Please cherry-pick:

- fixed project dependency with ../../ in relative path which makes it
  lesser portable/usable on other systems

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 19e275221f2ce4ebc4b14e7e92a13a187a78d8b4..dd052825ece7f1a2863638bee8e742d9dd6f418a 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,94 +1,94 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=true
-annotation.processing.processor.options=-Aeclipselink.canonicalmodel.use_static_factory=false
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form,**/.nbattrs
-build.dir=build
-build.ear.classes.dir=${build.dir}/classes
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-debug.classpath=${javac.classpath}:${build.classes.dir}
-debug.test.classpath=\
-    ${run.test.classpath}
-dist.dir=dist
-dist.ear.jar=${dist.dir}/${jar.name}
-dist.jar=${dist.dir}/${jar.name}
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.jfinancials-mailer.jar=lib/jfinancials-mailer.jar
-file.reference.cdi-api.jar=lib/cdi-api.jar
-file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar
-file.reference.jcoreee.jar=lib/jcoreee.jar
-file.reference.jmailer-ee.jar=lib/jmailer-ee.jar
-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/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
-j2ee.platform.wsimport.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
-j2ee.platform.wsit.classpath=
-j2ee.server.type=gfv3ee6
-jar.compress=false
-jar.name=jfinancials-mailer-ejb.jar
-jars.in.ejbjar=false
-javac.classpath=\
-    ${file.reference.jcoreee.jar}:\
-    ${file.reference.jcore-logger-lib.jar}:\
-    ${file.reference.jmailer-ee.jar}:\
-    ${file.reference.cdi-api.jar}:\
-    ${libs.velocity.classpath}:\
-    ${reference.jfinancials-mailer-lib.jar}
-javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
-javac.debug=true
-javac.deprecation=true
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.7
-javac.target=1.7
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-javac.test.processorpath=${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=true
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.preview=true
-javadoc.private=true
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=true
-javadoc.windowtitle=jfinancials EJBs
-meta.inf=${source.root}/conf
-meta.inf.excludes=sun-cmp-mappings.xml
-platform.active=default_platform
-project.jfinancials-mailer-lib=../../NetBeansProjects/jfinancials-mailer-lib
-project.juser-core=../juser-core
-project.license=agpl30
-reference.jfinancials-mailer-lib.jar=${project.jfinancials-mailer-lib}/dist/jfinancials-mailer-lib.jar
-resource.dir=setup
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-# Space-separated list of JVM arguments used when running a class with a main method or a unit test
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
-runmain.jvmargs=
-source.encoding=UTF-8
-source.reference.jfinancials-mailer.jar=../jfinancials-mailer/src/
-source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/
-source.reference.jcoreee.jar=../jcoreee/src/
-source.reference.jmailer-ee.jar=../jmailer-ee/src/
-source.root=src
-src.dir=${source.root}/java
-test.src.dir=test
+annotation.processing.enabled=true\r
+annotation.processing.enabled.in.editor=true\r
+annotation.processing.processor.options=-Aeclipselink.canonicalmodel.use_static_factory=false\r
+annotation.processing.processors.list=\r
+annotation.processing.run.all.processors=true\r
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output\r
+build.classes.dir=${build.dir}/classes\r
+build.classes.excludes=**/*.java,**/*.form,**/.nbattrs\r
+build.dir=build\r
+build.ear.classes.dir=${build.dir}/classes\r
+build.generated.dir=${build.dir}/generated\r
+build.generated.sources.dir=${build.dir}/generated-sources\r
+build.test.classes.dir=${build.dir}/test/classes\r
+build.test.results.dir=${build.dir}/test/results\r
+debug.classpath=${javac.classpath}:${build.classes.dir}\r
+debug.test.classpath=\\r
+    ${run.test.classpath}\r
+dist.dir=dist\r
+dist.ear.jar=${dist.dir}/${jar.name}\r
+dist.jar=${dist.dir}/${jar.name}\r
+dist.javadoc.dir=${dist.dir}/javadoc\r
+endorsed.classpath=\r
+excludes=\r
+file.reference.jfinancials-mailer.jar=lib/jfinancials-mailer.jar\r
+file.reference.cdi-api.jar=lib/cdi-api.jar\r
+file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar\r
+file.reference.jcoreee.jar=lib/jcoreee.jar\r
+file.reference.jmailer-ee.jar=lib/jmailer-ee.jar\r
+includes=**\r
+j2ee.compile.on.save=true\r
+j2ee.deploy.on.save=true\r
+j2ee.platform=1.7\r
+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\r
+j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar\r
+j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar\r
+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\r
+j2ee.platform.wsimport.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\r
+j2ee.platform.wsit.classpath=\r
+j2ee.server.type=gfv3ee6\r
+jar.compress=false\r
+jar.name=jfinancials-mailer-ejb.jar\r
+jars.in.ejbjar=false\r
+javac.classpath=\\r
+    ${file.reference.jcoreee.jar}:\\r
+    ${file.reference.jcore-logger-lib.jar}:\\r
+    ${file.reference.jmailer-ee.jar}:\\r
+    ${file.reference.cdi-api.jar}:\\r
+    ${libs.velocity.classpath}:\\r
+    ${reference.jfinancials-mailer-lib.jar}\r
+javac.compilerargs=-Xlint:unchecked -Xlint:deprecation\r
+javac.debug=true\r
+javac.deprecation=true\r
+javac.processorpath=\\r
+    ${javac.classpath}\r
+javac.source=1.7\r
+javac.target=1.7\r
+javac.test.classpath=\\r
+    ${javac.classpath}:\\r
+    ${build.classes.dir}\r
+javac.test.processorpath=${javac.test.classpath}\r
+javadoc.additionalparam=\r
+javadoc.author=true\r
+javadoc.encoding=${source.encoding}\r
+javadoc.noindex=false\r
+javadoc.nonavbar=false\r
+javadoc.notree=false\r
+javadoc.preview=true\r
+javadoc.private=true\r
+javadoc.splitindex=true\r
+javadoc.use=true\r
+javadoc.version=true\r
+javadoc.windowtitle=jfinancials EJBs\r
+meta.inf=${source.root}/conf\r
+meta.inf.excludes=sun-cmp-mappings.xml\r
+platform.active=default_platform\r
+project.jfinancials-mailer-lib=../jfinancials-mailer-lib\r
+project.juser-core=../juser-core\r
+project.license=agpl30\r
+reference.jfinancials-mailer-lib.jar=${project.jfinancials-mailer-lib}/dist/jfinancials-mailer-lib.jar\r
+resource.dir=setup\r
+run.test.classpath=\\r
+    ${javac.test.classpath}:\\r
+    ${build.test.classes.dir}\r
+# Space-separated list of JVM arguments used when running a class with a main method or a unit test\r
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):\r
+runmain.jvmargs=\r
+source.encoding=UTF-8\r
+source.reference.jfinancials-mailer.jar=../jfinancials-mailer/src/\r
+source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/\r
+source.reference.jcoreee.jar=../jcoreee/src/\r
+source.reference.jmailer-ee.jar=../jmailer-ee/src/\r
+source.root=src\r
+src.dir=${source.root}/java\r
+test.src.dir=test\r