From: Roland Haeder Date: Sat, 9 Apr 2016 18:32:24 +0000 (+0200) Subject: Turned master (EE)+ejb project into separate master (triangle) and EJB project X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cc299a1de9ea634270dcb68843a4a94d5577207b;p=pizzaservice.git Turned master (EE)+ejb project into separate master (triangle) and EJB project --- diff --git a/PizzaService-ejb/build.xml b/PizzaService-ejb/build.xml deleted file mode 100644 index 0e24c24..0000000 --- a/PizzaService-ejb/build.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - Builds, tests, and runs the project PizzaService-ejb. - - - diff --git a/PizzaService-ejb/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar b/PizzaService-ejb/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar deleted file mode 100644 index eaf6790..0000000 Binary files a/PizzaService-ejb/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar and /dev/null differ diff --git a/PizzaService-ejb/lib/cdi-api.jar b/PizzaService-ejb/lib/cdi-api.jar deleted file mode 100644 index 1fa239e..0000000 Binary files a/PizzaService-ejb/lib/cdi-api.jar and /dev/null differ diff --git a/PizzaService-ejb/lib/eclipselink/eclipselink.jar b/PizzaService-ejb/lib/eclipselink/eclipselink.jar deleted file mode 100644 index 2b0a810..0000000 Binary files a/PizzaService-ejb/lib/eclipselink/eclipselink.jar and /dev/null differ diff --git a/PizzaService-ejb/lib/eclipselink/javax.persistence_2.1.0.v201304241213.jar b/PizzaService-ejb/lib/eclipselink/javax.persistence_2.1.0.v201304241213.jar deleted file mode 100644 index 841d2e1..0000000 Binary files a/PizzaService-ejb/lib/eclipselink/javax.persistence_2.1.0.v201304241213.jar and /dev/null differ diff --git a/PizzaService-ejb/lib/eclipselink/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar b/PizzaService-ejb/lib/eclipselink/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar deleted file mode 100644 index 001316b..0000000 Binary files a/PizzaService-ejb/lib/eclipselink/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar and /dev/null differ diff --git a/PizzaService-ejb/lib/eclipselinkmodelgen/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar b/PizzaService-ejb/lib/eclipselinkmodelgen/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar deleted file mode 100644 index 0135c65..0000000 Binary files a/PizzaService-ejb/lib/eclipselinkmodelgen/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar and /dev/null differ diff --git a/PizzaService-ejb/lib/jcontacts-core.jar b/PizzaService-ejb/lib/jcontacts-core.jar deleted file mode 100644 index 59559ef..0000000 Binary files a/PizzaService-ejb/lib/jcontacts-core.jar and /dev/null differ diff --git a/PizzaService-ejb/lib/jcore-logger-lib.jar b/PizzaService-ejb/lib/jcore-logger-lib.jar deleted file mode 100644 index 6203f5f..0000000 Binary files a/PizzaService-ejb/lib/jcore-logger-lib.jar and /dev/null differ diff --git a/PizzaService-ejb/lib/jcore.jar b/PizzaService-ejb/lib/jcore.jar deleted file mode 100644 index 478823b..0000000 Binary files a/PizzaService-ejb/lib/jcore.jar and /dev/null differ diff --git a/PizzaService-ejb/lib/jcoreee.jar b/PizzaService-ejb/lib/jcoreee.jar deleted file mode 100644 index 71d0e1c..0000000 Binary files a/PizzaService-ejb/lib/jcoreee.jar and /dev/null differ diff --git a/PizzaService-ejb/lib/jcountry-core.jar b/PizzaService-ejb/lib/jcountry-core.jar deleted file mode 100644 index 01a8041..0000000 Binary files a/PizzaService-ejb/lib/jcountry-core.jar and /dev/null differ diff --git a/PizzaService-ejb/lib/jcountry-lib.jar b/PizzaService-ejb/lib/jcountry-lib.jar deleted file mode 100644 index f8f305c..0000000 Binary files a/PizzaService-ejb/lib/jcountry-lib.jar and /dev/null differ diff --git a/PizzaService-ejb/lib/jphone-core.jar b/PizzaService-ejb/lib/jphone-core.jar deleted file mode 100644 index be67aae..0000000 Binary files a/PizzaService-ejb/lib/jphone-core.jar and /dev/null differ diff --git a/PizzaService-ejb/lib/jphone-lib.jar b/PizzaService-ejb/lib/jphone-lib.jar deleted file mode 100644 index bdeff31..0000000 Binary files a/PizzaService-ejb/lib/jphone-lib.jar and /dev/null differ diff --git a/PizzaService-ejb/lib/jshop-core.jar b/PizzaService-ejb/lib/jshop-core.jar deleted file mode 100644 index 95ea58c..0000000 Binary files a/PizzaService-ejb/lib/jshop-core.jar and /dev/null differ diff --git a/PizzaService-ejb/lib/jshop-ee-lib.jar b/PizzaService-ejb/lib/jshop-ee-lib.jar deleted file mode 100644 index a209047..0000000 Binary files a/PizzaService-ejb/lib/jshop-ee-lib.jar and /dev/null differ diff --git a/PizzaService-ejb/lib/nblibraries.properties b/PizzaService-ejb/lib/nblibraries.properties deleted file mode 100644 index 1aac91b..0000000 --- a/PizzaService-ejb/lib/nblibraries.properties +++ /dev/null @@ -1,15 +0,0 @@ -libs.CopyLibs.classpath=\ - ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar -libs.CopyLibs.displayName=CopyLibs Task -libs.CopyLibs.prop-version=2.0 -libs.eclipselink.classpath=\ - ${base}/eclipselink/eclipselink.jar;\ - ${base}/eclipselink/javax.persistence_2.1.0.v201304241213.jar;\ - ${base}/eclipselink/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar -libs.eclipselink.displayName=EclipseLink (JPA 2.1) -libs.eclipselink.javadoc= -libs.eclipselink.prop-maven-dependencies=\n org.eclipse.persistence:eclipselink:2.5.2:jar\n -libs.eclipselinkmodelgen.classpath=\ - ${base}/eclipselinkmodelgen/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar -libs.eclipselinkmodelgen.displayName=EclipseLink-ModelGen (JPA 2.1) -libs.eclipselinkmodelgen.prop-maven-dependencies=org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen.processor:2.5.2:jar diff --git a/PizzaService-ejb/nbproject/ant-deploy.xml b/PizzaService-ejb/nbproject/ant-deploy.xml deleted file mode 100644 index 2d5f877..0000000 --- a/PizzaService-ejb/nbproject/ant-deploy.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PizzaService-ejb/nbproject/build-impl.xml b/PizzaService-ejb/nbproject/build-impl.xml deleted file mode 100644 index b66085e..0000000 --- a/PizzaService-ejb/nbproject/build-impl.xml +++ /dev/null @@ -1,1278 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set build.generated.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.classes.excludes - Must set dist.jar - - - - - - - - - -The Java EE server classpath is not correctly set up - server home directory is missing. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Dj2ee.server.home=<app_server_installation_directory> - - -The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}. -Either open the project in the IDE and assign the server or setup the server classpath manually. -For example like this: - ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file) -or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No tests executed. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -The libs.CopyLibs.classpath property is not set up. -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 -<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: - ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set JVM to use for profiling in profiler.info.jvm - Must set profiler agent JVM arguments in profiler.info.jvmargs.agent - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set main.class - - - - - Must set fix.includes - - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - This target only works when run from inside the NetBeans IDE. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - Must select some files in the IDE or set test.class - Must select some method in the IDE or set test.method - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - Must select one file in the IDE or set test.class - Must select some method in the IDE or set test.method - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PizzaService-ejb/nbproject/genfiles.properties b/PizzaService-ejb/nbproject/genfiles.properties deleted file mode 100644 index 19eb5bc..0000000 --- a/PizzaService-ejb/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=0427eba4 -build.xml.script.CRC32=cabe2e92 -build.xml.stylesheet.CRC32=5910fda3@1.51.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=6890d152 -nbproject/build-impl.xml.script.CRC32=5087c2fa -nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.55.1 diff --git a/PizzaService-ejb/nbproject/project.properties b/PizzaService-ejb/nbproject/project.properties deleted file mode 100644 index d455a03..0000000 --- a/PizzaService-ejb/nbproject/project.properties +++ /dev/null @@ -1,108 +0,0 @@ -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=true -annotation.processing.processor.options=-Aeclipselink.canonicalmodel.use_static_factory=false -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -build.classes.dir=${build.dir}/classes -build.classes.excludes=**/*.java,**/*.form,**/.nbattrs -build.dir=build -build.ear.classes.dir=${build.dir}/classes -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -debug.classpath=${javac.classpath}:${build.classes.dir} -debug.test.classpath=\ - ${run.test.classpath} -dist.dir=dist -dist.ear.jar=${dist.dir}/${jar.name} -dist.jar=${dist.dir}/${jar.name} -dist.javadoc.dir=${dist.dir}/javadoc -endorsed.classpath= -excludes= -file.reference.cdi-api.jar=lib/cdi-api.jar -file.reference.jcontacts-core.jar=lib/jcontacts-core.jar -file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar -file.reference.jcoreee.jar=lib/jcoreee.jar -file.reference.jcountry-core.jar=lib/jcountry-core.jar -file.reference.jcountry-lib.jar=lib/jcountry-lib.jar -file.reference.jphone-core.jar=lib/jphone-core.jar -file.reference.jphone-lib.jar=lib/jphone-lib.jar -file.reference.jshop-core.jar=lib/jshop-core.jar -file.reference.jshop-ee-lib.jar=lib/jshop-ee-lib.jar -includes=** -j2ee.compile.on.save=true -j2ee.deploy.on.save=true -j2ee.platform=1.7 -j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar -j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar -j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar -j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar -j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar -j2ee.platform.wsit.classpath= -j2ee.server.type=gfv3ee6 -jar.compress=false -jar.name=PizzaService-ejb.jar -jars.in.ejbjar=true -javac.classpath=\ - ${file.reference.jcountry-core.jar}:\ - ${file.reference.jcountry-lib.jar}:\ - ${file.reference.jcoreee.jar}:\ - ${file.reference.jcore-logger-lib.jar}:\ - ${reference.PizzaService-lib.jar}:\ - ${file.reference.jcontacts-core.jar}:\ - ${file.reference.jphone-core.jar}:\ - ${file.reference.jphone-lib.jar}:\ - ${file.reference.jshop-core.jar}:\ - ${file.reference.jshop-ee-lib.jar}:\ - ${file.reference.cdi-api.jar} -javac.debug=true -javac.deprecation=true -javac.processorpath=\ - ${javac.classpath} -javac.source=1.8 -javac.target=1.8 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -javac.test.processorpath=${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=true -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.preview=true -javadoc.private=true -javadoc.splitindex=true -javadoc.use=true -javadoc.version=true -javadoc.windowtitle=Pizza-Service EJBs -meta.inf=${source.root}/conf -meta.inf.excludes=sun-cmp-mappings.xml -platform.active=default_platform -project.license=agpl30 -project.pizzaservice-lib=../../pizzaservice-lib -project.PizzaService-lib=../../../public_html/pizzaservice-lib -reference.PizzaService-lib.jar=${project.PizzaService-lib}/dist/PizzaService-lib.jar -resource.dir=setup -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -# Space-separated list of JVM arguments used when running a class with a main method or a unit test -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): -runmain.jvmargs= -source.encoding=UTF-8 -source.reference.jcontacts-core.jar=../jcontacts-core/src/ -source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/ -source.reference.jcoreee.jar=../../jcoreee/src/ -source.reference.jcountry-core.jar=../jcountry-core/src/ -source.reference.jcountry-lib.jar=../jcountry-lib/src/ -source.reference.jphone-core.jar=../jphone-core/src/ -source.reference.jphone-lib.jar=../jphone-lib/src/ -source.reference.jshop-core.jar=../../jshop-core/src/ -source.reference.jshop-ee-lib.jar=../../jshop-ee-lib/src/ -source.root=src -src.dir=${source.root}/java -test.src.dir=test diff --git a/PizzaService-ejb/nbproject/project.xml b/PizzaService-ejb/nbproject/project.xml deleted file mode 100644 index 3a5f797..0000000 --- a/PizzaService-ejb/nbproject/project.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - org.netbeans.modules.j2ee.ejbjarproject - - - PizzaService-ejb - 1.6.5 - file.reference.jcountry-core.jar - file.reference.jcountry-lib.jar - file.reference.jcoreee.jar - file.reference.jcore-logger-lib.jar - reference.PizzaService-lib.jar - file.reference.jcontacts-core.jar - file.reference.jphone-core.jar - file.reference.jphone-lib.jar - file.reference.jshop-core.jar - file.reference.jshop-ee-lib.jar - file.reference.cdi-api.jar - - - - - - - - - lib/nblibraries.properties - - - - PizzaService-lib - jar - - jar - clean - jar - - - - diff --git a/PizzaService-ejb/src/conf/MANIFEST.MF b/PizzaService-ejb/src/conf/MANIFEST.MF deleted file mode 100644 index 59499bc..0000000 --- a/PizzaService-ejb/src/conf/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/PizzaService-ejb/src/conf/persistence.xml b/PizzaService-ejb/src/conf/persistence.xml deleted file mode 100644 index ad81acb..0000000 --- a/PizzaService-ejb/src/conf/persistence.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - jdbc/shop - org.mxchange.jcontacts.contact.UserContact - org.mxchange.jcountry.data.CountryData - org.mxchange.jphone.phonenumbers.cellphone.CellphoneNumber - org.mxchange.jphone.phonenumbers.fax.FaxNumber - org.mxchange.jphone.phonenumbers.landline.LandLineNumber - org.mxchange.jphone.phonenumbers.smsprovider.CellphoneProvider - org.mxchange.jshopcore.model.basket.items.BasketItem - org.mxchange.jshopcore.model.category.ProductCategory - org.mxchange.jshopcore.model.customer.ShopCustomer - org.mxchange.jshopcore.model.order.ShopOrder - org.mxchange.jshopcore.model.order.items.OrderItem - org.mxchange.jshopcore.model.product.GenericProduct - false - - - - - diff --git a/PizzaService-ejb/src/java/log4j2.xml b/PizzaService-ejb/src/java/log4j2.xml deleted file mode 100644 index 8d9a645..0000000 --- a/PizzaService-ejb/src/java/log4j2.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - diff --git a/PizzaService-ejb/src/java/org/mxchange/jcountry/data/PizzaCountrySingletonBean.java b/PizzaService-ejb/src/java/org/mxchange/jcountry/data/PizzaCountrySingletonBean.java deleted file mode 100644 index c0d42e1..0000000 --- a/PizzaService-ejb/src/java/org/mxchange/jcountry/data/PizzaCountrySingletonBean.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2016 Roland Haeder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * 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; - -import java.util.List; -import javax.ejb.Singleton; -import javax.ejb.Startup; -import javax.persistence.Query; -import org.mxchange.jcoreee.database.BaseDatabaseBean; - -/** - * A singleton bean for country informations - *

- * @author Roland Haeder - */ -@Startup -@Singleton (name = "country", mappedName = "ejb/pizzaservice-singleton-country", description = "A singleton session bean for country informations") -public class PizzaCountrySingletonBean extends BaseDatabaseBean implements CountrySingletonBeanRemote { - - /** - * Serial number - */ - private static final long serialVersionUID = 15_846_983_298_691_207L; - - @Override - @SuppressWarnings ("unchecked") - public List allCountries () { - // Init query - Query query = this.getEntityManager().createNamedQuery("AllCountries", List.class); //NOI18N - - // Return it - return query.getResultList(); - } - -} diff --git a/PizzaService-ejb/src/java/org/mxchange/jphone/phonenumbers/smsprovider/PizzaSmsProviderSingletonBean.java b/PizzaService-ejb/src/java/org/mxchange/jphone/phonenumbers/smsprovider/PizzaSmsProviderSingletonBean.java deleted file mode 100644 index c0d59e1..0000000 --- a/PizzaService-ejb/src/java/org/mxchange/jphone/phonenumbers/smsprovider/PizzaSmsProviderSingletonBean.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2016 Roland Haeder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * 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.smsprovider; - -import java.util.List; -import javax.ejb.Singleton; -import javax.ejb.Startup; -import javax.persistence.Query; -import org.mxchange.jcoreee.database.BaseDatabaseBean; - -/** - * A singleton bean for SMS provider informations - *

- * @author Roland Haeder - */ -@Startup -@Singleton (name = "smsprovider", mappedName = "ejb/pizzaservice-singleton-smsprovider", description = "A singleton session bean for SMS provider informations") -public class PizzaSmsProviderSingletonBean extends BaseDatabaseBean implements SmsProviderSingletonBeanRemote { - - /** - * Serial number - */ - private static final long serialVersionUID = 15_846_983_298_691_207L; - - @Override - @SuppressWarnings ("unchecked") - public List allSmsProvider () { - // Init query - Query query = this.getEntityManager().createNamedQuery("AllSmsProvider", List.class); //NOI18N - - // Return it - return query.getResultList(); - } - -} diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 7d3e83c..07b132d 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -24,8 +24,8 @@ is divided into following sections: - @@ -155,9 +155,9 @@ is divided into following sections: 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: @@ -201,10 +201,6 @@ is divided into following sections: - - - - @@ -221,7 +217,6 @@ is divided into following sections: - @@ -299,7 +294,6 @@ is divided into following sections: - @@ -625,10 +619,6 @@ is divided into following sections: - - - - diff --git a/nbproject/project.properties b/nbproject/project.properties index 44851f1..b459f23 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -20,12 +20,12 @@ j2ee.platform.wsit.classpath= j2ee.server.type=gfv3ee6 jar.compress=false jar.content.additional=\ + ${reference.jcontacts-ejb.dist-ear}:\ ${reference.jcore-logger-ejb.dist-ear}:\ - ${reference.PizzaService-ejb.dist-ear}:\ - ${reference.jshop-receipt-ejb.dist-ear}:\ - ${reference.jcore-logger-ejb.dist-ear}:\ + ${reference.jcountry-ejb.dist-ear}:\ ${reference.jshop-ejb.dist-ear}:\ - ${reference.jcountry-ejb.dist-ear} + ${reference.jshop-receipt-ejb.dist-ear}:\ + ${reference.PizzaService-ejb.dist-ear} jar.name=PizzaService.ear javac.debug=true javac.deprecation=false @@ -34,14 +34,12 @@ javac.target=1.6 meta.inf=src/conf no.dependencies=false platform.active=default_platform -project.jcore-logger-ejb=../jcore-logger-ejb -project.jcore-logger-ejb=../jcore-logger-ejb -project.jcountry-ejb=../../NetBeansProjects/jcountry-ejb +project.jcontacts-ejb=../jcontacts-ejb +project.jcountry-ejb=../jcountry-ejb project.jshop-ejb=../jshop-ejb project.jshop-receipt-ejb=../jshop-receipt-ejb -project.PizzaService-ejb=PizzaService-ejb -reference.jcore-logger-ejb.dist-ear=${project.jcore-logger-ejb}/dist/jcore-logger-ejb.jar -reference.jcore-logger-ejb.dist-ear=${project.jcore-logger-ejb}/dist/jcore-logger-ejb.jar +project.PizzaService-ejb=../pizzaservice-ejb +reference.jcontacts-ejb.dist-ear=${project.jcontacts-ejb}/dist/jcontacts-ejb.jar reference.jcountry-ejb.dist-ear=${project.jcountry-ejb}/dist/jcountry-ejb.jar reference.jshop-ejb.dist-ear=${project.jshop-ejb}/dist/jshop-ejb.jar reference.jshop-receipt-ejb.dist-ear=${project.jshop-receipt-ejb}/dist/jshop-receipt-ejb.jar diff --git a/nbproject/project.xml b/nbproject/project.xml index 764f761..f3f37fe 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -8,27 +8,27 @@ - ${reference.jcore-logger-ejb.dist-ear} + ${reference.jcontacts-ejb.dist-ear} / - ${reference.PizzaService-ejb.dist-ear} + ${reference.jcore-logger-ejb.dist-ear} / - ${reference.jshop-receipt-ejb.dist-ear} + ${reference.jcountry-ejb.dist-ear} / - ${reference.jcore-logger-ejb.dist-ear} + ${reference.jshop-ejb.dist-ear} / - ${reference.jshop-ejb.dist-ear} + ${reference.jshop-receipt-ejb.dist-ear} / - ${reference.jcountry-ejb.dist-ear} + ${reference.PizzaService-ejb.dist-ear} / @@ -46,7 +46,7 @@ dist-ear - jcore-logger-ejb + jcontacts-ejb j2ee_ear_archive dist-ear