Continued with administrative customer bean:

- added request-scoped administrative customer bean
- minor: better wording
- updated navigation data file

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index e97c6287f8179bbde534c294ec3cd6e2c6d6412d..826374fe415e50deeb0246e2da7b5311e1bfc0b0 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,62 +2,62 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/customer/admin_customer_delete.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="customer/checkout2.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="admin/user/admin_customer_show.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="privacy.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="400" y="1350" zoom="true"/>
-        <Node id="admin/index.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="customer/register.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="item_added.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="admin/category/admin_category_list.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="customer/lost_passwd.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="index.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="customer/checkout_done.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="admin/user/admin_customer_edit.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="customer/login.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="*" x="1150" y="750" zoom="true"/>
-        <Node id="admin/customer/admin_customer_unlock.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="admin/product/admin_product_edit.xhtml" x="150" y="1500" zoom="true"/>
+        <Node id="admin/customer/admin_customer_delete.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="customer/checkout2.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="admin/user/admin_customer_show.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="650" y="1200" zoom="true"/>
+        <Node id="privacy.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="admin/index.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="customer/register.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="admin/category/admin_category_list.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="item_added.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="customer/lost_passwd.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="index.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="customer/checkout_done.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/user/admin_customer_edit.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="*" x="2150" y="300" zoom="true"/>
+        <Node id="customer/login.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="admin/customer/admin_customer_unlock.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="150" y="1500" zoom="true"/>
+        <Node id="admin/product/admin_product_edit.xhtml" x="1150" y="750" zoom="true"/>
         <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="login/login_contact_data_saved.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="2650" y="150" zoom="true"/>
-        <Node id="admin/customer/admin_customer_edit.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="customer/checkout.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="admin/product/admin_product_delete.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="basket.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="exception.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="650" y="1200" zoom="true"/>
-        <Node id="admin/category/admin_category_delete.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="admin/user/admin_customer_unlock.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="terms.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="login/login_user_data_saved.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="admin/category/admin_category_edit.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="logout.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="imprint.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="admin/user/admin_customer_list.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="admin/user/admin_customer_delete.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="admin/customer/admin_customer_list.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="admin/product/admin_product_list.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="admin/customer/admin_customer_show.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="customer/empty_basket.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="login/login_contact_data_saved.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="admin/customer/admin_customer_edit.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="customer/checkout.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="admin/product/admin_product_delete.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="basket.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="exception.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="400" y="1350" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="2650" y="150" zoom="true"/>
+        <Node id="admin/category/admin_category_delete.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="admin/user/admin_customer_unlock.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="terms.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="login/login_user_data_saved.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="admin/category/admin_category_edit.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="logout.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="imprint.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="admin/user/admin_customer_list.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="admin/user/admin_customer_delete.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="admin/customer/admin_customer_list.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="admin/product/admin_product_list.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="admin/customer/admin_customer_show.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="customer/empty_basket.xhtml" x="1650" y="300" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>

diff --git a/src/java/de/chotime/jratecalc/beans/customer/RateCalcAdminCustomerWebRequestBean.java b/src/java/de/chotime/jratecalc/beans/customer/RateCalcAdminCustomerWebRequestBean.java
new file mode 100644 (file)
index 0000000..ba669e0
--- /dev/null
+++ b/src/java/de/chotime/jratecalc/beans/customer/RateCalcAdminCustomerWebRequestBean.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2016 Cho-Time GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package de.chotime.jratecalc.beans.customer;
+
+import javax.enterprise.context.RequestScoped;
+import javax.faces.view.facelets.FaceletException;
+import javax.inject.Named;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * Administrative customer bean (controller)
+ * <p>
+ * @author Roland Haeder<rhaeder@cho-time.de>
+ */
+@Named ("adminCustomerController")
+@RequestScoped
+public class RateCalcAdminCustomerWebRequestBean implements RateCalcAdminCustomerWebRequestController {
+
+       /**
+        * Serial number
+        */
+       private static final long serialVersionUID = 12_487_062_487_527_913L;
+
+       /**
+        * Default constructor
+        */
+       public RateCalcAdminCustomerWebRequestBean () {
+               // Try it
+               try {
+                       // Get initial context
+                       Context context = new InitialContext();
+
+                       // Try to lookup
+                       //this.userBean = (UserSessionBeanRemote) context.lookup("java:global/jratecalc-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N
+               } catch (final NamingException e) {
+                       // Throw again
+                       throw new FaceletException(e);
+               }
+       }
+
+}

