From 37967ae08ddbf9f8c8f36e9ac50f95b8180c5cb5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 20 May 2016 16:59:40 +0200 Subject: [PATCH] renamed to have project's name in + added missing dependencies juser-core/lib MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- nbproject/project.properties | 8 ++++++-- ...alidator.java => AddressbookUserIdValidator.java} | 12 ++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) rename src/org/mxchange/addressbook/validator/user/{UserIdValidator.java => AddressbookUserIdValidator.java} (92%) diff --git a/nbproject/project.properties b/nbproject/project.properties index 204c33b..d616ac6 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -38,9 +38,11 @@ file.reference.jcontacts-core.jar=lib/jcontacts-core.jar file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar file.reference.jcoreee.jar=lib/jcoreee.jar file.reference.jcountry-core.jar=lib/jcountry-core.jar +file.reference.jcountry-lib.jar=lib\\jcountry-lib.jar file.reference.jphone-core.jar=lib/jphone-core.jar file.reference.juser-core.jar=lib/juser-core.jar file.reference.juser-lib.jar=lib/juser-lib.jar +file.reference.addressbook-core.jar=lib/addressbook-core.jar includes=** jar.archive.disabled=${jnlp.enabled} jar.compress=false @@ -57,8 +59,8 @@ javac.classpath=\ ${file.reference.jaddressbook-core.jar}:\ ${file.reference.jaddressbook-lib.jar}:\ ${file.reference.addressbook-core.jar}:\ - ${libs.javaee-api-7.0.classpath}:\ - ${libs.jpa20-persistence.classpath} + ${file.reference.jcountry-lib.jar}:\ + ${libs.javaee-api-7.0.classpath} # Space-separated list of extra javac options javac.compilerargs=-Xlint:unchecked -Xlint:deprecation javac.deprecation=true @@ -116,8 +118,10 @@ source.reference.jcontacts-core.jar=../jcontacts-core/src/ source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/ source.reference.jcoreee.jar=../jcoreee/src/ source.reference.jcountry-core.jar=../jcountry-core/src/ +source.reference.jcountry-lib.jar=../jcountry-lib/src/ source.reference.jphone-core.jar=../jphone-core/src/ source.reference.juser-core.jar=../juser-core/src/ source.reference.juser-lib.jar=../juser-lib/src/ +source.reference.addressbook-core.jar=../addressbook-core/src/ src.dir=src test.src.dir=test diff --git a/src/org/mxchange/addressbook/validator/user/UserIdValidator.java b/src/org/mxchange/addressbook/validator/user/AddressbookUserIdValidator.java similarity index 92% rename from src/org/mxchange/addressbook/validator/user/UserIdValidator.java rename to src/org/mxchange/addressbook/validator/user/AddressbookUserIdValidator.java index d273aca..1644d61 100644 --- a/src/org/mxchange/addressbook/validator/user/UserIdValidator.java +++ b/src/org/mxchange/addressbook/validator/user/AddressbookUserIdValidator.java @@ -42,7 +42,7 @@ import org.mxchange.jusercore.model.user.UserSessionBeanRemote; * @author Roland Haeder */ @FacesValidator (value = "UserIdValidator") -public class UserIdValidator extends BaseLongValidator implements Validator { +public class AddressbookUserIdValidator extends BaseLongValidator implements Validator { /** * Cached user status @@ -68,7 +68,7 @@ public class UserIdValidator extends BaseLongValidator implements Validator { /** * Initialization of this converter */ - public UserIdValidator () { + public AddressbookUserIdValidator () { // Try to get it try { // Get initial context @@ -78,7 +78,7 @@ public class UserIdValidator extends BaseLongValidator implements Validator { this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N // ... and user controller - this.userBean = (UserSessionBeanRemote) context.lookup("java:global/addressbook-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N + this.userBean = (UserSessionBeanRemote) context.lookup("java:global/jlandingpage-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N @@ -116,7 +116,7 @@ public class UserIdValidator extends BaseLongValidator implements Validator { this.loggerBeanLocal.logDebug(MessageFormat.format("UserIdValidator:afterRegistrationEvent: registeredUser={0}", registeredUser)); //NOI18N // Update cache - UserIdValidator.cachedStatus.add(registeredUser.getUserId()); + AddressbookUserIdValidator.cachedStatus.add(registeredUser.getUserId()); // Trace message this.loggerBeanLocal.logTrace("UserIdValidator:afterRegistrationEvent: EXIT!"); //NOI18N @@ -140,7 +140,7 @@ public class UserIdValidator extends BaseLongValidator implements Validator { Boolean ifUserExists; // Is a map entry there? - if (UserIdValidator.cachedStatus.contains(userId)) { + if (AddressbookUserIdValidator.cachedStatus.contains(userId)) { // Get from cache ifUserExists = Boolean.TRUE; } else { @@ -155,7 +155,7 @@ public class UserIdValidator extends BaseLongValidator implements Validator { } // Add to cache if valid - UserIdValidator.cachedStatus.add(userId); + AddressbookUserIdValidator.cachedStatus.add(userId); // Trace message this.loggerBeanLocal.logTrace("validate: EXIT!"); //NOI18N -- 2.39.5