Some stuff changed:

- removed no longer used jshop-core
- added jcontacts-core as an exception is now thrown

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

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

diff --git a/nbproject/project.properties b/nbproject/project.properties
index c3571c8cc9fc2287f74ead6d2d851f79d6ce4a82..89ede25256f03ba8683fd86048cb0ae07528a8d9 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,104 +1,104 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=true
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=jcustomer-lib
-application.vendor=Roland Haeder
-auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# Files in build.classes.dir which should be excluded from distribution jar
-dist.archive.excludes=
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/jcustomer-lib.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.jcore.jar=lib/jcore.jar
-file.reference.jcoreee.jar=lib/jcoreee.jar
-file.reference.jcustomer-core.jar=lib/jcustomer-core.jar
-file.reference.jshop-core.jar=lib/jshop-core.jar
-includes=**
-jar.archive.disabled=${jnlp.enabled}
-jar.compress=false
-jar.index=${jnlp.enabled}
-javac.classpath=\
-    ${file.reference.jcore.jar}:\
-    ${file.reference.jcoreee.jar}:\
-    ${file.reference.jcustomer-core.jar}:\
-    ${file.reference.jshop-core.jar}:\
-    ${libs.javaee-api-7.0.classpath}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=true
-javac.external.vm=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.7
-javac.target=1.7
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=true
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=true
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=true
-javadoc.windowtitle=Java Shop EE Library
-jnlp.codebase.type=no.codebase
-jnlp.descriptor=application
-jnlp.enabled=false
-jnlp.mixed.code=default
-jnlp.offline-allowed=false
-jnlp.signed=false
-jnlp.signing=
-jnlp.signing.alias=
-jnlp.signing.keystore=
-# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed
-manifest.custom.codebase=
-# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions)
-manifest.custom.permissions=
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=true
-platform.active=default_platform
-project.license=gpl30
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project.
-# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
-# To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-source.reference.jcore.jar=../jcore/src/
-source.reference.jcoreee.jar=../jcoreee/src/
-source.reference.jcustomer-core.jar=../jcustomer-core/src/
-source.reference.jshop-core.jar=../jshop-core/src/
-src.dir=src
-test.src.dir=test
+annotation.processing.enabled=true\r
+annotation.processing.enabled.in.editor=true\r
+annotation.processing.processors.list=\r
+annotation.processing.run.all.processors=true\r
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output\r
+application.title=jcustomer-lib\r
+application.vendor=Roland Haeder\r
+auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml\r
+build.classes.dir=${build.dir}/classes\r
+build.classes.excludes=**/*.java,**/*.form\r
+# This directory is removed when the project is cleaned:\r
+build.dir=build\r
+build.generated.dir=${build.dir}/generated\r
+build.generated.sources.dir=${build.dir}/generated-sources\r
+# Only compile against the classpath explicitly listed here:\r
+build.sysclasspath=ignore\r
+build.test.classes.dir=${build.dir}/test/classes\r
+build.test.results.dir=${build.dir}/test/results\r
+# Uncomment to specify the preferred debugger connection transport:\r
+#debug.transport=dt_socket\r
+debug.classpath=\\r
+    ${run.classpath}\r
+debug.test.classpath=\\r
+    ${run.test.classpath}\r
+# Files in build.classes.dir which should be excluded from distribution jar\r
+dist.archive.excludes=\r
+# This directory is removed when the project is cleaned:\r
+dist.dir=dist\r
+dist.jar=${dist.dir}/jcustomer-lib.jar\r
+dist.javadoc.dir=${dist.dir}/javadoc\r
+endorsed.classpath=\r
+excludes=\r
+file.reference.jcontacts-core.jar=lib/jcontacts-core.jar\r
+file.reference.jcore.jar=lib/jcore.jar\r
+file.reference.jcoreee.jar=lib/jcoreee.jar\r
+file.reference.jcustomer-core.jar=lib/jcustomer-core.jar\r
+includes=**\r
+jar.archive.disabled=${jnlp.enabled}\r
+jar.compress=false\r
+jar.index=${jnlp.enabled}\r
+javac.classpath=\\r
+    ${file.reference.jcore.jar}:\\r
+    ${file.reference.jcoreee.jar}:\\r
+    ${file.reference.jcustomer-core.jar}:\\r
+    ${file.reference.jcontacts-core.jar}:\\r
+    ${libs.javaee-api-7.0.classpath}\r
+# Space-separated list of extra javac options\r
+javac.compilerargs=\r
+javac.deprecation=true\r
+javac.external.vm=false\r
+javac.processorpath=\\r
+    ${javac.classpath}\r
+javac.source=1.7\r
+javac.target=1.7\r
+javac.test.classpath=\\r
+    ${javac.classpath}:\\r
+    ${build.classes.dir}\r
+javac.test.processorpath=\\r
+    ${javac.test.classpath}\r
+javadoc.additionalparam=\r
+javadoc.author=true\r
+javadoc.encoding=${source.encoding}\r
+javadoc.noindex=false\r
+javadoc.nonavbar=false\r
+javadoc.notree=false\r
+javadoc.private=true\r
+javadoc.splitindex=true\r
+javadoc.use=true\r
+javadoc.version=true\r
+javadoc.windowtitle=Java Shop EE Library\r
+jnlp.codebase.type=no.codebase\r
+jnlp.descriptor=application\r
+jnlp.enabled=false\r
+jnlp.mixed.code=default\r
+jnlp.offline-allowed=false\r
+jnlp.signed=false\r
+jnlp.signing=\r
+jnlp.signing.alias=\r
+jnlp.signing.keystore=\r
+# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed\r
+manifest.custom.codebase=\r
+# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions)\r
+manifest.custom.permissions=\r
+meta.inf.dir=${src.dir}/META-INF\r
+mkdist.disabled=true\r
+platform.active=default_platform\r
+project.license=gpl30\r
+run.classpath=\\r
+    ${javac.classpath}:\\r
+    ${build.classes.dir}\r
+# Space-separated list of JVM arguments used when running the project.\r
+# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.\r
+# To set system properties for unit tests define test-sys-prop.name=value:\r
+run.jvmargs=\r
+run.test.classpath=\\r
+    ${javac.test.classpath}:\\r
+    ${build.test.classes.dir}\r
+source.encoding=UTF-8\r
+source.reference.jcontacts-core.jar=../jcontacts-core/src/\r
+source.reference.jcore.jar=../jcore/src/\r
+source.reference.jcoreee.jar=../jcoreee/src/\r
+source.reference.jcustomer-core.jar=../jcustomer-core/src/\r
+src.dir=src\r
+test.src.dir=test\r

