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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep 23 14:58:10 2014
New Revision: 285

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=285&view=rev
Log:
Add logic for second Jetty keystore property.

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=285&r1=284&r2=285&view=diff
==============================================================================
--- trunk/src/main/java/Main.java (original)
+++ trunk/src/main/java/Main.java Tue Sep 23 14:58:10 2014
@@ -66,16 +66,21 @@
                 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
+            // The keystore paths defined in jetty-base/start.d/idp.ini is relative to jetty.base, which is not correct
             // for the testbed. So replace "../" with path to idp-conf/src/test/resources
             final Path pathToIdPConfTestResources =
                     Paths.get(Paths.get("").toAbsolutePath().getParent().toAbsolutePath().toString(),
                             "java-identity-provider", "idp-conf", "src", "test", "resources");
-            final String idpIniJettyKeystorePath = configuration.getProperties().get("jetty.backchannel.keystore.path");
-            final String testbedJettyKeystorePath =
-                    idpIniJettyKeystorePath
+            final String idpIniJettyBackchannelKeystorePath = configuration.getProperties().get("jetty.backchannel.keystore.path");
+            final String testbedJettyBackchannelKeystorePath =
+                    idpIniJettyBackchannelKeystorePath
                             .replace("../", pathToIdPConfTestResources.toAbsolutePath().toString() + "/");
-            configuration.getProperties().put("jetty.backchannel.keystore.path", testbedJettyKeystorePath);
+            configuration.getProperties().put("jetty.backchannel.keystore.path", testbedJettyBackchannelKeystorePath);
+            final String idpIniJettyBrowserKeystorePath = configuration.getProperties().get("jetty.browser.keystore.path");
+            final String testbedJettyBrowserKeystorePath =
+                    idpIniJettyBrowserKeystorePath
+                            .replace("../", pathToIdPConfTestResources.toAbsolutePath().toString() + "/");
+            configuration.getProperties().put("jetty.browser.keystore.path", testbedJettyBrowserKeystorePath);
 
             // Configure the Jetty server (with both the XML and properties file configurations).
             final Server server = (Server) configuration.configure();