[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/test/java/org/opensaml/saml/saml2/profile/SAML2ActionTestingS...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb 24 21:39:58 2014
New Revision: 3649

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3649&view=rev
Log:
IDP-135 - General InResponseTo action for both SAML versions.

Added:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponse.java   (with props)
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponseTest.java   (with props)
Modified:
    trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/saml2/profile/SAML2ActionTestingSupport.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNotBeforeConditionToAssertions.java

Modified: trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/saml2/profile/SAML2ActionTestingSupport.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/saml2/profile/SAML2ActionTestingSupport.java?rev=3649&r1=3648&r2=3649&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/saml2/profile/SAML2ActionTestingSupport.java (original)
+++ trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/saml2/profile/SAML2ActionTestingSupport.java Mon Feb 24 21:39:58 2014
@@ -31,6 +31,7 @@
 import org.opensaml.saml.saml2.core.Assertion;
 import org.opensaml.saml.saml2.core.AttributeQuery;
 import org.opensaml.saml.saml2.core.Issuer;
+import org.opensaml.saml.saml2.core.LogoutResponse;
 import org.opensaml.saml.saml2.core.NameID;
 import org.opensaml.saml.saml2.core.Response;
 import org.opensaml.saml.saml2.core.Subject;
@@ -69,6 +70,25 @@
         return response;
     }
 
+    /**
+     * Builds an empty logout response. The ID of the message is {@link SamlActionTestingSupport#OUTBOUND_MSG_ID}, the issue
+     * instant is 1970-01-01T00:00:00Z and the SAML version is {@link SAMLVersion#VERSION_11}.
+     * 
+     * @return the constructed response
+     */
+    @Nonnull public static LogoutResponse buildLogoutResponse() {
+        final SAMLObjectBuilder<LogoutResponse> responseBuilder = (SAMLObjectBuilder<LogoutResponse>)
+                XMLObjectProviderRegistrySupport.getBuilderFactory().<LogoutResponse>getBuilderOrThrow(
+                        LogoutResponse.DEFAULT_ELEMENT_NAME);
+
+        final LogoutResponse response = responseBuilder.buildObject();
+        response.setID(ActionTestingSupport.OUTBOUND_MSG_ID);
+        response.setIssueInstant(new DateTime(0));
+        response.setVersion(SAMLVersion.VERSION_20);
+
+        return response;
+    }
+    
     /**
      * Builds an empty assertion. The ID of the message is {@link #ASSERTION_ID}, the issue instant is
      * 1970-01-01T00:00:00Z and the SAML version is {@link SAMLVersion#VERSION_11}.

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNotBeforeConditionToAssertions.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNotBeforeConditionToAssertions.java?rev=3649&r1=3648&r2=3649&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNotBeforeConditionToAssertions.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNotBeforeConditionToAssertions.java Mon Feb 24 21:39:58 2014
@@ -79,7 +79,7 @@
     /** {@inheritDoc} */
     @Override
     protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext) throws ProfileException {
-        log.debug("{} Attempting to add NameIdentifier to statements in outgoing Response", getLogPrefix());
+        log.debug("{} Attempting to add NotBefore condition to every Assertion in outgoing Response", getLogPrefix());
 
         response = responseLookupStrategy.apply(profileRequestContext);
         if (response == null) {
@@ -96,9 +96,7 @@
     
     /** {@inheritDoc} */
     @Override
-    protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext)
-            throws ProfileException {
-        log.debug("{} Attempting to add NotBefore condition to every Assertion in outgoing Response", getLogPrefix());
+    protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) throws ProfileException {
 
         for (final Assertion assertion : response.getAssertions()) {
             final Conditions conditions = SAML1ActionSupport.addConditionsToAssertion(this, assertion);