[java-idp-plugin-jetty] 21/186: IDP-1110 - Add testbed

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch dev/foo
in repository java-idp-plugin-jetty.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-jetty.git;a=commit;h=5a4a2fd0469a312d9b69b6fa0c3a5f9390a655b6

commit 5a4a2fd0469a312d9b69b6fa0c3a5f9390a655b6
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Jun 14 17:26:34 2017 -0500

    IDP-1110 - Add testbed
---
 .../resources/{ => jetty-base}/etc/idp-testbed.xml |  0
 src/test/resources/jetty-base/etc/web-override.xml | 37 ++++++++++++++++++++++
 .../resources/jetty-base/modules/idp-testbed.mod   | 13 ++++++++
 src/test/resources/jetty-base/webapps/idp.xml      | 16 ++++++++++
 src/test/resources/modules/idp-testbed.mod         | 12 -------
 5 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/src/test/resources/etc/idp-testbed.xml b/src/test/resources/jetty-base/etc/idp-testbed.xml
similarity index 100%
rename from src/test/resources/etc/idp-testbed.xml
rename to src/test/resources/jetty-base/etc/idp-testbed.xml
diff --git a/src/test/resources/jetty-base/etc/web-override.xml b/src/test/resources/jetty-base/etc/web-override.xml
new file mode 100644
index 0000000..b2be1f8
--- /dev/null
+++ b/src/test/resources/jetty-base/etc/web-override.xml
@@ -0,0 +1,37 @@
+<?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">
+
+    <!--
+    Uncomment to log HTTP requests and responses.
+    See http://logback.qos.ch/recipes/captureHttp.html 
+    -->
+    <!--
+    <filter>
+        <filter-name>TeeFilter</filter-name>
+        <filter-class>ch.qos.logback.access.servlet.TeeFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>TeeFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+     -->
+
+    <!-- The /storage app space. Interact with storage services via HTTP. -->
+    <servlet>
+        <servlet-name>storage</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <init-param>
+            <param-name>contextConfigLocation</param-name>
+            <param-value>classpath:/system/conf/storage-context.xml</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>storage</servlet-name>
+        <url-pattern>/storage/*</url-pattern>
+    </servlet-mapping>
+
+</web-app>
diff --git a/src/test/resources/jetty-base/modules/idp-testbed.mod b/src/test/resources/jetty-base/modules/idp-testbed.mod
new file mode 100644
index 0000000..6f42ae5
--- /dev/null
+++ b/src/test/resources/jetty-base/modules/idp-testbed.mod
@@ -0,0 +1,13 @@
+[description]
+Shibboleth IdP Testbed
+
+[depend]
+http
+idp
+
+[files]
+https://build.shibboleth.net/nexus/service/local/artifact/maven/redirect?r=snapshots&g=net.shibboleth.idp&a=idp-testbed&v=LATEST&p=war|testbed-war/idp-testbed.war
+https://build.shibboleth.net/nexus/service/local/artifact/maven/redirect?r=snapshots&g=net.shibboleth.idp&a=idp-testbed&v=LATEST&p=jar&c=classes|lib/idp-testbed/idp-testbed-classes.jar
+
+[xml]
+etc/idp-testbed.xml
diff --git a/src/test/resources/jetty-base/webapps/idp.xml b/src/test/resources/jetty-base/webapps/idp.xml
new file mode 100644
index 0000000..41c2e48
--- /dev/null
+++ b/src/test/resources/jetty-base/webapps/idp.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+
+<!-- =============================================================== -->
+<!-- Configure the Shibboleth IdP webapp                             -->
+<!-- =============================================================== -->
+<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+  <Set name="war"><SystemProperty name="idp.home"/>/war/idp.war</Set>
+  <Set name="contextPath">/idp</Set>
+  <Set name="extractWAR">false</Set>
+  <Set name="copyWebDir">false</Set>
+  <Set name="copyWebInf">true</Set>
+
+  <Set name="overrideDescriptor">etc/web-override.xml</Set>
+  <Set name="extraClasspath">/workspaces/shib-work/java-idp-jetty-base/target/idp-jetty-base/jetty-base/lib/idp-testbed/idp-testbed-classes.jar</Set>
+</Configure>
diff --git a/src/test/resources/modules/idp-testbed.mod b/src/test/resources/modules/idp-testbed.mod
deleted file mode 100644
index e9220d0..0000000
--- a/src/test/resources/modules/idp-testbed.mod
+++ /dev/null
@@ -1,12 +0,0 @@
-[description]
-Shibboleth IdP Testbed
-
-[depend]
-http
-shibboleth-idp
-
-[files]
-testbed-war/idp-testbed.war
-
-[xml]
-etc/shibboleth-idp-testbed.xml

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.