From: Roland Haeder Date: Thu, 28 Apr 2016 19:17:40 +0000 (+0200) Subject: Continued cleanup: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=db47b6d2ee283ea587d1b9f08a03e944153102d7;p=jjobs-ejb.git Continued cleanup: - use new BaseJobsDatabaseBean to have it's functionalities - removed mapped names --- diff --git a/src/java/org/mxchange/jcontacts/contact/JobsContactSessionBean.java b/src/java/org/mxchange/jcontacts/contact/JobsContactSessionBean.java index 77f8dcf..213fd36 100644 --- a/src/java/org/mxchange/jcontacts/contact/JobsContactSessionBean.java +++ b/src/java/org/mxchange/jcontacts/contact/JobsContactSessionBean.java @@ -26,6 +26,7 @@ import javax.persistence.Query; import org.mxchange.jcontacts.contact.utils.ContactUtils; import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException; import org.mxchange.jcontacts.exceptions.ContactNotFoundException; +import org.mxchange.jjobs.database.BaseJobsDatabaseBean; /** * A contact EJB @@ -33,7 +34,7 @@ import org.mxchange.jcontacts.exceptions.ContactNotFoundException; * @author Roland Haeder */ @Stateless (name = "contact", description = "A bean handling contact data") -public class AddressbookContactSessionBean extends BaseAddressbookDatabaseBean implements ContactSessionBeanRemote { +public class JobsContactSessionBean extends BaseJobsDatabaseBean implements ContactSessionBeanRemote { /** * Serial number @@ -47,7 +48,7 @@ public class AddressbookContactSessionBean extends BaseAddressbookDatabaseBean i } @Override - public Contact addContact (Contact contact) throws ContactAlreadyAddedException { + public Contact addContact (final Contact contact) throws ContactAlreadyAddedException { throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. } diff --git a/src/java/org/mxchange/jcountry/data/JobsCountrySingletonBean.java b/src/java/org/mxchange/jcountry/data/JobsCountrySingletonBean.java index 26f7786..3b31995 100644 --- a/src/java/org/mxchange/jcountry/data/JobsCountrySingletonBean.java +++ b/src/java/org/mxchange/jcountry/data/JobsCountrySingletonBean.java @@ -23,8 +23,8 @@ import javax.ejb.Singleton; import javax.ejb.Startup; import javax.persistence.NoResultException; import javax.persistence.Query; -import org.mxchange.jcoreee.database.BaseDatabaseBean; import org.mxchange.jcountry.exceptions.CountryAlreadyAddedException; +import org.mxchange.jjobs.database.BaseJobsDatabaseBean; /** * A singleton EJB for country informations @@ -32,8 +32,8 @@ import org.mxchange.jcountry.exceptions.CountryAlreadyAddedException; * @author Roland Haeder */ @Startup -@Singleton (name = "country", mappedName = "ejb/jjobs-singleton-country", description = "A singleton session bean for country informations") -public class JobsCountrySingletonBean extends BaseDatabaseBean implements CountrySingletonBeanRemote { +@Singleton (name = "country", description = "A singleton session bean for country informations") +public class JobsCountrySingletonBean extends BaseJobsDatabaseBean implements CountrySingletonBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/model/addressbook/JobsAddressbookSessionBean.java b/src/java/org/mxchange/jjobs/model/addressbook/JobsAddressbookSessionBean.java index 22c4a13..7513a07 100644 --- a/src/java/org/mxchange/jjobs/model/addressbook/JobsAddressbookSessionBean.java +++ b/src/java/org/mxchange/jjobs/model/addressbook/JobsAddressbookSessionBean.java @@ -28,7 +28,7 @@ import org.mxchange.jaddressbookcore.exceptions.AddressbookNotFoundException; import org.mxchange.jaddressbookcore.model.addressbook.Addressbook; import org.mxchange.jaddressbookcore.model.addressbook.UserAddressbook; import org.mxchange.jaddressbookcore.model.addressbook.entry.AddressbookEntry; -import org.mxchange.jcoreee.database.BaseDatabaseBean; +import org.mxchange.jjobs.database.BaseJobsDatabaseBean; import org.mxchange.jusercore.model.user.User; /** @@ -36,8 +36,8 @@ import org.mxchange.jusercore.model.user.User; *

