Skip to content

Commit

Permalink
Separated store and enterprise related classes and added a service re…
Browse files Browse the repository at this point in the history 
…gistry to retrieve store and enterprise servers.

Refactored common classes into a core project.
  • Loading branch information
s_poeppk committed Apr 15, 2016
1 parent 1f97e0f commit 807afe3
Show file tree
Hide file tree
Showing 406 changed files with 14,123 additions and 3,036 deletions.
17 changes: 0 additions & 17 deletions cocome-maven-project/.project
View file

This file was deleted.

34 changes: 23 additions & 11 deletions ...oud-logic-service/cloud-logic-ear/pom.xml → ...rprise-logic/enterprise-logic-ear/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,40 @@
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>cloud-logic-ear</artifactId>
<artifactId>enterprise-logic-ear</artifactId>
<packaging>ear</packaging>

<name>cloud-logic-ear</name>
<name>enterprise-logic-ear</name>

<parent>
<groupId>org.cocome</groupId>
<artifactId>cloud-logic-service</artifactId>
<artifactId>cloud-enterprise-logic</artifactId>
<version>1.1</version>
</parent>
<dependencies>
<dependency>
<groupId>org.cocome</groupId>
<artifactId>cloud-logic-ejb</artifactId>
<artifactId>enterprise-logic-ejb</artifactId>
<version>1.1</version>
<type>ejb</type>
</dependency>
<dependency>
<groupId>org.cocome</groupId>
<artifactId>cloud-logic-webservice</artifactId>
<artifactId>enterprise-logic-webservice</artifactId>
<version>1.1</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.cocome</groupId>
<artifactId>cloud-logic-core-services</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.cocome</groupId>
<artifactId>cloud-logic-core-impl</artifactId>
<version>1.1</version>
<type>ejb</type>
</dependency>
<!-- <dependency>
<groupId>net.kieker-monitoring</groupId>
<artifactId>kieker</artifactId>
Expand Down Expand Up @@ -58,13 +69,14 @@

<configuration>
<glassfishDirectory>${local.glassfish.home}</glassfishDirectory>
<user>${logic.user}</user>
<adminPassword>${logic.password}</adminPassword>
<user>${logic.enterprise.user}</user>
<!-- <adminPassword>${logic.password}</adminPassword> -->
<passwordFile>${logic.enterprise.passwordFile}</passwordFile>
<domain>
<name>${logic.domain}</name>
<host>${logic.host}</host>
<httpPort>${logic.httpPort}</httpPort>
<adminPort>${logic.adminPort}</adminPort>
<name>${logic.enterprise.domain}</name>
<host>${logic.enterprise.host}</host>
<httpPort>${logic.enterprise.httpPort}</httpPort>
<adminPort>${logic.enterprise.adminPort}</adminPort>
</domain>
<components>
<component>
Expand Down
0 ...src/main/application/META-INF/MANIFEST.MF → ...src/main/application/META-INF/MANIFEST.MF
View file
File renamed without changes.
0 ...r/src/main/application/META-INF/beans.xml → ...r/src/main/application/META-INF/beans.xml
View file
File renamed without changes.
82 changes: 42 additions & 40 deletions ...oud-logic-service/cloud-logic-ejb/pom.xml → ...rprise-logic/enterprise-logic-ejb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
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>cloud-logic-ejb</artifactId>
<artifactId>enterprise-logic-ejb</artifactId>
<packaging>ejb</packaging>

<name>cloud-logic-ejb</name>
<name>enterprise-logic-ejb</name>

<parent>
<groupId>org.cocome</groupId>
<artifactId>cloud-logic-service</artifactId>
<artifactId>cloud-enterprise-logic</artifactId>
<version>1.1</version>
</parent>

Expand All @@ -23,6 +23,18 @@
<artifactId>java.utils</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.cocome</groupId>
<artifactId>cloud-logic-core-services</artifactId>
<version>1.1</version>
<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.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
Expand All @@ -41,7 +53,7 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
<dependency>
<!-- <dependency>
<groupId>net.kieker-monitoring</groupId>
<artifactId>kieker</artifactId>
<version>1.12</version>
Expand All @@ -55,57 +67,35 @@
<groupId>org.iobserve</groupId>
<artifactId>common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</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>
<version>1.1</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArguments>
<endorseddirs>${endorsed.dir}</endorseddirs>
</compilerArguments>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ejb-plugin</artifactId>
<configuration>
<generateClient>true</generateClient>
<clientIncludes>
<clientInclude>**/I*.class</clientInclude>
<clientInclude>**/*Event.class</clientInclude>
<clientInclude>**/*Exception.class</clientInclude>
<clientInclude>**/scope/CashDeskSessionScoped.class</clientInclude>
<clientInclude>**/datatypes/*.class</clientInclude>
</clientIncludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArguments>
<!-- <compilerArguments>
<endorseddirs>${endorsed.dir}</endorseddirs>
</compilerArguments>
</compilerArguments> -->
<excludes>
<!-- These are not needed because they don't use the cloud backend
database -->
<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/inventory/data/generator/*.java</exclude>
<exclude>org/cocome/tradingsystem/util/Configuration.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<!-- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.8</version>
Expand Down Expand Up @@ -155,12 +145,12 @@
<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 -->
<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> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ejb-plugin</artifactId>
Expand All @@ -179,6 +169,18 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-properties-file</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeArtifactIds>cloud-logic-core</includeArtifactIds>
<outputDirectory>${project.basedir}/src/main/resources</outputDirectory>
<includes>**\/*.properties</includes>
</configuration>
</execution>
<execution>
<phase>validate</phase>
<goals>
Expand Down
Loading

0 comments on commit 807afe3

Please sign in to comment.