[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml idp-...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Sep 28 19:21:29 2014
New Revision: 6601

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6601&view=rev
Log:
IDP-244 - Working resolvertest flow with SAML output.

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAttributeStatementToAssertion.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-flow.xml
    trunk/idp-conf/src/main/resources/views/resolvertest.vm
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/AssertionIDAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/AssertionInstantAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/NameIDAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/NameIDFormatAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertion.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertion.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertionTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertionTest.java

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml?rev=6601&r1=6600&r2=6601&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml Sun Sep 28 19:21:29 2014
@@ -137,6 +137,59 @@
         </entry>
     </util:map>
     
+    <bean id="InitializeOutboundMessageContext"
+        class="net.shibboleth.idp.saml.profile.impl.InitializeOutboundMessageContext" scope="prototype" />
+    
+    <bean id="AddSAML1AttributeStatementToAssertion"
+            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="AddNameIdentifierToSubjects"
+            class="org.opensaml.saml.saml1.profile.impl.AddNameIdentifierToSubjects" scope="prototype">
+        <property name="formatLookupStrategy">
+            <bean class="net.shibboleth.idp.saml.profile.logic.DefaultNameIdentifierFormatStrategy"
+                p:defaultFormat="%{idp.nameid.saml1.default:urn:mace:shibboleth:1.0:nameIdentifier}" />
+        </property>
+        <property name="nameIdentifierGenerator">
+            <bean class="net.shibboleth.idp.saml.nameid.impl.ProxySAML1NameIdentifierGenerator"
+                c:service-ref="shibboleth.NameIdentifierGenerationService" />
+        </property>
+    </bean>
+
+    <bean id="AddSAML2AttributeStatementToAssertion"
+            class="net.shibboleth.idp.saml.saml2.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="AddNameIDToSubjects"
+            class="org.opensaml.saml.saml2.profile.impl.AddNameIDToSubjects" scope="prototype">
+        <property name="formatLookupStrategy">
+            <bean class="net.shibboleth.idp.saml.profile.logic.DefaultNameIdentifierFormatStrategy"
+                p:defaultFormat="%{idp.nameid.saml2.default:urn:oasis:names:tc:SAML:2.0:nameid-format:transient}" />
+        </property>
+        <property name="nameIDGenerator">
+            <bean class="net.shibboleth.idp.saml.nameid.impl.ProxySAML2NameIDGenerator"
+                c:service-ref="shibboleth.NameIdentifierGenerationService" />
+        </property>
+        <property name="nameIDPolicyPredicate">
+            <bean class="org.opensaml.saml.common.profile.logic.AffiliationNameIDPolicyPredicate"
+                    p:metadataResolver-ref="shibboleth.MetadataResolver"
+                    p:responderIdLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple"
+                    p:requesterIdLookupStrategy-ref="shibboleth.RelyingPartyIdLookup.Simple">
+                <property name="objectLookupStrategy">

[... 1170 lines stripped ...]