From df74b3d8a6f2f1402adfbe36d4cc60629adef510 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 31 Oct 2017 20:04:59 +0100 Subject: [PATCH] Maybe cherry-pick: - renamed "category" path -> "product_category" - renamed "product" path -> "generic_product" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../FinancialAdminProductWebRequestBean.java | 2 +- ...ncialAdminProductWebRequestController.java | 2 +- .../FinancialProductWebRequestBean.java | 2 +- .../FinancialProductWebRequestController.java | 2 +- .../FinancialAdminCategoryWebRequestBean.java | 2 +- ...cialAdminCategoryWebRequestController.java | 2 +- .../FinancialCategoryWebRequestBean.java | 2 +- ...FinancialCategoryWebRequestController.java | 2 +- .../FinancialsGenericProductConverter.java | 4 ++-- .../FinancialsProductCategoryConverter.java | 4 ++-- web/WEB-INF/faces-config.xml | 22 +++++++++---------- web/WEB-INF/product-links.jsf.taglib.xml | 4 ++-- web/WEB-INF/product.jsf.taglib.xml | 2 +- .../admin_form_product_data.tpl | 0 .../admin_form_category_data.tpl | 0 .../admin_generic_product_list.xhtml | 2 +- .../admin_product_category_list.xhtml | 2 +- 17 files changed, 28 insertions(+), 28 deletions(-) rename src/java/org/mxchange/jfinancials/beans/{product => generic_product}/FinancialAdminProductWebRequestBean.java (99%) rename src/java/org/mxchange/jfinancials/beans/{product => generic_product}/FinancialAdminProductWebRequestController.java (94%) rename src/java/org/mxchange/jfinancials/beans/{product => generic_product}/FinancialProductWebRequestBean.java (99%) rename src/java/org/mxchange/jfinancials/beans/{product => generic_product}/FinancialProductWebRequestController.java (97%) rename src/java/org/mxchange/jfinancials/beans/{category => product_category}/FinancialAdminCategoryWebRequestBean.java (98%) rename src/java/org/mxchange/jfinancials/beans/{category => product_category}/FinancialAdminCategoryWebRequestController.java (94%) rename src/java/org/mxchange/jfinancials/beans/{category => product_category}/FinancialCategoryWebRequestBean.java (99%) rename src/java/org/mxchange/jfinancials/beans/{category => product_category}/FinancialCategoryWebRequestController.java (96%) rename web/WEB-INF/templates/admin/{product => generic_product}/admin_form_product_data.tpl (100%) rename web/WEB-INF/templates/admin/{category => product_category}/admin_form_category_data.tpl (100%) rename web/admin/{product => generic_product}/admin_generic_product_list.xhtml (98%) rename web/admin/{category => product_category}/admin_product_category_list.xhtml (98%) diff --git a/src/java/org/mxchange/jfinancials/beans/product/FinancialAdminProductWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/generic_product/FinancialAdminProductWebRequestBean.java similarity index 99% rename from src/java/org/mxchange/jfinancials/beans/product/FinancialAdminProductWebRequestBean.java rename to src/java/org/mxchange/jfinancials/beans/generic_product/FinancialAdminProductWebRequestBean.java index 842d3b1f..14ee0cc4 100644 --- a/src/java/org/mxchange/jfinancials/beans/product/FinancialAdminProductWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/generic_product/FinancialAdminProductWebRequestBean.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.jfinancials.beans.product; +package org.mxchange.jfinancials.beans.generic_product; import javax.ejb.EJB; import javax.enterprise.context.RequestScoped; diff --git a/src/java/org/mxchange/jfinancials/beans/product/FinancialAdminProductWebRequestController.java b/src/java/org/mxchange/jfinancials/beans/generic_product/FinancialAdminProductWebRequestController.java similarity index 94% rename from src/java/org/mxchange/jfinancials/beans/product/FinancialAdminProductWebRequestController.java rename to src/java/org/mxchange/jfinancials/beans/generic_product/FinancialAdminProductWebRequestController.java index 768ed80d..c419bae0 100644 --- a/src/java/org/mxchange/jfinancials/beans/product/FinancialAdminProductWebRequestController.java +++ b/src/java/org/mxchange/jfinancials/beans/generic_product/FinancialAdminProductWebRequestController.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.jfinancials.beans.product; +package org.mxchange.jfinancials.beans.generic_product; import java.io.Serializable; diff --git a/src/java/org/mxchange/jfinancials/beans/product/FinancialProductWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/generic_product/FinancialProductWebRequestBean.java similarity index 99% rename from src/java/org/mxchange/jfinancials/beans/product/FinancialProductWebRequestBean.java rename to src/java/org/mxchange/jfinancials/beans/generic_product/FinancialProductWebRequestBean.java index 635cbe82..55ec5325 100644 --- a/src/java/org/mxchange/jfinancials/beans/product/FinancialProductWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/generic_product/FinancialProductWebRequestBean.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.jfinancials.beans.product; +package org.mxchange.jfinancials.beans.generic_product; import fish.payara.cdi.jsr107.impl.NamedCache; import java.text.MessageFormat; diff --git a/src/java/org/mxchange/jfinancials/beans/product/FinancialProductWebRequestController.java b/src/java/org/mxchange/jfinancials/beans/generic_product/FinancialProductWebRequestController.java similarity index 97% rename from src/java/org/mxchange/jfinancials/beans/product/FinancialProductWebRequestController.java rename to src/java/org/mxchange/jfinancials/beans/generic_product/FinancialProductWebRequestController.java index 8543d3c1..7dbe48cc 100644 --- a/src/java/org/mxchange/jfinancials/beans/product/FinancialProductWebRequestController.java +++ b/src/java/org/mxchange/jfinancials/beans/generic_product/FinancialProductWebRequestController.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.jfinancials.beans.product; +package org.mxchange.jfinancials.beans.generic_product; import java.io.Serializable; import java.util.List; diff --git a/src/java/org/mxchange/jfinancials/beans/category/FinancialAdminCategoryWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/product_category/FinancialAdminCategoryWebRequestBean.java similarity index 98% rename from src/java/org/mxchange/jfinancials/beans/category/FinancialAdminCategoryWebRequestBean.java rename to src/java/org/mxchange/jfinancials/beans/product_category/FinancialAdminCategoryWebRequestBean.java index 1764c64f..fb45265a 100644 --- a/src/java/org/mxchange/jfinancials/beans/category/FinancialAdminCategoryWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/product_category/FinancialAdminCategoryWebRequestBean.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.jfinancials.beans.category; +package org.mxchange.jfinancials.beans.product_category; import javax.ejb.EJB; import javax.enterprise.context.RequestScoped; diff --git a/src/java/org/mxchange/jfinancials/beans/category/FinancialAdminCategoryWebRequestController.java b/src/java/org/mxchange/jfinancials/beans/product_category/FinancialAdminCategoryWebRequestController.java similarity index 94% rename from src/java/org/mxchange/jfinancials/beans/category/FinancialAdminCategoryWebRequestController.java rename to src/java/org/mxchange/jfinancials/beans/product_category/FinancialAdminCategoryWebRequestController.java index 6a292c20..be189896 100644 --- a/src/java/org/mxchange/jfinancials/beans/category/FinancialAdminCategoryWebRequestController.java +++ b/src/java/org/mxchange/jfinancials/beans/product_category/FinancialAdminCategoryWebRequestController.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.jfinancials.beans.category; +package org.mxchange.jfinancials.beans.product_category; import java.io.Serializable; diff --git a/src/java/org/mxchange/jfinancials/beans/category/FinancialCategoryWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/product_category/FinancialCategoryWebRequestBean.java similarity index 99% rename from src/java/org/mxchange/jfinancials/beans/category/FinancialCategoryWebRequestBean.java rename to src/java/org/mxchange/jfinancials/beans/product_category/FinancialCategoryWebRequestBean.java index e45879a9..3dac53be 100644 --- a/src/java/org/mxchange/jfinancials/beans/category/FinancialCategoryWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/product_category/FinancialCategoryWebRequestBean.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.jfinancials.beans.category; +package org.mxchange.jfinancials.beans.product_category; import fish.payara.cdi.jsr107.impl.NamedCache; import java.text.MessageFormat; diff --git a/src/java/org/mxchange/jfinancials/beans/category/FinancialCategoryWebRequestController.java b/src/java/org/mxchange/jfinancials/beans/product_category/FinancialCategoryWebRequestController.java similarity index 96% rename from src/java/org/mxchange/jfinancials/beans/category/FinancialCategoryWebRequestController.java rename to src/java/org/mxchange/jfinancials/beans/product_category/FinancialCategoryWebRequestController.java index c8caa54e..69fde5ee 100644 --- a/src/java/org/mxchange/jfinancials/beans/category/FinancialCategoryWebRequestController.java +++ b/src/java/org/mxchange/jfinancials/beans/product_category/FinancialCategoryWebRequestController.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.jfinancials.beans.category; +package org.mxchange.jfinancials.beans.product_category; import java.io.Serializable; import org.mxchange.jproduct.exceptions.category.CategoryNotFoundException; diff --git a/src/java/org/mxchange/jfinancials/converter/generic_product/FinancialsGenericProductConverter.java b/src/java/org/mxchange/jfinancials/converter/generic_product/FinancialsGenericProductConverter.java index 5af8d5fd..4c78bd34 100644 --- a/src/java/org/mxchange/jfinancials/converter/generic_product/FinancialsGenericProductConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/generic_product/FinancialsGenericProductConverter.java @@ -22,8 +22,8 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; -import org.mxchange.jfinancials.beans.product.FinancialProductWebRequestBean; -import org.mxchange.jfinancials.beans.product.FinancialProductWebRequestController; +import org.mxchange.jfinancials.beans.generic_product.FinancialProductWebRequestBean; +import org.mxchange.jfinancials.beans.generic_product.FinancialProductWebRequestController; import org.mxchange.jproduct.exceptions.product.ProductNotFoundException; import org.mxchange.jproduct.model.product.Product; diff --git a/src/java/org/mxchange/jfinancials/converter/product_category/FinancialsProductCategoryConverter.java b/src/java/org/mxchange/jfinancials/converter/product_category/FinancialsProductCategoryConverter.java index 983e8b3f..4978f233 100644 --- a/src/java/org/mxchange/jfinancials/converter/product_category/FinancialsProductCategoryConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/product_category/FinancialsProductCategoryConverter.java @@ -22,8 +22,8 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; -import org.mxchange.jfinancials.beans.category.FinancialCategoryWebRequestBean; -import org.mxchange.jfinancials.beans.category.FinancialCategoryWebRequestController; +import org.mxchange.jfinancials.beans.product_category.FinancialCategoryWebRequestBean; +import org.mxchange.jfinancials.beans.product_category.FinancialCategoryWebRequestController; import org.mxchange.jproduct.exceptions.category.CategoryNotFoundException; import org.mxchange.jproduct.model.category.Category; diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index b6471e27..81a63726 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -130,11 +130,11 @@ admin_list_category - /admin/category/admin_product_category_list.xhtml + /admin/product_category/admin_product_category_list.xhtml admin_list_product - /admin/product/admin_generic_product_list.xhtml + /admin/generic_product/admin_generic_product_list.xhtml admin_list_user @@ -882,37 +882,37 @@ - /admin/category/admin_product_category_list.xhtml + /admin/product_category/admin_product_category_list.xhtml admin_show_product_category - /admin/category/admin_product_category_show.xhtml + /admin/product_category/admin_product_category_show.xhtml admin_edit_product_category - /admin/category/admin_product_category_edit.xhtml + /admin/product_category/admin_product_category_edit.xhtml admin_delete_product_category - /admin/category/admin_product_category_delete.xhtml + /admin/product_category/admin_product_category_delete.xhtml admin_assign_parent_category - /admin/category/admin_product_category_assign_parent.xhtml + /admin/product_category/admin_product_category_assign_parent.xhtml - /admin/product/admin_generic_product_list.xhtml + /admin/generic_product/admin_generic_product_list.xhtml admin_show_generic_product - /admin/product/admin_generic_product_show.xhtml + /admin/generic_product/admin_generic_product_show.xhtml admin_edit_generic_product - /admin/product/admin_generic_product_edit.xhtml + /admin/generic_product/admin_generic_product_edit.xhtml admin_delete_generic_product - /admin/product/admin_generic_product_delete.xhtml + /admin/generic_product/admin_generic_product_delete.xhtml