From 5d759e199e6b2704b1986edd7f89af43492e3cbe Mon Sep 17 00:00:00 2001
From: Milen Dyankov <MilenDyankov@gmail.com>
Date: Fri, 6 Mar 2015 16:21:57 +0100
Subject: [PATCH] Moved domain model into separate module

---
 dukes-domain-model/.gitignore                 |   2 +
 dukes-domain-model/pom.xml                    |  11 ++
 .../java/com/forest/model/Administrator.java  |   0
 .../main/java/com/forest/model/Category.java  |   0
 .../main/java/com/forest/model/Customer.java  |   0
 .../java/com/forest/model/CustomerOrder.java  |   0
 .../src/main/java/com/forest/model/Group.java |   0
 .../java/com/forest/model/OrderDetail.java    |   0
 .../java/com/forest/model/OrderDetailPK.java  |   0
 .../java/com/forest/model/OrderStatus.java    |   0
 .../main/java/com/forest/model/Person.java    |   0
 .../main/java/com/forest/model/Product.java   |   0
 entities/pom.xml                              | 122 +++++++++---------
 pom.xml                                       |   1 +
 14 files changed, 78 insertions(+), 58 deletions(-)
 create mode 100644 dukes-domain-model/.gitignore
 create mode 100644 dukes-domain-model/pom.xml
 rename {entities => dukes-domain-model}/src/main/java/com/forest/model/Administrator.java (100%)
 rename {entities => dukes-domain-model}/src/main/java/com/forest/model/Category.java (100%)
 rename {entities => dukes-domain-model}/src/main/java/com/forest/model/Customer.java (100%)
 rename {entities => dukes-domain-model}/src/main/java/com/forest/model/CustomerOrder.java (100%)
 rename {entities => dukes-domain-model}/src/main/java/com/forest/model/Group.java (100%)
 rename {entities => dukes-domain-model}/src/main/java/com/forest/model/OrderDetail.java (100%)
 rename {entities => dukes-domain-model}/src/main/java/com/forest/model/OrderDetailPK.java (100%)
 rename {entities => dukes-domain-model}/src/main/java/com/forest/model/OrderStatus.java (100%)
 rename {entities => dukes-domain-model}/src/main/java/com/forest/model/Person.java (100%)
 rename {entities => dukes-domain-model}/src/main/java/com/forest/model/Product.java (100%)

diff --git a/dukes-domain-model/.gitignore b/dukes-domain-model/.gitignore
new file mode 100644
index 0000000..4dc0091
--- /dev/null
+++ b/dukes-domain-model/.gitignore
@@ -0,0 +1,2 @@
+/target
+/bin
diff --git a/dukes-domain-model/pom.xml b/dukes-domain-model/pom.xml
new file mode 100644
index 0000000..b7bf7d2
--- /dev/null
+++ b/dukes-domain-model/pom.xml
@@ -0,0 +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">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.glassfish.javaeetutorial</groupId>
+		<artifactId>dukes-forest</artifactId>
+		<version>7.0.6-SNAPSHOT</version>
+	</parent>
+	<artifactId>dukes-domain-model</artifactId>
+	<name>Duke's domain model</name>
+</project>
\ No newline at end of file
diff --git a/entities/src/main/java/com/forest/model/Administrator.java b/dukes-domain-model/src/main/java/com/forest/model/Administrator.java
similarity index 100%
rename from entities/src/main/java/com/forest/model/Administrator.java
rename to dukes-domain-model/src/main/java/com/forest/model/Administrator.java
diff --git a/entities/src/main/java/com/forest/model/Category.java b/dukes-domain-model/src/main/java/com/forest/model/Category.java
similarity index 100%
rename from entities/src/main/java/com/forest/model/Category.java
rename to dukes-domain-model/src/main/java/com/forest/model/Category.java
diff --git a/entities/src/main/java/com/forest/model/Customer.java b/dukes-domain-model/src/main/java/com/forest/model/Customer.java
similarity index 100%
rename from entities/src/main/java/com/forest/model/Customer.java
rename to dukes-domain-model/src/main/java/com/forest/model/Customer.java
diff --git a/entities/src/main/java/com/forest/model/CustomerOrder.java b/dukes-domain-model/src/main/java/com/forest/model/CustomerOrder.java
similarity index 100%
rename from entities/src/main/java/com/forest/model/CustomerOrder.java
rename to dukes-domain-model/src/main/java/com/forest/model/CustomerOrder.java
diff --git a/entities/src/main/java/com/forest/model/Group.java b/dukes-domain-model/src/main/java/com/forest/model/Group.java
similarity index 100%
rename from entities/src/main/java/com/forest/model/Group.java
rename to dukes-domain-model/src/main/java/com/forest/model/Group.java
diff --git a/entities/src/main/java/com/forest/model/OrderDetail.java b/dukes-domain-model/src/main/java/com/forest/model/OrderDetail.java
similarity index 100%
rename from entities/src/main/java/com/forest/model/OrderDetail.java
rename to dukes-domain-model/src/main/java/com/forest/model/OrderDetail.java
diff --git a/entities/src/main/java/com/forest/model/OrderDetailPK.java b/dukes-domain-model/src/main/java/com/forest/model/OrderDetailPK.java
similarity index 100%
rename from entities/src/main/java/com/forest/model/OrderDetailPK.java
rename to dukes-domain-model/src/main/java/com/forest/model/OrderDetailPK.java
diff --git a/entities/src/main/java/com/forest/model/OrderStatus.java b/dukes-domain-model/src/main/java/com/forest/model/OrderStatus.java
similarity index 100%
rename from entities/src/main/java/com/forest/model/OrderStatus.java
rename to dukes-domain-model/src/main/java/com/forest/model/OrderStatus.java
diff --git a/entities/src/main/java/com/forest/model/Person.java b/dukes-domain-model/src/main/java/com/forest/model/Person.java
similarity index 100%
rename from entities/src/main/java/com/forest/model/Person.java
rename to dukes-domain-model/src/main/java/com/forest/model/Person.java
diff --git a/entities/src/main/java/com/forest/model/Product.java b/dukes-domain-model/src/main/java/com/forest/model/Product.java
similarity index 100%
rename from entities/src/main/java/com/forest/model/Product.java
rename to dukes-domain-model/src/main/java/com/forest/model/Product.java
diff --git a/entities/pom.xml b/entities/pom.xml
index a882e29..e131a1c 100644
--- a/entities/pom.xml
+++ b/entities/pom.xml
@@ -1,63 +1,69 @@
-<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">
-    <modelVersion>4.0.0</modelVersion>
+<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">
+	<modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.glassfish.javaeetutorial</groupId>
-        <artifactId>dukes-forest</artifactId>
-        <version>7.0.6-SNAPSHOT</version>
-    </parent>
+	<parent>
+		<groupId>org.glassfish.javaeetutorial</groupId>
+		<artifactId>dukes-forest</artifactId>
+		<version>7.0.6-SNAPSHOT</version>
+	</parent>
 
