[picketlink-commits] Picketlink SVN: r1353 - product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp.
Author: anil.saldhana(a)jboss.com
Date: 2012-01-31 16:42:28 -0500 (Tue, 31 Jan 2012)
New Revision: 1353
Modified:
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java
Log:
merge in r1326
Property changes on:
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp
___________________________________________________________________
Added: svn:mergeinfo
+
/federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp:1326
Modified:
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java
===================================================================
---
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2012-01-31
21:38:41 UTC (rev 1352)
+++
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2012-01-31
21:42:28 UTC (rev 1353)
@@ -1123,9 +1123,9 @@
log.info("Did not find picketlink-sts.xml. We will install default
configuration");
sts.installDefaultConfiguration();
}
- else
- sts.installDefaultConfiguration(configPath);
-
+ else
+ sts.installDefaultConfiguration(stsTokenConfigFile.toURI().toString());
+
if (this.signOutgoingMessages)
{
KeyProviderType keyProvider = this.idpConfiguration.getKeyProvider();