[java-idp-integration-tests] 02/03: Update helper script to start Jetty

[Tom Zeller]

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

tzeller pushed a commit to branch main
in repository java-idp-integration-tests.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-integration-tests.git;a=commit;h=4080f69a166f4e3062ad6d540072d0b18ced793e

commit 4080f69a166f4e3062ad6d540072d0b18ced793e
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Sat Sep 14 12:17:17 2024 -0500

    Update helper script to start Jetty
    
    Set jetty.base instead of JETTY_BASE environment variable
---
 .../tests/util/server/JettyServerProcess.java         | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/test/java/net/shibboleth/idp/integration/tests/util/server/JettyServerProcess.java b/src/test/java/net/shibboleth/idp/integration/tests/util/server/JettyServerProcess.java
index 34597f4..ec92609 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/util/server/JettyServerProcess.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/util/server/JettyServerProcess.java
@@ -45,21 +45,28 @@ public class JettyServerProcess extends AbstractServerProcess {
     /** Passphrase to use to shutdown Jetty. Defaults to SHUTDOWN. */
     @Nonnull private String shutdownKey = "SHUTDOWN";
 
-    /** {@inheritDoc} */
+    /**
+     * Set up commands to start Jetty using start.jar.
+     * 
+     * Prefer Java located at idp.java.home system property, otherwise java.home.
+     * 
+     * Add jetty.base variable for start.sh helper script.
+     * 
+     * Set STOP.KEY and STOP.PORT.
+     * 
+     * {@inheritDoc}
+     */
     @Override
     protected void doInitialize() throws ComponentInitializationException {
         super.doInitialize();
 
-        // Add JETTY_BASE to environment
-        getProcessBuilder().environment().put("JETTY_BASE", getServletContainerBasePath().toAbsolutePath().toString());
-
-        // Start Jetty via start.jar
-        // Prefer Java located at idp.java.home system property
         final Path pathToJava = Paths.get(System.getProperty("idp.java.home", System.getProperty("java.home")), "bin", "java");
         log.debug("Will use Java located at '{}'", pathToJava);
+
         getCommands().add(pathToJava.toAbsolutePath().toString());
         getCommands().add("-jar");
         getCommands().add(getServletContainerHomePath().toAbsolutePath().toString() + "/start.jar");
+        getCommands().add("jetty.base=" + getServletContainerBasePath().toAbsolutePath().toString());
         getCommands().add("STOP.KEY=" + shutdownKey);
         getCommands().add("STOP.PORT=" + Integer.toString(getShutdownPort()));
     }

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