[java-idp-jetty-base] 02/09: IDP-2297 Explore extending the Plugin and Module Infrastructure to allow Jetty installation

Rod Widdowson rdw at steadingsoftware.com
Sat Aug 10 15:04:30 UTC 2024


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

rdw pushed a commit to branch dev/IDP-2297
in repository java-idp-jetty-base.

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

commit c9bf0a272024f65153da1a2cb6303b137a8becd7
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jul 26 13:47:01 2024 +0100

    IDP-2297 Explore extending the Plugin and Module Infrastructure to allow Jetty installation
    
    https://shibboleth.atlassian.net/browse/IDP-2297
    
    Start to pluginify jetty base.  Create the plugin jar file and move jetty base
    into the jar file for future use by a module.  Names all subject to change
---
 jetty-base-impl/src/main/assembly/testbed.xml      |  22 --------
 jetty-base-impl/src/main/assembly/tgz.xml          |  15 -----
 jetty-base-impl/src/main/assembly/zip.xml          |  38 -------------
 .../idp/jettybase/plugin/JettyBasePlugin.java      |  31 +++++++++++
 .../idp/jettybase/plugin/package-info.java         |  17 ++++++
 .../resources/jetty-base/etc/idp-backchannel.xml   |  62 ---------------------
 .../lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar  | Bin 5503 -> 0 bytes
 .../module}/jetty-base/credentials/.gitkeep        |   0
 .../module}/jetty-base/etc/jetty-requestlog.xml    |   0
 .../idp/jettybase/module}/jetty-base/logs/.gitkeep |   0
 .../jettybase/module}/jetty-base/modules/idp.mod   |   0
 .../module}/jetty-base/resources/logback.xml       |   0
 .../module}/jetty-base/start.d/custom.ini          |   0
 .../jettybase/module}/jetty-base/start.d/idp.ini   |   0
 .../jettybase/module}/jetty-base/static/.gitkeep   |   0
 .../idp/jettybase/module}/jetty-base/tmp/.gitkeep  |   0
 .../jettybase/module}/jetty-base/webapps/idp.xml   |   0
 .../module}/jetty-base/webapps/static.xml          |   0
 jetty-base-impl/src/site/site.xml                  |  11 ----
 .../test/resources/jetty-base/etc/idp-testbed.xml  |  28 ----------
 .../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 ------
 23 files changed, 48 insertions(+), 242 deletions(-)

