added juser-core + fixed imports

Signed-off-by:Roland Häder <roland@mxchange.org>

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

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 0823cda1d39467de1ba8ef56c7b9e327a78e7bfb..8402cfa91dcbee42a45f09425361f3e80492b964 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -1036,6 +1036,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcontacts-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcontacts-business-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcontacts-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.juser-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.addressbook-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.cdi-api.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.gf-client.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
@@ -1049,6 +1050,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcontacts-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jcontacts-business-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jcontacts-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.juser-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${reference.addressbook-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.gf-client.jar}" todir="${build.web.dir}/WEB-INF/lib"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index f9b11ae5d39b54d8a6ccbb69d3421e07eec345f7..43c3cbb0ab75682bf80117ef93d78a024353dce5 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=8c263e2e
+build.xml.data.CRC32=625e5111
 build.xml.script.CRC32=be5f34f7
 build.xml.stylesheet.CRC32=651128d4@1.68.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=8c263e2e
-nbproject/build-impl.xml.script.CRC32=51a78ef4
+nbproject/build-impl.xml.data.CRC32=625e5111
+nbproject/build-impl.xml.script.CRC32=fb1e7256
 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 84bb6385e7fe19f665d4c8e946d6c722164fe469..078ff5b7b5edc8a1be17cd59c3b13fed6312b463 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -43,6 +43,7 @@ file.reference.jcontacts-lib.jar=lib\\jcontacts-lib.jar
 file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar
 file.reference.jcore.jar=lib/jcore.jar
 file.reference.jcoreee.jar=lib/jcoreee.jar
+file.reference.juser-core.jar=lib/juser-core.jar
 includes=**
 j2ee.compile.on.save=true
 j2ee.copy.static.files.on.save=true
@@ -63,6 +64,7 @@ javac.classpath=\
     ${file.reference.jcontacts-core.jar}:\
     ${file.reference.jcontacts-business-core.jar}:\
     ${file.reference.jcontacts-lib.jar}:\
+    ${file.reference.juser-core.jar}:\
     ${reference.addressbook-lib.jar}:\
     ${file.reference.cdi-api.jar}:\
     ${file.reference.gf-client.jar}
@@ -111,6 +113,7 @@ source.reference.jcontacts-lib.jar=../jcontacts-lib/src/
 source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/
 source.reference.jcore.jar=../jcore/src/
 source.reference.jcoreee.jar=../jcoreee/src/
+source.reference.juser-core.jar=../juser-core/src/
 source.root=src
 src.dir=${source.root}/java
 test.src.dir=test

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 97607b30e3ea98a70b05bf0e505e2861c48586b1..772b66c39ba6a305d84044f1f879a785eec8bceb 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -30,6 +30,10 @@
                     <file>${file.reference.jcontacts-lib.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library dirs="200">
+                    <file>${file.reference.juser-core.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
                 <library dirs="200">
                     <file>${reference.addressbook-lib.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>

diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java
index f79582b04e4b52af390fc7797dda26ebee9f967c..4e7b24a30315fa1cb5cc44595a32b202ed8d926f 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java
+++ b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java
@@ -25,6 +25,8 @@ import javax.naming.NamingException;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.contact.UserContact;
 import org.mxchange.jcontacts.contact.gender.Gender;
+import org.mxchange.jusercore.model.user.LoginUser;
+import org.mxchange.jusercore.model.user.User;
 
 /**
  * A user bean (controller)
@@ -137,15 +139,15 @@ public class UserWebBean implements UserWebController {
        }
 
        @Override
-       public User createCustomerInstance () {
+       public User createUserInstance () {
                // User message
-               //this.getLogger().logTrace("createInstance: CALLED!");
+               //this.getLogger().logTrace("createUserInstance: CALLED!");
 
                // Required personal data must be set
                assert (this.isRequiredPersonalDataSet()) : "not all personal data is set"; //NOI18N
 
                // Create new user instance
-               User user = new AddressbookUser();
+               User user = new LoginUser();
 
                // Create new contact
                Contact contact = new UserContact(this.getGender(), this.getFirstName(), this.getFamilyName(), this.getCompanyName());
@@ -161,7 +163,7 @@ public class UserWebBean implements UserWebController {
                user.setContact(contact);
 
                // Trace message
-               //this.getLogger().logTrace(MessageFormat.format("createInstance: user={0} - EXIT!", user));
+               //this.getLogger().logTrace(MessageFormat.format("createUserInstance: user={0} - EXIT!", user));
                // Return it
                return user;
        }

diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebController.java b/src/java/org/mxchange/addressbook/beans/user/UserWebController.java
index deed6be4c8652dcabff63a4bb560ed915b7e5833..0dcf04297e2ed4839861211493ee04dd9e80d2c0 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/user/UserWebController.java
+++ b/src/java/org/mxchange/addressbook/beans/user/UserWebController.java
@@ -18,6 +18,7 @@ package org.mxchange.addressbook.beans.user;
 
 import java.io.Serializable;
 import org.mxchange.jcontacts.contact.gender.Gender;
+import org.mxchange.jusercore.model.user.User;
 
 /**
  * An interface for user beans
@@ -29,9 +30,9 @@ public interface UserWebController extends Serializable {
        /**
         * Creates an instance from all properties
         * <p>
-        * @return A Customer instance
+        * @return A user instance
         */
-       public User createCustomerInstance ();
+       public User createUserInstance ();
 
        /**
         * Cellphone number