From 42422ce2e2b62347eefc1617076047e07cbdcc61 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 --- ...ationBean.java => JobsAdminCountryWebRequestBean.java} | 8 ++++---- ...ler.java => JobsAdminCountryWebRequestController.java} | 2 +- .../jjobs/beans/helper/JobsAdminWebRequestHelper.java | 2 +- .../beans/phone/JobsAdminContactPhoneWebSessionBean.java | 4 ++-- .../jjobs/beans/user/JobsAdminUserWebRequestBean.java | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename src/java/org/mxchange/jjobs/beans/country/{JobsAdminCountryWebApplicationBean.java => JobsAdminCountryWebRequestBean.java} (96%) rename src/java/org/mxchange/jjobs/beans/country/{JobsAdminCountryWebApplicationController.java => JobsAdminCountryWebRequestController.java} (97%) diff --git a/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java similarity index 96% rename from src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebApplicationBean.java rename to src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java index c6f4f684..eed8f3b2 100644 --- a/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebApplicationBean.java +++ b/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java @@ -19,7 +19,7 @@ package org.mxchange.jjobs.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 JobsAdminCountryWebApplicationBean implements JobsAdminCountryWebApplicationController { +@RequestScoped +public class JobsAdminCountryWebRequestBean implements JobsAdminCountryWebRequestController { /** * Serial number @@ -100,7 +100,7 @@ public class JobsAdminCountryWebApplicationBean implements JobsAdminCountryWebAp /** * Default constructor */ - public JobsAdminCountryWebApplicationBean () { + public JobsAdminCountryWebRequestBean () { // Try this try { // Get initial context diff --git a/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebApplicationController.java b/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestController.java similarity index 97% rename from src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebApplicationController.java rename to src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestController.java index ad4dc467..f0ab5012 100644 --- a/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebApplicationController.java +++ b/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestController.java @@ -25,7 +25,7 @@ import org.mxchange.jcountry.data.Country; *

* @author Roland Haeder */ -public interface JobsAdminCountryWebApplicationController extends Serializable { +public interface JobsAdminCountryWebRequestController extends Serializable { /** * A list of all countries diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsAdminWebRequestHelper.java b/src/java/org/mxchange/jjobs/beans/helper/JobsAdminWebRequestHelper.java index 4b88e563..37f91756 100644 --- a/src/java/org/mxchange/jjobs/beans/helper/JobsAdminWebRequestHelper.java +++ b/src/java/org/mxchange/jjobs/beans/helper/JobsAdminWebRequestHelper.java @@ -22,8 +22,8 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jjobs.beans.contact.JobsAdminContactWebRequestController; -import org.mxchange.jusercore.model.user.User; import org.mxchange.jjobs.beans.user.JobsAdminUserWebRequestController; +import org.mxchange.jusercore.model.user.User; /** * A general helper for beans diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminContactPhoneWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminContactPhoneWebSessionBean.java index e54617fb..4f4bfe02 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminContactPhoneWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminContactPhoneWebSessionBean.java @@ -19,7 +19,7 @@ package org.mxchange.jjobs.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,7 +37,7 @@ import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; * @author Roland Haeder */ @Named ("adminContactPhoneController") -@SessionScoped +@RequestScoped public class JobsAdminContactPhoneWebSessionBean implements JobsAdminContactPhoneWebSessionController { /** diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java index b58623e1..11363c2c 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.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; @@ -52,7 +52,7 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus; * @author Roland Haeder */ @Named ("adminUserController") -@SessionScoped +@RequestScoped public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestController { /** -- 2.39.5