Skip to content

Commit

Permalink
Merge pull request deegree#1178 from lat-lon/cleanUpAndFixWorkspaces-…
Browse files Browse the repository at this point in the history 
…7641-1063

Clean up and fix workspaces
  • Loading branch information
@stephanr
stephanr authored Sep 10, 2021
2 parents b4ce97a + 7f21bb7 commit 1634341
Show file tree
Hide file tree
Showing 95 changed files with 247 additions and 406 deletions.
44 changes: 33 additions & 11 deletions deegree-tests/deegree-compliance-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
<groupId>org.deegree</groupId>
<artifactId>deegree-workspace-compliance-tests</artifactId>
<version>${project.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/workspace/</outputDirectory>
</artifactItem>
</artifactItems>
Expand Down Expand Up @@ -115,17 +116,6 @@
</build>

<dependencies>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-workspace-compliance-tests</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>cite</groupId>
<artifactId>teamengine</artifactId>
Expand Down Expand Up @@ -186,6 +176,38 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-services-wms</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-services-wcs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-layers-feature</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-layers-coverage</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
Expand Down
41 changes: 5 additions & 36 deletions deegree-tests/deegree-workspace-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,38 +42,37 @@
<groupId>org.deegree</groupId>
<artifactId>deegree-workspace-wps</artifactId>
<version>${project.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/workspaces/deegree-workspace-wps</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.deegree</groupId>
<artifactId>deegree-workspace-utah</artifactId>
<version>${project.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/workspaces/deegree-workspace-utah</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.deegree</groupId>
<artifactId>deegree-workspace-aixm</artifactId>
<version>${project.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/workspaces/deegree-workspace-aixm</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.deegree</groupId>
<artifactId>deegree-workspace-geosciml</artifactId>
<version>${project.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/workspaces/deegree-workspace-geosciml</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.deegree</groupId>
<artifactId>deegree-workspace-wcts</artifactId>
<version>${project.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/workspaces/deegree-workspace-wcts</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.deegree</groupId>
<artifactId>deegree-workspace-xplan40</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/workspaces/deegree-workspace-xplan40</outputDirectory>
</artifactItem>
</artifactItems>
<excludes>
</excludes>
Expand Down Expand Up @@ -133,36 +132,6 @@
<artifactId>deegree-protocol-wms</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-workspace-wps</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-workspace-utah</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-workspace-aixm</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-workspace-geosciml</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-workspace-wcts</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-workspace-xplan40</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
9 changes: 9 additions & 0 deletions deegree-workspaces/deegree-workspace-aixm/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>deegree-workspace-aixm</artifactId>
<name>deegree-workspace-aixm</name>
<packaging>pom</packaging>
<description>Example configuration for deploying AIXM data via deegree WFS</description>

<properties>
Expand All @@ -27,5 +28,13 @@
</repository>
</repositories>

<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
</plugins>
</build>

</project>

14 changes: 14 additions & 0 deletions deegree-workspaces/deegree-workspace-aixm/src/assembly/assembly.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<assembly>
<id>workspace-zip</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
</formats>

<fileSets>
<fileSet>
<directory>src/main/resources</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
</assembly>
44 changes: 9 additions & 35 deletions deegree-workspaces/deegree-workspace-compliance-tests/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>deegree-workspace-compliance-tests</artifactId>
<packaging>jar</packaging>
<packaging>pom</packaging>
<name>deegree-workspace-compliance-tests</name>
<description>Configuration for the OGC CITE test suites</description>

Expand All @@ -28,39 +28,13 @@
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-services-wms</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-services-wcs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-layers-feature</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-layers-coverage</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
</plugins>
</build>

</project>

14 changes: 14 additions & 0 deletions deegree-workspaces/deegree-workspace-compliance-tests/src/assembly/assembly.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<assembly>
<id>workspace-zip</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
</formats>

<fileSets>
<fileSet>
<directory>src/main/resources</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
</assembly>
9 changes: 9 additions & 0 deletions deegree-workspaces/deegree-workspace-csw-memory-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>deegree-workspace-csw-memory-tests</artifactId>
<name>deegree-workspace-csw-memory-tests</name>
<packaging>pom</packaging>
<description>Configuration for running the BKG CSW test suite with memory metadata store.</description>

<properties>
Expand All @@ -27,5 +28,13 @@
</repository>
</repositories>

<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
</plugins>
</build>

</project>

14 changes: 14 additions & 0 deletions deegree-workspaces/deegree-workspace-csw-memory-tests/src/assembly/assembly.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<assembly>
<id>workspace-zip</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
</formats>

<fileSets>
<fileSet>
<directory>src/main/resources</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
</assembly>
14 changes: 8 additions & 6 deletions deegree-workspaces/deegree-workspace-csw/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>deegree-workspace-csw</artifactId>
<name>deegree-workspace-csw</name>
<packaging>pom</packaging>
<description>Example configuration for deploying a deegree CSW that serves ISO metadata</description>

<properties>
Expand All @@ -27,12 +28,13 @@
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
</plugins>
</build>

</project>

14 changes: 14 additions & 0 deletions deegree-workspaces/deegree-workspace-csw/src/assembly/assembly.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<assembly>
<id>workspace-zip</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
</formats>

<fileSets>
<fileSet>
<directory>src/main/resources</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
</assembly>
Loading

0 comments on commit 1634341

Please sign in to comment.