From 95db66e8b9045128b3ec3e5659a6a65d1efc3b42 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 5 Aug 2016 15:10:32 +0200 Subject: [PATCH] Cleanup: (please cherry-pick) - removed general contact bean as this is really not needed in an administrative user bean MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder Signed-off-by: Roland Häder --- .../PizzaUserPasswordWebRequestBean.java} | 16 ++++++++-------- .../PizzaUserPasswordWebRequestController.java} | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) rename src/java/{de/chotime/landingpage/beans/user/password/LandingUserPasswordWebRequestBean.java => org/mxchange/pizzaapplication/beans/user/password/PizzaUserPasswordWebRequestBean.java} (92%) rename src/java/{de/chotime/landingpage/beans/user/password/LandingUserPasswordWebRequestController.java => org/mxchange/pizzaapplication/beans/user/password/PizzaUserPasswordWebRequestController.java} (93%) diff --git a/src/java/de/chotime/landingpage/beans/user/password/LandingUserPasswordWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/password/PizzaUserPasswordWebRequestBean.java similarity index 92% rename from src/java/de/chotime/landingpage/beans/user/password/LandingUserPasswordWebRequestBean.java rename to src/java/org/mxchange/pizzaapplication/beans/user/password/PizzaUserPasswordWebRequestBean.java index fe4c5a91..36aee966 100644 --- a/src/java/de/chotime/landingpage/beans/user/password/LandingUserPasswordWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/password/PizzaUserPasswordWebRequestBean.java @@ -14,11 +14,8 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package de.chotime.landingpage.beans.user.password; +package org.mxchange.pizzaapplication.beans.user.password; -import de.chotime.landingpage.beans.BaseLandingController; -import de.chotime.landingpage.beans.features.LandingFeaturesWebApplicationController; -import de.chotime.landingpage.beans.login.LandingUserLoginWebSessionController; import java.util.Objects; import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Event; @@ -39,6 +36,9 @@ 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.password_history.PasswordHistory; +import org.mxchange.pizzaapplication.beans.BasePizzaController; +import org.mxchange.pizzaapplication.beans.features.PizzaFeaturesWebApplicationController; +import org.mxchange.pizzaapplication.beans.login.PizzaUserLoginWebSessionController; /** * A user password (change) bean (controller) @@ -47,7 +47,7 @@ import org.mxchange.jusercore.model.user.password_history.PasswordHistory; */ @Named ("userPasswordController") @RequestScoped -public class LandingUserPasswordWebRequestBean extends BaseLandingController implements LandingUserPasswordWebRequestController { +public class PizzaUserPasswordWebRequestBean extends BasePizzaController implements PizzaUserPasswordWebRequestController { /** * Serial number @@ -58,7 +58,7 @@ public class LandingUserPasswordWebRequestBean extends BaseLandingController imp * Features controller */ @Inject - private LandingFeaturesWebApplicationController featureController; + private PizzaFeaturesWebApplicationController featureController; /** * Remote user bean @@ -74,7 +74,7 @@ public class LandingUserPasswordWebRequestBean extends BaseLandingController imp * Login bean (controller) */ @Inject - private LandingUserLoginWebSessionController userLoginController; + private PizzaUserLoginWebSessionController userLoginController; /** * User password (unencrypted from web form) @@ -96,7 +96,7 @@ public class LandingUserPasswordWebRequestBean extends BaseLandingController imp /** * Default constructor */ - public LandingUserPasswordWebRequestBean () { + public PizzaUserPasswordWebRequestBean () { // Try it try { // Get initial context diff --git a/src/java/de/chotime/landingpage/beans/user/password/LandingUserPasswordWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/user/password/PizzaUserPasswordWebRequestController.java similarity index 93% rename from src/java/de/chotime/landingpage/beans/user/password/LandingUserPasswordWebRequestController.java rename to src/java/org/mxchange/pizzaapplication/beans/user/password/PizzaUserPasswordWebRequestController.java index a876eab7..6a053874 100644 --- a/src/java/de/chotime/landingpage/beans/user/password/LandingUserPasswordWebRequestController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/password/PizzaUserPasswordWebRequestController.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 de.chotime.landingpage.beans.user.password; +package org.mxchange.pizzaapplication.beans.user.password; import java.io.Serializable; import javax.ejb.Local; @@ -25,7 +25,7 @@ import javax.ejb.Local; * @author Roland Haeder */ @Local -public interface LandingUserPasswordWebRequestController extends Serializable { +public interface PizzaUserPasswordWebRequestController extends Serializable { /** * Getter for unencrypted user password -- 2.39.5