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

[noreply at shibboleth.net]

Author: tzeller
Date: Fri Dec 19 15:31:50 2014
New Revision: 7183

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7183&view=rev
Log:
IDP-473 and IDP-478 Remove all default search locations for '/conf/idp.properties' besides '/opt/shibboleth-idp'.

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=7183&r1=7182&r2=7183&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 Fri Dec 19 15:31:50 2014
@@ -58,8 +58,10 @@
     @Nonnull public static final String IDP_PROPERTIES = "/conf/idp.properties";
 
     /** Well known search locations. */
-    @Nonnull public static final String[] SEARCH_LOCATIONS = {System.getProperty("idp.home", "."),
-            System.getProperty("user.dir") + "/shibboleth-idp", "/opt/shibboleth-idp", "..", "classpath:",};
+    @Nonnull public static final String[] SEARCH_LOCATIONS =
+        {
+            System.getProperty("idp.home", "/opt/shibboleth-idp"),
+        };
 
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(IdPPropertiesApplicationContextInitializer.class);