From 42188b6f4586a84f3a33417f3076ec80184f397c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 11 Aug 2016 10:57:00 +0200 Subject: [PATCH] converted file-reference to library reference MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder Signed-off-by: Roland Häder --- lib/nblibraries.properties | 24 +++++++++++-------- lib/{ => poi}/poi-3.14-20160307.jar | Bin lib/{ => poi}/poi-3.14-all-LICENSE.txt | 0 lib/{ => poi}/poi-ooxml-3.14-20160307.jar | Bin nbproject/project.properties | 27 +++++++--------------- nbproject/project.xml | 5 +--- 6 files changed, 24 insertions(+), 32 deletions(-) rename lib/{ => poi}/poi-3.14-20160307.jar (100%) rename lib/{ => poi}/poi-3.14-all-LICENSE.txt (100%) rename lib/{ => poi}/poi-ooxml-3.14-20160307.jar (100%) diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties index 1d3179a7..c3187e1c 100644 --- a/lib/nblibraries.properties +++ b/lib/nblibraries.properties @@ -1,9 +1,15 @@ -libs.CopyLibs.classpath=\ - ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar -libs.CopyLibs.displayName=CopyLibs Task -libs.CopyLibs.prop-version=2.0 -libs.primefaces.classpath=\ - ${base}/primefaces/primefaces-6.0.jar -libs.primefaces.displayName=PrimeFaces 6.0 -libs.primefaces.prop-maven-dependencies=\n org.primefaces:primefaces:5.3:jar\n -libs.primefaces.prop-maven-repositories=default:http://repository.primefaces.org/ +libs.apache_poi.classpath=\ + ${base}/poi/poi-3.14-20160307.jar;\ + ${base}/poi/poi-ooxml-3.14-20160307.jar +libs.apache_poi.displayName=Apache POI 3.14 +libs.apache_poi.javadoc=\ + https://poi.apache.org/apidocs/ +libs.CopyLibs.classpath=\ + ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar +libs.CopyLibs.displayName=CopyLibs Task +libs.CopyLibs.prop-version=2.0 +libs.primefaces.classpath=\ + ${base}/primefaces/primefaces-6.0.jar +libs.primefaces.displayName=PrimeFaces 6.0 +libs.primefaces.prop-maven-dependencies=\n org.primefaces:primefaces:6.0:jar\n +libs.primefaces.prop-maven-repositories=default:http://repository.primefaces.org/ diff --git a/lib/poi-3.14-20160307.jar b/lib/poi/poi-3.14-20160307.jar similarity index 100% rename from lib/poi-3.14-20160307.jar rename to lib/poi/poi-3.14-20160307.jar diff --git a/lib/poi-3.14-all-LICENSE.txt b/lib/poi/poi-3.14-all-LICENSE.txt similarity index 100% rename from lib/poi-3.14-all-LICENSE.txt rename to lib/poi/poi-3.14-all-LICENSE.txt diff --git a/lib/poi-ooxml-3.14-20160307.jar b/lib/poi/poi-ooxml-3.14-20160307.jar similarity index 100% rename from lib/poi-ooxml-3.14-20160307.jar rename to lib/poi/poi-ooxml-3.14-20160307.jar diff --git a/nbproject/project.properties b/nbproject/project.properties index 6a6a77c9..ee5f0d9a 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -35,24 +35,19 @@ dist.javadoc.dir=${dist.dir}/javadoc dist.war=${dist.dir}/${war.name} endorsed.classpath= excludes= +file.reference.jjobs-core.jar=lib/jjobs-core.jar file.reference.cdi-api.jar=lib/cdi-api.jar file.reference.gf-client.jar=lib/gf-client.jar -file.reference.jaddressbook-core.jar=lib/jaddressbook-core.jar -file.reference.jaddressbook-lib.jar=lib/jaddressbook-lib.jar -file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.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 -file.reference.jjobs-core.jar=lib/jjobs-core.jar file.reference.jphone-core.jar=lib/jphone-core.jar file.reference.jphone-lib.jar=lib/jphone-lib.jar file.reference.juser-core.jar=lib/juser-core.jar file.reference.juser-lib.jar=lib/juser-lib.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=** j2ee.compile.on.save=true j2ee.copy.static.files.on.save=true @@ -67,25 +62,22 @@ j2ee.platform.wsit.classpath= j2ee.server.type=gfv3ee6 jar.compress=false javac.classpath=\ - ${file.reference.jcontacts-core.jar}:\ - ${file.reference.jcontacts-lib.jar}:\ - ${file.reference.jcore-logger-lib.jar}:\ ${file.reference.jcoreee.jar}:\ + ${file.reference.jcore-logger-lib.jar}:\ ${file.reference.jcountry-core.jar}:\ ${file.reference.jcountry-lib.jar}:\ + ${file.reference.jcontacts-core.jar}:\ + ${file.reference.jcontacts-lib.jar}:\ ${file.reference.jphone-core.jar}:\ ${file.reference.jphone-lib.jar}:\ ${file.reference.juser-core.jar}:\ ${file.reference.juser-lib.jar}:\ - ${file.reference.jaddressbook-core.jar}:\ - ${file.reference.jaddressbook-lib.jar}:\ ${file.reference.jjobs-core.jar}:\ ${reference.jjobs-lib.jar}:\ ${reference.jjobs-mailer.jar}:\ ${file.reference.cdi-api.jar}:\ ${file.reference.gf-client.jar}:\ - ${file.reference.poi-3.14-20160307.jar}:\ - ${file.reference.poi-ooxml-3.14-20160307.jar}:\ + ${libs.apache_poi.classpath}:\ ${libs.primefaces.classpath} # Space-separated list of extra javac options javac.compilerargs=-Xlint:unchecked -Xlint:deprecation @@ -113,12 +105,12 @@ javadoc.reference.poi-ooxml-3.14-20160307.jar=https://poi.apache.org/apidocs/ javadoc.splitindex=true javadoc.use=true javadoc.version=true -javadoc.windowtitle=Jobs Web Application +javadoc.windowtitle=jjobs Web Application lib.dir=${web.docbase.dir}/WEB-INF/lib persistence.xml.dir=${conf.dir} platform.active=default_platform project.jjobs-lib=../jjobs-lib -project.jjobs-mailer=../../NetBeansProjects/jjobs-mailer +project.jjobs-mailer=../jjobs-mailer project.license=agpl30 reference.jjobs-lib.jar=${project.jjobs-lib}/dist/jjobs-lib.jar reference.jjobs-mailer.jar=${project.jjobs-mailer}/dist/jjobs-mailer.jar @@ -130,16 +122,13 @@ 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.jaddressbook-core.jar=../jaddressbook-core/src/ -source.reference.jaddressbook-lib.jar=../jaddressbook-lib/src/ -source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/ +source.reference.jjobs-core.jar=../jjobs-core/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/ -source.reference.jjobs-core.jar=../jjobs-core/src/ source.reference.jphone-core.jar=../jphone-core/src/ source.reference.jphone-lib.jar=../jphone-lib/src/ source.reference.juser-core.jar=../juser-core/src/ diff --git a/nbproject/project.xml b/nbproject/project.xml index 8e9c18ce..d77cc74e 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -52,10 +52,7 @@ ${file.reference.gf-client.jar} - ${file.reference.poi-3.14-20160307.jar} - - - ${file.reference.poi-ooxml-3.14-20160307.jar} + ${libs.apache_poi.classpath} ${libs.primefaces.classpath} -- 2.39.5