[java-idp-jetty-base] 01/01: Refresh the testbed branch based on the remodeled 12.1 layout.
Codeberg
noreply at shibboleth.net
Tue Dec 16 21:17:31 UTC 2025
This is an automated email from the git hooks/post-receive script.
codeberg pushed a commit to branch 12.1-testbed-eclipse
in repository java-idp-jetty-base.
View the commit online:
https://codeberg.org/Shibboleth/java-idp-jetty-base/commit/7f2493640b6b591436be7c9b487d3a2957091fba
commit 7f2493640b6b591436be7c9b487d3a2957091fba
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Dec 16 16:17:19 2025 -0500
Refresh the testbed branch based on the remodeled 12.1 layout.
---
.../jetty-base/credentials/idp-userfacing.p12 | Bin 0 -> 3459 bytes
.../jetty/jetty-base/etc/idp-backchannel.xml | 62 ---------------------
.../module/jetty/jetty-base/etc/web-override.xml | 37 ++++++++++++
.../module/jetty/jetty-base/start.d/logback.ini | 2 +
.../module/jetty/jetty-base/start.d/shibboleth.ini | 4 +-
.../idp/module/jetty/jetty-base/webapps/idp.xml | 3 +-
.../idp/module/jetty/jetty-base/webapps/static.xml | 28 ----------
.../module/jetty/jetty-base/webapps/testbed.xml | 9 +++
8 files changed, 52 insertions(+), 93 deletions(-)
diff --git a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/credentials/idp-userfacing.p12 b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/credentials/idp-userfacing.p12
new file mode 100644
index 0000000..49aaa30
Binary files /dev/null and b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/credentials/idp-userfacing.p12 differ
diff --git a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/etc/idp-backchannel.xml b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/etc/idp-backchannel.xml
deleted file mode 100644
index e242ced..0000000
--- a/src/main/resources/net/shibboleth/idp/module/jetty/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/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/etc/web-override.xml b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/etc/web-override.xml
new file mode 100644
index 0000000..3a16bc1
--- /dev/null
+++ b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/etc/web-override.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd" version="6.1">
+
+ <!--
+ 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/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/logback.ini b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/logback.ini
index 463b146..27c5a5d 100644
--- a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/logback.ini
+++ b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/logback.ini
@@ -2,3 +2,5 @@
# Do not add it to the module in jetty-base-plugin
--module=logging-logback
+
+logback.version=1.5.6
diff --git a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/shibboleth.ini b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/shibboleth.ini
index bb79304..624ab18 100644
--- a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/shibboleth.ini
+++ b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/start.d/shibboleth.ini
@@ -26,8 +26,8 @@ jetty.http.host=127.0.0.1
######################################
# Keystore file path (relative to $jetty.base)
-jetty.sslContext.keyStorePath=../credentials/idp-userfacing.p12
-jetty.sslContext.trustStorePath=../credentials/idp-userfacing.p12
+jetty.sslContext.keyStorePath=credentials/idp-userfacing.p12
+jetty.sslContext.trustStorePath=credentials/idp-userfacing.p12
# Keystore type
#jetty.sslContext.keyStoreType=PKCS12
#jetty.sslContext.trustStoreType=PKCS12
diff --git a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/webapps/idp.xml b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/webapps/idp.xml
index 2e9ee16..78af2b8 100644
--- a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/webapps/idp.xml
+++ b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/webapps/idp.xml
@@ -4,9 +4,10 @@
<!-- Configure the Shibboleth IdP webapp -->
<!-- =============================================================== flibby-->
<Configure class="org.eclipse.jetty.ee11.webapp.WebAppContext">
- <Set name="war"><SystemProperty name="idp.home" default="/opt/shibboleth-idp" />/war/idp.war</Set>
+ <Set name="war">../../../../../../../../../../java-identity-provider/idp-war/src/main/webapp</Set>
<Set name="contextPath"><SystemProperty name="idp.context.path" default="/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>
</Configure>
diff --git a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/webapps/static.xml b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/webapps/static.xml
deleted file mode 100644
index 7841c5f..0000000
--- a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/webapps/static.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
-<!-- =============================================================== -->
-<!-- Configure static content delivery -->
-<!-- =============================================================== -->
-<Configure class="org.eclipse.jetty.server.handler.ContextHandler">
- <Set name="contextPath">/</Set>
- <Set name="handler">
- <New class="org.eclipse.jetty.server.handler.ResourceHandler">
- <Set name="baseResourceAsString"><SystemProperty name="idp.home"/>/static</Set>
- <Set name="dirAllowed">false</Set>
- <Set name="precompressedFormats">
- <Array id="ccfList" type="org.eclipse.jetty.http.CompressedContentFormat">
- <Item>
- <New class="org.eclipse.jetty.http.CompressedContentFormat">
- <Arg type="String">br</Arg><Arg type="String">.br</Arg>
- </New>
- </Item>
- <Item>
- <New class="org.eclipse.jetty.http.CompressedContentFormat">
- <Arg type="String">gzip</Arg><Arg type="String">.gz</Arg>
- </New>
- </Item>
- </Array>
- </Set>
- </New>
- </Set>
-</Configure>
diff --git a/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/webapps/testbed.xml b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/webapps/testbed.xml
new file mode 100644
index 0000000..12d502e
--- /dev/null
+++ b/src/main/resources/net/shibboleth/idp/module/jetty/jetty-base/webapps/testbed.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
+<Configure class="org.eclipse.jetty.ee11.webapp.WebAppContext">
+ <Set name="war">../../../../../../../../../../java-idp-testbed/src/main/webapp</Set>
+ <Set name="contextPath">/</Set>
+ <Set name="extractWAR">false</Set>
+ <Set name="copyWebDir">false</Set>
+ <Set name="copyWebInf">true</Set>
+</Configure>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list