diff --git a/src/org/mxchange/jcustomercore/model/customer/AdminCustomerSessionBeanRemote.java b/src/org/mxchange/jcustomercore/model/customer/AdminCustomerSessionBeanRemote.java
index e2fca5e397ed358d9f6df030b3a528cf1b0dcadb..fe0e894546f3f864a00449f626779186ce4bc05b 100644 (file)
--- a/src/org/mxchange/jcustomercore/model/customer/AdminCustomerSessionBeanRemote.java
+++ b/src/org/mxchange/jcustomercore/model/customer/AdminCustomerSessionBeanRemote.java
@@ -19,6 +19,7 @@ package org.mxchange.jcustomercore.model.customer;
 import java.io.Serializable;
 import java.util.List;
 import javax.ejb.Remote;
+import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException;
 import org.mxchange.jcustomercore.exceptions.CustomerAlreadyRegisteredException;
 
 /**
@@ -48,8 +49,10 @@ public interface AdminCustomerSessionBeanRemote extends Serializable {
         * @throws
         * org.mxchange.jcustomercore.exceptions.CustomerAlreadyRegisteredException
         * If the customer is already registered.
+        * @throws org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException If
+        * the given contact data is already added.
         */
-       Customer addCustomer (final Customer customer) throws CustomerAlreadyRegisteredException;
+       Customer addCustomer (final Customer customer) throws CustomerAlreadyRegisteredException, ContactAlreadyAddedException;
 
        /**
         * Creates a new (free) customer number.