]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Renaming season is not yet over ... ;-)
authorRoland Haeder <roland@mxchange.org>
Sat, 5 Sep 2015 13:05:50 +0000 (15:05 +0200)
committerRoland Haeder <roland@mxchange.org>
Sat, 5 Sep 2015 13:05:50 +0000 (15:05 +0200)
Signed-off-by:Roland Häder <roland@mxchange.org>

lib/jcore-ejb.jar [deleted file]
lib/jcoreee.jar [new file with mode: 0644]
nbproject/build-impl.xml
nbproject/project.properties
nbproject/project.xml
src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java
src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java
src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java
src/java/org/mxchange/pizzaapplication/beans/enums/DataWebBean.java
src/java/org/mxchange/pizzaapplication/beans/enums/PizzaServiceDataWebBean.java

diff --git a/lib/jcore-ejb.jar b/lib/jcore-ejb.jar
deleted file mode 100644 (file)
index 261eaa8..0000000
Binary files a/lib/jcore-ejb.jar and /dev/null differ
diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
new file mode 100644 (file)
index 0000000..5f80768
Binary files /dev/null and b/lib/jcoreee.jar differ
index 08650522eb728905953d23c5431e95bb16c126b4..15f68d0d4bef2a69453a71632518a3d1daee4a9b 100644 (file)
@@ -1023,7 +1023,7 @@ 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.jcore-ejb.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jcoreee.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"/>
@@ -1038,7 +1038,7 @@ 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.jcore-ejb.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jcoreee.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"/>
index 97210ba9520de0d319f3a1857024f26bee135f0f..86ee86fbe1f624d173f90ef4d53261d1b381086b 100644 (file)
@@ -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.jcore-ejb.jar=lib/jcore-ejb.jar
+file.reference.jcoreee.jar=lib/jcoreee.jar
 file.reference.jshop-core.jar=lib/jshop-core.jar
 file.reference.jshop-ejb.jar=lib/jshop-ejb.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.jcore-ejb.jar}:\
+    ${file.reference.jcoreee.jar}:\
     ${file.reference.jshop-core.jar}:\
     ${file.reference.jshop-ejb.jar}:\
     ${reference.PizzaService-lib.jar}:\
@@ -104,7 +104,7 @@ run.test.classpath=\
 runmain.jvmargs=
 source.encoding=UTF-8
 source.reference.jcore.jar=../jcore/src/
-source.reference.jcore-ejb.jar=../jcore-ejb/src/
+source.reference.jcoreee.jar=../jcoreee/src/
 source.reference.jshop-core.jar=../jshop-core/src/
 source.reference.jshop-ejb.jar=../jshop-ejb/src/
 source.root=src
