Implement config wiring changes related to artifact map and JOST-110:
authorputmanb <putmanb@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Wed, 7 Apr 2010 23:21:51 +0000 (23:21 +0000)
committerputmanb <putmanb@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Wed, 7 Apr 2010 23:21:51 +0000 (23:21 +0000)
- inject the shibboleth.ParserPool bean into the OpenSAML config, and set on Configuration singleton,
  so we are using a single ParserPool everywhere
- remove shibboleth.ParserPool from being injected on shibboleth.ArtifactMap bean, constructor now deprecated.
These changes are optional and non-disruptive, existing configs will continue to work as-is.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/branches/REL_2@2925 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

src/installer/resources/conf-tmpl/internal.xml

index 176f473..da21db0 100644 (file)
@@ -26,6 +26,7 @@
                 </bean>
             </list>
         </constructor-arg>
                 </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">
     </bean>
 
     <bean id="shibboleth.IdGenerator" class="org.opensaml.common.impl.SecureRandomIdentifierGenerator" depends-on="shibboleth.LogbackLogging">
@@ -96,7 +97,6 @@
     </bean>
 
     <bean id="shibboleth.ArtifactMap" class="org.opensaml.common.binding.artifact.BasicSAMLArtifactMap" depends-on="shibboleth.LogbackLogging">
     </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>
         <constructor-arg ref="shibboleth.StorageService" />
         <constructor-arg type="long" value="300000" />
     </bean>