Implement config wiring changes related to artifact map and JOST-110:

[java-idp.git] / src / installer / resources / conf-tmpl / internal.xml

diff --git a/src/installer/resources/conf-tmpl/internal.xml b/src/installer/resources/conf-tmpl/internal.xml
index fa666cf..da21db0 100644 (file)
--- a/src/installer/resources/conf-tmpl/internal.xml
+++ b/src/installer/resources/conf-tmpl/internal.xml
@@ -2,8 +2,10 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+                         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd" >
+
+    <bean id="shibboleth.CacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean" />
 
     <bean id="shibboleth.TaskTimer" class="java.util.Timer" destroy-method="cancel">
         <constructor-arg value="true" type="boolean" />
@@ -24,6 +26,7 @@
                 </bean>
             </list>
         </constructor-arg>
+        <property name="parserPool" ref="shibboleth.ParserPool" />
     </bean>
 
     <bean id="shibboleth.IdGenerator" class="org.opensaml.common.impl.SecureRandomIdentifierGenerator" depends-on="shibboleth.LogbackLogging">
@@ -38,7 +41,7 @@
                     org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
                 </prop>
                 <prop key="string.resource.loader.class">
-                    org.apache.velocity.runtime.resource.loader.StringResourceLoader
+                    edu.internet2.middleware.shibboleth.common.util.StringResourceLoader
                 </prop>
             </props>
         </property>
@@ -52,7 +55,6 @@
 
     <bean id="shibboleth.ParserPool" class="org.opensaml.xml.parse.BasicParserPool" depends-on="shibboleth.LogbackLogging">
         <property name="maxPoolSize" value="100" />
-        <property name="createBuildersAtPoolLimit" value="true" />
         <property name="coalescing" value="true" />
         <property name="ignoreComments" value="true" />
         <property name="ignoreElementContentWhitespace" value="true" />
@@ -79,7 +81,7 @@
         </property>
     </bean>
 
-    <bean id="shibboleth.StorageService" class="org.opensaml.util.storage.MapBasedStorageService" depends-on="shibboleth.LogbackLogging" />
+    <bean id="shibboleth.StorageService" class="edu.internet2.middleware.shibboleth.common.util.EventingMapBasedStorageService" depends-on="shibboleth.LogbackLogging" />
 
     <bean id="shibboleth.StorageServiceSweeper" class="org.opensaml.util.storage.ExpiringObjectStorageServiceSweeper" depends-on="shibboleth.LogbackLogging">
         <constructor-arg ref="shibboleth.TaskTimer" />
@@ -95,7 +97,6 @@
     </bean>
 
     <bean id="shibboleth.ArtifactMap" class="org.opensaml.common.binding.artifact.BasicSAMLArtifactMap" depends-on="shibboleth.LogbackLogging">
-        <constructor-arg ref="shibboleth.ParserPool" />
         <constructor-arg ref="shibboleth.StorageService" />
         <constructor-arg type="long" value="300000" />
     </bean>