diff --git a/src/java/de/chotime/jratecalc/beans/customer/RateCalcAdminCustomerWebRequestController.java b/src/java/de/chotime/jratecalc/beans/customer/RateCalcAdminCustomerWebRequestController.java
new file mode 100644 (file)
index 0000000..2e3ea8b
--- /dev/null
+++ b/src/java/de/chotime/jratecalc/beans/customer/RateCalcAdminCustomerWebRequestController.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2016 Cho-Time GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package de.chotime.jratecalc.beans.customer;
+
+import java.io.Serializable;
+
+/**
+ * An interface for user beans
+ * <p>
+ * @author Roland Haeder<rhaeder@cho-time.de>
+ */
+public interface RateCalcAdminCustomerWebRequestController extends Serializable {
+
+}

diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java
index 4c6d703f58d29c569e177b6351086ec8a90f3998..30bce3d5ea0ff77d4bcca4b73bb77998288243ab 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java
@@ -43,7 +43,7 @@ import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
 import org.mxchange.pizzaapplication.beans.helper.PizzaAdminWebRequestController;
 
 /**
- * An administrative user bean (controller)
+ * Administrative user bean (controller)
  * <p>
  * @author Roland Haeder<roland@mxchange.org>
  */

diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java
index 8b7f93fabdf7871c6e68cb7cadcf20a45c95c4f3..3ca70436567cca063e7e12eec2192c6691bdd471 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java
@@ -24,7 +24,7 @@ import org.mxchange.jcountry.data.Country;
 import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
 
 /**
- * An administrative interface for user beans
+ * Administrative interface for user beans
  * <p>
  * @author Roland Haeder<roland@mxchange.org>
  */

diff --git a/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebRequestBean.java
index 6dcd7209fa6f70647281a91d515b3c6adaf5c96a..9a1be70068396dae5da21be9f24dbdeb9b0c15d7 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/country/PizzaAdminCountryWebRequestBean.java
@@ -36,7 +36,7 @@ import org.mxchange.jcountry.events.AdminEventCountryAdded;
 import org.mxchange.jcountry.exceptions.CountryAlreadyAddedException;
 
 /**
- * An administrative country bean
+ * Administrative country bean
  * <p>
  * @author Roland Haeder<roland@mxchange.org>
  */

diff --git a/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaAdminWebRequestHelper.java b/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaAdminWebRequestHelper.java
index 41e629e4a6b60069791fa4b3d259b2af0ebfa2b5..284858a4f58f4dc0b0dea57686cca8f984e7e0a7 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaAdminWebRequestHelper.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaAdminWebRequestHelper.java
@@ -16,6 +16,8 @@
  */
 package org.mxchange.pizzaapplication.beans.helper;
 
+import de.chotime.jratecalc.beans.contact.RateCalcAdminContactWebRequestController;
+import de.chotime.jratecalc.beans.user.RateCalcAdminUserWebRequestController;
 import java.text.MessageFormat;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
@@ -26,7 +28,7 @@ import org.mxchange.pizzaapplication.beans.contact.PizzaAdminContactWebRequestCo
 import org.mxchange.pizzaapplication.beans.user.PizzaAdminUserWebRequestController;
 
 /**
- * A general helper for beans
+ * A general helper for administrative beans
  * <p>
  * @author Roland Haeder<roland@mxchange.org>
  */

diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java
index 4c77b0ee50607ddb0673ef2303d35aee3cd9bf89..ec2786a48e902759dc6970d557a267d0e9b75c25 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java
@@ -16,6 +16,8 @@
  */
 package org.mxchange.pizzaapplication.beans.user;
 
+import de.chotime.jratecalc.beans.contact.RateCalcContactWebSessionController;
+import de.chotime.jratecalc.beans.helper.RateCalcAdminWebRequestController;
 import java.text.MessageFormat;
 import java.util.Collections;
 import java.util.Iterator;
@@ -53,7 +55,7 @@ import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebSessionControl
 import org.mxchange.pizzaapplication.beans.helper.PizzaAdminWebRequestController;
 
 /**
- * A user bean (controller)
+ * Administrative user bean (controller)
  * <p>
  * @author Roland Haeder<roland@mxchange.org>
  */