From: Roland Haeder Date: Mon, 5 Oct 2015 13:08:02 +0000 (+0200) Subject: added juser-core + fixed imports X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8689df33f34a54e438c96b5ad7cbb16081e2af3d;p=addressbook-war.git added juser-core + fixed imports Signed-off-by:Roland Häder --- diff --git a/lib/juser-core.jar b/lib/juser-core.jar new file mode 100644 index 00000000..abc8000f Binary files /dev/null and b/lib/juser-core.jar differ diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 0823cda1..8402cfa9 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -1036,6 +1036,7 @@ exists or setup the property manually. For example like this: + @@ -1049,6 +1050,7 @@ exists or setup the property manually. For example like this: + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index f9b11ae5..43c3cbb0 100644 --- 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 84bb6385..078ff5b7 100644 --- 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 97607b30..772b66c3 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -30,6 +30,10 @@ ${file.reference.jcontacts-lib.jar} WEB-INF/lib + + ${file.reference.juser-core.jar} + WEB-INF/lib + ${reference.addressbook-lib.jar} WEB-INF/lib diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java index f79582b0..4e7b24a3 100644 --- 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 deed6be4..0dcf0429 100644 --- 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 *

- * @return A Customer instance + * @return A user instance */ - public User createCustomerInstance (); + public User createUserInstance (); /** * Cellphone number