From: Roland Häder <roland@mxchange.org>
Date: Wed, 16 Aug 2017 21:46:31 +0000 (+0200)
Subject: updated jar(s)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7f7839190ac7724f83cc9ec9aadc4e0fdb341fd8;p=pizzaservice-war.git

updated jar(s)

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/lib/juser-core.jar b/lib/juser-core.jar
index 47124fbd..a215338d 100644
Binary files a/lib/juser-core.jar and b/lib/juser-core.jar differ
diff --git a/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java
index 89794615..7a38bce3 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/checkout/PizzaCheckoutWebSessionBean.java
@@ -61,7 +61,6 @@ public class PizzaCheckoutWebSessionBean extends BasePizzaController implements
 	 */
 	private static final long serialVersionUID = 51_987_348_347_183L;
 
-	////////////////////// Bean injections ///////////////////////
 	/**
 	 * Basket bean
 	 */
diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java
index f998d3db..fc5f9019 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaAdminCustomerWebRequestBean.java
@@ -40,7 +40,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController;
 import org.mxchange.pizzaapplication.beans.contact.PizzaAdminContactWebRequestController;
 import org.mxchange.pizzaapplication.beans.helper.PizzaWebRequestHelperController;
 import org.mxchange.pizzaapplication.model.customer.PizzaAdminCustomerSessionBeanRemote;
