From: Roland Haeder <roland@mxchange.org>
Date: Mon, 7 Sep 2015 18:51:39 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5ff24518d1a60046c2cb28f88084b3106d2b3fc4;p=pizzaservice-war.git

Continued:
- updated jcore.jar, jcoreee.jar, jshop-core.jar jshop-ee-lib.jar
- got rid of some things that don't work in EJB container ... :-(
Signed-off-by:Roland Häder <roland@mxchange.org>
---

diff --git a/lib/jcore.jar b/lib/jcore.jar
index 636db5cb..1e4a78b0 100644
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ
diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index 7ab41e1c..8ca2e654 100644
Binary files a/lib/jcoreee.jar and b/lib/jcoreee.jar differ
diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar
index b803106f..9ee0879f 100644
Binary files a/lib/jshop-core.jar and b/lib/jshop-core.jar differ
diff --git a/lib/jshop-ee-lib.jar b/lib/jshop-ee-lib.jar
index 7a715b3c..a39d20b3 100644
Binary files a/lib/jshop-ee-lib.jar and b/lib/jshop-ee-lib.jar differ
diff --git a/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaServiceBasketWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaServiceBasketWebBean.java
index 2c770994..05586ed7 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaServiceBasketWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaServiceBasketWebBean.java
@@ -18,7 +18,6 @@ package org.mxchange.pizzaapplication.beans.basket;
 
 import java.rmi.RemoteException;
 import javax.annotation.PostConstruct;
-import javax.ejb.EJB;
 import javax.enterprise.context.SessionScoped;
 import javax.faces.FacesException;
 import javax.inject.Named;
@@ -35,16 +34,16 @@ import org.mxchange.jshopeelib.beans.remote.basket.BasketSessionBeanRemote;
 @Named("basket")
 @SessionScoped
 public class PizzaServiceBasketWebBean extends BaseFrameworkBean implements PizzaBasketWebBean {
+
 	/**
-	 *  Basket bean
+	 * Serial number
 	 */
-	@EJB
-	private final BasketSessionBeanRemote basket;
+	private static final long serialVersionUID = 5_476_347_320_198L;
 
 	/**
-	 * Serial number
+	 *  Basket bean
 	 */
-	private static final long serialVersionUID = 5476347320198L;
+	private final BasketSessionBeanRemote basket;
 
 	/**
 	 * Default constructor
diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java
index c85f8264..8755c9f7 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java
@@ -43,12 +43,11 @@ public class PizzaServiceWebBean extends BaseFrameworkBean implements PizzaWebBe
 	/**
 	 * Serial id
 	 */
-	private static final long serialVersionUID = 58137539530279L;
+	private static final long serialVersionUID = 58_137_539_530_279L;
 
 	/**
 	 * Remote bean
 	 */
-	//@EJB
 	private final ShopSessionBeanRemote shop;
 
 	/**
diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java
index 04ed6ffd..8b9af4d6 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java
@@ -17,7 +17,6 @@
 package org.mxchange.pizzaapplication.beans.customer;
 
 import javax.annotation.PostConstruct;
-import javax.ejb.EJB;
 import javax.enterprise.context.SessionScoped;
 import javax.inject.Named;
 import javax.naming.InitialContext;
@@ -36,12 +35,11 @@ public class PizzaServiceCustomerWebBean extends BaseFrameworkBean implements Cu
 	/**
 	 * Serial number
 	 */
-	private static final long serialVersionUID = 542145347916L;
+	private static final long serialVersionUID = 542_145_347_916L;
 
 	/**
 	 * Remote customer bean
 	 */
-	@EJB
 	private final CustomerSessionBeanRemote customer;
 
 	/**
diff --git a/src/java/org/mxchange/pizzaapplication/beans/data/PizzaServiceDataWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/data/PizzaServiceDataWebBean.java
index b4476b84..aa977901 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/data/PizzaServiceDataWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/data/PizzaServiceDataWebBean.java
@@ -18,7 +18,6 @@ package org.mxchange.pizzaapplication.beans.data;
 
 import java.util.List;
 import javax.annotation.PostConstruct;
-import javax.ejb.EJB;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Named;
 import javax.naming.InitialContext;
@@ -39,12 +38,11 @@ public class PizzaServiceDataWebBean extends BaseFrameworkBean implements DataWe
 	/**
 	 * Serial number
 	 */
-	private static final long serialVersionUID = 835482364189L;
+	private static final long serialVersionUID = 835_482_364_189L;
 
 	/**
 	 * Remote bean
 	 */
-	@EJB
 	private final ShopDataBeanRemote data;
 
 	/**