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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Mar 12 18:02:38 2014
New Revision: 5561

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5561&view=rev
Log:
Move remaining targeted ID generation classes into SAML module.

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/AbstractComputedIDDataConnector.java
      - copied, changed from r5560, trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractComputedIDDataConnector.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/ComputedIDDataConnector.java
      - copied, changed from r5560, trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ComputedIDDataConnector.java
Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractComputedIDDataConnector.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ComputedIDDataConnector.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ComputedIDDataConnectorTest.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/BaseComputedIDDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIDDataConnector.java

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ComputedIDDataConnectorTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ComputedIDDataConnectorTest.java?rev=5561&r1=5560&r2=5561&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ComputedIDDataConnectorTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ComputedIDDataConnectorTest.java Wed Mar 12 18:02:38 2014
@@ -23,15 +23,15 @@
 
 import net.shibboleth.idp.attribute.IdPAttributeValue;
 import net.shibboleth.idp.attribute.StringAttributeValue;
-import net.shibboleth.idp.attribute.resolver.AbstractComputedIDDataConnector;
 import net.shibboleth.idp.attribute.resolver.AttributeDefinition;
 import net.shibboleth.idp.attribute.resolver.AttributeResolver;
 import net.shibboleth.idp.attribute.resolver.DataConnector;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImpl;
-import net.shibboleth.idp.attribute.resolver.impl.dc.ComputedIDDataConnector;
 import net.shibboleth.idp.saml.impl.TestSources;
+import net.shibboleth.idp.saml.impl.attribute.resolver.AbstractComputedIDDataConnector;
+import net.shibboleth.idp.saml.impl.attribute.resolver.ComputedIDDataConnector;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.component.UnmodifiableComponentException;

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/BaseComputedIDDataConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/BaseComputedIDDataConnectorParser.java?rev=5561&r1=5560&r2=5561&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/BaseComputedIDDataConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/BaseComputedIDDataConnectorParser.java Wed Mar 12 18:02:38 2014
@@ -30,7 +30,7 @@
 
 /**
  * Spring bean definition parser for configuring
- * {@link net.shibboleth.idp.attribute.resolver.impl.dc.ComputedIDDataConnector} and
+ * {@link net.shibboleth.idp.saml.impl.attribute.resolver.ComputedIDDataConnector} and
  * {@link net.shibboleth.idp.saml.impl.attribute.resolver.StoredIDDataConnector}.
  */
 public abstract class BaseComputedIDDataConnectorParser extends AbstractDataConnectorParser {
@@ -39,7 +39,7 @@
     private final Logger log = LoggerFactory.getLogger(BaseComputedIDDataConnectorParser.class);
 
     /**
-     * Parse the common definitions for {@link net.shibboleth.idp.attribute.resolver.impl.dc.ComputedIDDataConnector}

[... 98 lines stripped ...]