Skip to content

Commit

Permalink
Many minor cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
reiner_jung committed Apr 28, 2016
1 parent cdc09f0 commit ddc522a
Show file tree
Hide file tree
Showing 18 changed files with 177 additions and 459 deletions.
21 changes: 3 additions & 18 deletions cocome-maven-project/cloud-logic-service/cloud-enterprise-logic/enterprise-logic-ear/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<artifactId>enterprise-logic-ear</artifactId>
<packaging>ear</packaging>

<name>enterprise-logic-ear</name>
<name>Enterprise Logic - EAR</name>

<parent>
<groupId>org.cocome</groupId>
Expand Down Expand Up @@ -36,21 +36,6 @@
<version>1.1</version>
<type>ejb</type>
</dependency>
<!-- <dependency>
<groupId>net.kieker-monitoring</groupId>
<artifactId>kieker</artifactId>
<version>1.12</version>
</dependency>
<dependency>
<groupId>org.iobserve</groupId>
<artifactId>monitoring</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.iobserve</groupId>
<artifactId>common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency> -->
</dependencies>

<build>
Expand All @@ -70,7 +55,7 @@
<configuration>
<glassfishDirectory>${local.glassfish.home}</glassfishDirectory>
<user>${logic.enterprise.user}</user>
<!-- <adminPassword>${logic.password}</adminPassword> -->
<!-- <adminPassword>${logic.enterprise.password}</adminPassword> -->
<passwordFile>${logic.enterprise.passwordFile}</passwordFile>
<domain>
<name>${logic.enterprise.domain}</name>
Expand Down
78 changes: 1 addition & 77 deletions cocome-maven-project/cloud-logic-service/cloud-enterprise-logic/enterprise-logic-ejb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<artifactId>enterprise-logic-ejb</artifactId>
<packaging>ejb</packaging>

<name>enterprise-logic-ejb</name>
<name>Enterprise Logic - EJB</name>

<parent>
<groupId>org.cocome</groupId>
Expand Down Expand Up @@ -53,26 +53,6 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
<!-- <dependency>
<groupId>net.kieker-monitoring</groupId>
<artifactId>kieker</artifactId>
<version>1.12</version>
</dependency>
<dependency>
<groupId>org.iobserve</groupId>
<artifactId>monitoring</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.iobserve</groupId>
<artifactId>common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency> -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.8.7</version>
</dependency>
<dependency>
<groupId>org.cocome</groupId>
<artifactId>cloud-registry-client</artifactId>
Expand All @@ -95,62 +75,6 @@
</excludes>
</configuration>
</plugin>
<!-- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.8</version>
<configuration>
<complianceLevel>1.7</complianceLevel>
<source>1.7</source>
<target>1.7</target>
<aspectLibraries>
<aspectLibrary>
<groupId>net.kieker-monitoring</groupId>
<artifactId>kieker</artifactId>
</aspectLibrary>
</aspectLibraries>
<xmlConfigured>${basedir}/src/main/resources/META-INF/aop.xml</xmlConfigured>
<sources>
<source>
<basedir>${basedir}/src/main/java</basedir>
<includes>
<include>**</include>
</includes>
<excludes>
<exclude>org/cocome/tradingsystem/inventory/data/store/StoreQueryProvider.java</exclude>
<exclude>org/cocome/tradingsystem/inventory/data/enterprise/EnterpriseQueryProvider.java</exclude>
<exclude>org/cocome/tradingsystem/inventory/data/persistence/*Transaction*.java</exclude>
<exclude>de/kit/ipd/java/tradingsystem/entity/*.java</exclude>
<exclude>org/cocome/tradingsystem/util/**</exclude>
<exclude>org/cocome/tradingsystem/inventory/application/store/ProductMovementTO.java</exclude>
<exclude>org/cocome/tradingsystem/inventory/application/store/StoreServer.java</exclude>
<exclude>org/cocome/tradingsystem/inventory/data/enterprise/CloudEnterpriseQueryProvider.java</exclude>
<exclude>org/cocome/tradingsystem/inventory/data/enterprise/Product.java</exclude>
<exclude>org/cocome/tradingsystem/inventory/data/enterprise/ProductSupplier.java</exclude>
<exclude>org/cocome/tradingsystem/inventory/data/enterprise/TradingEnterprise.java</exclude>
<exclude>org/cocome/tradingsystem/inventory/data/persistence/ServiceAdapterEntityConverter.java</exclude>
<exclude>org/cocome/tradingsystem/inventory/data/store/OrderEntry.java</exclude>
<exclude>org/cocome/tradingsystem/inventory/data/store/ProductOrder.java</exclude>
<exclude>org/cocome/tradingsystem/inventory/data/store/StockItem.java</exclude>
<exclude>org/cocome/tradingsystem/inventory/data/store/Store.java</exclude>
<exclude>org/cocome/tradingsystem/cashdeskline/cashdesk/IllegalCashDeskStateException.java</exclude>
<exclude>org/cocome/tradingsystem/cashdeskline/cashdesk/userdisplay/MessageKind.java</exclude>
<exclude>org/cocome/tradingsystem/cashdeskline/datatypes/*.java</exclude>
<exclude>org/cocome/tradingsystem/cashdeskline/events/*Event.java</exclude>
<exclude>org/cocome/tradingsystem/remote/access/connection/IPersistenceConnection.java</exclude>
</excludes>
</source>
</sources>
</configuration>
<executions>
<execution>
<goals>
<goal>compile</goal> use this goal to weave all your main classes
<goal>test-compile</goal> use this goal to weave all your test classes
</goals>
</execution>
</executions>
</plugin> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ejb-plugin</artifactId>
Expand Down
41 changes: 13 additions & 28 deletions ...en-project/cloud-logic-service/cloud-enterprise-logic/enterprise-logic-webservice/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
</parent>

<artifactId>enterprise-logic-webservice</artifactId>
<name>Enterprise Logic - Webservice</name>

<packaging>war</packaging>


Expand All @@ -23,17 +25,17 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.cocome</groupId>
<artifactId>cloud-logic-core-impl</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.cocome</groupId>
<artifactId>cloud-logic-core-services</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>
<groupId>org.cocome</groupId>
<artifactId>cloud-logic-core-impl</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.cocome</groupId>
<artifactId>cloud-logic-core-services</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
Expand All @@ -44,11 +46,6 @@
<type>pom</type>
<scope>provided</scope>
</dependency>
<!-- <dependency> <groupId>net.kieker-monitoring</groupId> <artifactId>kieker</artifactId>
<version>1.12</version> </dependency> <dependency> <groupId>org.iobserve</groupId>
<artifactId>monitoring</artifactId> <version>0.0.1-SNAPSHOT</version> </dependency>
<dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjrt</artifactId>
<version>1.8.7</version> </dependency> -->
</dependencies>

<build>
Expand All @@ -69,16 +66,6 @@
</compilerArguments> -->
</configuration>
</plugin>
<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>aspectj-maven-plugin</artifactId>
<version>1.8</version> <configuration> <complianceLevel>1.7</complianceLevel>
<source>1.7</source> <target>1.7</target> <aspectLibraries> <aspectLibrary>
<groupId>net.kieker-monitoring</groupId> <artifactId>kieker</artifactId>
</aspectLibrary> </aspectLibraries> <xmlConfigured>${basedir}/src/main/resources/META-INF/aop.xml</xmlConfigured>
<sources> <source> <basedir>${basedir}/src/main/java</basedir> <includes>
<include>**/**.java</include> </includes> </source> </sources> </configuration>
<executions> <execution> <goals> <goal>compile</goal> use this goal to weave
all your main classes <goal>test-compile</goal> use this goal to weave all
your test classes </goals> </execution> </executions> </plugin> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
Expand Down Expand Up @@ -109,6 +96,4 @@
</plugin>
</plugins>
</build>

