mvn-jgitflow:merging 'hotfix/1.0.2' into 'master'

labs-build · labs-build · commit b4e323a211e9 · 2016-11-02T15:16:25.000+01:00
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,19 @@
 ## Change Log of Sakuli Releases
 
+### Version 1.0.2 (Bugfix + some small features)
+* issue #210: upgrade Sahi to version `5.1` due to  Sahi compatibility issue with Chrome 53+ - _click
+* fix docker images
+    * Chrome don't startup under CentOS Docker image, see also https://github.com/ConSol/docker-headless-vnc-container/issues/2  
+    * XFCE window manager don't startup under CentOS Docker image, see also https://github.com/ConSol/docker-headless-vnc-container/issues/4  
+    * use `SAKULI_VERSION` ARG in Dockerfiles, to have more flexible to build images
+* issue #215 add java-based Sakuli Docker images
+* issue #91: add AES encryption option for Gearman forwarder module
+    * add Java JCE extension to Docker images
+* fix #216: set `dom.storage.enabled` to true in firefox pref.js
+* add Sakuli-Example page https://github.com/ConSol/sakuli-examples
+* fix #177 add description for the javaDSL and update the documentation
+* issue #205: use maven-jgitflow for releases and branching
+
 ### Version 1.0.1 (Bugfix)
 
 * fix #190:  fix Docker centos image:  use tagged version `consol/centos-xfce-vnc:1.0.1`
diff --git a/docker/sakuli-centos-xfce-java/Dockerfile b/docker/sakuli-centos-xfce-java/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM consol/centos-xfce-vnc:1.0.2
 MAINTAINER Tobias Schneck "tobias.schneck@consol.de"
-ENV REFRESHED_AT 2016-10-28
+ENV REFRESHED_AT 2016-11-02
 
 ENV VNC_COL_DEPTH 24
 ENV VNC_RESOLUTION 1280x1024
@@ -31,16 +31,16 @@ RUN mkdir -p $MAVEN_HOME \
   && ln -s $MAVEN_HOME/bin/mvn /usr/bin/mvn
 
 ##### Install some native libaries for Sakuli
-RUN yum -y install \
+RUN yum -y install unzip \
     # opencv
     opencv \
     # tesseract
     leptonica tesseract tesseract-langpack-deu \
     # wmctrl  (checked by: https://www.virustotal.com/de/url/394da2ac7e9bbbf5d10a3f304cc913459fc38f66019a4c3ba0fd4afd8f48e64f/analysis/1465466765/)
     $SAKULI_DOWNLOAD_URL/3rd-party/rpm/wmctrl-1.07-17.gf.el7.x86_64.rpm \
-    # xdotool
-    xdotool \
-    && yum clean all
+    # some missing ui controll tools
+    xdotool redhat-lsb-core psmisc \
+   && yum clean all
 
 #### Download Sakuli-Java-Example
 RUN mkdir -p /tmp/sakuli-example \
diff --git a/docker/sakuli-centos-xfce/Dockerfile b/docker/sakuli-centos-xfce/Dockerfile
@@ -2,14 +2,14 @@
 
 FROM consol/centos-xfce-vnc:1.0.2
 MAINTAINER Tobias Schneck "tobias.schneck@consol.de"
-ENV REFRESHED_AT 2016-10-28
+ENV REFRESHED_AT 2016-11-02
 
 ENV VNC_COL_DEPTH 24
 ENV VNC_RESOLUTION 1280x1024
 ENV VNC_PW sakuli
 
 ENV SAKULI_DOWNLOAD_URL https://labs.consol.de/sakuli/install
-ARG SAKULI_VERSION=1.0.2-lhm
+ARG SAKULI_VERSION=1.0.2
 ENV SAKULI_HOME /root/sakuli/sakuli-v$SAKULI_VERSION
 ENV SAKULI_TEST_SUITE /root/sakuli/example_test_suites/example_xfce
 