-import org.mxchange.pizzaapplication.model.customer.PizzaCustomer;
+import org.mxchange.jcustomercore.model.customer.ContactCustomer;
 
 /**
  * Administrative customer bean (controller)
@@ -126,7 +126,7 @@ public class PizzaAdminCustomerWebRequestBean extends BasePizzaController implem
 		String customerNumber = this.adminCustomerBean.createCustomerNumber();
 
 		// Create new customer instance
-		Customer customer = new PizzaCustomer(CustomerAccountStatus.CONFIRMED, customerContact, customerNumber);
+		Customer customer = new ContactCustomer(CustomerAccountStatus.CONFIRMED, customerContact, customerNumber);
 
 		// Init instance
 		Customer updatedCustomer;
diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/activity/PizzaUserActivityWebApplicationBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/activity/PizzaUserActivityWebApplicationBean.java
index e3ba84a0..c6497085 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/user/activity/PizzaUserActivityWebApplicationBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/user/activity/PizzaUserActivityWebApplicationBean.java
@@ -94,99 +94,10 @@ public class PizzaUserActivityWebApplicationBean extends BasePizzaController imp
 	 */
 	@SuppressWarnings ("CollectionWithoutInitialCapacity")
 	public PizzaUserActivityWebApplicationBean () {
-		// Try to get EJB instance
-		try {
-			// Get initial context
-			Context context = new InitialContext();
-
-			// Try to lookup
-			this.userActivityBean = (UserActivityLogSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/userActivity!org.mxchange.jusercore.model.user.activity.UserActivityLogSessionBeanRemote"); //NOI18N
-		} catch (final NamingException e) {
-			// Throw again
-			throw new FaceletException(e);
-		}
-
 		// Init cache
 		this.usersActivity = new LinkedHashMap<>();
 	}
 
-	/**
-	 * Adds user activity entry with given type
-	 * <p>
-	 * @param user User instance
-	 * @param activityType Activity type
-	 */
-	private void addUserActivity (final User user, final String activityType) {
-		// Better re-validate
-		if (null == user) {
-			// Throw NPE
-			throw new NullPointerException("user is null"); //NOI18N
-		} else if (user.getUserId() == null) {
-			// Throw again
-			throw new NullPointerException("user.userId is null"); //NOI18N
-		} else if (user.getUserId() < 1) {
-			// Invalid id number
-			throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N
-		} else if (null == activityType) {
-			// Throw NPE again
-			throw new NullPointerException("activityType is null"); //NOI18N
-		} else if (activityType.isEmpty()) {
-			// Is empty
-			throw new IllegalArgumentException("activityType is empty"); //NOI18N
-		}
-
-		// Create new activity object
-		LogableUserActivity userActivity = new UserActivityLog(activityType, user, new GregorianCalendar(), this.determinePrincipalName());
-
-		// Call bean to add it
-		this.userActivityBean.addUserActivityLog(userActivity);
-
-		// Add to cache, too
-		this.addUserActivityToCache(userActivity);
-	}
-
-	/**
-	 * Adds user activity log with type and message
-	 * <p>
-	 * @param user User instance
-	 * @param activityType Activity type
-	 * @param message Activity message
-	 */
-	private void addUserActivity (final User user, final String activityType, final String message) {
-		// Better re-validate
-		if (null == user) {
-			// Throw NPE
-			throw new NullPointerException("user is null"); //NOI18N
-		} else if (user.getUserId() == null) {
-			// Throw again
-			throw new NullPointerException("user.userId is null"); //NOI18N
-		} else if (user.getUserId() < 1) {
-			// Invalid id number
-			throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N
-		} else if (null == activityType) {
-			// Throw NPE again
-			throw new NullPointerException("activityType is null"); //NOI18N
-		} else if (activityType.isEmpty()) {
-			// Is empty
-			throw new IllegalArgumentException("activityType is empty"); //NOI18N
-		} else if (null == message) {
-			// Throw NPE again
-			throw new NullPointerException("message is null"); //NOI18N
-		} else if (message.isEmpty()) {
-			// Is empty
-			throw new IllegalArgumentException("message is empty"); //NOI18N
-		}
-
-		// Create new activity object
-		LogableUserActivity userActivity = new UserActivityLog(message, activityType, user, new GregorianCalendar(), this.determinePrincipalName());
-
-		// Call bean to add it
-		this.userActivityBean.addUserActivityLog(userActivity);
-
-		// Add to cache, too
-		this.addUserActivityToCache(userActivity);
-	}
-
 	/**
 	 * Event observer for newly added users by administrator
 	 * <p>
@@ -640,6 +551,18 @@ public class PizzaUserActivityWebApplicationBean extends BasePizzaController imp
 	 */
 	@PostConstruct
 	public void init () {
+		// Try to get EJB instance
+		try {
+			// Get initial context
+			Context context = new InitialContext();
+
+			// Try to lookup
+			this.userActivityBean = (UserActivityLogSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/userActivity!org.mxchange.jusercore.model.user.activity.UserActivityLogSessionBeanRemote"); //NOI18N
+		} catch (final NamingException e) {
+			// Throw again
+			throw new FaceletException(e);
+		}
+
 		// Get whole list
 		List<LogableUserActivity> list = this.userActivityBean.fetchAllUserActivityLog();
 
@@ -659,6 +582,83 @@ public class PizzaUserActivityWebApplicationBean extends BasePizzaController imp
 		}
 	}
 
+	/**
+	 * Adds user activity entry with given type
+	 * <p>
+	 * @param user         User instance
+	 * @param activityType Activity type
+	 */
+	private void addUserActivity (final User user, final String activityType) {
+		// Better re-validate
+		if (null == user) {
+			// Throw NPE
+			throw new NullPointerException("user is null"); //NOI18N
+		} else if (user.getUserId() == null) {
+			// Throw again
+			throw new NullPointerException("user.userId is null"); //NOI18N
+		} else if (user.getUserId() < 1) {
+			// Invalid id number
+			throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N
+		} else if (null == activityType) {
+			// Throw NPE again
+			throw new NullPointerException("activityType is null"); //NOI18N
+		} else if (activityType.isEmpty()) {
+			// Is empty
+			throw new IllegalArgumentException("activityType is empty"); //NOI18N
+		}
+
+		// Create new activity object
+		LogableUserActivity userActivity = new UserActivityLog(activityType, user, new GregorianCalendar(), this.determinePrincipalName());
+
+		// Call bean to add it
+		this.userActivityBean.addUserActivityLog(userActivity);
+
+		// Add to cache, too
+		this.addUserActivityToCache(userActivity);
+	}
+
+	/**
+	 * Adds user activity log with type and message
+	 * <p>
+	 * @param user         User instance
+	 * @param activityType Activity type
+	 * @param message      Activity message
+	 */
+	private void addUserActivity (final User user, final String activityType, final String message) {
+		// Better re-validate
+		if (null == user) {
+			// Throw NPE
+			throw new NullPointerException("user is null"); //NOI18N
+		} else if (user.getUserId() == null) {
+			// Throw again
+			throw new NullPointerException("user.userId is null"); //NOI18N
+		} else if (user.getUserId() < 1) {
+			// Invalid id number
+			throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N
+		} else if (null == activityType) {
+			// Throw NPE again
+			throw new NullPointerException("activityType is null"); //NOI18N
+		} else if (activityType.isEmpty()) {
+			// Is empty
+			throw new IllegalArgumentException("activityType is empty"); //NOI18N
+		} else if (null == message) {
+			// Throw NPE again
+			throw new NullPointerException("message is null"); //NOI18N
+		} else if (message.isEmpty()) {
+			// Is empty
+			throw new IllegalArgumentException("message is empty"); //NOI18N
+		}
+
+		// Create new activity object
+		LogableUserActivity userActivity = new UserActivityLog(message, activityType, user, new GregorianCalendar(), this.determinePrincipalName());
+
+		// Call bean to add it
+		this.userActivityBean.addUserActivityLog(userActivity);
+
+		// Add to cache, too
+		this.addUserActivityToCache(userActivity);
+	}
+
 	/**
 	 * Adds given user activity instance to "cache" (local map)
 	 * <p>