[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/services.xml idp-conf/src/main/resources/...

[noreply at shibboleth.net]

Author: tzeller
Date: Sun Jun 22 02:54:31 2014
New Revision: 6147

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6147&view=rev
Log:
Remove the "file:" scheme from resource locations.

Modified:
    trunk/idp-conf/src/main/resources/conf/services.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-war/src/main/webapp/WEB-INF/web.xml

Modified: trunk/idp-conf/src/main/resources/conf/services.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/services.xml?rev=6147&r1=6146&r2=6147&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/services.xml Sun Jun 22 02:54:31 2014
@@ -60,38 +60,38 @@
     -->
 
     <util:list id="shibboleth.RelyingPartyResolverResources">
-        <value>file:///${idp.home}/conf/relying-party.xml</value>
-        <value>file:///${idp.home}/conf/credentials.xml</value>
-        <value>file:///${idp.home}/system/conf/relying-party-system.xml</value>
+        <value>${idp.home}/conf/relying-party.xml</value>
+        <value>${idp.home}/conf/credentials.xml</value>
+        <value>${idp.home}/system/conf/relying-party-system.xml</value>
     </util:list>
 
     <!-- Use this set of resources (the first one suitably modified) to load a legacy 2.x file. -->
     <!--
     <util:list id="shibboleth.RelyingPartyResolverResources">
-        <value>file:///${idp.home}/conf/relying-party-legacy.xml</value>
-        <value>file:///${idp.home}/conf/property-placeholder.xml</value>
-        <value>file:///${idp.home}/system/conf/profile-defaults.xml</value>
+        <value>${idp.home}/conf/relying-party-legacy.xml</value>
+        <value>${idp.home}/conf/property-placeholder.xml</value>
+        <value>${idp.home}/system/conf/profile-defaults.xml</value>
     </util:list>
     -->
 
     <util:list id="shibboleth.MetadataResolverResources">
-        <value>file:///${idp.home}/conf/metadata-providers.xml</value>
-        <value>file:///${idp.home}/conf/property-placeholder.xml</value>
+        <value>${idp.home}/conf/metadata-providers.xml</value>
+        <value>${idp.home}/conf/property-placeholder.xml</value>
     </util:list>
 
     <util:list id ="shibboleth.AttributeResolverResources">
-        <value>file:///${idp.home}/conf/attribute-resolver.xml</value>
-        <value>file:///${idp.home}/conf/property-placeholder.xml</value>
+        <value>${idp.home}/conf/attribute-resolver.xml</value>
+        <value>${idp.home}/conf/property-placeholder.xml</value>
     </util:list>
 
     <util:list id ="shibboleth.AttributeFilterResources">
-        <value>file:///${idp.home}/conf/attribute-filter.xml</value>
-        <value>file:///${idp.home}/conf/property-placeholder.xml</value>
+        <value>${idp.home}/conf/attribute-filter.xml</value>
+        <value>${idp.home}/conf/property-placeholder.xml</value>
     </util:list>
 
     <util:list id ="shibboleth.NameIdentifierGenerationResources">
-        <value>file:///${idp.home}/conf/saml-nameid.xml</value>
-        <value>file:///${idp.home}/system/conf/saml-nameid-system.xml</value>
+        <value>${idp.home}/conf/saml-nameid.xml</value>
+        <value>${idp.home}/system/conf/saml-nameid-system.xml</value>
     </util:list>
 
 </beans>

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=6147&r1=6146&r2=6147&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 Sun Jun 22 02:54:31 2014
@@ -30,7 +30,7 @@
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 
     <bean id="messageSource" class="org.springframework.context.support.ReloadableResourceBundleMessageSource"
-            p:cacheSeconds="300" p:basename="file:///${idp.home}/conf/messages" />
+            p:cacheSeconds="300" p:basename="${idp.home}/conf/messages" />
 
     <import resource="general-authn-system.xml" />
     <import resource="session-manager.xml" />
@@ -42,7 +42,7 @@
     <bean id="shibboleth.TaskTimer" class="java.util.Timer" destroy-method="cancel"/> <!--  only needed if you do reloading -->
     
     <bean id="shibboleth.LogbackLogging" class="net.shibboleth.idp.log.LogbackLoggingService" init-method="start" destroy-method="stop"
-          p:loggingConfiguration="file:///${idp.home}/conf/logback.xml"
+          p:loggingConfiguration="${idp.home}/conf/logback.xml"
           p:reloadCheckDelay="${idp.service.logging.checkInterval}"
           p:reloadTaskTimer-ref="shibboleth.TaskTimer"
           p:failFast="${idp.service.logging.failFast}"/>


[... 45 lines stripped ...]