[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src: main/java/net/shibboleth/idp/profile/spring/relying...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct 24 15:53:41 2016
New Revision: 8530

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8530&view=rev
Log:
Add a factory bean for ExplicitKeyTrustEngines on top of Static credentials.

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/StaticExplicitKeyFactoryBean.java   (with props)
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/StaticExplicitKeyFactoryBeanTest.java   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicitNative.xml
Modified:
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/AbstractSecurityParserTest.java

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/AbstractSecurityParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/AbstractSecurityParserTest.java?rev=8530&r1=8529&r2=8530&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/AbstractSecurityParserTest.java	(original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/AbstractSecurityParserTest.java	Mon Oct 24 15:53:41 2016
@@ -91,6 +91,10 @@
     }
     
     protected <T> T getBean(final Class<T> claz,  final boolean validating, final String... files) throws IOException{
+        return getBean(null, claz, validating, files);
+    }
+
+    protected <T> T getBean(final String name, final Class<T> claz,  final boolean validating, final String... files) throws IOException{
         final Resource[] resources = new Resource[files.length];
        
         for (int i = 0; i < files.length; i++) {
@@ -116,7 +120,10 @@
         configReader.loadBeanDefinitions(resources);
         context.refresh();
         
-        return context.getBean(claz);
+        if (name != null) {
+            return context.getBean(name, claz);
+        } else {
+            return context.getBean(claz);
+        }
     }
-
 }