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 ab7f8190cd7b8925ca07a6c8d3ce2c6e5c6f7ea9..7fd0d14a44a2d69245646eeb3ae2fa0200c56891 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,42 +1,42 @@
-build.classes.excludes=**/*.java,**/*.form,**/.nbattrs
-build.dir=build
-build.generated.dir=${build.dir}/generated
-client.urlPart=
-debug.classpath=${javac.classpath}::${jar.content.additional}:${run.classpath}
-display.browser=true
-dist.dir=dist
-dist.jar=${dist.dir}/${jar.name}
-endorsed.classpath=
-j2ee.appclient.mainclass.args=${j2ee.appclient.tool.args}
-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.content.additional=\
-    ${reference.jcore-logger-ejb.dist-ear}:\
-    ${reference.jfinancials-ejb.dist-ear}:\
-    ${reference.jfinancials-mailer-ejb.dist-ear}
-jar.name=jfinancials.ear
-javac.debug=true
-javac.deprecation=false
-javac.source=1.6
-javac.target=1.6
-meta.inf=src/conf
-no.dependencies=false
-platform.active=default_platform
-project.jcore-logger-ejb=../jcore-logger-ejb
-project.jfinancials-ejb=../jfinancials-ejb
-project.jfinancials-mailer-ejb=../../NetBeansProjects/jfinancials-mailer-ejb
-reference.jfinancials-ejb.dist-ear=${project.jfinancials-ejb}/dist/jfinancials-ejb.jar
-reference.jcore-logger-ejb.dist-ear=${project.jcore-logger-ejb}/dist/jcore-logger-ejb.jar
-reference.jfinancials-mailer-ejb.dist-ear=${project.jfinancials-mailer-ejb}/dist/jfinancials-mailer-ejb.jar
-resource.dir=setup
-run.classpath=
-source.root=.
+build.classes.excludes=**/*.java,**/*.form,**/.nbattrs\r
+build.dir=build\r
+build.generated.dir=${build.dir}/generated\r
+client.urlPart=\r
+debug.classpath=${javac.classpath}::${jar.content.additional}:${run.classpath}\r
+display.browser=true\r
+dist.dir=dist\r
+dist.jar=${dist.dir}/${jar.name}\r
+endorsed.classpath=\r
+j2ee.appclient.mainclass.args=${j2ee.appclient.tool.args}\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.content.additional=\\r
+    ${reference.jcore-logger-ejb.dist-ear}:\\r
+    ${reference.jfinancials-ejb.dist-ear}:\\r
+    ${reference.jfinancials-mailer-ejb.dist-ear}\r
+jar.name=jfinancials.ear\r
+javac.debug=true\r
+javac.deprecation=false\r
+javac.source=1.6\r
+javac.target=1.6\r
+meta.inf=src/conf\r
+no.dependencies=false\r
+platform.active=default_platform\r
+project.jcore-logger-ejb=../jcore-logger-ejb\r
+project.jfinancials-ejb=../jfinancials-ejb\r
+project.jfinancials-mailer-ejb=../jfinancials-mailer-ejb\r
+reference.jfinancials-ejb.dist-ear=${project.jfinancials-ejb}/dist/jfinancials-ejb.jar\r
+reference.jcore-logger-ejb.dist-ear=${project.jcore-logger-ejb}/dist/jcore-logger-ejb.jar\r
+reference.jfinancials-mailer-ejb.dist-ear=${project.jfinancials-mailer-ejb}/dist/jfinancials-mailer-ejb.jar\r
+resource.dir=setup\r
+run.classpath=\r
+source.root=.\r