diff --git a/jetty-base-impl/src/main/assembly/testbed.xml b/jetty-base-impl/src/main/assembly/testbed.xml
deleted file mode 100644
index 5b3687e..0000000
--- a/jetty-base-impl/src/main/assembly/testbed.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-    <id>testbed</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <directory>${assemblyDirectory}</directory>
-            <excludes>
-                <exclude>**/webapps/idp.xml</exclude>
-            </excludes>
-            <outputDirectory></outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>${assemblyDirectory}-testbed</directory>
-            <outputDirectory></outputDirectory>
-        </fileSet>
-    </fileSets>
-    <includeBaseDirectory>false</includeBaseDirectory>
-</assembly>
diff --git a/jetty-base-impl/src/main/assembly/tgz.xml b/jetty-base-impl/src/main/assembly/tgz.xml
deleted file mode 100644
index 8763457..0000000
--- a/jetty-base-impl/src/main/assembly/tgz.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-    <id>tgz</id>
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <directory>${assemblyDirectory}</directory>
-            <outputDirectory></outputDirectory>
-        </fileSet>
-    </fileSets>
-    <includeBaseDirectory>false</includeBaseDirectory>
-</assembly>
diff --git a/jetty-base-impl/src/main/assembly/zip.xml b/jetty-base-impl/src/main/assembly/zip.xml
deleted file mode 100644
index c6a9413..0000000
--- a/jetty-base-impl/src/main/assembly/zip.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-    <id>zip</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <directory>${assemblyDirectory}</directory>
-            <outputDirectory></outputDirectory>
-            <excludes>
-                <exclude>**/*.bat*</exclude>
-                <exclude>**/*.config*</exclude>
-                <exclude>**/*.ini*</exclude>
-                <exclude>**/*.properties*</exclude>
-                <exclude>**/*.txt*</exclude>
-                <exclude>**/*.vm*</exclude>
-                <exclude>**/*.xml*</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>${assemblyDirectory}</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>**/*.bat*</include>
-                <include>**/*.config*</include>
-                <include>**/*.ini*</include>
-                <include>**/*.properties*</include>
-                <include>**/*.txt*</include>
-                <include>**/*.vm*</include>
-                <include>**/*.xml*</include>
-            </includes>
-            <lineEnding>windows</lineEnding>
-        </fileSet>
-    </fileSets>
-    <includeBaseDirectory>false</includeBaseDirectory>
-</assembly>
diff --git a/jetty-base-impl/src/main/java/net/shibboleth/idp/jettybase/plugin/JettyBasePlugin.java b/jetty-base-impl/src/main/java/net/shibboleth/idp/jettybase/plugin/JettyBasePlugin.java
new file mode 100644
index 0000000..83c7c2f
--- /dev/null
+++ b/jetty-base-impl/src/main/java/net/shibboleth/idp/jettybase/plugin/JettyBasePlugin.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.shibboleth.idp.jettybase.plugin;
+
+import java.io.IOException;
+
+import net.shibboleth.idp.plugin.impl.FirstPartyIdPPlugin;
+import net.shibboleth.profile.plugin.PluginException;
+
+/**Details about the Nashorn scripting plugin.  */
+public class JettyBasePlugin extends FirstPartyIdPPlugin {
+    /** Constructor.
+     * @throws PluginException from {@link FirstPartyIdPPlugin}
+     * @throws IOException from {@link FirstPartyIdPPlugin}
+     */
+    public JettyBasePlugin() throws PluginException, IOException {
+        super(JettyBasePlugin.class);
+    }
+}
diff --git a/jetty-base-impl/src/main/java/net/shibboleth/idp/jettybase/plugin/package-info.java b/jetty-base-impl/src/main/java/net/shibboleth/idp/jettybase/plugin/package-info.java
new file mode 100644
index 0000000..98d95de
--- /dev/null
+++ b/jetty-base-impl/src/main/java/net/shibboleth/idp/jettybase/plugin/package-info.java
@@ -0,0 +1,17 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** Classes for working with JSR-223 scripting environments. */
+
+package net.shibboleth.idp.jettybase.plugin;
diff --git a/jetty-base-impl/src/main/resources/jetty-base/etc/idp-backchannel.xml b/jetty-base-impl/src/main/resources/jetty-base/etc/idp-backchannel.xml
deleted file mode 100644
index e242ced..0000000
--- a/jetty-base-impl/src/main/resources/jetty-base/etc/idp-backchannel.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-  <!-- ============================================================= -->
-  <!-- TLS context factory with optional client auth                 -->
-  <!-- and no container trust (delegate to application)              -->
-  <!-- for backchannel (SOAP) communication to IdP                   -->
-  <!-- ============================================================= -->
-  <New id="shibContextFactory" class="net.shibboleth.utilities.jetty94.DelegateToApplicationSslContextFactory">
-    <Set name="KeyStorePath"><Property name="idp.backchannel.keyStorePath" default="credentials/idp-backchannel.p12" /></Set>
-    <Set name="KeyStoreType"><Property name="idp.backchannel.keyStoreType" default="PKCS12" /></Set>
-    <Set name="KeyStorePassword"><Property name="idp.backchannel.keyStorePassword" default="changeit" /></Set>
-    <Set name="EndpointIdentificationAlgorithm"></Set>
-    <Set name="renegotiationAllowed">false</Set>
-    <Set name="useCipherSuitesOrder">true</Set>
-  </New>
-
-  <New id="shibHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-    <Arg><Ref refid="httpConfig"/></Arg>
-    <Call name="addCustomizer">
-      <Arg>
-        <New class="org.eclipse.jetty.server.SecureRequestCustomizer">
-          <Arg type="boolean"><Property name="jetty.ssl.sniHostCheck" default="true"/></Arg>
-        </New>
-      </Arg>
-    </Call>
-  </New>
-
-  <!-- ============================================================= -->
-  <!-- IdP SOAP protocol connector                                   -->
-  <!-- ============================================================= -->
-  <Call id="shibConnector" name="addConnector">
-    <Arg>
-      <New class="org.eclipse.jetty.server.ServerConnector">
-        <Arg name="server"><Ref refid="Server" /></Arg>
-        <Arg name="acceptors" type="int"><Property name="jetty.ssl.acceptors" default="-1"/></Arg>
-        <Arg name="selectors" type="int"><Property name="jetty.ssl.selectors" default="-1"/></Arg>
-        <Arg name="factories">
-          <Array type="org.eclipse.jetty.server.ConnectionFactory">
-            <Item>
-              <New class="org.eclipse.jetty.server.SslConnectionFactory">
-                <Arg name="next">http/1.1</Arg>
-                <Arg name="sslContextFactory"><Ref refid="shibContextFactory"/></Arg>
-              </New>
-            </Item>
-            <Item>
-              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-                <Arg name="config"><Ref refid="shibHttpConfig"/></Arg>
-              </New>
-            </Item>
-          </Array>
-        </Arg>
-        <Set name="host"><Property name="jetty.ssl.host" default="0.0.0.0" /></Set>
-        <Set name="port"><Property name="idp.backchannel.port" default="8443" /></Set>
-        <Set name="idleTimeout"><Property name="jetty.ssl.timeout" default="30000"/></Set>
-        <Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta" default="0"/></Set>
-        <Set name="acceptQueueSize"><Property name="jetty.ssl.acceptQueueSize" default="0"/></Set>
-      </New>
-    </Arg>
-  </Call>
-
-</Configure>
diff --git a/jetty-base-impl/src/main/resources/jetty-base/lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar b/jetty-base-impl/src/main/resources/jetty-base/lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar
deleted file mode 100644
index bd7b281..0000000
Binary files a/jetty-base-impl/src/main/resources/jetty-base/lib/idp-backchannel/jetty94-dta-ssl-1.0.0.jar and /dev/null differ
diff --git a/jetty-base-impl/src/main/resources/jetty-base/credentials/.gitkeep b/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/credentials/.gitkeep
similarity index 100%
rename from jetty-base-impl/src/main/resources/jetty-base/credentials/.gitkeep
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/credentials/.gitkeep
diff --git a/jetty-base-impl/src/main/resources/jetty-base/etc/jetty-requestlog.xml b/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/etc/jetty-requestlog.xml
similarity index 100%
rename from jetty-base-impl/src/main/resources/jetty-base/etc/jetty-requestlog.xml
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/etc/jetty-requestlog.xml
diff --git a/jetty-base-impl/src/main/resources/jetty-base/logs/.gitkeep b/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/logs/.gitkeep
similarity index 100%
rename from jetty-base-impl/src/main/resources/jetty-base/logs/.gitkeep
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/logs/.gitkeep
diff --git a/jetty-base-impl/src/main/resources/jetty-base/modules/idp.mod b/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/modules/idp.mod
similarity index 100%
rename from jetty-base-impl/src/main/resources/jetty-base/modules/idp.mod
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/modules/idp.mod
diff --git a/jetty-base-impl/src/main/resources/jetty-base/resources/logback.xml b/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/resources/logback.xml
similarity index 100%
rename from jetty-base-impl/src/main/resources/jetty-base/resources/logback.xml
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/resources/logback.xml
diff --git a/jetty-base-impl/src/main/resources/jetty-base/start.d/custom.ini b/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/start.d/custom.ini
similarity index 100%
rename from jetty-base-impl/src/main/resources/jetty-base/start.d/custom.ini
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/start.d/custom.ini
diff --git a/jetty-base-impl/src/main/resources/jetty-base/start.d/idp.ini b/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/start.d/idp.ini
similarity index 100%
rename from jetty-base-impl/src/main/resources/jetty-base/start.d/idp.ini
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/start.d/idp.ini
diff --git a/jetty-base-impl/src/main/resources/jetty-base/static/.gitkeep b/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/static/.gitkeep
similarity index 100%
rename from jetty-base-impl/src/main/resources/jetty-base/static/.gitkeep
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/static/.gitkeep
diff --git a/jetty-base-impl/src/main/resources/jetty-base/tmp/.gitkeep b/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/tmp/.gitkeep
similarity index 100%
rename from jetty-base-impl/src/main/resources/jetty-base/tmp/.gitkeep
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/tmp/.gitkeep
diff --git a/jetty-base-impl/src/main/resources/jetty-base/webapps/idp.xml b/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/webapps/idp.xml
similarity index 100%
rename from jetty-base-impl/src/main/resources/jetty-base/webapps/idp.xml
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/webapps/idp.xml
diff --git a/jetty-base-impl/src/main/resources/jetty-base/webapps/static.xml b/jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/webapps/static.xml
similarity index 100%
rename from jetty-base-impl/src/main/resources/jetty-base/webapps/static.xml
rename to jetty-base-impl/src/main/resources/net/shibboleth/idp/jettybase/module/jetty-base/webapps/static.xml
diff --git a/jetty-base-impl/src/site/site.xml b/jetty-base-impl/src/site/site.xml
deleted file mode 100644
index 8068292..0000000
--- a/jetty-base-impl/src/site/site.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd">
-
-    <publishDate position="navigation-bottom" />
-
-    <body>
-        <menu ref="reports" />
-    </body>
-
-</project>
\ No newline at end of file
diff --git a/jetty-base-impl/src/test/resources/jetty-base/etc/idp-testbed.xml b/jetty-base-impl/src/test/resources/jetty-base/etc/idp-testbed.xml
deleted file mode 100644
index 076d4cc..0000000
--- a/jetty-base-impl/src/test/resources/jetty-base/etc/idp-testbed.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.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"><Property name="jetty.base" />/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/jetty-base-impl/src/test/resources/jetty-base/etc/web-override.xml b/jetty-base-impl/src/test/resources/jetty-base/etc/web-override.xml
deleted file mode 100644
index b2be1f8..0000000
--- a/jetty-base-impl/src/test/resources/jetty-base/etc/web-override.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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/jetty-base-impl/src/test/resources/jetty-base/modules/idp-testbed.mod b/jetty-base-impl/src/test/resources/jetty-base/modules/idp-testbed.mod
deleted file mode 100644
index 6f42ae5..0000000
--- a/jetty-base-impl/src/test/resources/jetty-base/modules/idp-testbed.mod
+++ /dev/null
@@ -1,13 +0,0 @@
-[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/jetty-base-impl/src/test/resources/jetty-base/webapps/idp.xml b/jetty-base-impl/src/test/resources/jetty-base/webapps/idp.xml
deleted file mode 100644
index d7c2fd8..0000000
--- a/jetty-base-impl/src/test/resources/jetty-base/webapps/idp.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.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"><Property name="jetty.base" />/lib/idp-testbed/idp-testbed-classes.jar</Set>
-</Configure>

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


More information about the commits mailing list