Please cherry-pick:

[pizzaservice-war.git] / nbproject / project.properties

diff --git a/nbproject/project.properties b/nbproject/project.properties
index d1557b597b80cb807825a3dc16a6780cd99bafae..e8e6c1d617566169d2197da5042cc858a8eb2ef5 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -47,11 +47,11 @@ file.reference.jcustomer-core.jar=lib/jcustomer-core.jar
 file.reference.jcustomer-lib.jar=lib/jcustomer-lib.jar
 file.reference.jphone-core.jar=lib/jphone-core.jar
 file.reference.jphone-lib.jar=lib/jphone-lib.jar
+file.reference.jproduct-core.jar=lib/jproduct-core.jar
 file.reference.jshop-core.jar=lib/jshop-core.jar
 file.reference.jshop-ee-lib.jar=lib/jshop-ee-lib.jar
 file.reference.juser-core.jar=lib/juser-core.jar
 file.reference.juser-lib.jar=lib/juser-lib.jar
-file.reference.pizzaservice-core.jar=lib/pizzaservice-core.jar
 file.reference.poi-3.14-20160307.jar=lib/poi-3.14-20160307.jar
 file.reference.poi-ooxml-3.14-20160307.jar=lib/poi-ooxml-3.14-20160307.jar
 includes=**
@@ -80,9 +80,10 @@ javac.classpath=\
     ${file.reference.juser-lib.jar}:\
     ${file.reference.jcustomer-core.jar}:\
     ${file.reference.jcustomer-lib.jar}:\
+    ${file.reference.jproduct-core.jar}:\
     ${file.reference.jshop-core.jar}:\
     ${file.reference.jshop-ee-lib.jar}:\
-    ${file.reference.pizzaservice-core.jar}:\
+    ${reference.pizzaservice-core.jar}:\
     ${reference.pizzaservice-lib.jar}:\
     ${reference.pizzaservice-mailer.jar}:\
     ${file.reference.cdi-api.jar}:\
@@ -121,8 +122,10 @@ lib.dir=${web.docbase.dir}/WEB-INF/lib
 persistence.xml.dir=${conf.dir}
 platform.active=default_platform
 project.license=agpl30
+project.pizzaservice-core=../../NetBeansProjects/pizzaservice-core
 project.pizzaservice-lib=../pizzaservice-lib
 project.pizzaservice-mailer=../../NetBeansProjects/pizzaservice-mailer
+reference.pizzaservice-core.jar=${project.pizzaservice-core}/dist/pizzaservice-core.jar
 reference.pizzaservice-lib.jar=${project.pizzaservice-lib}/dist/pizzaservice-lib.jar
 reference.pizzaservice-mailer.jar=${project.pizzaservice-mailer}/dist/pizzaservice-mailer.jar
 resource.dir=setup
@@ -143,11 +146,11 @@ source.reference.jcustomer-core.jar=../jcustomer-core/src/
 source.reference.jcustomer-lib.jar=../jcustomer-lib/src/
 source.reference.jphone-core.jar=../jphone-core/src/
 source.reference.jphone-lib.jar=../jphone-lib/src/
+source.reference.jproduct-core.jar=../jproduct-core/src/
 source.reference.jshop-core.jar=../jshop-core/src/
 source.reference.jshop-ee-lib.jar=../jshop-ee-lib/src/
 source.reference.juser-core.jar=../juser-core/src/
 source.reference.juser-lib.jar=../juser-lib/src/
-source.reference.pizzaservice-core.jar=../pizzaservice-core/src/
 source.root=src
 src.dir=${source.root}/java
 test.src.dir=test