[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system/flows/saml: saml1/attribute-query-beans....

[noreply at shibboleth.net]

Author: scantor
Date: Mon Sep 21 16:34:25 2015
New Revision: 7766

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7766&view=rev
Log:
Collapse some wiring now that attribute statement predicate handles query profiles.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-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/common-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml

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=7766&r1=7765&r2=7766&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 Sep 21 16:34:25 2015
@@ -40,14 +40,6 @@
 
     <alias name="shibboleth.OutgoingSOAPBindings" alias="shibboleth.OutgoingBindings"/>
 
-    <bean id="AddAttributeStatementToAssertion"
-            class="net.shibboleth.idp.saml.saml1.profile.impl.AddAttributeStatementToAssertion" scope="prototype">
-        <property name="identifierGeneratorLookupStrategy">
-            <bean class="net.shibboleth.idp.profile.config.navigate.IdentifierGenerationStrategyLookupFunction"
-                p:defaultIdentifierGenerationStrategy-ref="shibboleth.DefaultIdentifierGenerationStrategy" />
-        </property>
-    </bean>
-
     <bean id="CopyNameIdentifierFromRequest"
             class="org.opensaml.saml.saml1.profile.impl.CopyNameIdentifierFromRequest" scope="prototype" />
 

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml?rev=7766&r1=7765&r2=7766&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml	Mon Sep 21 16:34:25 2015
@@ -49,6 +49,17 @@
         </property>
     </bean>
 
+    <bean id="AddAttributeStatementToAssertion"
+            class="net.shibboleth.idp.saml.saml1.profile.impl.AddAttributeStatementToAssertion" scope="prototype">
+        <property name="activationCondition">
+            <bean class="net.shibboleth.idp.saml.profile.config.logic.IncludeAttributeStatementPredicate" />
+        </property>
+        <property name="identifierGeneratorLookupStrategy">
+            <bean class="net.shibboleth.idp.profile.config.navigate.IdentifierGenerationStrategyLookupFunction"
+                p:defaultIdentifierGenerationStrategy-ref="shibboleth.DefaultIdentifierGenerationStrategy" />
+        </property>
+    </bean>
+
     <bean id="InitializeOutboundMessageContextForError"
             class="net.shibboleth.idp.saml.profile.impl.InitializeOutboundMessageContextForError" scope="prototype">
         <property name="outboundBinding">

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml?rev=7766&r1=7765&r2=7766&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml	Mon Sep 21 16:34:25 2015
@@ -36,17 +36,6 @@
 
     <bean id="ResolveAttributesPredicate"
         class="net.shibboleth.idp.saml.profile.config.logic.ResolveAttributesProfileConfigPredicate" />
-
-    <bean id="AddAttributeStatementToAssertion"
-            class="net.shibboleth.idp.saml.saml1.profile.impl.AddAttributeStatementToAssertion" scope="prototype">
-        <property name="activationCondition">
-            <bean class="net.shibboleth.idp.saml.profile.config.logic.IncludeAttributeStatementPredicate" />
-        </property>
-        <property name="identifierGeneratorLookupStrategy">
-            <bean class="net.shibboleth.idp.profile.config.navigate.IdentifierGenerationStrategyLookupFunction"
-                p:defaultIdentifierGenerationStrategy-ref="shibboleth.DefaultIdentifierGenerationStrategy" />
-        </property>
-    </bean>
 
     <bean id="AddNameIdentifierToSubjects"
             class="org.opensaml.saml.saml1.profile.impl.AddNameIdentifierToSubjects" scope="prototype">


[... 69 lines stripped ...]