Merge branch 'develop-2.6' into develop

# Conflicts: # pom.xml
oasp · Jun 19, 2018 · a858d65 · a858d65
2 parents 0ddc62a + 9d2f657
commit a858d65
Show file tree

Hide file tree

Showing 112 changed files with 4,285 additions and 784 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -19,7 +19,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <cxf.version>3.1.8</cxf.version>
+    <cxf.version>3.1.9</cxf.version>
     <mmm.util.version>7.5.1</mmm.util.version>
     <oasp.flatten.mode>bom</oasp.flatten.mode>
   </properties>
@@ -86,7 +86,7 @@
       <dependency>
         <groupId>cglib</groupId>
         <artifactId>cglib</artifactId>
-        <version>3.1</version>
+        <version>3.2.4</version>
       </dependency>
       <!-- Support for dynamic and type-safe JPA queries -->
       <dependency>

diff --git a/docs/oomph/projects/OASP4J.setup b/docs/oomph/projects/OASP4J.setup
@@ -5,8 +5,11 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0"
     xmlns:maven="http://www.eclipse.org/oomph/setup/maven/1.0"
+    xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
     xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
-    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/maven/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore"
+    xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
+    xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/maven/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
     name="oasp4j.ide.git"
     label="OASP4J">
   <setupTask
@@ -45,13 +48,54 @@
         remoteURI="${github.remoteURIs.oasp4j}"
         pushURI="https://github.com/oasp/oasp4j"/>
   </setupTask>
+  <setupTask
+      xsi:type="setup.workingsets:WorkingSetTask">
+    <workingSet
+        name="samples"
+        id="oasp4j.samples">
+      <predicate
+          xsi:type="predicates:NamePredicate"
+          pattern=".*-sample.*"/>
+    </workingSet>
+    <workingSet
+        name="template"
+        id="oasp4j.templates">
+      <predicate
+          xsi:type="predicates:NamePredicate"
+          pattern=".*-template.*"/>
+    </workingSet>
+    <workingSet
+        name="starter"
+        id="oasp4j.starter">
+      <predicate
+          xsi:type="predicates:NamePredicate"
+          pattern=".*-starter.*"/>
+    </workingSet>
+    <workingSet
+        name="modules"
+        id="oasp4j.modules">
+      <predicate
+          xsi:type="workingsets:ExclusionPredicate"
+          excludedWorkingSet="//@setupTasks.2/@workingSets.0 //@setupTasks.2/@workingSets.2 //@setupTasks.2/@workingSets.1"/>
+    </workingSet>
+  </setupTask>
   <stream name="master">
     <setupTask
         xsi:type="maven:MavenImportTask"
         id="mvn.import.oasp4j">
       <sourceLocator
           rootFolder="${git.oasp.location/samples}"
-          locateNestedProjects="true"/>
+          locateNestedProjects="true">
+        <predicate
+            xsi:type="predicates:AndPredicate">
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="oasp4j-samples"/>
+          </operand>
+        </predicate>
+      </sourceLocator>
     </setupTask>
   </stream>
   <stream name="develop">
@@ -60,10 +104,41 @@
         id="mvn.import.oasp4j">
       <sourceLocator
           rootFolder="${git.oasp.location}"
-          locateNestedProjects="true"/>
-      <sourceLocator
-          rootFolder="${git.oasp.location/modules}"
-          locateNestedProjects="true"/>
+          locateNestedProjects="true">
+        <predicate
+            xsi:type="predicates:AndPredicate">
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="oasp4j"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="oasp4j-samples"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="oasp4j-templates"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="oasp4j-modules"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="oasp4j-starters"/>
+          </operand>
+        </predicate>
+      </sourceLocator>
     </setupTask>
   </stream>
   <logicalProjectContainer

diff --git a/.../src/main/java/io/oasp/module/cxf/common/impl/client/rest/RestServiceExceptionMapper.java b/.../src/main/java/io/oasp/module/cxf/common/impl/client/rest/RestServiceExceptionMapper.java
@@ -51,7 +51,8 @@ public Throwable fromResponse(Response response) {
           Map<String, Object> jsonMap = objectMapper.readValue(json, Map.class);
           return createException(jsonMap);
         } catch (IOException e) {
-          return new IllegalStateException("Invocation of service", e);
+          return new ServiceInvocationFailedTechnicalException(e, e.getMessage(), e.getClass().getSimpleName(), null,
+              this.serviceName);
         }
       }
     }
@@ -72,4 +73,33 @@ private Throwable createException(String code, String message, UUID uuid) {
     return new ServiceInvocationFailedException(message, code, uuid, this.serviceName);
   }
 
+  /**
+   * Extends {@link ServiceInvocationFailedException} as {@link #isTechnical() technical} exception.
+   */
+  private static final class ServiceInvocationFailedTechnicalException extends ServiceInvocationFailedException {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The constructor.
+     *
+     * @param cause the {@link #getCause() cause} of this exception.
+     * @param message the {@link #getMessage() message}.
+     * @param code the {@link #getCode() code}.
+     * @param uuid {@link UUID} the {@link #getUuid() UUID}.
+     * @param service the name (e.g. {@link Class#getName() qualified name}) of the service that failed.
+     */
+    private ServiceInvocationFailedTechnicalException(Throwable cause, String message, String code, UUID uuid,
+        String service) {
+
+      super(cause, message, code, uuid, service);
+    }
+
+    @Override
+    public boolean isForUser() {
+
+      return false;
+    }
+  }
+
 }
diff --git a/...es/jpa-envers/src/main/java/io/oasp/module/jpa/dataaccess/api/AdvancedRevisionEntity.java b/...es/jpa-envers/src/main/java/io/oasp/module/jpa/dataaccess/api/AdvancedRevisionEntity.java
@@ -4,6 +4,7 @@
 
 import java.util.Date;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -39,6 +40,7 @@ public class AdvancedRevisionEntity implements PersistenceEntity<Long> {
 
   /** @see #getTimestamp() */
   @RevisionTimestamp
+  @Column(name = "\"timestamp\"")
   private long timestamp;
 
   /** @see #getDate() */