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

[noreply at shibboleth.net]

Author: scantor
Date: Mon May 18 16:11:17 2015
New Revision: 304

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=304&view=rev
Log:
Get container level JAAS working in testbed.

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=304&r1=303&r2=304&view=diff
==============================================================================
--- trunk/src/main/java/Main.java	(original)
+++ trunk/src/main/java/Main.java	Mon May 18 16:11:17 2015
@@ -105,8 +105,11 @@
             idpWebapp.setContextPath("/idp");
             idpWebapp.setWar(idpWebappPath.toString());
             
-            System.setProperty("java.security.auth.login.config",
-                    System.getProperty(PathPropertySupport.IDP_HOME) + "/" + properties.getProperty("jetty.jaas.path"));
+            final String idpJaasConfigPath = configuration.getProperties().get("jetty.jaas.path");
+            final String testbedJaasConfigPath = pathToIdPConfTestResources.toAbsolutePath().toString()
+                    + "/" + idpJaasConfigPath;
+            System.setProperty("java.security.auth.login.config", testbedJaasConfigPath);
+            
             final JAASLoginService jaasLogin = new JAASLoginService();
             jaasLogin.setName("Web Login Service");
             jaasLogin.setLoginModuleName("ShibUserPassAuth");