Merge pull request #2077 from jlawyerorg/master

merge master into release for 2.4.0.2

.github/workflows/main.yml

@@ -48,16 +48,26 @@ jobs:
           wget -O /home/runner/j-lawyer-backup/backups.tar.gz https://www.j-lawyer.org/downloads/travisci/backups/backups.tar.gz
           tar -m -xvzf /home/runner/j-lawyer-backup/backups.tar.gz -C /home/runner/j-lawyer-backup
           
-      - name: Set up JDK8
+#      - name: Set up JDK8
+#        uses: AdoptOpenJDK/install-jdk@v1
+#        with:
+#          version: '8'
+#          architecture: x64
+
+      - name: Set up JDK11
         uses: AdoptOpenJDK/install-jdk@v1
         with:
-          version: '8'
+          version: '11'
           architecture: x64
+          targets: 'JDK_11'
+
+      - name: populate JAVA_HOME to Java 11
+        run: echo "JAVA_HOME=$(echo $JDK_11)" >> $GITHUB_ENV
 
       - name: Build server with JDK8
         # ejb tests fail for some reason...
         # run: ant -buildfile j-lawyer-fax/build.xml default && ant -buildfile j-lawyer-server-common/build.xml default && ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server-entities/build.xml default && ant -buildfile j-lawyer-server-api/build.xml default && ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server/build.xml default test && ant -buildfile j-lawyer-io-common/build.xml default
-        run: ant -buildfile j-lawyer-fax/build.xml default && ant -buildfile j-lawyer-server-common/build.xml default && ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server-entities/build.xml default && ant -buildfile j-lawyer-server-api/build.xml default && ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server/build.xml default && ant -buildfile j-lawyer-io-common/build.xml default
+        run: ant -buildfile j-lawyer-fax/build.xml default && ant -buildfile j-lawyer-server-common/build.xml default && ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server-entities/build.xml default && ant -buildfile j-lawyer-server-api/build.xml default && ant -Dplatforms.default_platform.home=$JDK_11 -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server/build.xml default && ant -buildfile j-lawyer-io-common/build.xml default
         # removed temporarily:  && mvn -f j-lawyer-backupmgr/pom.xml clean package test
         env:
           ftpuser: ${{ secrets.FTPUSER }}
@@ -72,15 +82,15 @@ jobs:
           datadirectory: /home/runner/j-lawyer-data
           encryptionpwd:  
 
-      - name: Set up JDK11
-        uses: AdoptOpenJDK/install-jdk@v1
-        with:
-          version: '11'
-          architecture: x64
-          targets: 'JDK_11'
-
-      - name: populate JAVA_HOME to Java 11
-        run: echo "JAVA_HOME=$(echo $JDK_11)" >> $GITHUB_ENV
+#      - name: Set up JDK11
+#        uses: AdoptOpenJDK/install-jdk@v1
+#        with:
+#          version: '11'
+#          architecture: x64
+#          targets: 'JDK_11'
+#
+#      - name: populate JAVA_HOME to Java 11
+#        run: echo "JAVA_HOME=$(echo $JDK_11)" >> $GITHUB_ENV
 
       - name: Build client with JDK11
         run: ant -buildfile j-lawyer-client/build.xml default
@@ -105,7 +115,7 @@ jobs:
             -Dsonar.organization=jlawyerorg
             -Dsonar.projectKey=jlawyerorg_j-lawyer-org
             -Dsonar.projectName=j-lawyer-org
-            -Dsonar.projectVersion=2.3.0
+            -Dsonar.projectVersion=2.3.1
             -Dsonar.java.binaries=.
             -Dsonar.java.source=8
             

build-fast.sh

@@ -24,7 +24,7 @@ ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server-entities/build.xm
 check_error $?
 ant -buildfile j-lawyer-server-api/build.xml jar
 check_error $?
-ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server/build.xml dist
+ant -Dplatforms.default_platform.home=/home/jens/bin/jdk-11.0.9.1-full/ -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server/build.xml dist
 check_error $?
 ant -buildfile j-lawyer-io-common/build.xml jar
 check_error $?

docker/getversion.sh

@@ -3,7 +3,12 @@
 
 # get latest filename in db migrations
 # jlversionfile=`ls -1 ../j-lawyer-server-entities/src/java/db/migration | sort -r | head -1`
-jlversionfile=`cd ../j-lawyer-server-entities/src/java/db/migration/ && ls -1 -r *.{java,sql} | head -1`
+
+# does not seem to work with double-digit in the last version component
+# jlversionfile=`cd ../j-lawyer-server-entities/src/java/db/migration/ && ls -1 -r *.{java,sql} | head -1`
+
+# does not work when run on github actions - would return the checkout date
+# jlversionfile=`cd ../j-lawyer-server-entities/src/java/db/migration/ && ls -1 -t *.{java,sql} | head -1`
 
 # cut at double underscore
 jlversion=${jlversionfile%__*}
@@ -14,6 +19,7 @@ jlversion=${jlversion:1}
 # replace underscores by dots
 jlversion=`echo "$jlversion" | tr _ .`
 
-# tadaaa!
-echo $jlversion
+# tadaaa! 
+# echo $jlversion
+echo 2.4.0.13
 

j-lawyer-backupmgr/src/main/java/org/jlawyer/backupmgr/impl/RestoreExecutor.java

