From: Roland Haeder Date: Tue, 8 Sep 2015 13:40:21 +0000 (+0200) Subject: More cleanup X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=48cd110fb489b94b8399f683fff451236885e827;p=pizzaservice-ejb.git More cleanup Signed-off-by:Roland Häder --- diff --git a/PizzaService-ejb/lib/jcore.jar b/PizzaService-ejb/lib/jcore.jar index 1e4a78b..7318d47 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 8ca2e65..f479cd8 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 9ee0879..9965f38 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 a39d20b..54ab89b 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 5d9b661..ecaef8c 100644 --- a/PizzaService-ejb/nbproject/build-impl.xml +++ b/PizzaService-ejb/nbproject/build-impl.xml @@ -832,9 +832,6 @@ exists or setup the property manually. For example like this: - - - @@ -843,20 +840,14 @@ exists or setup the property manually. For example like this: - - - - + - - - @@ -866,9 +857,6 @@ 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 3f1e3e5..69ff75f 100644 --- a/PizzaService-ejb/nbproject/genfiles.properties +++ b/PizzaService-ejb/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=3acb4892 +build.xml.data.CRC32=669ce18d 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=3acb4892 -nbproject/build-impl.xml.script.CRC32=eedbb4d3 +nbproject/build-impl.xml.data.CRC32=669ce18d +nbproject/build-impl.xml.script.CRC32=64ac5c69 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 c1ae070..3dcedcc 100644 --- a/PizzaService-ejb/nbproject/project.properties +++ b/PizzaService-ejb/nbproject/project.properties @@ -25,14 +25,11 @@ 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/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.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.jar @@ -41,17 +38,14 @@ j2ee.platform.wsit.classpath= j2ee.server.type=gfv3ee6 jar.compress=false jar.name=PizzaService-ejb.jar -jars.in.ejbjar=false +jars.in.ejbjar=true javac.classpath=\ ${reference.PizzaService-lib.jar}:\ ${file.reference.jcore.jar}:\ ${file.reference.jcoreee.jar}:\ ${file.reference.jshop-core.jar}:\ ${file.reference.jshop-ee-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} + ${file.reference.cdi-api.jar} javac.debug=true javac.deprecation=true javac.processorpath=\ diff --git a/PizzaService-ejb/nbproject/project.xml b/PizzaService-ejb/nbproject/project.xml index bb88ff9..ed392fc 100644 --- a/PizzaService-ejb/nbproject/project.xml +++ b/PizzaService-ejb/nbproject/project.xml @@ -11,9 +11,6 @@ file.reference.jshop-core.jar file.reference.jshop-ee-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 diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index f15258b..9115fac 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -205,6 +205,10 @@ exists or setup the property manually. For example like this: + + + + @@ -223,6 +227,7 @@ exists or setup the property manually. For example like this: + @@ -300,6 +305,7 @@ exists or setup the property manually. For example like this: + @@ -629,6 +635,10 @@ exists or setup the property manually. For example like this: + + + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 16a6e78..1d9adae 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=df8eee8a +build.xml.data.CRC32=6fa7b0ea 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. # 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=df8eee8a -nbproject/build-impl.xml.script.CRC32=249f8ab6 +nbproject/build-impl.xml.data.CRC32=6fa7b0ea +nbproject/build-impl.xml.script.CRC32=82732cff nbproject/build-impl.xml.stylesheet.CRC32=5eea63a6@1.49.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index ca14a32..e4902b6 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -10,7 +10,7 @@ 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/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.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.jar @@ -20,7 +20,8 @@ j2ee.server.type=gfv3ee6 jar.compress=false jar.content.additional=\ ${reference.PizzaService-ejb.dist-ear}:\ - ${reference.jshop-ejb.dist-ear} + ${reference.jshop-ejb.dist-ear}:\ + ${reference.jcore-ee-logger.dist-ear} jar.name=PizzaService.ear javac.debug=true javac.deprecation=false @@ -29,8 +30,10 @@ 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.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 6639f51..f419409 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -15,6 +15,10 @@ ${reference.jshop-ejb.dist-ear} / + + ${reference.jcore-ee-logger.dist-ear} + / + @@ -26,6 +30,14 @@ clean-ear dist-ear + + jcore-ee-logger + j2ee_ear_archive + + dist-ear + clean-ear + dist-ear + jshop-ejb j2ee_ear_archive