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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Jan 16 16:54:43 2015
New Revision: 7246

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7246&view=rev
Log:
IDP-564 - Allow for alternative StorageService beans

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=7246&r1=7245&r2=7246&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Fri Jan 16 16:54:43 2015
@@ -114,7 +114,7 @@
 # doesn't match the identity in a pre-existing session.
 #idp.authn.identitySwitchIsError = false
 
-# Set to "shibboleth.StorageService" for server-side storage of user consent
+# Set to "shibboleth.StorageService" or custom bean for alternate storage of consent
 #idp.consent.StorageService = shibboleth.ClientPersistentStorageService
 
 # Set to "shibboleth.consent.AttributeConsentStorageKey" to use an attribute
@@ -141,11 +141,17 @@
 #idp.policy.messageLifetime = PT3M
 #idp.policy.clockSkew = PT3M
 
+# Set to custom bean for alternate storage of replay cache
+#idp.replayCache.StorageService = shibboleth.StorageService
+
 # Suppresses typical signing/encryption when artifact binding used
 #idp.artifact.secureChannel = true
 
 # May differ to direct SAML 2 artifact lookups to specific server nodes
 #idp.artifact.endpointIndex = 2
+
+# Set to custom bean for alternate storage of artifact map state
+#idp.artifact.StorageService = shibboleth.StorageService
 
 # Name of access control policy for various admin flows
 idp.status.accessPolicy = AccessByIPAddress

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=7246&r1=7245&r2=7246&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 Fri Jan 16 16:54:43 2015
@@ -107,6 +107,10 @@
         </property>
     </bean>
 
+    <!--  Bean used by the SchemaValidation metadata filter and anything else doing basic schema validation. -->
+    <bean id="shibboleth.SchemaBuilder" lazy-init="true"
+        class="org.opensaml.saml.common.xml.SAMLSchemaBuilder" c:ver="SAML_11" />
+
     <bean id="shibboleth.HttpServletRequest" class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletRequestProxy" />
     <bean id="shibboleth.HttpServletResponse" class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletResponseProxy" />
 
@@ -150,7 +154,7 @@
     <!-- This is a convenience for compatibility with the examples for configuring this in V2. -->
     <alias name="shibboleth.DataSealer" alias="shibboleth.TransientIDDataSealer"/>
 
-    <bean id="shibboleth.StorageService"
+    <bean id="shibboleth.StorageService" lazy-init="true"
         class="%{idp.storage.StorageService:org.opensaml.storage.impl.MemoryStorageService}"
         p:cleanupInterval="%{idp.storage.cleanupInterval:PT10M}" />
 
@@ -171,11 +175,11 @@
         p:dataSealer-ref="shibboleth.DataSealer" />
 
     <bean id="shibboleth.ReplayCache" class="org.opensaml.storage.ReplayCache" depends-on="shibboleth.LoggingService"
-        p:storage-ref="shibboleth.StorageService" p:strict="true" />
+        p:storage-ref="%{idp.replayCache.StorageService:shibboleth.StorageService}" p:strict="true" />
 
     <bean id="shibboleth.SAMLArtifactMap" depends-on="shibboleth.StorageService"
         class="org.opensaml.saml.common.binding.artifact.impl.StorageServiceSAMLArtifactMap"
-        p:storageService-ref="shibboleth.StorageService" />
+        p:storageService-ref="%{idp.artifact.StorageService:shibboleth.StorageService}" />
 
     <bean id="shibboleth.DefaultIdentifierGenerationStrategy"
         class="net.shibboleth.utilities.java.support.security.SecureRandomIdentifierGenerationStrategy" />
@@ -252,10 +256,4 @@
         p:maxCacheEntries="%{idp.httpclient.memorycaching.maxCacheEntries:50}"
         p:maxCacheEntrySize="%{idp.httpclient.memorycaching.maxCacheEntrySize:1048576}" />
     
-    <!--  Bean used by the SchemaValidation metadata filter -->
-    
-    <bean id="shibboleth.SchemaBuilder"
-        lazy-init="true"
-        class="org.opensaml.saml.common.xml.SAMLSchemaBuilder"
-        c:ver="SAML_11" />
  </beans>