@@ -19,13 +19,12 @@ RUN yum -y install unzip \
     # opencv
     opencv \
     # tesseract
-    http://repo.iotti.biz/CentOS/7/x86_64/leptonica-1.71-2.el7.lux.1.x86_64.rpm \
-    http://repo.iotti.biz/CentOS/7/x86_64/tesseract-3.03-0.2.rc1.el7.lux.1.x86_64.rpm \
-    # wmctrl
-    http://mirror.symnds.com/distributions/gf/el/7/gf/x86_64/wmctrl-1.07-17.gf.el7.x86_64.rpm \
-    # xdotool
-    http://li.nux.ro/download/nux/dextop/el7/x86_64/xdotool-2.20110530.1-7.el7.nux.x86_64.rpm \
-    http://li.nux.ro/download/nux/dextop/el7/x86_64/libxdo-2.20110530.1-7.el7.nux.x86_64.rpm
+    leptonica tesseract tesseract-langpack-deu \
+    # wmctrl  (checked by: https://www.virustotal.com/de/url/394da2ac7e9bbbf5d10a3f304cc913459fc38f66019a4c3ba0fd4afd8f48e64f/analysis/1465466765/)
+    $SAKULI_DOWNLOAD_URL/3rd-party/rpm/wmctrl-1.07-17.gf.el7.x86_64.rpm \
+    # some missing ui controll tools
+    xdotool redhat-lsb-core psmisc \
+   && yum clean all
 ## Install JAVA JCE policy (necessary for gearman encryption)
 RUN mkdir -p /tmp/java-jce \
     && cd /tmp/java-jce \
diff --git a/docker/sakuli-omd-labs-centos/Dockerfile b/docker/sakuli-omd-labs-centos/Dockerfile
@@ -1,7 +1,7 @@
 FROM consol/ubuntu-omd-labs:latest
 MAINTAINER The Sakuli team.  <sakuli@consol.de>
 
-ENV REFRESHED_AT 2016-10-28
+ENV REFRESHED_AT 2016-11-02
 
 #RUN mkdir $OMD_DEMO/etc/check_mysql_health/
 #COPY ["./CheckMySQLHealthSakuli.pm", "$OMD_DEMO/etc/check_mysql_health/"]
diff --git a/docker/sakuli-omd-labs-ubuntu/Dockerfile b/docker/sakuli-omd-labs-ubuntu/Dockerfile
@@ -1,7 +1,7 @@
 FROM consol/omd-labs-ubuntu:latest
 MAINTAINER The Sakuli team.  <sakuli@consol.de>
 
-ENV REFRESHED_AT 2016-10-28
+ENV REFRESHED_AT 2016-11-02
 
 WORKDIR /omd/sites/demo/
 ADD contrib/CheckMySQLHealthSakuli.pm /omd/sites/demo/etc/check_mysql_health/
diff --git a/docker/sakuli-ubuntu-xfce-java/Dockerfile b/docker/sakuli-ubuntu-xfce-java/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM consol/ubuntu-xfce-vnc:1.0.2
 MAINTAINER Tobias Schneck "tobias.schneck@consol.de"
-ENV REFRESHED_AT 2016-10-28
+ENV REFRESHED_AT 2016-11-02
 
 ENV VNC_COL_DEPTH 24
 ENV VNC_RESOLUTION 1280x1024
diff --git a/docker/sakuli-ubuntu-xfce/Dockerfile b/docker/sakuli-ubuntu-xfce/Dockerfile
@@ -2,14 +2,14 @@
 
 FROM consol/ubuntu-xfce-vnc:1.0.2
 MAINTAINER Tobias Schneck "tobias.schneck@consol.de"
-ENV REFRESHED_AT 2016-10-28
+ENV REFRESHED_AT 2016-11-02
 
 ENV VNC_COL_DEPTH 24
 ENV VNC_RESOLUTION 1280x1024
 ENV VNC_PW sakuli
 
 ENV SAKULI_DOWNLOAD_URL https://labs.consol.de/sakuli/install
