Continued with separation from addressbook project:

- updated packages to own jjobs packages (not addressbook anymore)
- removed addressbook-lib as we now have own jjobs-lib

diff --git a/lib/addressbook-lib.jar b/lib/addressbook-lib.jar
deleted file mode 100644 (file)
index cd253cd..0000000
Binary files a/lib/addressbook-lib.jar and /dev/null differ

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 24dd9409438b3fe398b7d3402cef7a68ffce00f4..1804cc32e870881cd0c4d1242985d1d9a518e020 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -1030,7 +1030,6 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
     <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
-        <copyfiles files="${file.reference.addressbook-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcontacts-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcore.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcore-logger-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
@@ -1044,7 +1043,6 @@ exists or setup the property manually. For example like this:
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
-        <copyfiles files="${file.reference.addressbook-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jcontacts-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jcore.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jcore-logger-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 0e8b1adfffc0e06d8fb9958adbaf8fc9ddde9c20..224aeea47ad423af787fda99ab1c107cc1734ac0 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=1ae43834
+build.xml.data.CRC32=fafbc183
 build.xml.script.CRC32=fae72669
 build.xml.stylesheet.CRC32=651128d4@1.75.1.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=1ae43834
-nbproject/build-impl.xml.script.CRC32=6df6af1f
+nbproject/build-impl.xml.data.CRC32=fafbc183
+nbproject/build-impl.xml.script.CRC32=d40bda24
 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 7f70d9aeba5d69f691b48b8780793c5e99f9d78d..afaedba9967f0d597df06de3906ad60e34910375 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -35,7 +35,6 @@ dist.javadoc.dir=${dist.dir}/javadoc
 dist.war=${dist.dir}/${war.name}
 endorsed.classpath=
 excludes=
-file.reference.addressbook-lib.jar=lib/addressbook-lib.jar
 file.reference.jcontacts-core.jar=lib/jcontacts-core.jar
 file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar
 file.reference.jcore.jar=lib/jcore.jar
@@ -58,7 +57,6 @@ j2ee.platform.wsit.classpath=
 j2ee.server.type=gfv3ee6
 jar.compress=false
 javac.classpath=\
-    ${file.reference.addressbook-lib.jar}:\
     ${file.reference.jcontacts-core.jar}:\
     ${file.reference.jcore.jar}:\
     ${file.reference.jcore-logger-lib.jar}:\
@@ -107,7 +105,6 @@ run.test.classpath=\
 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
 runmain.jvmargs=
 source.encoding=UTF-8
-source.reference.addressbook-lib.jar=../addressbook-lib/src/
 source.reference.jcontacts-core.jar=../jcontacts-core/src/
 source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/
 source.reference.jcore.jar=../jcore/src/

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 499bdc6903473a1fc57e1d192b799b824cef64e9..f150bf9c81fa54c5e19014710c9076577772dc95 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -6,10 +6,6 @@
             <name>jjobs-war</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <web-module-libraries>
-                <library dirs="200">
-                    <file>${file.reference.addressbook-lib.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
                 <library dirs="200">
                     <file>${file.reference.jcontacts-core.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>

diff --git a/src/java/org/mxchange/jjobs/beans/addressbook/AddressbookWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/addressbook/AddressbookWebSessionBean.java
index 352b341a60373b5a252f6eb86583a42f5fe6c081..30bf372127b73c16b1d4c0d9f3fd81e5289e6b51 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/addressbook/AddressbookWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/addressbook/AddressbookWebSessionBean.java
@@ -34,15 +34,15 @@ import javax.inject.Named;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import org.mxchange.addressbook.events.addressbook.AddressbookLoadedEvent;
-import org.mxchange.addressbook.events.addressbook.LoadedAddressbookEvent;
-import org.mxchange.addressbook.exceptions.AddressbookNameAlreadyUsedException;
-import org.mxchange.addressbook.exceptions.AddressbookNotFoundException;
-import org.mxchange.addressbook.model.addressbook.Addressbook;
-import org.mxchange.addressbook.model.addressbook.AddressbookSessionBeanRemote;
-import org.mxchange.addressbook.model.addressbook.UserAddressbook;
-import org.mxchange.addressbook.model.addressbook.entry.AddressbookEntry;
 import org.mxchange.jjobs.beans.login.UserLoginWebSessionController;
+import org.mxchange.jjobs.events.addressbook.AddressbookLoadedEvent;
+import org.mxchange.jjobs.events.addressbook.LoadedAddressbookEvent;
+import org.mxchange.jjobs.exceptions.AddressbookNameAlreadyUsedException;
+import org.mxchange.jjobs.exceptions.AddressbookNotFoundException;
+import org.mxchange.jjobs.model.addressbook.Addressbook;
+import org.mxchange.jjobs.model.addressbook.AddressbookSessionBeanRemote;
+import org.mxchange.jjobs.model.addressbook.UserAddressbook;
+import org.mxchange.jjobs.model.addressbook.entry.AddressbookEntry;
 import org.mxchange.jusercore.events.login.UserLoggedInEvent;
 import org.mxchange.jusercore.model.user.User;
 

diff --git a/src/java/org/mxchange/jjobs/beans/addressbook/AddressbookWebSessionController.java b/src/java/org/mxchange/jjobs/beans/addressbook/AddressbookWebSessionController.java
index 21fc2fb2e365ffec3d31a0beb6f556e57999c07c..47686906d18168c662589f855c332a2b839927a3 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/addressbook/AddressbookWebSessionController.java
+++ b/src/java/org/mxchange/jjobs/beans/addressbook/AddressbookWebSessionController.java
@@ -19,9 +19,9 @@ package org.mxchange.jjobs.beans.addressbook;
 import java.io.Serializable;
 import java.util.Calendar;
 import java.util.List;
-import org.mxchange.addressbook.events.addressbook.AddressbookLoadedEvent;
-import org.mxchange.addressbook.model.addressbook.Addressbook;
-import org.mxchange.addressbook.model.addressbook.entry.AddressbookEntry;
+import org.mxchange.jjobs.events.addressbook.AddressbookLoadedEvent;
+import org.mxchange.jjobs.model.addressbook.Addressbook;
+import org.mxchange.jjobs.model.addressbook.entry.AddressbookEntry;
 import org.mxchange.jusercore.events.login.UserLoggedInEvent;
 import org.mxchange.jusercore.model.user.User;