From 235c4eb1876fc4d231b41166226f3386d9fd246c 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 ++++----- .../contact/JobsAdminContactSessionBean.java | 2 +- .../contact/JobsContactSessionBean.java | 23 ++++---- .../JobsAdminContactPhoneSessionBean.java | 56 +++++++++--------- .../JobsAdminBusinessDataSessionBean.java | 4 +- .../JobsBusinessDataSessionBean.java | 3 +- .../JobsAdminBranchOfficeSessionBean.java | 14 ++--- .../JobsBranchOfficeSessionBean.java | 3 +- .../JobsAdminCompanyEmployeeSessionBean.java | 3 +- .../JobsCompanyEmployeeSessionBean.java | 3 +- .../data/JobsCountrySingletonBean.java | 2 +- .../jjobs/database/BaseJobsDatabaseBean.java | 30 +++++----- .../JobsAdminMobileProviderSessionBean.java | 2 +- .../JobsMobileProviderSingletonBean.java | 2 +- .../phone/JobsAdminPhoneSessionBean.java | 57 +++++++++---------- .../phone/JobsPhoneSessionBean.java | 51 ++++++++--------- .../model/user/JobsAdminUserSessionBean.java | 2 +- .../model/user/JobsUserSessionBean.java | 16 +++--- .../JobsUserEmailChangeSessionBean.java | 2 +- .../JobsUserRegistrationSessionBean.java | 2 +- 20 files changed, 150 insertions(+), 155 deletions(-) rename src/java/org/mxchange/jcontacts/{ => model}/contact/JobsAdminContactSessionBean.java (99%) rename src/java/org/mxchange/jcontacts/{ => model}/contact/JobsContactSessionBean.java (91%) rename src/java/org/mxchange/jcontacts/{ => model}/phone/JobsAdminContactPhoneSessionBean.java (83%) rename src/java/org/mxchange/jcontactsbusiness/{ => model}/basicdata/JobsAdminBusinessDataSessionBean.java (95%) rename src/java/org/mxchange/jcontactsbusiness/{ => model}/basicdata/JobsBusinessDataSessionBean.java (97%) rename src/java/org/mxchange/jcontactsbusiness/{ => model}/branchoffice/JobsAdminBranchOfficeSessionBean.java (86%) rename src/java/org/mxchange/jcontactsbusiness/{ => model}/branchoffice/JobsBranchOfficeSessionBean.java (93%) rename src/java/org/mxchange/jcontactsbusiness/{ => model}/employee/JobsAdminCompanyEmployeeSessionBean.java (90%) rename src/java/org/mxchange/jcontactsbusiness/{ => model}/employee/JobsCompanyEmployeeSessionBean.java (96%) rename src/java/org/mxchange/jcountry/{ => model}/data/JobsCountrySingletonBean.java (99%) rename src/java/org/mxchange/jphone/{ => model}/phonenumbers/mobileprovider/JobsAdminMobileProviderSessionBean.java (98%) rename src/java/org/mxchange/jphone/{ => model}/phonenumbers/mobileprovider/JobsMobileProviderSingletonBean.java (97%) rename src/java/org/mxchange/jphone/{ => model}/phonenumbers/phone/JobsAdminPhoneSessionBean.java (80%) rename src/java/org/mxchange/jphone/{ => model}/phonenumbers/phone/JobsPhoneSessionBean.java (73%) diff --git a/src/conf/persistence.xml b/src/conf/persistence.xml index d6bf42b..9376c6f 100644 --- a/src/conf/persistence.xml +++ b/src/conf/persistence.xml @@ -4,24 +4,24 @@ jdbc/jjobs org.mxchange.jaddressbook.model.addressbook.UserAddressbook org.mxchange.jaddressbook.model.addressbook.entry.UserAddressbookEntry - 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.jjobs.model.jobposition.JobPosition org.mxchange.jjobs.model.jobskill.JobPositionSkill org.mxchange.jjobs.model.skill.JobSkill org.mxchange.jjobs.model.user.skills.UserSkill - 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.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/JobsAdminContactSessionBean.java b/src/java/org/mxchange/jcontacts/model/contact/JobsAdminContactSessionBean.java similarity index 99% rename from src/java/org/mxchange/jcontacts/contact/JobsAdminContactSessionBean.java rename to src/java/org/mxchange/jcontacts/model/contact/JobsAdminContactSessionBean.java index 0c6e744..5fd615b 100644 --- a/src/java/org/mxchange/jcontacts/contact/JobsAdminContactSessionBean.java +++ b/src/java/org/mxchange/jcontacts/model/contact/JobsAdminContactSessionBean.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.GregorianCalendar; diff --git a/src/java/org/mxchange/jcontacts/contact/JobsContactSessionBean.java b/src/java/org/mxchange/jcontacts/model/contact/JobsContactSessionBean.java similarity index 91% rename from src/java/org/mxchange/jcontacts/contact/JobsContactSessionBean.java rename to src/java/org/mxchange/jcontacts/model/contact/JobsContactSessionBean.java index 4768229..52b1c9c 100644 --- a/src/java/org/mxchange/jcontacts/contact/JobsContactSessionBean.java +++ b/src/java/org/mxchange/jcontacts/model/contact/JobsContactSessionBean.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; @@ -267,9 +267,9 @@ public class JobsContactSessionBean extends BaseJobsDatabaseBean implements Cont } @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) { @@ -283,14 +283,17 @@ public class JobsContactSessionBean extends BaseJobsDatabaseBean implements Cont throw new IllegalStateException(MessageFormat.format("contact.contactId={0} is not valid.", contact.getContactId())); //NOI18N } + // Set updated timestamp + this.setAllContactPhoneEntriesUpdated(contact, isCellphoneUnlinked, isLandlineUnlinked, isFaxUnlinked); + // Merge mobile, land-line and fix - Contact managedContact = this.mergeContactData(contact); + 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 @@ -311,18 +314,18 @@ public class JobsContactSessionBean extends BaseJobsDatabaseBean implements Cont } // 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/JobsAdminContactPhoneSessionBean.java b/src/java/org/mxchange/jcontacts/model/phone/JobsAdminContactPhoneSessionBean.java similarity index 83% rename from src/java/org/mxchange/jcontacts/phone/JobsAdminContactPhoneSessionBean.java rename to src/java/org/mxchange/jcontacts/model/phone/JobsAdminContactPhoneSessionBean.java index 9a1c12c..0555707 100644 --- a/src/java/org/mxchange/jcontacts/phone/JobsAdminContactPhoneSessionBean.java +++ b/src/java/org/mxchange/jcontacts/model/phone/JobsAdminContactPhoneSessionBean.java @@ -14,21 +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.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.ContactSessionBeanRemote; import org.mxchange.jjobs.database.BaseJobsDatabaseBean; 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; /** * A session EJB for administrative contact's phone number purposes @@ -58,7 +54,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple } @Override - public Contact linkExistingFaxNumberWithContact (final Contact contact, final DialableFaxNumber faxNumber) throws PhoneNumberAlreadyLinkedException { + public org.mxchange.jcontacts.model.contact.Contact linkExistingFaxNumberWithContact (final org.mxchange.jcontacts.model.contact.Contact contact, final org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber faxNumber) throws PhoneNumberAlreadyLinkedException { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkExistingFaxNumberWithContact: contact={1},faxNumber={2} - CALLED!", this.getClass().getSimpleName(), contact, faxNumber)); //NOI18N @@ -72,7 +68,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple } else if (contact.getContactId() < 1) { // Invalid id number throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid.", contact.getContactId())); //NOI18N - } else if (contact.getContactFaxNumber() instanceof DialableFaxNumber) { + } else if (contact.getContactFaxNumber() instanceof org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber) { // Not set cell phone instance throw new PhoneNumberAlreadyLinkedException(faxNumber); } else if (null == faxNumber) { @@ -105,7 +101,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple contact.setContactFaxNumber(faxNumber); // Update database - final Contact updatedContact = this.contactBean.updateContactData(contact); + final org.mxchange.jcontacts.model.contact.Contact updatedContact = this.contactBean.updateContactData(contact); // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkExistingFaxNumberWithContact: updatedContact={1} - EXIT!", this.getClass().getSimpleName(), updatedContact)); //NOI18N @@ -115,7 +111,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple } @Override - public Contact linkExistingLandLineNumberWithContact (final Contact contact, final DialableLandLineNumber landLineNumber) throws PhoneNumberAlreadyLinkedException { + public org.mxchange.jcontacts.model.contact.Contact linkExistingLandLineNumberWithContact (final org.mxchange.jcontacts.model.contact.Contact contact, final org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber landLineNumber) throws PhoneNumberAlreadyLinkedException { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkExistingLandLineNumberWithContact: contact={1},landLineNumber={2} - CALLED!", this.getClass().getSimpleName(), contact, landLineNumber)); //NOI18N @@ -129,7 +125,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple } else if (contact.getContactId() < 1) { // Invalid id number throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid.", contact.getContactId())); //NOI18N - } else if (contact.getContactLandLineNumber() instanceof DialableLandLineNumber) { + } else if (contact.getContactLandLineNumber() instanceof org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber) { // Not set cell phone instance throw new PhoneNumberAlreadyLinkedException(landLineNumber); } else if (null == landLineNumber) { @@ -162,7 +158,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple contact.setContactLandLineNumber(landLineNumber); // Update database - final Contact updatedContact = this.contactBean.updateContactData(contact); + final org.mxchange.jcontacts.model.contact.Contact updatedContact = this.contactBean.updateContactData(contact); // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkExistingLandLineNumberWithContact: updatedContact={1} - EXIT!", this.getClass().getSimpleName(), updatedContact)); //NOI18N @@ -172,7 +168,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple } @Override - public Contact linkExistingMobileNumberWithContact (final Contact contact, final DialableMobileNumber mobileNumber) throws PhoneNumberAlreadyLinkedException { + public org.mxchange.jcontacts.model.contact.Contact linkExistingMobileNumberWithContact (final org.mxchange.jcontacts.model.contact.Contact contact, final org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber mobileNumber) throws PhoneNumberAlreadyLinkedException { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkExistingMobileNumberWithContact: contact={1},mobileNumber={2} - CALLED!", this.getClass().getSimpleName(), contact, mobileNumber)); //NOI18N @@ -186,7 +182,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple } else if (contact.getContactId() < 1) { // Invalid id number throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid.", contact.getContactId())); //NOI18N - } else if (contact.getContactMobileNumber() instanceof DialableMobileNumber) { + } else if (contact.getContactMobileNumber() instanceof org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber) { // Not set cell phone instance throw new PhoneNumberAlreadyLinkedException(mobileNumber); } else if (null == mobileNumber) { @@ -213,7 +209,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple contact.setContactMobileNumber(mobileNumber); // Update database - final Contact updatedContact = this.contactBean.updateContactData(contact); + final org.mxchange.jcontacts.model.contact.Contact updatedContact = this.contactBean.updateContactData(contact); // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkExistingMobileNumberWithContact: updatedContact={1} - EXIT!", this.getClass().getSimpleName(), updatedContact)); //NOI18N @@ -223,7 +219,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple } @Override - public Contact linkNewFaxNumberWithContact (final Contact contact, final DialableFaxNumber faxNumber) throws PhoneNumberAlreadyLinkedException { + public org.mxchange.jcontacts.model.contact.Contact linkNewFaxNumberWithContact (final org.mxchange.jcontacts.model.contact.Contact contact, final org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber faxNumber) throws PhoneNumberAlreadyLinkedException { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkNewFaxNumberWithContact: contact={1},faxNumber={2} - CALLED!", this.getClass().getSimpleName(), contact, faxNumber)); //NOI18N @@ -237,7 +233,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple } else if (contact.getContactId() < 1) { // Invalid id number throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid.", contact.getContactId())); //NOI18N - } else if (contact.getContactFaxNumber() instanceof DialableFaxNumber) { + } else if (contact.getContactFaxNumber() instanceof org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber) { // Not set cell phone instance throw new PhoneNumberAlreadyLinkedException(faxNumber); } else if (null == faxNumber) { @@ -270,7 +266,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple contact.setContactFaxNumber(faxNumber); // Update database - final Contact updatedContact = this.contactBean.updateContactData(contact); + final org.mxchange.jcontacts.model.contact.Contact updatedContact = this.contactBean.updateContactData(contact); // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkNewFaxNumberWithContact: updatedContact={1} - EXIT!", this.getClass().getSimpleName(), updatedContact)); //NOI18N @@ -280,7 +276,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple } @Override - public Contact linkNewLandLineNumberWithContact (final Contact contact, final DialableLandLineNumber landLineNumber) throws PhoneNumberAlreadyLinkedException { + public org.mxchange.jcontacts.model.contact.Contact linkNewLandLineNumberWithContact (final org.mxchange.jcontacts.model.contact.Contact contact, final org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber landLineNumber) throws PhoneNumberAlreadyLinkedException { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkNewLandLineNumberWithContact: contact={1},landLineNumber={2} - CALLED!", this.getClass().getSimpleName(), contact, landLineNumber)); //NOI18N @@ -294,7 +290,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple } else if (contact.getContactId() < 1) { // Invalid id number throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid.", contact.getContactId())); //NOI18N - } else if (contact.getContactLandLineNumber() instanceof DialableLandLineNumber) { + } else if (contact.getContactLandLineNumber() instanceof org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber) { // Not set cell phone instance throw new PhoneNumberAlreadyLinkedException(landLineNumber); } else if (null == landLineNumber) { @@ -327,7 +323,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple contact.setContactLandLineNumber(landLineNumber); // Update database - final Contact updatedContact = this.contactBean.updateContactData(contact); + final org.mxchange.jcontacts.model.contact.Contact updatedContact = this.contactBean.updateContactData(contact); // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkNewLandLineNumberWithContact: updatedContact={1} - EXIT!", this.getClass().getSimpleName(), updatedContact)); //NOI18N @@ -337,7 +333,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple } @Override - public Contact linkNewMobileNumberWithContact (final Contact contact, final DialableMobileNumber mobileNumber) throws PhoneNumberAlreadyLinkedException { + public org.mxchange.jcontacts.model.contact.Contact linkNewMobileNumberWithContact (final org.mxchange.jcontacts.model.contact.Contact contact, final org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber mobileNumber) throws PhoneNumberAlreadyLinkedException { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkNewMobileNumberWithContact: contact={1},mobileNumber={2} - CALLED!", this.getClass().getSimpleName(), contact, mobileNumber)); //NOI18N @@ -351,7 +347,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple } else if (contact.getContactId() < 1) { // Invalid id number throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid.", contact.getContactId())); //NOI18N - } else if (contact.getContactMobileNumber() instanceof DialableMobileNumber) { + } else if (contact.getContactMobileNumber() instanceof org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber) { // Not set cell phone instance throw new PhoneNumberAlreadyLinkedException(mobileNumber); } else if (null == mobileNumber) { @@ -378,7 +374,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple contact.setContactMobileNumber(mobileNumber); // Update database - final Contact updatedContact = this.contactBean.updateContactData(contact); + final org.mxchange.jcontacts.model.contact.Contact updatedContact = this.contactBean.updateContactData(contact); // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkNewMobileNumberWithContact: updatedContact={1} - EXIT!", this.getClass().getSimpleName(), updatedContact)); //NOI18N @@ -388,7 +384,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple } @Override - public Contact unlinkFaxDataFromContact (final Contact contact, final DialableFaxNumber faxNumber) throws PhoneNumberNotLinkedException { + public org.mxchange.jcontacts.model.contact.Contact unlinkFaxDataFromContact (final org.mxchange.jcontacts.model.contact.Contact contact, final org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber faxNumber) throws PhoneNumberNotLinkedException { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.unlinkFaxDataFromContact: contact={1},faxNumber={2} - CALLED!", this.getClass().getSimpleName(), contact, faxNumber)); //NOI18N @@ -420,7 +416,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple contact.setContactFaxNumber(null); // Update database - final Contact updatedContact = this.contactBean.updateContactData(contact); + final org.mxchange.jcontacts.model.contact.Contact updatedContact = this.contactBean.updateContactData(contact); // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.unlinkFaxDataFromContact: updatedContact={1} - EXIT!", this.getClass().getSimpleName(), updatedContact)); //NOI18N @@ -430,7 +426,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple } @Override - public Contact unlinkLandLineDataFromContact (final Contact contact, final DialableLandLineNumber landLineNumber) throws PhoneNumberNotLinkedException { + public org.mxchange.jcontacts.model.contact.Contact unlinkLandLineDataFromContact (final org.mxchange.jcontacts.model.contact.Contact contact, final org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber landLineNumber) throws PhoneNumberNotLinkedException { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.unlinkLandLineDataFromContact: contact={1},landLineNumber={2} - CALLED!", this.getClass().getSimpleName(), contact, landLineNumber)); //NOI18N @@ -462,7 +458,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple contact.setContactLandLineNumber(null); // Update database - final Contact updatedContact = this.contactBean.updateContactData(contact); + final org.mxchange.jcontacts.model.contact.Contact updatedContact = this.contactBean.updateContactData(contact); // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.unlinkLandLineDataFromContact: updatedContact={1} - EXIT!", this.getClass().getSimpleName(), updatedContact)); //NOI18N @@ -472,7 +468,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple } @Override - public Contact unlinkMobileDataFromContact (final Contact contact, final DialableMobileNumber mobileNumber) throws PhoneNumberNotLinkedException { + public org.mxchange.jcontacts.model.contact.Contact unlinkMobileDataFromContact (final org.mxchange.jcontacts.model.contact.Contact contact, final org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber mobileNumber) throws PhoneNumberNotLinkedException { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.unlinkMobileDataFromContact: contact={1},mobileNumber={2} - CALLED!", this.getClass().getSimpleName(), contact, mobileNumber)); //NOI18N @@ -504,7 +500,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean imple contact.setContactMobileNumber(null); // Update database - final Contact updatedContact = this.contactBean.updateContactData(contact); + final org.mxchange.jcontacts.model.contact.Contact updatedContact = this.contactBean.updateContactData(contact); // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.unlinkMobileDataFromContact: updatedContact={1} - EXIT!", this.getClass().getSimpleName(), updatedContact)); //NOI18N diff --git a/src/java/org/mxchange/jcontactsbusiness/basicdata/JobsAdminBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsAdminBusinessDataSessionBean.java similarity index 95% rename from src/java/org/mxchange/jcontactsbusiness/basicdata/JobsAdminBusinessDataSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsAdminBusinessDataSessionBean.java index bc5279d..b1bd1ba 100644 --- a/src/java/org/mxchange/jcontactsbusiness/basicdata/JobsAdminBusinessDataSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsAdminBusinessDataSessionBean.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; @@ -22,6 +22,8 @@ import java.util.List; import java.util.Objects; import javax.ejb.EJB; import javax.ejb.Stateless; +import org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote; +import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote; import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataAlreadyAddedException; import org.mxchange.jcontactsbusiness.model.employee.Employee; import org.mxchange.jjobs.database.BaseJobsDatabaseBean; diff --git a/src/java/org/mxchange/jcontactsbusiness/basicdata/JobsBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsBusinessDataSessionBean.java similarity index 97% rename from src/java/org/mxchange/jcontactsbusiness/basicdata/JobsBusinessDataSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsBusinessDataSessionBean.java index bec3cc5..a0c473d 100644 --- a/src/java/org/mxchange/jcontactsbusiness/basicdata/JobsBusinessDataSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsBusinessDataSessionBean.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; @@ -22,6 +22,7 @@ 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.jjobs.database.BaseJobsDatabaseBean; diff --git a/src/java/org/mxchange/jcontactsbusiness/branchoffice/JobsAdminBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java similarity index 86% rename from src/java/org/mxchange/jcontactsbusiness/branchoffice/JobsAdminBranchOfficeSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java index ce149fb..b8be625 100644 --- a/src/java/org/mxchange/jcontactsbusiness/branchoffice/JobsAdminBranchOfficeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java @@ -14,16 +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.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.jjobs.database.BaseJobsDatabaseBean; import org.mxchange.jusercore.model.user.User; @@ -75,9 +75,9 @@ public class JobsAdminBranchOfficeSessionBean extends BaseJobsDatabaseBean imple branchOffice.setBranchCreated(new GregorianCalendar()); // Is user instance set? - if (branchOffice.getBranchCompany() instanceof BusinessBasicData) { + if (branchOffice.getBranchCompany() instanceof org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData) { // Get managed instance back - final BusinessBasicData managedBasicData = this.createManaged(branchOffice.getBranchCompany()); + final org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData managedBasicData = this.createManaged(branchOffice.getBranchCompany()); // Set it back in branch office branchOffice.setBranchCompany(managedBasicData); @@ -93,9 +93,9 @@ public class JobsAdminBranchOfficeSessionBean extends BaseJobsDatabaseBean imple } // Is user instance set? - if (branchOffice.getBranchCountry() instanceof Country) { + if (branchOffice.getBranchCountry() instanceof org.mxchange.jcountry.model.data.Country) { // Get managed instance back - final Country managedCountry = this.createManaged(branchOffice.getBranchCountry()); + final org.mxchange.jcountry.model.data.Country managedCountry = this.createManaged(branchOffice.getBranchCountry()); // Set it back in branch office branchOffice.setBranchCountry(managedCountry); diff --git a/src/java/org/mxchange/jcontactsbusiness/branchoffice/JobsBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsBranchOfficeSessionBean.java similarity index 93% rename from src/java/org/mxchange/jcontactsbusiness/branchoffice/JobsBranchOfficeSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsBranchOfficeSessionBean.java index bf02f66..f1ed632 100644 --- a/src/java/org/mxchange/jcontactsbusiness/branchoffice/JobsBranchOfficeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsBranchOfficeSessionBean.java @@ -14,12 +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.jcontactsbusiness.branchoffice.BranchOfficeSessionBeanRemote; import org.mxchange.jjobs.database.BaseJobsDatabaseBean; /** diff --git a/src/java/org/mxchange/jcontactsbusiness/employee/JobsAdminCompanyEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsAdminCompanyEmployeeSessionBean.java similarity index 90% rename from src/java/org/mxchange/jcontactsbusiness/employee/JobsAdminCompanyEmployeeSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/employee/JobsAdminCompanyEmployeeSessionBean.java index cf3c022..79b4897 100644 --- a/src/java/org/mxchange/jcontactsbusiness/employee/JobsAdminCompanyEmployeeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsAdminCompanyEmployeeSessionBean.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.jjobs.database.BaseJobsDatabaseBean; /** diff --git a/src/java/org/mxchange/jcontactsbusiness/employee/JobsCompanyEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsCompanyEmployeeSessionBean.java similarity index 96% rename from src/java/org/mxchange/jcontactsbusiness/employee/JobsCompanyEmployeeSessionBean.java rename to src/java/org/mxchange/jcontactsbusiness/model/employee/JobsCompanyEmployeeSessionBean.java index 86055b8..959056c 100644 --- a/src/java/org/mxchange/jcontactsbusiness/employee/JobsCompanyEmployeeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/JobsCompanyEmployeeSessionBean.java @@ -14,13 +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.employee; +package org.mxchange.jcontactsbusiness.model.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.jjobs.database.BaseJobsDatabaseBean; diff --git a/src/java/org/mxchange/jcountry/data/JobsCountrySingletonBean.java b/src/java/org/mxchange/jcountry/model/data/JobsCountrySingletonBean.java similarity index 99% rename from src/java/org/mxchange/jcountry/data/JobsCountrySingletonBean.java rename to src/java/org/mxchange/jcountry/model/data/JobsCountrySingletonBean.java index 2fc68b8..8629f05 100644 --- a/src/java/org/mxchange/jcountry/data/JobsCountrySingletonBean.java +++ b/src/java/org/mxchange/jcountry/model/data/JobsCountrySingletonBean.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; diff --git a/src/java/org/mxchange/jjobs/database/BaseJobsDatabaseBean.java b/src/java/org/mxchange/jjobs/database/BaseJobsDatabaseBean.java index b37d6e3..5a06d18 100644 --- a/src/java/org/mxchange/jjobs/database/BaseJobsDatabaseBean.java +++ b/src/java/org/mxchange/jjobs/database/BaseJobsDatabaseBean.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/JobsAdminMobileProviderSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/JobsAdminMobileProviderSessionBean.java similarity index 98% rename from src/java/org/mxchange/jphone/phonenumbers/mobileprovider/JobsAdminMobileProviderSessionBean.java rename to src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/JobsAdminMobileProviderSessionBean.java index 6111b67..22e4489 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/JobsAdminMobileProviderSessionBean.java +++ b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/JobsAdminMobileProviderSessionBean.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.GregorianCalendar; diff --git a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/JobsMobileProviderSingletonBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/JobsMobileProviderSingletonBean.java similarity index 97% rename from src/java/org/mxchange/jphone/phonenumbers/mobileprovider/JobsMobileProviderSingletonBean.java rename to src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/JobsMobileProviderSingletonBean.java index 0284357..e881ffd 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/JobsMobileProviderSingletonBean.java +++ b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/JobsMobileProviderSingletonBean.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/JobsAdminPhoneSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsAdminPhoneSessionBean.java similarity index 80% rename from src/java/org/mxchange/jphone/phonenumbers/phone/JobsAdminPhoneSessionBean.java rename to src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsAdminPhoneSessionBean.java index 7ba5b51..9b387f6 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/phone/JobsAdminPhoneSessionBean.java +++ b/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsAdminPhoneSessionBean.java @@ -14,18 +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.phone; +package org.mxchange.jphone.model.phonenumbers.phone; import java.text.MessageFormat; import java.util.GregorianCalendar; import javax.ejb.Stateless; import org.mxchange.jjobs.database.BaseJobsDatabaseBean; -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.phone.AdminPhoneSessionBeanRemote; /** * An EJB for administrative phone purposes @@ -49,7 +44,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } @Override - public void deleteFaxData (final DialableFaxNumber faxNumber) { + public void deleteFaxData (final org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber faxNumber) { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.deleteFaxData: faxNumber={1} - CALLED!", this.getClass().getSimpleName(), faxNumber)); @@ -87,7 +82,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } // Get a managed instance - final DialableFaxNumber managedNumber = this.getEntityManager().getReference(faxNumber.getClass(), faxNumber.getPhoneId()); + final org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber managedNumber = this.getEntityManager().getReference(faxNumber.getClass(), faxNumber.getPhoneId()); // Remove it from database this.getEntityManager().remove(managedNumber); @@ -97,7 +92,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } @Override - public void deleteLandLineData (final DialableLandLineNumber landLineNumber) { + public void deleteLandLineData (final org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber landLineNumber) { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.deleteLandLineData: landLineNumber={1} - CALLED!", this.getClass().getSimpleName(), landLineNumber)); @@ -135,7 +130,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } // Get a managed instance - final DialableLandLineNumber managedNumber = this.getEntityManager().getReference(landLineNumber.getClass(), landLineNumber.getPhoneId()); + final org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber managedNumber = this.getEntityManager().getReference(landLineNumber.getClass(), landLineNumber.getPhoneId()); // Remove it from database this.getEntityManager().remove(managedNumber); @@ -145,7 +140,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } @Override - public void deleteMobileData (final DialableMobileNumber mobileNumber) { + public void deleteMobileData (final org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber mobileNumber) { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.deleteMobileData: mobileNumber={1} - CALLED!", this.getClass().getSimpleName(), mobileNumber)); @@ -161,13 +156,13 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getPhoneId())); //NOI18N } else if (mobileNumber.getMobileProvider() == null) { // Throw NPE - throw new NullPointerException("mobileNumber.mobileProvider is null"); //NOI18N + throw new NullPointerException("mobileNumber.cellphoneProvider is null"); //NOI18N } else if (mobileNumber.getMobileProvider().getProviderId() == null) { // ... throw again - throw new NullPointerException("mobileNumber.mobileProvider.providerId is null"); //NOI18N + throw new NullPointerException("mobileNumber.cellphoneProvider.providerId is null"); //NOI18N } else if (mobileNumber.getMobileProvider().getProviderId() < 1) { // Id not valid - throw new IllegalArgumentException(MessageFormat.format("mobileNumber.mobileProvider.providerId={0} is not valid.", mobileNumber.getMobileProvider().getProviderId())); //NOI18N + throw new IllegalArgumentException(MessageFormat.format("mobileNumber.cellphoneProvider.providerId={0} is not valid.", mobileNumber.getMobileProvider().getProviderId())); //NOI18N } else if (mobileNumber.getPhoneNumber() == null) { // Throw NPE again throw new NullPointerException("mobileNumber.phoneNumber is null"); //NOI18N @@ -177,7 +172,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } // Get a managed instance - final DialableMobileNumber managedNumber = this.getEntityManager().getReference(mobileNumber.getClass(), mobileNumber.getPhoneId()); + final org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber managedNumber = this.getEntityManager().getReference(mobileNumber.getClass(), mobileNumber.getPhoneId()); // Remove it from database this.getEntityManager().remove(managedNumber); @@ -187,7 +182,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } @Override - public DialableFaxNumber updateFaxData (final DialableFaxNumber faxNumber) { + public org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber updateFaxData (final org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber faxNumber) { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateFaxData: faxNumber={1} - CALLED!", this.getClass().getSimpleName(), faxNumber)); @@ -225,16 +220,16 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } // Get contact from it and find it - final DialableFaxNumber managedNumber = this.getEntityManager().find(faxNumber.getClass(), faxNumber.getPhoneId()); + final org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber managedNumber = this.getEntityManager().find(faxNumber.getClass(), faxNumber.getPhoneId()); // Should be found - assert (managedNumber instanceof DialableFaxNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", faxNumber.getPhoneId()); //NOI18N + assert (managedNumber instanceof org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", faxNumber.getPhoneId()); //NOI18N // Debug message this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateFaxData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getPhoneId())); //NOI18N // Set updated timestamp - FaxNumbers.copyAll(faxNumber, managedNumber); + org.mxchange.jphone.model.phonenumbers.fax.FaxNumbers.copyAll(faxNumber, managedNumber); managedNumber.setPhoneEntryUpdated(new GregorianCalendar()); // Trace message @@ -245,7 +240,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } @Override - public DialableLandLineNumber updateLandLineData (final DialableLandLineNumber landLineNumber) { + public org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber updateLandLineData (final org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber landLineNumber) { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateLandLineData: landLineNumber={1} - CALLED!", this.getClass().getSimpleName(), landLineNumber)); @@ -283,16 +278,16 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } // Get contact from it and find it - final DialableLandLineNumber managedNumber = this.getEntityManager().find(landLineNumber.getClass(), landLineNumber.getPhoneId()); + final org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber managedNumber = this.getEntityManager().find(landLineNumber.getClass(), landLineNumber.getPhoneId()); // Should be found - assert (managedNumber instanceof DialableLandLineNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", landLineNumber.getPhoneId()); //NOI18N + assert (managedNumber instanceof org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", landLineNumber.getPhoneId()); //NOI18N // Debug message this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateLandLineData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getPhoneId())); //NOI18N // Set updated timestamp - LandLineNumbers.copyAll(landLineNumber, managedNumber); + org.mxchange.jphone.model.phonenumbers.landline.LandLineNumbers.copyAll(landLineNumber, managedNumber); managedNumber.setPhoneEntryUpdated(new GregorianCalendar()); // Trace message @@ -303,7 +298,7 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } @Override - public DialableMobileNumber updateMobileData (final DialableMobileNumber mobileNumber) { + public org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber updateMobileData (final org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber mobileNumber) { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateMobileData: mobileNumber={1} - CALLED!", this.getClass().getSimpleName(), mobileNumber)); @@ -319,13 +314,13 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getPhoneId())); //NOI18N } else if (mobileNumber.getMobileProvider() == null) { // Throw NPE - throw new NullPointerException("mobileNumber.mobileProvider is null"); //NOI18N + throw new NullPointerException("mobileNumber.cellphoneProvider is null"); //NOI18N } else if (mobileNumber.getMobileProvider().getProviderId() == null) { // ... throw again - throw new NullPointerException("mobileNumber.mobileProvider.providerId is null"); //NOI18N + throw new NullPointerException("mobileNumber.cellphoneProvider.providerId is null"); //NOI18N } else if (mobileNumber.getMobileProvider().getProviderId() < 1) { // Id not valid - throw new IllegalArgumentException(MessageFormat.format("mobileNumber.mobileProvider.providerId={0} is not valid.", mobileNumber.getMobileProvider().getProviderId())); //NOI18N + throw new IllegalArgumentException(MessageFormat.format("mobileNumber.cellphoneProvider.providerId={0} is not valid.", mobileNumber.getMobileProvider().getProviderId())); //NOI18N } else if (mobileNumber.getPhoneNumber() == null) { // Throw NPE again throw new NullPointerException("mobileNumber.phoneNumber is null"); //NOI18N @@ -335,16 +330,16 @@ public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements A } // Get contact from it and find it - final DialableMobileNumber managedNumber = this.getEntityManager().find(mobileNumber.getClass(), mobileNumber.getPhoneId()); + final org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber managedNumber = this.getEntityManager().find(mobileNumber.getClass(), mobileNumber.getPhoneId()); // Should be found - assert (managedNumber instanceof DialableMobileNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", mobileNumber.getPhoneId()); //NOI18N + assert (managedNumber instanceof org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", mobileNumber.getPhoneId()); //NOI18N // Debug message this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateMobileData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getPhoneId())); //NOI18N // Set updated timestamp - MobileNumbers.copyAll(mobileNumber, managedNumber); + org.mxchange.jphone.model.phonenumbers.mobile.MobileNumbers.copyAll(mobileNumber, managedNumber); managedNumber.setPhoneEntryUpdated(new GregorianCalendar()); // Trace message diff --git a/src/java/org/mxchange/jphone/phonenumbers/phone/JobsPhoneSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsPhoneSessionBean.java similarity index 73% rename from src/java/org/mxchange/jphone/phonenumbers/phone/JobsPhoneSessionBean.java rename to src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsPhoneSessionBean.java index 883df63..9a07dc9 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/phone/JobsPhoneSessionBean.java +++ b/src/java/org/mxchange/jphone/model/phonenumbers/phone/JobsPhoneSessionBean.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,7 @@ import javax.persistence.NoResultException; import javax.persistence.Query; import org.mxchange.jjobs.database.BaseJobsDatabaseBean; 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.phone.PhoneSessionBeanRemote; /** * A general phone EJB @@ -53,15 +48,15 @@ public class JobsPhoneSessionBean extends BaseJobsDatabaseBean implements PhoneS @SuppressWarnings ("unchecked") @Override - public List allFaxNumbers () { + public List allFaxNumbers () { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allFaxNumbers: CALLED!", this.getClass().getSimpleName())); //NOI18N // Get query - final Query query = this.getEntityManager().createNamedQuery("AllFaxNumbers", FaxNumber.class); //NOI18N + final Query query = this.getEntityManager().createNamedQuery("AllFaxNumbers", org.mxchange.jphone.model.phonenumbers.fax.FaxNumber.class); //NOI18N // Get list from it - final List list = query.getResultList(); + final List list = query.getResultList(); // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allFaxNumbers: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N @@ -72,15 +67,15 @@ public class JobsPhoneSessionBean extends BaseJobsDatabaseBean implements PhoneS @SuppressWarnings ("unchecked") @Override - public List allLandLineNumbers () { + public List allLandLineNumbers () { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allLandLineNumbers: CALLED!", this.getClass().getSimpleName())); //NOI18N // Get query - final Query query = this.getEntityManager().createNamedQuery("AllLandLineNumbers", LandLineNumber.class); //NOI18N + final Query query = this.getEntityManager().createNamedQuery("AllLandLineNumbers", org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber.class); //NOI18N // Get list from it - final List list = query.getResultList(); + final List list = query.getResultList(); // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allLandLineNumbers: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N @@ -91,15 +86,15 @@ public class JobsPhoneSessionBean extends BaseJobsDatabaseBean implements PhoneS @SuppressWarnings ("unchecked") @Override - public List allMobileNumbers () { + public List allMobileNumbers () { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allMobileNumbers: CALLED!", this.getClass().getSimpleName())); //NOI18N // Get query - final Query query = this.getEntityManager().createNamedQuery("AllMobileNumbers", MobileNumber.class); //NOI18N + final Query query = this.getEntityManager().createNamedQuery("AllMobileNumbers", org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber.class); //NOI18N // Get list from it - final List list = query.getResultList(); + final List list = query.getResultList(); // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allMobileNumbers: list.size()={1} - EXIT!", this.getClass().getSimpleName(), list.size())); //NOI18N @@ -109,7 +104,7 @@ public class JobsPhoneSessionBean extends BaseJobsDatabaseBean implements PhoneS } @Override - public DialableFaxNumber findFaxNumberById (final Long faxNumberId) throws PhoneEntityNotFoundException { + public org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber findFaxNumberById (final Long faxNumberId) throws PhoneEntityNotFoundException { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findFaxNumberById: mobileNumberId={1} - CALLED!", this.getClass().getSimpleName(), faxNumberId)); //NOI18N @@ -123,18 +118,18 @@ public class JobsPhoneSessionBean extends BaseJobsDatabaseBean implements PhoneS } // Now find it - final Query query = this.getEntityManager().createNamedQuery("SearchFaxNumberId", FaxNumber.class); //NOI18N + final Query query = this.getEntityManager().createNamedQuery("SearchFaxNumberId", org.mxchange.jphone.model.phonenumbers.fax.FaxNumber.class); //NOI18N // Set parameter query.setParameter("faxNumberId", faxNumberId); //NOI18N // Init instance - final DialableFaxNumber faxNumber; + final org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber faxNumber; // Try to get a result try { // Get a single result - faxNumber = (DialableFaxNumber) query.getSingleResult(); + faxNumber = (org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber) query.getSingleResult(); } catch (NoResultException ex) { // The entry was not found, so throw it again throw new PhoneEntityNotFoundException(faxNumberId, ex); @@ -148,7 +143,7 @@ public class JobsPhoneSessionBean extends BaseJobsDatabaseBean implements PhoneS } @Override - public DialableLandLineNumber findLandLineNumberById (final Long landLineNumberId) throws PhoneEntityNotFoundException { + public org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber findLandLineNumberById (final Long landLineNumberId) throws PhoneEntityNotFoundException { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findLandLineNumberById: mobileNumberId={1} - CALLED!", this.getClass().getSimpleName(), landLineNumberId)); //NOI18N @@ -162,18 +157,18 @@ public class JobsPhoneSessionBean extends BaseJobsDatabaseBean implements PhoneS } // Now find it - final Query query = this.getEntityManager().createNamedQuery("SearchLandLineNumberId", LandLineNumber.class); //NOI18N + final Query query = this.getEntityManager().createNamedQuery("SearchLandLineNumberId", org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber.class); //NOI18N // Set parameter query.setParameter("landLineNumberId", landLineNumberId); //NOI18N // Init instance - final DialableLandLineNumber landLineNumber; + final org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber landLineNumber; // Try to get a result try { // Get a single result - landLineNumber = (DialableLandLineNumber) query.getSingleResult(); + landLineNumber = (org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber) query.getSingleResult(); } catch (NoResultException ex) { // The entry was not found, so throw it again throw new PhoneEntityNotFoundException(landLineNumberId, ex); @@ -187,7 +182,7 @@ public class JobsPhoneSessionBean extends BaseJobsDatabaseBean implements PhoneS } @Override - public DialableMobileNumber findMobileNumberById (final Long mobileNumberId) throws PhoneEntityNotFoundException { + public org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber findMobileNumberById (final Long mobileNumberId) throws PhoneEntityNotFoundException { // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.findMobileNumberById: mobileNumberId={1} - CALLED!", this.getClass().getSimpleName(), mobileNumberId)); //NOI18N @@ -201,18 +196,18 @@ public class JobsPhoneSessionBean extends BaseJobsDatabaseBean implements PhoneS } // Now find it - final Query query = this.getEntityManager().createNamedQuery("SearchMobileNumberId", MobileNumber.class); //NOI18N + final Query query = this.getEntityManager().createNamedQuery("SearchMobileNumberId", org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber.class); //NOI18N // Set parameter query.setParameter("mobileNumberId", mobileNumberId); //NOI18N // Init instance - final DialableMobileNumber mobile; + final org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber mobile; // Try to get a result try { // Get a single result - mobile = (DialableMobileNumber) query.getSingleResult(); + mobile = (org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber) query.getSingleResult(); } catch (NoResultException ex) { // The entry was not found, so throw it again throw new PhoneEntityNotFoundException(mobileNumberId, ex); diff --git a/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java index 2ed096f..fac2bbd 100644 --- a/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.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.jjobs.database.BaseJobsDatabaseBean; import org.mxchange.jusercore.exceptions.EmailAddressAlreadyRegisteredException; import org.mxchange.jusercore.exceptions.UserNameAlreadyRegisteredException; diff --git a/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java index 0b4513d..e4a65fa 100644 --- a/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.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.jjobs.database.BaseJobsDatabaseBean; -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/jusercore/model/user/email_address/JobsUserEmailChangeSessionBean.java b/src/java/org/mxchange/jusercore/model/user/email_address/JobsUserEmailChangeSessionBean.java index 2f02a3b..3f7b677 100644 --- a/src/java/org/mxchange/jusercore/model/user/email_address/JobsUserEmailChangeSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/email_address/JobsUserEmailChangeSessionBean.java @@ -110,7 +110,7 @@ public class JobsUserEmailChangeSessionBean extends BaseJobsDatabaseBean impleme this.generateSecureHash(emailChange); // Make user managed - emailChange.setEmailChangeUser(this.getManaged(emailChange.getEmailChangeUser())); + emailChange.setEmailChangeUser(this.createManaged(emailChange.getEmailChangeUser())); // Persist it //@TODO Fix email delivery then allow this: this.getEntityManager().persist(emailChange); diff --git a/src/java/org/mxchange/juserlogincore/model/user/register/JobsUserRegistrationSessionBean.java b/src/java/org/mxchange/juserlogincore/model/user/register/JobsUserRegistrationSessionBean.java index cc82aa1..a09c73a 100644 --- a/src/java/org/mxchange/juserlogincore/model/user/register/JobsUserRegistrationSessionBean.java +++ b/src/java/org/mxchange/juserlogincore/model/user/register/JobsUserRegistrationSessionBean.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.jjobs.database.BaseJobsDatabaseBean; import org.mxchange.jusercore.exceptions.EmailAddressAlreadyRegisteredException; import org.mxchange.jusercore.exceptions.UserNameAlreadyRegisteredException; -- 2.39.5