You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/10/23 01:25:42 UTC
svn commit: r1187827 - in /tomcat/trunk: ./ bin/ res/ res/maven/
Author: markt
Date: Sat Oct 22 23:25:41 2011
New Revision: 1187827
URL: http://svn.apache.org/viewvc?rev=1187827&view=rev
Log:
Fix remaining trailing white-space issues that were preventing the
checkstyle build check from passing.
Modified:
tomcat/trunk/KEYS
tomcat/trunk/LICENSE
tomcat/trunk/NOTICE
tomcat/trunk/RELEASE-NOTES
tomcat/trunk/bin/catalina.bat (contents, props changed)
tomcat/trunk/bin/catalina.sh (contents, props changed)
tomcat/trunk/bin/configtest.sh (contents, props changed)
tomcat/trunk/bin/digest.sh (contents, props changed)
tomcat/trunk/bin/setclasspath.bat (contents, props changed)
tomcat/trunk/bin/setclasspath.sh (contents, props changed)
tomcat/trunk/bin/shutdown.sh (contents, props changed)
tomcat/trunk/bin/startup.sh (contents, props changed)
tomcat/trunk/bin/version.sh (contents, props changed)
tomcat/trunk/res/INSTALLLICENSE
tomcat/trunk/res/maven/mvn.properties.default
Modified: tomcat/trunk/KEYS
URL: http://svn.apache.org/viewvc/tomcat/trunk/KEYS?rev=1187827&r1=1187826&r2=1187827&view=diff
==============================================================================
--- tomcat/trunk/KEYS (original)
+++ tomcat/trunk/KEYS Sat Oct 22 23:25:41 2011
@@ -3,7 +3,7 @@ Please don't use them for email unless y
purpose is code signing.
Apache users: pgp < KEYS
-Apache developers:
+Apache developers:
(pgpk -ll <your name> && pgpk -xa <your name>) >> this file.
or
(gpg --fingerprint --list-sigs <your name>
Modified: tomcat/trunk/LICENSE
URL: http://svn.apache.org/viewvc/tomcat/trunk/LICENSE?rev=1187827&r1=1187826&r2=1187827&view=diff
==============================================================================
--- tomcat/trunk/LICENSE (original)
+++ tomcat/trunk/LICENSE Sat Oct 22 23:25:41 2011
@@ -203,11 +203,11 @@
-APACHE TOMCAT SUBCOMPONENTS:
+APACHE TOMCAT SUBCOMPONENTS:
Apache Tomcat includes a number of subcomponents with separate copyright notices
and license terms. Your use of these subcomponents is subject to the terms and
-conditions of the following licenses.
+conditions of the following licenses.
For the ecj-x.x.x.jar component:
@@ -433,7 +433,7 @@ For the Windows Installer component:
license.
* The bzip2 compression module for NSIS is licensed under the bzip2 license.
* The lzma compression module for NSIS is licensed under the Common Public
- License version 1.0.
+ License version 1.0.
zlib/libpng license
@@ -451,7 +451,7 @@ the following restrictions:
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
+ 3. This notice may not be removed or altered from any source distribution.
bzip2 license
@@ -467,7 +467,7 @@ are permitted provided that the followin
3. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
4. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
+ derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
Modified: tomcat/trunk/NOTICE
URL: http://svn.apache.org/viewvc/tomcat/trunk/NOTICE?rev=1187827&r1=1187826&r2=1187827&view=diff
==============================================================================
--- tomcat/trunk/NOTICE (original)
+++ tomcat/trunk/NOTICE Sat Oct 22 23:25:41 2011
@@ -10,8 +10,8 @@ open source software. The original soft
related information is available at
http://nsis.sourceforge.net.
-Java compilation software for JSP pages is provided by Eclipse,
-which is open source software. The original software and
+Java compilation software for JSP pages is provided by Eclipse,
+which is open source software. The original software and
related information is available at
http://www.eclipse.org.
Modified: tomcat/trunk/RELEASE-NOTES
URL: http://svn.apache.org/viewvc/tomcat/trunk/RELEASE-NOTES?rev=1187827&r1=1187826&r2=1187827&view=diff
==============================================================================
--- tomcat/trunk/RELEASE-NOTES (original)
+++ tomcat/trunk/RELEASE-NOTES Sat Oct 22 23:25:41 2011
@@ -48,9 +48,9 @@ Tomcat @VERSION_MAJOR_MINOR@ is designed
In addition, Tomcat @VERSION_MAJOR_MINOR@ uses the Eclipse JDT Java compiler for
compiling JSP pages. This means you no longer need to have the complete
Java Development Kit (JDK) to run Tomcat, but a Java Runtime Environment
-(JRE) is sufficient. The Eclipse JDT Java compiler is bundled with the
+(JRE) is sufficient. The Eclipse JDT Java compiler is bundled with the
binary Tomcat distributions. Tomcat can also be configured to use the
-compiler from the JDK to compile JSPs, or any other Java compiler supported
+compiler from the JDK to compile JSPs, or any other Java compiler supported
by Apache Ant.
@@ -119,7 +119,7 @@ putting unpacked classes into a "classes
or by placing them in JAR files in the "lib" directory.
To override the XML parser implementation or interfaces, use the endorsed
-mechanism of the JVM. The default configuration defines JARs located in
+mechanism of the JVM. The default configuration defines JARs located in
"endorsed" as endorsed.
@@ -167,23 +167,23 @@ included in the documentation web applic
=============================
Cryptographic software notice
=============================
-This distribution includes cryptographic software. The country in
-which you currently reside may have restrictions on the import,
-possession, use, and/or re-export to another country, of
-encryption software. BEFORE using any encryption software, please
+This distribution includes cryptographic software. The country in
+which you currently reside may have restrictions on the import,
+possession, use, and/or re-export to another country, of
+encryption software. BEFORE using any encryption software, please
check your country's laws, regulations and policies concerning the
-import, possession, or use, and re-export of encryption software, to
+import, possession, or use, and re-export of encryption software, to
see if this is permitted. See <http://www.wassenaar.org/> for more
information.
The U.S. Government Department of Commerce, Bureau of Industry and
-Security (BIS), has classified this software as Export Commodity
+Security (BIS), has classified this software as Export Commodity
Control Number (ECCN) 5D002.C.1, which includes information security
software using or performing cryptographic functions with asymmetric
algorithms. The form and manner of this Apache Software Foundation
distribution makes it eligible for export under the License Exception
-ENC Technology Software Unrestricted (TSU) exception (see the BIS
-Export Administration Regulations, Section 740.13) for both object
+ENC Technology Software Unrestricted (TSU) exception (see the BIS
+Export Administration Regulations, Section 740.13) for both object
code and source code.
The following provides more details on the included cryptographic
Modified: tomcat/trunk/bin/catalina.bat
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=1187827&r1=1187826&r2=1187827&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.bat (original)
+++ tomcat/trunk/bin/catalina.bat Sat Oct 22 23:25:41 2011
@@ -55,8 +55,8 @@ rem the version comman
rem Most options should go into CATALINA_OPTS.
rem
rem JAVA_ENDORSED_DIRS (Optional) Lists of of semi-colon separated directories
-rem containing some jars in order to allow replacement of APIs
-rem created outside of the JCP (i.e. DOM and SAX from W3C).
+rem containing some jars in order to allow replacement of APIs
+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
@@ -82,7 +82,7 @@ rem LOGGING_CONFIG (Optional) Overrid
rem Example (all one line)
rem set LOGGING_CONFIG="-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties"
rem
-rem LOGGING_MANAGER (Optional) Override Tomcat's logging manager
+rem LOGGING_MANAGER (Optional) Override Tomcat's logging manager
rem Example (all one line)
rem set LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
rem
Propchange: tomcat/trunk/bin/catalina.bat
('svn:executable' removed)
Modified: tomcat/trunk/bin/catalina.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1187827&r1=1187826&r2=1187827&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Sat Oct 22 23:25:41 2011
@@ -494,7 +494,7 @@ elif [ "$1" = "configtest" ] ; then
-Dcatalina.base=\"$CATALINA_BASE\" \
-Dcatalina.home=\"$CATALINA_HOME\" \
-Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \
- org.apache.catalina.startup.Bootstrap configtest
+ org.apache.catalina.startup.Bootstrap configtest
result=$?
if [ $result -ne 0 ]; then
echo "Configuration error detected!"
Propchange: tomcat/trunk/bin/catalina.sh
('svn:executable' removed)
Modified: tomcat/trunk/bin/configtest.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/configtest.sh?rev=1187827&r1=1187826&r2=1187827&view=diff
==============================================================================
--- tomcat/trunk/bin/configtest.sh (original)
+++ tomcat/trunk/bin/configtest.sh Sat Oct 22 23:25:41 2011
@@ -39,13 +39,13 @@ while [ -h "$PRG" ] ; do
PRG=`dirname "$PRG"`/"$link"
fi
done
-
+
PRGDIR=`dirname "$PRG"`
EXECUTABLE=catalina.sh
# Check that target executable exists
if $os400; then
- # -x will Only work on the os400 if the files are:
+ # -x will Only work on the os400 if the files are:
# 1. owned by the user
# 2. owned by the PRIMARY group of the user
# this will not work if the user belongs in secondary groups
@@ -57,6 +57,6 @@ else
echo "This file is needed to run this program"
exit 1
fi
-fi
+fi
exec "$PRGDIR"/"$EXECUTABLE" configtest "$@"
Propchange: tomcat/trunk/bin/configtest.sh
('svn:executable' removed)
Modified: tomcat/trunk/bin/digest.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/digest.sh?rev=1187827&r1=1187826&r2=1187827&view=diff
==============================================================================
--- tomcat/trunk/bin/digest.sh (original)
+++ tomcat/trunk/bin/digest.sh Sat Oct 22 23:25:41 2011
@@ -39,13 +39,13 @@ while [ -h "$PRG" ] ; do
PRG=`dirname "$PRG"`/"$link"
fi
done
-
+
PRGDIR=`dirname "$PRG"`
EXECUTABLE=tool-wrapper.sh
# Check that target executable exists
if $os400; then
- # -x will Only work on the os400 if the files are:
+ # -x will Only work on the os400 if the files are:
# 1. owned by the user
# 2. owned by the PRIMARY group of the user
# this will not work if the user belongs in secondary groups
@@ -57,6 +57,6 @@ else
echo "This file is needed to run this program"
exit 1
fi
-fi
+fi
exec "$PRGDIR"/"$EXECUTABLE" -server org.apache.catalina.realm.RealmBase "$@"
Propchange: tomcat/trunk/bin/digest.sh
('svn:executable' removed)
Modified: tomcat/trunk/bin/setclasspath.bat
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.bat?rev=1187827&r1=1187826&r2=1187827&view=diff
==============================================================================
--- tomcat/trunk/bin/setclasspath.bat (original)
+++ tomcat/trunk/bin/setclasspath.bat Sat Oct 22 23:25:41 2011
@@ -17,7 +17,7 @@ rem limitations under the License.
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 endorsed directory.
rem
rem $Id$
rem ---------------------------------------------------------------------------
Propchange: tomcat/trunk/bin/setclasspath.bat
('svn:executable' removed)
Modified: tomcat/trunk/bin/setclasspath.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.sh?rev=1187827&r1=1187826&r2=1187827&view=diff
==============================================================================
--- tomcat/trunk/bin/setclasspath.sh (original)
+++ tomcat/trunk/bin/setclasspath.sh Sat Oct 22 23:25:41 2011
@@ -18,7 +18,7 @@
# -----------------------------------------------------------------------------
# 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.
+# endorsed directory.
#
# $Id$
# -----------------------------------------------------------------------------
Propchange: tomcat/trunk/bin/setclasspath.sh
('svn:executable' removed)
Modified: tomcat/trunk/bin/shutdown.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/shutdown.sh?rev=1187827&r1=1187826&r2=1187827&view=diff
==============================================================================
--- tomcat/trunk/bin/shutdown.sh (original)
+++ tomcat/trunk/bin/shutdown.sh Sat Oct 22 23:25:41 2011
@@ -39,13 +39,13 @@ while [ -h "$PRG" ] ; do
PRG=`dirname "$PRG"`/"$link"
fi
done
-
+
PRGDIR=`dirname "$PRG"`
EXECUTABLE=catalina.sh
# Check that target executable exists
if $os400; then
- # -x will Only work on the os400 if the files are:
+ # -x will Only work on the os400 if the files are:
# 1. owned by the user
# 2. owned by the PRIMARY group of the user
# this will not work if the user belongs in secondary groups
@@ -57,6 +57,6 @@ else
echo "This file is needed to run this program"
exit 1
fi
-fi
+fi
exec "$PRGDIR"/"$EXECUTABLE" stop "$@"
Propchange: tomcat/trunk/bin/shutdown.sh
('svn:executable' removed)
Modified: tomcat/trunk/bin/startup.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/startup.sh?rev=1187827&r1=1187826&r2=1187827&view=diff
==============================================================================
--- tomcat/trunk/bin/startup.sh (original)
+++ tomcat/trunk/bin/startup.sh Sat Oct 22 23:25:41 2011
@@ -39,13 +39,13 @@ while [ -h "$PRG" ] ; do
PRG=`dirname "$PRG"`/"$link"
fi
done
-
+
PRGDIR=`dirname "$PRG"`
EXECUTABLE=catalina.sh
# Check that target executable exists
if $os400; then
- # -x will Only work on the os400 if the files are:
+ # -x will Only work on the os400 if the files are:
# 1. owned by the user
# 2. owned by the PRIMARY group of the user
# this will not work if the user belongs in secondary groups
@@ -57,6 +57,6 @@ else
echo "This file is needed to run this program"
exit 1
fi
-fi
+fi
exec "$PRGDIR"/"$EXECUTABLE" start "$@"
Propchange: tomcat/trunk/bin/startup.sh
('svn:executable' removed)
Modified: tomcat/trunk/bin/version.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/version.sh?rev=1187827&r1=1187826&r2=1187827&view=diff
==============================================================================
--- tomcat/trunk/bin/version.sh (original)
+++ tomcat/trunk/bin/version.sh Sat Oct 22 23:25:41 2011
@@ -39,13 +39,13 @@ while [ -h "$PRG" ] ; do
PRG=`dirname "$PRG"`/"$link"
fi
done
-
+
PRGDIR=`dirname "$PRG"`
EXECUTABLE=catalina.sh
# Check that target executable exists
if $os400; then
- # -x will Only work on the os400 if the files are:
+ # -x will Only work on the os400 if the files are:
# 1. owned by the user
# 2. owned by the PRIMARY group of the user
# this will not work if the user belongs in secondary groups
@@ -57,6 +57,6 @@ else
echo "This file is needed to run this program"
exit 1
fi
-fi
+fi
exec "$PRGDIR"/"$EXECUTABLE" version "$@"
Propchange: tomcat/trunk/bin/version.sh
('svn:executable' removed)
Modified: tomcat/trunk/res/INSTALLLICENSE
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/INSTALLLICENSE?rev=1187827&r1=1187826&r2=1187827&view=diff
==============================================================================
--- tomcat/trunk/res/INSTALLLICENSE (original)
+++ tomcat/trunk/res/INSTALLLICENSE Sat Oct 22 23:25:41 2011
@@ -203,11 +203,11 @@
-APACHE TOMCAT SUBCOMPONENTS:
+APACHE TOMCAT SUBCOMPONENTS:
Apache Tomcat includes a number of subcomponents with separate copyright notices
and license terms. Your use of these subcomponents is subject to the terms and
-conditions of the following licenses.
+conditions of the following licenses.
For the Eclipse JDT Java compiler:
@@ -433,7 +433,7 @@ For the Windows Installer component:
license.
* The bzip2 compression module for NSIS is licensed under the bzip2 license.
* The lzma compression module for NSIS is licensed under the Common Public
- License version 1.0.
+ License version 1.0.
zlib/libpng license
@@ -451,7 +451,7 @@ the following restrictions:
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
+ 3. This notice may not be removed or altered from any source distribution.
bzip2 license
@@ -467,7 +467,7 @@ are permitted provided that the followin
3. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
4. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
+ derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -704,4 +704,4 @@ by name) to the files from the LZMA comp
subjecting your linked code to the terms of the Common Public license version
1.0. Any modifications or additions to files from the LZMA compression module
for NSIS, however, are subject to the terms of the Common Public License version
-1.0.
+1.0.
Modified: tomcat/trunk/res/maven/mvn.properties.default
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1187827&r1=1187826&r2=1187827&view=diff
==============================================================================
--- tomcat/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/trunk/res/maven/mvn.properties.default Sat Oct 22 23:25:41 2011
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
+#
# To create custom properties, simply create
# the file mvn.properties
# in this directory
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org