Merge pull request #406 from jlawyerorg/master

Merge 1.10 into release branch

.gitignore

@@ -1,3 +1,4 @@
+**/.DS_Store
 /j-lawyer-client/nbproject/private/
 /j-lawyer-fax/nbproject/private/
 /j-lawyer-io-common/nbproject/private/
@@ -16,4 +17,17 @@
 /j-lawyer-server-common/dist/
 /j-lawyer-server-common/build/
 /j-lawyer-server-api/dist/
-/j-lawyer-client/build/
+/j-lawyer-client/build/
+/j-lawyer-backupmgr/target/
+/j-lawyer-server/j-lawyer-server-ejb/build/
+/j-lawyer-server/build/
+/j-lawyer-server/j-lawyer-server-ejb/dist/
+/j-lawyer-io-common/build/
+/j-lawyer-server/j-lawyer-server-io/build/
+/j-lawyer-server/j-lawyer-server-io/dist/
+/j-lawyer-io-common/dist/
+/j-lawyer-server/dist/
+/j-lawyer-server/j-lawyer-server-war/dist/
+/j-lawyer-server/j-lawyer-server-war/build/
+/j-lawyer-client/dist/
+/mybuild.sh

.travis.yml

@@ -0,0 +1,42 @@
+dist: xenial
+services: mysql
+#addons:
+#  apt:
+#    sources:
+#      - mysql-5.7-trusty
+#    packages:
+#      - mysql-server
+#      - mysql-client
+sudo: true
+language: java
+# install: ant deps
+jdk:
+  - openjdk8
+  # - openjdk11
+# install: ant default
+before_install:
+  # - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('travisci') where User='root'; update user set plugin='mysql_native_password';commit;FLUSH PRIVILEGES;"
+  # - sudo mysql -e "use mysql; update user set password=PASSWORD('travisci') where User='root'; update user set plugin='mysql_native_password';commit;FLUSH PRIVILEGES;"
+  - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('travisci') where User='root'; update user set plugin='mysql_native_password';commit;FLUSH PRIVILEGES;"
+  # - sudo mysql_upgrade -u root -ptravisci
+  - sudo service mysql restart
+  - sudo mysql -u root -ptravisci -e "select 1 from dual;"
+  - sudo mysql -u root -ptravisci -e "create database jlawyerdb;"
+  - mkdir /home/travis/j-lawyer-backup
+  - mkdir /home/travis/j-lawyer-data
+  - mkdir /home/travis/j-lawyer-data/archivefiles
+  - mkdir /home/travis/j-lawyer-data/emailtemplates
+  - mkdir /home/travis/j-lawyer-data/templates
+  - mkdir /home/travis/j-lawyer-data/mastertemplates
+  - cd /home/travis/j-lawyer-backup
+  - sudo apt-get install wget
+  - sudo apt-get install tar
+  - sudo apt-get install ant
+  - sudo apt-get install ant-optional
+  - sudo apt-get install openjfx
+  # - sudo apt-get install junit
+  - sudo apt-get install junit4
+  - wget https://www.j-lawyer.org/downloads/travisci/backups/backups.tar.gz
+  - tar -m -xvzf backups.tar.gz
+  - cd /home/travis/build/jlawyerorg/j-lawyer-org
+script: ant -buildfile j-lawyer-fax/build.xml default && ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server-entities/build.xml default && ant -buildfile j-lawyer-server-common/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 && ant -buildfile j-lawyer-client/build.xml default && mvn -f j-lawyer-backupmgr/pom.xml clean package test

CONTRIBUTING.md

