[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/global-system.xml idp-profile-spri...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Oct 26 15:13:24 2016
New Revision: 8549

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8549&view=rev
Log:
IDP-1073 - Factory beans for easier handling of simple trust scenarios.

https://issues.shibboleth.net/jira/browse/IDP-1073

PKIX trust engine factory bean.

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/StaticPKIXFactoryBean.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/StaticExplicitKeyFactoryBean.java

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=8549&r1=8548&r2=8549&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml	Wed Oct 26 15:13:24 2016
@@ -330,8 +330,11 @@
         class="org.opensaml.security.httpclient.impl.SecurityEnhancedHttpClientSupport"
         factory-method="buildTLSSocketFactoryWithClientTLS" />
     
-    <bean id="shibboleth.StaticTrustEngine" abstract="true"
+    <bean id="shibboleth.StaticExplicitTrustEngine" abstract="true"
         class="net.shibboleth.idp.profile.spring.factory.StaticExplicitKeyFactoryBean" />
+    
+    <bean id="shibboleth.StaticPKIXTrustEngine" abstract="true"
+        class="net.shibboleth.idp.profile.spring.factory.StaticPKIXFactoryBean" />
     
     <!-- Default Jackson ObjectMapper with JodaTime support. -->
     

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/StaticExplicitKeyFactoryBean.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/StaticExplicitKeyFactoryBean.java?rev=8549&r1=8548&r2=8549&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/StaticExplicitKeyFactoryBean.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/StaticExplicitKeyFactoryBean.java	Wed Oct 26 15:13:24 2016
@@ -40,18 +40,18 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.FatalBeanException;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.core.io.Resource;
 
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
 
+import net.shibboleth.ext.spring.factory.AbstractComponentAwareFactoryBean;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 
 /**
  * Factory bean for simple use cases involving the {@link ExplicitKeyTrustEngine} and static credentials.
  */
-public class StaticExplicitKeyFactoryBean extends AbstractFactoryBean<ExplicitKeyTrustEngine> {
+public class StaticExplicitKeyFactoryBean extends AbstractComponentAwareFactoryBean<ExplicitKeyTrustEngine> {
 
     /** log. */
     private Logger log = LoggerFactory.getLogger(StaticExplicitKeyFactoryBean.class);
@@ -127,7 +127,7 @@
 
     /** {@inheritDoc} */
     @Override
-    protected ExplicitKeyTrustEngine createInstance() throws Exception {
+    protected ExplicitKeyTrustEngine doCreateInstance() throws Exception {
         return new ExplicitKeyTrustEngine(new StaticCredentialResolver(getCredentials()));
     }