Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 95935 invoked from network); 10 Jun 2009 17:05:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Jun 2009 17:05:17 -0000 Received: (qmail 75662 invoked by uid 500); 10 Jun 2009 17:05:28 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 75604 invoked by uid 500); 10 Jun 2009 17:05:28 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 75595 invoked by uid 99); 10 Jun 2009 17:05:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Jun 2009 17:05:28 +0000 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; Wed, 10 Jun 2009 17:05:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E56D623888D7; Wed, 10 Jun 2009 17:04:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r783428 - /geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh Date: Wed, 10 Jun 2009 17:04:57 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090610170457.E56D623888D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Wed Jun 10 17:04:57 2009 New Revision: 783428 URL: http://svn.apache.org/viewvc?rev=783428&view=rev Log: modify svn script to svn cp and rm if basic structure has been added to svn Modified: geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh Modified: geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh?rev=783428&r1=783427&r2=783428&view=diff ============================================================================== --- geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh (original) +++ geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh Wed Jun 10 17:04:57 2009 @@ -1,9 +1,14 @@ #!/bin/sh # Script to copy the tomcat source to the appropriate places in the mavenized project - -SVN_CMD="svn export" -RM="rm -rf" +if [ -d .svn ] +then + SVN_CMD="svn co" + RM="svn rm" +else + SVN_CMD="svn export" + RM="rm -rf" +fi TOMCAT_VERSION=TOMCAT_6_0_18 @@ -18,9 +23,12 @@ $RM catalina/src/main/java/org/apache/catalina/cluster $RM catalina/src/main/java/org/apache/catalina/ha $RM catalina/src/main/java/org/apache/catalina/tribes +# does not exist? $RM catalina/src/main/java/org/apache/catalina/launcher +# does not exist? $RM catalina/src/main/java/org/apache/catalina/storeconfig $RM catalina/src/main/java/org/apache/naming/factory/webservices +#formerly coyote jar $SVN_CMD $TOMCAT/java/org/apache/coyote catalina/src/main/java/org/apache/coyote $SVN_CMD $TOMCAT/java/org/apache/tomcat/jni catalina/src/main/java/org/apache/tomcat/jni $SVN_CMD $TOMCAT/java/org/apache/jk catalina/src/main/java/org/apache/jk