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

[noreply at shibboleth.net]

Author: rdw
Date: Thu Jan  2 08:40:20 2014
New Revision: 5134

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5134&view=rev
Log:
IDP-346 (port SVN resource) Test loading of the attribute resolver from SVN, with property replacement.

Added:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/SVNAndPropertiesTest.java   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/PropertyPlaceholder.xml   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/SVN.properties   (with props)
Modified:
    trunk/idp-attribute-resolver-spring/pom.xml
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/logback-test.xml

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=5134&r1=5133&r2=5134&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/pom.xml (original)
+++ trunk/idp-attribute-resolver-spring/pom.xml Thu Jan  2 08:40:20 2014
@@ -132,6 +132,14 @@
             <artifactId>hsqldb</artifactId>
             <scope>test</scope>
         </dependency>
+        
+        <dependency>
+             <groupId>org.tmatesoft.svnkit</groupId>
+             <artifactId>svnkit</artifactId>
+             <version>1.7.8</version>
+             <scope>test</scope>
+         </dependency>
+        
         <!-- Managed Dependencies -->
     </dependencies>
 

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParser.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/StaticDataConnectorParser.java?rev=5134&r1=5133&r2=5134&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParser.java Thu Jan  2 08:40:20 2014
@@ -17,7 +17,6 @@
 
 package net.shibboleth.idp.attribute.resolver.spring.dc;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Nonnull;
@@ -30,7 +29,9 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
@@ -47,31 +48,40 @@
     private final Logger log = LoggerFactory.getLogger(StaticDataConnectorParser.class);
 
     /** {@inheritDoc} */
+    @Override
     protected Class<StaticDataConnector> getBeanClass(Element element) {
         return StaticDataConnector.class;
     }
 
     /** {@inheritDoc} */
+    @Override
     protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
             @Nonnull final BeanDefinitionBuilder builder) {
         super.doParse(config, parserContext, builder);
 
         List<Element> children = ElementSupport.getChildElements(config, ATTRIBUTE_ELEMENT_NAME);
-        List<IdPAttribute> attributes = new ArrayList<IdPAttribute>();
+        ManagedList<BeanDefinition> attributes = new ManagedList<BeanDefinition>(children.size());
+        
         for (Element child : children) {
+            
             String attrId = child.getAttributeNS(null, "id");
-            IdPAttribute attribute = new IdPAttribute(attrId);
+            BeanDefinitionBuilder attributeDefn = BeanDefinitionBuilder.rootBeanDefinition(IdPAttribute.class);
+            attributeDefn.addConstructorArgValue(attrId);
+            
             List<Element> values =
                     ElementSupport.getChildElementsByTagNameNS(child, DataConnectorNamespaceHandler.NAMESPACE, "Value");
+            ManagedList<BeanDefinition> inValues = new ManagedList<BeanDefinition>(values.size());
             for (Element val : values) {
-                StringAttributeValue av = new StringAttributeValue(val.getTextContent());
+                BeanDefinitionBuilder value = BeanDefinitionBuilder.genericBeanDefinition(StringAttributeValue.class);
+                value.addConstructorArgValue(val.getTextContent());
                 log.trace("{} Attribute: {}, adding value {} ", new Object[] {getLogPrefix(), attrId,
-                        av.getValue(),});

[... 45 lines stripped ...]