Return-Path: Delivered-To: apmail-openejb-commits-archive@www.apache.org Received: (qmail 6969 invoked from network); 13 Feb 2011 22:31:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 13 Feb 2011 22:31:00 -0000 Received: (qmail 86128 invoked by uid 500); 13 Feb 2011 22:31:00 -0000 Delivered-To: apmail-openejb-commits-archive@openejb.apache.org Received: (qmail 86069 invoked by uid 500); 13 Feb 2011 22:30:59 -0000 Mailing-List: contact commits-help@openejb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openejb.apache.org Delivered-To: mailing list commits@openejb.apache.org Received: (qmail 86062 invoked by uid 99); 13 Feb 2011 22:30:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Feb 2011 22:30:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 13 Feb 2011 22:30:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B48912388900; Sun, 13 Feb 2011 22:30:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1070316 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java Date: Sun, 13 Feb 2011 22:30:38 -0000 To: commits@openejb.apache.org From: jgallimore@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110213223038.B48912388900@eris.apache.org> Author: jgallimore Date: Sun Feb 13 22:30:38 2011 New Revision: 1070316 URL: http://svn.apache.org/viewvc?rev=1070316&view=rev Log: Adding tomcat-juli.jar to classpath so RemoteServer can start Tomcat 7 correctly Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java?rev=1070316&r1=1070315&r2=1070316&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java Sun Feb 13 22:30:38 2011 @@ -136,6 +136,7 @@ public class RemoteServer { } else { File bin = new File(home, "bin"); File bootstrapJar = new File(bin, "bootstrap.jar"); + File juliJar = new File(bin, "tomcat-juli.jar"); File commonsLoggingJar = new File(bin, "commons-logging-api.jar"); File conf = new File(home, "conf"); @@ -165,7 +166,7 @@ public class RemoteServer { "-Dcatalina.home=" + home.getAbsolutePath(), "-Dopenejb.servicemanager.enabled=" + Boolean.getBoolean("openejb.servicemanager.enabled"), - "-classpath", bootstrapJar.getAbsolutePath() + ":" + commonsLoggingJar.getAbsolutePath(), + "-classpath", bootstrapJar.getAbsolutePath() + ":" + juliJar.getAbsolutePath() + ":"+ commonsLoggingJar.getAbsolutePath(), "org.apache.catalina.startup.Bootstrap", "start" }; @@ -185,7 +186,7 @@ public class RemoteServer { "-Dcatalina.home=" + home.getAbsolutePath(), "-Dopenejb.servicemanager.enabled=" + Boolean.getBoolean("openejb.servicemanager.enabled"), - "-classpath", bootstrapJar.getAbsolutePath() + ":" + commonsLoggingJar.getAbsolutePath(), + "-classpath", bootstrapJar.getAbsolutePath() + ":" + juliJar.getAbsolutePath() + ":" + commonsLoggingJar.getAbsolutePath(), "org.apache.catalina.startup.Bootstrap", "start" };