-    <groupId>org.glassfish.javaeetutorial</groupId>
-    <artifactId>entities</artifactId>
-    <packaging>jar</packaging>
+	<groupId>org.glassfish.javaeetutorial</groupId>
+	<artifactId>entities</artifactId>
+	<packaging>jar</packaging>
 
-    <name>entities</name>
+	<name>entities</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>javax.persistence</artifactId>
-            <version>2.1.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>1.1.0.Final</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <skip>false</skip>
-                    <executable>${glassfish.home}/bin/asadmin${glassfish.executables.suffix}</executable>
-                    <successCodes>
-                        <successCode>0</successCode>
-                        <successCode>1</successCode>
-                    </successCodes>
-                    <arguments>
-                        <argument>create-auth-realm</argument>
-                        <argument>--classname=com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm</argument>
-                        <argument>--property=jaas-context=jdbcRealm:datasource-jndi=java\:global/ForestDataSource:user-table=forest.PERSON:user-name-column=email:password-column=password:group-table=forest.GROUPS:group-table-user-name-column=name:group-name-column=name:assign-groups=USERS,ADMINS:digest-algorithm=MD5</argument>
-                        <argument>jdbcRealm</argument>
-                    </arguments>
-                </configuration>
-            </plugin> 
-        </plugins>         
-    </build>
+	<dependencies>
+		<dependency>
+			<groupId>org.eclipse.persistence</groupId>
+			<artifactId>javax.persistence</artifactId>
+			<version>2.1.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>1.1.0.Final</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>dukes-domain-model</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<finalName>${project.artifactId}</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<version>1.2.1</version>
+				<executions>
+					<execution>
+						<phase>compile</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<skip>false</skip>
+					<executable>${glassfish.home}/bin/asadmin${glassfish.executables.suffix}</executable>
+					<successCodes>
+						<successCode>0</successCode>
+						<successCode>1</successCode>
+					</successCodes>
+					<arguments>
+						<argument>create-auth-realm</argument>
+						<argument>--classname=com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm</argument>
+						<argument>--property=jaas-context=jdbcRealm:datasource-jndi=java\:global/ForestDataSource:user-table=forest.PERSON:user-name-column=email:password-column=password:group-table=forest.GROUPS:group-table-user-name-column=name:group-name-column=name:assign-groups=USERS,ADMINS:digest-algorithm=MD5</argument>
+						<argument>jdbcRealm</argument>
+					</arguments>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/pom.xml b/pom.xml
index 5f57c3e..6b144a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,6 +175,7 @@
 		<module>dukes-payment</module>
 		<module>dukes-store</module>
 		<module>dukes-shipment</module>
+		<module>dukes-domain-model</module>
 	</modules>