Revert r1302359. Problem was broken svn client at my end.

markt-asf · markt-asf · commit a62dd175e6ca · 2012-03-19T11:16:16.000Z
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1302376 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bin/catalina.bat b/bin/catalina.bat
@@ -93,7 +93,7 @@ rem                   set TITLE=Tomcat.Cluster#1.Server#1 [%DATE% %TIME%]
 rem
 rem
 rem
-rem $Id:$
+rem $Id$
 rem ---------------------------------------------------------------------------
 
 rem Suppress Terminate batch job on CTRL+C
diff --git a/bin/catalina.sh b/bin/catalina.sh
@@ -94,7 +94,7 @@
 #                   Example (all one line)
 #                   LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
 #
-# $Id:$
+# $Id$
 # -----------------------------------------------------------------------------
 
 # OS specific support.  $var _must_ be set to either true or false.
diff --git a/bin/configtest.bat b/bin/configtest.bat
@@ -18,7 +18,7 @@ if "%OS%" == "Windows_NT" setlocal
 rem ---------------------------------------------------------------------------
 rem Configuration test script for the CATALINA Server
 rem
-rem $Id:$
+rem $Id$
 rem ---------------------------------------------------------------------------
 
 rem Guess CATALINA_HOME if not defined
diff --git a/bin/configtest.sh b/bin/configtest.sh
@@ -18,7 +18,7 @@
 # -----------------------------------------------------------------------------
 # Configuration Test Script for the CATALINA Server
 #
-# $Id:$
+# $Id$
 # -----------------------------------------------------------------------------
 
 # Better OS/400 detection: see Bugzilla 31132
diff --git a/bin/cpappend.bat b/bin/cpappend.bat
@@ -17,7 +17,7 @@ rem limitations under the License.
 rem ---------------------------------------------------------------------------
 rem Append to CLASSPATH
 rem
-rem $Id:$
+rem $Id$
 rem ---------------------------------------------------------------------------
 
 rem Process the first argument
diff --git a/bin/digest.bat b/bin/digest.bat
@@ -18,7 +18,7 @@ if "%OS%" == "Windows_NT" setlocal
 rem ---------------------------------------------------------------------------
 rem Script to digest password using the algorithm specified
 rem
-rem $Id:$
+rem $Id$
 rem ---------------------------------------------------------------------------
 
 rem Guess CATALINA_HOME if not defined
diff --git a/bin/digest.sh b/bin/digest.sh
@@ -18,7 +18,7 @@
 # -----------------------------------------------------------------------------
 # Script to digest password using the algorithm specified
 #
-# $Id:$
+# $Id$
 # -----------------------------------------------------------------------------
 
 # Better OS/400 detection: see Bugzilla 31132
diff --git a/bin/service.bat b/bin/service.bat
@@ -26,7 +26,7 @@ rem
 rem name        (optional) If the second argument is present it is considered
 rem                        to be new service name
 rem
-rem $Id:$
+rem $Id$
 rem ---------------------------------------------------------------------------
 
 set "SELF=%~dp0%service.bat"
diff --git a/bin/setclasspath.bat b/bin/setclasspath.bat
@@ -19,7 +19,7 @@ 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 $Id$
 rem ---------------------------------------------------------------------------
 
 rem Make sure prerequisite environment variables are set
diff --git a/bin/setclasspath.sh b/bin/setclasspath.sh
@@ -20,7 +20,7 @@
 #  are valid and consistent with the selected start-up options and set up the
 #  endorsed directory.
 #
-#  $Id:$
+#  $Id$
 # -----------------------------------------------------------------------------
 
 # Make sure prerequisite environment variables are set
diff --git a/bin/shutdown.bat b/bin/shutdown.bat
@@ -18,7 +18,7 @@ if "%OS%" == "Windows_NT" setlocal
 rem ---------------------------------------------------------------------------
 rem Stop script for the CATALINA Server
 rem
-rem $Id:$
+rem $Id$
 rem ---------------------------------------------------------------------------
 
 rem Guess CATALINA_HOME if not defined
diff --git a/bin/shutdown.sh b/bin/shutdown.sh
@@ -18,7 +18,7 @@
 # -----------------------------------------------------------------------------
 # Stop script for the CATALINA Server
 #
-# $Id:$
+# $Id$
 # -----------------------------------------------------------------------------
 
 # Better OS/400 detection: see Bugzilla 31132
diff --git a/bin/startup.bat b/bin/startup.bat
@@ -18,7 +18,7 @@ if "%OS%" == "Windows_NT" setlocal
 rem ---------------------------------------------------------------------------
 rem Start script for the CATALINA Server
 rem
-rem $Id:$
+rem $Id$
 rem ---------------------------------------------------------------------------
 
 rem Guess CATALINA_HOME if not defined
