From 69b4e1e7c88729dc9387b2b14e2c45c67bc4695d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 24 Nov 2019 05:29:41 +0100 Subject: [PATCH] Please cherry-pick: - renamed BaseFinancialsDatabaseBean to BaseFinancialsEnterpriseBean - also moved it to proper "enterprise" package MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../jcontacts/model/contact/PizzaContactSessionBean.java | 1 + .../model/employee/PizzaAdminEmployeeSessionBean.java | 6 +++--- .../model/headquarter/PizzaHeadquarterSessionBean.java | 1 + .../mobileprovider/PizzaAdminMobileProviderSessionBean.java | 2 +- .../model/user/activity/PizzaUserActivitySessionBean.java | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/java/org/mxchange/jcontacts/model/contact/PizzaContactSessionBean.java b/src/java/org/mxchange/jcontacts/model/contact/PizzaContactSessionBean.java index ae96a02..2bb1168 100644 --- a/src/java/org/mxchange/jcontacts/model/contact/PizzaContactSessionBean.java +++ b/src/java/org/mxchange/jcontacts/model/contact/PizzaContactSessionBean.java @@ -25,6 +25,7 @@ import javax.persistence.NoResultException; import javax.persistence.Query; import org.mxchange.jcontacts.exceptions.ContactNotFoundException; import org.mxchange.pizzaaplication.enterprise.BasePizzaEnterpriseBean; + /** * A contact EJB *

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/employee/PizzaAdminEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/PizzaAdminEmployeeSessionBean.java index b87d823..d20dae1 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/employee/PizzaAdminEmployeeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/PizzaAdminEmployeeSessionBean.java @@ -25,7 +25,7 @@ import org.mxchange.jcontactsbusiness.exceptions.employee.EmployeeAlreadyAddedEx import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; import org.mxchange.jcontactsbusiness.model.department.Department; import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter; -import org.mxchange.jcontactsbusiness.model.jobposition.JobPosition; +import org.mxchange.jcontactsbusiness.model.jobposition.HireableJobPosition; import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; import org.mxchange.jusercore.model.user.User; @@ -177,9 +177,9 @@ public class PizzaAdminEmployeeSessionBean extends BasePizzaEnterpriseBean imple } // Is headquarter set? - if (employee.getEmployeeJobPosition() instanceof JobPosition) { + if (employee.getEmployeeJobPosition() instanceof HireableJobPosition) { // Then make it managed - final JobPosition jobPosition = this.createManaged(employee.getEmployeeJobPosition()); + final HireableJobPosition jobPosition = this.createManaged(employee.getEmployeeJobPosition()); // Set it back employee.setEmployeeJobPosition(jobPosition); diff --git a/src/java/org/mxchange/jcontactsbusiness/model/headquarter/PizzaHeadquarterSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/headquarter/PizzaHeadquarterSessionBean.java index 8382583..aee7a0d 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/headquarter/PizzaHeadquarterSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/headquarter/PizzaHeadquarterSessionBean.java @@ -20,6 +20,7 @@ import java.text.MessageFormat; import java.util.List; import javax.ejb.Stateless; import javax.persistence.Query; +import org.mxchange.jcontactsbusiness.model.headquarter.HeadquarterSessionBeanRemote; import org.mxchange.pizzaapplication.enterprise.BasePizzaEnterpriseBean; /** diff --git a/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/PizzaAdminMobileProviderSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/PizzaAdminMobileProviderSessionBean.java index cdbad53..4143ddd 100644 --- a/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/PizzaAdminMobileProviderSessionBean.java +++ b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/PizzaAdminMobileProviderSessionBean.java @@ -19,7 +19,7 @@ package org.mxchange.jphone.model.phonenumbers.mobileprovider; import java.text.MessageFormat; import java.util.Date; import javax.ejb.Stateless; -import org.mxchange.jphone.exceptions.MobileProviderAlreadyAddedException; +import org.mxchange.jphone.exceptions.mobileprovider.MobileProviderAlreadyAddedException; import org.mxchange.pizzaaplication.enterprise.BasePizzaEnterpriseBean; /** diff --git a/src/java/org/mxchange/jusercore/model/user/activity/PizzaUserActivitySessionBean.java b/src/java/org/mxchange/jusercore/model/user/activity/PizzaUserActivitySessionBean.java index bb20341..bc9bea8 100644 --- a/src/java/org/mxchange/jusercore/model/user/activity/PizzaUserActivitySessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/activity/PizzaUserActivitySessionBean.java @@ -23,7 +23,7 @@ import javax.ejb.Stateless; import javax.jms.JMSException; import javax.jms.ObjectMessage; import javax.persistence.Query; -import org.mxchange.jcoreee.enterprise.BaseEnterpriseBean; +import org.mxchange.pizzaapplication.enterprise.BasePizzaEnterpriseBean; import org.mxchange.jusercore.model.user.User; /** @@ -34,7 +34,7 @@ import org.mxchange.jusercore.model.user.User; * @author Roland Häder */ @Stateless (name = "userActivity", description = "A stateless, session-scored user-activity bean.") -public class PizzaUserActivitySessionBean extends BaseEnterpiseBean implements UserActivityLogSessionBeanRemote { +public class PizzaUserActivitySessionBean extends BasePizzaEnterpiseBean implements UserActivityLogSessionBeanRemote { /** * Serial number -- 2.39.5