From 7697673c02747d316663b75b30746f19e5b11fa6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 9 Jun 2017 22:53:24 +0200 Subject: [PATCH] added missing dependencies on jaddressbook[-share] MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- nbproject/build-impl.xml | 39 ++++++++++++++++++++++++++++-------- nbproject/project.properties | 20 ++++++++++++++---- nbproject/project.xml | 14 ++++++++++++- 3 files changed, 60 insertions(+), 13 deletions(-) diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index d79ebf8..693651a 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -806,6 +806,9 @@ exists or setup the property manually. For example like this: COMPILATION SECTION --> + + + @@ -817,6 +820,9 @@ exists or setup the property manually. For example like this: + + + @@ -851,7 +857,11 @@ exists or setup the property manually. For example like this: - + + + + + @@ -870,12 +880,16 @@ exists or setup the property manually. For example like this: - + + + + + - + @@ -889,10 +903,14 @@ exists or setup the property manually. For example like this: - - - - + + + + + + + + @@ -909,7 +927,11 @@ exists or setup the property manually. For example like this: - + + + + + @@ -1296,6 +1318,7 @@ exists or setup the property manually. For example like this: CLEANUP SECTION --> + diff --git a/nbproject/project.properties b/nbproject/project.properties index be3e8d6..09f240a 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -21,9 +21,12 @@ dist.jar=${dist.dir}/${jar.name} dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -file.reference.addressbook-core.jar=lib/addressbook-core.jar file.reference.addressbook-mailer.jar=lib/addressbook-mailer.jar file.reference.cdi-api.jar=lib/cdi-api.jar +file.reference.jaddressbook-core.jar=lib/jaddressbook-core.jar +file.reference.jaddressbook-lib.jar=lib/jaddressbook-lib.jar +file.reference.jaddressbook-share-core.jar=lib/jaddressbook-share-core.jar +file.reference.jaddressbook-share-lib.jar=lib/jaddressbook-share-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 @@ -41,7 +44,7 @@ includes=** j2ee.compile.on.save=true j2ee.deploy.on.save=true j2ee.platform=1.7 -j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar +j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar @@ -65,7 +68,11 @@ javac.classpath=\ ${file.reference.juser-activity-core.jar}:\ ${file.reference.juser-activity-lib.jar}:\ ${file.reference.jmailer-ee.jar}:\ - ${file.reference.addressbook-core.jar}:\ + ${file.reference.jaddressbook-core.jar}:\ + ${file.reference.jaddressbook-lib.jar}:\ + ${file.reference.jaddressbook-share-core.jar}:\ + ${file.reference.jaddressbook-share-lib.jar}:\ + ${reference.addressbook-core.jar}:\ ${reference.addressbook-lib.jar}:\ ${reference.addressbook-mailer.jar}:\ ${file.reference.cdi-api.jar} @@ -95,11 +102,13 @@ javadoc.windowtitle=addressbook EJBs meta.inf=${source.root}/conf meta.inf.excludes=sun-cmp-mappings.xml platform.active=default_platform +project.addressbook-core=../../NetBeansProjects/addressbook-core project.addressbook-lib=../addressbook-lib project.addressbook-mailer=../addressbook-mailer project.juser-core=../juser-core project.license=agpl30 project.serviceLocator.class=de.chotime.landingpage.mailer.model.delivery.LandingMailer +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 @@ -110,8 +119,11 @@ 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.addressbook-mailer.jar=../addressbook-mailer/src/ +source.reference.jaddressbook-core.jar=../jaddressbook-core/src +source.reference.jaddressbook-lib.jar=../jaddressbook-lib/src +source.reference.jaddressbook-share-core.jar=../jaddressbook-share-core/src +source.reference.jaddressbook-share-lib.jar=../jaddressbook-share-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/ diff --git a/nbproject/project.xml b/nbproject/project.xml index acf8a96..4dcbc09 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -18,7 +18,11 @@ file.reference.juser-activity-core.jar file.reference.juser-activity-lib.jar file.reference.jmailer-ee.jar - file.reference.addressbook-core.jar + file.reference.jaddressbook-core.jar + file.reference.jaddressbook-lib.jar + file.reference.jaddressbook-share-core.jar + file.reference.jaddressbook-share-lib.jar + reference.addressbook-core.jar reference.addressbook-lib.jar reference.addressbook-mailer.jar file.reference.cdi-api.jar @@ -33,6 +37,14 @@ ./lib/nblibraries.properties + + addressbook-core + jar + + jar + clean + jar + addressbook-lib jar -- 2.39.5