[java-idp-integration-tests] branch master updated: Fix setting idp.home system property when starting forked Jetty

[Tom Zeller]

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

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

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

The following commit(s) were added to refs/heads/master by this push:
       new  0459caf   Fix setting idp.home system property when starting forked Jetty
0459caf is described below

commit 0459caf57b895d91ba9d03da4a84837c028388ad
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Thu Aug 17 21:48:07 2017 -0500

    Fix setting idp.home system property when starting forked Jetty
    
    Jetty 9.3 and 9.4 do not propagate/recognize system properties set on
    the command line before `-jar start.jar`, only afterward.
    
    Move setting idp.home as a system property to BaseIntegrationTest so
    that it can be overridden if need be.
    
    The tests only work right now because we don't fork Jetty.
---
 src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java | 1 +
 src/test/java/net/shibboleth/idp/test/JettyServerProcess.java  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
index a872d82..fc8a1d9 100644
--- a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
@@ -769,6 +769,7 @@ public abstract class BaseIntegrationTest
      */
     public void startJettyServer() throws ComponentInitializationException {
 
+        serverCommands.add(0, "-Didp.home=" + System.getProperty("idp.home"));
         serverCommands.add("-Djava.io.tmpdir=" + pathToJettyBase.resolve("tmp").toAbsolutePath());
 
         server = new JettyServerProcess();
diff --git a/src/test/java/net/shibboleth/idp/test/JettyServerProcess.java b/src/test/java/net/shibboleth/idp/test/JettyServerProcess.java
index c88a986..1dbb46f 100644
--- a/src/test/java/net/shibboleth/idp/test/JettyServerProcess.java
+++ b/src/test/java/net/shibboleth/idp/test/JettyServerProcess.java
@@ -36,7 +36,6 @@ public class JettyServerProcess extends AbstractServerProcess {
         // Start Jetty via start.jar
         final Path pathToJava = Paths.get(System.getProperty("java.home"), "bin", "java");
         getCommands().add(pathToJava.toAbsolutePath().toString());
-        getCommands().add("-Didp.home=" + System.getProperty("idp.home"));
         getCommands().add("-jar");
         getCommands().add(getServletContainerHomePath().toAbsolutePath().toString() + "/start.jar");
     }

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