From 07f8bf49a80f6972e3ae8925ec6662ee33c2623b Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 5 Sep 2015 00:45:22 +0200 Subject: [PATCH] =?utf8?q?renaming=20season=20has=20started=20...=20;-)=20?= =?utf8?q?Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/{jsfcore.jar => jcore-ejb.jar} | Bin lib/{jshop.jar => jshop-ejb.jar} | Bin nbproject/build-impl.xml | 8 ++++---- nbproject/project.properties | 8 ++++---- nbproject/project.xml | 4 ++-- .../beans/controller/PizzaServiceWebBean.java | 6 +++--- .../beans/controller/PizzaWebBean.java | 6 +++--- .../beans/customer/CustomerWebBean.java | 2 +- .../beans/customer/PizzaServiceCustomerWebBean.java | 6 +++--- .../pizzaapplication/beans/enums/DataWebBean.java | 2 +- .../beans/enums/PizzaServiceDataWebBean.java | 2 +- web/WEB-INF/faces-config.xml | 4 ++-- web/WEB-INF/tlds/basket.tld | 2 +- web/WEB-INF/web.xml | 4 ++-- web/admin/category.jsp | 2 +- web/admin/index.jsp | 2 +- web/form_handler/add_item.jsp | 4 ++-- 17 files changed, 31 insertions(+), 31 deletions(-) rename lib/{jsfcore.jar => jcore-ejb.jar} (100%) rename lib/{jshop.jar => jshop-ejb.jar} (100%) diff --git a/lib/jsfcore.jar b/lib/jcore-ejb.jar similarity index 100% rename from lib/jsfcore.jar rename to lib/jcore-ejb.jar diff --git a/lib/jshop.jar b/lib/jshop-ejb.jar similarity index 100% rename from lib/jshop.jar rename to lib/jshop-ejb.jar diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index ccedafe3..08650522 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -1023,8 +1023,8 @@ exists or setup the property manually. For example like this: - - + + @@ -1038,8 +1038,8 @@ exists or setup the property manually. For example like this: - - + + diff --git a/nbproject/project.properties b/nbproject/project.properties index 5a0eb9bb..28d7b5b0 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -33,7 +33,7 @@ file.reference.commons-codec-1.10.jar=lib/commons-codec-1.10.jar file.reference.commons-lang3-3.4.jar=lib/commons-lang3-3.4.jar file.reference.gf-client.jar=lib/gf-client.jar file.reference.jcore.jar=lib/jcore.jar -file.reference.jsfcore.jar=lib/jsfcore.jar +file.reference.jcore-ejb.jar=lib/jcore-ejb.jar file.reference.jshop-core.jar=lib/jshop-core.jar file.reference.jshop.jar=lib/jshop.jar file.reference.log4j-api-2.3.jar=lib/log4j-api-2.3.jar @@ -54,7 +54,7 @@ j2ee.server.type=gfv3ee6 jar.compress=false javac.classpath=\ ${file.reference.jcore.jar}:\ - ${file.reference.jsfcore.jar}:\ + ${file.reference.jcore-ejb.jar}:\ ${file.reference.jshop.jar}:\ ${file.reference.cdi-api.jar}:\ ${file.reference.gf-client.jar}:\ @@ -101,9 +101,9 @@ run.test.classpath=\ runmain.jvmargs= source.encoding=UTF-8 source.reference.jcore.jar=../jcore/src/ -source.reference.jsfcore.jar=../jsfcore/src/ +source.reference.jcore-ejb.jar=../jcore-ejb/src/ source.reference.jshop-core.jar=../jshop-core/src/ -source.reference.jshop.jar=../jshop/src/ +source.reference.jshop.jar=../jshop-ejb/src/ source.root=src src.dir=${source.root}/java test.src.dir=test diff --git a/nbproject/project.xml b/nbproject/project.xml index 2ce44c6d..49ab0ad2 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -11,11 +11,11 @@ WEB-INF/lib - ${file.reference.jsfcore.jar} + ${file.reference.jcore-ejb.jar} WEB-INF/lib - ${file.reference.jshop.jar} + ${file.reference.jshop-ejb.jar} WEB-INF/lib diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java index 6532d402..41b832d5 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java @@ -27,11 +27,11 @@ import javax.annotation.PostConstruct; import javax.enterprise.context.SessionScoped; import javax.faces.FacesException; import javax.inject.Named; -import org.mxchange.jshop.beans.BaseFrameworkBean; -import org.mxchange.jshop.category.Category; -import org.mxchange.jshop.product.Product; import org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException; import org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException; +import org.mxchange.jshopejb.beans.BaseFrameworkBean; +import org.mxchange.jshopejb.model.category.Category; +import org.mxchange.jshopejb.model.product.Product; /** * Main application class diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java index e28a03d0..11dcdb76 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java @@ -20,11 +20,11 @@ import java.rmi.RemoteException; import java.util.Deque; import java.util.Iterator; import javax.faces.FacesException; -import org.mxchange.jshop.beans.FrameworkBean; -import org.mxchange.jshop.category.Category; import org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException; import org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException; -import org.mxchange.jshop.product.Product; +import org.mxchange.jshopejb.beans.FrameworkBean; +import org.mxchange.jshopejb.model.category.Category; +import org.mxchange.jshopejb.model.product.Product; /** * diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java index 7bce7d36..7abb046c 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java @@ -17,7 +17,7 @@ package org.mxchange.pizzaapplication.beans.customer; import org.mxchange.jcore.model.contact.gender.Gender; -import org.mxchange.jshop.beans.FrameworkBean; +import org.mxchange.jshopejb.beans.FrameworkBean; /** * An interface for customer beans diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java index b43fa557..ba0ce6f7 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java @@ -19,9 +19,9 @@ package org.mxchange.pizzaapplication.beans.customer; import javax.enterprise.context.SessionScoped; import javax.inject.Named; import org.mxchange.jcore.model.contact.gender.Gender; -import org.mxchange.jshop.beans.BaseFrameworkBean; -import org.mxchange.jshop.model.customer.Customer; -import org.mxchange.jshop.model.customer.ShopCustomer; +import org.mxchange.jshopejb.beans.BaseFrameworkBean; +import org.mxchange.jshopejb.model.customer.Customer; +import org.mxchange.jshopejb.model.customer.ShopCustomer; /** * A customer bean which hides the customer instance diff --git a/src/java/org/mxchange/pizzaapplication/beans/enums/DataWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/enums/DataWebBean.java index 57a9d7d5..327ac2b3 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/enums/DataWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/enums/DataWebBean.java @@ -18,7 +18,7 @@ package org.mxchange.pizzaapplication.beans.enums; import java.util.List; import org.mxchange.jcore.model.contact.gender.Gender; -import org.mxchange.jshop.beans.FrameworkBean; +import org.mxchange.jshopejb.beans.FrameworkBean; /** * An interface for data beans diff --git a/src/java/org/mxchange/pizzaapplication/beans/enums/PizzaServiceDataWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/enums/PizzaServiceDataWebBean.java index 66cfa6b1..32c77984 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/enums/PizzaServiceDataWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/enums/PizzaServiceDataWebBean.java @@ -23,7 +23,7 @@ import java.util.List; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; import org.mxchange.jcore.model.contact.gender.Gender; -import org.mxchange.jshop.beans.BaseFrameworkBean; +import org.mxchange.jshopejb.beans.BaseFrameworkBean; /** * A customer bean which hides the customer instance diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 59dad757..019e6f13 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -5,10 +5,10 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd"> PrivacyTermsCheckboxValidator - org.mxchange.jsfcore.validator.bool.privacy_terms.PrivacyTermsCheckboxValidator + org.mxchange.jcoreejb.validator.bool.privacy_terms.PrivacyTermsCheckboxValidator NameValidator - org.mxchange.jsfcore.validator.string.names.NameValidator + org.mxchange.jcoreejb.validator.string.names.NameValidator diff --git a/web/WEB-INF/tlds/basket.tld b/web/WEB-INF/tlds/basket.tld index 234caf26..e87d2592 100644 --- a/web/WEB-INF/tlds/basket.tld +++ b/web/WEB-INF/tlds/basket.tld @@ -14,7 +14,7 @@ Basket instance, should be the same as the bean true true - org.mxchange.jshop.beans.basket.BasketBean + org.mxchange.jshopejb.beans.basket.BasketBean diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index e66ce272..853ab6b2 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -37,7 +37,7 @@ A servlet filter for setting character encoding to UTF-8 Utf8ServletFilter - org.mxchange.jsfcore.filter.servlet.utf8.Utf8ServletFilter + org.mxchange.jcoreejb.filter.servlet.utf8.Utf8ServletFilter A servlet filter for logging @@ -49,7 +49,7 @@ A filter for handling added basket items BasketItemAddedFilter - org.mxchange.jshop.filter.servlet.basket.BasketItemAddedFilter + org.mxchange.jshopejb.filter.servlet.basket.BasketItemAddedFilter BasketItemAddedFilter diff --git a/web/admin/category.jsp b/web/admin/category.jsp index 8aefece3..b6bef599 100644 --- a/web/admin/category.jsp +++ b/web/admin/category.jsp @@ -5,7 +5,7 @@ --%> <%--<%@page errorPage="errorHandler.jsp" %>--%> -<%@page import="org.mxchange.jshop.category.Category"%> +<%@page import="org.mxchange.jshopejb.category.Category"%> <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%> <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaBean"%> <%@page contentType="text/html" pageEncoding="UTF-8"%> diff --git a/web/admin/index.jsp b/web/admin/index.jsp index d6cea8ce..05c28e9a 100644 --- a/web/admin/index.jsp +++ b/web/admin/index.jsp @@ -9,7 +9,7 @@ <%@page import="java.util.Iterator"%> <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%> <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaBean"%> -<%@page import="org.mxchange.jshop.product.Product"%> +<%@page import="org.mxchange.jshopejb.product.Product"%> <%@page contentType="text/html" pageEncoding="UTF-8"%> diff --git a/web/form_handler/add_item.jsp b/web/form_handler/add_item.jsp index 74d7cf4f..fcd66525 100644 --- a/web/form_handler/add_item.jsp +++ b/web/form_handler/add_item.jsp @@ -8,7 +8,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaBean"%> <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%> -<%@page import="org.mxchange.jshop.item.AddableBasketItem"%> +<%@page import="org.mxchange.jshopejb.item.AddableBasketItem"%> @@ -20,7 +20,7 @@ controller.init(); %> - + <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -- 2.39.5