index 7628060f8df910ea1b83bc996daf6292bfb6567e..257793f7548aa13a5f4443075e0e1b598c78de15 100644 (file)
@@ -11,7 +11,7 @@
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jcore-ejb.jar}</file>
+                    <file>${file.reference.jcoreee.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
index dd896a6c86e1af9507e3ba4b79e2c6a88ad650c1..e69bba25a0cdf564b225f3158becde83d358e013 100644 (file)
@@ -20,18 +20,17 @@ import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.rmi.RemoteException;
 import java.sql.SQLException;
-import java.text.MessageFormat;
 import java.util.Deque;
 import java.util.Iterator;
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.SessionScoped;
 import javax.faces.FacesException;
 import javax.inject.Named;
+import org.mxchange.jcoreee.beans.BaseFrameworkBean;
 import org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException;
 import org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException;
 import org.mxchange.jshopcore.model.category.Category;
 import org.mxchange.jshopcore.model.product.Product;
-import org.mxchange.jshopejb.beans.BaseFrameworkBean;
 
 /**
  * Main application class
@@ -65,13 +64,10 @@ public class PizzaServiceWebBean extends BaseFrameworkBean implements PizzaWebBe
        @PostConstruct
        public void init () throws FacesException {
                // Trace message
-               this.getLogger().trace(MessageFormat.format("application={0} - CALLED!", this.getApplication())); //NOI18N
+               this.getLogger().trace("CALLED!"); //NOI18N
 
-               // Must not be null
-               if (this.getApplication() == null) {
-                       // Abort here
-                       throw new NullPointerException("application is null"); //NOI18N
-               }
+               // Super call
+               super.init();
 
                try {
                        // Call init method
@@ -82,12 +78,6 @@ public class PizzaServiceWebBean extends BaseFrameworkBean implements PizzaWebBe
                }
        }
 
-       @Override
-       @Deprecated
-       public String getPrintableProductAvailability (final Product product) {
-               return this.app.getPrintableProductAvailability(product);
-       }
-
        @Override
        public Iterator<Product> getAvailableProductsIterator () throws RemoteException {
                try {
@@ -167,36 +157,4 @@ public class PizzaServiceWebBean extends BaseFrameworkBean implements PizzaWebBe
                        throw new RemoteException("doAdminAddProduct() failed.", ex);
                }
        }
-
-       @Override
-       @Deprecated
-       public String getPrintableProduktCategory (final Product product) throws RemoteException {
-               try {
-                       return this.app.getPrintableProductCategory(product);
-               } catch (final IOException | SQLException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
-                       // Continue to throw
-                       throw new RemoteException("getPrintableProduktCategory() failed.", ex);
-               }
-       }
-
-       @Override
-       @Deprecated
-       public void doAdminHandleProductForms () throws RemoteException {
-               // Deprecated method called
-               throw new UnsupportedOperationException("Deprecated method called");
-       }
-
-       @Override
-       @Deprecated
-       public void doAdminHandleCategoryForms () throws RemoteException {
-               // Deprecated method called
-               throw new UnsupportedOperationException("Deprecated method called");
-       }
-
-       @Override
-       @Deprecated
-       public String generateLinkForParent (final Category category) {
-               // Deligate to app
-               return this.app.generateLinkForParent(category);
-       }
 }
index f24dad1ec565e79882bfe4ed2b94cfd4307954b0..451f9f70cb9210e420e181a23cf1ce2402afa1f9 100644 (file)
@@ -19,24 +19,17 @@ package org.mxchange.pizzaapplication.beans.controller;
 import java.rmi.RemoteException;
 import java.util.Deque;
 import java.util.Iterator;
-import javax.faces.FacesException;
+import org.mxchange.jcoreee.beans.FrameworkBean;
 import org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException;
 import org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException;
 import org.mxchange.jshopcore.model.category.Category;
 import org.mxchange.jshopcore.model.product.Product;
-import org.mxchange.jshopejb.beans.FrameworkBean;
 
 /**
  *
  * @author Roland Haeder
  */
 public interface PizzaWebBean extends FrameworkBean {
-       /**
-        * Initializes this instance
-        * 
-        * @throws FacesException If something was wrong
-        */
-       public void init () throws FacesException;
 
        /**
         * Some "getter" for an iterator of only available products
@@ -86,39 +79,6 @@ public interface PizzaWebBean extends FrameworkBean {
         */
        public Deque<Category> getAllCategories () throws RemoteException;
 
-       /**
-        * Generates a link for category's parent category. If none is given, the method will return only a small
-        * note.
-        *
-        * @param category Category instance
-        * @return HTML link for category's parent category
-        * @deprecated Old lost code
-        */
-       @Deprecated
-       public String generateLinkForParent (final Category category);
-
-       /**
-        * Checks if given Product instance is available and returns a printable
-        * (human-readable) string.
-        * 
-        * @param product Product instance to check
-        * @return Human-readable version of product availability
-        * @deprecated Old lost code
-        */
-       @Deprecated
-       public String getPrintableProductAvailability (final Product product);
-
-       /**
-        * Returns a printable (human-readable) string of product's category
-        * 
-        * @param product Product instance to check
-        * @return Human-readable version of product availability
-        * @throws java.rmi.RemoteException If something unexpected happened
-        * @deprecated Old lost code
-        */
-       @Deprecated
-       public String getPrintableProduktCategory (final Product product) throws RemoteException;
-
        /**
         * Adds given category data from request to database
         *
@@ -136,22 +96,4 @@ public interface PizzaWebBean extends FrameworkBean {
         * @throws org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException If the given product title is already used
         */
        public void doAdminAddProduct (final Product product) throws RemoteException, ProductTitleAlreadyUsedException;
-
-       /**
-        * Handles admin product form requests
-        *
-        * @throws RemoteException If something unexpected happened
-        * @deprecated Old lost code
-        */
-       @Deprecated
-       public void doAdminHandleProductForms () throws RemoteException;
-
-       /**
-        * Handles admin category form requests
-        * 
-        * @throws RemoteException If something unexpected happened
-        * @deprecated Old lost code
-        */
-       @Deprecated
-       public void doAdminHandleCategoryForms () throws RemoteException;
 }
index 7abb046c358378fe3842503e1f43732b738f78bf..fe9dec1b229f00c6cd70bf62ffe4474459a49897 100644 (file)
@@ -16,8 +16,7 @@
  */
 package org.mxchange.pizzaapplication.beans.customer;
 
-import org.mxchange.jcore.model.contact.gender.Gender;
-import org.mxchange.jshopejb.beans.FrameworkBean;
+import org.mxchange.jcoreee.beans.FrameworkBean;
 
 /**
  * An interface for customer beans
@@ -25,227 +24,4 @@ import org.mxchange.jshopejb.beans.FrameworkBean;
  * @author Roland Haeder
  */
 public interface CustomerWebBean extends FrameworkBean {
-       /**
-        * Some "getter" for translated gender of the contact
-        *
-        * @return Translated / human-readable gender
-        */
-       public String getTranslatedGender ();
-
-       /**
-        * Gender of the contact
-        *
-        * @return the gender
-        */
-       public Gender getGender ();
-
-       /**
-        * Gender of the contact
-        *
-        * @param gender the gender to set
-        */
-       public void setGender (final Gender gender);
-
-       /**
-        * First name
-        *
-        * @return the first name
-        */
-       public String getFirstName ();
-
-       /**
-        * First name
-        *
-        * @param firstName the first name to set
-        */
-       public void setFirstName (final String firstName);
-
-       /**
-        * Family name
-        *
-        * @return the familyName
-        */
-       public String getFamilyName ();
-
-       /**
-        * Family name
-        *
-        * @param familyName the familyName to set
-        */
-       public void setFamilyName (final String familyName);
-
-       /**
-        * Companyname
-        *
-        * @return the companyName
-        */
-       public String getCompanyName ();
-
-       /**
-        * Companyname
-        *
-        * @param companyName the companyName to set
-        */
-       public void setCompanyName (final String companyName);
-
-       /**
-        * Street
-        *
-        * @return the street
-        */
-       public String getStreet ();
-
-       /**
-        * Street
-        *
-        * @param street the street to set
-        */
-       public void setStreet (final String street);
-
-       /**
-        * House number
-        *
-        * @return the houseNumber
-        */
-       public Long getHouseNumber ();
-
-       /**
-        * House number
-        *
-        * @param houseNumber the houseNumber to set
-        */
-       public void setHouseNumber (final Long houseNumber);
-
-       /**
-        * ZIP code
-        *
-        * @return the zipCode
-        */
-       public Long getZipCode ();
-
-       /**
-        * ZIP code
-        *
-        * @param zipCode the zipCode to set
-        */
-       public void setZipCode (final Long zipCode);
-
-       /**
-        * City
-        *
-        * @return the city
-        */
-       public String getCity ();
-
-       /**
-        * City
-        *
-        * @param city the city to set
-        */
-       public void setCity (final String city);
-
-       /**
-        * Country code
-        *
-        * @return the countryCode
-        */
-       public String getCountryCode ();
-
-       /**
-        * Country code
-        *
-        * @param countryCode the countryCode to set
-        */
-       public void setCountryCode (final String countryCode);
-
-       /**
-        * Email address
-        *
-        * @return the emailAddress
-        */
-       public String getEmailAddress ();
-
-       /**
-        * Email address
-        *
-        * @param emailAddress the emailAddress to set
-        */
-       public void setEmailAddress (final String emailAddress);
-
-       /**
-        * Phone number
-        *
-        * @return the phoneNumber
-        */
-       public String getPhoneNumber ();
-
-       /**
-        * Phone number
-        *
-        * @param phoneNumber the phoneNumber to set
-        */
-       public void setPhoneNumber (final String phoneNumber);
-
-       /**
-        * Fax number
-        *
-        * @return the faxNumber
-        */
-       public String getFaxNumber ();
-
-       /**
-        * Fax number
-        *
-        * @param faxNumber the faxNumber to set
-        */
-       public void setFaxNumber (final String faxNumber);
-
-       /**
-        * Cellphone number
-        *
-        * @return the cellphoneNumber
-        */
-       public String getCellphoneNumber ();
-
-       /**
-        * Cellphone number
-        *
-        * @param cellphoneNumber the cellphoneNumber to set
-        */
-       public void setCellphoneNumber (final String cellphoneNumber);
-
-       /**
-        * Birth day
-        *
-        * @return the birthday
-        */
-       public String getBirthday ();
-
-       /**
-        * Birth day
-        *
-        * @param birthday the birthday to set
-        */
-       public void setBirthday (final String birthday);
-
-       /**
-        * Comments
-        *
-        * @return the comment
-        */
-       public String getComment ();
-
-       /**
-        * Comments
-        *
-        * @param comment the comment to set
-        */
-       public void setComment (final String comment);
-
-       /**
-        * Checks whether the contact is user's own data
-        *
-        * @return Own data?
-        */
-       public boolean isOwnContact ();
 }
index 0c5806ad9bd19062b1ff8d69a914b9578f72ee4b..159413a20977dcd90557659930facdc281419ca2 100644 (file)
@@ -18,10 +18,7 @@ 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.jshopcore.model.customer.Customer;
-import org.mxchange.jshopcore.model.customer.ShopCustomer;
-import org.mxchange.jshopejb.beans.BaseFrameworkBean;
+import org.mxchange.jcoreee.beans.BaseFrameworkBean;
 
 /**
  * A customer bean which hides the customer instance
@@ -36,222 +33,9 @@ public class PizzaServiceCustomerWebBean extends BaseFrameworkBean implements Cu
         */
        private static final long serialVersionUID = 542145347916L;
 
-       /**
-        * Customer instance
-        */
-       private final Customer customer;
-
        /**
         * Default constructor
         */
        public PizzaServiceCustomerWebBean () {
-               // Instance customer
-               this.customer = new ShopCustomer();
-       }
-
-       @Override
-       public String getBirthday () {
-               // Deligate to "hidden" object
-               return this.getCustomer().getBirthday();
-       }
-
-       @Override
-       public void setBirthday (final String birthday) {
-               // Deligate to "hidden" object
-               this.getCustomer().setBirthday(birthday);
-       }
-
-       @Override
-       public String getCellphoneNumber () {
-               // Deligate to "hidden" object
-               return this.getCustomer().getCellphoneNumber();
-       }
-
-       @Override
-       public void setCellphoneNumber (final String cellphoneNumber) {
-               // Deligate to "hidden" object
-               this.getCustomer().setCellphoneNumber(cellphoneNumber);
-       }
-
-       @Override
-       public String getCity () {
-               // Deligate to "hidden" object
-               return this.getCustomer().getCity();
-       }
-
-       @Override
-       public void setCity (final String city) {
-               // Deligate to "hidden" object
-               this.getCustomer().setCity(city);
-       }
-
-       @Override
-       public String getComment () {
-               // Deligate to "hidden" object
-               return this.getCustomer().getComment();
-       }
-
-       @Override
-       public void setComment (final String comment) {
-               // Deligate to "hidden" object
-               this.getCustomer().setComment(comment);
-       }
-
-       @Override
-       public String getCompanyName () {
-               // Deligate to "hidden" object
-               return this.getCustomer().getCompanyName();
-       }
-
-       @Override
-       public void setCompanyName (final String companyName) {
-               // Deligate to "hidden" object
-               this.getCustomer().setCompanyName(companyName);
-       }
-
-       @Override
-       public String getCountryCode () {
-               // Deligate to "hidden" object
-               return this.getCustomer().getCountryCode();
-       }
-
-       @Override
-       public void setCountryCode (final String countryCode) {
-               // Deligate to "hidden" object
-               this.getCustomer().setCountryCode(countryCode);
-       }
-
-       @Override
-       public String getEmailAddress () {
-               // Deligate to "hidden" object
-               return this.getCustomer().getEmailAddress();
-       }
-
-       @Override
-       public void setEmailAddress (final String emailAddress) {
-               // Deligate to "hidden" object
-               this.getCustomer().setEmailAddress(emailAddress);
-       }
-
-       @Override
-       public String getFamilyName () {
-               // Trace call
-               //* NOISY-DEBUG: */ this.getLogger().trace("CALLED!");
-
-               // Deligate to "hidden" object
-               return this.getCustomer().getFamilyName();
-       }
-
-       @Override
-       public void setFamilyName (final String familyName) {
-               // Trace call
-               //* NOISY-DEBUG: */ this.getLogger().trace(MessageFormat.format("familyName={0} - CALLED!", familyName));
-
-               // Deligate to "hidden" object
-               this.getCustomer().setFamilyName(familyName);
-       }
-
-       @Override
-       public String getFaxNumber () {
-               // Deligate to "hidden" object
-               return this.getCustomer().getFaxNumber();
-       }
-
-       @Override
-       public void setFaxNumber (final String faxNumber) {
-               // Deligate to "hidden" object
-               this.getCustomer().setFaxNumber(faxNumber);
-       }
-
-       @Override
-       public Gender getGender () {
-               // Deligate to "hidden" object
-               return this.getCustomer().getGender();
-       }
-
-       @Override
-       public void setGender (final Gender gender) {
-               // Deligate to "hidden" object
-               this.getCustomer().setGender(gender);
-       }
-
-       @Override
-       public Long getHouseNumber () {
-               // Deligate to "hidden" object
-               return this.getCustomer().getHouseNumber();
-       }
-
-       @Override
-       public void setHouseNumber (final Long houseNumber) {
-               // Deligate to "hidden" object
-               this.getCustomer().setHouseNumber(houseNumber);
-       }
-
-       @Override
-       public String getPhoneNumber () {
-               // Deligate to "hidden" object
-               return this.getCustomer().getPhoneNumber();
-       }
-
-       @Override
-       public void setPhoneNumber (final String phoneNumber) {
-               // Deligate to "hidden" object
-               this.getCustomer().setPhoneNumber(phoneNumber);
-       }
-
-       @Override
-       public String getStreet () {
-               // Deligate to "hidden" object
-               return this.getCustomer().getStreet();
-       }
-
-       @Override
-       public void setStreet (final String street) {
-               // Deligate to "hidden" object
-               this.getCustomer().setStreet(street);
-       }
-
-       @Override
-       public String getFirstName () {
-               // Deligate to "hidden" object
-               return this.getCustomer().getFirstName();
-       }
-
-       @Override
-       public void setFirstName (final String firstName) {
-               // Deligate to "hidden" object
-               this.getCustomer().setFirstName(firstName);
-       }
-
-       @Override
-       public String getTranslatedGender () {
-               // Deligate to "hidden" object
-               return this.getCustomer().getTranslatedGender();
-       }
-
-       @Override
-       public Long getZipCode () {
-               // Deligate to "hidden" object
-               return this.getCustomer().getZipCode();
-       }
-
-       @Override
-       public void setZipCode (final Long zipCode) {
-               // Deligate to "hidden" object
-               this.getCustomer().setZipCode(zipCode);
-       }
-
-       @Override
-       public boolean isOwnContact () {
-               throw new UnsupportedOperationException("Not supported yet."); //NOI18N
-       }
-
-       /**
-        * Getter for Customer instance
-        *
-        * @return Contact instance
-        */
-       private Customer getCustomer () {
-               return this.customer;
        }
 }
index 327ac2b330b53cee06a4a5b5163e85e23c9a6753..5fe8435d0b93c61de5e09aed593ee03762aaa61d 100644 (file)
@@ -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.jshopejb.beans.FrameworkBean;
+import org.mxchange.jcoreee.beans.FrameworkBean;
 
 /**
  * An interface for data beans
index e9655c12a5a6fbbc3f7b7fdd4b56cbda1663aca9..87ed577b10b61516e180eb1074160f57aa1b571c 100644 (file)
@@ -22,7 +22,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.jshopejb.beans.BaseFrameworkBean;
+import org.mxchange.jcoreee.beans.BaseFrameworkBean;
 
 /**
  * A customer bean which hides the customer instance