From: Roland Haeder Date: Sat, 5 Sep 2015 14:34:10 +0000 (+0200) Subject: updated jcore.jar + jshop-core.jar + added jshop-ee-lib.jar (maybe not needed here... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3248e36f05b0bb2cb5fd2f08faf9386d77054aa0;p=pizzaservice-war.git updated jcore.jar + jshop-core.jar + added jshop-ee-lib.jar (maybe not needed here?) + remove commons Signed-off-by:Roland Häder --- diff --git a/lib/jcore.jar b/lib/jcore.jar index 512369dc..ad765c65 100644 Binary files a/lib/jcore.jar and b/lib/jcore.jar differ diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar index 48fd3ca3..9cd4e02e 100644 Binary files a/lib/jshop-core.jar and b/lib/jshop-core.jar differ diff --git a/lib/jshop-ee-lib.jar b/lib/jshop-ee-lib.jar new file mode 100644 index 00000000..eb63ff54 Binary files /dev/null and b/lib/jshop-ee-lib.jar differ diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 76bf3058..206bd649 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,4 +1,4 @@ -build.xml.data.CRC32=ff1dc0da +build.xml.data.CRC32=1edfee4e 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. diff --git a/nbproject/project.properties b/nbproject/project.properties index 86ee86fb..c8f807dd 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -29,13 +29,11 @@ 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.gf-client.jar=lib/gf-client.jar file.reference.jcore.jar=lib/jcore.jar file.reference.jcoreee.jar=lib/jcoreee.jar file.reference.jshop-core.jar=lib/jshop-core.jar -file.reference.jshop-ejb.jar=lib/jshop-ejb.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 @@ -53,15 +51,13 @@ j2ee.platform.wsit.classpath= j2ee.server.type=gfv3ee6 jar.compress=false javac.classpath=\ + ${reference.PizzaService-lib.jar}:\ ${file.reference.jcore.jar}:\ ${file.reference.jcoreee.jar}:\ ${file.reference.jshop-core.jar}:\ - ${file.reference.jshop-ejb.jar}:\ - ${reference.PizzaService-lib.jar}:\ + ${file.reference.jshop-ee-lib.jar}:\ ${file.reference.cdi-api.jar}:\ ${file.reference.gf-client.jar}:\ - ${file.reference.commons-codec-1.10.jar}:\ - ${file.reference.commons-lang3-3.4.jar}:\ ${file.reference.log4j-api-2.3.jar}:\ ${file.reference.log4j-core-2.3.jar}:\ ${file.reference.log4j-web-2.3.jar} @@ -106,7 +102,7 @@ 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-ejb.jar=../jshop-ejb/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/nbproject/project.xml b/nbproject/project.xml index 53d981ae..dee8330a 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -6,6 +6,10 @@ PizzaService-war 1.6.5 + + ${reference.PizzaService-lib.jar} + WEB-INF/lib + ${file.reference.jcore.jar} WEB-INF/lib @@ -19,7 +23,7 @@ WEB-INF/lib - ${reference.PizzaService-lib.jar} + ${file.reference.jshop-ee-lib.jar} WEB-INF/lib @@ -30,14 +34,6 @@ ${file.reference.gf-client.jar} WEB-INF/lib - - ${file.reference.commons-codec-1.10.jar} - WEB-INF/lib - - - ${file.reference.commons-lang3-3.4.jar} - WEB-INF/lib - ${file.reference.log4j-api-2.3.jar} WEB-INF/lib @@ -50,10 +46,6 @@ ${file.reference.log4j-web-2.3.jar} WEB-INF/lib - - ${file.reference.jshop-ejb.jar} - WEB-INF/lib -