[java-idp-plugin-jetty] branch main updated: Create jetty temp file in the correct place Also add comments about creating it

[Rod Widdowson]

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=ee25747b6e6876231db58bc81f339b1e5247071b

The following commit(s) were added to refs/heads/main by this push:
     new ee25747  Create jetty temp file in the correct place Also add comments about creating it
ee25747 is described below

commit ee25747b6e6876231db58bc81f339b1e5247071b
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Sep 8 16:33:19 2025 +0100

    Create jetty temp file in the correct place
    Also add comments about creating it
---
 jetty-impl/pom.xml                                                   | 2 ++
 .../src/main/java/net/shibboleth/idp/module/jetty/JettyModule.java   | 2 +-
 .../main/resources/net/shibboleth/idp/module/jetty/module.properties | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/jetty-impl/pom.xml b/jetty-impl/pom.xml
index 341f7bb..18f26ac 100644
--- a/jetty-impl/pom.xml
+++ b/jetty-impl/pom.xml
@@ -89,6 +89,8 @@
                                     </fileMappers>
                                 </artifactItem>
                                 <!-- How to do a different jetty-base version
+                                     Also: Add files to n.s.i.module.jetty/module.properties
+                                           Create Directory in .s.i.module.jetty/JettyModule.java
                                 <artifactItem>
                                     <groupId>net.shibboleth.idp</groupId>
                                     <artifactId>idp-jetty-base</artifactId>
diff --git a/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettyModule.java b/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettyModule.java
index 426444f..299f736 100644
--- a/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettyModule.java
+++ b/jetty-impl/src/main/java/net/shibboleth/idp/module/jetty/JettyModule.java
@@ -49,7 +49,7 @@ public class JettyModule extends PluginIdPModule {
     public Map<ModuleResource, ResourceResult> enable(@Nonnull ModuleContext moduleContext) throws ModuleException {
         final Map<ModuleResource, ResourceResult> result = super.enable(moduleContext);
         final Path idpHome = Path.of(moduleContext.getInstallLocation());
-        final Path jettyBase = idpHome.resolve("jetty-base");
+        final Path jettyBase = idpHome.resolve("jetty-base-12");
         log.debug("Creating directories (if needed): '{}' '{}'\n", jettyBase.resolve("tmp"));
         try {
             Files.createDirectories(jettyBase.resolve("tmp"));
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 dcc3eea..1cf096e 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
@@ -9,6 +9,11 @@ jetty.plugin = net.shibboleth.idp.plugin.jetty
 jetty.module.name = Jetty Base Module
 jetty.module.desc = Configures jetty  
 
+#
+# NOTE.
+# If adding other jetty-base-versions remember to create the temp file
+# in net.shibboleth.idp.module.jetty.JettyModule
+#
 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
 

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