From 717b27c69a88dc7463b1696412d345fa15b48ee7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 9 Sep 2017 14:49:54 +0200 Subject: [PATCH] Please cherry-pick: - re-package season has started: now all core project's entity packages do always have following format: tld.domain.project.model.foo.SomeFoo; - also fixed persistence unit MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- src/conf/persistence.xml | 28 ++++++++--------- .../FinancialsAdminContactSessionBean.java | 4 ++- .../contact/FinancialsContactSessionBean.java | 6 +++- ...inancialsAdminContactPhoneSessionBean.java | 13 ++++---- ...inancialsAdminBusinessDataSessionBean.java | 7 +++-- .../FinancialsBusinessDataSessionBean.java | 5 +++- ...inancialsAdminBranchOfficeSessionBean.java | 8 +++-- .../FinancialsBranchOfficeSessionBean.java | 4 ++- ...ncialsAdminCompanyEmployeeSessionBean.java | 3 +- .../FinancialsCompanyEmployeeSessionBean.java | 4 ++- .../data/FinancialsCountrySingletonBean.java | 5 +++- .../database/BaseFinancialsDatabaseBean.java | 30 +++++++++---------- ...ancialsAdminMobileProviderSessionBean.java | 4 ++- ...FinancialsMobileProviderSingletonBean.java | 2 +- .../FinancialsAdminPhoneSessionBean.java | 14 ++++----- .../phone/FinancialsPhoneSessionBean.java | 14 ++++----- .../user/FinancialsAdminUserSessionBean.java | 2 +- .../model/user/FinancialsUserSessionBean.java | 16 +++++----- ...FinancialsUserRegistrationSessionBean.java | 2 +- 19 files changed, 98 insertions(+), 73 deletions(-) rename src/java/org/mxchange/jcontacts/{ => model}/contact/FinancialsAdminContactSessionBean.java (96%) rename src/java/org/mxchange/jcontacts/{ => model}/contact/FinancialsContactSessionBean.java (97%) rename src/java/org/mxchange/jcontacts/{ => model}/phone/FinancialsAdminContactPhoneSessionBean.java (98%) rename src/java/org/mxchange/jcontactsbusiness/{ => model}/basicdata/FinancialsAdminBusinessDataSessionBean.java (92%) rename src/java/org/mxchange/jcontactsbusiness/{ => model}/basicdata/FinancialsBusinessDataSessionBean.java (94%) rename src/java/org/mxchange/jcontactsbusiness/{ => model}/branchoffice/FinancialsAdminBranchOfficeSessionBean.java (93%) rename src/java/org/mxchange/jcontactsbusiness/{ => model}/branchoffice/FinancialsBranchOfficeSessionBean.java (90%) rename src/java/org/mxchange/jcontactsbusiness/{ => model}/employee/FinancialsAdminCompanyEmployeeSessionBean.java (90%) rename src/java/org/mxchange/jcontactsbusiness/{ => model}/employee/FinancialsCompanyEmployeeSessionBean.java (95%) rename src/java/org/mxchange/jcountry/{ => model}/data/FinancialsCountrySingletonBean.java (96%) rename src/java/org/mxchange/jphone/{ => model}/phonenumbers/mobileprovider/FinancialsAdminMobileProviderSessionBean.java (94%) rename src/java/org/mxchange/jphone/{ => model}/phonenumbers/mobileprovider/FinancialsMobileProviderSingletonBean.java (97%) rename src/java/org/mxchange/jphone/{ => model}/phonenumbers/phone/FinancialsAdminPhoneSessionBean.java (97%) rename src/java/org/mxchange/jphone/{ => model}/phonenumbers/phone/FinancialsPhoneSessionBean.java (94%) diff --git a/src/conf/persistence.xml b/src/conf/persistence.xml index 4b25087..999b69b 100644 --- a/src/conf/persistence.xml +++ b/src/conf/persistence.xml @@ -2,23 +2,23 @@ jdbc/jfinancials - org.mxchange.jcontacts.contact.UserContact - org.mxchange.jcontactsbusiness.basicdata.CompanyBasicData - org.mxchange.jcontactsbusiness.branchoffice.CompanyBranchOffice - org.mxchange.jcontactsbusiness.department.CompanyDepartment - org.mxchange.jcontactsbusiness.employee.CompanyEmployee - org.mxchange.jcontactsbusiness.headquarters.CompanyHeadquartersData - org.mxchange.jcontactsbusiness.jobposition.EmployeePosition - org.mxchange.jcontactsbusiness.logo.CompanyLogo - org.mxchange.jcontactsbusiness.opening_times.BusinessOpeningTimes - org.mxchange.jcountry.data.CountryData + org.mxchange.jcontacts.model.contact.UserContact + org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData + org.mxchange.jcontactsbusiness.model.branchoffice.CompanyBranchOffice + org.mxchange.jcontactsbusiness.model.department.CompanyDepartment + org.mxchange.jcontactsbusiness.model.employee.CompanyEmployee + org.mxchange.jcontactsbusiness.model.headquarters.CompanyHeadquartersData + org.mxchange.jcontactsbusiness.model.jobposition.EmployeePosition + org.mxchange.jcontactsbusiness.model.logo.CompanyLogo + org.mxchange.jcontactsbusiness.model.opening_times.BusinessOpeningTimes + org.mxchange.jcountry.model.data.CountryData org.mxchange.jfinancials.model.income.FinancialIncome org.mxchange.jfinancials.model.receipt.FinancialReceipt org.mxchange.jfinancials.model.receipt.entry.ReceiptEntry - org.mxchange.jphone.phonenumbers.fax.FaxNumber - org.mxchange.jphone.phonenumbers.landline.LandLineNumber - org.mxchange.jphone.phonenumbers.mobile.MobileNumber - org.mxchange.jphone.phonenumbers.mobileprovider.CellphoneProvider + org.mxchange.jphone.model.phonenumbers.fax.FaxNumber + org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber + org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber + org.mxchange.jphone.model.phonenumbers.mobileprovider.CellphoneProvider org.mxchange.jproduct.model.category.ProductCategory org.mxchange.jproduct.model.product.GenericProduct org.mxchange.jusercore.model.email_address.EmailAddressChange diff --git a/src/java/org/mxchange/jcontacts/contact/FinancialsAdminContactSessionBean.java b/src/java/org/mxchange/jcontacts/model/contact/FinancialsAdminContactSessionBean.java similarity index 96% rename from src/java/org/mxchange/jcontacts/contact/FinancialsAdminContactSessionBean.java rename to src/java/org/mxchange/jcontacts/model/contact/FinancialsAdminContactSessionBean.java index 2a4baf7..2cef89f 100644 --- a/src/java/org/mxchange/jcontacts/contact/FinancialsAdminContactSessionBean.java +++ b/src/java/org/mxchange/jcontacts/model/contact/FinancialsAdminContactSessionBean.java @@ -14,8 +14,10 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jcontacts.contact; +package org.mxchange.jcontacts.model.contact; +import org.mxchange.jcontacts.model.contact.AdminContactSessionBeanRemote; +import org.mxchange.jcontacts.model.contact.Contact; import java.text.MessageFormat; import java.util.GregorianCalendar; import javax.ejb.Stateless; diff --git a/src/java/org/mxchange/jcontacts/contact/FinancialsContactSessionBean.java b/src/java/org/mxchange/jcontacts/model/contact/FinancialsContactSessionBean.java similarity index 97% rename from src/java/org/mxchange/jcontacts/contact/FinancialsContactSessionBean.java rename to src/java/org/mxchange/jcontacts/model/contact/FinancialsContactSessionBean.java index dcf1caf..e55a2db 100644 --- a/src/java/org/mxchange/jcontacts/contact/FinancialsContactSessionBean.java +++ b/src/java/org/mxchange/jcontacts/model/contact/FinancialsContactSessionBean.java @@ -14,8 +14,12 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jcontacts.contact; +package org.mxchange.jcontacts.model.contact; +import org.mxchange.jcontacts.model.contact.ContactSessionBeanRemote; +import org.mxchange.jcontacts.model.contact.UserContact; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jcontacts.model.contact.ContactUtils; import java.text.MessageFormat; import java.util.Iterator; import java.util.List; diff --git a/src/java/org/mxchange/jcontacts/phone/FinancialsAdminContactPhoneSessionBean.java b/src/java/org/mxchange/jcontacts/model/phone/FinancialsAdminContactPhoneSessionBean.java similarity index 98% rename from src/java/org/mxchange/jcontacts/phone/FinancialsAdminContactPhoneSessionBean.java rename to src/java/org/mxchange/jcontacts/model/phone/FinancialsAdminContactPhoneSessionBean.java index ad8bba6..9e0e2bd 100644 --- a/src/java/org/mxchange/jcontacts/phone/FinancialsAdminContactPhoneSessionBean.java +++ b/src/java/org/mxchange/jcontacts/model/phone/FinancialsAdminContactPhoneSessionBean.java @@ -14,21 +14,22 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jcontacts.phone; +package org.mxchange.jcontacts.model.phone; import java.text.MessageFormat; import java.util.GregorianCalendar; import java.util.Objects; import javax.ejb.EJB; import javax.ejb.Stateless; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jcontacts.contact.ContactSessionBeanRemote; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jcontacts.model.contact.ContactSessionBeanRemote; +import org.mxchange.jcontacts.model.phone.AdminContactsPhoneSessionBeanRemote; import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; import org.mxchange.jphone.exceptions.PhoneNumberAlreadyLinkedException; import org.mxchange.jphone.exceptions.PhoneNumberNotLinkedException; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; /** * A session EJB for administrative contact's phone number purposes diff --git a/src/java/org/mxchange/jcontactsbusiness/basicdata/FinancialsAdminBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsAdminBusinessDataSessionBean.java similarity index 92% rename from src/java/org/mxchange/jcontactsbusiness/basicdata/FinancialsAdminBusinessDataSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsAdminBusinessDataSessionBean.java index c786968..af36f70 100644 --- a/src/java/org/mxchange/jcontactsbusiness/basicdata/FinancialsAdminBusinessDataSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsAdminBusinessDataSessionBean.java @@ -14,15 +14,18 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.basicdata; +package org.mxchange.jcontactsbusiness.model.basicdata; +import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import java.text.MessageFormat; import java.util.GregorianCalendar; import java.util.List; import java.util.Objects; import javax.ejb.EJB; import javax.ejb.Stateless; -import org.mxchange.jcontactsbusiness.employee.Employee; +import org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote; +import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote; +import org.mxchange.jcontactsbusiness.model.employee.Employee; import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataAlreadyAddedException; import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; import org.mxchange.jusercore.model.user.User; diff --git a/src/java/org/mxchange/jcontactsbusiness/basicdata/FinancialsBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsBusinessDataSessionBean.java similarity index 94% rename from src/java/org/mxchange/jcontactsbusiness/basicdata/FinancialsBusinessDataSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsBusinessDataSessionBean.java index 1a3b835..5a9ec79 100644 --- a/src/java/org/mxchange/jcontactsbusiness/basicdata/FinancialsBusinessDataSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsBusinessDataSessionBean.java @@ -14,14 +14,17 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.basicdata; +package org.mxchange.jcontactsbusiness.model.basicdata; +import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData; import java.text.MessageFormat; import java.util.List; import java.util.Objects; import javax.ejb.Stateless; import javax.persistence.NoResultException; import javax.persistence.Query; +import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote; import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataNotFoundException; import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; diff --git a/src/java/org/mxchange/jcontactsbusiness/branchoffice/FinancialsAdminBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsAdminBranchOfficeSessionBean.java similarity index 93% rename from src/java/org/mxchange/jcontactsbusiness/branchoffice/FinancialsAdminBranchOfficeSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsAdminBranchOfficeSessionBean.java index 3b3b213..c2f70c5 100644 --- a/src/java/org/mxchange/jcontactsbusiness/branchoffice/FinancialsAdminBranchOfficeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsAdminBranchOfficeSessionBean.java @@ -14,16 +14,18 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.branchoffice; +package org.mxchange.jcontactsbusiness.model.branchoffice; import java.text.MessageFormat; import java.util.GregorianCalendar; import java.util.List; import javax.ejb.EJB; import javax.ejb.Stateless; -import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.branchoffice.AdminBranchOfficeSessionBeanRemote; +import org.mxchange.jcontactsbusiness.branchoffice.BranchOfficeSessionBeanRemote; import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeAlreadyAddedException; -import org.mxchange.jcountry.data.Country; +import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; +import org.mxchange.jcountry.model.data.Country; import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; import org.mxchange.jusercore.model.user.User; diff --git a/src/java/org/mxchange/jcontactsbusiness/branchoffice/FinancialsBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsBranchOfficeSessionBean.java similarity index 90% rename from src/java/org/mxchange/jcontactsbusiness/branchoffice/FinancialsBranchOfficeSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsBranchOfficeSessionBean.java index 0d720c7..600bae5 100644 --- a/src/java/org/mxchange/jcontactsbusiness/branchoffice/FinancialsBranchOfficeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsBranchOfficeSessionBean.java @@ -14,12 +14,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.branchoffice; +package org.mxchange.jcontactsbusiness.model.branchoffice; +import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; import java.text.MessageFormat; import java.util.List; import javax.ejb.Stateless; import javax.persistence.Query; +import org.mxchange.jcontactsbusiness.branchoffice.BranchOfficeSessionBeanRemote; import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; /** diff --git a/src/java/org/mxchange/jcontactsbusiness/employee/FinancialsAdminCompanyEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsAdminCompanyEmployeeSessionBean.java similarity index 90% rename from src/java/org/mxchange/jcontactsbusiness/employee/FinancialsAdminCompanyEmployeeSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsAdminCompanyEmployeeSessionBean.java index aadfb68..e805d9f 100644 --- a/src/java/org/mxchange/jcontactsbusiness/employee/FinancialsAdminCompanyEmployeeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsAdminCompanyEmployeeSessionBean.java @@ -14,9 +14,10 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.employee; +package org.mxchange.jcontactsbusiness.model.employee; import javax.ejb.Stateless; +import org.mxchange.jcontactsbusiness.employee.AdminCompanyEmployeeSessionBeanRemote; import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; /** diff --git a/src/java/org/mxchange/jcontactsbusiness/employee/FinancialsCompanyEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsCompanyEmployeeSessionBean.java similarity index 95% rename from src/java/org/mxchange/jcontactsbusiness/employee/FinancialsCompanyEmployeeSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsCompanyEmployeeSessionBean.java index ebea96c..344dcf7 100644 --- a/src/java/org/mxchange/jcontactsbusiness/employee/FinancialsCompanyEmployeeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/FinancialsCompanyEmployeeSessionBean.java @@ -14,13 +14,15 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.employee; +package org.mxchange.jcontactsbusiness.model.employee; +import org.mxchange.jcontactsbusiness.model.employee.Employee; import java.text.MessageFormat; import java.util.List; import javax.ejb.Stateless; import javax.persistence.NoResultException; import javax.persistence.Query; +import org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote; import org.mxchange.jcontactsbusiness.exceptions.employee.CompanyEmployeeNotFoundException; import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; diff --git a/src/java/org/mxchange/jcountry/data/FinancialsCountrySingletonBean.java b/src/java/org/mxchange/jcountry/model/data/FinancialsCountrySingletonBean.java similarity index 96% rename from src/java/org/mxchange/jcountry/data/FinancialsCountrySingletonBean.java rename to src/java/org/mxchange/jcountry/model/data/FinancialsCountrySingletonBean.java index c208d7e..bcdfe50 100644 --- a/src/java/org/mxchange/jcountry/data/FinancialsCountrySingletonBean.java +++ b/src/java/org/mxchange/jcountry/model/data/FinancialsCountrySingletonBean.java @@ -14,8 +14,11 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jcountry.data; +package org.mxchange.jcountry.model.data; +import org.mxchange.jcountry.model.data.CountrySingletonBeanRemote; +import org.mxchange.jcountry.model.data.CountryData; +import org.mxchange.jcountry.model.data.Country; import java.text.MessageFormat; import java.util.GregorianCalendar; import java.util.List; diff --git a/src/java/org/mxchange/jfinancials/database/BaseFinancialsDatabaseBean.java b/src/java/org/mxchange/jfinancials/database/BaseFinancialsDatabaseBean.java index 42255e5..eafb9e7 100644 --- a/src/java/org/mxchange/jfinancials/database/BaseFinancialsDatabaseBean.java +++ b/src/java/org/mxchange/jfinancials/database/BaseFinancialsDatabaseBean.java @@ -26,24 +26,24 @@ import javax.jms.ObjectMessage; import javax.mail.Address; import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jcontacts.contact.ContactUtils; -import org.mxchange.jcontacts.contact.UserContact; -import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; -import org.mxchange.jcontactsbusiness.basicdata.CompanyBasicData; -import org.mxchange.jcontactsbusiness.employee.CompanyEmployee; -import org.mxchange.jcontactsbusiness.employee.Employee; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jcontacts.model.contact.ContactUtils; +import org.mxchange.jcontacts.model.contact.UserContact; +import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData; +import org.mxchange.jcontactsbusiness.model.employee.CompanyEmployee; +import org.mxchange.jcontactsbusiness.model.employee.Employee; import org.mxchange.jcoreee.database.BaseDatabaseBean; -import org.mxchange.jcountry.data.Country; -import org.mxchange.jcountry.data.CountryData; +import org.mxchange.jcountry.model.data.Country; +import org.mxchange.jcountry.model.data.CountryData; import org.mxchange.jmailee.model.delivery.wrapper.EmailDeliveryWrapper; import org.mxchange.jmailee.model.delivery.wrapper.WrapableEmailDelivery; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.fax.FaxNumbers; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; -import org.mxchange.jphone.phonenumbers.landline.LandLineNumbers; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; -import org.mxchange.jphone.phonenumbers.mobile.MobileNumbers; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.FaxNumbers; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumbers; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumbers; import org.mxchange.jphone.utils.PhoneUtils; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; diff --git a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/FinancialsAdminMobileProviderSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/FinancialsAdminMobileProviderSessionBean.java similarity index 94% rename from src/java/org/mxchange/jphone/phonenumbers/mobileprovider/FinancialsAdminMobileProviderSessionBean.java rename to src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/FinancialsAdminMobileProviderSessionBean.java index df472d0..d01f174 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/FinancialsAdminMobileProviderSessionBean.java +++ b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/FinancialsAdminMobileProviderSessionBean.java @@ -14,13 +14,15 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jphone.phonenumbers.mobileprovider; +package org.mxchange.jphone.model.phonenumbers.mobileprovider; import java.text.MessageFormat; import java.util.GregorianCalendar; import javax.ejb.Stateless; import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; import org.mxchange.jphone.exceptions.MobileProviderAlreadyAddedException; +import org.mxchange.jphone.model.phonenumbers.mobileprovider.AdminMobileProviderSessionBeanRemote; +import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; /** * An administrative singleton EJB for mobile provider informations diff --git a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/FinancialsMobileProviderSingletonBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/FinancialsMobileProviderSingletonBean.java similarity index 97% rename from src/java/org/mxchange/jphone/phonenumbers/mobileprovider/FinancialsMobileProviderSingletonBean.java rename to src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/FinancialsMobileProviderSingletonBean.java index b57e2a2..ed4387d 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/FinancialsMobileProviderSingletonBean.java +++ b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/FinancialsMobileProviderSingletonBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jphone.phonenumbers.mobileprovider; +package org.mxchange.jphone.model.phonenumbers.mobileprovider; import java.text.MessageFormat; import java.util.List; diff --git a/src/java/org/mxchange/jphone/phonenumbers/phone/FinancialsAdminPhoneSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/phone/FinancialsAdminPhoneSessionBean.java similarity index 97% rename from src/java/org/mxchange/jphone/phonenumbers/phone/FinancialsAdminPhoneSessionBean.java rename to src/java/org/mxchange/jphone/model/phonenumbers/phone/FinancialsAdminPhoneSessionBean.java index 91c532e..0277f2c 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/phone/FinancialsAdminPhoneSessionBean.java +++ b/src/java/org/mxchange/jphone/model/phonenumbers/phone/FinancialsAdminPhoneSessionBean.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jphone.phonenumbers.phone; +package org.mxchange.jphone.model.phonenumbers.phone; import java.text.MessageFormat; import java.util.GregorianCalendar; import javax.ejb.Stateless; import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.fax.FaxNumbers; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; -import org.mxchange.jphone.phonenumbers.landline.LandLineNumbers; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; -import org.mxchange.jphone.phonenumbers.mobile.MobileNumbers; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.FaxNumbers; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumbers; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumbers; /** * An EJB for administrative phone purposes diff --git a/src/java/org/mxchange/jphone/phonenumbers/phone/FinancialsPhoneSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/phone/FinancialsPhoneSessionBean.java similarity index 94% rename from src/java/org/mxchange/jphone/phonenumbers/phone/FinancialsPhoneSessionBean.java rename to src/java/org/mxchange/jphone/model/phonenumbers/phone/FinancialsPhoneSessionBean.java index d69a686..c4a95e0 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/phone/FinancialsPhoneSessionBean.java +++ b/src/java/org/mxchange/jphone/model/phonenumbers/phone/FinancialsPhoneSessionBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jphone.phonenumbers.phone; +package org.mxchange.jphone.model.phonenumbers.phone; import java.text.MessageFormat; import java.util.List; @@ -23,12 +23,12 @@ import javax.persistence.NoResultException; import javax.persistence.Query; import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; import org.mxchange.jphone.exceptions.PhoneEntityNotFoundException; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.fax.FaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; -import org.mxchange.jphone.phonenumbers.landline.LandLineNumber; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; -import org.mxchange.jphone.phonenumbers.mobile.MobileNumber; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber; /** * A general phone EJB diff --git a/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java index 21bdfec..a63d80a 100644 --- a/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java @@ -20,7 +20,7 @@ import java.text.MessageFormat; import java.util.GregorianCalendar; import javax.ejb.EJB; import javax.ejb.Stateless; -import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; import org.mxchange.jusercore.exceptions.EmailAddressAlreadyRegisteredException; import org.mxchange.jusercore.exceptions.UserNameAlreadyRegisteredException; diff --git a/src/java/org/mxchange/jusercore/model/user/FinancialsUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/FinancialsUserSessionBean.java index e38d9db..8d7bf57 100644 --- a/src/java/org/mxchange/jusercore/model/user/FinancialsUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/FinancialsUserSessionBean.java @@ -25,15 +25,15 @@ import javax.ejb.Stateless; import javax.persistence.NoResultException; import javax.persistence.PersistenceException; import javax.persistence.Query; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jcontacts.contact.ContactUtils; +import org.mxchange.jcontacts.model.contact.Contact; +import org.mxchange.jcontacts.model.contact.ContactUtils; import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.fax.FaxNumbers; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; -import org.mxchange.jphone.phonenumbers.landline.LandLineNumbers; -import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; -import org.mxchange.jphone.phonenumbers.mobile.MobileNumbers; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.FaxNumbers; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumbers; +import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; +import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumbers; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.exceptions.UserStatusConfirmedException; import org.mxchange.jusercore.exceptions.UserStatusLockedException; diff --git a/src/java/org/mxchange/juserlogincore/model/user/register/FinancialsUserRegistrationSessionBean.java b/src/java/org/mxchange/juserlogincore/model/user/register/FinancialsUserRegistrationSessionBean.java index b7fa53f..5bc14a2 100644 --- a/src/java/org/mxchange/juserlogincore/model/user/register/FinancialsUserRegistrationSessionBean.java +++ b/src/java/org/mxchange/juserlogincore/model/user/register/FinancialsUserRegistrationSessionBean.java @@ -22,7 +22,7 @@ import javax.ejb.EJB; import javax.ejb.Stateless; import javax.persistence.NoResultException; import javax.persistence.Query; -import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; import org.mxchange.jusercore.exceptions.EmailAddressAlreadyRegisteredException; import org.mxchange.jusercore.exceptions.UserNameAlreadyRegisteredException; -- 2.39.5