From: Roland Haeder <roland@mxchange.org>
Date: Fri, 4 Sep 2015 22:45:22 +0000 (+0200)
Subject: renaming season has started ... ;-)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=07f8bf49a80f6972e3ae8925ec6662ee33c2623b;p=pizzaservice-war.git

renaming season has started ... ;-)
Signed-off-by:Roland Häder <roland@mxchange.org>
---

diff --git a/lib/jcore-ejb.jar b/lib/jcore-ejb.jar
new file mode 100644
index 00000000..c854dee1
Binary files /dev/null and b/lib/jcore-ejb.jar differ
diff --git a/lib/jsfcore.jar b/lib/jsfcore.jar
deleted file mode 100644
index c854dee1..00000000
Binary files a/lib/jsfcore.jar and /dev/null differ
diff --git a/lib/jshop-ejb.jar b/lib/jshop-ejb.jar
new file mode 100644
index 00000000..cb867327
Binary files /dev/null and b/lib/jshop-ejb.jar differ
diff --git a/lib/jshop.jar b/lib/jshop.jar
deleted file mode 100644
index cb867327..00000000
Binary files a/lib/jshop.jar and /dev/null differ
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:
     <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
     <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
         <copyfiles files="${file.reference.jcore.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jsfcore.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jshop.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jcore-ejb.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jshop-ejb.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.cdi-api.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.gf-client.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.commons-codec-1.10.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
@@ -1038,8 +1038,8 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
         <copyfiles files="${file.reference.jcore.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.jsfcore.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.jshop.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jcore-ejb.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jshop-ejb.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.gf-client.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.commons-codec-1.10.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
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 @@
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jsfcore.jar}</file>
+                    <file>${file.reference.jcore-ejb.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jshop.jar}</file>
+                    <file>${file.reference.jshop-ejb.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
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">
 	<validator>
 		<validator-id>PrivacyTermsCheckboxValidator</validator-id>
-		<validator-class>org.mxchange.jsfcore.validator.bool.privacy_terms.PrivacyTermsCheckboxValidator</validator-class>
+		<validator-class>org.mxchange.jcoreejb.validator.bool.privacy_terms.PrivacyTermsCheckboxValidator</validator-class>
 	</validator>
 	<validator>
 		<validator-id>NameValidator</validator-id>
-		<validator-class>org.mxchange.jsfcore.validator.string.names.NameValidator</validator-class>
+		<validator-class>org.mxchange.jcoreejb.validator.string.names.NameValidator</validator-class>
 	</validator>
 </faces-config>
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 @@
 			<description>Basket instance, should be the same as the bean</description>
 			<required>true</required>
 			<rtexprvalue>true</rtexprvalue>
-			<type>org.mxchange.jshop.beans.basket.BasketBean</type>
+			<type>org.mxchange.jshopejb.beans.basket.BasketBean</type>
 		</attribute>
 	</tag>
 </taglib>
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 @@
 	<filter>
 		<description>A servlet filter for setting character encoding to UTF-8</description>
 		<filter-name>Utf8ServletFilter</filter-name>
-		<filter-class>org.mxchange.jsfcore.filter.servlet.utf8.Utf8ServletFilter</filter-class>
+		<filter-class>org.mxchange.jcoreejb.filter.servlet.utf8.Utf8ServletFilter</filter-class>
 	</filter>
 	<filter>
 		<description>A servlet filter for logging</description>
@@ -49,7 +49,7 @@
 	<filter>
 		<description>A filter for handling added basket items</description>
 		<filter-name>BasketItemAddedFilter</filter-name>
-		<filter-class>org.mxchange.jshop.filter.servlet.basket.BasketItemAddedFilter</filter-class>
+		<filter-class>org.mxchange.jshopejb.filter.servlet.basket.BasketItemAddedFilter</filter-class>
 	</filter>
 	<filter-mapping>
 		<filter-name>BasketItemAddedFilter</filter-name>
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"%>
 <jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="PizzaBean" />
 
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"%>
 
 <jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="PizzaBean" />
 
@@ -20,7 +20,7 @@
 	controller.init();
 %>
 
-<jsp:useBean id="item" scope="request" class="org.mxchange.jshop.item.basket.BasketItem" type="AddableBasketItem" />
+<jsp:useBean id="item" scope="request" class="org.mxchange.jshopejb.item.basket.BasketItem" type="AddableBasketItem" />
 <jsp:setProperty name="item" property="*" />
 
 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>