[java-identity-provider COMMIT] in /trunk: idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/XMLObjectAttr...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Jan  5 07:30:49 2013
New Revision: 4252

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4252&view=rev
Log:
https://issues.shibboleth.net/jira/browse/IDP-13

Port IdPv2 Attribute Resolver SAML2 NameID Attribute Definition to new APIs

This also involves writing unit tests for same.  Part of the work meant the 
moving XMLObjectAttributeValue from its temporary home in saml-impl to 
attribute-api (alongside all the other AttributeValue implementations) and
adding a unit test for same.

That in turn required some diddling with the POM files for saml-impl.

Added:
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/XMLObjectAttributeValue.java
      - copied, changed from r4251, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/XMLObjectAttributeValue.java
    trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/XMLObjectAttributeValueTest.java   (with props)
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinition.java   (with props)
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinitionTest.java   (with props)
Modified:
    trunk/idp-attribute-resolver-impl/pom.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml1XmlObjectAttributeEncoder.java
    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/attribute/encoding/XMLObjectAttributeValue.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml1XmlObjectAttributeEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml1XmlObjectSubjectNameIdentifierEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2XmlObjectAttributeEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2XmlObjectSubjectNameIDEncoderTest.java

Copied: trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/XMLObjectAttributeValue.java (from r4251, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/XMLObjectAttributeValue.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/XMLObjectAttributeValue.java?p2=trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/XMLObjectAttributeValue.java&p1=trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/XMLObjectAttributeValue.java&r1=4251&r2=4252&rev=4252&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/XMLObjectAttributeValue.java (original)
+++ trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/XMLObjectAttributeValue.java Sat Jan  5 07:30:49 2013
@@ -15,19 +15,16 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.saml.impl.attribute.encoding;
+package net.shibboleth.idp.attribute;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.idp.attribute.AttributeValue;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.opensaml.core.xml.XMLObject;
 
 import com.google.common.base.Objects;
-
-// TODO (rdw) this belongs in idp-attribute
 
 /** A {@link XMLObjectAttributeValue} value for an {@link net.shibboleth.idp.attribute.Attribute}. */
 public class XMLObjectAttributeValue implements AttributeValue<XMLObject> {

Modified: trunk/idp-attribute-resolver-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/pom.xml?rev=4252&r1=4251&r2=4252&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/pom.xml (original)
+++ trunk/idp-attribute-resolver-impl/pom.xml Sat Jan  5 07:30:49 2013
@@ -19,6 +19,11 @@
         <!-- Compile Dependencies -->
         <dependency>
             <groupId>${project.groupId}</groupId>
+            <artifactId>idp-attribute-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
             <artifactId>idp-attribute-resolver-api</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -31,9 +36,20 @@
             <artifactId>ldaptive</artifactId>
         </dependency>
         
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-saml-api</artifactId>
+            <version>${opensaml.version}</version>
+        </dependency>
         <!-- Provided Dependencies -->
 
         <!-- Runtime Dependencies -->
+        <dependency>

[... 110 lines stripped ...]