From: Roland Haeder Date: Wed, 2 Mar 2016 19:45:50 +0000 (+0100) Subject: Continued with separation from addressbook project: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6d7ca4a69d67e16ec254147be5384c29e4b447b5;p=jjobs-war.git 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 index cd253cd0..00000000 Binary files a/lib/addressbook-lib.jar and /dev/null differ diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 24dd9409..1804cc32 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -1030,7 +1030,6 @@ exists or setup the property manually. For example like this: - @@ -1044,7 +1043,6 @@ exists or setup the property manually. For example like this: - diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 0e8b1adf..224aeea4 100644 --- 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 7f70d9ae..afaedba9 100644 --- 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 499bdc69..f150bf9c 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -6,10 +6,6 @@ jjobs-war 1.6.5 - - ${file.reference.addressbook-lib.jar} - WEB-INF/lib - ${file.reference.jcontacts-core.jar} WEB-INF/lib diff --git a/src/java/org/mxchange/jjobs/beans/addressbook/AddressbookWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/addressbook/AddressbookWebSessionBean.java index 352b341a..30bf3721 100644 --- 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 21fc2fb2..47686906 100644 --- 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;