@@ -689,6 +689,8 @@ You should also get your employer (if you work as a programmer) or school,
  */
 public class RestoreExecutor {
 
+    private static final String DIR_LETTERHEADS="letterheads";
+
     private String mysqlPassword = null;
     private String backupDirectory = null;
     private String dataDirectory = null;
@@ -814,6 +816,8 @@ private void validateEncryption(BackupProgressCallback progress) throws Exceptio
         this.validateEncryptionForDirectory(dir, progress);
         dir = new File(this.backupDirectory + File.separator + "mastertemplates");
         this.validateEncryptionForDirectory(dir, progress);
+        dir = new File(this.backupDirectory + File.separator + DIR_LETTERHEADS);
+        this.validateEncryptionForDirectory(dir, progress);
         dir = new File(this.backupDirectory + File.separator + "emailtemplates");
         this.validateEncryptionForDirectory(dir, progress);
         dir = new File(this.backupDirectory + File.separator + "faxqueue");
@@ -958,7 +962,7 @@ private void validateBackupDirectory(BackupProgressCallback progress) throws Exc
                 }
             }
         }
-        if (!subDirs.contains("archivefiles") || !subDirs.contains("templates") || !subDirs.contains("mastertemplates") || !subDirs.contains("emailtemplates")) {
+        if (!subDirs.contains("archivefiles") || !subDirs.contains("templates") || !subDirs.contains("mastertemplates") || !subDirs.contains("emailtemplates") || !subDirs.contains(DIR_LETTERHEADS)) {
             throw new Exception("Verzeichnis unvollständig - benötigt werden Unterverzeichnisse: archivefiles, templates, emailtemplates, mastertemplates");
         }
 
@@ -999,8 +1003,8 @@ private void validateDataDirectory(BackupProgressCallback progress) throws Excep
                 }
             }
         }
-        if (!subDirs.contains("archivefiles") || !subDirs.contains("templates") || !subDirs.contains("mastertemplates") || !subDirs.contains("emailtemplates")) {
-            throw new Exception("Verzeichnis unvollständig - benötigt werden Unterverzeichnisse: archivefiles, templates, emailtemplates, mastertemplates");
+        if (!subDirs.contains("archivefiles") || !subDirs.contains("templates") || !subDirs.contains("mastertemplates") || !subDirs.contains("emailtemplates") || !subDirs.contains(DIR_LETTERHEADS)) {
+            throw new Exception("Verzeichnis unvollständig - benötigt werden Unterverzeichnisse: archivefiles, templates, emailtemplates, mastertemplates, letterheads");
         }
 
         if (dumpExists) {
@@ -1033,6 +1037,7 @@ private void restoreFiles(BackupProgressCallback progress) throws Exception {
 
         // archivefiles, emailtemplates, faxqueue, mastertemplates, templates
         this.restoreFromTo(backup + "templates", data + "templates", progress);
+        this.restoreFromTo(backup + DIR_LETTERHEADS, data + DIR_LETTERHEADS, progress);
         try {
             // allowed to fail
             this.restoreFromTo(backup + "mastertemplates", data + "mastertemplates", progress);
@@ -1104,6 +1109,10 @@ private void clearDataDirectory(BackupProgressCallback progress) throws Exceptio
         delDir = new File(data + "mastertemplates");
         this.deleteRecursively(delDir, progress);
         delDir.mkdirs();
+
+        delDir = new File(data + DIR_LETTERHEADS);
+        this.deleteRecursively(delDir, progress);
+        delDir.mkdirs();
 
         delDir = new File(data + "searchindex");
         this.deleteRecursively(delDir, progress);

j-lawyer-client/lib/bea/nblibraries.properties

@@ -0,0 +1,26 @@
+libs.hamcrest.classpath=\
+    ${base}/hamcrest-3/hamcrest-core-1.3.jar
+libs.hamcrest.displayName=Hamcrest 1.3
+libs.hamcrest.prop-maven-dependencies=org.hamcrest:hamcrest-core:1.3:jar
+libs.junit_4.classpath=\
+    ${base}/junit_4/junit-4.13.1.jar
+libs.junit_4.displayName=JUnit 4.12
+libs.junit_4.javadoc=\
+    ${base}/junit_4/junit-4.13.1-javadoc.jar
+libs.junit_4.prop-maven-dependencies=junit:junit:4.13.1:jar
+libs.junit_4.src=\
+    ${base}/junit_4/junit-4.13.1-sources.jar
+libs.junit_5.classpath=\
+    ${base}/junit_5/junit-jupiter-api-5.6.0.jar:\
+    ${base}/junit_5/junit-jupiter-params-5.6.0.jar:\
+    ${base}/junit_5/junit-jupiter-engine-5.6.0.jar
+libs.junit_5.displayName=JUnit 5.6.0
+libs.junit_5.javadoc=\
+    ${base}/junit_5/junit-jupiter-api-5.6.0-javadoc.jar:\
+    ${base}/junit_5/junit-jupiter-params-5.6.0-javadoc.jar:\
+    ${base}/junit_5/junit-jupiter-engine-5.6.0-javadoc.jar
+libs.junit_5.prop-maven-dependencies=\n                org.junit.jupiter:junit-jupiter-api:5.6.0:jar\n                org.junit.jupiter:junit-jupiter-params:5.6.0:jar\n                org.junit.jupiter:junit-jupiter-engine:5.6.0:jar\n            
+libs.junit_5.src=\
+    ${base}/junit_5/junit-jupiter-api-5.6.0-sources.jar:\
+    ${base}/junit_5/junit-jupiter-params-5.6.0-sources.jar:\
+    ${base}/junit_5/junit-jupiter-engine-5.6.0-sources.jar