From c0cba793ae9e6520d9e3b4fe28bdde6180920865 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 15 Apr 2017 20:55:54 +0200 Subject: [PATCH] Continued: - addressbook-core/mailer are now referenced as projects as they are application-specific projects and not libraries (like e.g. juser-core is) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- lib/addressbook-core.jar | Bin 17751 -> 0 bytes nbproject/build-impl.xml | 12 +++++++++++- nbproject/genfiles.properties | 4 ++-- nbproject/project.properties | 6 +++--- nbproject/project.xml | 35 ++++++++++++++++------------------ 5 files changed, 32 insertions(+), 25 deletions(-) delete mode 100644 lib/addressbook-core.jar diff --git a/lib/addressbook-core.jar b/lib/addressbook-core.jar deleted file mode 100644 index 36c8f87e76366fe7597f8c5dc14348a9ec148b72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17751 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 diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 2f9622e5..961c7991 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -878,6 +878,9 @@ exists or setup the property manually. For example like this: COMPILATION SECTION --> + + + @@ -886,6 +889,9 @@ exists or setup the property manually. For example like this: + + + @@ -1036,10 +1042,13 @@ exists or setup the property manually. For example like this: + - + + + @@ -1452,6 +1461,7 @@ exists or setup the property manually. For example like this: CLEANUP SECTION --> + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index d3239fb7..ce320316 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=be5f34f7 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. # 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=3cd401ae -nbproject/build-impl.xml.script.CRC32=b5ddf432 +nbproject/build-impl.xml.data.CRC32=f07494a8 +nbproject/build-impl.xml.script.CRC32=8dc59c00 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index 83f5d30c..203ad966 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -35,7 +35,6 @@ dist.javadoc.dir=${dist.dir}/javadoc dist.war=${dist.dir}/${war.name} endorsed.classpath= excludes= -file.reference.addressbook-core.jar=lib/addressbook-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 @@ -80,7 +79,7 @@ javac.classpath=\ ${file.reference.juser-lib.jar}:\ ${file.reference.jaddressbook-core.jar}:\ ${file.reference.jaddressbook-lib.jar}:\ - ${file.reference.addressbook-core.jar}:\ + ${reference.addressbook-core.jar}:\ ${reference.addressbook-lib.jar}:\ ${reference.addressbook-mailer.jar}:\ ${file.reference.cdi-api.jar}:\ @@ -118,9 +117,11 @@ javadoc.windowtitle=Addressbook Web Application lib.dir=${web.docbase.dir}/WEB-INF/lib persistence.xml.dir=${conf.dir} platform.active=default_platform +project.addressbook-core=../../NetBeansProjects/addressbook-core project.addressbook-lib=../addressbook-lib project.addressbook-mailer=../../NetBeansProjects/addressbook-mailer project.license=agpl30 +reference.addressbook-core.jar=${project.addressbook-core}/dist/addressbook-core.jar reference.addressbook-lib.jar=${project.addressbook-lib}/dist/addressbook-lib.jar reference.addressbook-mailer.jar=${project.addressbook-mailer}/dist/addressbook-mailer.jar resource.dir=setup @@ -131,7 +132,6 @@ 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.addressbook-core.jar=../addressbook-core/src 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/ diff --git a/nbproject/project.xml b/nbproject/project.xml index a19c4f59..a7ea36a5 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -7,10 +7,10 @@ 1.6.5 - ${file.reference.jcore-logger-lib.jar} + ${file.reference.jcoreee.jar} - ${file.reference.jcoreee.jar} + ${file.reference.jcore-logger-lib.jar} ${file.reference.jcountry-core.jar} @@ -19,19 +19,19 @@ ${file.reference.jcountry-lib.jar} - ${file.reference.jphone-core.jar} + ${file.reference.jcontacts-core.jar} ${file.reference.jcontacts-business-core.jar} - ${file.reference.jphone-lib.jar} + ${file.reference.jcontacts-lib.jar} - ${file.reference.jcontacts-core.jar} + ${file.reference.jphone-core.jar} - ${file.reference.jcontacts-lib.jar} + ${file.reference.jphone-lib.jar} ${file.reference.juser-core.jar} @@ -39,18 +39,6 @@ ${file.reference.juser-lib.jar} - - ${file.reference.jcustomer-core.jar} - - - ${file.reference.jcustomer-lib.jar} - - - ${file.reference.jshop-core.jar} - - - ${file.reference.jshop-ee-lib.jar} - ${file.reference.jaddressbook-core.jar} @@ -58,7 +46,8 @@ ${file.reference.jaddressbook-lib.jar} - ${file.reference.addressbook-core.jar} + ${reference.addressbook-core.jar} + WEB-INF/lib ${reference.addressbook-lib.jar} @@ -94,6 +83,14 @@ ./lib/nblibraries.properties + + addressbook-core + jar + + jar + clean + jar + addressbook-lib jar -- 2.39.5