[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system/flows/saml: saml1/artifact-resolution-be...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jun  2 14:16:19 2014
New Revision: 6027

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6027&view=rev
Log:
Add some missing parserPool properties, and move Init action down into SSO concrete flow beans.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/artifact-resolution-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-unsolicited-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/artifact-resolution-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-simplesign-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-redirect-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-unsolicited-beans.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/artifact-resolution-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/artifact-resolution-beans.xml?rev=6027&r1=6026&r2=6027&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/artifact-resolution-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/artifact-resolution-beans.xml Mon Jun  2 14:16:19 2014
@@ -26,6 +26,7 @@
     <bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
         <constructor-arg>
             <bean class="org.opensaml.saml.saml1.binding.decoding.impl.HTTPSOAP11Decoder" scope="prototype">
+                <property name="parserPool" ref="shibboleth.ParserPool" />
                 <property name="httpServletRequest" ref="shibboleth.HttpServletRequest" />
             </bean>
         </constructor-arg>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml?rev=6027&r1=6026&r2=6027&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml Mon Jun  2 14:16:19 2014
@@ -26,6 +26,7 @@
     <bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
         <constructor-arg>
             <bean class="org.opensaml.saml.saml1.binding.decoding.impl.HTTPSOAP11Decoder" scope="prototype">
+                <property name="parserPool" ref="shibboleth.ParserPool" />
                 <property name="httpServletRequest" ref="shibboleth.HttpServletRequest" />
             </bean>
         </constructor-arg>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-unsolicited-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-unsolicited-beans.xml?rev=6027&r1=6026&r2=6027&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-unsolicited-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-unsolicited-beans.xml Mon Jun  2 14:16:19 2014
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:c="http://www.springframework.org/schema/c"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:util="http://www.springframework.org/schema/util"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"       
+                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
        default-init-method="initialize"
-       default-destroy-method="destory">
+       default-destroy-method="destroy">
+
+    <context:property-placeholder location="file:///${idp.home}/conf/idp.properties" />
 
     <bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
         <constructor-arg>

[... 174 lines stripped ...]