[java-idp-testbed] branch master updated: IDP-1044 - Start testbed before the IdP when using Jetty

[Tom Zeller]

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

tzeller pushed a commit to branch master
in repository java-idp-testbed.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-testbed.git;a=commit;h=6e2e032c7123bd8215a02cc222b24b9d706245de

The following commit(s) were added to refs/heads/master by this push:
       new  6e2e032   IDP-1044 - Start testbed before the IdP when using Jetty
6e2e032 is described below

commit 6e2e032c7123bd8215a02cc222b24b9d706245de
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Fri Sep 16 12:51:20 2016 -0500

    IDP-1044 - Start testbed before the IdP when using Jetty
---
 src/main/resources/etc/testbed.xml           | 28 ++++++++++++++++++++++++++++
 src/main/resources/webapps/0-idp-testbed.xml | 23 -----------------------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/main/resources/etc/testbed.xml b/src/main/resources/etc/testbed.xml
new file mode 100644
index 0000000..7f25b7c
--- /dev/null
+++ b/src/main/resources/etc/testbed.xml
@@ -0,0 +1,28 @@
+<?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 Testbed webapp                             -->
+<!-- =============================================================== -->
+<Configure id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection">
+  <Call name="addHandler">
+    <Arg>
+      <New class="org.eclipse.jetty.webapp.WebAppContext">
+        <Set name="war">../testbed-war/idp-testbed.war</Set>
+        <Set name="contextPath">/</Set>
+        <Set name="extractWAR">false</Set>
+        <Set name="copyWebDir">false</Set>
+        <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=375504 -->
+        <Set name="copyWebInf">true</Set>
+        <Call name="setAttribute">
+          <Arg>org.eclipse.jetty.server.webapp.WebInfIncludeJarPattern</Arg>
+          <Arg>none</Arg>
+        </Call>
+        <Call name="setAttribute">
+          <Arg>org.eclipse.jetty.webapp.basetempdir</Arg>
+          <Arg><Property name="jetty.base" />/tmp</Arg>
+        </Call>
+      </New>
+    </Arg>
+  </Call>
+</Configure>
\ No newline at end of file
diff --git a/src/main/resources/webapps/0-idp-testbed.xml b/src/main/resources/webapps/0-idp-testbed.xml
deleted file mode 100644
index 35458da..0000000
--- a/src/main/resources/webapps/0-idp-testbed.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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 Testbed webapp                             -->
-<!-- =============================================================== -->
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
-  <Set name="war">../testbed-war/idp-testbed.war</Set>
-  <Set name="contextPath">/</Set>
-  <Set name="extractWAR">false</Set>
-  <Set name="copyWebDir">false</Set>
-  <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=375504 -->
-  <Set name="copyWebInf">true</Set>
-  <Call name="setAttribute">
-    <Arg>org.eclipse.jetty.server.webapp.WebInfIncludeJarPattern</Arg>
-    <Arg>none</Arg>
-  </Call>
-  <Call name="setAttribute">
-    <Arg>org.eclipse.jetty.webapp.basetempdir</Arg>
-    <Arg><Property name="jetty.base" />/tmp</Arg>
-  </Call>
-  
-</Configure>
\ No newline at end of file

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