From 6927320084b52b2b66835c8202a23b6c06916c15 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 4 Sep 2015 16:15:13 +0200 Subject: [PATCH] Imported from pizzaservice EE project. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- build.xml | 4 +-- lib/gf-client.jar | Bin 0 -> 22389 bytes lib/nblibraries.properties | 11 ++++--- nbproject/build-impl.xml | 44 ++++++++++++-------------- nbproject/genfiles.properties | 8 ++--- nbproject/project.properties | 57 +++++++++++----------------------- nbproject/project.xml | 44 ++++++++------------------ src/java/log4j2.xml | 30 +++--------------- web/WEB-INF/glassfish-web.xml | 13 ++++---- web/WEB-INF/web.xml | 1 - web/index.xhtml | 7 ++++- 11 files changed, 82 insertions(+), 137 deletions(-) create mode 100644 lib/gf-client.jar diff --git a/build.xml b/build.xml index bddac8f2..00b4eeda 100644 --- a/build.xml +++ b/build.xml @@ -7,8 +7,8 @@ - - Builds, tests, and runs the project PizzaService. + + Builds, tests, and runs the project PizzaService-war. - + @@ -495,7 +495,7 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f - + @@ -645,7 +645,7 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f - + @@ -877,8 +877,16 @@ exists or setup the property manually. For example like this: - - + + + + + + + + + + @@ -1022,30 +1030,16 @@ exists or setup the property manually. For example like this: - - - - - - - + - - + - - - - - - - + - - + @@ -1458,7 +1452,9 @@ exists or setup the property manually. For example like this: CLEANUP SECTION --> - + + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index d76800cb..d4e8376e 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=183b4b56 -build.xml.script.CRC32=a6f5a733 +build.xml.data.CRC32=dda72f05 +build.xml.script.CRC32=82213886 build.xml.stylesheet.CRC32=651128d4@1.68.1.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=183b4b56 -nbproject/build-impl.xml.script.CRC32=6164077b +nbproject/build-impl.xml.data.CRC32=dda72f05 +nbproject/build-impl.xml.script.CRC32=06b680e3 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index 6836c4a1..8f87762f 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -3,8 +3,6 @@ annotation.processing.enabled.in.editor=true annotation.processing.processors.list= annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -auxiliary.org-netbeans-modules-html-editor-lib.default-xhtml-public-id=-//W3C//DTD XHTML 1.0 Transitional//EN -auxiliary.org-netbeans-modules-projectapi.jsf_2e_language=Facelets build.classes.dir=${build.web.dir}/WEB-INF/classes build.classes.excludes=**/*.java,**/*.form build.dir=build @@ -27,45 +25,32 @@ dist.dir=dist dist.ear.war=${dist.dir}/${war.ear.name} dist.javadoc.dir=${dist.dir}/javadoc dist.war=${dist.dir}/${war.name} -endorsed.classpath= +endorsed.classpath=\ + ${libs.javaee-endorsed-api-6.0.classpath} excludes= file.reference.cdi-api.jar=lib/cdi-api.jar -file.reference.commons-codec-1.10.jar=lib/commons-codec-1.10.jar -file.reference.commons-lang3-3.4.jar=lib/commons-lang3-3.4.jar -file.reference.jsfcore.jar=lib/jsfcore.jar -file.reference.jshop.jar=lib/jshop.jar -file.reference.log4j-api-2.3.jar=lib/log4j-api-2.3.jar -file.reference.log4j-core-2.3.jar=lib/log4j-core-2.3.jar -file.reference.jcore.jar=lib/jcore.jar -file.reference.log4j-web-2.3.jar=lib/log4j-web-2.3.jar +file.reference.gf-client.jar=lib/gf-client.jar includes=** j2ee.compile.on.save=true j2ee.copy.static.files.on.save=true j2ee.deploy.on.save=true -j2ee.platform=1.5 -j2ee.platform.classpath=${j2ee.server.middleware}/mq/lib/jaxm-api.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar +j2ee.platform=1.7 +j2ee.platform.classpath=${j2ee.server.middleware}/mq/lib/jaxm-api.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.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-osgi.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-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 javac.classpath=\ - ${file.reference.jcore.jar}:\ - ${file.reference.log4j-api-2.3.jar}:\ - ${file.reference.log4j-core-2.3.jar}:\ - ${file.reference.commons-codec-1.10.jar}:\ - ${libs.MySQLDriver.classpath}:\ - ${file.reference.log4j-web-2.3.jar}:\ - ${file.reference.jsfcore.jar}:\ + ${reference.jshop.jar}:\ ${file.reference.cdi-api.jar}:\ - ${file.reference.commons-lang3-3.4.jar}:\ - ${file.reference.jshop.jar} + ${file.reference.gf-client.jar} # Space-separated list of extra javac options -javac.compilerargs=-Xlint:unchecked -Xlint:deprecation +javac.compilerargs= javac.debug=true -javac.deprecation=true +javac.deprecation=false javac.processorpath=\ ${javac.classpath} javac.source=1.7 @@ -76,23 +61,22 @@ javac.test.classpath=\ javac.test.processorpath=\ ${javac.test.classpath} javadoc.additionalparam= -javadoc.author=true +javadoc.author=false javadoc.encoding=${source.encoding} javadoc.noindex=false javadoc.nonavbar=false javadoc.notree=false javadoc.preview=true -javadoc.private=true -javadoc.reference.commons-codec-1.10.jar=/home/quix0r/public_html/JARs/commons-codec-1.10-javadoc.jar -javadoc.reference.log4j-web-2.3.jar=../../../JARs/log4j-web-2.3-javadoc.jar +javadoc.private=false javadoc.splitindex=true javadoc.use=true -javadoc.version=true -javadoc.windowtitle=Pizza-Service +javadoc.version=false +javadoc.windowtitle= lib.dir=${web.docbase.dir}/WEB-INF/lib persistence.xml.dir=${conf.dir} platform.active=default_platform -project.license=gpl30 +project.jshop=../../jshop +reference.jshop.jar=${project.jshop}/dist/jshop.jar resource.dir=setup run.test.classpath=\ ${javac.test.classpath}:\ @@ -101,16 +85,11 @@ run.test.classpath=\ # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): runmain.jvmargs= source.encoding=UTF-8 -source.reference.commons-codec-1.10.jar=/home/quix0r/public_html/JARs/commons-codec-1.10-sources.jar -source.reference.jcore.jar=../jcore/src -source.reference.jsfcore.jar=../jsfcore/src -source.reference.jshop.jar=../jshop/src/ -source.reference.log4j-web-2.3.jar=../../../JARs/log4j-web-2.3-sources.jar source.root=src src.dir=${source.root}/java test.src.dir=test war.content.additional= war.ear.name=${war.name} -war.name=PizzaService.war +war.name=PizzaService-war.war web.docbase.dir=web webinf.dir=web/WEB-INF diff --git a/nbproject/project.xml b/nbproject/project.xml index 7468c759..954eb020 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -3,35 +3,11 @@ org.netbeans.modules.web.project - PizzaService + PizzaService-war 1.6.5 - ${file.reference.jcore.jar} - WEB-INF/lib - - - ${file.reference.log4j-api-2.3.jar} - WEB-INF/lib - - - ${file.reference.log4j-core-2.3.jar} - WEB-INF/lib - - - ${file.reference.commons-codec-1.10.jar} - WEB-INF/lib - - - ${libs.MySQLDriver.classpath} - WEB-INF/lib - - - ${file.reference.log4j-web-2.3.jar} - WEB-INF/lib - - - ${file.reference.jsfcore.jar} + ${reference.jshop.jar} WEB-INF/lib @@ -39,11 +15,7 @@ WEB-INF/lib - ${file.reference.commons-lang3-3.4.jar} - WEB-INF/lib - - - ${file.reference.jshop.jar} + ${file.reference.gf-client.jar} WEB-INF/lib @@ -58,5 +30,15 @@ .\lib\nblibraries.properties + + + jshop + jar + + jar + clean + jar + + diff --git a/src/java/log4j2.xml b/src/java/log4j2.xml index dbbcdde2..1f62de54 100644 --- a/src/java/log4j2.xml +++ b/src/java/log4j2.xml @@ -1,33 +1,13 @@ - - + - - + + - - + + - - - - diff --git a/web/WEB-INF/glassfish-web.xml b/web/WEB-INF/glassfish-web.xml index ed9840a0..730d5867 100644 --- a/web/WEB-INF/glassfish-web.xml +++ b/web/WEB-INF/glassfish-web.xml @@ -1,10 +1,11 @@ - - - - Keep a copy of the generated servlet class' java code. - - + /PizzaService-war + + + + Keep a copy of the generated servlet class' java code. + + diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index fe867e30..e66ce272 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -84,6 +84,5 @@ faces/index.xhtml - diff --git a/web/index.xhtml b/web/index.xhtml index 3df3fb5f..74acebc0 100644 --- a/web/index.xhtml +++ b/web/index.xhtml @@ -105,7 +105,12 @@ - + + + + -- 2.39.5