-ARG SAKULI_VERSION=1.0.2-lhm
+ARG SAKULI_VERSION=1.0.2
 ENV SAKULI_HOME /root/sakuli/sakuli-v$SAKULI_VERSION
 ENV SAKULI_TEST_SUITE /root/sakuli/example_test_suites/example_xfce
 
diff --git a/docs/development/maven-aspects.md b/docs/development/maven-aspects.md
@@ -73,3 +73,17 @@ Example of Maven config file `.m2/settings.xml`:
       </servers>
 
   ```
+
+## add new artifacts to remote repo
+for example for the sahi.jars, more information see: https://maven.apache.org/guides/mini/guide-3rd-party-jars-remote.html
+
+#### install to local repo
+    mvn install:install-file -DgroupId=net.sf.sahi -DartifactId=sahi -Dversion=5.1 -Dpackaging=jar -Dfile=sahi-5.1.jar
+    mvn install:install-file -DgroupId=net.sf.sahi -DartifactId=ant-sahi -Dversion=5.1 -Dpackaging=jar -Dfile=ant-sahi-5.1.jar
+    mvn install:install-file -DgroupId=net.sf.sahi -DartifactId=sahi-install -Dversion=5.1 -Dpackaging=zip -Dfile=sahi-install-5.1.zip
+
+#### install to remote repo
+    mvn deploy:deploy-file -DgroupId=net.sf.sahi -DartifactId=sahi -Dversion=5.1 -Dpackaging jar -Dfile=sahi-5.1.jar -Drepository=labs-consol-sakuli-repository -Durl=scpexe://labs.consol.de/home/maven-repository/www/htdocs/repository
+    
+or copy the local artifacts via SCP:
+    scp -r ~.m2/repository/net/sf/sahi/sahi/5.1  maven-repository@labs.consol.de:/home/maven-repository/www/htdocs/repository/net/sf/sahi/sahi/5.1
diff --git a/docs/forwarder-gearman.md b/docs/forwarder-gearman.md
@@ -34,7 +34,7 @@ As Sakuli only uses the *result queue* of gearmand, you can disable all other qu
 	hosts=no
 	do_hostchecks=no
 	
-At the time of the creation of this documents, Sakuli does not encrypt any gearman results. Therefore, set  `accept_clear_results` in `server.cfg`:
+At the time of the creation of this documents, Sakuli does not encrypt any gearman results by default. Therefore, set  `accept_clear_results` in `server.cfg`:
 
     OMD[sakuli]:~$ vim ~/etc/mod-gearman/server.cfg
 	accept_clear_results=yes
@@ -113,16 +113,30 @@ On the Sakuli client you must set the global properties for the gearman receiver
 	sakuli.forwarder.gearman.nagios.hostname=sakuli_client
 	sakuli.forwarder.gearman.nagios.check_command=check_sakuli
 
-## Using AES encryption
+## Using AES encryption (optional)
 
 The gearman forwarder supports AES encryption when sending checked results to the OMD server. The AES encryption uses a 32 byte (256 bit) secret key that
 has to be given in the properties. 
 
     sakuli.forwarder.gearman.encryption=true
     sakuli.forwarder.gearman.secret.key=secret_password
 
-In case you get a java.lang.security.InvalidKeyException with error message *"Illegal key size or default parameters"* you probably
-need to enable unlimited strength security policies in your Java JRE. This is done by adding a special security policy JAR to the Java JRE lib directory.
+In case you get a `java.lang.security.InvalidKeyException` with error message *"Illegal key size or default parameters"* you probably
+need to enable unlimited strength security policies in your Java JRE. This is done by adding a special security policy JAR to the Java JRE lib directory. For the Java JRE 8, take a look at [Oracle - Java Cryptography Extension 8](http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html).
+
+On the server side (OMD) you have to enable the encryption feature of [mod-gearman](https://labs.consol.de/nagios/mod-gearman/). Therefore the following two steps are necessary:
+
+1) Set the server side encryption password:
+
+     OMD[sakuli]:~$ echo "secret_password" > ~/etc/mod-gearman/secret.key
+
+2) Enable the `encryption` and disable `accept_clear_results` in the config file:
+
+	 OMD[sakuli]:~$ vim ~/etc/mod-gearman/server.cfg
+	
+	encryption=yes
+    accept_clear_results=yes
+
 
 ## Test result transmission to OMD
 
diff --git a/example_test_suites/example_xfce/case1/sakuli_demo.js b/example_test_suites/example_xfce/case1/sakuli_demo.js
@@ -17,7 +17,7 @@
  */
 
 _dynamicInclude($includeFolder);
-var testCase = new TestCase(20, 30);
+var testCase = new TestCase(40, 60);
 var env = new Environment();
 var screen = new Region();
 var appCalc = new Application("/usr/bin/gnome-calculator");
diff --git a/example_test_suites/example_xfce/testsuite.properties b/example_test_suites/example_xfce/testsuite.properties
@@ -43,14 +43,14 @@ testsuite.name=example test suite inside of the Xfce desktop for Sakuli
 # 'WARNING'.
 # If the threshold is set to 0, the execution time will never exceed, so the state will be always OK!
 # DEFAULT:0
-testsuite.warningTime=30
+testsuite.warningTime=60
 
 # The critical runtime threshold (seconds) estimates the execution time of the complete
 # test suite. If the cirtical time is exceeded, the test suite will get the state
 # 'CRITICAL'.
 # If the threshold is set to 0, the execution time will never exceed, so the state will be always OK!
 # DEFAULT:0
-testsuite.criticalTime=40
+testsuite.criticalTime=90
 
 
 #######################################################################################
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>org.sakuli</groupId>
     <artifactId>root</artifactId>
-    <version>1.0.2-lhm</version>
+    <version>1.0.2</version>
     <packaging>pom</packaging>
 
     <name>sakuli-parent</name>
@@ -60,7 +60,7 @@
         <test.group.sakuliDSL>sakuli-test</test.group.sakuliDSL>
         <!-- special sakuli-version 99x - change this later to latest stable version-->
         <sikulixapi.version>1.1.999</sikulixapi.version>
-        <sahi.version>5.0</sahi.version>
+        <sahi.version>5.1</sahi.version>
         <izpack.version>5.0.6</izpack.version>
     </properties>
 
@@ -460,7 +460,7 @@
             </dependency>
 
             <!-- Sahi Library (OpenSource Version)-->
-            <!-- local libaries, included with 'install_local_lib.sh' ... the are still not available over maven central -->
+            <!-- install libaries in labs repo, see `docs/development/maven-aspects.md` -->
             <dependency>
                 <groupId>net.sf.sahi</groupId>
                 <artifactId>sahi</artifactId>
@@ -475,9 +475,9 @@
 
             <!-- Sahi API Dependencies-->
             <dependency>
-                <groupId>rhino</groupId>
-                <artifactId>js</artifactId>
-                <version>1.7R2</version>
+                <groupId>org.mozilla</groupId>
+                <artifactId>rhino</artifactId>
+                <version>1.7.7.1</version>
             </dependency>
 
             <!-- SikuliX-Java Library (FULL LIBRARY) - is part of the  sikuli-setup.jar-->
diff --git a/src/common/pom.xml b/src/common/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.sakuli</groupId>
         <artifactId>root</artifactId>
-        <version>1.0.2-lhm</version>
+        <version>1.0.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>common</artifactId>
-    <version>1.0.2-lhm</version>
+    <version>1.0.2</version>
     <name>common</name>
     <description>maven module for common used resources</description>
 
diff --git a/src/core/pom.xml b/src/core/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.sakuli</groupId>
         <artifactId>root</artifactId>
-        <version>1.0.2-lhm</version>
+        <version>1.0.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>core</artifactId>
-    <version>1.0.2-lhm</version>
+    <version>1.0.2</version>
     <name>core</name>
 
     <description>core module for all sakuli functionality</description>
@@ -376,8 +376,8 @@
 
         <!-- Sahi API Dependencies-->
         <dependency>
-            <groupId>rhino</groupId>
-            <artifactId>js</artifactId>
+            <groupId>org.mozilla</groupId>
+            <artifactId>rhino</artifactId>
         </dependency>
 
         <!-- SikuliX-Java Library (FULL LIBRARY) - is part of the  sikuli-setup.jar-->
diff --git a/src/core/src/main/java/org/sakuli/aop/RhinoAspect.java b/src/core/src/main/java/org/sakuli/aop/RhinoAspect.java
@@ -23,7 +23,9 @@
 import net.sf.sahi.rhino.RhinoScriptRunner;
 import org.apache.commons.lang.ArrayUtils;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.annotation.After;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
 import org.sakuli.actions.logging.LogToResult;
 import org.sakuli.datamodel.actions.LogResult;
 import org.sakuli.loader.BaseActionLoader;
@@ -33,9 +35,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import java.util.Arrays;
-import java.util.Iterator;
-
 import static org.apache.commons.lang.StringUtils.isNotEmpty;
 import static org.apache.commons.lang.StringUtils.removeEnd;
 import static org.apache.commons.lang3.StringUtils.removeStart;
@@ -60,9 +59,9 @@ public class RhinoAspect extends BaseSakuliAspect {
      */
     @After("execution(* net.sf.sahi.rhino.RhinoScriptRunner.setReporter*(*))")
     public void getRhinoScriptRunner(JoinPoint joinPoint) {
-        logger.info("Add RhinoScriptRunner to the JavaBackEnd");
         BaseActionLoader environmentLoader = BeanLoader.loadBaseActionLoader();
         if (joinPoint.getTarget() instanceof RhinoScriptRunner) {
+            logger.info("Add RhinoScriptRunner to the JavaBackEnd");
             environmentLoader.setRhinoScriptRunner((RhinoScriptRunner) joinPoint.getTarget());
         } else {
             logger.warn(joinPoint.getTarget().getClass().getName() + " could not added to the JavaBackEnd!");
diff --git a/src/docs/pom.xml b/src/docs/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.sakuli</groupId>
         <artifactId>root</artifactId>
-        <version>1.0.2-lhm</version>
+        <version>1.0.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>docs</artifactId>
-    <version>1.0.2-lhm</version>
+    <version>1.0.2</version>
     <name>docs</name>
     <description>maven module to build the markdown api docs from jsdoc</description>
 
diff --git a/src/installer/pom.xml b/src/installer/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.sakuli</groupId>
         <artifactId>root</artifactId>
-        <version>1.0.2-lhm</version>
+        <version>1.0.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>installer</artifactId>
-    <version>1.0.2-lhm</version>
+    <version>1.0.2</version>
     <description>maven module to build the IzPack-Java Installer</description>
 
     <properties>
diff --git a/src/integration-test/pom.xml b/src/integration-test/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.sakuli</groupId>
         <artifactId>root</artifactId>
-        <version>1.0.2-lhm</version>
+        <version>1.0.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>integration-test</artifactId>
-    <version>1.0.2-lhm</version>
+    <version>1.0.2</version>
     <name>integration-test</name>
     <description>integration test module for sakuli</description>
 
diff --git a/src/java-dsl/pom.xml b/src/java-dsl/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.sakuli</groupId>
         <artifactId>root</artifactId>
-        <version>1.0.2-lhm</version>
+        <version>1.0.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>java-dsl</artifactId>
-    <version>1.0.2-lhm</version>
+    <version>1.0.2</version>
     <name>Java DSL</name>
     <description>Specific Java-DSL for using Sakuli directly over Java</description>
 
