From f17df39ac2ed10aef754877337608aadc2e61db4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 12 Jul 2017 21:13:56 +0200 Subject: [PATCH] Please cherry-pick: - imported new location (package) of classes/interfaces - moved EJBs to proper locations MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../model/user/JobsAdminUserSessionBean.java | 4 +--- .../model/user/JobsUserSessionBean.java | 2 +- .../JobsUserEmailChangeSessionBean.java | 4 ++-- .../user/login/JobsUserLoginSessionBean.java | 18 +++++++++--------- .../JobsUserRegistrationSessionBean.java | 8 ++++---- .../resendlink/JobsResendLinkSessionBean.java | 8 ++++---- 6 files changed, 21 insertions(+), 23 deletions(-) rename src/java/org/mxchange/{jusercore => juserlogincore}/model/user/login/JobsUserLoginSessionBean.java (89%) rename src/java/org/mxchange/{jusercore => juserlogincore}/model/user/register/JobsUserRegistrationSessionBean.java (96%) rename src/java/org/mxchange/{jusercore => juserlogincore}/model/user/resendlink/JobsResendLinkSessionBean.java (93%) diff --git a/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java index 29bf99d..badd9a1 100644 --- a/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java @@ -28,8 +28,8 @@ import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.exceptions.UserStatusConfirmedException; import org.mxchange.jusercore.exceptions.UserStatusLockedException; import org.mxchange.jusercore.exceptions.UserStatusUnconfirmedException; -import org.mxchange.jusercore.model.user.register.UserRegistrationSessionBeanRemote; import org.mxchange.jusercore.model.user.status.UserAccountStatus; +import org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBeanRemote; /** * An administrative user EJB @@ -262,7 +262,6 @@ public class JobsAdminUserSessionBean extends BaseJobsDatabaseBean implements Ad User updatedUser = this.userBean.updateUserData(user); // @TODO Create user lock history entry - // Send out email // @TODO externalize subject line this.sendEmail("User account locked", "user_account_locked", updatedUser, baseUrl, null); //NOI18N @@ -322,7 +321,6 @@ public class JobsAdminUserSessionBean extends BaseJobsDatabaseBean implements Ad User updatedUser = this.userBean.updateUserData(user); // @TODO Create user lock history entry - // Send out email // @TODO externalize subject line this.sendEmail("User account unlocked", "user_account_unlocked", updatedUser, baseUrl, null); //NOI18N diff --git a/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java index 4eb4753..085ff50 100644 --- a/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java @@ -41,8 +41,8 @@ import org.mxchange.jusercore.exceptions.UserStatusUnconfirmedException; import org.mxchange.jusercore.model.user.password_history.PasswordHistory; import org.mxchange.jusercore.model.user.password_history.UserPasswordHistory; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; -import org.mxchange.jusercore.model.user.register.UserRegistrationSessionBeanRemote; import org.mxchange.jusercore.model.user.status.UserAccountStatus; +import org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBeanRemote; /** * A user EJB diff --git a/src/java/org/mxchange/jusercore/model/user/email_address/JobsUserEmailChangeSessionBean.java b/src/java/org/mxchange/jusercore/model/user/email_address/JobsUserEmailChangeSessionBean.java index cefd8a3..a051599 100644 --- a/src/java/org/mxchange/jusercore/model/user/email_address/JobsUserEmailChangeSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/email_address/JobsUserEmailChangeSessionBean.java @@ -28,7 +28,7 @@ import org.mxchange.jjobs.database.BaseJobsDatabaseBean; import org.mxchange.jusercore.model.email_address.ChangeableEmailAddress; import org.mxchange.jusercore.model.email_address.EmailAddressChange; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; -import org.mxchange.jusercore.model.user.UserUtils; +import org.mxchange.juserlogincore.login.UserLoginUtils; /** * A session-scoped bean for changing email addresses @@ -209,7 +209,7 @@ public class JobsUserEmailChangeSessionBean extends BaseJobsDatabaseBean impleme // Search for free hash while (isUsed) { // Generate hash, there is already in UserUtils a nice method that can be used for this purpose. - hash = UserUtils.encryptPassword(String.format("%s:%s", emailAddressChange.getEmailAddress(), emailAddressChange.toString())); //NOI18N + hash = UserLoginUtils.encryptPassword(String.format("%s:%s", emailAddressChange.getEmailAddress(), emailAddressChange.toString())); //NOI18N // The hash *may* be unique, better test it Query query = this.getEntityManager().createNamedQuery("SearchEmailChangeByHash", EmailAddressChange.class); //NOI18N diff --git a/src/java/org/mxchange/jusercore/model/user/login/JobsUserLoginSessionBean.java b/src/java/org/mxchange/juserlogincore/model/user/login/JobsUserLoginSessionBean.java similarity index 89% rename from src/java/org/mxchange/jusercore/model/user/login/JobsUserLoginSessionBean.java rename to src/java/org/mxchange/juserlogincore/model/user/login/JobsUserLoginSessionBean.java index 6bc3181..292424b 100644 --- a/src/java/org/mxchange/jusercore/model/user/login/JobsUserLoginSessionBean.java +++ b/src/java/org/mxchange/juserlogincore/model/user/login/JobsUserLoginSessionBean.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jusercore.model.user.login; +package org.mxchange.juserlogincore.model.user.login; import java.text.MessageFormat; import javax.ejb.EJB; import javax.ejb.Stateless; import org.mxchange.jjobs.database.BaseJobsDatabaseBean; -import org.mxchange.jusercore.container.login.LoginContainer; import org.mxchange.jusercore.exceptions.UserNotFoundException; -import org.mxchange.jusercore.exceptions.UserPasswordMismatchException; import org.mxchange.jusercore.exceptions.UserStatusLockedException; import org.mxchange.jusercore.exceptions.UserStatusUnconfirmedException; -import org.mxchange.jusercore.model.login.user.UserLoginSessionBeanRemote; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; -import org.mxchange.jusercore.model.user.UserUtils; -import org.mxchange.jusercore.model.user.register.UserRegistrationSessionBeanRemote; import org.mxchange.jusercore.model.user.status.UserAccountStatus; +import org.mxchange.juserlogincore.container.login.LoginContainer; +import org.mxchange.juserlogincore.exceptions.UserPasswordMismatchException; +import org.mxchange.juserlogincore.login.UserLoginUtils; +import org.mxchange.juserlogincore.model.login.user.UserLoginSessionBeanRemote; +import org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBeanRemote; /** * A session EJB for user logins @@ -125,8 +125,8 @@ public class JobsUserLoginSessionBean extends BaseJobsDatabaseBean implements Us * not match, the first one is the one from the calling bean/controller, the * second is the from database. *

- * @param container Container instance holding the user instance and - * clear-text password + * @param container Container instance holding the user instance and + * clear-text password * @param updatedUser Updated user instance found for given user name *

* @return Whether the password matches @@ -145,7 +145,7 @@ public class JobsUserLoginSessionBean extends BaseJobsDatabaseBean implements Us } // Is it the same same password? - return UserUtils.ifPasswordMatches(container, updatedUser); + return UserLoginUtils.ifPasswordMatches(container, updatedUser); } } diff --git a/src/java/org/mxchange/jusercore/model/user/register/JobsUserRegistrationSessionBean.java b/src/java/org/mxchange/juserlogincore/model/user/register/JobsUserRegistrationSessionBean.java similarity index 96% rename from src/java/org/mxchange/jusercore/model/user/register/JobsUserRegistrationSessionBean.java rename to src/java/org/mxchange/juserlogincore/model/user/register/JobsUserRegistrationSessionBean.java index 0408d16..86abaff 100644 --- a/src/java/org/mxchange/jusercore/model/user/register/JobsUserRegistrationSessionBean.java +++ b/src/java/org/mxchange/juserlogincore/model/user/register/JobsUserRegistrationSessionBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jusercore.model.user.register; +package org.mxchange.juserlogincore.model.user.register; import java.text.MessageFormat; import java.util.Objects; @@ -30,7 +30,7 @@ import org.mxchange.jusercore.model.user.AdminUserSessionBeanRemote; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; -import org.mxchange.jusercore.model.user.UserUtils; +import org.mxchange.juserlogincore.login.UserLoginUtils; /** * A session-scoped bean for user registration @@ -62,7 +62,7 @@ public class JobsUserRegistrationSessionBean extends BaseJobsDatabaseBean implem */ public JobsUserRegistrationSessionBean () { // Call super constructor - super("jms/jjobs-queue-factory", "jms/jjobs-email-queue"); //NOI18N + super("jms/addressbook-queue-factory", "jms/addressbook-email-queue"); //NOI18N } @Override @@ -85,7 +85,7 @@ public class JobsUserRegistrationSessionBean extends BaseJobsDatabaseBean implem // Find a free one while (confirmationKey == null) { // Create new one - String key = UserUtils.generatedConfirmationKey(user); + String key = UserLoginUtils.generatedConfirmationKey(user); // Set key as parameter query.setParameter("confirmKey", key); //NOI18N diff --git a/src/java/org/mxchange/jusercore/model/user/resendlink/JobsResendLinkSessionBean.java b/src/java/org/mxchange/juserlogincore/model/user/resendlink/JobsResendLinkSessionBean.java similarity index 93% rename from src/java/org/mxchange/jusercore/model/user/resendlink/JobsResendLinkSessionBean.java rename to src/java/org/mxchange/juserlogincore/model/user/resendlink/JobsResendLinkSessionBean.java index 8f9836c..a78749b 100644 --- a/src/java/org/mxchange/jusercore/model/user/resendlink/JobsResendLinkSessionBean.java +++ b/src/java/org/mxchange/juserlogincore/model/user/resendlink/JobsResendLinkSessionBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jusercore.model.user.resendlink; +package org.mxchange.juserlogincore.model.user.resendlink; import java.text.MessageFormat; import java.util.Locale; @@ -27,8 +27,8 @@ import org.mxchange.jusercore.exceptions.UserStatusLockedException; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; -import org.mxchange.jusercore.model.user.register.UserRegistrationSessionBeanRemote; import org.mxchange.jusercore.model.user.status.UserAccountStatus; +import org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBeanRemote; /** * A session-based EJB for resending confirmation links @@ -60,7 +60,7 @@ public class JobsResendLinkSessionBean extends BaseJobsDatabaseBean implements R */ public JobsResendLinkSessionBean () { // Call super constructor - super("jms/jjobs-queue-factory", "jms/jjobs-email-queue"); //NOI18N + super("jms/addressbook-queue-factory", "jms/addressbook-email-queue"); //NOI18N } @Override @@ -109,7 +109,7 @@ public class JobsResendLinkSessionBean extends BaseJobsDatabaseBean implements R // Send email // @TODO: Internationlize the subject line somehow - this.sendEmail("Resend user confirmation link", "user_resend_confirmation_link", managedUser, baseUrl, null); //NOI18N + this.sendEmail("Resend user confirmation link", "user_resend_confirmation_link", managedUser, baseUrl, null); //NOI18N // Log trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.resendConfirmationLink: managedUser={1} - EXIT!", this.getClass().getSimpleName(), managedUser)); //NOI18N -- 2.39.5