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

[noreply at shibboleth.net]

Author: rdw
Date: Thu Aug 13 09:32:18 2015
New Revision: 7673

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7673&view=rev
Log:
JSE-15 Add constructors to FileBackedHTTPResource

https://issues.shibboleth.net/jira/browse/JSE-15

Add two new constructors to FileBackedHTTPResource that take a String rather than a Resource.  This avoids all sorts of ResourceLoader issues and allows the file name to specified without the garnish of file:://.

The parameter order is changed to maximise backwards compatibility.

Also add tests and change the (commented) example in the IdP distribution

Modified:
    trunk/idp-conf/src/main/resources/conf/services.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=7673&r1=7672&r2=7673&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/services.xml	Thu Aug 13 09:32:18 2015
@@ -75,12 +75,12 @@
         <bean id="fileResource" class="net.shibboleth.ext.spring.resource.FileBackedHTTPResource"
               c:client-ref="shibboleth.FileCachingHttpClient" 
               c:url="http://example.org/path/to/file.xml"
-              c:resource="/var/shibboleth/caches/resourcecache/file.xml"/>
+              c:backingFile="/var/shibboleth/caches/resourcecache/file.xml"/>
        
         <bean id="otherFileResource" class="net.shibboleth.ext.spring.resource.FileBackedHTTPResource"
               c:client-ref="shibboleth.FileCachingHttpClient" 
               c:url="http://another.server.example.org/path/to/different/file.xml"
-              c:resource="/var/shibboleth/caches/resourcecache/differentFile.xml"/>
+              c:backingFile="/var/shibboleth/caches/resourcecache/differentFile.xml"/>
               
         In all cases you should review the "idp.httpclient.*" properties defined in services.properties
     -->