From 7cce5b421ddba1faf3c88d6d5ddf2571ade9331e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 20 Apr 2016 16:45:09 +0200 Subject: [PATCH] Continued a bit: - moved all admin controllers from session-scope to request-scope - renamed them, too MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- nbproject/faces-config.NavData | 90 +++++++++---------- .../PizzaAdminContactWebRequestBean.java | 2 +- ...PizzaAdminContactWebRequestController.java | 2 +- .../contact/PizzaContactWebSessionBean.java | 2 +- .../PizzaContactWebSessionController.java | 2 +- ...a => PizzaAdminCountryWebRequestBean.java} | 8 +- ...izzaAdminCountryWebRequestController.java} | 2 +- .../helper/PizzaAdminWebRequestHelper.java | 6 +- ...PizzaAdminContactPhoneWebRequestBean.java} | 8 +- ...dminContactPhoneWebRequestController.java} | 2 +- .../PizzaUserRegisterWebSessionBean.java | 2 +- ...java => PizzaAdminUserWebRequestBean.java} | 10 +-- ...> PizzaAdminUserWebRequestController.java} | 2 +- .../beans/user/PizzaUserWebSessionBean.java | 2 +- 14 files changed, 70 insertions(+), 70 deletions(-) rename src/java/org/mxchange/{jratecalc => pizzaapplication}/beans/contact/PizzaAdminContactWebRequestBean.java (99%) rename src/java/org/mxchange/{jratecalc => pizzaapplication}/beans/contact/PizzaAdminContactWebRequestController.java (99%) rename src/java/org/mxchange/{jratecalc => pizzaapplication}/beans/contact/PizzaContactWebSessionBean.java (99%) rename src/java/org/mxchange/{jratecalc => pizzaapplication}/beans/contact/PizzaContactWebSessionController.java (99%) rename src/java/org/mxchange/pizzaapplication/beans/country/{PizzaAdminCountryWebApplicationBean.java => PizzaAdminCountryWebRequestBean.java} (96%) rename src/java/org/mxchange/pizzaapplication/beans/country/{PizzaAdminCountryWebApplicationController.java => PizzaAdminCountryWebRequestController.java} (97%) rename src/java/org/mxchange/pizzaapplication/beans/phone/{PizzaAdminContactPhoneWebSessionBean.java => PizzaAdminContactPhoneWebRequestBean.java} (94%) rename src/java/org/mxchange/pizzaapplication/beans/phone/{PizzaAdminContactPhoneWebSessionController.java => PizzaAdminContactPhoneWebRequestController.java} (97%) rename src/java/org/mxchange/pizzaapplication/beans/user/{PizzaAdminUserWebSessionBean.java => PizzaAdminUserWebRequestBean.java} (96%) rename src/java/org/mxchange/pizzaapplication/beans/user/{PizzaAdminUserWebSessionController.java => PizzaAdminUserWebRequestController.java} (97%) diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index ab2141a7..baa26860 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,51 +2,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/org/mxchange/jratecalc/beans/contact/PizzaAdminContactWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java similarity index 99% rename from src/java/org/mxchange/jratecalc/beans/contact/PizzaAdminContactWebRequestBean.java rename to src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java index 786c84e0..798afbef 100644 --- a/src/java/org/mxchange/jratecalc/beans/contact/PizzaAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.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.jratecalc.beans.contact; +package org.mxchange.pizzaapplication.beans.contact; import java.text.MessageFormat; import java.util.Date; diff --git a/src/java/org/mxchange/jratecalc/beans/contact/PizzaAdminContactWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java similarity index 99% rename from src/java/org/mxchange/jratecalc/beans/contact/PizzaAdminContactWebRequestController.java rename to src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java index d6d6fbd2..0e8e7668 100644 --- a/src/java/org/mxchange/jratecalc/beans/contact/PizzaAdminContactWebRequestController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.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.jratecalc.beans.contact; +package org.mxchange.pizzaapplication.beans.contact; import java.io.Serializable; import java.util.Date; diff --git a/src/java/org/mxchange/jratecalc/beans/contact/PizzaContactWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java similarity index 99% rename from src/java/org/mxchange/jratecalc/beans/contact/PizzaContactWebSessionBean.java rename to src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java index ed14a2c2..94d397f1 100644 --- a/src/java/org/mxchange/jratecalc/beans/contact/PizzaContactWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.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.jratecalc.beans.contact; +package org.mxchange.pizzaapplication.beans.contact; import java.text.MessageFormat; import java.util.Date; diff --git a/src/java/org/mxchange/jratecalc/beans/contact/PizzaContactWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java similarity index 99% rename from src/java/org/mxchange/jratecalc/beans/contact/PizzaContactWebSessionController.java rename to src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java index 2de56865..44aa596f 100644 --- a/src/java/org/mxchange/jratecalc/beans/contact/PizzaContactWebSessionController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.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.jratecalc.beans.contact; +package org.mxchange.pizzaapplication.beans.contact; import java.io.Serializable; import java.util.Date; diff --git a/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebApplicationBean.java b/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebRequestBean.java similarity index 96% rename from src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebApplicationBean.java rename to src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebRequestBean.java index c14d4a5c..1fef7df6 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebApplicationBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebRequestBean.java @@ -19,7 +19,7 @@ package org.mxchange.pizzaapplication.beans.country; import java.util.Iterator; import java.util.List; import java.util.Objects; -import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Event; import javax.enterprise.inject.Any; import javax.faces.view.facelets.FaceletException; @@ -41,8 +41,8 @@ import org.mxchange.jcountry.exceptions.CountryAlreadyAddedException; * @author Roland Haeder */ @Named ("adminCountryController") -@ApplicationScoped -public class PizzaAdminCountryWebApplicationBean implements PizzaAdminCountryWebApplicationController { +@RequestScoped +public class PizzaAdminCountryWebRequestBean implements PizzaAdminCountryWebRequestController { /** * Serial number @@ -100,7 +100,7 @@ public class PizzaAdminCountryWebApplicationBean implements PizzaAdminCountryWeb /** * Default constructor */ - public PizzaAdminCountryWebApplicationBean () { + public PizzaAdminCountryWebRequestBean () { // Try this try { // Get initial context diff --git a/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebApplicationController.java b/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebRequestController.java similarity index 97% rename from src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebApplicationController.java rename to src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebRequestController.java index 40b581ea..64222449 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebApplicationController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebRequestController.java @@ -25,7 +25,7 @@ import org.mxchange.jcountry.data.Country; *

* @author Roland Haeder */ -public interface PizzaAdminCountryWebApplicationController extends Serializable { +public interface PizzaAdminCountryWebRequestController extends Serializable { /** * A list of all countries diff --git a/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaAdminWebRequestHelper.java b/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaAdminWebRequestHelper.java index b30ee67d..fe347eea 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaAdminWebRequestHelper.java +++ b/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaAdminWebRequestHelper.java @@ -21,9 +21,9 @@ import javax.enterprise.context.RequestScoped; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jratecalc.beans.contact.PizzaAdminContactWebRequestController; +import org.mxchange.pizzaapplication.beans.contact.PizzaAdminContactWebRequestController; import org.mxchange.jusercore.model.user.User; -import org.mxchange.pizzaapplication.beans.user.PizzaAdminUserWebSessionController; +import org.mxchange.pizzaapplication.beans.user.PizzaAdminUserWebRequestController; /** * A general helper for beans @@ -49,7 +49,7 @@ public class PizzaAdminWebRequestHelper implements PizzaAdminWebRequestControlle * Admin user controller */ @Inject - private PizzaAdminUserWebSessionController adminUserController; + private PizzaAdminUserWebRequestController adminUserController; /** * User instance diff --git a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebRequestBean.java similarity index 94% rename from src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebSessionBean.java rename to src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebRequestBean.java index 5928351b..f289ca94 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebRequestBean.java @@ -19,7 +19,7 @@ package org.mxchange.pizzaapplication.beans.phone; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.enterprise.context.SessionScoped; +import javax.enterprise.context.RequestScoped; import javax.faces.view.facelets.FaceletException; import javax.inject.Named; import javax.naming.Context; @@ -37,8 +37,8 @@ import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; * @author Roland Haeder */ @Named ("adminContactPhoneController") -@SessionScoped -public class PizzaAdminContactPhoneWebSessionBean implements PizzaAdminContactPhoneWebSessionController { +@RequestScoped +public class PizzaAdminContactPhoneWebRequestBean implements PizzaAdminContactPhoneWebRequestController { /** * Serial number @@ -79,7 +79,7 @@ public class PizzaAdminContactPhoneWebSessionBean implements PizzaAdminContactPh /** * Default constructor */ - public PizzaAdminContactPhoneWebSessionBean () { + public PizzaAdminContactPhoneWebRequestBean () { // Try it try { // Get initial context diff --git a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebRequestController.java similarity index 97% rename from src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebSessionController.java rename to src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebRequestController.java index 97321ad7..400e97d3 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebSessionController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebRequestController.java @@ -29,7 +29,7 @@ import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; *

* @author Roland Haeder */ -public interface PizzaAdminContactPhoneWebSessionController extends Serializable { +public interface PizzaAdminContactPhoneWebRequestController extends Serializable { /** * Getter for all contacts having current cellphone instance linked diff --git a/src/java/org/mxchange/pizzaapplication/beans/register/PizzaUserRegisterWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/register/PizzaUserRegisterWebSessionBean.java index 1eb3e905..2b339ea8 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/register/PizzaUserRegisterWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/register/PizzaUserRegisterWebSessionBean.java @@ -26,7 +26,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jratecalc.beans.contact.PizzaContactWebSessionController; +import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebSessionController; import org.mxchange.jusercore.events.registration.RegisteredUserEvent; import org.mxchange.jusercore.events.registration.UserRegisteredEvent; import org.mxchange.jusercore.exceptions.DataRepeatMismatchException; diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java similarity index 96% rename from src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebSessionBean.java rename to src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java index 61f5f5d0..7f11e8b8 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java @@ -22,7 +22,7 @@ import java.util.Iterator; import java.util.List; import java.util.Objects; import javax.annotation.PostConstruct; -import javax.enterprise.context.SessionScoped; +import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Event; import javax.enterprise.inject.Any; import javax.faces.view.facelets.FaceletException; @@ -32,7 +32,7 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jratecalc.beans.contact.PizzaContactWebSessionController; +import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebSessionController; import org.mxchange.jusercore.events.user.AdminAddedUserEvent; import org.mxchange.jusercore.events.user.AdminUserAddedEvent; import org.mxchange.jusercore.exceptions.EmailAddressAlreadyRegisteredException; @@ -52,8 +52,8 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus; * @author Roland Haeder */ @Named ("adminUserController") -@SessionScoped -public class PizzaAdminUserWebSessionBean implements PizzaAdminUserWebSessionController { +@RequestScoped +public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestController { /** * Serial number @@ -107,7 +107,7 @@ public class PizzaAdminUserWebSessionBean implements PizzaAdminUserWebSessionCon /** * Default constructor */ - public PizzaAdminUserWebSessionBean () { + public PizzaAdminUserWebRequestBean () { // Try it try { // Get initial context diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestController.java similarity index 97% rename from src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebSessionController.java rename to src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestController.java index 15edff03..7a64e7b4 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebSessionController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestController.java @@ -26,7 +26,7 @@ import org.mxchange.jusercore.model.user.User; *

* @author Roland Haeder */ -public interface PizzaAdminUserWebSessionController extends Serializable { +public interface PizzaAdminUserWebRequestController extends Serializable { /** * Tries to lookup user by given id number. If the user is not found or the diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java index f1818294..e8f06a21 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java @@ -42,7 +42,7 @@ import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; import org.mxchange.pizzaapplication.beans.login.PizzaUserLoginWebSessionController; -import org.mxchange.jratecalc.beans.contact.PizzaContactWebSessionController; +import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebSessionController; import org.mxchange.jusercore.exceptions.UserPasswordMismatchException; /** -- 2.39.5