svn commit: r1547292 - /archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java

[ol...@apache.org]

Author: olamy
Date: Tue Dec  3 05:46:50 2013
New Revision: 1547292

URL: http://svn.apache.org/r1547292
Log:
use tomcat here

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java?rev=1547292&r1=1547291&r2=1547292&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java Tue Dec  3 05:46:50 2013
@@ -27,6 +27,10 @@ import org.apache.archiva.rest.api.servi
 import org.apache.archiva.rest.api.services.RepositoryGroupService;
 import org.apache.archiva.rest.api.services.SearchService;
 import org.apache.archiva.webdav.RepositoryServlet;
+import org.apache.catalina.Context;
+import org.apache.catalina.deploy.ApplicationListener;
+import org.apache.catalina.deploy.ApplicationParameter;
+import org.apache.catalina.startup.Tomcat;
 import org.apache.commons.lang.StringUtils;
 import org.apache.cxf.common.util.Base64Utility;
 import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
@@ -68,6 +72,8 @@ public abstract class AbstractDownloadTe
 
     public Server server = null;
 
+    public Tomcat tomcat;
+
     public int port;
 
     public static String encode( String uid, String password )
@@ -101,6 +107,8 @@ public abstract class AbstractDownloadTe
     {
 
         System.setProperty( "redback.admin.creation.file", "target/auto-admin-creation.properties" );
+
+        /*
         this.server = new Server( 0 );
 
         ServletContextHandler context = new ServletContextHandler();
@@ -128,6 +136,31 @@ public abstract class AbstractDownloadTe
         this.server.start();
         Connector connector = this.server.getConnectors()[0];
         this.port = connector.getLocalPort();
+        */
+        tomcat = new Tomcat();
+        tomcat.setBaseDir( System.getProperty( "java.io.tmpdir" ) );
+        tomcat.setPort( 0 );
+
+        Context context = tomcat.addContext( "", System.getProperty( "java.io.tmpdir" ) );
+
+        ApplicationParameter applicationParameter = new ApplicationParameter();
+        applicationParameter.setName( "contextConfigLocation" );
+        applicationParameter.setValue( getSpringConfigLocation() );
+        context.addApplicationParameter( applicationParameter );
+
+        context.addApplicationListener( new ApplicationListener( ContextLoaderListener.class.getName(), false ) );
+
+        tomcat.addServlet( context, "cxf", new CXFServlet() );
+        context.addServletMapping( "/" + getRestServicesPath() + "/*" , "cxf" );
+
+        tomcat.addServlet( context, "archivarepo", new RepositoryServlet() );
+        context.addServletMapping( "/repository/*" , "archivarepo" );
+
+        tomcat.start();
+
+        port = tomcat.getConnector().getLocalPort();
+
+
         log.info( "start server on port {}", this.port );
 
         User user = new User();
@@ -152,6 +185,10 @@ public abstract class AbstractDownloadTe
         {
             this.server.stop();
         }
+        if (this.tomcat != null)
+        {
+            this.tomcat.stop();
+        }
     }