[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src: main/java/org/opensaml/saml/common/binding/artifact/ main/ja...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Jul  7 16:59:36 2013
New Revision: 3398

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3398&view=rev
Log:
Layer SAMLArtifactMap classes on storage API.

Added:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMap.java   (with props)
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntry.java   (with props)
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntryFactory.java   (with props)
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/package-info.java   (with props)
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/HTTPArtifactEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/HTTPArtifactEncoder.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntryFactoryTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntryTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/HTTPArtifactEncoder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/HTTPArtifactEncoder.java?rev=3398&r1=3397&r2=3398&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/HTTPArtifactEncoder.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/HTTPArtifactEncoder.java Sun Jul  7 16:59:36 2013
@@ -29,7 +29,6 @@
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.net.UrlBuilder;
 
-import org.opensaml.core.xml.io.MarshallingException;
 import org.opensaml.messaging.context.BasicMessageMetadataContext;
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.messaging.encoder.MessageEncodingException;
@@ -168,9 +167,9 @@
             try {
                 artifactMap.put(artifact.base64Encode(), getInboundMessageIssuer(messageContext), 
                         getOutboundMessageIssuer(messageContext), assertion);
-            } catch (MarshallingException e) {
-                log.error("Unable to marshall assertion to be represented as an artifact", e);
-                throw new MessageEncodingException("Unable to marshall assertion to be represented as an artifact", e);
+            } catch (IOException e) {
+                log.error("Unable to store assertion mapping for artifact", e);
+                throw new MessageEncodingException("Unable to store assertion mapping for artifact", e);
             }
             artifactString = artifact.base64Encode();
             queryParams.add(new Pair<String, String>("SAMLart", artifactString));

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/HTTPArtifactEncoder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/HTTPArtifactEncoder.java?rev=3398&r1=3397&r2=3398&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/HTTPArtifactEncoder.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/HTTPArtifactEncoder.java Sun Jul  7 16:59:36 2013
@@ -32,7 +32,6 @@
 
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
-import org.opensaml.core.xml.io.MarshallingException;
 import org.opensaml.messaging.context.BasicMessageMetadataContext;
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.messaging.encoder.MessageEncodingException;
@@ -333,9 +332,9 @@
         try {
             artifactMap.put(encodedArtifact, getInboundMessageIssuer(messageContext),
                     getOutboundMessageIssuer(messageContext), messageContext.getMessage());
-        } catch (MarshallingException e) {
-            log.error("Unable to marshall assertion to be represented as an artifact", e);
-            throw new MessageEncodingException("Unable to marshall assertion to be represented as an artifact", e);
+        } catch (IOException e) {
+            log.error("Unable to store message mapping for artifact", e);
+            throw new MessageEncodingException("Unable to store message mapping for artifact", e);
         }
 
         return artifact;

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntryFactoryTest.java

[... 211 lines stripped ...]