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

[noreply at shibboleth.net]

Author: rdw
Date: Fri Apr 26 10:35:14 2013
New Revision: 4424

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4424&view=rev
Log:
IDP-205 Add in ComputedIdDataConnector and tests.  Also most of the skeleton for the StoredIdDataConnector (but no tests for this latter).

Added:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/BaseComputedIDDataConnectorBeanDefinitionParser.java   (with props)
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorBeanDefinitionParser.java   (with props)
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/StoredIDDataConnectorBeanDefinitionParser.java   (with props)
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorBeanDefinitionParserTest.java   (with props)
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorBeanDefinitionParserTest.java
      - copied, changed from r4423, trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/computed.xml   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/computedNoSalt.xml   (with props)
Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginBeanDefinitionParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/DataConnectorNamespaceHandler.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorTest.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginBeanDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginBeanDefinitionParser.java?rev=4424&r1=4423&r2=4424&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginBeanDefinitionParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginBeanDefinitionParser.java Fri Apr 26 10:35:14 2013
@@ -36,7 +36,7 @@
 public abstract class BaseResolverPluginBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
 
     /** An Id for the definition, used for debugging messages. */
-    private String defnId = "<Unnamed Attribute>";
+    private String defnId = "<Unnamed Attribute or Connector>";
     
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(BaseResolverPluginBeanDefinitionParser.class);

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/DataConnectorNamespaceHandler.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/DataConnectorNamespaceHandler.java?rev=4424&r1=4423&r2=4424&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/DataConnectorNamespaceHandler.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/DataConnectorNamespaceHandler.java Fri Apr 26 10:35:14 2013
@@ -31,12 +31,12 @@
         registerBeanDefinitionParser(StaticDataConnectorBeanDefinitionParser.TYPE_NAME,
                 new StaticDataConnectorBeanDefinitionParser());
         // TODO
-        //registerBeanDefinitionParser(ComputedIDDataConnectorBeanDefinitionParser.TYPE_NAME,
-          //      new ComputedIDDataConnectorBeanDefinitionParser());
-        //registerBeanDefinitionParser(StoredIDDataConnectorBeanDefinitionParser.TYPE_NAME,
-          //      new StoredIDDataConnectorBeanDefinitionParser());
-        //registerBeanDefinitionParser(RDBMSDataConnectorBeanDefinitionParser.TYPE_NAME,
-          //      new RDBMSDataConnectorBeanDefinitionParser());
+        registerBeanDefinitionParser(ComputedIDDataConnectorBeanDefinitionParser.TYPE_NAME,
+                new ComputedIDDataConnectorBeanDefinitionParser());
+        // registerBeanDefinitionParser(StoredIDDataConnectorBeanDefinitionParser.TYPE_NAME,
+        // new StoredIDDataConnectorBeanDefinitionParser());
+        // registerBeanDefinitionParser(RDBMSDataConnectorBeanDefinitionParser.TYPE_NAME,
+        // new RDBMSDataConnectorBeanDefinitionParser());

[... 22 lines stripped ...]