Author: kkolinko
Date: Sat Jan 25 20:05:02 2014
New Revision: 1561382
URL: http://svn.apache.org/r1561382
Log:
Merged revisions r1561072-r1561073 from tomcat/trunk:
Remove $Id keyword from bin/**
Remove svn:keywords property from bin/**
svn propdel svn:keywords --depth infinity
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/bin/catalina-tasks.xml (props changed)
tomcat/tc7.0.x/trunk/bin/catalina.bat (contents, props changed)
tomcat/tc7.0.x/trunk/bin/catalina.sh (contents, props changed)
tomcat/tc7.0.x/trunk/bin/configtest.bat (contents, props changed)
tomcat/tc7.0.x/trunk/bin/configtest.sh (contents, props changed)
tomcat/tc7.0.x/trunk/bin/cpappend.bat (contents, props changed)
tomcat/tc7.0.x/trunk/bin/daemon.sh
tomcat/tc7.0.x/trunk/bin/digest.bat (contents, props changed)
tomcat/tc7.0.x/trunk/bin/digest.sh (contents, props changed)
tomcat/tc7.0.x/trunk/bin/service.bat (contents, props changed)
tomcat/tc7.0.x/trunk/bin/setclasspath.bat (contents, props changed)
tomcat/tc7.0.x/trunk/bin/setclasspath.sh (contents, props changed)
tomcat/tc7.0.x/trunk/bin/shutdown.bat (contents, props changed)
tomcat/tc7.0.x/trunk/bin/shutdown.sh (contents, props changed)
tomcat/tc7.0.x/trunk/bin/startup.bat (contents, props changed)
tomcat/tc7.0.x/trunk/bin/startup.sh (contents, props changed)
tomcat/tc7.0.x/trunk/bin/tool-wrapper.bat (contents, props changed)
tomcat/tc7.0.x/trunk/bin/tool-wrapper.sh (contents, props changed)
tomcat/tc7.0.x/trunk/bin/version.bat (contents, props changed)
tomcat/tc7.0.x/trunk/bin/version.sh (contents, props changed)
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1561072-1561073
Propchange: tomcat/tc7.0.x/trunk/bin/catalina-tasks.xml
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/bin/catalina.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/catalina.bat?rev=1561382&r1=1561381&r2=1561382&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/catalina.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/catalina.bat Sat Jan 25 20:05:02 2014
@@ -90,10 +90,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 Suppress Terminate batch job on CTRL+C
Propchange: tomcat/tc7.0.x/trunk/bin/catalina.bat
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/catalina.sh?rev=1561382&r1=1561381&r2=1561382&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/catalina.sh (original)
+++ tomcat/tc7.0.x/trunk/bin/catalina.sh Sat Jan 25 20:05:02 2014
@@ -93,8 +93,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/tc7.0.x/trunk/bin/catalina.sh
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/bin/configtest.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/configtest.bat?rev=1561382&r1=1561381&r2=1561382&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/configtest.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/configtest.bat Sat Jan 25 20:05:02 2014
@@ -17,8 +17,6 @@ rem limitations under the License.
if "%OS%" == "Windows_NT" setlocal
rem ---------------------------------------------------------------------------
rem Configuration test script for the CATALINA Server
-rem
-rem $Id$
rem ---------------------------------------------------------------------------
rem Guess CATALINA_HOME if not defined
Propchange: tomcat/tc7.0.x/trunk/bin/configtest.bat
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/bin/configtest.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/configtest.sh?rev=1561382&r1=1561381&r2=1561382&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/configtest.sh (original)
+++ tomcat/tc7.0.x/trunk/bin/configtest.sh Sat Jan 25 20:05:02 2014
@@ -17,8 +17,6 @@
# -----------------------------------------------------------------------------
# Configuration Test Script for the CATALINA Server
-#
-# $Id$
# -----------------------------------------------------------------------------
# Better OS/400 detection: see Bugzilla 31132
Propchange: tomcat/tc7.0.x/trunk/bin/configtest.sh
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/bin/cpappend.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/cpappend.bat?rev=1561382&r1=1561381&r2=1561382&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/cpappend.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/cpappend.bat Sat Jan 25 20:05:02 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/tc7.0.x/trunk/bin/cpappend.bat
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/bin/daemon.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/daemon.sh?rev=1561382&r1=1561381&r2=1561382&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/daemon.sh (original)
+++ tomcat/tc7.0.x/trunk/bin/daemon.sh Sat Jan 25 20:05:02 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/tc7.0.x/trunk/bin/digest.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/digest.bat?rev=1561382&r1=1561381&r2=1561382&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/digest.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/digest.bat Sat Jan 25 20:05:02 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/tc7.0.x/trunk/bin/digest.bat
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/bin/digest.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/digest.sh?rev=1561382&r1=1561381&r2=1561382&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/digest.sh (original)
+++ tomcat/tc7.0.x/trunk/bin/digest.sh Sat Jan 25 20:05:02 2014
@@ -17,8 +17,6 @@
# -----------------------------------------------------------------------------
# Script to digest password using the algorithm specified
-#
-# $Id$
# -----------------------------------------------------------------------------
# Better OS/400 detection: see Bugzilla 31132
Propchange: tomcat/tc7.0.x/trunk/bin/digest.sh
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/bin/service.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/service.bat?rev=1561382&r1=1561381&r2=1561382&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/service.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/service.bat Sat Jan 25 20:05:02 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 ---------------------------------------------------------------------------
set "SELF=%~dp0%service.bat"
Propchange: tomcat/tc7.0.x/trunk/bin/service.bat
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/bin/setclasspath.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/setclasspath.bat?rev=1561382&r1=1561381&r2=1561382&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/setclasspath.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/setclasspath.bat Sat Jan 25 20:05:02 2014
@@ -18,8 +18,6 @@ rem ------------------------------------
rem Set JAVA_HOME or JRE_HOME if not already set, ensure any provided settings
rem are valid and consistent with the selected start-up options and set up the
rem endorsed directory.
-rem
-rem $Id$
rem ---------------------------------------------------------------------------
rem Make sure prerequisite environment variables are set
Propchange: tomcat/tc7.0.x/trunk/bin/setclasspath.bat
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/bin/setclasspath.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/setclasspath.sh?rev=1561382&r1=1561381&r2=1561382&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/setclasspath.sh (original)
+++ tomcat/tc7.0.x/trunk/bin/setclasspath.sh Sat Jan 25 20:05:02 2014
@@ -19,8 +19,6 @@
# Set JAVA_HOME or JRE_HOME if not already set, ensure any provided settings
# are valid and consistent with the selected start-up options and set up the
# endorsed directory.
-#
-# $Id$
# -----------------------------------------------------------------------------
# Make sure prerequisite environment variables are set
Propchange: tomcat/tc7.0.x/trunk/bin/setclasspath.sh
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/bin/shutdown.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/shutdown.bat?rev=1561382&r1=1561381&r2=1561382&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/shutdown.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/shutdown.bat Sat Jan 25 20:05:02 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/tc7.0.x/trunk/bin/shutdown.bat
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/bin/shutdown.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/shutdown.sh?rev=1561382&r1=1561381&r2=1561382&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/shutdown.sh (original)
+++ tomcat/tc7.0.x/trunk/bin/shutdown.sh Sat Jan 25 20:05:02 2014
@@ -17,8 +17,6 @@
# -----------------------------------------------------------------------------
# Stop script for the CATALINA Server
-#
-# $Id$
# -----------------------------------------------------------------------------
# Better OS/400 detection: see Bugzilla 31132
Propchange: tomcat/tc7.0.x/trunk/bin/shutdown.sh
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/bin/startup.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/startup.bat?rev=1561382&r1=1561381&r2=1561382&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/startup.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/startup.bat Sat Jan 25 20:05:02 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/tc7.0.x/trunk/bin/startup.bat
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/bin/startup.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/startup.sh?rev=1561382&r1=1561381&r2=1561382&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/startup.sh (original)
+++ tomcat/tc7.0.x/trunk/bin/startup.sh Sat Jan 25 20:05:02 2014
@@ -17,8 +17,6 @@
# -----------------------------------------------------------------------------
# Start Script for the CATALINA Server
-#
-# $Id$
# -----------------------------------------------------------------------------
# Better OS/400 detection: see Bugzilla 31132
Propchange: tomcat/tc7.0.x/trunk/bin/startup.sh
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/bin/tool-wrapper.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/tool-wrapper.bat?rev=1561382&r1=1561381&r2=1561382&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/tool-wrapper.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/tool-wrapper.bat Sat Jan 25 20:05:02 2014
@@ -38,8 +38,6 @@ rem containing some ja
rem created outside of the JCP (i.e. DOM and SAX from W3C).
rem It can also be used to update the XML parser
implementation.
rem Defaults to $CATALINA_HOME/endorsed.
-rem
-rem $Id$
rem ---------------------------------------------------------------------------
rem Guess CATALINA_HOME if not defined
Propchange: tomcat/tc7.0.x/trunk/bin/tool-wrapper.bat
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/bin/tool-wrapper.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/tool-wrapper.sh?rev=1561382&r1=1561381&r2=1561382&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/tool-wrapper.sh (original)
+++ tomcat/tc7.0.x/trunk/bin/tool-wrapper.sh Sat Jan 25 20:05:02 2014
@@ -38,8 +38,6 @@
# created outside of the JCP (i.e. DOM and SAX from W3C).
# It can also be used to update the XML parser
implementation.
# Defaults to $CATALINA_HOME/endorsed.
-#
-# $Id$
# -----------------------------------------------------------------------------
# OS specific support. $var _must_ be set to either true or false.
Propchange: tomcat/tc7.0.x/trunk/bin/tool-wrapper.sh
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/bin/version.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/version.bat?rev=1561382&r1=1561381&r2=1561382&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/version.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/version.bat Sat Jan 25 20:05:02 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/tc7.0.x/trunk/bin/version.bat
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/bin/version.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/version.sh?rev=1561382&r1=1561381&r2=1561382&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/version.sh (original)
+++ tomcat/tc7.0.x/trunk/bin/version.sh Sat Jan 25 20:05:02 2014
@@ -17,8 +17,6 @@
# -----------------------------------------------------------------------------
# Version Script for the CATALINA Server
-#
-# $Id$
# -----------------------------------------------------------------------------
# Better OS/400 detection: see Bugzilla 31132
Propchange: tomcat/tc7.0.x/trunk/bin/version.sh
('svn:keywords' removed)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
