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

[noreply at shibboleth.net]

Author: rdw
Date: Sat Feb 14 10:20:17 2015
New Revision: 7344

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7344&view=rev
Log:
IDP-604 Use named beans not random impl classes

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=7344&r1=7343&r2=7344&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/services.xml Sat Feb 14 10:20:17 2015
@@ -64,33 +64,25 @@
         A resource which will be supplied from an in-memory cache for as long as the file on the webserver does not change.  
         If the webserver becomes unavailable the resource will be unavailable.
          
-        <bean id="inMemoryClient"
-              class="net.shibboleth.idp.profile.spring.relyingparty.metadata.InMemoryCachingHttpClientFactoryBean"
-              p:maxCacheEntries="1"
-              p:connectionTimeout="PT3M" />
-         
         <bean id="inMemoryResource" class="net.shibboleth.ext.spring.resource.HTTPResource"
-              c:client-ref="inMemoryClient" 
+              c:client-ref="shibboleth.MemoryCachingHttpClient" 
               c:url="http://example.org/path/to/file.xml" />
               
         Two resources which will be supplied from an on disk cache (suitable for multiple or large files) for as long 
         as the file on the webserver does not change.  If the webserver becomes unavailable the last used contents
         of the file will be returned (even if that was in a previous IdP lifetime).
         
-        <bean id="fileClient"
-              class="net.shibboleth.idp.profile.spring.relyingparty.metadata.FileCachingHttpClientFactoryBean"
-              p:maxCacheEntries="3000"
-              p:cacheDirectory="/var/shibboleth/caches/httpcache"/>
-         
         <bean id="fileResource" class="net.shibboleth.ext.spring.resource.FileBackedHTTPResource"
-              c:client-ref="fileClient" 
+              c:client-ref="shibboleth.FileCachingHttpClient" 
               c:url="http://example.org/path/to/file.xml"
               c:resource="/var/shibboleth/caches/resourcecache/file.xml"/>
        
         <bean id="otherFileResource" class="net.shibboleth.ext.spring.resource.FileBackedHTTPResource"
-              c:client-ref="fileClient" 
+              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"/>
+              
+        In all cases you should review the "idp.httpclient.*" properties defined in services.properties
     -->
     
     <!--