[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/r...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Nov 10 21:20:31 2014
New Revision: 6875

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6875&view=rev
Log:
Rename XMLObject mapper class.

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/XMLObjectAttributeValueMapper.java
      - copied, changed from r6873, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/XmlObjectAttributeValueMapper.java
Modified:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2XMLObjectAttributeEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/XmlObjectAttributeValueMapper.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/mapping/impl/AttributeValueMapperTest.java
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/mapping/attributesMapper.xml

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java?rev=6875&r1=6874&r2=6875&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java Mon Nov 10 21:20:31 2014
@@ -28,7 +28,7 @@
 import net.shibboleth.idp.saml.attribute.mapping.impl.RequestedAttributesMapper;
 import net.shibboleth.idp.saml.attribute.mapping.impl.ScopedStringAttributeValueMapper;
 import net.shibboleth.idp.saml.attribute.mapping.impl.StringAttributeValueMapper;
-import net.shibboleth.idp.saml.attribute.mapping.impl.XmlObjectAttributeValueMapper;
+import net.shibboleth.idp.saml.attribute.mapping.impl.XMLObjectAttributeValueMapper;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.service.ReloadableService;
 import net.shibboleth.utilities.java.support.service.ServiceException;
@@ -107,7 +107,7 @@
                 Assert.assertEquals(sMappers.getAttributeFormat(), Attribute.URI_REFERENCE);
                 Assert.assertEquals(sMappers.getAttributeIds().size(), 1);
                 Assert.assertEquals(sMappers.getAttributeIds().get(0), "eduPersonTID");
-                Assert.assertTrue(sMappers.getValueMapper() instanceof XmlObjectAttributeValueMapper);
+                Assert.assertTrue(sMappers.getValueMapper() instanceof XMLObjectAttributeValueMapper);
             } else {
                 Assert.fail();
             }

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2XMLObjectAttributeEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2XMLObjectAttributeEncoder.java?rev=6875&r1=6874&r2=6875&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2XMLObjectAttributeEncoder.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2XMLObjectAttributeEncoder.java Mon Nov 10 21:20:31 2014
@@ -29,7 +29,7 @@
 import net.shibboleth.idp.saml.attribute.encoding.AttributeMapperProcessor;
 import net.shibboleth.idp.saml.attribute.encoding.SAMLEncoderSupport;
 import net.shibboleth.idp.saml.attribute.mapping.AbstractSAMLAttributeMapper;
-import net.shibboleth.idp.saml.attribute.mapping.impl.XmlObjectAttributeValueMapper;
+import net.shibboleth.idp.saml.attribute.mapping.impl.XMLObjectAttributeValueMapper;
 
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.saml2.core.AttributeValue;
@@ -62,7 +62,7 @@
         mapper.setAttributeFormat(getNameFormat());
         mapper.setId(getMapperId());
         mapper.setSAMLName(getName());
-        mapper.setValueMapper(new XmlObjectAttributeValueMapper());
+        mapper.setValueMapper(new XMLObjectAttributeValueMapper());
 
     }
 

Copied: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/XMLObjectAttributeValueMapper.java (from r6873, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/XmlObjectAttributeValueMapper.java)

[... 59 lines stripped ...]