@@ -0,0 +1,33 @@
+[![Build Status](https://api.travis-ci.org/jlawyerorg/j-lawyer-org.svg?branch=master)](https://travis-ci.org/jlawyerorg/j-lawyer-org)
+
+# j-lawyer-org Contributing Guidelines
+
+## How to file a bug report
+
+Submit bug reports in repository j-lawyer-org: https://github.com/jlawyerorg/j-lawyer-org/issues
+Search the existing issues before to avoid duplicates, and apply the "bug" label for your new ticket.
+
+## How to suggest a new feature
+
+Submit enhancement requests in repository j-lawyer-org: https://github.com/jlawyerorg/j-lawyer-org/issues
+Search the existing issues before to avoid duplicates, and apply the "enhancement" label for your new ticket.
+
+## How to set up your environment and run tests
+
+See the developer quickstart manual to get started: https://github.com/jlawyerorg/j-lawyer-developer-quickstart
+
+## Contact us
+
+The projects website (https://www.j-lawyer.org/) has both a forum and email contact information. 
+
+## Contributing 
+
+Please send pull requests. If you want to commit to the repositories directly, please request being added to the [j-lawyer.org GitHub organization](https://github.com/jlawyerorg).
+
+## Code of conduct
+
+We do not have one yet, and never missed one so far :-)   Contact us if you want to report inappropriate behavior. We want to provide a welcoming environment for anyone looking to support the project.
+
+## License
+
+This project is licensed under the AGPLv3 License - see the [LICENSE](LICENSE) file for details.

README.md

@@ -0,0 +1,38 @@
+[![Build Status](https://api.travis-ci.org/jlawyerorg/j-lawyer-org.svg?branch=master)](https://travis-ci.org/jlawyerorg/j-lawyer-org)
+
+# j-lawyer-org
+j-lawyer.org core project and builds
+
+
+## Getting Started
+
+There is a dedicated repository with instructions on how to set up, build and install the application: https://github.com/jlawyerorg/j-lawyer-developer-quickstart
+
+
+### Installing
+
+Installation for contributors and how to set up a development environment is covered in https://github.com/jlawyerorg/j-lawyer-developer-quickstart.
+For end users, see the projects website for installation instruction: https://www.j-lawyer.org/?page_id=88.
+
+## Contributing
+
+Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduct, and the process for submitting pull requests to us.
+
+## Versioning
+
+We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/jlawyerorg/j-lawyer-org/tags). 
+
+## Authors
+
+* **Jens Kutschke** - *Initial work* - [j-dimension](https://github.com/j-dimension)
+* **Anatol Anuschewski** - *plugins* - [an-mus](https://github.com/an-mus)
+* **Karin Beck** - *urteile-gesetze.de integration* - [karbek](https://github.com/karbek)
+* **Daniel Beck** - *urteile-gesetze.de integration* - [danbeck](https://github.com/danbeck)
+
+## License
+
+This project is licensed under the AGPLv3 License - see the [LICENSE](LICENSE) file for details.
+
+## Acknowledgments
+
+* Thanks to all the unnamed community members filling our ticket backlog :-)

build-fast.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# requires: sudo apt-get install openjfx
+
+# skips tests
+
+ant -buildfile j-lawyer-fax/build.xml jar
+ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server-entities/build.xml dist
+ant -buildfile j-lawyer-server-common/build.xml jar
+ant -buildfile j-lawyer-server-api/build.xml jar
+ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server/build.xml dist
+ant -buildfile j-lawyer-io-common/build.xml jar
+ant -buildfile j-lawyer-client/build.xml jar
+
+# there is an OpenJDK bug on Ubuntu, causing Surefire tests to fail - skip tests for now
+mvn -f j-lawyer-backupmgr/pom.xml package -DskipTests

build.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# requires: sudo apt-get install openjfx
+
+# set this if you want to execute the Sipgate API tests
+export sipuser=""
+export sippassword=""
+
+# set this if you want to execute the virtual file system tests, required for FTP and SFTP implementations
+export ftpuser=""
+export ftppassword=""
+export ftphome=""
+export ftphost=""
+
+if [ "$sipuser" = "" ] || [ "$sippassword" = "" ]
+then
+   echo "Sipgate credentials not set, skipping j-lawyer-fax tests"
+   ant -buildfile j-lawyer-fax/build.xml jar
+else
+   ant -buildfile j-lawyer-fax/build.xml default
+fi
+
+ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server-entities/build.xml default
+
+if [ "$ftpuser" = "" ] || [ "$ftppassword" = "" ] || [ "$ftphome" = "" ] || [ "$ftphost" = "" ]
+then
+   echo "VFS ftp / sftp credentials not set, skipping j-lawyer-server-common tests"
+   ant -buildfile j-lawyer-server-common/build.xml jar
+else
+   ant -buildfile j-lawyer-server-common/build.xml default
+fi
+
+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
+
+ant -buildfile j-lawyer-client/build.xml default
+
+# there is an OpenJDK bug on Ubuntu, causing Surefire tests to fail - skip tests for now
+mvn -f j-lawyer-backupmgr/pom.xml clean package test -DskipTests

clean.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# requires: sudo apt-get install openjfx
+
+ant -buildfile j-lawyer-fax/build.xml clean
+ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server-entities/build.xml clean
+ant -buildfile j-lawyer-server-common/build.xml clean
+ant -buildfile j-lawyer-server-api/build.xml clean
+ant -Dj2ee.server.home=/home/travis -buildfile j-lawyer-server/build.xml clean
+ant -buildfile j-lawyer-io-common/build.xml clean
+ant -buildfile j-lawyer-client/build.xml clean
+
+# there is an OpenJDK bug on Ubuntu, causing Surefire tests to fail - skip tests for now
+mvn -f j-lawyer-backupmgr/pom.xml clean

j-lawyer-backupmgr/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.jlawyer</groupId>
     <artifactId>j-lawyer-backupmgr</artifactId>
-    <version>1.9.1</version>
+    <version>1.10.0</version>
     <packaging>jar</packaging>
 
     <name>j-lawyer-backupmgr</name>

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

@@ -1216,6 +1216,11 @@ private void restoreDatabase(String password, BackupProgressCallback progress) t
             System.out.println(line);
         }
         br.close();
+        try {
+            process.waitFor();
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
         if (process.exitValue() != 0) {
             throw new Exception("Datenbankwiederherstellung fehlgeschlagen!");
         }

j-lawyer-backupmgr/src/test/java/org/jlawyer/test/backupmgr/RestoreExecutorTest.java

@@ -686,6 +686,8 @@ public class RestoreExecutorTest {
     private String dataDirectory = null;
     private String encryptionPassword = null;
 
+    private boolean runsontravis = false;
+
     public RestoreExecutorTest() {
     }
 
@@ -699,19 +701,36 @@ public static void tearDownClass() {
 
     @Before
     public void setUp() {
-        Properties p = new Properties();
-        try {
-            String propLocation="test/test.properties";
-            System.out.println("using properties from " + propLocation);
-            //p.load(Thread.currentThread().getContextClassLoader().getResourceAsStream(propLocation));
-            p.load(new FileReader("/home/jens/scripts/test.properties"));
-
-            this.mysqlPassword = p.getProperty("mysqlpwd");
-            this.backupDirectory = p.getProperty("backupdirectory");
-            this.dataDirectory=p.getProperty("datadirectory");
-            this.encryptionPassword = p.getProperty("encryptionpwd");
-        } catch (IOException ex) {
-            ex.printStackTrace();
+
+        String rot = System.getenv("runsontravisci");
+        if (rot != null) {
+            if (rot.length() > 0) {
+                this.runsontravis = true;
+            }
+        }
+
+        if (runsontravis) {
+            this.mysqlPassword = System.getenv("mysqlpwd");
+            this.backupDirectory = System.getenv("backupdirectory");
+            this.dataDirectory = System.getenv("datadirectory");
+            this.encryptionPassword = System.getenv("encryptionpwd");
+            if(this.encryptionPassword!=null)
+                this.encryptionPassword=this.encryptionPassword.trim();
+        } else {
+            Properties p = new Properties();
+            try {
+                String propLocation = "test/test.properties";
+                System.out.println("using properties from " + propLocation);
+                //p.load(Thread.currentThread().getContextClassLoader().getResourceAsStream(propLocation));
+                p.load(new FileReader("/home/jens/scripts/test.properties"));
+
+                this.mysqlPassword = p.getProperty("mysqlpwd");
+                this.backupDirectory = p.getProperty("backupdirectory");
+                this.dataDirectory = p.getProperty("datadirectory");
+                this.encryptionPassword = p.getProperty("encryptionpwd");
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
         }
 
     }
@@ -724,7 +743,7 @@ public void tearDown() {
     public void testValidate() {
         System.out.println("Using MySQL password " + this.mysqlPassword);
         RestoreExecutor re = new RestoreExecutor(this.dataDirectory, this.backupDirectory, this.encryptionPassword, this.mysqlPassword);
-        BackupProgressConsoleCallback callback=new BackupProgressConsoleCallback();
+        BackupProgressConsoleCallback callback = new BackupProgressConsoleCallback();
         try {
             re.validate(callback);
         } catch (Exception ex) {

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

@@ -0,0 +1,12 @@
+libs.hamcrest.classpath=\
+    ${base}/hamcrest/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-3/junit-4.12.jar
+libs.junit_4.displayName=JUnit 4.12
+libs.junit_4.javadoc=\
+    ${base}/junit_4-3/junit-4.12-javadoc.jar
+libs.junit_4.prop-maven-dependencies=junit:junit:4.12:jar
+libs.junit_4.src=\
+    ${base}/junit_4-3/junit-4.12-sources.jar

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

@@ -0,0 +1,12 @@
+libs.hamcrest.classpath=\
+    ${base}/hamcrest-2/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-4/junit-4.12.jar
+libs.junit_4.displayName=JUnit 4.12
+libs.junit_4.javadoc=\
+    ${base}/junit_4-4/junit-4.12-javadoc.jar
+libs.junit_4.prop-maven-dependencies=junit:junit:4.12:jar
+libs.junit_4.src=\
+    ${base}/junit_4-4/junit-4.12-sources.jar

j-lawyer-client/lib/nblibraries.properties

@@ -4,9 +4,9 @@ libs.beans-binding.displayName=Beans Binding
 libs.beans-binding.javadoc=\
     ${base}/beans-binding/beansbinding-1.2.1-doc.zip
 libs.CopyLibs.classpath=\
-    ${base}/CopyLibs-2/org-netbeans-modules-java-j2seproject-copylibstask.jar
+    ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
 libs.CopyLibs.displayName=CopyLibs Task
-libs.CopyLibs.prop-version=2.0
+libs.CopyLibs.prop-version=3.0
 libs.javaee-api-6.0.classpath=\
     ${base}/javaee-api-6.0/javaee-api-6.0.jar
 libs.javaee-api-6.0.displayName=Java EE 6 API Library