Return-Path: 
 <commits-return-4413-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org>
Delivered-To: apmail-continuum-commits-archive@www.apache.org
Received: (qmail 36433 invoked from network); 12 Oct 2008 16:49:34 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 12 Oct 2008 16:49:34 -0000
Received: (qmail 79659 invoked by uid 500); 12 Oct 2008 16:49:34 -0000
Delivered-To: apmail-continuum-commits-archive@continuum.apache.org
Received: (qmail 79650 invoked by uid 500); 12 Oct 2008 16:49:34 -0000
Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@continuum.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@continuum.apache.org>
List-Post: <mailto:commits@continuum.apache.org>
List-Id: <commits.continuum.apache.org>
Reply-To: dev@continuum.apache.org
Delivered-To: mailing list commits@continuum.apache.org
Received: (qmail 79640 invoked by uid 99); 12 Oct 2008 16:49:34 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 12 Oct 2008 09:49:34 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 12 Oct 2008 16:48:36 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 5975B23888A5; Sun, 12 Oct 2008 09:48:43 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r703846 - /continuum/sandbox/continuum-tomcat/pom.xml
Date: Sun, 12 Oct 2008 16:48:43 -0000
To: commits@continuum.apache.org
From: wsmoak@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081012164843.5975B23888A5@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>