From 37aed98d8dedbfcfbf2e46130433688635a4807e 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 +++++++++--------- .../AddressbookAdminContactSessionBean.java | 6 ++-- .../AddressbookContactSessionBean.java | 29 +++++++++---------- ...dressbookAdminContactPhoneSessionBean.java | 3 +- ...dressbookAdminBusinessDataSessionBean.java | 5 +--- .../AddressbookBusinessDataSessionBean.java | 5 +--- ...dressbookAdminBranchOfficeSessionBean.java | 6 +--- .../AddressbookBranchOfficeSessionBean.java | 4 +-- ...ssbookAdminCompanyEmployeeSessionBean.java | 2 +- ...AddressbookCompanyEmployeeSessionBean.java | 4 +-- .../data/AddressbookCountrySingletonBean.java | 5 +--- ...essbookAdminMobileProviderSessionBean.java | 4 +-- ...ddressbookMobileProviderSingletonBean.java | 5 +--- .../AddressbookAdminPhoneSessionBean.java | 3 +- .../phone/AddressbookPhoneSessionBean.java | 3 +- 15 files changed, 42 insertions(+), 70 deletions(-) rename src/java/org/mxchange/jcontacts/{ => model}/contact/AddressbookAdminContactSessionBean.java (96%) rename src/java/org/mxchange/jcontacts/{ => model}/contact/AddressbookContactSessionBean.java (90%) rename src/java/org/mxchange/jcontacts/{ => model}/phone/AddressbookAdminContactPhoneSessionBean.java (99%) rename src/java/org/mxchange/jcontactsbusiness/{ => model}/basicdata/AddressbookAdminBusinessDataSessionBean.java (93%) rename src/java/org/mxchange/jcontactsbusiness/{ => model}/basicdata/AddressbookBusinessDataSessionBean.java (94%) rename src/java/org/mxchange/jcontactsbusiness/{ => model}/branchoffice/AddressbookAdminBranchOfficeSessionBean.java (92%) rename src/java/org/mxchange/jcontactsbusiness/{ => model}/branchoffice/AddressbookBranchOfficeSessionBean.java (90%) rename src/java/org/mxchange/jcontactsbusiness/{ => model}/employee/AddressbookAdminCompanyEmployeeSessionBean.java (96%) rename src/java/org/mxchange/jcontactsbusiness/{ => model}/employee/AddressbookCompanyEmployeeSessionBean.java (95%) rename src/java/org/mxchange/jcountry/{ => model}/data/AddressbookCountrySingletonBean.java (96%) rename src/java/org/mxchange/jphone/{ => model}/phonenumbers/mobileprovider/AddressbookAdminMobileProviderSessionBean.java (94%) rename src/java/org/mxchange/jphone/{ => model}/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.java (87%) rename src/java/org/mxchange/jphone/{ => model}/phonenumbers/phone/AddressbookAdminPhoneSessionBean.java (99%) rename src/java/org/mxchange/jphone/{ => model}/phonenumbers/phone/AddressbookPhoneSessionBean.java (98%) diff --git a/src/conf/persistence.xml b/src/conf/persistence.xml index 9f42305..ee278be 100644 --- a/src/conf/persistence.xml +++ b/src/conf/persistence.xml @@ -5,20 +5,20 @@ org.mxchange.jaddressbook.model.addressbook.UserAddressbook org.mxchange.jaddressbook.model.addressbook.entry.UserAddressbookEntry org.mxchange.jaddressbookshare.model.addressbook.shared.AddressbookShare - 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.jphone.phonenumbers.fax.FaxNumber - org.mxchange.jphone.phonenumbers.landline.LandLineNumber - org.mxchange.jphone.phonenumbers.mobile.MobileNumber - org.mxchange.jphone.phonenumbers.mobileprovider.CellphoneProvider + 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.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.jusercore.model.email_address.EmailAddressChange org.mxchange.jusercore.model.user.LoginUser org.mxchange.jusercore.model.user.activity.UserActivityLog diff --git a/src/java/org/mxchange/jcontacts/contact/AddressbookAdminContactSessionBean.java b/src/java/org/mxchange/jcontacts/model/contact/AddressbookAdminContactSessionBean.java similarity index 96% rename from src/java/org/mxchange/jcontacts/contact/AddressbookAdminContactSessionBean.java rename to src/java/org/mxchange/jcontacts/model/contact/AddressbookAdminContactSessionBean.java index d3a3ad2..82c88b4 100644 --- a/src/java/org/mxchange/jcontacts/contact/AddressbookAdminContactSessionBean.java +++ b/src/java/org/mxchange/jcontacts/model/contact/AddressbookAdminContactSessionBean.java @@ -14,18 +14,16 @@ * 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 java.text.MessageFormat; import java.util.GregorianCalendar; import javax.ejb.Stateless; -import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; import javax.persistence.NoResultException; import javax.persistence.Query; +import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException; import org.mxchange.jcontacts.exceptions.ContactNotFoundException; -import org.mxchange.jcontacts.model.contact.AdminContactSessionBeanRemote; -import org.mxchange.jcontacts.model.contact.Contact; /** * An administrative contact EJB diff --git a/src/java/org/mxchange/jcontacts/contact/AddressbookContactSessionBean.java b/src/java/org/mxchange/jcontacts/model/contact/AddressbookContactSessionBean.java similarity index 90% rename from src/java/org/mxchange/jcontacts/contact/AddressbookContactSessionBean.java rename to src/java/org/mxchange/jcontacts/model/contact/AddressbookContactSessionBean.java index a720285..5bd528d 100644 --- a/src/java/org/mxchange/jcontacts/contact/AddressbookContactSessionBean.java +++ b/src/java/org/mxchange/jcontacts/model/contact/AddressbookContactSessionBean.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.jcontacts.contact; +package org.mxchange.jcontacts.model.contact; import java.text.MessageFormat; import java.util.Iterator; @@ -25,10 +25,6 @@ import javax.persistence.NoResultException; import javax.persistence.Query; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; import org.mxchange.jcontacts.exceptions.ContactNotFoundException; -import org.mxchange.jcontacts.model.contact.Contact; -import org.mxchange.jcontacts.model.contact.ContactSessionBeanRemote; -import org.mxchange.jcontacts.model.contact.ContactUtils; -import org.mxchange.jcontacts.model.contact.UserContact; /** * A contact EJB @@ -271,9 +267,9 @@ public class AddressbookContactSessionBean extends BaseAddressbookDatabaseBean i } @Override - public Contact updateContactData (final Contact contact, final boolean isMobileUnlinked, final boolean isLandlineUnlinked, final boolean isFaxUnlinked) { + public Contact updateContactData (final Contact contact, final boolean isCellphoneUnlinked, final boolean isLandlineUnlinked, final boolean isFaxUnlinked) { // Log trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateContactData: contact={1},isMobileUnlinked={2},isLandlineUnlinked={3},isFaxUnlinked={4} - CALLED!", this.getClass().getSimpleName(), contact, isMobileUnlinked, isLandlineUnlinked, isFaxUnlinked)); //NOI18N + this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateContactData: contact={1},isCellphoneUnlinked={2},isLandlineUnlinked={3},isFaxUnlinked={4} - CALLED!", this.getClass().getSimpleName(), contact, isCellphoneUnlinked, isLandlineUnlinked, isFaxUnlinked)); //NOI18N // The contact instance must be valid if (null == contact) { @@ -287,14 +283,17 @@ public class AddressbookContactSessionBean extends BaseAddressbookDatabaseBean i throw new IllegalStateException(MessageFormat.format("contact.contactId={0} is not valid.", contact.getContactId())); //NOI18N } - // Merge cellphone, land-line and fix - Contact managedContact = this.mergeContactData(contact); + // Set updated timestamp + this.setAllContactPhoneEntriesUpdated(contact, isCellphoneUnlinked, isLandlineUnlinked, isFaxUnlinked); + + // Merge mobile, land-line and fix + Contact detachedContact = this.mergeContactData(contact); // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateContactData: managedContact={1} - EXIT!", this.getClass().getSimpleName(), managedContact)); //NOI18N + this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateContactData: detachedContact={1} - EXIT!", this.getClass().getSimpleName(), detachedContact)); //NOI18N // Return it - return managedContact; + return detachedContact; } @Override @@ -315,18 +314,18 @@ public class AddressbookContactSessionBean extends BaseAddressbookDatabaseBean i } // Is cell phone/land-line/fax number unlinked? - boolean isMobileUnlinked = (contact.getContactMobileNumber() == null); + boolean isCellphoneUnlinked = (contact.getContactMobileNumber() == null); boolean isLandLineUnlinked = (contact.getContactLandLineNumber() == null); boolean isFaxUnlinked = (contact.getContactFaxNumber() == null); // Call other Method - Contact managedContact = this.updateContactData(contact, isMobileUnlinked, isLandLineUnlinked, isFaxUnlinked); + Contact detachedContact = this.updateContactData(contact, isCellphoneUnlinked, isLandLineUnlinked, isFaxUnlinked); // Trace message - this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateContactData: managedContact={1} - EXIT!", this.getClass().getSimpleName(), managedContact)); //NOI18N + this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateContactData: detachedContact={1} - EXIT!", this.getClass().getSimpleName(), detachedContact)); //NOI18N // Return it - return managedContact; + return detachedContact; } } diff --git a/src/java/org/mxchange/jcontacts/phone/AddressbookAdminContactPhoneSessionBean.java b/src/java/org/mxchange/jcontacts/model/phone/AddressbookAdminContactPhoneSessionBean.java similarity index 99% rename from src/java/org/mxchange/jcontacts/phone/AddressbookAdminContactPhoneSessionBean.java rename to src/java/org/mxchange/jcontacts/model/phone/AddressbookAdminContactPhoneSessionBean.java index b520b1f..93d130d 100644 --- a/src/java/org/mxchange/jcontacts/phone/AddressbookAdminContactPhoneSessionBean.java +++ b/src/java/org/mxchange/jcontacts/model/phone/AddressbookAdminContactPhoneSessionBean.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.jcontacts.phone; +package org.mxchange.jcontacts.model.phone; import java.text.MessageFormat; import java.util.GregorianCalendar; @@ -24,7 +24,6 @@ import javax.ejb.Stateless; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcontacts.model.contact.ContactSessionBeanRemote; -import org.mxchange.jcontacts.model.phone.AdminContactsPhoneSessionBeanRemote; import org.mxchange.jphone.exceptions.PhoneNumberAlreadyLinkedException; import org.mxchange.jphone.exceptions.PhoneNumberNotLinkedException; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; diff --git a/src/java/org/mxchange/jcontactsbusiness/basicdata/AddressbookAdminBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/AddressbookAdminBusinessDataSessionBean.java similarity index 93% rename from src/java/org/mxchange/jcontactsbusiness/basicdata/AddressbookAdminBusinessDataSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/basicdata/AddressbookAdminBusinessDataSessionBean.java index cf8d545..39a8358 100644 --- a/src/java/org/mxchange/jcontactsbusiness/basicdata/AddressbookAdminBusinessDataSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/AddressbookAdminBusinessDataSessionBean.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.jcontactsbusiness.basicdata; +package org.mxchange.jcontactsbusiness.model.basicdata; import java.text.MessageFormat; import java.util.GregorianCalendar; @@ -24,9 +24,6 @@ import javax.ejb.EJB; import javax.ejb.Stateless; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataAlreadyAddedException; -import org.mxchange.jcontactsbusiness.model.basicdata.AdminBusinessDataSessionBeanRemote; -import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; -import org.mxchange.jcontactsbusiness.model.basicdata.BusinessDataSessionBeanRemote; import org.mxchange.jcontactsbusiness.model.employee.Employee; import org.mxchange.jusercore.model.user.User; diff --git a/src/java/org/mxchange/jcontactsbusiness/basicdata/AddressbookBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/AddressbookBusinessDataSessionBean.java similarity index 94% rename from src/java/org/mxchange/jcontactsbusiness/basicdata/AddressbookBusinessDataSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/basicdata/AddressbookBusinessDataSessionBean.java index 33d84f6..dff08e5 100644 --- a/src/java/org/mxchange/jcontactsbusiness/basicdata/AddressbookBusinessDataSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/AddressbookBusinessDataSessionBean.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.jcontactsbusiness.basicdata; +package org.mxchange.jcontactsbusiness.model.basicdata; import java.text.MessageFormat; import java.util.List; @@ -24,9 +24,6 @@ import javax.persistence.NoResultException; import javax.persistence.Query; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataNotFoundException; -import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; -import org.mxchange.jcontactsbusiness.model.basicdata.BusinessDataSessionBeanRemote; -import org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData; /** * A stateless session bean for business data diff --git a/src/java/org/mxchange/jcontactsbusiness/branchoffice/AddressbookAdminBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/AddressbookAdminBranchOfficeSessionBean.java similarity index 92% rename from src/java/org/mxchange/jcontactsbusiness/branchoffice/AddressbookAdminBranchOfficeSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/branchoffice/AddressbookAdminBranchOfficeSessionBean.java index 020d0ba..9040c22 100644 --- a/src/java/org/mxchange/jcontactsbusiness/branchoffice/AddressbookAdminBranchOfficeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/AddressbookAdminBranchOfficeSessionBean.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.jcontactsbusiness.branchoffice; +package org.mxchange.jcontactsbusiness.model.branchoffice; import java.text.MessageFormat; import java.util.GregorianCalendar; @@ -24,10 +24,6 @@ import javax.ejb.Stateless; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeAlreadyAddedException; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; -import org.mxchange.jcontactsbusiness.model.branchoffice.AdminBranchOfficeSessionBeanRemote; -import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; -import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote; -import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffices; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jusercore.model.user.User; diff --git a/src/java/org/mxchange/jcontactsbusiness/branchoffice/AddressbookBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/AddressbookBranchOfficeSessionBean.java similarity index 90% rename from src/java/org/mxchange/jcontactsbusiness/branchoffice/AddressbookBranchOfficeSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/branchoffice/AddressbookBranchOfficeSessionBean.java index 3fe167a..1aa258d 100644 --- a/src/java/org/mxchange/jcontactsbusiness/branchoffice/AddressbookBranchOfficeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/AddressbookBranchOfficeSessionBean.java @@ -14,15 +14,13 @@ * 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.List; import javax.ejb.Stateless; import javax.persistence.Query; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; -import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; -import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote; /** * A stateless session bean for general branch office purposes diff --git a/src/java/org/mxchange/jcontactsbusiness/employee/AddressbookAdminCompanyEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/AddressbookAdminCompanyEmployeeSessionBean.java similarity index 96% rename from src/java/org/mxchange/jcontactsbusiness/employee/AddressbookAdminCompanyEmployeeSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/employee/AddressbookAdminCompanyEmployeeSessionBean.java index 27bd364..3cd42fc 100644 --- a/src/java/org/mxchange/jcontactsbusiness/employee/AddressbookAdminCompanyEmployeeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/AddressbookAdminCompanyEmployeeSessionBean.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.jcontactsbusiness.employee; +package org.mxchange.jcontactsbusiness.model.employee; import javax.ejb.Stateless; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; diff --git a/src/java/org/mxchange/jcontactsbusiness/employee/AddressbookCompanyEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/AddressbookCompanyEmployeeSessionBean.java similarity index 95% rename from src/java/org/mxchange/jcontactsbusiness/employee/AddressbookCompanyEmployeeSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/employee/AddressbookCompanyEmployeeSessionBean.java index 5c19171..3f6b8b2 100644 --- a/src/java/org/mxchange/jcontactsbusiness/employee/AddressbookCompanyEmployeeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/AddressbookCompanyEmployeeSessionBean.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.jcontactsbusiness.employee; +package org.mxchange.jcontactsbusiness.model.employee; import java.text.MessageFormat; import java.util.List; @@ -23,8 +23,6 @@ import javax.persistence.NoResultException; import javax.persistence.Query; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; import org.mxchange.jcontactsbusiness.exceptions.employee.CompanyEmployeeNotFoundException; -import org.mxchange.jcontactsbusiness.model.employee.CompanyEmployeeSessionBeanRemote; -import org.mxchange.jcontactsbusiness.model.employee.Employee; /** * A stateless bean for general purposes for company employees. diff --git a/src/java/org/mxchange/jcountry/data/AddressbookCountrySingletonBean.java b/src/java/org/mxchange/jcountry/model/data/AddressbookCountrySingletonBean.java similarity index 96% rename from src/java/org/mxchange/jcountry/data/AddressbookCountrySingletonBean.java rename to src/java/org/mxchange/jcountry/model/data/AddressbookCountrySingletonBean.java index 0aad3fd..d2029c9 100644 --- a/src/java/org/mxchange/jcountry/data/AddressbookCountrySingletonBean.java +++ b/src/java/org/mxchange/jcountry/model/data/AddressbookCountrySingletonBean.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.jcountry.data; +package org.mxchange.jcountry.model.data; import java.text.MessageFormat; import java.util.GregorianCalendar; @@ -25,9 +25,6 @@ import javax.persistence.NoResultException; import javax.persistence.Query; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; import org.mxchange.jcountry.exceptions.CountryAlreadyAddedException; -import org.mxchange.jcountry.model.data.Country; -import org.mxchange.jcountry.model.data.CountryData; -import org.mxchange.jcountry.model.data.CountrySingletonBeanRemote; /** * A singleton EJB for country informations diff --git a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookAdminMobileProviderSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/AddressbookAdminMobileProviderSessionBean.java similarity index 94% rename from src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookAdminMobileProviderSessionBean.java rename to src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/AddressbookAdminMobileProviderSessionBean.java index e36dc5d..135172d 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookAdminMobileProviderSessionBean.java +++ b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/AddressbookAdminMobileProviderSessionBean.java @@ -14,15 +14,13 @@ * 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.addressbook.database.BaseAddressbookDatabaseBean; 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/AddressbookMobileProviderSingletonBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.java similarity index 87% rename from src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.java rename to src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.java index 5877721..b277e3b 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.java +++ b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.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; @@ -22,9 +22,6 @@ import javax.ejb.Singleton; import javax.ejb.Startup; import javax.persistence.Query; import org.mxchange.addressbook.database.BaseAddressbookDatabaseBean; -import org.mxchange.jphone.model.phonenumbers.mobileprovider.CellphoneProvider; -import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; -import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote; /** * A singleton EJB for mobile provider informations diff --git a/src/java/org/mxchange/jphone/phonenumbers/phone/AddressbookAdminPhoneSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/phone/AddressbookAdminPhoneSessionBean.java similarity index 99% rename from src/java/org/mxchange/jphone/phonenumbers/phone/AddressbookAdminPhoneSessionBean.java rename to src/java/org/mxchange/jphone/model/phonenumbers/phone/AddressbookAdminPhoneSessionBean.java index bee9e5b..9010a8c 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/phone/AddressbookAdminPhoneSessionBean.java +++ b/src/java/org/mxchange/jphone/model/phonenumbers/phone/AddressbookAdminPhoneSessionBean.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.GregorianCalendar; @@ -26,7 +26,6 @@ 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.model.phonenumbers.phone.AdminPhoneSessionBeanRemote; /** * An EJB for administrative phone purposes diff --git a/src/java/org/mxchange/jphone/phonenumbers/phone/AddressbookPhoneSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/phone/AddressbookPhoneSessionBean.java similarity index 98% rename from src/java/org/mxchange/jphone/phonenumbers/phone/AddressbookPhoneSessionBean.java rename to src/java/org/mxchange/jphone/model/phonenumbers/phone/AddressbookPhoneSessionBean.java index 54259d7..c1ddc99 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/phone/AddressbookPhoneSessionBean.java +++ b/src/java/org/mxchange/jphone/model/phonenumbers/phone/AddressbookPhoneSessionBean.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; @@ -29,7 +29,6 @@ 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; -import org.mxchange.jphone.model.phonenumbers.phone.PhoneSessionBeanRemote; /** * A general phone EJB -- 2.39.5