Correct props.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@467221 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/.classpath b/.classpath
index 25e23e5..c3f67a7 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry excluding="**/.svn/**|org/apache/tomcat/util/net/puretls/" kind="src" path="java"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
-       <classpathentry kind="var" path="TOMCAT_LIBS_BASE/apache-ant-1.6.5/lib/ant.jar"/>\r
-       <classpathentry kind="var" path="TOMCAT_LIBS_BASE/eclipse/plugins/org.eclipse.jdt.core_3.1.2.jar"/>\r
-       <classpathentry kind="output" path=".settings/output"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry excluding="**/.svn/**|org/apache/tomcat/util/net/puretls/" kind="src" path="java"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="var" path="TOMCAT_LIBS_BASE/apache-ant-1.6.5/lib/ant.jar"/>
+       <classpathentry kind="var" path="TOMCAT_LIBS_BASE/eclipse/plugins/org.eclipse.jdt.core_3.1.2.jar"/>
+       <classpathentry kind="output" path=".settings/output"/>
+</classpath>

diff --git a/BUILDING.txt b/BUILDING.txt
index 6795dbf..58c7107 100644 (file)
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -1,4 +1,4 @@
-$Id: BUILDING.txt 432252 2006-08-17 14:41:02Z jfclere $
+$Id$
 
             ====================================================
             Building The Apache Tomcat 6.0 Servlet/JSP Container

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 567ae31..d923b6a 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -4,7 +4,7 @@
                             Release Notes
 
 
-$Id: RELEASE-NOTES 351503 2005-12-01 22:12:48Z keith $
+$Id$
 
 
 =============================

diff --git a/RELEASE-PLAN-6.0.txt b/RELEASE-PLAN-6.0.txt
index 9dbceef..a9da60c 100644 (file)
--- a/RELEASE-PLAN-6.0.txt
+++ b/RELEASE-PLAN-6.0.txt
@@ -1,4 +1,4 @@
-$Id: RELEASE-PLAN-5.5.txt 304598 2004-08-23 17:26:09Z remm $
+$Id$
 
                       Release Plan for Apache Tomcat 6.0
                       ==================================

