[java-identity-provider COMMIT] in /trunk: idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/fil...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Nov 18 23:41:03 2014
New Revision: 6949

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6949&view=rev
Log:
Add support for BeanFactoryPostProcessor injection to SpringSupport and Service APIs.

Modified:
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
    trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java

Modified: trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java?rev=6949&r1=6948&r2=6949&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java (original)
+++ trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java Tue Nov 18 23:41:03 2014
@@ -30,6 +30,7 @@
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.service.ServiceException;
 
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.support.GenericApplicationContext;
@@ -63,8 +64,8 @@
         final Resource resource = new ClassPathResource(SERVICE_CONFIG_DIR + name);
         final GenericApplicationContext context =
                 SpringSupport.newContext(name, Collections.singletonList(resource),
-                        Collections.<BeanPostProcessor> emptyList(),
-                        Collections.<ApplicationContextInitializer> emptyList(), null);
+                        Collections.<BeanFactoryPostProcessor>emptyList(), Collections.<BeanPostProcessor>emptyList(),
+                        Collections.<ApplicationContextInitializer>emptyList(), null);
         final AttributeFilterServiceStrategy strategy = new AttributeFilterServiceStrategy();
         strategy.setId("ID");
         strategy.initialize();

Modified: trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java?rev=6949&r1=6948&r2=6949&view=diff
==============================================================================
--- trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java (original)
+++ trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java Tue Nov 18 23:41:03 2014
@@ -33,6 +33,7 @@
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.support.GenericApplicationContext;
@@ -183,8 +184,8 @@
 
             final GenericApplicationContext context =
                     SpringSupport.newContext(MetadataGeneratorTask.class.getName(),
-                            Collections.singletonList(resource), Collections.<BeanPostProcessor> emptyList(),
-                            Collections.singletonList(initializer), null);
+                            Collections.singletonList(resource), Collections.<BeanFactoryPostProcessor>emptyList(),
+                            Collections.<BeanPostProcessor>emptyList(), Collections.singletonList(initializer), null);
 
             parameters = context.getBean("IdPConfiguration", MetadataGeneratorParameters.class);