[java-identity-provider COMMIT] /trunk/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationConte...

[noreply at shibboleth.net]

Author: tzeller
Date: Sat Dec 19 02:06:29 2015
New Revision: 8055

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8055&view=rev
Log:
IDP-815 - On Windows, idp.home must use slashes instead of backslashes

Apply r8047 from 3.2 branch to trunk.

Modified:
    trunk/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationContextInitializer.java

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationContextInitializer.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationContextInitializer.java?rev=8055&r1=8054&r2=8055&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationContextInitializer.java	(original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationContextInitializer.java	Sat Dec 19 02:06:29 2015
@@ -17,6 +17,7 @@
 
 package net.shibboleth.idp.spring;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.Properties;
@@ -108,7 +109,12 @@
                 if ("classpath:".equals(searchLocation) || (resource instanceof ClassPathResource)) {
                     setIdPHomeProperty(searchLocation, properties);
                 } else {
-                    final String searchLocationAbsolutePath = Paths.get(searchLocation).toAbsolutePath().toString();
+                    String searchLocationAbsolutePath = Paths.get(searchLocation).toAbsolutePath().toString();
+                    // Minimal normalization required on Windows to allow SWF's flow machinery to work.
+                    // Just replace backslashes with forward slashes.
+                    if (File.separatorChar == '\\') {
+                        searchLocationAbsolutePath = searchLocationAbsolutePath.replace('\\', '/');
+                    }
                     setIdPHomeProperty(searchLocationAbsolutePath, properties);
                 }