<name>enterprise-logic-webservice</name>
</project>
2 changes: 1 addition & 1 deletion cocome-maven-project/cloud-logic-service/cloud-enterprise-logic/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<artifactId>cloud-enterprise-logic</artifactId>
<version>1.1</version>
<packaging>pom</packaging>
<name>cloud-enterprise-logic</name>
<name>Cloud Enterprise Logic (Parent)</name>

<modules>
<module>enterprise-logic-ear</module>
Expand Down
2 changes: 1 addition & 1 deletion cocome-maven-project/cloud-logic-service/cloud-logic-core-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<artifactId>cloud-logic-core-api</artifactId>
<packaging>jar</packaging>

<name>cloud-logic-core-api</name>
<name>Cloud Logic Core - API</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion cocome-maven-project/cloud-logic-service/cloud-logic-core-impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</parent>

<artifactId>cloud-logic-core-impl</artifactId>
<name>cloud-logic-core-impl java library</name>
<name>Cloud Logic Core - Implementation</name>
<description>cloud-logic-core-impl</description>
<packaging>ejb</packaging>

Expand Down
2 changes: 1 addition & 1 deletion cocome-maven-project/cloud-logic-service/cloud-logic-core-services/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</parent>

<artifactId>cloud-logic-core-services</artifactId>
<name>cloud-logic-core-services java library</name>
<name>Cloud Logic Core - Services</name>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
38 changes: 19 additions & 19 deletions cocome-maven-project/cloud-logic-service/cloud-registry-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>cloud-logic-service</artifactId>
<groupId>org.cocome</groupId>
<version>1.1</version>
</parent>
<artifactId>cloud-registry-client</artifactId>
<version>1.1</version>
<packaging>jar</packaging>
<name>cloud-registry-client</name>
<build>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>cloud-logic-service</artifactId>
<groupId>org.cocome</groupId>
<version>1.1</version>
</parent>
<artifactId>cloud-registry-client</artifactId>
<version>1.1</version>
<packaging>jar</packaging>
<name>Cloud Registry - Client</name>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -80,12 +80,12 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-all-6.0</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-all-6.0</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</dependency>
Expand All @@ -95,5 +95,5 @@
<version>1.1</version>
</dependency>
</dependencies>

</project>
Loading

0 comments on commit ddc522a

Please sign in to comment.