From e5535f69b337e252b6bf08dad34ce4d1c643b36c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 19 Apr 2016 16:36:19 +0200 Subject: [PATCH] Refacture: - moved model (entities) files to jaddressbook-care - jaddressbook-core.jar is not needed here as no addressbooks are maintained MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- lib/jaddressbook-core.jar | Bin 0 -> 34086 bytes nbproject/build-impl.xml | 14 +++++++++----- nbproject/genfiles.properties | 4 ++-- nbproject/project.properties | 3 +++ nbproject/project.xml | 1 + .../addressbook/AddressbookSessionBean.java | 10 ++++++---- .../shared/SharedAddressbooksSessionBean.java | 8 ++++---- 7 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 lib/jaddressbook-core.jar diff --git a/lib/jaddressbook-core.jar b/lib/jaddressbook-core.jar new file mode 100644 index 0000000000000000000000000000000000000000..246241db909e08d3d035ee743504774be7c53c0a GIT binary patch literal 34086 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 + @@ -862,12 +863,13 @@ exists or setup the property manually. For example like this: + - + @@ -880,10 +882,11 @@ exists or setup the property manually. For example like this: - - - - + + + + + @@ -899,6 +902,7 @@ exists or setup the property manually. For example like this: + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index ebcfb60..267a362 100644 --- 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 c6826e4..49dc7ff 100644 --- 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 f47c3a9..53b5d99 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -17,6 +17,7 @@ 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 diff --git a/src/java/org/mxchange/addressbook/model/addressbook/AddressbookSessionBean.java b/src/java/org/mxchange/addressbook/model/addressbook/AddressbookSessionBean.java index 4aac269..38ea664 100644 --- 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 f3b9b95..9296aea 100644 --- 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; -- 2.39.5