[java-opensaml2 COMMIT] in /branches/REL_2/src/main/java/org/opensaml/saml2/ecp/impl: SubjectConfirmationMarshaller.j...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jan 28 15:18:10 2013
New Revision: 1621

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1621&view=rev
Log:
Fix some references to the wrong class.

Modified:
    branches/REL_2/src/main/java/org/opensaml/saml2/ecp/impl/SubjectConfirmationMarshaller.java
    branches/REL_2/src/main/java/org/opensaml/saml2/ecp/impl/SubjectConfirmationUnmarshaller.java

Modified: branches/REL_2/src/main/java/org/opensaml/saml2/ecp/impl/SubjectConfirmationMarshaller.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/saml2/ecp/impl/SubjectConfirmationMarshaller.java?rev=1621&r1=1620&r2=1621&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/saml2/ecp/impl/SubjectConfirmationMarshaller.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/saml2/ecp/impl/SubjectConfirmationMarshaller.java Mon Jan 28 15:18:10 2013
@@ -22,7 +22,6 @@
 package org.opensaml.saml2.ecp.impl;
 
 import org.opensaml.common.impl.AbstractSAMLObjectMarshaller;
-import org.opensaml.saml2.ecp.RequestAuthenticated;
 import org.opensaml.saml2.ecp.SubjectConfirmation;
 import org.opensaml.xml.XMLObject;
 import org.opensaml.xml.io.MarshallingException;
@@ -39,12 +38,12 @@
         SubjectConfirmation sc = (SubjectConfirmation) samlObject;
 
         if (sc.isSOAP11MustUnderstandXSBoolean() != null) {
-            XMLHelper.marshallAttribute(RequestAuthenticated.SOAP11_MUST_UNDERSTAND_ATTR_NAME, 
+            XMLHelper.marshallAttribute(SubjectConfirmation.SOAP11_MUST_UNDERSTAND_ATTR_NAME, 
                     sc.isSOAP11MustUnderstandXSBoolean().toString(), domElement, false);
         }
         
         if (sc.getSOAP11Actor() != null) {
-            XMLHelper.marshallAttribute(RequestAuthenticated.SOAP11_ACTOR_ATTR_NAME, 
+            XMLHelper.marshallAttribute(SubjectConfirmation.SOAP11_ACTOR_ATTR_NAME, 
                     sc.getSOAP11Actor(), domElement, false);
         }
         

Modified: branches/REL_2/src/main/java/org/opensaml/saml2/ecp/impl/SubjectConfirmationUnmarshaller.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/saml2/ecp/impl/SubjectConfirmationUnmarshaller.java?rev=1621&r1=1620&r2=1621&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/saml2/ecp/impl/SubjectConfirmationUnmarshaller.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/saml2/ecp/impl/SubjectConfirmationUnmarshaller.java Mon Jan 28 15:18:10 2013
@@ -21,7 +21,6 @@
 
 import org.opensaml.common.impl.AbstractSAMLObjectUnmarshaller;
 import org.opensaml.saml2.core.SubjectConfirmationData;
-import org.opensaml.saml2.ecp.RequestAuthenticated;
 import org.opensaml.saml2.ecp.SubjectConfirmation;
 import org.opensaml.xml.XMLObject;
 import org.opensaml.xml.io.UnmarshallingException;
@@ -50,9 +49,9 @@
         SubjectConfirmation sc = (SubjectConfirmation) samlObject;
 
         QName attrName = XMLHelper.getNodeQName(attribute);
-        if (RequestAuthenticated.SOAP11_MUST_UNDERSTAND_ATTR_NAME.equals(attrName)) {
+        if (SubjectConfirmation.SOAP11_MUST_UNDERSTAND_ATTR_NAME.equals(attrName)) {
             sc.setSOAP11MustUnderstand(XSBooleanValue.valueOf(attribute.getValue()));
-        } else if (RequestAuthenticated.SOAP11_ACTOR_ATTR_NAME.equals(attrName)) {
+        } else if (SubjectConfirmation.SOAP11_ACTOR_ATTR_NAME.equals(attrName)) {
             sc.setSOAP11Actor(attribute.getValue()); 
         } else if (attribute.getLocalName().equals(SubjectConfirmation.METHOD_ATTRIB_NAME)) {
             sc.setMethod(attribute.getValue());