Continued rewriting:

- added new project dependency jaddressbook-lib (remote interfaces)

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

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index b2ad187873fac0288417be1f68ca15587f6225d5..881fb5cda1486931ade3465fcd701d5930ca0d40 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -845,6 +845,7 @@ exists or setup the property manually. For example like this:
         <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.jaddressbook-lib.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}"/>
@@ -864,12 +865,13 @@ exists or setup the property manually. For example like this:
         <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.jaddressbook-lib.jar}" property="manifest.file.reference.jaddressbook-lib.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 jar-17 "/>
+            <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 jar-18 "/>
             <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}"/>
@@ -883,10 +885,11 @@ exists or setup the property manually. For example like this:
             <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.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}"/>
+            <attribute name="jar-14-Extension-Name" value="${manifest.file.reference.jaddressbook-lib.jar}"/>
+            <attribute name="jar-15-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
+            <attribute name="jar-16-Extension-Name" value="${manifest.file.reference.addressbook-mailer.jar}"/>
+            <attribute name="jar-17-Extension-Name" value="${manifest.reference.addressbook-lib.jar}"/>
+            <attribute name="jar-18-Extension-Name" value="${manifest.reference.juser-core.jar}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
@@ -903,6 +906,7 @@ exists or setup the property manually. For example like this:
         <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.jaddressbook-lib.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 267a36249e2b9adc590bca8a91e1df4ec5dad00b..4276f60d9ea21becbef7d69f9b1ca04ca97ec864 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=da392143
-nbproject/build-impl.xml.script.CRC32=9a18d109
+nbproject/build-impl.xml.data.CRC32=022f2a6e
+nbproject/build-impl.xml.script.CRC32=5596da13
 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.55.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 49dc7ffdb900a638051cffc412b62593ed16d394..4888f2f49afd9677b80f6bb7acca7c4c4ac0b93a 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -23,6 +23,7 @@ endorsed.classpath=
 excludes=
 file.reference.addressbook-mailer.jar=lib/addressbook-mailer.jar
 file.reference.jaddressbook-core.jar=lib/jaddressbook-core.jar
+file.reference.jaddressbook-lib.jar=lib/jaddressbook-lib.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
@@ -64,6 +65,7 @@ javac.classpath=\
     ${file.reference.juser-core.jar}:\
     ${file.reference.juser-lib.jar}:\
     ${file.reference.jaddressbook-core.jar}:\
+    ${file.reference.jaddressbook-lib.jar}:\
     ${file.reference.jmailer-ee.jar}:\
     ${file.reference.addressbook-mailer.jar}:\
     ${reference.addressbook-lib.jar}:\
@@ -109,6 +111,7 @@ runmain.jvmargs=
 source.encoding=UTF-8
 source.reference.addressbook-mailer.jar=../addressbook-mailer/src/
 source.reference.jaddressbook-core.jar=../jaddressbook-core/src/
+source.reference.jaddressbook-lib.jar=../jaddressbook-lib/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 53b5d99b3fd2977a2c71ce2091383d700495d988..1ea21cbf4866d52db3b30767a5d9738381a56cc0 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -18,6 +18,7 @@
             <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.jaddressbook-lib.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>