[java-idp-testbed COMMIT] /trunk/src/main/java/Main.java

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Jun 11 14:37:44 2014
New Revision: 265

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=265&view=rev
Log:
Fix "jetty.keystore.path" for the testbed's embedded Jetty after removing references to the 'idp.home' system property from Jetty configuration files in lieu of paths relative to ${jetty.base}.

Modified:
    trunk/src/main/java/Main.java

Modified: trunk/src/main/java/Main.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/java/Main.java?rev=265&r1=264&r2=265&view=diff
==============================================================================
--- trunk/src/main/java/Main.java (original)
+++ trunk/src/main/java/Main.java Wed Jun 11 14:37:44 2014
@@ -73,6 +73,13 @@
                 configuration.getProperties().put(key, properties.getProperty(key));
             }
 
+            // The keystore path defined in jetty-base/start.d/idp.ini is relative to jetty.base, which is not correct
+            // for the testbed. So replace "../" with "${idp.home}/".
+            final String idpIniJettyKeystorePath = configuration.getProperties().get("jetty.keystore.path");
+            final String testbedJettyKeystorePath =
+                    idpIniJettyKeystorePath.replace("../", System.getProperty(PathPropertySupport.IDP_HOME) + "/");
+            configuration.getProperties().put("jetty.keystore.path", testbedJettyKeystorePath);
+
             // Configure the Jetty server (with both the XML and properties file configurations).
             final Server server = (Server) configuration.configure();