* @author Roland Haeder */ -@Stateless (name = "addressbook", mappedName = "ejb/stateless-jjobs-adr", description = "A stateless bean for handling JJobs addressbooks") -public class JobsAddressbookSessionBean extends BaseDatabaseBean implements AddressbookSessionBeanRemote { +@Stateless (name = "addressbook", description = "A stateless bean for handling JJobs addressbooks") +public class JobsAddressbookSessionBean extends BaseJobsDatabaseBean implements AddressbookSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/JobsAdminMobileProviderSessionBean.java b/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/JobsAdminMobileProviderSessionBean.java index 60bcee6..b74f248 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/JobsAdminMobileProviderSessionBean.java +++ b/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/JobsAdminMobileProviderSessionBean.java @@ -19,7 +19,7 @@ package org.mxchange.jphone.phonenumbers.mobileprovider; import java.text.MessageFormat; import java.util.GregorianCalendar; import javax.ejb.Stateless; -import org.mxchange.jcoreee.database.BaseDatabaseBean; +import org.mxchange.jjobs.database.BaseJobsDatabaseBean; import org.mxchange.jphone.exceptions.MobileProviderAlreadyAddedException; /** @@ -28,7 +28,7 @@ import org.mxchange.jphone.exceptions.MobileProviderAlreadyAddedException; * @author Roland Haeder */ @Stateless (name = "adminmobileprovider", description = "A singleton session bean for mobile provider informations, admin-edition") -public class JobsAdminMobileProviderSessionBean extends BaseDatabaseBean implements AdminMobileProviderSessionBeanRemote { +public class JobsAdminMobileProviderSessionBean extends BaseJobsDatabaseBean implements AdminMobileProviderSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/JobsMobileProviderSingletonBean.java b/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/JobsMobileProviderSingletonBean.java index 6f7677d..2e28ab5 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/JobsMobileProviderSingletonBean.java +++ b/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/JobsMobileProviderSingletonBean.java @@ -20,7 +20,7 @@ import java.util.List; import javax.ejb.Singleton; import javax.ejb.Startup; import javax.persistence.Query; -import org.mxchange.jcoreee.database.BaseDatabaseBean; +import org.mxchange.jjobs.database.BaseJobsDatabaseBean; /** * A singleton EJB for mobile provider informations @@ -28,8 +28,8 @@ import org.mxchange.jcoreee.database.BaseDatabaseBean; * @author Roland Haeder */ @Startup -@Singleton (name = "mobileprovider", mappedName = "ejb/jjobs-singleton-mobile-provider", description = "A singleton session bean for SMS provider informations") -public class JobsMobileProviderSingletonBean extends BaseDatabaseBean implements MobileProviderSingletonBeanRemote { +@Singleton (name = "mobileprovider", description = "A singleton session bean for SMS provider informations") +public class JobsMobileProviderSingletonBean extends BaseJobsDatabaseBean implements MobileProviderSingletonBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jphone/phonenumbers/phone/JobsAdminContactPhoneSessionBean.java b/src/java/org/mxchange/jphone/phonenumbers/phone/JobsAdminContactPhoneSessionBean.java index cecc04d..69f38b0 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/phone/JobsAdminContactPhoneSessionBean.java +++ b/src/java/org/mxchange/jphone/phonenumbers/phone/JobsAdminContactPhoneSessionBean.java @@ -23,7 +23,7 @@ import javax.persistence.NoResultException; import javax.persistence.Query; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote; -import org.mxchange.jcoreee.database.BaseDatabaseBean; +import org.mxchange.jjobs.database.BaseJobsDatabaseBean; import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; /** @@ -31,8 +31,8 @@ import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; *

* @author Roland Haeder */ -@Stateless (name = "admincontactphone", mappedName = "ejb/stateless-jjobs-admin-contact-phone", description = "An administrative bean handling contact's phone data") -public class JobsAdminContactPhoneSessionBean extends BaseDatabaseBean implements AdminContactsPhoneSessionBeanRemote { +@Stateless (name = "admincontactphone", description = "An administrative bean handling contact's phone data") +public class JobsAdminContactPhoneSessionBean extends BaseJobsDatabaseBean implements AdminContactsPhoneSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jphone/phonenumbers/phone/JobsAdminPhoneSessionBean.java b/src/java/org/mxchange/jphone/phonenumbers/phone/JobsAdminPhoneSessionBean.java index f32c3e0..187d1d4 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/phone/JobsAdminPhoneSessionBean.java +++ b/src/java/org/mxchange/jphone/phonenumbers/phone/JobsAdminPhoneSessionBean.java @@ -17,15 +17,15 @@ package org.mxchange.jphone.phonenumbers.phone; import javax.ejb.Stateless; -import org.mxchange.jcoreee.database.BaseDatabaseBean; +import org.mxchange.jjobs.database.BaseJobsDatabaseBean; /** * An EJB for administrative phone purposes *

* @author Roland Haeder */ -@Stateless (name = "adminphone", mappedName = "ejb/stateless-jjobs-admin-phone", description = "An administrative bean handling phone data") -public class JobsAdminPhoneSessionBean extends BaseDatabaseBean implements AdminPhoneSessionBeanRemote { +@Stateless (name = "adminphone", description = "An administrative bean handling phone data") +public class JobsAdminPhoneSessionBean extends BaseJobsDatabaseBean implements AdminPhoneSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jphone/phonenumbers/phone/JobsPhoneSessionBean.java b/src/java/org/mxchange/jphone/phonenumbers/phone/JobsPhoneSessionBean.java index 92b8431..0766c46 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/phone/JobsPhoneSessionBean.java +++ b/src/java/org/mxchange/jphone/phonenumbers/phone/JobsPhoneSessionBean.java @@ -20,7 +20,7 @@ import java.text.MessageFormat; import javax.ejb.Stateless; import javax.persistence.NoResultException; import javax.persistence.Query; -import org.mxchange.jcoreee.database.BaseDatabaseBean; +import org.mxchange.jjobs.database.BaseJobsDatabaseBean; import org.mxchange.jphone.exceptions.PhoneEntityNotFoundException; import org.mxchange.jphone.phonenumbers.cellphone.CellphoneNumber; import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; @@ -30,8 +30,8 @@ import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; *

* @author Roland Haeder */ -@Stateless (name = "phone", mappedName = "ejb/stateless-jjobs-phone", description = "A bean handling phone data") -public class JobsPhoneSessionBean extends BaseDatabaseBean implements PhoneSessionBeanRemote { +@Stateless (name = "phone", description = "A bean handling phone data") +public class JobsPhoneSessionBean extends BaseJobsDatabaseBean implements PhoneSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jusercore/model/email_address/JobsEmailChangeSessionBean.java b/src/java/org/mxchange/jusercore/model/email_address/JobsEmailChangeSessionBean.java index ff2afb9..757b762 100644 --- a/src/java/org/mxchange/jusercore/model/email_address/JobsEmailChangeSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/email_address/JobsEmailChangeSessionBean.java @@ -36,7 +36,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import javax.persistence.NoResultException; import javax.persistence.Query; -import org.mxchange.jcoreee.database.BaseDatabaseBean; +import org.mxchange.jjobs.database.BaseJobsDatabaseBean; import org.mxchange.jjobsmailer.model.delivery.DeliverableJobsEmail; import org.mxchange.jjobsmailer.model.delivery.JobsMailer; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; @@ -47,8 +47,8 @@ import org.mxchange.jusercore.model.user.UserUtils; *

* @author Roland Haeder */ -@Stateless (name = "email-change", mappedName = "ejb/stateless-jjobs-email-change", description = "A bean handling email changes") -public class JobsEmailChangeSessionBean extends BaseDatabaseBean implements EmailChangeSessionBeanRemote { +@Stateless (name = "email-change", description = "A bean handling email changes") +public class JobsEmailChangeSessionBean extends BaseJobsDatabaseBean implements EmailChangeSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jusercore/model/login/JobsUserLoginSessionBean.java b/src/java/org/mxchange/jusercore/model/login/JobsUserLoginSessionBean.java index fa34ff2..dd74ed1 100644 --- a/src/java/org/mxchange/jusercore/model/login/JobsUserLoginSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/login/JobsUserLoginSessionBean.java @@ -19,7 +19,7 @@ package org.mxchange.jusercore.model.login; import java.text.MessageFormat; import javax.ejb.EJB; import javax.ejb.Stateless; -import org.mxchange.jcoreee.database.BaseDatabaseBean; +import org.mxchange.jjobs.database.BaseJobsDatabaseBean; import org.mxchange.jusercore.container.login.LoginContainer; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.exceptions.UserPasswordMismatchException; @@ -36,8 +36,8 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus; *

* @author Roland Haeder */ -@Stateless (name = "login", mappedName = "ejb/stateless-jjobs-login", description = "A bean handling the user login") -public class JobsUserLoginSessionBean extends BaseDatabaseBean implements UserLoginSessionBeanRemote { +@Stateless (name = "login", description = "A bean handling the user login") +public class JobsUserLoginSessionBean extends BaseJobsDatabaseBean implements UserLoginSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jusercore/model/register/JobsUserRegistrationSessionBean.java b/src/java/org/mxchange/jusercore/model/register/JobsUserRegistrationSessionBean.java index 61dfec5..6d86e5b 100644 --- a/src/java/org/mxchange/jusercore/model/register/JobsUserRegistrationSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/register/JobsUserRegistrationSessionBean.java @@ -19,7 +19,7 @@ package org.mxchange.jusercore.model.register; import java.text.MessageFormat; import javax.ejb.EJB; import javax.ejb.Stateless; -import org.mxchange.jcoreee.database.BaseDatabaseBean; +import org.mxchange.jjobs.database.BaseJobsDatabaseBean; import org.mxchange.jusercore.exceptions.EmailAddressAlreadyRegisteredException; import org.mxchange.jusercore.exceptions.UserNameAlreadyRegisteredException; import org.mxchange.jusercore.model.user.User; @@ -30,8 +30,8 @@ import org.mxchange.jusercore.model.user.UserSessionBeanRemote; *

* @author Roland Haeder */ -@Stateless (name = "register", mappedName = "ejb/stateless-jjobs-register", description = "A bean handling the user registration") -public class JobsUserRegistrationSessionBean extends BaseDatabaseBean implements UserRegistrationSessionBeanRemote { +@Stateless (name = "register", description = "A bean handling the user registration") +public class JobsUserRegistrationSessionBean extends BaseJobsDatabaseBean implements UserRegistrationSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java index 8e54cb4..203f601 100644 --- a/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java @@ -26,7 +26,7 @@ import javax.persistence.NoResultException; import javax.persistence.PersistenceException; import javax.persistence.Query; import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jcoreee.database.BaseDatabaseBean; +import org.mxchange.jjobs.database.BaseJobsDatabaseBean; import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; @@ -42,8 +42,8 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus; *

* @author Roland Haeder */ -@Stateless (name = "user", mappedName = "ejb/stateless-jjobs-user", description = "A bean handling the user data") -public class JobsUserSessionBean extends BaseDatabaseBean implements UserSessionBeanRemote { +@Stateless (name = "user", description = "A bean handling the user data") +public class JobsUserSessionBean extends BaseJobsDatabaseBean implements UserSessionBeanRemote { /** * Serial number