Synch up with artifact map changes
authorlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Wed, 9 Jan 2008 09:59:14 +0000 (09:59 +0000)
committerlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Wed, 9 Jan 2008 09:59:14 +0000 (09:59 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2531 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

resources/conf/internal.xml
src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ArtifactResolution.java
src/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java

index cb4a910..d5d4bd4 100644 (file)
     </bean>
 
     <bean id="shibboleth.ArtifactMap" class="org.opensaml.common.binding.artifact.BasicSAMLArtifactMap" depends-on="shibboleth.LogbackLogging">
+        <constructor-arg ref="shibboleth.ParserPool" />
         <constructor-arg ref="shibboleth.StorageService" />
         <constructor-arg type="long" value="300000" />
     </bean>
index 69fdfa1..c29c555 100644 (file)
@@ -264,7 +264,7 @@ public class ArtifactResolution extends AbstractSAML1ProfileHandler {
             assertions.add((Assertion) artifactEntry.getSamlMessage());
         }
 
-        requestContext.setReferencedAssertions(assertions);
+        requestContext.setDereferencedAssertions(assertions);
     }
 
     /**
@@ -282,8 +282,8 @@ public class ArtifactResolution extends AbstractSAML1ProfileHandler {
         samlResponse.setIssueInstant(issueInstant);
         populateStatusResponse(requestContext, samlResponse);
 
-        if (requestContext.getReferencedAssertions() != null) {
-            samlResponse.getAssertions().addAll(requestContext.getReferencedAssertions());
+        if (requestContext.getDereferencedAssertions() != null) {
+            samlResponse.getAssertions().addAll(requestContext.getDereferencedAssertions());
         }
 
         Status status = buildStatus(StatusCode.SUCCESS, null, null);
@@ -318,7 +318,7 @@ public class ArtifactResolution extends AbstractSAML1ProfileHandler {
          * 
          * @return SAML assertions referenced by the artifact(s)
          */
-        public Collection<Assertion> getReferencedAssertions() {
+        public Collection<Assertion> getDereferencedAssertions() {
             return referencedAssertions;
         }
 
@@ -327,7 +327,7 @@ public class ArtifactResolution extends AbstractSAML1ProfileHandler {
          * 
          * @param assertions SAML assertions referenced by the artifact(s)
          */
-        public void setReferencedAssertions(Collection<Assertion> assertions) {
+        public void setDereferencedAssertions(Collection<Assertion> assertions) {
             referencedAssertions = assertions;
         }
     }
index 3824df3..f26e11b 100644 (file)
@@ -125,9 +125,6 @@ public class ArtifactResolution extends AbstractSAML2ProfileHandler {
                 requestContext.setFailureStatus(buildStatus(StatusCode.SUCCESS_URI, StatusCode.REQUEST_DENIED_URI,
                         "Artifact requester mismatch."));
             }
-            artifactMap.remove(requestContext.getArtifact());
-            SAMLObject referencedMessage = artifactEntry.getSamlMessage();
-            requestContext.setReferencedMessage(referencedMessage);
 
             // create the SAML response
             samlResponse = buildArtifactResponse(requestContext);
@@ -315,20 +312,12 @@ public class ArtifactResolution extends AbstractSAML2ProfileHandler {
             this.artifact = saml2Artifact;
         }
 
-        /**
-         * Gets the SAML message referenced by the artifact.
-         * 
-         * @return SAML message referenced by the artifact
-         */
+        /** {@inheritDoc} */
         public SAMLObject getReferencedMessage() {
             return referencedMessage;
         }
 
-        /**
-         * Sets the SAML message referenced by the artifact.
-         * 
-         * @param message SAML message referenced by the artifact
-         */
+        /** {@inheritDoc} */
         public void setReferencedMessage(SAMLObject message) {
             referencedMessage = message;
         }