Please cherry-pick:

- added notice for important copy-step in WAR project
- added WAR project as dependency for building full EAR archive

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/INSTALL.txt b/INSTALL.txt
index eadff3d5712949ada2ca6305032e73f448f23d61..f44f8ab23ef1ebdc78876c122a393b0e673e115a 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -58,3 +58,9 @@ mail.smtp.auth : true
 JNDI name: jms/jjobs-user-activity-log
 Physical destination name: jjobsUserActivityLog
 Resource type: javax.jms.Queue
+
+9) In WAR project, copy local_xx_XX.properties-dist to local_de_DE.properties
+   and local_en_US.properties. If for example your application uses
+   product_categories from jproduct-core, you may want to add your custom i18n
+   strings to the local properties files as this doesn't cause any later merge
+   conflicts as they are ignored by default.

diff --git a/nbproject/project.properties b/nbproject/project.properties
index e46bd766df21ce76d5daca159cc9b62f7e80d887..1d2d8021c22f27b09757afbdf5bd0bcc72751b94 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,6 +1,7 @@
 build.classes.excludes=**/*.java,**/*.form,**/.nbattrs
 build.dir=build
 build.generated.dir=${build.dir}/generated
+client.module.uri=jjobs-war
 client.urlPart=
 debug.classpath=${javac.classpath}::${jar.content.additional}:${run.classpath}
 display.browser=true
@@ -23,7 +24,8 @@ jar.compress=false
 jar.content.additional=\
     ${reference.jcore-logger-ejb.dist-ear}:\
     ${reference.jjobs-ejb.dist-ear}:\
-    ${reference.jjobs-mailer-ejb.dist-ear}
+    ${reference.jjobs-mailer-ejb.dist-ear}\
+    ${reference.jjobs-war.dist-ear}
 jar.name=jjobs.ear
 javac.debug=true
 javac.deprecation=false
@@ -35,9 +37,12 @@ platform.active=default_platform
 project.jcore-logger-ejb=../jcore-logger-ejb
 project.jjobs-ejb=../jjobs-ejb
 project.jjobs-mailer-ejb=../jjobs-mailer-ejb
+project.jjobs-war=../jjobs-war
 reference.jcore-logger-ejb.dist-ear=${project.jcore-logger-ejb}/dist/jcore-logger-ejb.jar
 reference.jjobs-ejb.dist-ear=${project.jjobs-ejb}/dist/jjobs-ejb.jar
 reference.jjobs-mailer-ejb.dist-ear=${project.jjobs-mailer-ejb}/dist/jjobs-mailer-ejb.jar
+reference.jjobs-ejb.dist-ear=${project.jjobs-ejb}/dist/jjobs-ejb.jar
+reference.jjobs-war.dist-ear=${project.jjobs-war}/dist/jjobs-war.war
 resource.dir=setup
 run.classpath=
 source.root=.

diff --git a/nbproject/project.xml b/nbproject/project.xml
index ce9f5e170da81877568e5c776f990baeb421d2f5..22c9747d434c2e293f6cf48ec7f6880cc3bd3c6e 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -19,6 +19,10 @@
                     <file>${reference.jjobs-mailer-ejb.dist-ear}</file>
                     <path-in-war>/</path-in-war>
                 </library>
+                <library>
+                    <file>${reference.jfinancials-war.dist-ear}</file>
+                    <path-in-war>/</path-in-war>
+                </library>
             </web-module-additional-libraries>
         </data>
         <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
@@ -46,6 +50,14 @@
                 <clean-target>clean-ear</clean-target>
                 <id>dist-ear</id>
             </reference>
+            <reference>
+                <foreign-project>jfinancials-war</foreign-project>
+                <artifact-type>j2ee_ear_archive</artifact-type>
+                <script>build.xml</script>
+                <target>dist-ear</target>
+                <clean-target>clean-ear</clean-target>
+                <id>dist-ear</id>
+            </reference>
         </references>
     </configuration>
 </project>