Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C3A88106F0 for ; Sat, 25 Jan 2014 20:22:31 +0000 (UTC) Received: (qmail 10106 invoked by uid 500); 25 Jan 2014 20:22:29 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 9979 invoked by uid 500); 25 Jan 2014 20:22:29 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 9970 invoked by uid 99); 25 Jan 2014 20:22:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 Jan 2014 20:22:29 +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; Sat, 25 Jan 2014 20:22:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 328E62388A74 for ; Sat, 25 Jan 2014 20:22:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1561390 - in /tomcat/tc6.0.x/trunk: ./ bin/ Date: Sat, 25 Jan 2014 20:22:06 -0000 To: dev@tomcat.apache.org From: kkolinko@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140125202207.328E62388A74@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kkolinko Date: Sat Jan 25 20:22:05 2014 New Revision: 1561390 URL: http://svn.apache.org/r1561390 Log: CTR: comments + discussed on dev list Remove $Id keyword from bin/** Remove svn:keywords property from bin/** svn propdel svn:keywords --depth infinity It is merge of r1561382 from tomcat/tc7.0.x/trunk. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/bin/catalina-tasks.xml (props changed) tomcat/tc6.0.x/trunk/bin/catalina.bat (contents, props changed) tomcat/tc6.0.x/trunk/bin/catalina.sh (contents, props changed) tomcat/tc6.0.x/trunk/bin/cpappend.bat (contents, props changed) tomcat/tc6.0.x/trunk/bin/daemon.sh tomcat/tc6.0.x/trunk/bin/digest.bat (contents, props changed) tomcat/tc6.0.x/trunk/bin/digest.sh (contents, props changed) tomcat/tc6.0.x/trunk/bin/service.bat (contents, props changed) tomcat/tc6.0.x/trunk/bin/setclasspath.bat (contents, props changed) tomcat/tc6.0.x/trunk/bin/setclasspath.sh (contents, props changed) tomcat/tc6.0.x/trunk/bin/shutdown.bat (contents, props changed) tomcat/tc6.0.x/trunk/bin/shutdown.sh (contents, props changed) tomcat/tc6.0.x/trunk/bin/startup.bat (contents, props changed) tomcat/tc6.0.x/trunk/bin/startup.sh (contents, props changed) tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat (contents, props changed) tomcat/tc6.0.x/trunk/bin/tool-wrapper.sh (contents, props changed) tomcat/tc6.0.x/trunk/bin/version.bat (contents, props changed) tomcat/tc6.0.x/trunk/bin/version.sh (contents, props changed) Propchange: tomcat/tc6.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1561072-1561073 Merged /tomcat/tc7.0.x/trunk:r1561382 Propchange: tomcat/tc6.0.x/trunk/bin/catalina-tasks.xml ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.bat?rev=1561390&r1=1561389&r2=1561390&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/catalina.bat (original) +++ tomcat/tc6.0.x/trunk/bin/catalina.bat Sat Jan 25 20:22:05 2014 @@ -78,10 +78,6 @@ rem TITLE (Optional) Specify rem TITLE is Tomcat if it's not specified. rem Example (all one line) rem set TITLE=Tomcat.Cluster#1.Server#1 [%DATE% %TIME%] -rem -rem -rem -rem $Id$ rem --------------------------------------------------------------------------- rem Guess CATALINA_HOME if not defined Propchange: tomcat/tc6.0.x/trunk/bin/catalina.bat ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.sh?rev=1561390&r1=1561389&r2=1561390&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/catalina.sh (original) +++ tomcat/tc6.0.x/trunk/bin/catalina.sh Sat Jan 25 20:22:05 2014 @@ -80,8 +80,6 @@ # LOGGING_MANAGER (Optional) Override Tomcat's logging manager # Example (all one line) # LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" -# -# $Id$ # ----------------------------------------------------------------------------- # OS specific support. $var _must_ be set to either true or false. Propchange: tomcat/tc6.0.x/trunk/bin/catalina.sh ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/bin/cpappend.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/cpappend.bat?rev=1561390&r1=1561389&r2=1561390&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/cpappend.bat (original) +++ tomcat/tc6.0.x/trunk/bin/cpappend.bat Sat Jan 25 20:22:05 2014 @@ -16,8 +16,6 @@ rem limitations under the License. rem --------------------------------------------------------------------------- rem Append to CLASSPATH -rem -rem $Id$ rem --------------------------------------------------------------------------- rem Process the first argument Propchange: tomcat/tc6.0.x/trunk/bin/cpappend.bat ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/bin/daemon.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/daemon.sh?rev=1561390&r1=1561389&r2=1561390&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/daemon.sh (original) +++ tomcat/tc6.0.x/trunk/bin/daemon.sh Sat Jan 25 20:22:05 2014 @@ -17,8 +17,6 @@ # # ----------------------------------------------------------------------------- # Commons Daemon wrapper script. -# -# $Id: daemon.sh 1202058 2011-11-15 06:37:12Z mturk $ # ----------------------------------------------------------------------------- # # resolve links - $0 may be a softlink Modified: tomcat/tc6.0.x/trunk/bin/digest.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/digest.bat?rev=1561390&r1=1561389&r2=1561390&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/digest.bat (original) +++ tomcat/tc6.0.x/trunk/bin/digest.bat Sat Jan 25 20:22:05 2014 @@ -17,8 +17,6 @@ rem limitations under the License. if "%OS%" == "Windows_NT" setlocal rem --------------------------------------------------------------------------- rem Script to digest password using the algorithm specified -rem -rem $Id$ rem --------------------------------------------------------------------------- rem Guess CATALINA_HOME if not defined Propchange: tomcat/tc6.0.x/trunk/bin/digest.bat ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/bin/digest.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/digest.sh?rev=1561390&r1=1561389&r2=1561390&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/digest.sh (original) +++ tomcat/tc6.0.x/trunk/bin/digest.sh Sat Jan 25 20:22:05 2014 @@ -17,8 +17,6 @@ # ----------------------------------------------------------------------------- # Script to digest password using the algorithm specified -# -# $Id$ # ----------------------------------------------------------------------------- # resolve links - $0 may be a softlink Propchange: tomcat/tc6.0.x/trunk/bin/digest.sh ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/bin/service.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/service.bat?rev=1561390&r1=1561389&r2=1561390&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/service.bat (original) +++ tomcat/tc6.0.x/trunk/bin/service.bat Sat Jan 25 20:22:05 2014 @@ -25,8 +25,6 @@ rem remove Remove the se rem rem name (optional) If the second argument is present it is considered rem to be new service name -rem -rem $Id$ rem --------------------------------------------------------------------------- rem Guess CATALINA_HOME if not defined Propchange: tomcat/tc6.0.x/trunk/bin/service.bat ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.bat?rev=1561390&r1=1561389&r2=1561390&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/setclasspath.bat (original) +++ tomcat/tc6.0.x/trunk/bin/setclasspath.bat Sat Jan 25 20:22:05 2014 @@ -16,8 +16,6 @@ rem limitations under the License. rem --------------------------------------------------------------------------- rem Set CLASSPATH and Java options -rem -rem $Id$ rem --------------------------------------------------------------------------- rem Make sure prerequisite environment variables are set Propchange: tomcat/tc6.0.x/trunk/bin/setclasspath.bat ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.sh?rev=1561390&r1=1561389&r2=1561390&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/setclasspath.sh (original) +++ tomcat/tc6.0.x/trunk/bin/setclasspath.sh Sat Jan 25 20:22:05 2014 @@ -17,8 +17,6 @@ # ----------------------------------------------------------------------------- # Set CLASSPATH and Java options -# -# $Id$ # ----------------------------------------------------------------------------- # Make sure prerequisite environment variables are set Propchange: tomcat/tc6.0.x/trunk/bin/setclasspath.sh ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/bin/shutdown.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/shutdown.bat?rev=1561390&r1=1561389&r2=1561390&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/shutdown.bat (original) +++ tomcat/tc6.0.x/trunk/bin/shutdown.bat Sat Jan 25 20:22:05 2014 @@ -17,8 +17,6 @@ rem limitations under the License. if "%OS%" == "Windows_NT" setlocal rem --------------------------------------------------------------------------- rem Stop script for the CATALINA Server -rem -rem $Id$ rem --------------------------------------------------------------------------- rem Guess CATALINA_HOME if not defined Propchange: tomcat/tc6.0.x/trunk/bin/shutdown.bat ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/bin/shutdown.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/shutdown.sh?rev=1561390&r1=1561389&r2=1561390&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/shutdown.sh (original) +++ tomcat/tc6.0.x/trunk/bin/shutdown.sh Sat Jan 25 20:22:05 2014 @@ -17,8 +17,6 @@ # ----------------------------------------------------------------------------- # Stop script for the CATALINA Server -# -# $Id$ # ----------------------------------------------------------------------------- # resolve links - $0 may be a softlink Propchange: tomcat/tc6.0.x/trunk/bin/shutdown.sh ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/bin/startup.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/startup.bat?rev=1561390&r1=1561389&r2=1561390&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/startup.bat (original) +++ tomcat/tc6.0.x/trunk/bin/startup.bat Sat Jan 25 20:22:05 2014 @@ -17,8 +17,6 @@ rem limitations under the License. if "%OS%" == "Windows_NT" setlocal rem --------------------------------------------------------------------------- rem Start script for the CATALINA Server -rem -rem $Id$ rem --------------------------------------------------------------------------- rem Guess CATALINA_HOME if not defined Propchange: tomcat/tc6.0.x/trunk/bin/startup.bat ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/bin/startup.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/startup.sh?rev=1561390&r1=1561389&r2=1561390&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/startup.sh (original) +++ tomcat/tc6.0.x/trunk/bin/startup.sh Sat Jan 25 20:22:05 2014 @@ -17,8 +17,6 @@ # ----------------------------------------------------------------------------- # Start Script for the CATALINA Server -# -# $Id$ # ----------------------------------------------------------------------------- # Better OS/400 detection: see Bugzilla 31132 Propchange: tomcat/tc6.0.x/trunk/bin/startup.sh ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat?rev=1561390&r1=1561389&r2=1561390&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat (original) +++ tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat Sat Jan 25 20:22:05 2014 @@ -29,8 +29,6 @@ rem JAVA_HOME Must point at your J rem rem JAVA_OPTS (Optional) Java runtime options used when the "start", rem "stop", or "run" command is executed. -rem -rem $Id$ rem --------------------------------------------------------------------------- rem Guess CATALINA_HOME if not defined Propchange: tomcat/tc6.0.x/trunk/bin/tool-wrapper.bat ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/bin/tool-wrapper.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/tool-wrapper.sh?rev=1561390&r1=1561389&r2=1561390&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/tool-wrapper.sh (original) +++ tomcat/tc6.0.x/trunk/bin/tool-wrapper.sh Sat Jan 25 20:22:05 2014 @@ -29,8 +29,6 @@ # # JAVA_OPTS (Optional) Java runtime options used when the "start", # "stop", or "run" command is executed. -# -# $Id$ # ----------------------------------------------------------------------------- # OS specific support. $var _must_ be set to either true or false. Propchange: tomcat/tc6.0.x/trunk/bin/tool-wrapper.sh ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/bin/version.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/version.bat?rev=1561390&r1=1561389&r2=1561390&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/version.bat (original) +++ tomcat/tc6.0.x/trunk/bin/version.bat Sat Jan 25 20:22:05 2014 @@ -17,8 +17,6 @@ rem limitations under the License. if "%OS%" == "Windows_NT" setlocal rem --------------------------------------------------------------------------- rem Version script for the CATALINA Server -rem -rem $Id$ rem --------------------------------------------------------------------------- rem Guess CATALINA_HOME if not defined Propchange: tomcat/tc6.0.x/trunk/bin/version.bat ('svn:keywords' removed) Modified: tomcat/tc6.0.x/trunk/bin/version.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/version.sh?rev=1561390&r1=1561389&r2=1561390&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/version.sh (original) +++ tomcat/tc6.0.x/trunk/bin/version.sh Sat Jan 25 20:22:05 2014 @@ -17,8 +17,6 @@ # ----------------------------------------------------------------------------- # Version Script for the CATALINA Server -# -# $Id$ # ----------------------------------------------------------------------------- # resolve links - $0 may be a softlink Propchange: tomcat/tc6.0.x/trunk/bin/version.sh ('svn:keywords' removed) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org