Refacture:

- moved model (entities) files to jaddressbook-care
- jaddressbook-core.jar is not needed here as no addressbooks are maintained

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/lib/jaddressbook-core.jar b/lib/jaddressbook-core.jar
new file mode 100644 (file)
index 0000000..246241d
Binary files /dev/null and b/lib/jaddressbook-core.jar differ

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 35e6098057f2e565c15ae2022f756f17f1af32cc..b2ad187873fac0288417be1f68ca15587f6225d5 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -844,6 +844,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcontacts-business-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.juser-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.juser-lib.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.jaddressbook-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jmailer-ee.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.addressbook-mailer.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${reference.addressbook-lib.jar}" todir="${build.classes.dir}"/>
@@ -862,12 +863,13 @@ exists or setup the property manually. For example like this:
         <basename file="${file.reference.jcontacts-business-core.jar}" property="manifest.file.reference.jcontacts-business-core.jar"/>
         <basename file="${file.reference.juser-core.jar}" property="manifest.file.reference.juser-core.jar"/>
         <basename file="${file.reference.juser-lib.jar}" property="manifest.file.reference.juser-lib.jar"/>
+        <basename file="${file.reference.jaddressbook-core.jar}" property="manifest.file.reference.jaddressbook-core.jar"/>
         <basename file="${file.reference.jmailer-ee.jar}" property="manifest.file.reference.jmailer-ee.jar"/>
         <basename file="${file.reference.addressbook-mailer.jar}" property="manifest.file.reference.addressbook-mailer.jar"/>
         <basename file="${reference.addressbook-lib.jar}" property="manifest.reference.addressbook-lib.jar"/>
         <basename file="${reference.juser-core.jar}" property="manifest.reference.juser-core.jar"/>
         <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update">
-            <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 jar-7 jar-8 jar-9 jar-10 jar-11 jar-12 jar-13 jar-14 jar-15 jar-16 "/>
+            <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 jar-7 jar-8 jar-9 jar-10 jar-11 jar-12 jar-13 jar-14 jar-15 jar-16 jar-17 "/>
             <attribute name="jar-1-Extension-Name" value="${manifest.file.reference.jcore.jar}"/>
             <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jcoreee.jar}"/>
             <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jcore-logger-lib.jar}"/>
@@ -880,10 +882,11 @@ exists or setup the property manually. For example like this:
             <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.jcontacts-business-core.jar}"/>
             <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.juser-core.jar}"/>
             <attribute name="jar-12-Extension-Name" value="${manifest.file.reference.juser-lib.jar}"/>
-            <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
-            <attribute name="jar-14-Extension-Name" value="${manifest.file.reference.addressbook-mailer.jar}"/>
-            <attribute name="jar-15-Extension-Name" value="${manifest.reference.addressbook-lib.jar}"/>
-            <attribute name="jar-16-Extension-Name" value="${manifest.reference.juser-core.jar}"/>
+            <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.jaddressbook-core.jar}"/>
+            <attribute name="jar-14-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
+            <attribute name="jar-15-Extension-Name" value="${manifest.file.reference.addressbook-mailer.jar}"/>
+            <attribute name="jar-16-Extension-Name" value="${manifest.reference.addressbook-lib.jar}"/>
+            <attribute name="jar-17-Extension-Name" value="${manifest.reference.juser-core.jar}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
@@ -899,6 +902,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcontacts-business-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.juser-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.juser-lib.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jaddressbook-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jmailer-ee.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.addressbook-mailer.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.addressbook-lib.jar}" todir="${dist.ear.dir}/lib"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index ebcfb60036e2b961c75dd69f8a090ba378efc8b7..267a36249e2b9adc590bca8a91e1df4ec5dad00b 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=7d41e0fd
 build.xml.stylesheet.CRC32=5910fda3@1.51.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=1470c767
-nbproject/build-impl.xml.script.CRC32=2174af13
+nbproject/build-impl.xml.data.CRC32=da392143
+nbproject/build-impl.xml.script.CRC32=9a18d109
 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.55.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index c6826e4337b4f4b5714677161843568bb476a22d..49dc7ffdb900a638051cffc412b62593ed16d394 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -22,6 +22,7 @@ dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
 file.reference.addressbook-mailer.jar=lib/addressbook-mailer.jar
+file.reference.jaddressbook-core.jar=lib/jaddressbook-core.jar
 file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar
 file.reference.jcontacts-core.jar=lib/jcontacts-core.jar
 file.reference.jcontacts-lib.jar=lib/jcontacts-lib.jar
@@ -62,6 +63,7 @@ javac.classpath=\
     ${file.reference.jcontacts-business-core.jar}:\
     ${file.reference.juser-core.jar}:\
     ${file.reference.juser-lib.jar}:\
