[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: Mon Feb  9 07:49:34 2015
New Revision: 7328

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7328&view=rev
Log:
IDP-592 Add missed schema changes.  Fix logging and defaulting of the BeanFactoryPostProcessor.  Fix tests

Added:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/externalBeans.xml
      - copied, changed from r7322, trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/velocity.xml
Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
    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/ldap/PropertyPlaceholder.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-props-context.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-props.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2-props.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/PropertyPlaceholder.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-props-context.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-props.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-v2-props.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/velocity.xml
    trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.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/AbstractDataConnectorParser.java?rev=7328&r1=7327&r2=7328&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java Mon Feb  9 07:49:34 2015
@@ -122,13 +122,16 @@
             }
             if (config.hasAttribute(ATTR_FACTORY_POSTPROCESSORS_REF)) {
                 final String factoryPostProcessorsRef = config.getAttributeNS(null, ATTR_FACTORY_POSTPROCESSORS_REF);
-                log.debug("{} native conifuguration from bean {}", getLogPrefix(), factoryPostProcessorsRef);
-                builder.addPropertyReference("factoryPostProcessors",factoryPostProcessorsRef);
+                log.debug("{} Factory Bean Post Processors {}", getLogPrefix(), factoryPostProcessorsRef);
+                builder.addPropertyReference("beanFactoryPostProcessors",factoryPostProcessorsRef);
+            } else {
+                log.debug("{} Adding default Factory Bean Post Processors shibboleth.PropertySourcesPlaceholderConfigurer", getLogPrefix()); 
+                builder.addPropertyReference("beanFactoryPostProcessors","shibboleth.PropertySourcesPlaceholderConfigurer");
             }
             if (config.hasAttribute(ATTR_POSTPROCESSORS_REF)) {
                 final String postProcessorsRef = config.getAttributeNS(null, ATTR_POSTPROCESSORS_REF);
-                log.debug("{} native conifuguration from bean {}", getLogPrefix(), postProcessorsRef);
-                builder.addPropertyReference("factoryPostProcessors", postProcessorsRef);
+                log.debug("{} Bean Post Processors {}", getLogPrefix(), postProcessorsRef);
+                builder.addPropertyReference("beanPostProcessors", postProcessorsRef);
             }
         } else {
             doV2Parse(config, parserContext, builder);

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java

[... 642 lines stripped ...]