[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: Thu Feb 20 15:23:00 2014
New Revision: 5427

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5427&view=rev
Log:
IDP-370 Use #setInitMtehodName on the builders of all parsers for PrincipalConnectors.

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/AbstractPrincipalConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/TransientConnectorParser.java
    trunk/idp-conf/src/main/resources/conf/idp.properties

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/AbstractPrincipalConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/AbstractPrincipalConnectorParser.java?rev=5427&r1=5426&r2=5427&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/AbstractPrincipalConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/AbstractPrincipalConnectorParser.java Thu Feb 20 15:23:00 2014
@@ -50,6 +50,10 @@
     /** {@inheritDoc} */
     @Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
             @Nonnull final BeanDefinitionBuilder builder) {
+        
+        builder.setInitMethodName("initialize");
+        //TODO builder.setDestroyMethodName("destroy");
+        
         super.doParse(config, parserContext, builder);
 
         // First up, add the per type decoders

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectConnectorParser.java?rev=5427&r1=5426&r2=5427&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectConnectorParser.java Thu Feb 20 15:23:00 2014
@@ -41,11 +41,16 @@
             @Nonnull final BeanDefinitionBuilder builder) {
 
         BeanDefinitionBuilder subBuilder = BeanDefinitionBuilder.genericBeanDefinition(DirectNameIDDecoder.class);
+        subBuilder.setInitMethodName("initialize");
+        //TODO subBuilder.setDestroyMethodName("destroy");
         final String id = config.getAttributeNS(null, "id");
         subBuilder.addPropertyValue("id", id);
         builder.addConstructorArgValue(subBuilder.getBeanDefinition());
+        
 
         subBuilder = BeanDefinitionBuilder.genericBeanDefinition(DirectNameIdentifierDecoder.class);
+        subBuilder.setInitMethodName("initialize");
+        //TODO subBuilder.setDestroyMethodName("destroy");
         subBuilder.addPropertyValue("id", id);
         builder.addConstructorArgValue(subBuilder.getBeanDefinition());
     }

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/TransientConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/TransientConnectorParser.java?rev=5427&r1=5426&r2=5427&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/TransientConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/TransientConnectorParser.java Thu Feb 20 15:23:00 2014
@@ -48,6 +48,8 @@
         
         // NameID
         BeanDefinitionBuilder subBuilder = BeanDefinitionBuilder.genericBeanDefinition(TransientNameIDDecoder.class);
+        subBuilder.setInitMethodName("initialize");
+        //TODO subBuilder.setDestroyMethodName("destroy");
         subBuilder.addPropertyReference("idStore", idStore);
         final String id = config.getAttributeNS(null, "id");
         subBuilder.addPropertyValue("id", id);
@@ -56,6 +58,8 @@
         
         // NameIdentifier
         subBuilder = BeanDefinitionBuilder.genericBeanDefinition(TransientNameIdentifierDecoder.class);
+        subBuilder.setInitMethodName("initialize");
+        //TODO subBuilder.setDestroyMethodName("destroy");
         subBuilder.addPropertyReference("idStore", idStore);
         subBuilder.addPropertyValue("id", id);

[... 19 lines stripped ...]