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 2d902285967062a9cdac6852d00c3e29bdbb6979..8ddaafe5b1a27056c1d1a6a307c55a3a445e9c5b 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,60 +1,66 @@
-Installation instructions:\r
-==========================\r
-\r
-0) Create an empty database and setup proper permissions\r
-\r
-1) (Import install/install.sql into your new database) Currently DROP+CREATE\r
-\r
-2) Setup a JDBC pool. I took the simple driver:\r
-\r
-Pool name: JFinancialsPool\r
-Resource type: java.sql.Driver\r
-Driver: MySQL\r
-Driver class: org.mariadb.jdbc.Driver\r
-\r
-URL: jdbc:mysql://localhost/your_database\r
-user: your_login\r
-password: your_password\r
-\r
-3) Setup a JDBC resource:\r
-\r
-JNDI name: jdbc/jfinancials\r
-Pool name: JFinancialsPool\r
-\r
-4) In juser-core project you will find a JAR named "commons-codec-1.10.jar" you\r
-   need to copy this to your $GLASSFISH_DOMAIN/lib/ path to make password\r
-   encryption working. Please setup sufficient access rights (CHMOD 0644 is\r
-   enough).\r
-\r
-   If you forgot this file to copy and you have copied it now, please restart\r
-   the Glassfish server so the JAR can be found and loaded.\r
-\r
-5) Setup a JMS connection factory:\r
-\r
-JNDI name: jms/jfinancials-queue-factory\r
-Resource type: javax.jms.QueueConnectionFactory\r
-\r
-6) Setup JMS message queue:\r
-\r
-JNDI name: jms/jfinancials-email-queue\r
-Physical destination name: jfinancialsSendEmail\r
-Resource type: javax.jms.Queue\r
-\r
-7) Setup Java Mail session:\r
-\r
-JNDI name: jfinancialsSmtpSession\r
-Mail host: <your-smtp-host>\r
-Default user: <your-smtp-login-name>\r
-Default sender address: noreply@your-domain.example\r
-\r
-Optional, but more secure/sometimes required advanced properties:\r
-\r
-mail.smtp.password : <email password>\r
-mail.smtp.port : <email port>\r
-mail.smtp.auth : true\r
-\r
-8) Setup JMS message queue\r
-\r
-JNDI name: jms/jfinancials-user-activity-log\r
-Physical destination name: jfinancialsUserActivityLog\r
-Resource type: javax.jms.Queue\r
+Installation instructions:
+==========================
+
+1) Create an empty database and setup proper permissions and user account. You
+   should create a separate database and user for each project you are going to
+   run on it for maximum security.
+
+2) Setup a JDBC pool. I took the simple driver:
+
+Pool name: JFinancialsPool
+Resource type: java.sql.Driver
+Driver: MariaDB
+Driver class: org.mariadb.jdbc.Driver
+
+URL: jdbc:mysql://localhost/your_database
+user: your_login
+password: your_password
+
+3) Setup a JDBC resource:
+
+JNDI name: jdbc/jfinancials
+Pool name: JFinancialsPool
+
+4) In juser-core project you will find a JAR named "commons-codec-1.10.jar" you
+   need to copy this to your $GLASSFISH_DOMAIN/lib/ path to make password
+   encryption working. Please setup sufficient access rights (CHMOD 0644 is
+   enough).
+
+   If you forgot this file to copy and you have copied it now, please restart
+   the Glassfish server so the JAR can be found and loaded.
+
+5) Setup a JMS connection factory:
+
+JNDI name: jms/jfinancials-queue-factory
+Resource type: javax.jms.QueueConnectionFactory
+
+6) Setup JMS message queue:
+
+JNDI name: jms/jfinancials-email-queue
+Physical destination name: jfinancialsSendEmail
+Resource type: javax.jms.Queue
+
+7) Setup Java Mail session:
+
+JNDI name: jfinancialsSmtpSession
+Mail host: <your-smtp-host>
+Default user: <your-smtp-login-name>
+Default sender address: noreply@your-domain.example
+
+Optional, but more secure/sometimes required advanced properties:
+
+mail.smtp.password : <email password>
+mail.smtp.port : <email port>
+mail.smtp.auth : true
+
+8) Setup JMS message queue
+
+JNDI name: jms/jfinancials-user-activity-log
+Physical destination name: jfinancialsUserActivityLog
+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 e0d9fc30f06d67af79b38ee8afd7cdbee87ea9c3..83c210a98b42054412d1aa0a833138e366baf4d3 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=jfinancials-war
 client.urlPart=
 debug.classpath=${javac.classpath}::${jar.content.additional}:${run.classpath}
 display.browser=true
@@ -22,7 +23,8 @@ jar.compress=false
 jar.content.additional=\
     ${reference.jcore-logger-ejb.dist-ear}:\
     ${reference.jfinancials-ejb.dist-ear}:\
-    ${reference.jfinancials-mailer-ejb.dist-ear}
+    ${reference.jfinancials-mailer-ejb.dist-ear}:\
+    ${reference.jfinancials-war.dist-ear}
 jar.name=jfinancials.ear
 javac.debug=true
 javac.deprecation=false
@@ -34,9 +36,11 @@ platform.active=default_platform
 project.jcore-logger-ejb=../jcore-logger-ejb
 project.jfinancials-ejb=../jfinancials-ejb
 project.jfinancials-mailer-ejb=../jfinancials-mailer-ejb
+project.jfinancials-war=../jfinancials-war
 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
+reference.jfinancials-war.dist-ear=${project.jfinancials-war}/dist/jfinancials-war.war
 resource.dir=setup
 run.classpath=
 source.root=.

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 284ad402b7da84ee17d3e973a51b8d29f7aff19e..491c17c5b25979e6ed99972b01732c17827bbe19 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -19,6 +19,10 @@
                     <file>${reference.jfinancials-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>