+    ${file.reference.jaddressbook-core.jar}:\
     ${file.reference.jmailer-ee.jar}:\
     ${file.reference.addressbook-mailer.jar}:\
     ${reference.addressbook-lib.jar}:\
@@ -106,6 +108,7 @@ run.test.classpath=\
 runmain.jvmargs=
 source.encoding=UTF-8
 source.reference.addressbook-mailer.jar=../addressbook-mailer/src/
+source.reference.jaddressbook-core.jar=../jaddressbook-core/src/
 source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/
 source.reference.jcontacts-core.jar=../jcontacts-core/src/
 source.reference.jcontacts-lib.jar=../jcontacts-lib/src/

diff --git a/nbproject/project.xml b/nbproject/project.xml
index f47c3a9bfe19f1927aa8b8a4fe769f08e5148104..53b5d99b3fd2977a2c71ce2091383d700495d988 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -17,6 +17,7 @@
             <included-library dirs="200">file.reference.jcontacts-business-core.jar</included-library>
             <included-library dirs="200">file.reference.juser-core.jar</included-library>
             <included-library dirs="200">file.reference.juser-lib.jar</included-library>
+            <included-library dirs="200">file.reference.jaddressbook-core.jar</included-library>
             <included-library dirs="200">file.reference.jmailer-ee.jar</included-library>
             <included-library dirs="200">file.reference.addressbook-mailer.jar</included-library>
             <included-library dirs="200">reference.addressbook-lib.jar</included-library>

diff --git a/src/java/org/mxchange/addressbook/model/addressbook/AddressbookSessionBean.java b/src/java/org/mxchange/addressbook/model/addressbook/AddressbookSessionBean.java
index 4aac269e2902ed573f63791646d17f621731c15a..38ea664a13e10eed38198022f8230c38b7dc439f 100644 (file)
--- a/src/java/org/mxchange/addressbook/model/addressbook/AddressbookSessionBean.java
+++ b/src/java/org/mxchange/addressbook/model/addressbook/AddressbookSessionBean.java
@@ -24,10 +24,12 @@ import java.util.List;
 import javax.ejb.Stateless;
 import javax.persistence.NoResultException;
 import javax.persistence.Query;
-import org.mxchange.addressbook.exceptions.AddressbookNameAlreadyUsedException;
-import org.mxchange.addressbook.exceptions.AddressbookNotFoundException;
-import org.mxchange.addressbook.model.addressbook.entry.AddressbookEntry;
-import org.mxchange.addressbook.model.addressbook.shared.ShareableAddressbook;
+import org.mxchange.jaddressbookcore.exceptions.AddressbookNameAlreadyUsedException;
+import org.mxchange.jaddressbookcore.exceptions.AddressbookNotFoundException;
+import org.mxchange.jaddressbookcore.model.addressbook.Addressbook;
+import org.mxchange.jaddressbookcore.model.addressbook.UserAddressbook;
+import org.mxchange.jaddressbookcore.model.addressbook.entry.AddressbookEntry;
+import org.mxchange.jaddressbookcore.model.addressbook.shared.ShareableAddressbook;
 import org.mxchange.jcoreee.database.BaseDatabaseBean;
 import org.mxchange.jusercore.model.user.User;
 

diff --git a/src/java/org/mxchange/addressbook/model/shared/SharedAddressbooksSessionBean.java b/src/java/org/mxchange/addressbook/model/shared/SharedAddressbooksSessionBean.java
index f3b9b95edacd74d64e907b6298ac3c6aac13dc8e..9296aea21d21c85a891b8355bbc32e2fe700dea2 100644 (file)
--- a/src/java/org/mxchange/addressbook/model/shared/SharedAddressbooksSessionBean.java
+++ b/src/java/org/mxchange/addressbook/model/shared/SharedAddressbooksSessionBean.java
@@ -22,10 +22,10 @@ import java.util.Objects;
 import javax.ejb.Stateless;
 import javax.persistence.NoResultException;
 import javax.persistence.Query;
-import org.mxchange.addressbook.exceptions.UserAlreadySharingAddressbookException;
-import org.mxchange.addressbook.model.addressbook.Addressbook;
-import org.mxchange.addressbook.model.addressbook.shared.AddressbookShare;
-import org.mxchange.addressbook.model.addressbook.shared.ShareableAddressbook;
+import org.mxchange.jaddressbookcore.exceptions.UserAlreadySharingAddressbookException;
+import org.mxchange.jaddressbookcore.model.addressbook.Addressbook;
+import org.mxchange.jaddressbookcore.model.addressbook.shared.AddressbookShare;
+import org.mxchange.jaddressbookcore.model.addressbook.shared.ShareableAddressbook;
 import org.mxchange.jcoreee.database.BaseDatabaseBean;
 import org.mxchange.jusercore.model.user.User;