[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/global-user.xml conf/ipaddress-authn-conf...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Nov 11 18:16:40 2013
New Revision: 4944

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4944&view=rev
Log:
Remove classpath dependency

Modified:
    trunk/idp-conf/src/main/resources/conf/global-user.xml
    trunk/idp-conf/src/main/resources/conf/ipaddress-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/jaas-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/global-user.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global-user.xml?rev=4944&r1=4943&r2=4944&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global-user.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global-user.xml Mon Nov 11 18:16:40 2013
@@ -12,7 +12,7 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <context:property-placeholder location="classpath:conf/idp.properties" />
+    <context:property-placeholder location="file://${idp.home}/conf/idp.properties" />
 
     <import resource="authn-comparison.xml" />
     <import resource="authn-flow-descriptors.xml" />

Modified: trunk/idp-conf/src/main/resources/conf/ipaddress-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/ipaddress-authn-config.xml?rev=4944&r1=4943&r2=4944&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ipaddress-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/ipaddress-authn-config.xml Mon Nov 11 18:16:40 2013
@@ -8,7 +8,6 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.2.xsd
                            http://www.springframework.org/schema/context classpath:/org/springframework/context/config/spring-context-3.2.xsd
                            http://www.springframework.org/schema/util classpath:/org/springframework/beans/factory/xml/spring-util-3.2.xsd">
-
 
 
     <!-- Simple transforms to apply to address before validation. -->

Modified: trunk/idp-conf/src/main/resources/conf/jaas-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/jaas-authn-config.xml?rev=4944&r1=4943&r2=4944&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/jaas-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/jaas-authn-config.xml Mon Nov 11 18:16:40 2013
@@ -12,7 +12,7 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
        
-    <context:property-placeholder location="classpath:conf/idp.properties" />
+    <context:property-placeholder location="file://${idp.home}/conf/idp.properties" />
     
     <!-- Specify your JAAS config. -->
     <bean id="JAASConfig" class="org.springframework.core.io.FileSystemResource" c:path="${idp.home}/conf/jaas.config" />

Modified: trunk/idp-conf/src/main/resources/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/webflow-config.xml?rev=4944&r1=4943&r2=4944&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/webflow-config.xml Mon Nov 11 18:16:40 2013
@@ -6,7 +6,7 @@
                            http://www.springframework.org/schema/context classpath:/org/springframework/context/config/spring-context-3.2.xsd
                            http://www.springframework.org/schema/webflow-config classpath:/org/springframework/webflow/config/spring-webflow-config-2.3.xsd">
     
-    <context:property-placeholder location="classpath:conf/idp.properties" />
+    <context:property-placeholder location="file://${idp.home}/conf/idp.properties" />
     
     <!-- Define custom flows, or override system flows, inside here. -->
     <webflow:flow-registry id="flowRegistry" parent="systemFlowRegistry" base-path="file://${idp.home}/flows" flow-builder-services="flowBuilderServices">

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=4944&r1=4943&r2=4944&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Mon Nov 11 18:16:40 2013
@@ -12,7 +12,7 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 

[... 21 lines stripped ...]