From d17755c3a074e22ec045fe033f60d882271fb2eb Mon Sep 17 00:00:00 2001
From: Lyn Elisa Goltz <goltz@lat-lon.de>
Date: Thu, 23 Aug 2018 12:25:11 +0200
Subject: [PATCH 1/4] #917 - renamed config tools class with main method

---
 .../config/{Exec.java => SqlFeatureStoreConfigCreator.java}     | 2 ++
 1 file changed, 2 insertions(+)
 rename deegree-tools/deegree-tools-config/src/main/java/org/deegree/tools/config/{Exec.java => SqlFeatureStoreConfigCreator.java} (98%)

diff --git a/deegree-tools/deegree-tools-config/src/main/java/org/deegree/tools/config/Exec.java b/deegree-tools/deegree-tools-config/src/main/java/org/deegree/tools/config/SqlFeatureStoreConfigCreator.java
similarity index 98%
rename from deegree-tools/deegree-tools-config/src/main/java/org/deegree/tools/config/Exec.java
rename to deegree-tools/deegree-tools-config/src/main/java/org/deegree/tools/config/SqlFeatureStoreConfigCreator.java
index 7055f96ad8..95ea7f1eb7 100644
--- a/deegree-tools/deegree-tools-config/src/main/java/org/deegree/tools/config/Exec.java
+++ b/deegree-tools/deegree-tools-config/src/main/java/org/deegree/tools/config/SqlFeatureStoreConfigCreator.java
@@ -39,6 +39,7 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 
+import org.deegree.commons.annotations.Tool;
 import org.deegree.commons.xml.stax.IndentingXMLStreamWriter;
 import org.deegree.cs.persistence.CRSManager;
 import org.deegree.cs.refs.coordinatesystem.CRSRef;
@@ -58,6 +59,7 @@
  * 
  * @author Juergen Weichand
  */
