svn commit: r1507592 - in /webservices/axiom/trunk/axiom-spring-ws/src/test: java/org/apache/axiom/spring/ws/test/jdom/ClientServerTest.java resources/org/apache/axiom/spring/ws/test/jdom/spring-ws-servlet.xml webapps/

[ve...@apache.org]

Author: veithen
Date: Sat Jul 27 07:29:39 2013
New Revision: 1507592

URL: http://svn.apache.org/r1507592
Log:
AXIOM-447: Create the servlet context programmatically instead of using an exploded WAR. This should make it easier to create parameterized tests.

Added:
    webservices/axiom/trunk/axiom-spring-ws/src/test/resources/org/apache/axiom/spring/ws/test/jdom/spring-ws-servlet.xml
      - copied unchanged from r1506960, webservices/axiom/trunk/axiom-spring-ws/src/test/webapps/jdom/WEB-INF/spring-ws-servlet.xml
Removed:
    webservices/axiom/trunk/axiom-spring-ws/src/test/webapps/
Modified:
    webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/jdom/ClientServerTest.java

Modified: webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/jdom/ClientServerTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/jdom/ClientServerTest.java?rev=1507592&r1=1507591&r2=1507592&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/jdom/ClientServerTest.java (original)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/java/org/apache/axiom/spring/ws/test/jdom/ClientServerTest.java Sat Jul 27 07:29:39 2013
@@ -22,7 +22,8 @@ import static org.junit.Assert.assertEqu
 
 import org.apache.axiom.testutils.PortAllocator;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
 import org.jdom2.input.SAXBuilder;
 import org.jdom2.transform.JDOMResult;
 import org.jdom2.transform.JDOMSource;
@@ -34,6 +35,7 @@ import org.springframework.core.env.Conf
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.mock.env.MockPropertySource;
 import org.springframework.ws.client.core.WebServiceTemplate;
+import org.springframework.ws.transport.http.MessageDispatcherServlet;
 
 public class ClientServerTest {
     private static Server server;
@@ -44,7 +46,12 @@ public class ClientServerTest {
     public static void setUp() throws Exception {
         port = PortAllocator.allocatePort();
         server = new Server(port);
-        new WebAppContext(server, "src/test/webapps/jdom", "/");
+        ServletContextHandler handler = new ServletContextHandler(server, "/");
+        ServletHolder servlet = new ServletHolder(MessageDispatcherServlet.class);
+        servlet.setName("spring-ws");
+        servlet.setInitParameter("contextConfigLocation", ClientServerTest.class.getResource("spring-ws-servlet.xml").toString());
+        servlet.setInitOrder(1);
+        handler.addServlet(servlet, "/*");
         server.start();
         
         context = new GenericXmlApplicationContext();