Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert deegree-tools-config to d3toolbox and activate all deegree tools #918

Merged
merged 4 commits into from
Aug 24, 2018
Merged

Convert deegree-tools-config to d3toolbox and activate all deegree tools #918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d17755c
#917 - renamed config tools class with main method
lgoltz Aug 23, 2018
b23aea4
#917 - fixed class imports; configured assembly
lgoltz Aug 23, 2018
2d0b1e8
#917 - removed profile
lgoltz Aug 23, 2018
5e1b45e
#917 - moved assemblies and configured assembly plugin
lgoltz Aug 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions deegree-tools/deegree-tools-3d/assembly.xml
View file
Open in desktop

This file was deleted.

22 changes: 22 additions & 0 deletions deegree-tools/deegree-tools-3d/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
25 changes: 25 additions & 0 deletions deegree-tools/deegree-tools-3d/src/assembly/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
22 changes: 22 additions & 0 deletions deegree-tools/deegree-tools-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
25 changes: 25 additions & 0 deletions deegree-tools/deegree-tools-base/src/assembly/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
79 changes: 25 additions & 54 deletions deegree-tools/deegree-tools-config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -74,59 +78,26 @@
</dependency>
</dependencies>

<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.Exec</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>
<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>
25 changes: 25 additions & 0 deletions deegree-tools/deegree-tools-config/src/assembly/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 3 additions & 1 deletion ...n/java/org/deegree/tools/config/Exec.java → .../config/SqlFeatureStoreConfigCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -58,7 +59,8 @@
*
* @author Juergen Weichand
*/
public class Exec {
@Tool(value = "Creates SQLFeatureStore configuration and DDL from a GML application schema")
public class SqlFeatureStoreConfigCreator {

private static final PropertyNameParser propertyNameParser = new PropertyNameParser();

Expand Down
25 changes: 12 additions & 13 deletions deegree-tools/deegree-tools-config/src/test/java/org/deegree/tools/config/InspireIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
*/
package org.deegree.tools.config;

import org.deegree.tools.config.Exec;
import org.junit.Test;

/**
Expand All @@ -36,85 +35,85 @@ 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
public void schemaToDeegreeConfigAndListOfPropertiesWithPrimitiveHref()
throws Exception {
String[] args = { SCHEMA_URL_CP, "--format=deegree",
"--listOfPropertiesWithPrimitiveHref=src/test/resources/listOfPropertiesWithPrimitiveHref" };
Exec.main( args );
SqlFeatureStoreConfigCreator.main( args );
}

}
22 changes: 0 additions & 22 deletions deegree-tools/deegree-tools-migration/assembly.xml
View file
Open in desktop

This file was deleted.

Loading