[java-idp-jetty-base] branch 12 updated: Fix some overzealous tidy

Rod Widdowson rdw at steadingsoftware.com
Wed Oct 30 14:20:42 UTC 2024


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

rdw pushed a commit to branch 12
in repository java-idp-jetty-base.

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

The following commit(s) were added to refs/heads/12 by this push:
     new aaad18b  Fix some overzealous tidy
aaad18b is described below

commit aaad18bd446286911b6715925e9338de7e77306a
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Oct 30 14:20:37 2024 +0000

    Fix some overzealous tidy
---
 .../java/net/shibboleth/idp/module/jetty/JettyModule.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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 7ae119d..6d2ae50 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
@@ -64,6 +64,21 @@ public class JettyModule extends PluginIdPModule {
         if (!Files.exists(keystore)) {
             generateKeystore(keystore);
         }
+        if (SystemUtils.IS_OS_WINDOWS) {
+            final File jettyHelper = idpHome.resolve("jetty-base").resolve("jetty.base.linux").toFile();
+            if (!jettyHelper.exists()) {
+                try {
+                    final String idpHomeString = idpHome.toFile().getCanonicalPath().replace('\\', '/');
+                    try (final PrintStream stream = new PrintStream(jettyHelper)) {
+                        stream.printf("%s\n", idpHomeString);
+                    }
+                }
+                catch (IOException e) {
+                    log.error("Could not write jetty-base/jetty.base.linux", e);
+                    throw new ModuleException("Could not write jetty-base/jetty.base.linux", e);
+                }
+            }
+        }
         return result;
     }
 

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


More information about the commits mailing list