Author: markt
Date: Sat Oct 22 21:21:54 2011
New Revision: 1187805
URL: http://svn.apache.org/viewvc?rev=1187805&view=rev
Log:
Whitespace removal from remaining /res
Modified:
tomcat/trunk/res/META-INF/jsp-api.jar.license
tomcat/trunk/res/META-INF/servlet-api.jar.license
tomcat/trunk/res/checkstyle/checkstyle.xml
tomcat/trunk/res/deployer/build.xml
tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml
tomcat/trunk/res/maven/mvn-pub.xml
tomcat/trunk/res/maven/tomcat-jdbc.pom
tomcat/trunk/res/maven/tomcat-tribes.pom
tomcat/trunk/res/tomcat.nsi
tomcat/trunk/res/welcome.bin.html
tomcat/trunk/res/welcome.main.html
Modified: tomcat/trunk/res/META-INF/jsp-api.jar.license
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/jsp-api.jar.license?rev=1187805&r1=1187804&r2=1187805&view=diff
==============================================================================
--- tomcat/trunk/res/META-INF/jsp-api.jar.license (original)
+++ tomcat/trunk/res/META-INF/jsp-api.jar.license Sat Oct 22 21:21:54 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 following XML Schemas for Java EE Deployment Descriptors:
Modified: tomcat/trunk/res/META-INF/servlet-api.jar.license
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/servlet-api.jar.license?rev=1187805&r1=1187804&r2=1187805&view=diff
==============================================================================
--- tomcat/trunk/res/META-INF/servlet-api.jar.license (original)
+++ tomcat/trunk/res/META-INF/servlet-api.jar.license Sat Oct 22 21:21:54 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 following XML Schemas for Java EE Deployment Descriptors:
Modified: tomcat/trunk/res/checkstyle/checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/checkstyle.xml?rev=1187805&r1=1187804&r2=1187805&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/checkstyle.xml (original)
+++ tomcat/trunk/res/checkstyle/checkstyle.xml Sat Oct 22 21:21:54 2011
@@ -32,6 +32,10 @@
<!-- Whitespace -->
<module name="FileTabCharacter"/>
+ <module name="RegexpSingleline">
+ <!-- No trailing whitespace -->
+ <property name="format" value="\s+$"/>
+ </module>
<module name="TreeWalker">
<!-- Cache what has passed checkstyle -->
@@ -45,7 +49,7 @@
<!-- Coding -->
<module name="IllegalInstantiation"/>
-
+
<!-- Imports -->
<module name="AvoidStarImport"/>
<module name="AvoidStaticImport">
@@ -62,13 +66,13 @@
</module>
<module name="RedundantImport"/>
<module name="UnusedImports"/>
-
+
<!-- Modifiers -->
<module name="ModifierOrder"/>
<!-- ~1750 errors
<module name="RedundantModifier"/>
-->
-
+
<!-- Whitespace -->
<!-- Can't handle HashMap<String,Class<?>[]>
https://sourceforge.net/tracker/?func=detail&aid=3039718&group_id=29721&atid=397078
Modified: tomcat/trunk/res/deployer/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/deployer/build.xml?rev=1187805&r1=1187804&r2=1187805&view=diff
==============================================================================
--- tomcat/trunk/res/deployer/build.xml (original)
+++ tomcat/trunk/res/deployer/build.xml Sat Oct 22 21:21:54 2011
@@ -55,11 +55,11 @@
<fileset dir="${webapp}" />
</copy>
- <jasper validateXml="false"
- uriroot="${webapp.path}"
+ <jasper validateXml="false"
+ uriroot="${webapp.path}"
webXmlFragment="${webapp.path}/WEB-INF/generated_web.xml"
addWebXmlMappings="true"
- outputDir="${webapp.path}/WEB-INF/classes" />
+ outputDir="${webapp.path}/WEB-INF/classes" />
<validator path="${webapp.path}" />
Modified: tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml?rev=1187805&r1=1187804&r2=1187805&view=diff
==============================================================================
--- tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml (original)
+++ tomcat/trunk/res/findbugs/filter-post-7.0.x-fixes.xml Sat Oct 22 21:21:54
2011
@@ -51,5 +51,5 @@
<Method name="run"/>
<Bug code="IL"/>
</Match>
-
+
</FindBugsFilter>
\ No newline at end of file
Modified: tomcat/trunk/res/maven/mvn-pub.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=1187805&r1=1187804&r2=1187805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/trunk/res/maven/mvn-pub.xml Sat Oct 22 21:21:54 2011
@@ -30,13 +30,13 @@
tomcat.lib.path - the path to tomcat JAR files
tomcat.bin.path - the path to tomcat's bin directory (for other JAR files)
tomcat.pom.path - the path to the POM files
-
+
For passwordless upload you'll also need to set
maven.scp.username - Your ASF ID
maven.scp.privateKey - Path to your exported ssh key
-
+
All these can be defined by mvn.properties (and defaults are in
mvn.properties.default)
-
+
To get a private key to work on Windows, I followed these steps
1. on a linux box execute 'ssh-keygen -t rsa'
2. same linux box execute 'cat id_rsa.pub >> authorized_keys' and 'cat
id_rsa.pub >> authorized_keys2'
@@ -50,7 +50,7 @@
<property file="${basedir}/mvn.properties"/>
<property file="${basedir}/mvn.properties.default"/>
<property name="local.repo" value="${user.home}/.m2/repository"/>
-
+
<target name="init-maven">
<typedef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="urn:maven-artifact-ant">
<classpath>
@@ -73,7 +73,7 @@
<filter token="MAVEN.DEPLOY.VERSION" value="${maven.deploy.version}"/>
</filterset>
</copy>
-
+
<!--sign the jar, the source and the pom -->
<exec executable="${maven.gpg.exec}" failonerror="true"
inputstring="${maven.gpg.passphrase}">
<arg value="--passphrase-fd"/>
@@ -98,7 +98,7 @@
<arg value="${pom}.asc"/>
<arg value="${pom}.tmp"/>
</exec>
-
+
<!--deploy it-->
<artifact:deploy file="${file}">
<pom file="${pom}.tmp"/>
@@ -225,7 +225,7 @@
<doMavenDeploy artifactId="tomcat-tribes"
jarFileName="catalina-tribes.jar"
srcJarFileName="catalina-tribes-src.jar"/>
-
+
<doMavenDeploy artifactId="tomcat-jdbc"
jarFileName="tomcat-jdbc.jar"
srcJarFileName="tomcat-jdbc-src.jar"/>
@@ -325,7 +325,7 @@
<param name="maven.deploy.version"
value="${maven.asf.release.deploy.version}"/>
</antcall>
</target>
-
+
<target name="help">
<echo>Help is on the way!</echo>
</target>
Modified: tomcat/trunk/res/maven/tomcat-jdbc.pom
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jdbc.pom?rev=1187805&r1=1187804&r2=1187805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-jdbc.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jdbc.pom Sat Oct 22 21:21:54 2011
@@ -29,4 +29,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
-</project>
+</project>
Modified: tomcat/trunk/res/maven/tomcat-tribes.pom
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-tribes.pom?rev=1187805&r1=1187804&r2=1187805&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-tribes.pom (original)
+++ tomcat/trunk/res/maven/tomcat-tribes.pom Sat Oct 22 21:21:54 2011
@@ -29,4 +29,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
-</project>
+</project>
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1187805&r1=1187804&r2=1187805&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Sat Oct 22 21:21:54 2011
@@ -336,7 +336,7 @@ Section -post
${Else}
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName"
'"$INSTDIR\bin\$TomcatServiceManagerFileName" //MS//$TomcatServiceName'
${EndIf}
-
+
${If} $TomcatMenuEntriesEnable == "1"
Call createShortcuts
${EndIf}
@@ -456,7 +456,7 @@ Function pageComponentsLeave
StrCpy $TomcatAdminRoles "admin-gui"
${EndIf}
${EndIf}
-
+
SectionGetFlags ${SecMenu} $0
IntOp $0 $0 & ${SF_SELECTED}
${If} $0 <> 0
@@ -578,7 +578,7 @@ Function pageConfigurationLeave
Push $TomcatServiceName
Call validateServiceName
Pop $0
-
+
IntCmp $0 1 exit
MessageBox MB_ICONEXCLAMATION|MB_OK 'The Service Name may not contain a
space or any of the following characters: <>:"/\:|?*'
Abort "Config not right"
@@ -598,7 +598,7 @@ Function validateServiceName
StrLen $1 $0
StrCpy $3 '<>:"/\:|?* '
StrLen $4 $3
-
+
loopInput:
IntOp $1 $1 - 1
IntCmp $1 -1 valid
@@ -615,7 +615,7 @@ Function validateServiceName
invalid:
Push 0
Goto exit
-
+
valid:
Push 1
exit:
@@ -817,7 +817,7 @@ Function findJavaHome
IfErrors 0 +2
StrCpy $1 ""
ClearErrors
-
+
; If using 64-bit, go back to using 64-bit registry
${If} $0 != "%PROGRAMW6432%"
SetRegView 64
@@ -917,7 +917,7 @@ Function configure
Call copyFile
FileClose $R9
Delete "$INSTDIR\conf\server.xml.new"
-
+
DetailPrint 'Server shutdown listener configured on port
"$TomcatPortShutdown"'
DetailPrint 'HTTP/1.1 Connector configured on port "$TomcatPortHttp"'
DetailPrint 'AJP/1.3 Connector configured on port "$TomcatPortAjp"'
@@ -1026,7 +1026,7 @@ Function createShortcuts
${If} $TomcatShortcutAllUsers == ${BST_CHECKED}
SetShellVarContext all
${EndIf}
-
+
SetOutPath "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@
$TomcatServiceName"
CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@
$TomcatServiceName\Tomcat Home Page.lnk" \
@@ -1094,7 +1094,7 @@ Section Uninstall
the command line with -ServiceName=$\"<name of service>$\"."
Quit
${EndIf}
-
+
Delete "$INSTDIR\Uninstall.exe"
; Stop Tomcat service monitor if running
Modified: tomcat/trunk/res/welcome.bin.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/welcome.bin.html?rev=1187805&r1=1187804&r2=1187805&view=diff
==============================================================================
--- tomcat/trunk/res/welcome.bin.html (original)
+++ tomcat/trunk/res/welcome.bin.html Sat Oct 22 21:21:54 2011
@@ -24,17 +24,17 @@
<P></P>
<p>Useful references:</p>
<ul>
-<li><a href="../RELEASE-NOTES">Release notes</a>, with important information
+<li><a href="../RELEASE-NOTES">Release notes</a>, with important information
about known issues</li>
<li><a
href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/changelog.html";>Changelog</a></li>
</ul>
-<p><b>NOTE: The tar files in this distribution use GNU tar extensions,
-and must be untarred with a GNU compatible version of tar. The version
-of <CODE>tar</CODE> on Solaris and Mac OS X will not work with
+<p><b>NOTE: The tar files in this distribution use GNU tar extensions,
+and must be untarred with a GNU compatible version of tar. The version
+of <CODE>tar</CODE> on Solaris and Mac OS X will not work with
these files.</b></P>
-<p><font color="red">Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 6 or later.
Read the
+<p><font color="red">Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 6 or later.
Read the
RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
</font></p>
@@ -84,7 +84,7 @@ RELEASE-NOTES and the RUNNING.txt file i
<dd>JMX Remote Lifecycle Listener. See the <a
href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/listeners.html";>
listeners documentation</a> for details.</dd>
-</dl></dd>
+</dl></dd>
<dt><b>src/</b></dt>
<dd><dl>
<dt>apache-tomcat-[version].zip or .tar.gz</dt>
@@ -93,9 +93,9 @@ RELEASE-NOTES and the RUNNING.txt file i
</dl></dd>
</dl>
-<P>Thank you for using <A href="http://tomcat.apache.org/";>Tomcat</A>!.
+<P>Thank you for using <A href="http://tomcat.apache.org/";>Tomcat</A>!.
</P>
-<P><B>The Apache Tomcat Project</B> <BR><A
+<P><B>The Apache Tomcat Project</B> <BR><A
href="http://tomcat.apache.org/";>http://tomcat.apache.org/</A> </P>
<P>
<P></P></BODY></HTML>
Modified: tomcat/trunk/res/welcome.main.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/welcome.main.html?rev=1187805&r1=1187804&r2=1187805&view=diff
==============================================================================
--- tomcat/trunk/res/welcome.main.html (original)
+++ tomcat/trunk/res/welcome.main.html Sat Oct 22 21:21:54 2011
@@ -24,17 +24,17 @@
<P></P>
<p>Useful references:</p>
<ul>
-<li><a href="RELEASE-NOTES">Release notes</a>, with important information
+<li><a href="RELEASE-NOTES">Release notes</a>, with important information
about known issues</li>
<li><a
href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/changelog.html";>Changelog</a></li>
</ul>
-<p><b>NOTE: The tar files in this distribution use GNU tar extensions,
-and must be untarred with a GNU compatible version of tar. The version
-of <CODE>tar</CODE> on Solaris and Mac OS X will not work with
+<p><b>NOTE: The tar files in this distribution use GNU tar extensions,
+and must be untarred with a GNU compatible version of tar. The version
+of <CODE>tar</CODE> on Solaris and Mac OS X will not work with
these files.</b></P>
-<p><font color="red">Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 6 or later.
Read the
+<p><font color="red">Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 6 or later.
Read the
RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
</font></p>
@@ -84,7 +84,7 @@ RELEASE-NOTES and the RUNNING.txt file i
<dd>JMX Remote Lifecycle Listener. See the <a
href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/listeners.html";>
listeners documentation</a> for details.</dd>
-</dl></dd>
+</dl></dd>
<dt><b>src/</b></dt>
<dd><dl>
<dt>apache-tomcat-[version].zip or .tar.gz</dt>
@@ -93,9 +93,9 @@ RELEASE-NOTES and the RUNNING.txt file i
</dl></dd>
</dl>
-<P>Thank you for using <A href="http://tomcat.apache.org/";>Tomcat</A>!.
+<P>Thank you for using <A href="http://tomcat.apache.org/";>Tomcat</A>!.
</P>
-<P><B>The Apache Tomcat Project</B> <BR><A
+<P><B>The Apache Tomcat Project</B> <BR><A
href="http://tomcat.apache.org/";>http://tomcat.apache.org/</A> </P>
<P>
<P></P></BODY></HTML>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
