[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 12:14:54 2016
New Revision: 8548

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8548&view=rev
Log:
Relocate static trust engine factory bean class.

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/StaticExplicitKeyFactoryBean.java
      - copied, changed from r8544, trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/StaticExplicitKeyFactoryBean.java
Modified:
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/StaticExplicitKeyFactoryBean.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicitNative.xml

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=8548&r1=8547&r2=8548&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 12:14:54 2016
@@ -331,7 +331,7 @@
         factory-method="buildTLSSocketFactoryWithClientTLS" />
     
     <bean id="shibboleth.StaticTrustEngine" abstract="true"
-        class="net.shibboleth.idp.profile.spring.relyingparty.security.trustengine.impl.StaticExplicitKeyFactoryBean" />
+        class="net.shibboleth.idp.profile.spring.factory.StaticExplicitKeyFactoryBean" />
     
     <!-- Default Jackson ObjectMapper with JodaTime support. -->
     

Copied: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/StaticExplicitKeyFactoryBean.java (from r8544, trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/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?p2=trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/StaticExplicitKeyFactoryBean.java&p1=trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/StaticExplicitKeyFactoryBean.java&r1=8544&r2=8548&rev=8548&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/impl/StaticExplicitKeyFactoryBean.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/StaticExplicitKeyFactoryBean.java	Wed Oct 26 12:14:54 2016
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.profile.spring.relyingparty.security.trustengine.impl;
+package net.shibboleth.idp.profile.spring.factory;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicitNative.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicitNative.xml?rev=8548&r1=8547&r2=8548&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicitNative.xml	(original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicitNative.xml	Wed Oct 26 12:14:54 2016
@@ -12,19 +12,19 @@
 		location="classpath:/net/shibboleth/idp/profile/spring/relyingparty/file.properties" />
 
     <bean id="staticKeySingle"
-        class="net.shibboleth.idp.profile.spring.relyingparty.security.trustengine.impl.StaticExplicitKeyFactoryBean"
+        class="net.shibboleth.idp.profile.spring.factory.StaticExplicitKeyFactoryBean"
         p:publicKeys="classpath:/net/shibboleth/idp/profile/spring/relyingparty/security/credential/publicKey.pem" />
 
     <bean id="staticX509Single"
-        class="net.shibboleth.idp.profile.spring.relyingparty.security.trustengine.impl.StaticExplicitKeyFactoryBean"
+        class="net.shibboleth.idp.profile.spring.factory.StaticExplicitKeyFactoryBean"
         p:certificates="classpath:/net/shibboleth/idp/profile/spring/relyingparty/security/credential/cert.pem" />
 
     <bean id="staticX509Multiple"
-        class="net.shibboleth.idp.profile.spring.relyingparty.security.trustengine.impl.StaticExplicitKeyFactoryBean"
+        class="net.shibboleth.idp.profile.spring.factory.StaticExplicitKeyFactoryBean"

[... 9 lines stripped ...]