continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wsm...@apache.org
Subject svn commit: r703846 - /continuum/sandbox/continuum-tomcat/pom.xml
Date Sun, 12 Oct 2008 16:48:43 GMT
Author: wsmoak
Date: Sun Oct 12 09:48:42 2008
New Revision: 703846

URL: http://svn.apache.org/viewvc?rev=703846&view=rev
Log:
Add dependency on Catalina and switch to org.apache.catalina.startup.Embedded to start Tomcat.
 Stay with 5.5.15 for now due to other dependencies already listed.

Modified:
    continuum/sandbox/continuum-tomcat/pom.xml

Modified: continuum/sandbox/continuum-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/continuum/sandbox/continuum-tomcat/pom.xml?rev=703846&r1=703845&r2=703846&view=diff
==============================================================================
--- continuum/sandbox/continuum-tomcat/pom.xml (original)
+++ continuum/sandbox/continuum-tomcat/pom.xml Sun Oct 12 09:48:42 2008
@@ -24,7 +24,7 @@
     <groupId>org.apache.continuum</groupId>
     <version>1.3-SNAPSHOT</version>
   </parent>
-  <artifactId>continuum-jetty</artifactId>
+  <artifactId>continuum-tomcat</artifactId>
   <packaging>pom</packaging>
   <name>Apache Continuum</name>
   <dependencies>
@@ -123,6 +123,11 @@
       </exclusions>
     </dependency>
     <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>catalina</artifactId>
+      <version>${tomcat.version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl104-over-slf4j</artifactId>
       <version>1.5.0</version>
@@ -157,7 +162,7 @@
           <daemons>
             <daemon>
               <id>continuum</id>
-              <mainClass>org.mortbay.start.Main</mainClass>
+              <mainClass>org.apache.catalina.startup.Embedded</mainClass>
               <commandLineArguments>
                 <commandLineArgument>conf/jetty.xml</commandLineArgument>
                 <commandLineArgument>conf/jetty-logging.xml</commandLineArgument>

@@ -293,5 +298,6 @@
   </pluginRepositories>
   <properties>
     <jetty.version>6.1.11</jetty.version>
+    <tomcat.version>5.5.15</tomcat.version>
   </properties>
 </project>



Mime
View raw message