[java-identity-provider COMMIT] in /trunk: idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/saml2/SAML2Acti...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb 24 20:20:46 2014
New Revision: 5468

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5468&view=rev
Log:
Move SAML 2 helper class down so actions can be moved.

Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/saml2/SAML2ActionSupport.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/saml2/SAML2ActionSupportTest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddAttributeStatementToAssertion.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddAudienceRestrictionToAssertions.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddAuthnStatementToAssertion.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddNotBeforeConditionToAssertions.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddNotOnOrAfterConditionToAssertions.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddOneTimeUseConditionToAssertions.java

Modified: trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/saml2/SAML2ActionSupportTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/saml2/SAML2ActionSupportTest.java?rev=5468&r1=5467&r2=5468&view=diff
==============================================================================
--- trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/saml2/SAML2ActionSupportTest.java (original)
+++ trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/saml2/SAML2ActionSupportTest.java Mon Feb 24 20:20:46 2014
@@ -28,6 +28,7 @@
 import org.opensaml.saml.saml2.core.Assertion;
 import org.opensaml.saml.saml2.core.Conditions;
 import org.opensaml.saml.saml2.core.Response;
+import org.opensaml.saml.saml2.profile.SAML2ActionSupport;
 import org.springframework.webflow.execution.RequestContext;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -65,10 +66,14 @@
         RelyingPartyContext relyingPartyCtx = relyingPartyContextLookupStrategy.apply(profileRequestContext);
 
         Assert.assertEquals(response.getAssertions().size(), 0, "Expected zarro assertions before insert");
-        Assertion assertion = SAML2ActionSupport.addAssertionToResponse(action, relyingPartyCtx, response);
+        Assertion assertion = SAML2ActionSupport.addAssertionToResponse(action, response,
+                relyingPartyCtx.getProfileConfig().getSecurityConfiguration().getIdGenerator(),
+                relyingPartyCtx.getConfiguration().getResponderId());
         Assert.assertEquals(response.getAssertions().size(), 1, "Expected but one assertion after insert");
         Assert.assertTrue(response.getAssertions().contains(assertion), "Inserted assertion should be there");
-        Assertion second = SAML2ActionSupport.addAssertionToResponse(action, relyingPartyCtx, response);
+        Assertion second = SAML2ActionSupport.addAssertionToResponse(action, response,
+                relyingPartyCtx.getProfileConfig().getSecurityConfiguration().getIdGenerator(),
+                relyingPartyCtx.getConfiguration().getResponderId());
         Assert.assertEquals(response.getAssertions().size(), 2, "Expected two assertions after two inserts");
         Assert.assertTrue(response.getAssertions().contains(assertion), "Inserted assertion should be there");
         Assert.assertNotSame(second, assertion, "Two separate assertions should have been added");

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddAttributeStatementToAssertion.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddAttributeStatementToAssertion.java?rev=5468&r1=5467&r2=5468&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddAttributeStatementToAssertion.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddAttributeStatementToAssertion.java Mon Feb 24 20:20:46 2014
@@ -22,6 +22,7 @@
 import java.util.Set;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import net.shibboleth.ext.spring.webflow.Event;
 import net.shibboleth.ext.spring.webflow.Events;
@@ -35,7 +36,6 @@
 import net.shibboleth.idp.profile.context.RelyingPartyContext;
 import net.shibboleth.idp.saml.attribute.encoding.AbstractSAML2AttributeEncoder;
 import net.shibboleth.idp.saml.profile.SAMLEventIds;
-import net.shibboleth.idp.saml.profile.saml2.SAML2ActionSupport;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
@@ -49,6 +49,7 @@
 import org.opensaml.saml.saml2.core.Attribute;
 import org.opensaml.saml.saml2.core.AttributeStatement;
 import org.opensaml.saml.saml2.core.Response;

[... 186 lines stripped ...]