[java-idp-testbed COMMIT] in /trunk/src: main/webapp/WEB-INF/web.xml test/java/idp/AbstractFlowTest.java

[noreply at shibboleth.net]

Author: scantor
Date: Wed May  7 21:25:41 2014
New Revision: 219

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=219&view=rev
Log:
Move webflow-config to system tree

Modified:
    trunk/src/main/webapp/WEB-INF/web.xml
    trunk/src/test/java/idp/AbstractFlowTest.java

Modified: trunk/src/main/webapp/WEB-INF/web.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/webapp/WEB-INF/web.xml?rev=219&r1=218&r2=219&view=diff
==============================================================================
--- trunk/src/main/webapp/WEB-INF/web.xml (original)
+++ trunk/src/main/webapp/WEB-INF/web.xml Wed May  7 21:25:41 2014
@@ -73,7 +73,7 @@
         <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
         <init-param>
             <param-name>contextConfigLocation</param-name>
-            <param-value>file:///${idp.home}/system/conf/mvc-beans.xml file:///${idp.home}/conf/webflow-config.xml /WEB-INF/idp/testbed.xml</param-value>
+            <param-value>file:///${idp.home}/system/conf/mvc-beans.xml file:///${idp.home}/system/conf/webflow-config.xml /WEB-INF/idp/testbed.xml</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>

Modified: trunk/src/test/java/idp/AbstractFlowTest.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/AbstractFlowTest.java?rev=219&r1=218&r2=219&view=diff
==============================================================================
--- trunk/src/test/java/idp/AbstractFlowTest.java (original)
+++ trunk/src/test/java/idp/AbstractFlowTest.java Wed May  7 21:25:41 2014
@@ -77,7 +77,7 @@
  * Abstract flow test.
  */
 @ContextConfiguration({"/system/conf/global-system.xml", "/conf/global-user.xml", "/system/conf/mvc-beans.xml",
-        "/conf/webflow-config.xml"})
+        "/system/conf/webflow-config.xml"})
 @WebAppConfiguration
 public abstract class AbstractFlowTest extends AbstractTestNGSpringContextTests {