diff --git a/bin/startup.sh b/bin/startup.sh
@@ -18,7 +18,7 @@
 # -----------------------------------------------------------------------------
 # Start Script for the CATALINA Server
 #
-# $Id:$
+# $Id$
 # -----------------------------------------------------------------------------
 
 # Better OS/400 detection: see Bugzilla 31132
diff --git a/bin/tool-wrapper.bat b/bin/tool-wrapper.bat
@@ -39,7 +39,7 @@ 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 $Id$
 rem ---------------------------------------------------------------------------
 
 rem Guess CATALINA_HOME if not defined
diff --git a/bin/tool-wrapper.sh b/bin/tool-wrapper.sh
@@ -39,7 +39,7 @@
 #                   It can also be used to update the XML parser implementation.
 #                   Defaults to $CATALINA_HOME/endorsed.
 #
-# $Id:$
+# $Id$
 # -----------------------------------------------------------------------------
 
 # OS specific support.  $var _must_ be set to either true or false.
diff --git a/bin/version.bat b/bin/version.bat
@@ -18,7 +18,7 @@ if "%OS%" == "Windows_NT" setlocal
 rem ---------------------------------------------------------------------------
 rem Version script for the CATALINA Server
 rem
-rem $Id:$
+rem $Id$
 rem ---------------------------------------------------------------------------
 
 rem Guess CATALINA_HOME if not defined
diff --git a/bin/version.sh b/bin/version.sh
@@ -18,7 +18,7 @@
 # -----------------------------------------------------------------------------
 # Version Script for the CATALINA Server
 #
-# $Id:$
+# $Id$
 # -----------------------------------------------------------------------------
 
 # Better OS/400 detection: see Bugzilla 31132
diff --git a/conf/catalina.policy b/conf/catalina.policy
@@ -24,7 +24,7 @@
 // * Read access to the web application's document root directory
 // * Read, write and delete access to the web application's working directory
 //
-// $Id:$
+// $Id$
 // ============================================================================
 
 
diff --git a/java/javax/servlet/jsp/resources/jsp_2_2.xsd b/java/javax/servlet/jsp/resources/jsp_2_2.xsd
@@ -9,7 +9,7 @@
   <xsd:annotation>
     <xsd:documentation>
 
-      $Id:$
+      $Id$
 
     </xsd:documentation>
   </xsd:annotation>
diff --git a/java/javax/servlet/resources/datatypes.dtd b/java/javax/servlet/resources/datatypes.dtd
@@ -16,7 +16,7 @@
 -->
 <!--
         DTD for XML Schemas: Part 2: Datatypes
-        $Id:$
+        $Id$
         Note this DTD is NOT normative, or even definitive. - - the
         prose copy in the datatypes REC is the definitive version
         (which shouldn't differ from this one except for this comment
diff --git a/java/javax/servlet/resources/javaee_6.xsd b/java/javax/servlet/resources/javaee_6.xsd
@@ -8,7 +8,7 @@
   <xsd:annotation>
     <xsd:documentation>
 
-      $Id:$
+      $Id$
 
     </xsd:documentation>
   </xsd:annotation>
diff --git a/java/javax/servlet/resources/javaee_web_services_1_3.xsd b/java/javax/servlet/resources/javaee_web_services_1_3.xsd
@@ -9,7 +9,7 @@
   <xsd:annotation>
     <xsd:documentation>
 
-      $Id:$
+      $Id$
 
     </xsd:documentation>
   </xsd:annotation>
diff --git a/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd b/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd
@@ -9,7 +9,7 @@
   <xsd:annotation>
     <xsd:documentation>
 
-      $Id:$
+      $Id$
 
     </xsd:documentation>
   </xsd:annotation>

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@`
`94`	`94`	`# Example (all one line)`
`95`	`95`	`# LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"`
`96`	`96`	`#`
`97`		`-# $Id:$`
	`97`	`+# $Id$`
`98`	`98`	`# -----------------------------------------------------------------------------`
`99`	`99`
`100`	`100`	`# OS specific support. $var _must_ be set to either true or false.`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`# -----------------------------------------------------------------------------`
`19`	`19`	`# Configuration Test Script for the CATALINA Server`
`20`	`20`	`#`
`21`		`-# $Id:$`
	`21`	`+# $Id$`
`22`	`22`	`# -----------------------------------------------------------------------------`
`23`	`23`
`24`	`24`	`# Better OS/400 detection: see Bugzilla 31132`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`# are valid and consistent with the selected start-up options and set up the`
`21`	`21`	`# endorsed directory.`
`22`	`22`	`#`
`23`		`-# $Id:$`
	`23`	`+# $Id$`
`24`	`24`	`# -----------------------------------------------------------------------------`
`25`	`25`
`26`	`26`	`# Make sure prerequisite environment variables are set`