[java-idp-plugin-jetty] 05/05: JJETTY-24 Changes for Jetty-Base 12.1
Rod Widdowson
rdw at steadingsoftware.com
Wed Oct 22 15:05:13 UTC 2025
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-idp-plugin-jetty.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-jetty.git;a=commit;h=3ddc7a534202b664c5e5214c97b678072afda3da
commit 3ddc7a534202b664c5e5214c97b678072afda3da
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Oct 22 15:48:46 2025 +0100
JJETTY-24 Changes for Jetty-Base 12.1
https://shibboleth.atlassian.net/browse/JJETTY-24
Two new modules. One to deploy sp.ini one to deploy idp.ini
---
.../idp/module/jetty/JettyIdPModule.java | 34 ++++++++++++++++++
.../shibboleth/idp/module/jetty/JettySPModule.java | 34 ++++++++++++++++++
.../services/net.shibboleth.idp.module.IdPModule | 4 ++-
.../shibboleth/idp/module/jetty/module.properties | 41 ++++++++++++++++++++--
4 files changed, 110 insertions(+), 3 deletions(-)
diff --git a/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettyIdPModule.java b/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettyIdPModule.java
new file mode 100644
index 0000000..c1cd1b4
--- /dev/null
+++ b/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettyIdPModule.java
@@ -0,0 +1,34 @@
+/*
+ * 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.module.jetty;
+
+import java.io.IOException;
+
+import net.shibboleth.idp.Version;
+import net.shibboleth.idp.module.impl.PluginIdPModule;
+import net.shibboleth.profile.module.ModuleException;
+
+/**
+ * Module to create start.d/idp.ini
+ */
+public class JettyIdPModule extends PluginIdPModule {
+
+ /**
+ * Constructor.
+ */
+ public JettyIdPModule() throws IOException, ModuleException {
+ super(Version.getVersion(), JettyIdPModule.class);
+ }
+
+}
diff --git a/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettySPModule.java b/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettySPModule.java
new file mode 100644
index 0000000..878d0c8
--- /dev/null
+++ b/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettySPModule.java
@@ -0,0 +1,34 @@
+/*
+ * 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.module.jetty;
+
+import java.io.IOException;
+
+import net.shibboleth.idp.Version;
+import net.shibboleth.idp.module.impl.PluginIdPModule;
+import net.shibboleth.profile.module.ModuleException;
+
+/**
+ * Module to create start.d/sp.ini
+ */
+public class JettySPModule extends PluginIdPModule {
+
+ /**
+ * Constructor.
+ */
+ public JettySPModule() throws IOException, ModuleException {
+ super(Version.getVersion(), JettySPModule.class);
+ }
+
+}
diff --git a/jetty-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule b/jetty-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
index 3314621..2a2a37e 100644
--- a/jetty-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
+++ b/jetty-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
@@ -1 +1,3 @@
-net.shibboleth.idp.module.jetty.JettyModule
\ No newline at end of file
+net.shibboleth.idp.module.jetty.JettyModule
+net.shibboleth.idp.module.jetty.JettyIdPModule
+net.shibboleth.idp.module.jetty.JettySPModule
diff --git a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/module.properties b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/module.properties
index 6de28bd..0fe3276 100644
--- a/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/module.properties
+++ b/jetty-impl/src/main/resources/net/shibboleth/idp/module/jetty/module.properties
@@ -2,12 +2,14 @@
# Class to Module ID mappings
net.shibboleth.idp.module.jetty.JettyModule = jetty.module
+net.shibboleth.idp.module.jetty.JettyIdPModule = jetty.idp.module
+net.shibboleth.idp.module.jetty.JettySPModule = jetty.sp.module
# Module Owner
-jetty.plugin = net.shibboleth.idp.plugin.jetty
+jetty.module.plugin = net.shibboleth.idp.plugin.jetty
jetty.module.name = Jetty Base Module
-jetty.module.desc = Configures jetty
+jetty.module.desc = Base configuration for Jetty
jetty.module.1.src = /net/shibboleth/idp/module/jetty/jetty-base-12/etc/jetty-requestlog.xml
jetty.module.1.dest = jetty-base-12/etc/jetty-requestlog.xml
@@ -98,3 +100,38 @@ jetty.module.18.replace = true
jetty.module.19.src = /net/shibboleth/idp/module/jetty/jetty-base-download-keystore.gpg
jetty.module.19.dest = credentials/jetty-base-download-keystore.gpg
jetty.module.19.replace = false
+
+#
+# Specific IdP module
+#
+jetty.idp.module.name = Jetty Base IdP Module
+jetty.idp.module.desc = Configures Jetty to run as the IdP
+
+
+jetty.idp.module.1.src = /net/shibboleth/idp/module/jetty/jetty-base-12/start.d/idp.ini
+jetty.idp.module.1.dest = jetty-base-12/start.d/idp.ini
+jetty.idp.module.1.replace = false
+
+#
+# Specific IdP module
+#
+jetty.idp.module.plugin = net.shibboleth.idp.plugin.jetty
+jetty.idp.module.name = Jetty Base IdP Module
+jetty.idp.module.desc = Configures Jetty to run the IdP
+
+
+jetty.idp.module.1.src = /net/shibboleth/idp/module/jetty/jetty-base-12/start.d/idp.ini
+jetty.idp.module.1.dest = jetty-base-12/start.d/idp.ini
+jetty.idp.module.1.replace = false
+
+#
+# Specific SP module
+#
+jetty.sp.module.plugin = net.shibboleth.idp.plugin.jetty
+jetty.sp.module.name = Jetty Base SP Module
+jetty.sp.module.desc = Configures Jetty to run the SP Hub
+
+
+jetty.sp.module.1.src = /net/shibboleth/idp/module/jetty/jetty-base-12/start.d/sp.ini
+jetty.sp.module.1.dest = jetty-base-12/start.d/sp.ini
+jetty.sp.module.1.replace = false
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list