From 8689df33f34a54e438c96b5ad7cbb16081e2af3d Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 5 Oct 2015 15:08:02 +0200 Subject: [PATCH] =?utf8?q?added=20juser-core=20+=20fixed=20imports=20Signe?= =?utf8?q?d-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/juser-core.jar | Bin 0 -> 8881 bytes nbproject/build-impl.xml | 2 ++ nbproject/genfiles.properties | 6 +++--- nbproject/project.properties | 3 +++ nbproject/project.xml | 4 ++++ .../addressbook/beans/user/UserWebBean.java | 10 ++++++---- .../beans/user/UserWebController.java | 5 +++-- 7 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 lib/juser-core.jar diff --git a/lib/juser-core.jar b/lib/juser-core.jar new file mode 100644 index 0000000000000000000000000000000000000000..abc8000f70408b9c5953fe743b439a7380fd3ffc GIT binary patch literal 8881 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 KRQ}FRjs6Y4vN|FF literal 0 HcmV?d00001 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 -- 2.39.5