diff --git a/build.properties.default b/build.properties.default
index 5c8afa2..158d5c3 100644 (file)
--- a/build.properties.default
+++ b/build.properties.default
@@ -1,63 +1,63 @@
-# -----------------------------------------------------------------------------\r
-# build.properties.sample\r
-#\r
-# This is an example "build.properties" file, used to customize building \r
-# Jasper2 for your local environment.  It defines the location of all external\r
-# modules that Jasper2 depends on.  Copy this file to "build.properties"\r
-# in the top-level source directory, and customize it as needed.\r
-#\r
-# $Id: build.properties.sample 379500 2006-02-21 15:50:10Z remm $\r
-# -----------------------------------------------------------------------------\r
-\r
-# ----- Default Base Path for Dependent Packages -----\r
-# Please note this path must be absolute, not relative,\r
-# as it is referenced with different working directory\r
-# contexts by the various build scripts.\r
-base.path=/usr/share/java\r
-#base.path=C:/path/to/the/repository\r
-#base.path=/usr/local\r
-\r
-compile.source=1.5\r
-compile.target=1.5\r
-compile.debug=true\r
-\r
-base-jakarta.loc=http://archive.apache.org/dist/jakarta\r
-base-tomcat.loc=http://archive.apache.org/dist/tomcat\r
-\r
-# ----- Commons Logging, version 1.1 or later -----\r
-commons-logging-src.loc=${base-jakarta.loc}/commons/logging/source/commons-logging-1.1-src.tar.gz\r
-\r
-# ----- Eclipse JDT, version 3.2 or later -----\r
-jdt.home=${base.path}/eclipse/plugins\r
-jdt.lib=${jdt.home}\r
-jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.2.0.v_671.jar\r
-jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.2-200606291905/eclipse-JDT-3.2.zip\r
-\r
-# ----- Tomcat native library -----\r
-tomcat-native.home=${base.path}/tomcat-native-1.1.6\r
-tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz\r
-tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.6-src.tar.gz\r
-\r
-# ----- Commons DBCP, version 1.1 or later -----\r
-commons-dbcp.version=1.2.1\r
-commons-dbcp.home=${base.path}/commons-dbcp-1.2.1\r
-commons-dbcp-src.loc=${base-jakarta.loc}/commons/dbcp/source/commons-dbcp-1.2.1-src.tar.gz\r
-\r
-# ----- Commons Pool, version 1.1 or later -----\r
-commons-pool.home=${base.path}/commons-pool-1.2\r
-commons-pool-src.loc=${base-jakarta.loc}/commons/pool/source/commons-pool-1.2-src.tar.gz\r
-\r
-# ----- Commons Collections, version 2.0 or later -----\r
-commons-collections.home=${base.path}/commons-collections-3.1\r
-commons-collections.lib=${commons-collections.home}\r
-commons-collections.jar=${commons-collections.lib}/commons-collections-3.1.jar\r
-commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-3.1.tar.gz\r
-commons-collections-src.loc=${base-jakarta.loc}/commons/collections/source/commons-collections-3.1-src.tar.gz\r
-\r
-# ----- NSIS, version 2.0 or later -----\r
-nsis.home=${base.path}/nsis-2.18\r
-nsis.exe=${nsis.home}/makensis.exe\r
-nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll\r
-nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll\r
-nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll\r
-nsis.loc=${base-sf.loc}/nsis/nsis-2.18-setup.exe\r
+# -----------------------------------------------------------------------------
+# build.properties.sample
+#
+# This is an example "build.properties" file, used to customize building 
+# Jasper2 for your local environment.  It defines the location of all external
+# modules that Jasper2 depends on.  Copy this file to "build.properties"
+# in the top-level source directory, and customize it as needed.
+#
+# $Id$
+# -----------------------------------------------------------------------------
+
+# ----- Default Base Path for Dependent Packages -----
+# Please note this path must be absolute, not relative,
+# as it is referenced with different working directory
+# contexts by the various build scripts.
+base.path=/usr/share/java
+#base.path=C:/path/to/the/repository
+#base.path=/usr/local
+
+compile.source=1.5
+compile.target=1.5
+compile.debug=true
+
+base-jakarta.loc=http://archive.apache.org/dist/jakarta
+base-tomcat.loc=http://archive.apache.org/dist/tomcat
+
+# ----- Commons Logging, version 1.1 or later -----
+commons-logging-src.loc=${base-jakarta.loc}/commons/logging/source/commons-logging-1.1-src.tar.gz
+
+# ----- Eclipse JDT, version 3.2 or later -----
+jdt.home=${base.path}/eclipse/plugins
+jdt.lib=${jdt.home}
+jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.2.0.v_671.jar
+jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.2-200606291905/eclipse-JDT-3.2.zip
+
+# ----- Tomcat native library -----
+tomcat-native.home=${base.path}/tomcat-native-1.1.6
+tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
+tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.6-src.tar.gz
+
+# ----- Commons DBCP, version 1.1 or later -----
+commons-dbcp.version=1.2.1
+commons-dbcp.home=${base.path}/commons-dbcp-1.2.1
+commons-dbcp-src.loc=${base-jakarta.loc}/commons/dbcp/source/commons-dbcp-1.2.1-src.tar.gz
+
+# ----- Commons Pool, version 1.1 or later -----
+commons-pool.home=${base.path}/commons-pool-1.2
+commons-pool-src.loc=${base-jakarta.loc}/commons/pool/source/commons-pool-1.2-src.tar.gz
+
+# ----- Commons Collections, version 2.0 or later -----
+commons-collections.home=${base.path}/commons-collections-3.1
+commons-collections.lib=${commons-collections.home}
+commons-collections.jar=${commons-collections.lib}/commons-collections-3.1.jar
+commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-3.1.tar.gz
+commons-collections-src.loc=${base-jakarta.loc}/commons/collections/source/commons-collections-3.1-src.tar.gz
+
+# ----- NSIS, version 2.0 or later -----
+nsis.home=${base.path}/nsis-2.18
+nsis.exe=${nsis.home}/makensis.exe
+nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
+nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
+nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
+nsis.loc=${base-sf.loc}/nsis/nsis-2.18-setup.exe