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 (file)
index 0000000..c854dee
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 (file)
index c854dee..0000000
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 (file)
index 0000000..cb86732
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 (file)
index cb86732..0000000
Binary files a/lib/jshop.jar and /dev/null differ

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index ccedafe379858be604201dff7b592e5df14ec665..08650522eb728905953d23c5431e95bb16c126b4 100644 (file)
--- 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 5a0eb9bbd44cfc80e95b8878b85dcd0bfa6211cc..28d7b5b08c92f8d71497eab0852e4d53f521b993 100644 (file)
--- 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 2ce44c6d34c3204db3789c785e56d215af76905f..49ab0ad296b5a00572dd9fc6994424d66117879f 100644 (file)
--- 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 6532d4020c871cdbc611ba22355381788ea1e653..41b832d5359599135300abe2510bd28546bf48c5 100644 (file)
--- 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 e28a03d033a4807f0f07eaad55089705bd8de036..11dcdb7622d4b8cd33a7658d7a1ae0396db4a4f0 100644 (file)
--- 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 7bce7d361d6b6a4b415031b917f2256b1ca7c573..7abb046c358378fe3842503e1f43732b738f78bf 100644 (file)
--- 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 b43fa5574ce1cdd00288f4959adb05f1ba1c9ae5..ba0ce6f795a333860cc8bd54a3e8a8cf33ccbcf5 100644 (file)
--- 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 57a9d7d5de19e639400a848809ed1fd9c09427d4..327ac2b330b53cee06a4a5b5163e85e23c9a6753 100644 (file)
--- 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 66cfa6b1c58e0d99a70fc295fdf7fd906d43ce64..32c77984570b318102fed8410f9335402ef8f216 100644 (file)
--- 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 59dad75770b26f8ab9b7f6509bec6174056c4af0..019e6f139ad50ca6c0a1fac74b2178287224c0d3 100644 (file)
--- 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 234caf26a8422c05b11268474898f6167510e02b..e87d25926b8d93b9276247a108905d2ab83087d6 100644 (file)
--- 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 e66ce2722ce689d5bd493a05e312f5fc88edc781..853ab6b2e1f74826492f8958bc9bafa5122a8f90 100644 (file)
--- 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 8aefece39bae808eae1d75992043657419c57fc9..b6bef59914d620afe700c413099420731faa369d 100644 (file)
--- 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 d6cea8ce682f838f9ab8a2494daafdbd5095d0f3..05c28e9a49422ad1de82654f0ebe5828272b5268 100644 (file)
--- 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 74d7cf4fe65ffb1e6c213f961d0d997a707d7a6b..fcd66525d58695037a19b332d55be31de433ff7d 100644 (file)
--- 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" %>