From 02c40f99c2aa44d7d26014ae15b1ebfcfc3a57ee Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 6 Jul 2017 23:56:04 +0200 Subject: [PATCH] Please cherry-pick: - 'login' is to generic, there are maybe other logins around than just for users only MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../{ => user}/login/PizzaUserLoginSessionBean.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename src/java/org/mxchange/jusercore/model/{ => user}/login/PizzaUserLoginSessionBean.java (93%) diff --git a/src/java/org/mxchange/jusercore/model/login/PizzaUserLoginSessionBean.java b/src/java/org/mxchange/jusercore/model/user/login/PizzaUserLoginSessionBean.java similarity index 93% rename from src/java/org/mxchange/jusercore/model/login/PizzaUserLoginSessionBean.java rename to src/java/org/mxchange/jusercore/model/user/login/PizzaUserLoginSessionBean.java index 89c87a6..98180bb 100644 --- a/src/java/org/mxchange/jusercore/model/login/PizzaUserLoginSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/login/PizzaUserLoginSessionBean.java @@ -14,9 +14,8 @@ * 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.login; +package org.mxchange.jusercore.model.user.login; -import org.mxchange.jusercore.model.login.user.UserLoginSessionBeanRemote; import java.text.MessageFormat; import javax.ejb.EJB; import javax.ejb.Stateless; @@ -25,10 +24,11 @@ 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.user.register.UserRegistrationSessionBeanRemote; +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.pizzaaplication.database.BasePizzaDatabaseBean; @@ -37,7 +37,7 @@ import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; *

* @author Roland Häder */ -@Stateless (name = "login", description = "A bean handling the user login") +@Stateless (name = "userLogin", description = "A bean handling the user login for Financials project") public class PizzaUserLoginSessionBean extends BasePizzaDatabaseBean implements UserLoginSessionBeanRemote { /** @@ -71,8 +71,8 @@ public class PizzaUserLoginSessionBean extends BasePizzaDatabaseBean implements this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.loginUser: container={1} - CALLED!", this.getClass().getSimpleName(), container)); //NOI18N // Check some beans - assert(this.userBean instanceof UserSessionBeanRemote) : "this.userBean is not set"; //NOI18N - assert(this.registerBean instanceof UserRegistrationSessionBeanRemote) : "this.registerBean is not set"; //NOI18N + assert (this.userBean instanceof UserSessionBeanRemote) : "this.userBean is not set"; //NOI18N + assert (this.registerBean instanceof UserRegistrationSessionBeanRemote) : "this.registerBean is not set"; //NOI18N // user should not be null if (null == container) { -- 2.39.5