Merge branch 'refactor' into develop

docker/compile_and_build_docker_image.sh

@@ -124,7 +124,7 @@ fail() {
 #############################################
 
 
-TGZ_BASENAME="contrast-finder-webapp/target/contrast-finder"
+TGZ_BASENAME="webapp/target/contrast-finder"
 TGZ_EXT=".tar.gz"
 ADD_IP=''
 URL="http://localhost:${CONTAINER_EXPOSED_PORT}/contrast-finder/"

contrast-finder-api/pom.xml → engine/api/pom.xml

@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.asqatasun</groupId>
-        <artifactId>contrast-finder</artifactId>
+        <artifactId>engine</artifactId>
         <version>0.5.1-dev</version>
     </parent>
     <artifactId>contrast-finder-api</artifactId>
     <version>0.5.1-dev</version>
+    <name>api</name>
     <packaging>jar</packaging>
 
-    <name>contrast-finder-api</name>
     <url>https://contrast-finder.org</url>
     <organization>
         <name>Asqatasun.org</name>

contrast-finder-hsv/pom.xml → engine/hsv/pom.xml

@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.asqatasun</groupId>
-        <artifactId>contrast-finder</artifactId>
+        <artifactId>engine</artifactId>
         <version>0.5.1-dev</version>
     </parent>
     <artifactId>contrast-finder-hsv</artifactId>
     <version>0.5.1-dev</version>
+    <name>hsv</name>
     <packaging>jar</packaging>
 
-    <name>contrast-finder-hsv</name>
     <url>https://contrast-finder.org</url>
     <organization>
         <name>Asqatasun.org</name>

contrast-finder-impl/pom.xml → engine/impl/pom.xml

@@ -3,14 +3,15 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.asqatasun</groupId>
-        <artifactId>contrast-finder</artifactId>
+        <artifactId>engine</artifactId>
         <version>0.5.1-dev</version>
     </parent>
     <artifactId>contrast-finder-impl</artifactId>
     <version>0.5.1-dev</version>
+    <name>impl</name>
     <packaging>jar</packaging>
 
-    <name>contrast-finder-impl</name>
+
     <url>https://contrast-finder.org</url>
     <organization>
         <name>Asqatasun.org</name>

engine/pom.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.asqatasun</groupId>
+        <artifactId>contrast-finder</artifactId>
+        <version>0.5.1-dev</version>
+    </parent>
+    <artifactId>engine</artifactId>
+    <version>0.5.1-dev</version>
+    <packaging>pom</packaging>
+
+    <name>contrast-finder-engine</name>
+    <url>https://contrast-finder.org</url>
+    <organization>
+        <name>Asqatasun.org</name>
+        <url>http://asqatasun.org</url>
+    </organization>
+    <licenses>
+        <license>
+            <name>GNU Affero General Public License v3.0</name>
+            <url>https://www.gnu.org/licenses/agpl-3.0.txt</url>
+            <distribution>manual</distribution>
+        </license>
+    </licenses>
+
+
+    <modules>
+        <module>api</module>
+        <module>utils</module>
+        <module>hsv</module>
+        <module>impl</module>
+    </modules>
+</project>

contrast-finder-utils/pom.xml → engine/utils/pom.xml

@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.asqatasun</groupId>
-        <artifactId>contrast-finder</artifactId>
+        <artifactId>engine</artifactId>
         <version>0.5.1-dev</version>
     </parent>
     <artifactId>contrast-finder-utils</artifactId>
     <version>0.5.1-dev</version>
+    <name>utils</name>
     <packaging>jar</packaging>
 
-    <name>contrast-finder-utils</name>
     <url>https://contrast-finder.org</url>
     <organization>
         <name>Asqatasun.org</name>

pom.xml

@@ -28,11 +28,8 @@
                                     the minimum version of Maven for maven plugins
                                     ............  mvn versions:display-plugin-updates     -->
     <modules>
-        <module>contrast-finder-api</module>
-        <module>contrast-finder-utils</module>
-        <module>contrast-finder-hsv</module>
-        <module>contrast-finder-impl</module>
-        <module>contrast-finder-webapp</module>
+        <module>engine</module>
+        <module>webapp</module>
     </modules>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

contrast-finder-webapp/pom.xml → webapp/pom.xml

@@ -6,7 +6,7 @@
         <artifactId>contrast-finder</artifactId>
         <version>0.5.1-dev</version>
     </parent>
-    <artifactId>contrast-finder-webapp</artifactId>
+    <artifactId>webapp</artifactId>
     <version>0.5.1-dev</version>
     <packaging>war</packaging>
 
@@ -231,6 +231,7 @@
                 </executions>
             </plugin>
         </plugins>
+        <finalName>contrast-finder-webapp-${project.version}</finalName>
     </build>
 
 </project>