[java-identity-provider COMMIT] in /trunk: idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java...

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Jun 23 11:38:29 2014
New Revision: 6155

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6155&view=rev
Log:
Move the idp.properties app ctx nitializer from spring-extensions to idp-core.

Added:
    trunk/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationContextInitializer.java   (with props)
Modified:
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
    trunk/idp-core/pom.xml
    trunk/idp-war/src/main/webapp/WEB-INF/web.xml

Modified: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java?rev=6155&r1=6154&r2=6155&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java (original)
+++ trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java Mon Jun 23 11:38:29 2014
@@ -30,12 +30,12 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import net.shibboleth.ext.spring.context.IdPPropertiesApplicationContextInitializer;
 import net.shibboleth.ext.spring.factory.X509CertificateFactoryBean;
 import net.shibboleth.idp.authn.SubjectCanonicalizationFlowDescriptor;
 import net.shibboleth.idp.profile.logic.RelyingPartyIdPredicate;
 import net.shibboleth.idp.saml.nameid.impl.NameIDCanonicalization;
 import net.shibboleth.idp.saml.nameid.impl.NameIdentifierCanonicalization;
+import net.shibboleth.idp.spring.IdPPropertiesApplicationContextInitializer;
 import net.shibboleth.idp.test.InMemoryDirectory;
 import net.shibboleth.idp.test.PreferFileSystemContextLoader;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;

Modified: trunk/idp-core/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/pom.xml?rev=6155&r1=6154&r2=6155&view=diff
==============================================================================
--- trunk/idp-core/pom.xml (original)
+++ trunk/idp-core/pom.xml Mon Jun 23 11:38:29 2014
@@ -35,6 +35,10 @@
           <artifactId>spring-context</artifactId>
         </dependency>
         <dependency>
+          <groupId>${spring.groupId}</groupId>
+          <artifactId>spring-web</artifactId>
+        </dependency>
+        <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
             <scope>compile</scope><!-- normally runtime -->

Modified: trunk/idp-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-war/src/main/webapp/WEB-INF/web.xml?rev=6155&r1=6154&r2=6155&view=diff
==============================================================================
--- trunk/idp-war/src/main/webapp/WEB-INF/web.xml (original)
+++ trunk/idp-war/src/main/webapp/WEB-INF/web.xml Mon Jun 23 11:38:29 2014
@@ -20,7 +20,7 @@
     
     <context-param>
         <param-name>contextInitializerClasses</param-name>
-        <param-value>net.shibboleth.ext.spring.context.IdPPropertiesApplicationContextInitializer</param-value>
+        <param-value>net.shibboleth.idp.spring.IdPPropertiesApplicationContextInitializer</param-value>
     </context-param>
 
     <!-- Spring listener used to load up the configuration -->