[java-identity-provider COMMIT] in /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl: attribute/encodin...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Dec 19 13:21:23 2011
New Revision: 4093

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4093&view=rev
Log:
Fix base class for SAML2 XML encoding

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2XmlObjectAttributeEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAttributeStatementToAssertion.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2XmlObjectAttributeEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2XmlObjectAttributeEncoder.java?rev=4093&r1=4092&r2=4093&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2XmlObjectAttributeEncoder.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2XmlObjectAttributeEncoder.java Mon Dec 19 13:21:23 2011
@@ -19,7 +19,7 @@
 
 import net.shibboleth.idp.attribute.Attribute;
 import net.shibboleth.idp.attribute.AttributeEncodingException;
-import net.shibboleth.idp.saml.attribute.encoding.AbstractSaml1AttributeEncoder;
+import net.shibboleth.idp.saml.attribute.encoding.AbstractSaml2AttributeEncoder;
 import net.shibboleth.idp.saml.attribute.encoding.SamlEncoderSupport;
 
 import org.opensaml.xml.XMLObject;
@@ -28,7 +28,7 @@
  * {@link net.shibboleth.idp.attribute.AttributeEncoder} that produces SAML 2 attributes from
  * {@link net.shibboleth.idp.attribute.Attribute} that contains {@link XMLObject} values.
  */
-public class Saml2XmlObjectAttributeEncoder extends AbstractSaml1AttributeEncoder<XMLObject> {
+public class Saml2XmlObjectAttributeEncoder extends AbstractSaml2AttributeEncoder<XMLObject> {
 
     /** {@inheritDoc} */
     protected boolean canEncodeValue(Attribute<?> attribute, Object value) {

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAttributeStatementToAssertion.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAttributeStatementToAssertion.java?rev=4093&r1=4092&r2=4093&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAttributeStatementToAssertion.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAttributeStatementToAssertion.java Mon Dec 19 13:21:23 2011
@@ -54,7 +54,7 @@
  * {@link ProfileRequestContext}.
  */
 public class AddAttributeStatementToAssertion extends AbstractIdentityProviderAction<Object, Response> {
-
+// TODO unit tests
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(AddAttributeStatementToAssertion.class);
 
@@ -205,7 +205,7 @@
          * Constructor.
          * 
          * @param attribute the attribute that could not be encoded
-         * @param e the exception that occured when attempting to encode the attribute
+         * @param e the exception that occurred when attempting to encode the attribute
          */
         public UnableToEncodeAttributeException(Attribute<?> attribute, AttributeEncodingException e) {
             super("Action " + getId() + ": Unable to encode attribute " + attribute.getId(), e);