+@Tool(value = "Creates SQLFeatureStore configuration and DDL from a GML application schema")
 public class Exec {
 
     private static final PropertyNameParser propertyNameParser = new PropertyNameParser();

From b23aea49431b1ef4c870d0a4792bb5409284513c Mon Sep 17 00:00:00 2001
From: Lyn Elisa Goltz <goltz@lat-lon.de>
Date: Thu, 23 Aug 2018 12:31:39 +0200
Subject: [PATCH 2/4] #917 - fixed class imports; configured assembly

---
 deegree-tools/deegree-tools-config/pom.xml    | 27 ++++++++++++++++++-
 .../src/assembly/assembly.xml                 | 25 +++++++++++++++++
 .../config/SqlFeatureStoreConfigCreator.java  |  2 +-
 .../org/deegree/tools/config/InspireIT.java   | 25 +++++++++--------
 4 files changed, 64 insertions(+), 15 deletions(-)
 create mode 100644 deegree-tools/deegree-tools-config/src/assembly/assembly.xml

diff --git a/deegree-tools/deegree-tools-config/pom.xml b/deegree-tools/deegree-tools-config/pom.xml
index e683e4f54b..1e15ee5aa0 100755
--- a/deegree-tools/deegree-tools-config/pom.xml
+++ b/deegree-tools/deegree-tools-config/pom.xml
@@ -10,6 +10,10 @@
     <version>3.4.3-SNAPSHOT</version>
   </parent>
 
+  <properties>
+    <toolboxname>d3config</toolboxname>
+  </properties>
+
   <inceptionYear>2016</inceptionYear>
 
   <!-- Added licence header to source files with:
@@ -74,6 +78,27 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/assembly/assembly.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
   <profiles>
     <profile>
       <id>jar-with-dependencies</id>
@@ -107,7 +132,7 @@
                 <manifest>
                   <addClasspath>true</addClasspath>
                   <classpathPrefix>lib/</classpathPrefix>
-                  <mainClass>org.deegree.tools.config.Exec</mainClass>
+                  <mainClass>org.deegree.tools.config.SqlFeatureStoreConfigCreator</mainClass>
                 </manifest>
               </archive>
               <descriptorRefs>
diff --git a/deegree-tools/deegree-tools-config/src/assembly/assembly.xml b/deegree-tools/deegree-tools-config/src/assembly/assembly.xml
new file mode 100644
index 0000000000..43e6a07573
--- /dev/null
+++ b/deegree-tools/deegree-tools-config/src/assembly/assembly.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<assembly
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>distribution</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>target/appassembler/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>target/appassembler/etc</directory>
+      <outputDirectory>etc</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>target/appassembler/repo</directory>
+      <outputDirectory>repo</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/deegree-tools/deegree-tools-config/src/main/java/org/deegree/tools/config/SqlFeatureStoreConfigCreator.java b/deegree-tools/deegree-tools-config/src/main/java/org/deegree/tools/config/SqlFeatureStoreConfigCreator.java
index 95ea7f1eb7..c363f0d2a8 100644
--- a/deegree-tools/deegree-tools-config/src/main/java/org/deegree/tools/config/SqlFeatureStoreConfigCreator.java
+++ b/deegree-tools/deegree-tools-config/src/main/java/org/deegree/tools/config/SqlFeatureStoreConfigCreator.java
@@ -60,7 +60,7 @@
  * @author Juergen Weichand
  */
 @Tool(value = "Creates SQLFeatureStore configuration and DDL from a GML application schema")
-public class Exec {
+public class SqlFeatureStoreConfigCreator {
 
     private static final PropertyNameParser propertyNameParser = new PropertyNameParser();
 
diff --git a/deegree-tools/deegree-tools-config/src/test/java/org/deegree/tools/config/InspireIT.java b/deegree-tools/deegree-tools-config/src/test/java/org/deegree/tools/config/InspireIT.java
index b6cb71a74f..f1bdf4957e 100644
--- a/deegree-tools/deegree-tools-config/src/test/java/org/deegree/tools/config/InspireIT.java
+++ b/deegree-tools/deegree-tools-config/src/test/java/org/deegree/tools/config/InspireIT.java
@@ -21,7 +21,6 @@
  */
 package org.deegree.tools.config;
 
-import org.deegree.tools.config.Exec;
 import org.junit.Test;
 
 /**
@@ -36,77 +35,77 @@ public class InspireIT {
     public void schemaOnly()
                     throws Exception {
         String[] args = { SCHEMA_URL_CP };
-        Exec.main( args );
+        SqlFeatureStoreConfigCreator.main( args );
     }
 
     @Test
     public void schemaToDeegreeConfig()
                     throws Exception {
         String[] args = { SCHEMA_URL_CP, "--format=deegree" };
-        Exec.main( args );
+        SqlFeatureStoreConfigCreator.main( args );
     }
 
     @Test
     public void schemaToDeegreeConfigWithSrid()
                     throws Exception {
         String[] args = { SCHEMA_URL_CP, "--format=deegree", "--srid=31468" };
-        Exec.main( args );
+        SqlFeatureStoreConfigCreator.main( args );
     }
 
     @Test
     public void schemaToDeegreeConfigAndSqlDdl()
                     throws Exception {
         String[] args = { SCHEMA_URL_CP, "--format=all", "--srid=31468" };
-        Exec.main( args );
+        SqlFeatureStoreConfigCreator.main( args );
     }
 
     @Test
     public void schemaToDeegreeConfigAndSqlDdlAndIdTypeInteger()
                     throws Exception {
         String[] args = { SCHEMA_URL_CP, "--format=all", "--srid=4326", "--idtype=int" };
-        Exec.main( args );
+        SqlFeatureStoreConfigCreator.main( args );
     }
 
     @Test
     public void schemaToDeegreeConfigAndSqlDdlAndIdTypeUuid()
                     throws Exception {
         String[] args = { SCHEMA_URL_CP, "--format=all", "--srid=4326", "--idtype=uuid" };
-        Exec.main( args );
+        SqlFeatureStoreConfigCreator.main( args );
     }
 
     @Test
     public void schemaToSqlDdl()
                     throws Exception {
         String[] args = { SCHEMA_URL_CP, "--format=ddl" };
-        Exec.main( args );
+        SqlFeatureStoreConfigCreator.main( args );
     }
 
     @Test
     public void schemaToDeegreeConfigAndSqlDdlWithBlobMapping()
                     throws Exception {
         String[] args = { SCHEMA_URL_CP, "--format=all", "--mapping=blob" };
-        Exec.main( args );
+        SqlFeatureStoreConfigCreator.main( args );
     }
 
     @Test
     public void schemaToDeegreeConfigAndSqlDdlWithBlobMappingAndAllOptions()
                     throws Exception {
         String[] args = { SCHEMA_URL_CP, "--format=all", "--srid=4326", "--mapping=blob" };
-        Exec.main( args );
+        SqlFeatureStoreConfigCreator.main( args );
     }
 
     @Test
     public void schemaToDeegreeConfigAndSqlDdlWithForOracle()
                     throws Exception {
         String[] args = { SCHEMA_URL_CP, "--format=all", "--srid=4326", "--dialect=oracle" };
-        Exec.main( args );
+        SqlFeatureStoreConfigCreator.main( args );
     }
 
     @Test
     public void schemaToDeegreeConfigAndSqlDdlWithBlobMappingForOracle()
                     throws Exception {
         String[] args = { SCHEMA_URL_CP, "--format=all", "--srid=4326", "--mapping=blob", "--dialect=oracle" };
-        Exec.main( args );
+        SqlFeatureStoreConfigCreator.main( args );
     }
 
     @Test
@@ -114,7 +113,7 @@ public void schemaToDeegreeConfigAndListOfPropertiesWithPrimitiveHref()
                     throws Exception {
         String[] args = { SCHEMA_URL_CP, "--format=deegree",
                          "--listOfPropertiesWithPrimitiveHref=src/test/resources/listOfPropertiesWithPrimitiveHref" };
-        Exec.main( args );
+        SqlFeatureStoreConfigCreator.main( args );
     }
 
 }
\ No newline at end of file

From 2d0b1e853c72fc5b92b74d87a7456ce7b539057a Mon Sep 17 00:00:00 2001
From: Lyn Elisa Goltz <goltz@lat-lon.de>
Date: Thu, 23 Aug 2018 12:33:33 +0200
Subject: [PATCH 3/4] #917 - removed profile

---
 deegree-tools/deegree-tools-config/pom.xml | 54 ----------------------
 1 file changed, 54 deletions(-)

diff --git a/deegree-tools/deegree-tools-config/pom.xml b/deegree-tools/deegree-tools-config/pom.xml
index 1e15ee5aa0..bac1e6b01d 100755
--- a/deegree-tools/deegree-tools-config/pom.xml
+++ b/deegree-tools/deegree-tools-config/pom.xml
@@ -99,59 +99,5 @@
       </plugin>
     </plugins>
   </build>
-  <profiles>
-    <profile>
-      <id>jar-with-dependencies</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>copy-dependencies</id>
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>copy-dependencies</goal>
-                </goals>
-                <configuration>
-                  <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                  <overWriteReleases>false</overWriteReleases>
-                  <overWriteSnapshots>false</overWriteSnapshots>
-                  <overWriteIfNewer>true</overWriteIfNewer>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <version>2.6</version>
-            <configuration>
-              <archive>
-                <manifest>
-                  <addClasspath>true</addClasspath>
-                  <classpathPrefix>lib/</classpathPrefix>
-                  <mainClass>org.deegree.tools.config.SqlFeatureStoreConfigCreator</mainClass>
-                </manifest>
-              </archive>
-              <descriptorRefs>
-                <descriptorRef>jar-with-dependencies</descriptorRef>
-              </descriptorRefs>
-            </configuration>
-            <executions>
-              <execution>
-                <id>make-assembly</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 
 </project>

From 5e1b45e6b7abe39caac9e0f2deee92d43820e961 Mon Sep 17 00:00:00 2001
From: Lyn Elisa Goltz <goltz@lat-lon.de>
Date: Thu, 23 Aug 2018 13:31:25 +0200
Subject: [PATCH 4/4] #917 - moved assemblies and configured assembly plugin

---
 deegree-tools/deegree-tools-3d/assembly.xml   | 21 ----------------
 deegree-tools/deegree-tools-3d/pom.xml        | 22 ++++++++++++++++
 .../src/assembly/assembly.xml                 | 25 +++++++++++++++++++
 deegree-tools/deegree-tools-base/pom.xml      | 22 ++++++++++++++++
 .../src/assembly/assembly.xml                 | 25 +++++++++++++++++++
 .../deegree-tools-migration/assembly.xml      | 22 ----------------
 deegree-tools/deegree-tools-migration/pom.xml | 22 ++++++++++++++++
 .../src/assembly}/assembly.xml                | 13 ++++++----
 8 files changed, 124 insertions(+), 48 deletions(-)
 delete mode 100644 deegree-tools/deegree-tools-3d/assembly.xml
 create mode 100644 deegree-tools/deegree-tools-3d/src/assembly/assembly.xml
 create mode 100644 deegree-tools/deegree-tools-base/src/assembly/assembly.xml
 delete mode 100644 deegree-tools/deegree-tools-migration/assembly.xml
 rename deegree-tools/{deegree-tools-base => deegree-tools-migration/src/assembly}/assembly.xml (74%)

diff --git a/deegree-tools/deegree-tools-3d/assembly.xml b/deegree-tools/deegree-tools-3d/assembly.xml
deleted file mode 100644
index 6807a8ba44..0000000000
--- a/deegree-tools/deegree-tools-3d/assembly.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<assembly
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-  <id>distribution</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-      <directory>target/appassembler/bin</directory>
-      <outputDirectory>bin</outputDirectory>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>repo</outputDirectory>
-    </dependencySet>
-  </dependencySets>
-</assembly>
\ No newline at end of file
diff --git a/deegree-tools/deegree-tools-3d/pom.xml b/deegree-tools/deegree-tools-3d/pom.xml
index af4e97d423..37ec746faa 100644
--- a/deegree-tools/deegree-tools-3d/pom.xml
+++ b/deegree-tools/deegree-tools-3d/pom.xml
@@ -63,4 +63,26 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/assembly/assembly.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/deegree-tools/deegree-tools-3d/src/assembly/assembly.xml b/deegree-tools/deegree-tools-3d/src/assembly/assembly.xml
new file mode 100644
index 0000000000..43e6a07573
--- /dev/null
+++ b/deegree-tools/deegree-tools-3d/src/assembly/assembly.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<assembly
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>distribution</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>target/appassembler/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>target/appassembler/etc</directory>
+      <outputDirectory>etc</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>target/appassembler/repo</directory>
+      <outputDirectory>repo</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/deegree-tools/deegree-tools-base/pom.xml b/deegree-tools/deegree-tools-base/pom.xml
index 601cb3aa43..32e9ab6ecf 100644
--- a/deegree-tools/deegree-tools-base/pom.xml
+++ b/deegree-tools/deegree-tools-base/pom.xml
@@ -56,4 +56,26 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/assembly/assembly.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/deegree-tools/deegree-tools-base/src/assembly/assembly.xml b/deegree-tools/deegree-tools-base/src/assembly/assembly.xml
new file mode 100644
index 0000000000..43e6a07573
--- /dev/null
+++ b/deegree-tools/deegree-tools-base/src/assembly/assembly.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<assembly
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>distribution</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>target/appassembler/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>target/appassembler/etc</directory>
+      <outputDirectory>etc</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>target/appassembler/repo</directory>
+      <outputDirectory>repo</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/deegree-tools/deegree-tools-migration/assembly.xml b/deegree-tools/deegree-tools-migration/assembly.xml
deleted file mode 100644
index 965f57839a..0000000000
--- a/deegree-tools/deegree-tools-migration/assembly.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<assembly
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-  <id>distribution</id>
-  <formats>
-    <format>tar.gz</format>
-    <format>zip</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-      <directory>target/appassembler/bin</directory>
-      <outputDirectory>bin</outputDirectory>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>repo</outputDirectory>
-    </dependencySet>
-  </dependencySets>
-</assembly>
\ No newline at end of file
diff --git a/deegree-tools/deegree-tools-migration/pom.xml b/deegree-tools/deegree-tools-migration/pom.xml
index 71541f34a6..8eb3df9498 100644
--- a/deegree-tools/deegree-tools-migration/pom.xml
+++ b/deegree-tools/deegree-tools-migration/pom.xml
@@ -47,4 +47,26 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/assembly/assembly.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/deegree-tools/deegree-tools-base/assembly.xml b/deegree-tools/deegree-tools-migration/src/assembly/assembly.xml
similarity index 74%
rename from deegree-tools/deegree-tools-base/assembly.xml
rename to deegree-tools/deegree-tools-migration/src/assembly/assembly.xml
index 965f57839a..8cbbab2609 100644
--- a/deegree-tools/deegree-tools-base/assembly.xml
+++ b/deegree-tools/deegree-tools-migration/src/assembly/assembly.xml
@@ -13,10 +13,13 @@
       <directory>target/appassembler/bin</directory>
       <outputDirectory>bin</outputDirectory>
     </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
+    <fileSet>
+      <directory>target/appassembler/etc</directory>
+      <outputDirectory>etc</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>target/appassembler/repo</directory>
       <outputDirectory>repo</outputDirectory>
-    </dependencySet>
-  </dependencySets>
+    </fileSet>
+  </fileSets>
 </assembly>
\ No newline at end of file