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

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Mar 11 17:05:48 2013
New Revision: 4323

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4323&view=rev
Log:
More work on spring wiring for the attribute resolver. Still wrong, but at least we can resolve a static attribute.

Added:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginBeanDefinitionParser.java   (with props)
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/DataConnectorNamespaceHandler.java   (with props)
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/StaticDataConnectorBeanDefinitionParser.java   (with props)
Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverBeanDefinitionParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverService.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/SimpleAttributeDefinitionBeanDefinitionParser.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/TestAttributeResolverService.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverBeanDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverBeanDefinitionParser.java?rev=4323&r1=4322&r2=4323&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverBeanDefinitionParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverBeanDefinitionParser.java Mon Mar 11 17:05:48 2013
@@ -52,8 +52,6 @@
     /** {@inheritDoc} */
     public BeanDefinition parse(Element config, ParserContext context) {
 
-        log.info("parse");
-
         // Map<QName, List<Element>> configChildren = XMLHelper.getChildElements(config);
         Map<QName, List<Element>> configChildren = ElementSupport.getIndexedChildElements(config);
         List<Element> children;
@@ -63,6 +61,7 @@
 
         children = configChildren.get(new QName(AttributeResolverNamespaceHandler.NAMESPACE, "DataConnector"));
         // SpringConfigurationUtils.parseCustomElements(children, context);
+        SpringSupport.parseCustomElements(children, context);
 
         children = configChildren.get(new QName(AttributeResolverNamespaceHandler.NAMESPACE, "AttributeDefinition"));
         // SpringConfigurationUtils.parseCustomElements(children, context);

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverService.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverService.java?rev=4323&r1=4322&r2=4323&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverService.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverService.java Mon Mar 11 17:05:48 2013
@@ -1,15 +1,15 @@
 
 package net.shibboleth.idp.attribute.resolver.spring;
 
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
+import java.util.Map;
 
 import javax.annotation.Nonnull;
 
 import net.shibboleth.idp.attribute.resolver.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.AttributeResolver;
 import net.shibboleth.idp.attribute.resolver.BaseAttributeDefinition;
+import net.shibboleth.idp.attribute.resolver.BaseDataConnector;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.service.AbstractSpringService;
 import net.shibboleth.idp.service.ServiceException;
@@ -18,7 +18,6 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
 
 // TODO incomplete
@@ -47,9 +46,8 @@
         attributeResolver.resolveAttributes(resolutionContext);
     }
 
+    // TODO probably wrong
     protected void doPreStart(HashMap context) throws ServiceException {
-
-        // TODO probably wrong
 
         // TODO do we have to init resources here ?
         log.debug("getServiceConfigurations() '{}'", getServiceConfigurations());
@@ -68,16 +66,14 @@
 
         GenericApplicationContext appCtx = (GenericApplicationContext) context.get(APP_CTX_CTX_KEY);
 

[... 123 lines stripped ...]