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

[noreply at shibboleth.net]

Author: dfisher
Date: Fri May  3 00:29:45 2013
New Revision: 4458

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4458&view=rev
Log:
IDP-4: add RdbmsDataConnectorParser and unit test.
Missing functionality:
  Velocity based templated builder
  result caching
  column type mapping

Added:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ManagedConnectionParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsDataConnectorParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsData.sql
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsStore.sql
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-v2.xml
Modified:
    trunk/idp-attribute-resolver-spring/pom.xml
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/BaseDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/DataConnectorNamespaceHandler.java

Modified: trunk/idp-attribute-resolver-spring/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/pom.xml?rev=4458&r1=4457&r2=4458&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/pom.xml (original)
+++ trunk/idp-attribute-resolver-spring/pom.xml Fri May  3 00:29:45 2013
@@ -32,6 +32,11 @@
             <artifactId>idp-attribute-resolver-impl</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.mchange</groupId>
+            <artifactId>c3p0</artifactId>
+            <version>0.9.2.1</version>
+        </dependency>
 
         <!-- Provided Dependencies -->
 
@@ -49,6 +54,11 @@
             <groupId>com.unboundid</groupId>
             <artifactId>unboundid-ldapsdk</artifactId>
             <version>2.3.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/BaseDataConnectorParser.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/BaseDataConnectorParser.java?rev=4458&r1=4457&r2=4458&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/BaseDataConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/BaseDataConnectorParser.java Fri May  3 00:29:45 2013
@@ -22,6 +22,7 @@
 import java.util.List;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
 import net.shibboleth.idp.attribute.resolver.spring.AttributeResolverNamespaceHandler;
@@ -87,9 +88,10 @@
      * multiple <beans/> declarations, only the first is returned.
      * 
      * @param config to check for spring beans declaration
+     *
      * @return spring beans element
      */
-    protected Element getSpringBeansElement(final Element config) {
+    @Nullable protected Element getSpringBeansElement(@Nullable final Element config) {
         final List<Element> configElements = ElementSupport.getChildElements(config, SPRING_BEANS_ELEMENT_NAME);
         if (configElements.size() > 0) {
             return configElements.get(0);
@@ -101,18 +103,19 @@
      * Creates a Spring bean factory from the supplied Spring beans element.
      * 
      * @param springBeans to create bean factory from
+     *
      * @return bean factory
      */
-    protected BeanFactory createBeanFactory(final Element springBeans) {
-        final DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
-        final XmlBeanDefinitionReader dr = new XmlBeanDefinitionReader(bf);

[... 79 lines stripped ...]