From: Roland Haeder Date: Mon, 25 Apr 2016 20:28:20 +0000 (+0200) Subject: Continued a bit: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3b9623b6287a4fefcc7d0cb7d92ec901a2932a31;p=pizzaservice-ejb.git Continued a bit: - move BaseDatabaseBean to -core project Signed-off-by: Roland Häder --- diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 3227078..6ab33ad 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -25,8 +25,8 @@ is divided into following sections: - @@ -749,9 +749,9 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f The libs.CopyLibs.classpath property is not set up. -This property must point to +This property must point to org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part -of NetBeans IDE installation and is usually located at +of NetBeans IDE installation and is usually located at <netbeans_installation>/java<version>/ant/extra folder. Either open the project in the IDE and make sure CopyLibs library exists or setup the property manually. For example like this: @@ -828,82 +828,62 @@ exists or setup the property manually. For example like this: + + - - - - - - - - + + - + + - - - - - - - - + + - - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - + + - diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index b51b192..1ed4581 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=9c0f08a9 build.xml.stylesheet.CRC32=5910fda3@1.55.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=de14bf5f -nbproject/build-impl.xml.script.CRC32=16d7af10 +nbproject/build-impl.xml.data.CRC32=be5d8e80 +nbproject/build-impl.xml.script.CRC32=c48d23aa nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.55.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index c139995..a11d1c0 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -65,6 +65,7 @@ javac.classpath=\ ${file.reference.jphone-lib.jar}:\ ${file.reference.jshop-core.jar}:\ ${file.reference.jshop-ee-lib.jar}:\ + ${file.reference.pizzaservice-core.jar}:\ ${reference.PizzaService-lib.jar}:\ ${file.reference.cdi-api.jar} javac.debug=true diff --git a/nbproject/project.xml b/nbproject/project.xml index 8132a7a..cfd140c 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -7,21 +7,16 @@ 1.6.5 file.reference.jcore.jar file.reference.jcoreee.jar + file.reference.jcountry-core.jar + file.reference.jcountry-lib.jar file.reference.jcore-logger-lib.jar file.reference.jcontacts-core.jar file.reference.jcontacts-lib.jar - file.reference.jcontacts-business-core.jar - file.reference.jcountry-core.jar - file.reference.jcountry-lib.jar - file.reference.jphone-core.jar - file.reference.jphone-lib.jar file.reference.juser-core.jar file.reference.juser-lib.jar - file.reference.jmailer-ee.jar - file.reference.jcustomer-core.jar - file.reference.jcustomer-lib.jar + file.reference.jphone-core.jar + file.reference.jphone-lib.jar file.reference.pizzaservice-core.jar - file.reference.pizzaservice-mailer.jar reference.PizzaService-lib.jar diff --git a/src/java/org/mxchange/jcontacts/contact/PizzaContactSessionBean.java b/src/java/org/mxchange/jcontacts/contact/PizzaContactSessionBean.java index 6c827ad..ee42d89 100644 --- a/src/java/org/mxchange/jcontacts/contact/PizzaContactSessionBean.java +++ b/src/java/org/mxchange/jcontacts/contact/PizzaContactSessionBean.java @@ -22,7 +22,7 @@ import javax.ejb.Stateless; import javax.persistence.NoResultException; import javax.persistence.Query; import org.mxchange.jcontacts.exceptions.ContactNotFoundException; -import org.mxchange.jcoreee.database.BaseDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; /** * A contact EJB @@ -30,7 +30,7 @@ import org.mxchange.jcoreee.database.BaseDatabaseBean; * @author Roland Haeder */ @Stateless (name = "contact", mappedName = "ejb/stateless-pizza-contact", description = "A bean handling contact data") -public class PizzaContactSessionBean extends BaseDatabaseBean implements ContactSessionBeanRemote { +public class PizzaContactSessionBean extends BasePizzaDatabaseBean implements ContactSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jcountry/data/PizzaCountrySingletonBean.java b/src/java/org/mxchange/jcountry/data/PizzaCountrySingletonBean.java index d67125b..87d67df 100644 --- a/src/java/org/mxchange/jcountry/data/PizzaCountrySingletonBean.java +++ b/src/java/org/mxchange/jcountry/data/PizzaCountrySingletonBean.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.pizzaaplication.database.BasePizzaDatabaseBean; /** * A singleton EJB for country informations @@ -33,7 +33,7 @@ import org.mxchange.jcountry.exceptions.CountryAlreadyAddedException; */ @Startup @Singleton (name = "country", mappedName = "ejb/pizzaservice-singleton-country", description = "A singleton session bean for country informations") -public class PizzaCountrySingletonBean extends BaseDatabaseBean implements CountrySingletonBeanRemote { +public class PizzaCountrySingletonBean extends BasePizzaDatabaseBean implements CountrySingletonBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/PizzaAdminMobileProviderSessionBean.java b/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/PizzaAdminMobileProviderSessionBean.java index 6414240..25df8fd 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/PizzaAdminMobileProviderSessionBean.java +++ b/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/PizzaAdminMobileProviderSessionBean.java @@ -19,8 +19,8 @@ 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.jphone.exceptions.MobileProviderAlreadyAddedException; +import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; /** * Administrative singleton EJB for mobile provider informations @@ -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 PizzaAdminMobileProviderSessionBean extends BaseDatabaseBean implements AdminMobileProviderSessionBeanRemote { +public class PizzaAdminMobileProviderSessionBean extends BasePizzaDatabaseBean implements AdminMobileProviderSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/PizzaMobileProviderSingletonBean.java b/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/PizzaMobileProviderSingletonBean.java index 2c3f9b9..8e30b7d 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/PizzaMobileProviderSingletonBean.java +++ b/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/PizzaMobileProviderSingletonBean.java @@ -21,7 +21,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.pizzaaplication.database.BasePizzaDatabaseBean; /** * A singleton EJB for mobile provider informations @@ -30,7 +30,7 @@ import org.mxchange.jcoreee.database.BaseDatabaseBean; */ @Startup @Singleton (name = "mobileprovider", mappedName = "ejb/pizzaservice-singleton-mobile-provider", description = "A singleton session bean for mobile provider informations") -public class PizzaMobileProviderSingletonBean extends BaseDatabaseBean implements MobileProviderSingletonBeanRemote { +public class PizzaMobileProviderSingletonBean extends BasePizzaDatabaseBean implements MobileProviderSingletonBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jphone/phonenumbers/phone/PizzaAdminContactPhoneSessionBean.java b/src/java/org/mxchange/jphone/phonenumbers/phone/PizzaAdminContactPhoneSessionBean.java index a3ccac9..a0e1954 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/phone/PizzaAdminContactPhoneSessionBean.java +++ b/src/java/org/mxchange/jphone/phonenumbers/phone/PizzaAdminContactPhoneSessionBean.java @@ -23,8 +23,8 @@ 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.jphone.phonenumbers.cellphone.DialableCellphoneNumber; +import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; /** * A session EJB for administrative contact's phone number purposes @@ -32,7 +32,7 @@ import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; * @author Roland Haeder */ @Stateless (name = "admincontactphone", mappedName = "ejb/stateless-pizza-admin-contact-phone", description = "Administrative bean handling contact's phone data") -public class PizzaAdminContactPhoneSessionBean extends BaseDatabaseBean implements AdminContactsPhoneSessionBeanRemote { +public class PizzaAdminContactPhoneSessionBean extends BasePizzaDatabaseBean implements AdminContactsPhoneSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jphone/phonenumbers/phone/PizzaAdminPhoneSessionBean.java b/src/java/org/mxchange/jphone/phonenumbers/phone/PizzaAdminPhoneSessionBean.java index f8225be..2f99c1c 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/phone/PizzaAdminPhoneSessionBean.java +++ b/src/java/org/mxchange/jphone/phonenumbers/phone/PizzaAdminPhoneSessionBean.java @@ -17,7 +17,7 @@ package org.mxchange.jphone.phonenumbers.phone; import javax.ejb.Stateless; -import org.mxchange.jcoreee.database.BaseDatabaseBean; +import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; /** * An EJB for administrative phone purposes @@ -25,7 +25,7 @@ import org.mxchange.jcoreee.database.BaseDatabaseBean; * @author Roland Haeder */ @Stateless (name = "adminphone", mappedName = "ejb/stateless-pizza-admin-phone", description = "Administrative bean handling phone data") -public class PizzaAdminPhoneSessionBean extends BaseDatabaseBean implements AdminPhoneSessionBeanRemote { +public class PizzaAdminPhoneSessionBean extends BasePizzaDatabaseBean implements AdminPhoneSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jphone/phonenumbers/phone/PizzaPhoneSessionBean.java b/src/java/org/mxchange/jphone/phonenumbers/phone/PizzaPhoneSessionBean.java index e1794e5..3f4cb50 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/phone/PizzaPhoneSessionBean.java +++ b/src/java/org/mxchange/jphone/phonenumbers/phone/PizzaPhoneSessionBean.java @@ -20,10 +20,10 @@ 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.jphone.exceptions.PhoneEntityNotFoundException; import org.mxchange.jphone.phonenumbers.cellphone.CellphoneNumber; import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; +import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; /** * A general phone EJB @@ -31,7 +31,7 @@ import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; * @author Roland Haeder */ @Stateless (name = "phone", mappedName = "ejb/stateless-pizza-phone", description = "A bean handling phone data") -public class PizzaPhoneSessionBean extends BaseDatabaseBean implements PhoneSessionBeanRemote { +public class PizzaPhoneSessionBean extends BasePizzaDatabaseBean implements PhoneSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jusercore/model/login/PizzaUserLoginSessionBean.java b/src/java/org/mxchange/jusercore/model/login/PizzaUserLoginSessionBean.java index 94b31f7..240d98b 100644 --- a/src/java/org/mxchange/jusercore/model/login/PizzaUserLoginSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/login/PizzaUserLoginSessionBean.java @@ -19,7 +19,6 @@ 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.jusercore.container.login.LoginContainer; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.exceptions.UserPasswordMismatchException; @@ -30,6 +29,7 @@ import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; import org.mxchange.jusercore.model.user.UserUtils; import org.mxchange.jusercore.model.user.status.UserAccountStatus; +import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; /** * A session EJB for user logins @@ -37,7 +37,7 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus; * @author Roland Haeder */ @Stateless (name = "login", mappedName = "ejb/stateless-pizza-login", description = "A bean handling the user login") -public class PizzaUserLoginSessionBean extends BaseDatabaseBean implements UserLoginSessionBeanRemote { +public class PizzaUserLoginSessionBean extends BasePizzaDatabaseBean implements UserLoginSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jusercore/model/register/PizzaUserRegistrationSessionBean.java b/src/java/org/mxchange/jusercore/model/register/PizzaUserRegistrationSessionBean.java index 8bf030e..8e9fd9b 100644 --- a/src/java/org/mxchange/jusercore/model/register/PizzaUserRegistrationSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/register/PizzaUserRegistrationSessionBean.java @@ -19,11 +19,11 @@ 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.jusercore.exceptions.EmailAddressAlreadyRegisteredException; import org.mxchange.jusercore.exceptions.UserNameAlreadyRegisteredException; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; +import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; /** * A session bean for user registration @@ -31,7 +31,7 @@ import org.mxchange.jusercore.model.user.UserSessionBeanRemote; * @author Roland Haeder */ @Stateless (name = "register", mappedName = "ejb/stateless-pizza-register", description = "A bean handling the user registration") -public class PizzaUserRegistrationSessionBean extends BaseDatabaseBean implements UserRegistrationSessionBeanRemote { +public class PizzaUserRegistrationSessionBean extends BasePizzaDatabaseBean implements UserRegistrationSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java index 824fce3..f3130b4 100644 --- a/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java @@ -26,7 +26,6 @@ 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.jphone.phonenumbers.cellphone.DialableCellphoneNumber; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; @@ -36,6 +35,7 @@ import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.model.register.UserRegistrationSessionBeanRemote; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; import org.mxchange.jusercore.model.user.status.UserAccountStatus; +import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; /** * A user EJB @@ -43,7 +43,7 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus; * @author Roland Haeder */ @Stateless (name = "user", mappedName = "ejb/stateless-pizza-user", description = "A bean handling the user data") -public class PizzaUserSessionBean extends BaseDatabaseBean implements UserSessionBeanRemote { +public class PizzaUserSessionBean extends BasePizzaDatabaseBean implements UserSessionBeanRemote { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java b/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java index 23630da..b338715 100644 --- a/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java @@ -21,8 +21,8 @@ import java.util.List; import javax.ejb.Stateless; import javax.persistence.Query; import org.mxchange.jcustomercore.model.customer.Customer; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; import org.mxchange.jcustomercore.utils.CustomerUtils; +import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; /** * A stateless administrative customer session bean (EJB) diff --git a/src/java/org/mxchange/pizzaapplication/model/customer/PizzaCustomerSessionBean.java b/src/java/org/mxchange/pizzaapplication/model/customer/PizzaCustomerSessionBean.java index 8a9a6e3..b8732b1 100644 --- a/src/java/org/mxchange/pizzaapplication/model/customer/PizzaCustomerSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/model/customer/PizzaCustomerSessionBean.java @@ -16,21 +16,17 @@ */ package org.mxchange.pizzaapplication.model.customer; -import de.chotime.jratecalc.model.customer.RateCalcCustomerSessionBeanRemote; import javax.ejb.Stateless; -import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; -; import org.mxchange.jcustomercore.exceptions.CustomerAlreadyRegisteredException; -import org.mxchange.jcustomercore.model.customer.Customer;import org.mxchange.jcustomercore.exceptions.CustomerAlreadyRegisteredException; import org.mxchange.jcustomercore.model.customer.Customer; - +import org.mxchange.pizzaaplication.database.BasePizzaDatabaseBean; /** * A stateless customer session bean (EJB) *

* @author Roland Haeder */ @Stateless (name = "customer", description = "A bean handling customer data") -public class PizzaCustomerSessionBean extends BasePizzaDatabaseBean implements RateCalcCustomerSessionBeanRemote { +public class PizzaCustomerSessionBean extends BasePizzaDatabaseBean implements PizzaCustomerSessionBeanRemote { /** * Serial number