From 1324b84410c166d6a2984c9ba08e81eb469b7235 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 30 Apr 2020 22:32:18 +0200 Subject: [PATCH] Please cherry-pick: - removed no longer used jcore-logger-lib.jar as this is not possible here - added upcoming need of jbonuscard-lib.jar MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- nbproject/project.properties | 35 +++++++++++++++++++++++++++-------- nbproject/project.xml | 18 +++++++++--------- 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/nbproject/project.properties b/nbproject/project.properties index 187b76a6..5a47991e 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -36,12 +36,12 @@ dist.war=${dist.dir}/${war.name} endorsed.classpath= excludes= file.reference.jbonuscard-core.jar=lib/jbonuscard-core.jar +file.reference.jbonuscard-lib.jar=lib/jbonuscard-lib.jar file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar file.reference.cdi-api.jar=lib/cdi-api.jar file.reference.jcontacts-business-lib.jar=lib/jcontacts-business-lib.jar file.reference.jcontacts-core.jar=lib/jcontacts-core.jar file.reference.jcontacts-lib.jar=lib/jcontacts-lib.jar -file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar file.reference.jcoreee.jar=lib/jcoreee.jar file.reference.jcountry-core.jar=lib/jcountry-core.jar file.reference.jcountry-lib.jar=lib/jcountry-lib.jar @@ -72,15 +72,14 @@ j2ee.server.type=gfv3ee6 jar.compress=false javac.classpath=\ ${file.reference.jcoreee.jar}:\ - ${file.reference.jcore-logger-lib.jar}:\ ${file.reference.jcountry-core.jar}:\ ${file.reference.jcountry-lib.jar}:\ - ${file.reference.jcontacts-lib.jar}:\ ${file.reference.jcontacts-core.jar}:\ - ${file.reference.jcustomer-core.jar}:\ - ${file.reference.jcustomer-lib.jar}:\ + ${file.reference.jcontacts-lib.jar}:\ ${file.reference.jcontacts-business-core.jar}:\ ${file.reference.jcontacts-business-lib.jar}:\ + ${file.reference.jcustomer-core.jar}:\ + ${file.reference.jcustomer-lib.jar}:\ ${file.reference.jproduct-core.jar}:\ ${file.reference.jproduct-lib.jar}:\ ${file.reference.jphone-core.jar}:\ @@ -92,6 +91,7 @@ javac.classpath=\ ${file.reference.juser-login-core.jar}:\ ${file.reference.juser-login-lib.jar}:\ ${file.reference.jbonuscard-core.jar}:\ + ${file.reference.jbonuscard-lib.jar}:\ ${reference.jfinancials-core.jar}:\ ${reference.jfinancials-lib.jar}:\ ${file.reference.cdi-api.jar}:\ @@ -124,7 +124,26 @@ javadoc.preview=true javadoc.private=true javadoc.reference.cdi-api.jar=https://docs.oracle.com/javaee/7/api/ javadoc.reference.jbonuscard-core.jar=https://docs.mxchange.org/javadoc/jbonuscard-core/ -javadoc.reference.jcoreee.jar=https://docs.mxchange.org/javadoc/jcoreee. +javadoc.reference.jbonuscard-lib.jar=https://docs.mxchange.org/javadoc/jbonuscard-lib/ +javadoc.reference.jcontacts-business-core.jar=https://docs.mxchange.org/javadoc/jcontacts-business-core/ +javadoc.reference.jcontacts-business-lib.jar=https://docs.mxchange.org/javadoc/jcontacts-business-lib/ +javadoc.reference.jcontacts-core.jar=https://docs.mxchange.org/javadoc/jcontacts-core/ +javadoc.reference.jcontacts-lib.jar=https://docs.mxchange.org/javadoc/jcontacts-lib/ +javadoc.reference.jcoreee.jar=https://docs.mxchange.org/javadoc/jcoreee/ +javadoc.reference.jcountry-core.jar=https://docs.mxchange.org/javadoc/jcountry-core/ +javadoc.reference.jcountry-lib.jar=https://docs.mxchange.org/javadoc/jcountry-lib/ +javadoc.reference.jcustomer-core.jar=https://docs.mxchange.org/javadoc/jcustomer-core/ +javadoc.reference.jcustomer-lib.jar=https://docs.mxchange.org/javadoc/jcustomer-lib/ +javadoc.reference.jphone-core.jar=https://docs.mxchange.org/javadoc/jphone-core/ +javadoc.reference.jphone-lib.jar=https://docs.mxchange.org/javadoc/jphone-lib/ +javadoc.reference.jproduct-core.jar=https://docs.mxchange.org/javadoc/jproduct-core/ +javadoc.reference.jproduct-lib.jar=https://docs.mxchange.org/javadoc/jproduct-lib/ +javadoc.reference.juser-activity-core.jar=https://docs.mxchange.org/javadoc/juser-activity-core/ +javadoc.reference.juser-activity-lib.jar=https://docs.mxchange.org/javadoc/juser-activity-lib/ +javadoc.reference.juser-core.jar=https://docs.mxchange.org/javadoc/juser-core/ +javadoc.reference.juser-lib.jar=https://docs.mxchange.org/javadoc/juser-lib/ +javadoc.reference.juser-login-core.jar=https://docs.mxchange.org/javadoc/juser-login-core/ +javadoc.reference.juser-login-lib.jar=https://docs.mxchange.org/javadoc/juser-login-lib/ javadoc.splitindex=true javadoc.use=true javadoc.version=true @@ -145,12 +164,12 @@ 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.jbonuscard-core.jar=..jbonuscard-core/ +source.reference.jbonuscard-core.jar=../jbonuscard-core/ +source.reference.jbonuscard-lib.jar=../jbonuscard-lib/ source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/ source.reference.jcontacts-business-lib.jar=../jcontacts-business-lib/src/ source.reference.jcontacts-core.jar=../jcontacts-core/src/ source.reference.jcontacts-lib.jar=../jcontacts-lib/src/ -source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/ source.reference.jcoreee.jar=../jcoreee/src/ source.reference.jcountry-core.jar=../jcountry-core/src/ source.reference.jcountry-lib.jar=../jcountry-lib/src/ diff --git a/nbproject/project.xml b/nbproject/project.xml index be4dbfff..bcb24c15 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -9,9 +9,6 @@ ${file.reference.jcoreee.jar} - - ${file.reference.jcore-logger-lib.jar} - ${file.reference.jcountry-core.jar} @@ -19,22 +16,22 @@ ${file.reference.jcountry-lib.jar} - ${file.reference.jcontacts-lib.jar} + ${file.reference.jcontacts-core.jar} - ${file.reference.jcontacts-core.jar} + ${file.reference.jcontacts-lib.jar} - ${file.reference.jcustomer-core.jar} + ${file.reference.jcontacts-business-core.jar} - ${file.reference.jcustomer-lib.jar} + ${file.reference.jcontacts-business-lib.jar} - ${file.reference.jcontacts-business-core.jar} + ${file.reference.jcustomer-core.jar} - ${file.reference.jcontacts-business-lib.jar} + ${file.reference.jcustomer-lib.jar} ${file.reference.jproduct-core.jar} @@ -69,6 +66,9 @@ ${file.reference.jbonuscard-core.jar} + + ${file.reference.jbonuscard-lib.jar} + ${reference.jfinancials-core.jar} -- 2.39.5