[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/java/net/shibboleth/idp/conf/OpensamlConfigBean.java idp...

[noreply at shibboleth.net]

Author: tzeller
Date: Fri Dec 27 11:59:31 2013
New Revision: 5093

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5093&view=rev
Log:
Move OpensamlConfigBean from the testbed and idp-conf to the spring package in idp-core.

Added:
    trunk/idp-core/src/main/java/net/shibboleth/idp/spring/OpensamlConfigBean.java
      - copied, changed from r5092, trunk/idp-conf/src/main/java/net/shibboleth/idp/conf/OpensamlConfigBean.java
Modified:
    trunk/idp-conf/src/main/java/net/shibboleth/idp/conf/OpensamlConfigBean.java
    trunk/idp-conf/src/main/resources/system/conf/global-system.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=5093&r1=5092&r2=5093&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 Fri Dec 27 11:59:31 2013
@@ -35,7 +35,7 @@
           p:reloadTaskTimer-ref="shibboleth.TaskTimer"
           p:failFast="${idp.service.logging.failFast}"/>
     
-    <bean id="shibboleth.OpensamlConfig" class="common.OpensamlConfigBean"
+    <bean id="shibboleth.OpensamlConfig" class="net.shibboleth.idp.spring.OpensamlConfigBean"
         depends-on="shibboleth.LogbackLogging" p:parserPool-ref="shibboleth.ParserPool" />
 
     <bean id="shibboleth.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean" depends-on="shibboleth.LogbackLogging">

Copied: trunk/idp-core/src/main/java/net/shibboleth/idp/spring/OpensamlConfigBean.java (from r5092, trunk/idp-conf/src/main/java/net/shibboleth/idp/conf/OpensamlConfigBean.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/spring/OpensamlConfigBean.java?p2=trunk/idp-core/src/main/java/net/shibboleth/idp/spring/OpensamlConfigBean.java&p1=trunk/idp-conf/src/main/java/net/shibboleth/idp/conf/OpensamlConfigBean.java&r1=5092&r2=5093&rev=5093&view=diff
==============================================================================
--- trunk/idp-conf/src/main/java/net/shibboleth/idp/conf/OpensamlConfigBean.java (original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/spring/OpensamlConfigBean.java Fri Dec 27 11:59:31 2013
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.conf;
+package net.shibboleth.idp.spring;
 
 
 import javax.annotation.Nonnull;