Skip to content

Commit

Permalink
deegree#349: Created deegree-testservice module from deegree-jsf-cons…
Browse files Browse the repository at this point in the history
…ole remainders
  • Loading branch information
MrSnyder authored and stephanr committed Nov 11, 2014
1 parent d72313b commit 628cd28
Show file tree
Hide file tree
Showing 5 changed files with 342 additions and 2 deletions.
231 changes: 231 additions & 0 deletions deegree-tests/deegree-testservice/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,231 @@
<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-testservice</artifactId>
<packaging>jar</packaging>
<name>deegree-testservice</name>
<description>Webservices base webapp for integration tests</description>
<properties>
<deegree.module.status>rework</deegree.module.status>
</properties>
<parent>
<groupId>org.deegree</groupId>
<artifactId>deegree-client</artifactId>
<version>3.4-pre15-SNAPSHOT</version>
<relativePath>../../deegree-client</relativePath>
</parent>
<repositories>
<repository>
<id>deegree-repo</id>
<url>http://repo.deegree.org/content/groups/public</url>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/assembly/webapp-template.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>create-webapp-template-zip</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
<configuration>
<ignorePackaging>true</ignorePackaging>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<additionalProjectFacets>
<jst.jsf>2.1</jst.jsf>
</additionalProjectFacets>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<dependencies>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-services-wmts</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-services-wms</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-services-wps</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-services-wfs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-services-csw</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-services-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-featurestore-memory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-featurestore-shape</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-featurestore-simplesql</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-featurestore-sql</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-sqldialect-postgis</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-mdstore-iso</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-mdstore-iso-memory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-themes-remotewms</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-layers-remotewms</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-layers-tile</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-layers-coverage</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-gdal</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-tilestore-cache</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-tilestore-gdal</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-tilestore-geotiff</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-tilestore-filesystem</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-tilestore-merge</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-tilestore-remotewms</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-tilestore-remotewmts</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-connectionprovider-datasource</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-jsf-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</dependency>
</dependencies>
</project>
15 changes: 15 additions & 0 deletions deegree-tests/deegree-testservice/src/assembly/webapp-template.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<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>webapp-template</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>src/main/webapp</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
</assembly>
92 changes: 92 additions & 0 deletions deegree-tests/deegree-testservice/src/main/webapp/WEB-INF/web.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
<display-name>deegree 3 OGC services console + generic client</display-name>

<filter>
<filter-name>Upload Filter</filter-name>
<filter-class>org.deegree.client.core.filter.InputFileFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>Upload Filter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>

<servlet>
<servlet-name>services</servlet-name>
<servlet-class>org.deegree.services.controller.OGCFrontController</servlet-class>
<load-on-startup>2</load-on-startup>
</servlet>

<servlet>
<servlet-name>resources</servlet-name>
<servlet-class>org.deegree.services.resources.ResourcesServlet</servlet-class>
<load-on-startup>2</load-on-startup>
</servlet>

<servlet>
<servlet-name>config</servlet-name>
<servlet-class>org.deegree.services.config.servlet.ConfigServlet</servlet-class>
<load-on-startup>2</load-on-startup>
</servlet>

<servlet-mapping>
<servlet-name>services</servlet-name>
<url-pattern>/services</url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name>services</servlet-name>
<url-pattern>/services/*</url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name>resources</servlet-name>
<url-pattern>/resources/*</url-pattern>
</servlet-mapping>

<servlet-mapping>
<servlet-name>config</servlet-name>
<url-pattern>/config/*</url-pattern>
</servlet-mapping>

<welcome-file-list>
<welcome-file>index.xhtml</welcome-file>
</welcome-file-list>

<security-constraint>
<web-resource-collection>
<web-resource-name>Configuration</web-resource-name>
<url-pattern>/config/*</url-pattern>
</web-resource-collection>
<auth-constraint>
<role-name>deegree</role-name>
</auth-constraint>
</security-constraint>

<login-config>
<auth-method>BASIC</auth-method>
<realm-name>deegree web configuration API</realm-name>
</login-config>

<security-role>
<description>deegree administrator role</description>
<role-name>deegree</role-name>
</security-role>


<!-- http basic auth enable -->
<!-- Define a security constraint on this application -->
<!-- User and role must be added to tomcat-users.xml -->
<!-- <security-constraint> <web-resource-collection> <web-resource-name>Entire Application</web-resource-name> <url-pattern>/*</url-pattern>
</web-resource-collection> <auth-constraint> <role-name>demoadmin</role-name> </auth-constraint> </security-constraint> <login-config>
<auth-method>BASIC</auth-method> <realm-name>Tomcat Manager Application</realm-name> </login-config> <security-role> <description>The
role that is required to log in to the Manager Application</description> <role-name>demoadmin</role-name> </security-role> -->
<!-- end -->

<!-- error-page>
<exception-type>java.lang.Exception</exception-type>
<location>/error.xhtml</location>
</error-page-->

</web-app>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
deegree
5 changes: 3 additions & 2 deletions deegree-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@
<dependencies>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-jsf-console</artifactId>
<artifactId>deegree-testservice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-jsf-console</artifactId>
<artifactId>deegree-testservice</artifactId>
<version>${project.version}</version>
<type>zip</type>
<classifier>webapp-template</classifier>
Expand All @@ -81,6 +81,7 @@
</dependencies>

<modules>
<module>deegree-testservice</module>
<!-- workspace tests must run first! -->
<module>deegree-workspace-tests</module>
<module>deegree-compliance-tests</module>
Expand Down

0 comments on commit 628cd28

Please sign in to comment.