From: Roland Haeder Date: Tue, 8 Sep 2015 20:47:03 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9e7c149409cc15ec0d34b3720c6a369c62262bd0;p=pizzaservice-ejb.git Continued: - updated jcore.jar, jcoreee.jar, jshop-core.jar, jshop-ee-lib.jar - added jcore-ee-logger.jar Signed-off-by:Roland Häder --- diff --git a/PizzaService-ejb/lib/jcore-ee-logger.jar b/PizzaService-ejb/lib/jcore-ee-logger.jar new file mode 100644 index 0000000..4869b92 Binary files /dev/null and b/PizzaService-ejb/lib/jcore-ee-logger.jar differ diff --git a/PizzaService-ejb/lib/jcore.jar b/PizzaService-ejb/lib/jcore.jar index 7318d47..217c364 100644 Binary files a/PizzaService-ejb/lib/jcore.jar and b/PizzaService-ejb/lib/jcore.jar differ diff --git a/PizzaService-ejb/lib/jcoreee.jar b/PizzaService-ejb/lib/jcoreee.jar index f479cd8..9f0039f 100644 Binary files a/PizzaService-ejb/lib/jcoreee.jar and b/PizzaService-ejb/lib/jcoreee.jar differ diff --git a/PizzaService-ejb/lib/jshop-core.jar b/PizzaService-ejb/lib/jshop-core.jar index 9965f38..3772ba4 100644 Binary files a/PizzaService-ejb/lib/jshop-core.jar and b/PizzaService-ejb/lib/jshop-core.jar differ diff --git a/PizzaService-ejb/lib/jshop-ee-lib.jar b/PizzaService-ejb/lib/jshop-ee-lib.jar index 54ab89b..7b53640 100644 Binary files a/PizzaService-ejb/lib/jshop-ee-lib.jar and b/PizzaService-ejb/lib/jshop-ee-lib.jar differ diff --git a/PizzaService-ejb/nbproject/build-impl.xml b/PizzaService-ejb/nbproject/build-impl.xml index ecaef8c..c76424d 100644 --- a/PizzaService-ejb/nbproject/build-impl.xml +++ b/PizzaService-ejb/nbproject/build-impl.xml @@ -826,36 +826,36 @@ exists or setup the property manually. For example like this: - - + + - - + + - - - - - + + + + + - - + + diff --git a/PizzaService-ejb/nbproject/genfiles.properties b/PizzaService-ejb/nbproject/genfiles.properties index 69ff75f..bc528c3 100644 --- a/PizzaService-ejb/nbproject/genfiles.properties +++ b/PizzaService-ejb/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=669ce18d +build.xml.data.CRC32=ee74bfea 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=669ce18d -nbproject/build-impl.xml.script.CRC32=64ac5c69 +nbproject/build-impl.xml.data.CRC32=4737abf6 +nbproject/build-impl.xml.script.CRC32=09b65c61 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.51.1 diff --git a/PizzaService-ejb/nbproject/project.properties b/PizzaService-ejb/nbproject/project.properties index 3dcedcc..ef74043 100644 --- a/PizzaService-ejb/nbproject/project.properties +++ b/PizzaService-ejb/nbproject/project.properties @@ -22,14 +22,16 @@ endorsed.classpath= excludes= file.reference.cdi-api.jar=lib/cdi-api.jar file.reference.jcoreee.jar=lib/jcoreee.jar -file.reference.jcore.jar=lib/jcore.jar file.reference.jshop-core.jar=lib/jshop-core.jar file.reference.jshop-ee-lib.jar=lib/jshop-ee-lib.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.log4j-web-2.3.jar=lib/log4j-web-2.3.jar includes=** j2ee.compile.on.save=true j2ee.deploy.on.save=true 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.classpath=${j2ee.server.middleware}/mq/lib/jaxm-api.jar:${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/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.persistence.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 @@ -40,12 +42,15 @@ jar.compress=false jar.name=PizzaService-ejb.jar jars.in.ejbjar=true javac.classpath=\ - ${reference.PizzaService-lib.jar}:\ - ${file.reference.jcore.jar}:\ + ${reference.jcore-ee-logger.jar}:\ ${file.reference.jcoreee.jar}:\ ${file.reference.jshop-core.jar}:\ ${file.reference.jshop-ee-lib.jar}:\ - ${file.reference.cdi-api.jar} + ${reference.PizzaService-lib.jar}:\ + ${file.reference.cdi-api.jar}:\ + ${file.reference.log4j-api-2.3.jar}:\ + ${file.reference.log4j-core-2.3.jar}:\ + ${file.reference.log4j-web-2.3.jar} javac.debug=true javac.deprecation=true javac.processorpath=\ @@ -71,8 +76,10 @@ javadoc.windowtitle=Pizza-Service EJBs meta.inf=${source.root}/conf meta.inf.excludes=sun-cmp-mappings.xml platform.active=default_platform +project.jcore-ee-logger=../../jcore-ee-logger project.license=gpl30 project.PizzaService-lib=../../PizzaService-lib +reference.jcore-ee-logger.jar=${project.jcore-ee-logger}/dist/jcore-ee-logger.jar reference.PizzaService-lib.jar=${project.PizzaService-lib}/dist/PizzaService-lib.jar resource.dir=setup run.test.classpath=\ @@ -82,7 +89,6 @@ 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.jcore.jar=../../jcore/src source.reference.jcoreee.jar=../../jcoreee/src/ source.reference.jshop-core.jar=../../jshop-core/src/ source.reference.jshop-ee-lib.jar=../../jshop-ee-lib/src/ diff --git a/PizzaService-ejb/nbproject/project.xml b/PizzaService-ejb/nbproject/project.xml index ed392fc..1f9719f 100644 --- a/PizzaService-ejb/nbproject/project.xml +++ b/PizzaService-ejb/nbproject/project.xml @@ -5,12 +5,15 @@ PizzaService-ejb 1.6.5 - reference.PizzaService-lib.jar - file.reference.jcore.jar + reference.jcore-ee-logger.jar file.reference.jcoreee.jar file.reference.jshop-core.jar file.reference.jshop-ee-lib.jar + reference.PizzaService-lib.jar file.reference.cdi-api.jar + file.reference.log4j-api-2.3.jar + file.reference.log4j-core-2.3.jar + file.reference.log4j-web-2.3.jar @@ -30,6 +33,14 @@ clean jar + + jcore-ee-logger + jar + + jar + clean + jar + diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 9115fac..f15258b 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -205,10 +205,6 @@ exists or setup the property manually. For example like this: - - - - @@ -227,7 +223,6 @@ exists or setup the property manually. For example like this: - @@ -305,7 +300,6 @@ exists or setup the property manually. For example like this: - @@ -635,10 +629,6 @@ exists or setup the property manually. For example like this: - - - - diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 1d9adae..cd334b7 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,4 +1,4 @@ -build.xml.data.CRC32=6fa7b0ea +build.xml.data.CRC32=e3137455 build.xml.script.CRC32=8e3e9528 build.xml.stylesheet.CRC32=a5d15b16@1.49.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. diff --git a/nbproject/project.properties b/nbproject/project.properties index e4902b6..ad9af24 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -6,11 +6,13 @@ debug.classpath=${javac.classpath}::${jar.content.additional}:${run.classpath} display.browser=true dist.dir=dist dist.jar=${dist.dir}/${jar.name} +endorsed.classpath= +file.reference.jcore-ee-logger.jar=../jcore-ee-logger/dist/jcore-ee-logger.jar j2ee.appclient.mainclass.args=${j2ee.appclient.tool.args} j2ee.compile.on.save=true j2ee.deploy.on.save=true 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.classpath=${j2ee.server.middleware}/mq/lib/jaxm-api.jar:${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/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.persistence.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 @@ -19,9 +21,9 @@ j2ee.platform.wsit.classpath= j2ee.server.type=gfv3ee6 jar.compress=false jar.content.additional=\ - ${reference.PizzaService-ejb.dist-ear}:\ + ${file.reference.jcore-ee-logger.jar}:\ ${reference.jshop-ejb.dist-ear}:\ - ${reference.jcore-ee-logger.dist-ear} + ${reference.PizzaService-ejb.dist-ear} jar.name=PizzaService.ear javac.debug=true javac.deprecation=false @@ -30,10 +32,8 @@ javac.target=1.6 meta.inf=src/conf no.dependencies=false platform.active=default_platform -project.jcore-ee-logger=../jcore-ee-logger -project.jshop-ejb=../../MyProjects/jshop-ejb +project.jshop-ejb=../jshop-ejb project.PizzaService-ejb=PizzaService-ejb -reference.jcore-ee-logger.dist-ear=${project.jcore-ee-logger}/dist/jcore-ee-logger.jar reference.jshop-ejb.dist-ear=${project.jshop-ejb}/dist/jshop-ejb.jar reference.PizzaService-ejb.dist-ear=${project.PizzaService-ejb}/dist/PizzaService-ejb.jar resource.dir=setup diff --git a/nbproject/project.xml b/nbproject/project.xml index f419409..874f6db 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -8,7 +8,7 @@ - ${reference.PizzaService-ejb.dist-ear} + ${file.reference.jcore-ee-logger.jar} / @@ -16,7 +16,7 @@ / - ${reference.jcore-ee-logger.dist-ear} + ${reference.PizzaService-ejb.dist-ear} / @@ -30,14 +30,6 @@ clean-ear dist-ear - - jcore-ee-logger - j2ee_ear_archive - - dist-ear - clean-ear - dist-ear - jshop-ejb j2ee_ear_archive