svn commit: r1187665 - in /tomcat/tc7.0.x/trunk/maven: tomcat-annotations-api/ tomcat-api/ tomcat-catalina-ant/ tomcat-catalina-ha/ tomcat-catalina-jmx-remote/ tomcat-catalina-ws/ tomcat-catalina/ tom

[olamy]

Author: olamy
Date: Sat Oct 22 07:22:29 2011
New Revision: 1187665

URL: http://svn.apache.org/viewvc?rev=1187665&view=rev
Log:
not delete copied sources for all builds

Modified:
tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ws/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-coyote/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-el-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-embed-core/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-juli/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-extras-juli-adapters/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-jasper-el/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-jasper/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-jsp-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-juli/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-mail-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-tests/   (props changed)
tomcat/tc7.0.x/trunk/maven/tomcat-tribes/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-util/pom.xml

Modified: tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml?rev=1187665&r1=1187664&r2=1187665&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml Sat Oct 22 
07:22:29 2011
@@ -43,7 +43,6 @@
 generate-sources
 
   
-
 
   
 

Modified: tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml?rev=1187665&r1=1187664&r2=1187665&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml Sat Oct 22 07:22:29 2011
@@ -49,7 +49,6 @@
 generate-sources
 
   
-
 
   
 

Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml?rev=1187665&r1=1187664&r2=1187665&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml Sat Oct 22 07:22:29 
2011
@@ -64,7 +64,6 @@
 generate-sources
 
   
-
 
   
 

Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml?rev=1187665&r1=1187664&r2=1187665&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml Sat Oct 22 07:22:29 
2011
@@ -83,7 +83,6 @@
 generate-sources
 
   
-
 
   
 

Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/pom.xml?rev=1187665&r1=1187664&r2=1187665&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/pom.xml Sat Oct 22 
07:22:29 2011
@@ -62,7 +62,6 @@
 generate-sources
 
   
-
 
   
 

Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ws/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ws/pom.xml?rev=1187665&r1=1187664&r2=1187665&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ws/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ws/pom.xml Sat Oct 22 07:22:29 
2011
@@ -68,7 +68,6 @@
 generate-sources
 
   
-
 
   
 

Modified: tomcat/tc7

svn commit: r1187667 - in /tomcat/tc7.0.x/trunk/maven: tomcat-dbcp/pom.xml tomcat-embed-logging-log4j/pom.xml

[olamy]

Author: olamy
Date: Sat Oct 22 07:28:39 2011
New Revision: 1187667

URL: http://svn.apache.org/viewvc?rev=1187667&view=rev
Log:
import external sources only if not exits: build speed improve when not using 
clean

Modified:
tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/pom.xml

Modified: tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/pom.xml?rev=1187667&r1=1187666&r2=1187667&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/pom.xml Sat Oct 22 07:28:39 2011
@@ -55,82 +55,91 @@
 
   
 
-  
-
-  
-org.apache.maven.plugins
-maven-dependency-plugin
-2.3
-
-  
-unpack-commons-deps
-generate-sources
-
-  unpack
-
-
-  
-
-  commons-dbcp
-  commons-dbcp
-  1.4
-  sources
-  jar
-  false
-  **/*.java
-  **/test/**
-
-
-  commons-pool
-  commons-pool
-  1.5.6
-  sources
-  jar
-  false
-  **/*.java
-  **/test/**,**/managed/**
-
-  
-  ${tomcat-dbcp.home}/src/java
-  false
-  true
-
-  
-
-  
-  
-org.apache.maven.plugins
-maven-antrun-plugin
-
-  
-transform_to_tomcat_packages
-process-sources
-
-  
-
-  
-
-
-  
-
-
-
-
-  
-
-  
-
-
-  run
-
-  
-
-  
-
-  
+  
+
+  import-commons-sources
+  
+
+  ${basedir}/src/main/java/org/apache/tomcat/dbcp
+
+  
+  
+
+  
+org.apache.maven.plugins
+maven-dependency-plugin
+2.3
+
+  
+unpack-commons-deps
+generate-sources
+
+  unpack
+
+
+  
+
+  commons-dbcp
+  commons-dbcp
+  1.4
+  sources
+  jar
+  false
+  **/*.java
+  **/test/**
+
+
+  commons-pool
+  commons-pool
+  1.5.6
+  sources
+  jar
+  false
+  **/*.java
+  **/test/**,**/managed/**
+
+  
+  
${tomcat-dbcp.home}/src/java
+  true
+  true
+
+  
+
+  
+  
+org.apache.maven.plugins
+maven-antrun-plugin
+
+  
+transform_to_tomcat_packages
+process-sources
+
+  
+
+  
+
+
+  
+
 
+
+
+  
+
+  
+
+
+  run
+
+  
+
+  
+
+  
+
+  
 

Modified: tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/pom.xml?rev=1187667&r1=1187666&r2=1187667&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/pom.xml Sat Oct 22 
07:28:39 2011
@@ -67,67 +67,84 @@
 
   
 
-  
-
-  
-org.apache.maven.plugins
-maven-dependency-plugin
-2.3
-
-  
-unpack-commons-deps
-generate-sources
-
-  unpack
-
-
-  
-
-  commons-logging
-  commons-logging
-  1.1.1
-  sources
-  

[GUMP@vmgump]: Project tomcat-tc7.0.x-validate (in module tomcat-7.0.x) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc7.0.x-validate has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 13 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-validate :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 25 secs
Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.5-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.5-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-22102011.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.1.1-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-22102011.jar:/srv/gump/public/workspace/junit/dist/junit-22102011.jar:/srv/gump
 
/public/workspace/junit/dist/junit-dep-22102011.jar:/srv/gump/public/workspace/google-guava/build/dist/guava-22102011/guava-22102011.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-22102011.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-22102011.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/jdom/build/jdom.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-22102011.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-22102011-dep.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-7.0.x/build.xml

download-validate:

proxyflags:

setproxy:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/checkstyle/target/checkstyle-5.5-SNAPSHOT.jar

downloadzip:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-7.0.x/output/res/checkstyle
[checkstyle] Running Checkstyle 5.5-SNAPSHOT on 2098 files
[checkstyle] /srv/gump/public/workspace/tomcat-7.0.x/maven/pom.xml:3: Line does 
not match expected header line of '^(rem)?\W*Licensed to the Apache Software 
Foundation \(ASF\) under one or more$'.
[checkstyle] 
/srv/gump/public/workspace/tomcat-7.0.x/maven/tomcat-annotations-api/pom.xml:3: 
Line does not match expected header line of '^(rem)?\W*Licensed to the Apache 
Software Foundation \(ASF\) under one or more$'.
[checkstyle] 
/srv/gump/public/workspace/tomcat-7.0.x/maven/tomcat-api/pom.xml:3: Line does 
not match expected header line of '^(rem)?\W*Licensed to the Apache Software 
Foundation \(ASF\) under one or more$'.
[checkstyle] 
/srv/gump/public/workspace/tomcat-7.0.x/maven/tomcat-catalina-ant/pom.xml:3: 
Line does not match expected header line of '^(rem)?\W*Licensed to the Apache 
Software Foundation \(ASF\) under one or more$'.
[checkstyle] 
/srv/gump/public/workspace/tomcat-7.0.x/maven/tomcat-catalina-ha/pom.xml:3: 
Line does not match expected header line of '^(rem)?\W*Licensed to the Apache 
Software Foundation \(ASF\) under one or more$'.
[checkstyle] 
/srv/gump/public/workspace/tomcat-7.0.x/maven/tomcat-cat

Re: Publishing zips to the maven repo

[Henri Gomez]

Wonderfull

Thanks Olivier !

Le 21 oct. 2011 à 23:46, Olivier Lamy  a écrit :

> So I have just commit some stuff in r 1187561.
> Note: Sources layout not touched.
> Currently only maven artifacts are build  (I will work later on distrib).
> 
> to test it on the top of 
> https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk.
> Just use: mvn -f maven/pom.xml clean install.
> Currently some unit tests are failing (so use -DskipTests).
> I will try to fix that too.
> 
> 2011/10/14 Olivier Lamy :
>> Hello,
>> I can maybe help here.
>> A solution I have in mind to not change sources layout.
>> http://svn.apache.org/repos/asf/tomcat/trunk/
>> /maven/pom.xml (root pom.xml here)
>>/tomcat-coyote/pom.xml
>> etc.. one module for each artifact to produce
>> plus a module to package the distro.
>> 
>> in each module, compiler plugin will be configured to use only a set
>> of java files.
>> This won't change the current sources layout
>> 
>> As an example, this solution is used by the selenium project:
>> http://selenium.googlecode.com/svn/trunk/maven/
>> 
>> I can maybe try to work on that and provide a patch.
>> Or at least commit in trunk (if I have no layout changes to do).
>> 
>> But not before end of next week or early week after.
>> 
>> 2011/10/14 Konstantin Kolinko :
>>> 2011/10/14 Henri Gomez :
> 
> This is the first time that I can recall that anyone has stated that
> there is a requirement for this.
> 
 
 I should say many companies, including mine are injecting full Tomcat (as
 zip) in their enterprise repositories (Archiva/Nexus/Artifactory powered)
>>> 
>>> Are all those related to Maven? Do they publish only zips, or the full
>>> set of tgz and zips (~80Mb) ?
>>> 
>>> Keeping an in-house copy of 3rd party library is a different story,
>>> and it is needed regardless of whether somebody uses Maven Central to
>>> publish their work.
>>> 
>>> I personally am using Apache Ivy [1] to manage my repository of
>>> dependencies, and AFAIK it can download not only from maven, but from
>>> any other structured repository as well.
>>> 
>>> [1] http://ant.apache.org/ivy/
>>> 
 
 BTW, did there is a strong -1 to have an alternative build system using
 Maven if this build keep the current Tomcat structure ?
 
>>> 
>>> There are not may people here to support it here if it breaks, and on
>>> RTC branches that would require 3+ committers that understand what
>>> happens.
>>> 
>>> 
>>> There was some discussion here on dev@ about 2 years ago, and some
>>> person proposed to create a maven build, but he disappeared never
>>> showing anything working.
>>> 
>>> Best regards,
>>> Konstantin Kolinko
>>> 
>>> -
>>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>> 
>>> 
>> 
>> 
>> 
>> --
>> Olivier Lamy
>> Talend : http://talend.com
>> http://twitter.com/olamy | http://linkedin.com/in/olamy
>> 
> 
> 
> 
> -- 
> Olivier Lamy
> Talend : http://talend.com
> http://twitter.com/olamy | http://linkedin.com/in/olamy
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1187571 - /tomcat/tc7.0.x/trunk/.gitignore

[Rainer Jung]

Hi Olivier,

On 21.10.2011 23:59, ol...@apache.org wrote:
> Author: olamy
> Date: Fri Oct 21 21:59:52 2011
> New Revision: 1187571
> 
> URL: http://svn.apache.org/viewvc?rev=1187571&view=rev
> Log:
> add a basic .gitignore
> 
> Added:
> tomcat/tc7.0.x/trunk/.gitignore

please keep tomcat/trunk (aka TC 8) in sync.

Thanks!

Rainer

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1187740 - in /tomcat/trunk: ./ .gitignore

[olamy]

Author: olamy
Date: Sat Oct 22 17:49:29 2011
New Revision: 1187740

URL: http://svn.apache.org/viewvc?rev=1187740&view=rev
Log:
merge rev 1187571 add a simple .gitignore

Added:
tomcat/trunk/.gitignore
Modified:
tomcat/trunk/   (props changed)

Propchange: tomcat/trunk/
--
svn:mergeinfo = /tomcat/tc7.0.x/trunk:1187571

Added: tomcat/trunk/.gitignore
URL: http://svn.apache.org/viewvc/tomcat/trunk/.gitignore?rev=1187740&view=auto
==
--- tomcat/trunk/.gitignore (added)
+++ tomcat/trunk/.gitignore Sat Oct 22 17:49:29 2011
@@ -0,0 +1,6 @@
+target
+output
+build.properties
+work
+logs
+*.iml



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1187571 - /tomcat/tc7.0.x/trunk/.gitignore

[Olivier Lamy]

2011/10/22 Rainer Jung :
> Hi Olivier,
>
> On 21.10.2011 23:59, ol...@apache.org wrote:
>> Author: olamy
>> Date: Fri Oct 21 21:59:52 2011
>> New Revision: 1187571
>>
>> URL: http://svn.apache.org/viewvc?rev=1187571&view=rev
>> Log:
>> add a basic .gitignore

yup done (btw git svn is not really usable due to some use of
svn:externals in modules path)

>>
>> Added:
>>     tomcat/tc7.0.x/trunk/.gitignore
>
> please keep tomcat/trunk (aka TC 8) in sync.
>
> Thanks!
>
> Rainer
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>



-- 
Olivier Lamy
Talend : http://talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1187744 - /tomcat/trunk/

[markt]

Author: markt
Date: Sat Oct 22 18:23:45 2011
New Revision: 1187744

URL: http://svn.apache.org/viewvc?rev=1187744&view=rev
Log:
Remove mereg info. Merging is from trunk to 7.0.x, not 7.0.x to trunk

Modified:
tomcat/trunk/   (props changed)

Propchange: tomcat/trunk/
('svn:mergeinfo' removed)



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1187753 [1/4] - in /tomcat/trunk/java/org/apache: catalina/connector/ tomcat/util/buf/ tomcat/util/http/

[markt]

Author: markt
Date: Sat Oct 22 19:21:08 2011
New Revision: 1187753

URL: http://svn.apache.org/viewvc?rev=1187753&view=rev
Log:
Clean-up. No functional change.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/ClientAbortException.java
tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/Constants.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java
tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteReader.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteWriter.java
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java
tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java
tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/Constants.java
tomcat/trunk/java/org/apache/tomcat/util/buf/HexUtils.java
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
tomcat/trunk/java/org/apache/tomcat/util/http/ContentType.java
tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java
tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java
tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
tomcat/trunk/java/org/apache/tomcat/util/http/HttpMessages.java
tomcat/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookie.java

Modified: 
tomcat/trunk/java/org/apache/catalina/connector/ClientAbortException.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/ClientAbortException.java?rev=1187753&r1=1187752&r2=1187753&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/ClientAbortException.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/ClientAbortException.java 
Sat Oct 22 19:21:08 2011
@@ -5,17 +5,15 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * 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.
  */
-
-
 package org.apache.catalina.connector;
 
 import java.io.IOException;
@@ -32,7 +30,7 @@ public final class ClientAbortException 
 
 private static final long serialVersionUID = 1L;
 
-
+
 // Constructors
 
 /**
@@ -119,12 +117,12 @@ public final class ClientAbortException 
  */
 @Override
 public Throwable getCause() {
-
+
 return (throwable);
-
+
 }
 
-
+
 /**
  * Return a formatted string that describes this exception.
  */

Modified: tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java?rev=1187753&r1=1187752&r2=1187753&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java Sat Oct 
22 19:21:08 2011
@@ -5,17 +5,15 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License

svn commit: r1187753 [4/4] - in /tomcat/trunk/java/org/apache: catalina/connector/ tomcat/util/buf/ tomcat/util/http/

[markt]

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/HttpMessages.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/HttpMessages.java?rev=1187753&r1=1187752&r2=1187753&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/HttpMessages.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/HttpMessages.java Sat Oct 22 
19:21:08 2011
@@ -14,14 +14,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.apache.tomcat.util.http;
 
 import org.apache.tomcat.util.res.StringManager;
 
 /**
  * Handle (internationalized) HTTP messages.
- * 
+ *
  * @author James Duncan Davidson [dun...@eng.sun.com]
  * @author James Todd [go...@eng.sun.com]
  * @author Jason Hunter [j...@eng.sun.com]
@@ -32,12 +31,12 @@ public class HttpMessages {
 // XXX move message resources in this package
 protected static final StringManager sm =
 StringManager.getManager("org.apache.tomcat.util.http.res");
-
+
 static String st_200=null;
 static String st_302=null;
 static String st_400=null;
 static String st_404=null;
-
+
 /** Get the status string associated with a status code.
  *  No I18N - return the messages defined in the HTTP spec.
  *  ( the user isn't supposed to see them, this is the last
@@ -48,21 +47,29 @@ public class HttpMessages {
  */
 public static String getMessage( int status ) {
 // method from Response.
-
+
 // Does HTTP requires/allow international messages or
 // are pre-defined? The user doesn't see them most of the time
 switch( status ) {
 case 200:
-if( st_200==null ) st_200=sm.getString( "sc.200");
+if( st_200==null ) {
+st_200=sm.getString( "sc.200");
+}
 return st_200;
 case 302:
-if( st_302==null ) st_302=sm.getString( "sc.302");
+if( st_302==null ) {
+st_302=sm.getString( "sc.302");
+}
 return st_302;
 case 400:
-if( st_400==null ) st_400=sm.getString( "sc.400");
+if( st_400==null ) {
+st_400=sm.getString( "sc.400");
+}
 return st_400;
 case 404:
-if( st_404==null ) st_404=sm.getString( "sc.404");
+if( st_404==null ) {
+st_404=sm.getString( "sc.404");
+}
 return st_404;
 }
 return sm.getString("sc."+ status);
@@ -77,8 +84,9 @@ public class HttpMessages {
  */
 public static String filter(String message) {
 
-if (message == null)
+if (message == null) {
 return (null);
+}
 
 char content[] = new char[message.length()];
 message.getChars(0, message.length(), content, 0);
@@ -107,7 +115,7 @@ public class HttpMessages {
 /**
  * Is the provided message safe to use in an HTTP header. Safe messages 
must
  * meet the requirements of RFC2616 - i.e. must consist only of TEXT.
- * 
+ *
  * @param msg   The message to test
  * @return  true if the message is safe to use in an HTTP
  *  header else false

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java?rev=1187753&r1=1187752&r2=1187753&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java Sat Oct 22 
19:21:08 2011
@@ -14,7 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.apache.tomcat.util.http;
 
 import java.io.PrintWriter;
@@ -53,16 +52,16 @@ import org.apache.tomcat.util.buf.Messag
directly access all headers, and most headers are single-valued.
( the alternative - a hash or similar data structure - will add
an overhead that is not needed in most cases )
-   
+
Apache seems to be using a similar method for storing and manipulating
headers.
-   
+
Future enhancements:
- hash the headers the first time a header is requested ( i.e. if the
servlet needs direct access to headers).
- scan "common" values ( length, cookies, etc ) during the parse
( addHeader hook )
-   
+
 */
 
 
@@ -83,8 +82,8 @@ import org.apache.tomcat.util.buf.Messag
  *  XXX remove unused methods
  *  XXX External enumerations, with 0 GC.
  *  XXX use HeaderName ID
- *  
- * 
+ *
+ *
  * @author d...@eng.sun.com
  * @author James Todd [go...@eng.sun.com]
  * @author Costin Manolache
@@ -95,7 +94,7 @@ public class MimeHeaders {
  *  XXX  make it configu

svn commit: r1187754 - in /tomcat/trunk/java/org/apache: coyote/Request.java tomcat/util/http/ContentType.java tomcat/util/http/MimeHeaders.java tomcat/util/http/Parameters.java tomcat/util/http/Serve

[markt]

Author: markt
Date: Sat Oct 22 19:23:17 2011
New Revision: 1187754

URL: http://svn.apache.org/viewvc?rev=1187754&view=rev
Log:
Remove unused code. Move utility method that is only usedonce to where
it is used.

Removed:
tomcat/trunk/java/org/apache/tomcat/util/http/ContentType.java
Modified:
tomcat/trunk/java/org/apache/coyote/Request.java
tomcat/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookie.java

Modified: tomcat/trunk/java/org/apache/coyote/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Request.java?rev=1187754&r1=1187753&r2=1187754&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Request.java Sat Oct 22 19:23:17 2011
@@ -23,18 +23,17 @@ import java.util.HashMap;
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.buf.MessageBytes;
 import org.apache.tomcat.util.buf.UDecoder;
-import org.apache.tomcat.util.http.ContentType;
 import org.apache.tomcat.util.http.Cookies;
 import org.apache.tomcat.util.http.MimeHeaders;
 import org.apache.tomcat.util.http.Parameters;
 
 /**
- * This is a low-level, efficient representation of a server request. Most 
- * fields are GC-free, expensive operations are delayed until the  user code 
+ * This is a low-level, efficient representation of a server request. Most
+ * fields are GC-free, expensive operations are delayed until the  user code
  * needs the information.
  *
  * Processing is delegated to modules, using a hook mechanism.
- * 
+ *
  * This class is not intended for user code - it is used internally by tomcat
  * for processing the request in the most efficient way. Users ( servlets ) can
  * access the information using a facade, which provides the high-level view
@@ -50,7 +49,7 @@ import org.apache.tomcat.util.http.Param
  * Tomcat defines a number of attributes:
  * 
  *   "org.apache.tomcat.request" - allows access to the low-level
- *   request object in trusted applications 
+ *   request object in trusted applications
  * 
  *
  * @author James Duncan Davidson [dun...@eng.sun.com]
@@ -80,34 +79,34 @@ public final class Request {
 
 
 private int serverPort = -1;
-private MessageBytes serverNameMB = MessageBytes.newInstance();
+private final MessageBytes serverNameMB = MessageBytes.newInstance();
 
 private int remotePort;
 private int localPort;
 
-private MessageBytes schemeMB = MessageBytes.newInstance();
+private final MessageBytes schemeMB = MessageBytes.newInstance();
 
-private MessageBytes methodMB = MessageBytes.newInstance();
-private MessageBytes unparsedURIMB = MessageBytes.newInstance();
-private MessageBytes uriMB = MessageBytes.newInstance();
-private MessageBytes decodedUriMB = MessageBytes.newInstance();
-private MessageBytes queryMB = MessageBytes.newInstance();
-private MessageBytes protoMB = MessageBytes.newInstance();
+private final MessageBytes methodMB = MessageBytes.newInstance();
+private final MessageBytes unparsedURIMB = MessageBytes.newInstance();
+private final MessageBytes uriMB = MessageBytes.newInstance();
+private final MessageBytes decodedUriMB = MessageBytes.newInstance();
+private final MessageBytes queryMB = MessageBytes.newInstance();
+private final MessageBytes protoMB = MessageBytes.newInstance();
 
 // remote address/host
-private MessageBytes remoteAddrMB = MessageBytes.newInstance();
-private MessageBytes localNameMB = MessageBytes.newInstance();
-private MessageBytes remoteHostMB = MessageBytes.newInstance();
-private MessageBytes localAddrMB = MessageBytes.newInstance();
- 
-private MimeHeaders headers = new MimeHeaders();
+private final MessageBytes remoteAddrMB = MessageBytes.newInstance();
+private final MessageBytes localNameMB = MessageBytes.newInstance();
+private final MessageBytes remoteHostMB = MessageBytes.newInstance();
+private final MessageBytes localAddrMB = MessageBytes.newInstance();
+
+private final MimeHeaders headers = new MimeHeaders();
 
-private MessageBytes instanceId = MessageBytes.newInstance();
+private final MessageBytes instanceId = MessageBytes.newInstance();
 
 /**
  * Notes.
  */
-private Object notes[] = new Object[Constants.MAX_NOTES];
+private final Object notes[] = new Object[Constants.MAX_NOTES];
 
 
 /**
@@ -119,7 +118,7 @@ public final class Request {
 /**
  * URL decoder.
  */
-private UDecoder urlDecoder = new UDecoder();
+private final UDecoder urlDecoder = new UDecoder();
 
 
 /**
@@ -128,12 +127,12 @@ public final class Request {
 private long contentLength = -1;
 private MessageBytes contentTypeMB = null;
 private Strin

svn commit: r1187755 - /tomcat/trunk/webapps/examples/jsp/plugin/applet/Clock2.java

[markt]

Author: markt
Date: Sat Oct 22 19:23:59 2011
New Revision: 1187755

URL: http://svn.apache.org/viewvc?rev=1187755&view=rev
Log:
Fix various Eclipse warnings

Modified:
tomcat/trunk/webapps/examples/jsp/plugin/applet/Clock2.java

Modified: tomcat/trunk/webapps/examples/jsp/plugin/applet/Clock2.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/plugin/applet/Clock2.java?rev=1187755&r1=1187754&r2=1187755&view=diff
==
--- tomcat/trunk/webapps/examples/jsp/plugin/applet/Clock2.java (original)
+++ tomcat/trunk/webapps/examples/jsp/plugin/applet/Clock2.java Sat Oct 22 
19:23:59 2011
@@ -30,9 +30,10 @@ import java.util.Locale;
  */
 
 public class Clock2 extends Applet implements Runnable {
+private static final long serialVersionUID = 1L;
 Thread timer;// The thread that displays clock
 int lastxs, lastys, lastxm,
-lastym, lastxh, lastyh;  // Dimensions used to draw hands 
+lastym, lastxh, lastyh;  // Dimensions used to draw hands
 SimpleDateFormat formatter;  // Formats the date displayed
 String lastdate; // String to hold date displayed
 Font clockFaceFont;  // Font for number display on clock
@@ -40,8 +41,8 @@ public class Clock2 extends Applet imple
 Color handColor; // Color of main hands and dial
 Color numberColor;   // Color of second hand and numbers
 
+@Override
 public void init() {
-int x,y;
 lastxs = lastys = lastxm = lastym = lastxh = lastyh = 0;
 formatter = new SimpleDateFormat ("EEE MMM dd hh:mm:ss ", 
Locale.getDefault());
 currentDate = new Date();
@@ -99,6 +100,7 @@ public class Clock2 extends Applet imple
 }
 
 // Paint is the main part of the program
+@Override
 public void paint(Graphics g) {
 int xh, yh, xm, ym, xs, ys, s = 0, m = 10, h = 10, xcenter, ycenter;
 String today;
@@ -115,7 +117,7 @@ public class Clock2 extends Applet imple
 m = Integer.parseInt(formatter.format(currentDate));
 } catch (NumberFormatException n) {
 m = 10;
-}
+}
 formatter.applyPattern("h");
 try {
 h = Integer.parseInt(formatter.format(currentDate));
@@ -126,30 +128,30 @@ public class Clock2 extends Applet imple
 today = formatter.format(currentDate);
 xcenter=80;
 ycenter=55;
-
+
 // a= s* pi/2 - pi/2 (to switch 0,0 from 3:00 to 12:00)
 // x = r(cos a) + xcenter, y = r(sin a) + ycenter
-
+
 xs = (int)(Math.cos(s * 3.14f/30 - 3.14f/2) * 45 + xcenter);
 ys = (int)(Math.sin(s * 3.14f/30 - 3.14f/2) * 45 + ycenter);
 xm = (int)(Math.cos(m * 3.14f/30 - 3.14f/2) * 40 + xcenter);
 ym = (int)(Math.sin(m * 3.14f/30 - 3.14f/2) * 40 + ycenter);
 xh = (int)(Math.cos((h*30 + m/2) * 3.14f/180 - 3.14f/2) * 30 + 
xcenter);
 yh = (int)(Math.sin((h*30 + m/2) * 3.14f/180 - 3.14f/2) * 30 + 
ycenter);
-
+
 // Draw the circle and numbers
-
+
 g.setFont(clockFaceFont);
 g.setColor(handColor);
 circle(xcenter,ycenter,50,g);
 g.setColor(numberColor);
-g.drawString("9",xcenter-45,ycenter+3); 
+g.drawString("9",xcenter-45,ycenter+3);
 g.drawString("3",xcenter+40,ycenter+3);
 g.drawString("12",xcenter-5,ycenter-37);
 g.drawString("6",xcenter-3,ycenter+45);
 
 // Erase if necessary, and redraw
-
+
 g.setColor(getBackground());
 if (xs != lastxs || ys != lastys) {
 g.drawLine(xcenter, ycenter, lastxs, lastys);
@@ -163,7 +165,7 @@ public class Clock2 extends Applet imple
 g.drawLine(xcenter-1, ycenter, lastxh, lastyh); }
 g.setColor(numberColor);
 g.drawString("", 5, 125);
-g.drawString(today, 5, 125);
+g.drawString(today, 5, 125);
 g.drawLine(xcenter, ycenter, xs, ys);
 g.setColor(handColor);
 g.drawLine(xcenter, ycenter-1, xm, ym);
@@ -177,34 +179,40 @@ public class Clock2 extends Applet imple
 currentDate=null;
 }
 
+@Override
 public void start() {
 timer = new Thread(this);
 timer.start();
 }
 
+@Override
 public void stop() {
 timer = null;
 }
 
+@Override
 public void run() {
 Thread me = Thread.currentThread();
 while (timer == me) {
 try {
-Thread.currentThread().sleep(100);
+Thread.sleep(100);
 } catch (InterruptedException e) {
 }
 repaint();
 }
 }
 
+@Override
 public void update(Graphics g) {
 paint(g);
 }
 
+@Override
 public String getAppletInfo() {
 return "Title: A Clock \nAuthor: Rachel Gollub, 1995 \nAn analog 
clock.";
 }
-  
+
+@Override
 public String[][] getParameterIn

svn commit: r1187757 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/ha/ java/org/apache/catalina/ha/authentic

[markt]

Author: markt
Date: Sat Oct 22 19:28:31 2011
New Revision: 1187757

URL: http://svn.apache.org/viewvc?rev=1187757&view=rev
Log:
Removing info part 2

Modified:
tomcat/trunk/java/org/apache/catalina/Cluster.java
tomcat/trunk/java/org/apache/catalina/Realm.java
tomcat/trunk/java/org/apache/catalina/Session.java
tomcat/trunk/java/org/apache/catalina/Store.java
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/ha/CatalinaCluster.java

tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java

tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/java/org/apache/catalina/manager/DummyProxySession.java
tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
tomcat/trunk/java/org/apache/catalina/session/FileStore.java
tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/java/org/apache/catalina/session/StoreBase.java
tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java

tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java

Modified: tomcat/trunk/java/org/apache/catalina/Cluster.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Cluster.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Cluster.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Cluster.java Sat Oct 22 19:28:31 2011
@@ -37,13 +37,6 @@ public interface Cluster {
 // - Properties
 
 /**
- * Return descriptive information about this Cluster implementation and
- * the corresponding version number, in the format
- * /.
- */
-public String getInfo();
-
-/**
  * Return the name of the cluster that this Server is currently
  * configured to operate within.
  *

Modified: tomcat/trunk/java/org/apache/catalina/Realm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Realm.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Realm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Realm.java Sat Oct 22 19:28:31 2011
@@ -58,16 +58,7 @@ public interface Realm {
 public void setContainer(Container container);
 
 
-/**
- * Return descriptive information about this Realm implementation and
- * the corresponding version number, in the format
- * /.
- */
-public String getInfo();
-
-
 // - Public Methods
-
 
 /**
  * Add a property change listener to this component.

Modified: tomcat/trunk/java/org/apache/catalina/Session.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Session.java?rev=1187757&r1=1187756&r2=1187757&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Session.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Session.java Sat Oct 22 19:28:31 2011
@@ -138,14 +138,6 @@ public interface Session {
 
 
 /**
- * Return descriptive information about this Session implementation and
- * the corresponding version number, in the format
- * /.
- */
-public String getInfo();
-
-
-/**
  * Return the last time the client sent a request associated with this
  * session,

svn commit: r1187759 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/ant/jmx/ java/org/apache/catalina/core/ java/org/apache/catalina/ha/ java/org/apache/catalina/ha/deploy/ jav

[markt]

Author: markt
Date: Sat Oct 22 19:31:29 2011
New Revision: 1187759

URL: http://svn.apache.org/viewvc?rev=1187759&view=rev
Log:
info / getInfo() cleanup part 3

Modified:
tomcat/trunk/java/org/apache/catalina/Container.java
tomcat/trunk/java/org/apache/catalina/Loader.java
tomcat/trunk/java/org/apache/catalina/Manager.java
tomcat/trunk/java/org/apache/catalina/Server.java
tomcat/trunk/java/org/apache/catalina/Service.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java

tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/trunk/java/org/apache/catalina/ha/ClusterDeployer.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java

tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java

tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java

Modified: tomcat/trunk/java/org/apache/catalina/Container.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Container.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Container.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Container.java Sat Oct 22 19:31:29 
2011
@@ -133,15 +133,6 @@ public interface Container extends Lifec
 
 // - Properties
 
-
-/**
- * Return descriptive information about this Container implementation and
- * the corresponding version number, in the format
- * /.
- */
-public String getInfo();
-
-
 /**
  * Return the Loader with which this Container is associated.  If there is
  * no associated Loader, return the Loader associated with our parent

Modified: tomcat/trunk/java/org/apache/catalina/Loader.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Loader.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Loader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Loader.java Sat Oct 22 19:31:29 2011
@@ -104,14 +104,6 @@ public interface Loader {
 
 
 /**
- * Return descriptive information about this Loader implementation and
- * the corresponding version number, in the format
- * /.
- */
-public String getInfo();
-
-
-/**
  * Return the reloadable flag for this Loader.
  */
 public boolean getReloadable();

Modified: tomcat/trunk/java/org/apache/catalina/Manager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Manager.java?rev=1187759&r1=1187758&r2=1187759&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Manager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Manager.java Sat Oct 22 19:31:29 2011
@@ -81,14 +81,6 @@ public interface Manager {
 
 
 /**
- * Return descriptive information about this Manager implementation and
- * the corresponding version number, in the format
- * /.
- */
-public String getInf

svn commit: r1187760 - in /tomcat/trunk: java/org/apache/catalina/core/ContainerBase.java java/org/apache/coyote/Request.java test/org/apache/catalina/filters/TesterResponse.java

[markt]

Author: markt
Date: Sat Oct 22 19:32:37 2011
New Revision: 1187760

URL: http://svn.apache.org/viewvc?rev=1187760&view=rev
Log:
Remainder of info / getInfo() clean-up

Modified:
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/coyote/Request.java
tomcat/trunk/test/org/apache/catalina/filters/TesterResponse.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1187760&r1=1187759&r2=1187760&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Sat Oct 22 
19:32:37 2011
@@ -60,8 +60,7 @@ import org.apache.tomcat.util.res.String
 /**
  * Abstract implementation of the Container interface, providing common
  * functionality required by nearly every implementation.  Classes extending
- * this base class must implement getInfo(), and may implement
- * a replacement for invoke().
+ * this base class must may implement a replacement for invoke().
  * 
  * All subclasses of this abstract base class will include support for a
  * Pipeline object that defines the processing to be performed for each request

Modified: tomcat/trunk/java/org/apache/coyote/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Request.java?rev=1187760&r1=1187759&r2=1187760&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Request.java Sat Oct 22 19:32:37 2011
@@ -39,13 +39,6 @@ import org.apache.tomcat.util.http.Param
  * access the information using a facade, which provides the high-level view
  * of the request.
  *
- * For lazy evaluation, the request uses the getInfo() hook. The following ids
- * are defined:
- * 
- *  req.encoding - returns the request encoding
- *  req.attribute - returns a module-specific attribute ( like SSL keys, 
etc ).
- * 
- *
  * Tomcat defines a number of attributes:
  * 
  *   "org.apache.tomcat.request" - allows access to the low-level

Modified: tomcat/trunk/test/org/apache/catalina/filters/TesterResponse.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TesterResponse.java?rev=1187760&r1=1187759&r2=1187760&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/filters/TesterResponse.java (original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TesterResponse.java Sat Oct 
22 19:32:37 2011
@@ -66,7 +66,6 @@ public class TesterResponse
 public void setIncluded(@SuppressWarnings("unused") boolean included) {
 // NOOP
 }
-public String getInfo() { return null; }
 public Request getRequest() { return null; }
 public void setRequest(@SuppressWarnings("unused") Request request) {
 // NOOP



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1187761 - /tomcat/trunk/TOMCAT-NEXT.txt

[markt]

Author: markt
Date: Sat Oct 22 19:33:01 2011
New Revision: 1187761

URL: http://svn.apache.org/viewvc?rev=1187761&view=rev
Log:
Update to-do list

Modified:
tomcat/trunk/TOMCAT-NEXT.txt

Modified: tomcat/trunk/TOMCAT-NEXT.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-NEXT.txt?rev=1187761&r1=1187760&r2=1187761&view=diff
==
--- tomcat/trunk/TOMCAT-NEXT.txt (original)
+++ tomcat/trunk/TOMCAT-NEXT.txt Sat Oct 22 19:33:01 2011
@@ -44,6 +44,4 @@ but possibly 7.1.x).
particularly any that may result in a client socket being left open after a
connector.stop(). 
 
-9. Remove all the static info attributes and associated getters.
-
-10. Remove the svn keywords from all the files. 
\ No newline at end of file
+9. Remove the svn keywords from all the files. (Just Java files?) 
\ No newline at end of file



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1187762 - /tomcat/trunk/webapps/docs/changelog.xml

[markt]

Author: markt
Date: Sat Oct 22 19:33:30 2011
New Revision: 1187762

URL: http://svn.apache.org/viewvc?rev=1187762&view=rev
Log:
Update changelog

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1187762&r1=1187761&r2=1187762&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Oct 22 19:33:30 2011
@@ -60,6 +60,10 @@
   
 Remove unused, deprecated code. (markt)
   
+  
+Remove static info String and associated getInfo() method where 
present.
+(markt)
+  
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1187764 - in /tomcat/tc7.0.x/trunk/maven: ./ tomcat-annotations-api/ tomcat-api/ tomcat-catalina-ant/ tomcat-catalina-ha/ tomcat-catalina-jmx-remote/ tomcat-catalina-ws/ tomcat-catalina/

[olamy]

Author: olamy
Date: Sat Oct 22 19:50:49 2011
New Revision: 1187764

URL: http://svn.apache.org/viewvc?rev=1187764&view=rev
Log:
temporary copy sources ${basedir}/target/src/main/java rather than to ./src/ it 
will prevents to add too much svn:ignore and will be deleted by a simple clean

Modified:
tomcat/tc7.0.x/trunk/maven/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ws/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-catalina/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-coyote/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-dbcp/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-el-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-embed-core/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-juli/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-embed-logging-log4j/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-extras-juli-adapters/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-jasper-el/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-jasper/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-jsp-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-juli/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-mail-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-servlet-api/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-tests/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-tribes/pom.xml
tomcat/tc7.0.x/trunk/maven/tomcat-util/pom.xml

Modified: tomcat/tc7.0.x/trunk/maven/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/pom.xml?rev=1187764&r1=1187763&r2=1187764&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/pom.xml Sat Oct 22 19:50:49 2011
@@ -41,6 +41,7 @@
 true
 
 ISO-8859-1
+${basedir}/target/src/main/java
   
 
 
@@ -79,6 +80,7 @@
 
 
   
+${sourceBasePath}
 
   
 

Modified: tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml?rev=1187764&r1=1187763&r2=1187764&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-annotations-api/pom.xml Sat Oct 22 
19:50:49 2011
@@ -41,7 +41,7 @@
 generate-sources
 
   
-
+
   
 
 

Modified: tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml?rev=1187764&r1=1187763&r2=1187764&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-api/pom.xml Sat Oct 22 19:50:49 2011
@@ -47,7 +47,7 @@
 generate-sources
 
   
-
+
   
 
   

Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml?rev=1187764&r1=1187763&r2=1187764&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ant/pom.xml Sat Oct 22 19:50:49 
2011
@@ -62,7 +62,7 @@
 generate-sources
 
   
-
+
   
 
 

Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml?rev=1187764&r1=1187763&r2=1187764&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina-ha/pom.xml Sat Oct 22 19:50:49 
2011
@@ -81,7 +81,7 @@
 generate-sources
 
   
-
+
   
 
   

Modified: tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/pom.xml?rev=1187764&r1=1187763&r2=1187764&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/tomcat-catalina-jmx-remote/po

svn commit: r1187765 - /tomcat/tc7.0.x/trunk/maven/pom.xml

[olamy]

Author: olamy
Date: Sat Oct 22 19:52:04 2011
New Revision: 1187765

URL: http://svn.apache.org/viewvc?rev=1187765&view=rev
Log:
no more need to try delete/clean src directory

Modified:
tomcat/tc7.0.x/trunk/maven/pom.xml

Modified: tomcat/tc7.0.x/trunk/maven/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/maven/pom.xml?rev=1187765&r1=1187764&r2=1187765&view=diff
==
--- tomcat/tc7.0.x/trunk/maven/pom.xml (original)
+++ tomcat/tc7.0.x/trunk/maven/pom.xml Sat Oct 22 19:52:04 2011
@@ -88,13 +88,6 @@
   org.apache.maven.plugins
   maven-clean-plugin
   2.4.1
-  
-
-  
-src
-  
-
-  
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Removing getInfo() methods - JMX needs update as well

[Konstantin Kolinko]

Mark,

note, that searching for "info" in *.xml files gives 14 hits in 4
mbeans-descriptor.xml files.

Those have to be removed.

mbeans-descriptors.xml -
tomcat-8.0.x/java/org/apache/catalina/ha/session (3 matches)
mbeans-descriptors.xml - tomcat-8.0.x/java/org/apache/catalina/ha/tcp
(2 matches)
mbeans-descriptors.xml - tomcat-8.0.x/java/org/apache/catalina/tribes/membership
mbeans-descriptors.xml - tomcat-8.0.x/java/org/apache/catalina/valves
(8 matches)




That is the only user-visible usage of those getInfo() methods that I
know about.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Removing getInfo() methods - JMX needs update as well

[Mark Thomas]

On 22/10/2011 21:47, Konstantin Kolinko wrote:
> Mark,
> 
> note, that searching for "info" in *.xml files gives 14 hits in 4
> mbeans-descriptor.xml files.
> 
> Those have to be removed.

Thanks. I'll do that shortly.

I am currently trying to remove all trailing whitespace and having
issues with the size of the commit. I'll probably have to break it down
into smaller chunks.

I'll fix the info issues once I have the whitespace cleaned up.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1187775 - in /tomcat/trunk/conf: catalina.policy catalina.properties server.xml web.xml

[markt]

Author: markt
Date: Sat Oct 22 20:52:05 2011
New Revision: 1187775

URL: http://svn.apache.org/viewvc?rev=1187775&view=rev
Log:
Whitespace removal from /conf

Modified:
tomcat/trunk/conf/catalina.policy
tomcat/trunk/conf/catalina.properties
tomcat/trunk/conf/server.xml
tomcat/trunk/conf/web.xml

Modified: tomcat/trunk/conf/catalina.policy
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.policy?rev=1187775&r1=1187774&r2=1187775&view=diff
==
--- tomcat/trunk/conf/catalina.policy (original)
+++ tomcat/trunk/conf/catalina.policy Sat Oct 22 20:52:05 2011
@@ -67,7 +67,7 @@ grant codeBase "file:${catalina.home}/bi
 //  grant codeBase "file:${catalina.base}/bin/tomcat-juli.jar" {..}
 grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
 permission java.io.FilePermission
- 
"${java.home}${file.separator}lib${file.separator}logging.properties", "read"; 
+ 
"${java.home}${file.separator}lib${file.separator}logging.properties", "read";
 
 permission java.io.FilePermission
  
"${catalina.base}${file.separator}conf${file.separator}logging.properties", 
"read";

Modified: tomcat/trunk/conf/catalina.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.properties?rev=1187775&r1=1187774&r2=1187775&view=diff
==
--- tomcat/trunk/conf/catalina.properties (original)
+++ tomcat/trunk/conf/catalina.properties Sat Oct 22 20:52:05 2011
@@ -34,41 +34,41 @@ package.definition=sun.,java.,org.apache
 
 #
 #
-# List of comma-separated paths defining the contents of the "common" 
+# List of comma-separated paths defining the contents of the "common"
 # classloader. Prefixes should be used to define what is the repository type.
 # Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank,the JVM system loader will be used as Catalina's "common" 
+# If left as blank,the JVM system loader will be used as Catalina's "common"
 # loader.
 # Examples:
 # "foo": Add this folder as a class repository
-# "foo/*.jar": Add all the JARs of the specified folder as class 
+# "foo/*.jar": Add all the JARs of the specified folder as class
 #  repositories
 # "foo/bar.jar": Add bar.jar as a class repository
 
common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar
 
 #
-# List of comma-separated paths defining the contents of the "server" 
+# List of comma-separated paths defining the contents of the "server"
 # classloader. Prefixes should be used to define what is the repository type.
 # Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank, the "common" loader will be used as Catalina's "server" 
+# If left as blank, the "common" loader will be used as Catalina's "server"
 # loader.
 # Examples:
 # "foo": Add this folder as a class repository
-# "foo/*.jar": Add all the JARs of the specified folder as class 
+# "foo/*.jar": Add all the JARs of the specified folder as class
 #  repositories
 # "foo/bar.jar": Add bar.jar as a class repository
 server.loader=
 
 #
-# List of comma-separated paths defining the contents of the "shared" 
+# List of comma-separated paths defining the contents of the "shared"
 # classloader. Prefixes should be used to define what is the repository type.
 # Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
 # the "common" loader will be used as Catalina's "shared" loader.
 # Examples:
 # "foo": Add this folder as a class repository
-# "foo/*.jar": Add all the JARs of the specified folder as class 
+# "foo/*.jar": Add all the JARs of the specified folder as class
 #  repositories
-# "foo/bar.jar": Add bar.jar as a class repository 
+# "foo/bar.jar": Add bar.jar as a class repository
 # Please note that for single jars, e.g. bar.jar, you need the URL form
 # starting with file:.
 shared.loader=

Modified: tomcat/trunk/conf/server.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/server.xml?rev=1187775&r1=1187774&r2=1187775&view=diff
==
--- tomcat/trunk/conf/server.xml (original)
+++ tomcat/trunk/conf/server.xml Sat Oct 22 20:52:05 2011
@@ -47,19 +47,19 @@
   
 
   
   
-  
+
 
 
-
-
+
+
 
-
 

+-->
 
 
 
  
+
+-->
 
 
   
   
+  -->
 
   

Modified: tomcat/trunk/conf/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1187775&r1=1187774&r2=1187775&view=diff
==
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Sat Oct 22 20:52:05 2011
@

svn commit: r1187781 [6/6] - in /tomcat/trunk/java/org/apache/tomcat: ./ buildutil/ jni/ util/ util/bcel/ util/bcel/classfile/ util/bcel/util/ util/buf/ util/digester/ util/file/ util/http/fileupload/

[markt]

Modified: tomcat/trunk/java/org/apache/tomcat/util/threads/LimitLatch.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/threads/LimitLatch.java?rev=1187781&r1=1187780&r2=1187781&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/threads/LimitLatch.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/threads/LimitLatch.java Sat Oct 22 
21:02:40 2011
@@ -56,7 +56,7 @@ public class LimitLatch {
 private final AtomicLong count;
 private volatile long limit;
 private volatile boolean released = false;
-
+
 /**
  * Instantiates a LimitLatch object with an initial limit.
  * @param limit - maximum number of concurrent acquisitions of this latch
@@ -83,7 +83,7 @@ public class LimitLatch {
  * the new limit. If the limit is increased, threads currently in the queue
  * may not be issued one of the newly available shares until the next
  * request is made for a latch.
- * 
+ *
  * @param limit The new limit
  */
 public void setLimit(long limit) {
@@ -107,7 +107,7 @@ public class LimitLatch {
 sync.releaseShared(0);
 return count.get();
 }
-
+
 /**
  * Releases all waiting threads and causes the {@link #limit} to be ignored
  * until {@link #reset()} is called.
@@ -116,7 +116,7 @@ public class LimitLatch {
 released = true;
 return sync.releaseShared(0);
 }
-
+
 /**
  * Resets the latch and initializes the shared acquisition counter to zero.
  * @see #releaseAll()
@@ -125,7 +125,7 @@ public class LimitLatch {
 this.count.set(0);
 released = false;
 }
-
+
 /**
  * Returns true if there is at least one thread waiting to
  * acquire the shared lock, otherwise returns false.

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/threads/ResizableExecutor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/threads/ResizableExecutor.java?rev=1187781&r1=1187780&r2=1187781&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/threads/ResizableExecutor.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/threads/ResizableExecutor.java Sat 
Oct 22 21:02:40 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,7 +26,7 @@ public interface ResizableExecutor exten
  * @return the number of threads
  */
 public int getPoolSize();
-
+
 public int getMaxThreads();
 
 /**
@@ -36,9 +36,9 @@ public interface ResizableExecutor exten
  * @return the number of threads
  */
 public int getActiveCount();
-
+
 public boolean resizePool(int corePoolSize, int maximumPoolSize);
-
+
 public boolean resizeQueue(int capacity);
-
+
 }

Modified: tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java?rev=1187781&r1=1187780&r2=1187781&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java Sat Oct 22 
21:02:40 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,9 +23,9 @@ import java.util.concurrent.TimeUnit;
 
 /**
  * As task queue specifically designed to run with a thread pool executor.
- * The task queue is optimised to properly utilize threads within 
+ * The task queue is optimised to properly utilize threads within
  * a thread pool executor. If you use a normal queue, the executor will spawn 
threads
- * when there are idle threads and you wont be able to force items unto the 
queue itself 
+ * when there are idle threads and you wont be able to force items unto the 
queue itself
  * @author fhanik
  *
  */
@@ -34,7 +34,7 @@ public class TaskQueue extends LinkedBlo
 private stat

svn commit: r1187782 [5/5] - in /tomcat/trunk/java/org/apache/naming: ./ factory/ factory/webservices/ java/ resources/ resources/jndi/

[markt]

Modified: tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java?rev=1187782&r1=1187781&r2=1187782&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java Sat Oct 22 
21:03:58 2011
@@ -5,15 +5,15 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * 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.
- */ 
+ */
 
 
 package org.apache.naming.resources;
@@ -59,7 +59,7 @@ public class WARDirContext extends BaseD
 
 private static final org.apache.juli.logging.Log log=
 org.apache.juli.logging.LogFactory.getLog( WARDirContext.class );
-
+
 // --- Constructors
 
 
@@ -109,9 +109,9 @@ public class WARDirContext extends BaseD
 
 /**
  * Set the document root.
- * 
+ *
  * @param docBase The new document root
- * 
+ *
  * @exception IllegalArgumentException if the specified value is not
  *  supported by this implementation
  * @exception IllegalArgumentException if this would create a
@@ -188,7 +188,7 @@ public class WARDirContext extends BaseD
 
 /**
  * Retrieves the named object.
- * 
+ *
  * @param strName the name of the object to look up
  * @return the object bound to name
  */
@@ -208,7 +208,7 @@ public class WARDirContext extends BaseD
 Entry entry = treeLookup(name);
 if (entry == null)
 return null;
-
+
 ZipEntry zipEntry = entry.getEntry();
 if (zipEntry.isDirectory())
 return new WARDirContext(base, entry);
@@ -222,25 +222,25 @@ public class WARDirContext extends BaseD
  * escaped as part of converting file names to JNDI names. Note that while
  * ' can be used in Windows and Unix file names, " is only valid on Unix.
  * This method assumes that the string is currently unquoted.
- * 
+ *
  * @return  A valid JNDI name
- * @throws InvalidNameException 
+ * @throws InvalidNameException
  */
 private Name getEscapedJndiName(String name) throws InvalidNameException {
 return new CompositeName(name.replace("'", "\\'").replace("\"", ""));
 }
 
 /**
- * Unbinds the named object. Removes the terminal atomic name in name 
- * from the target context--that named by all but the terminal atomic 
+ * Unbinds the named object. Removes the terminal atomic name in name
+ * from the target context--that named by all but the terminal atomic
  * part of name.
  * 
- * This method is idempotent. It succeeds even if the terminal atomic 
- * name is not bound in the target context, but throws 
- * NameNotFoundException if any of the intermediate contexts do not exist. 
- * 
+ * This method is idempotent. It succeeds even if the terminal atomic
+ * name is not bound in the target context, but throws
+ * NameNotFoundException if any of the intermediate contexts do not exist.
+ *
  * @param name the name to bind; may not be empty
- * @exception NameNotFoundException if an intermediate context does not 
+ * @exception NameNotFoundException if an intermediate context does not
  * exist
  * @exception NamingException if a naming exception is encountered
  */
@@ -252,11 +252,11 @@ public class WARDirContext extends BaseD
 
 
 /**
- * Binds a new name to the object bound to an old name, and unbinds the 
- * old name. Both names are relative to this context. Any attributes 
- * associated with the old name become associated with the new name. 
+ * Binds a new name to the object bound to an old name, and unbinds the
+ * old name. Both names are relative to this context. Any attributes
+ * associated with the old name become associated with the new name.
  * Intermediate contexts of the old name are not changed.
- * 
+ *
  * @param oldName the name of the existing binding; may not be empty
  * @param newName the name of the new binding; may not be empty
  * @exception javax.naming.NameAlreadyBoundException if newName is already
@@ -271,15 +271,15 @@ public class WARDirContext extends BaseD
 
 
 /**
- * Enumerates the names bound in the named context, alon

svn commit: r1187784 - in /tomcat/trunk/java/org/apache/catalina/authenticator: Constants.java LocalStrings.properties SavedRequest.java SingleSignOnEntry.java mbeans-descriptors.xml

[markt]

Author: markt
Date: Sat Oct 22 21:07:53 2011
New Revision: 1187784

URL: http://svn.apache.org/viewvc?rev=1187784&view=rev
Log:
Whitespace removal from /java/org/apache/catalina/authenticator

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
tomcat/trunk/java/org/apache/catalina/authenticator/mbeans-descriptors.xml

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java?rev=1187784&r1=1187783&r2=1187784&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java Sat Oct 
22 21:07:53 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties?rev=1187784&r1=1187783&r2=1187784&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties 
Sat Oct 22 21:07:53 2011
@@ -29,9 +29,9 @@ authenticator.unauthorized=Cannot authen
 authenticator.userDataConstraint=This request violates a User Data constraint 
for this application
 
 digestAuthenticator.cacheRemove=A valid entry has been removed from client 
nonce cache to make room for new entries. A replay attack is now possible. To 
prevent the possibility of replay attacks, reduce nonceValidity or increase 
cnonceCacheSize. Further warnings of this type will be suppressed for 5 minutes.
- 
+
 formAuthenticator.forwardErrorFail=Unexpected error forwarding to error page
-formAuthenticator.forwardLogin=Forwarding request for [{0}] made with method 
[{1}] to login page [{2}] of context [{3}] using request method GET  
+formAuthenticator.forwardLogin=Forwarding request for [{0}] made with method 
[{1}] to login page [{2}] of context [{3}] using request method GET
 formAuthenticator.forwardLoginFail=Unexpected error forwarding to login page
 formAuthenticator.noErrorPage=No error page was defined for FORM 
authentication in context [{0}]
 formAuthenticator.noLoginPage=No login page was defined for FORM 
authentication in context [{0}]

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java?rev=1187784&r1=1187783&r2=1187784&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java Sat 
Oct 22 21:07:53 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -145,12 +145,12 @@ public final class SavedRequest {
 this.requestURI = requestURI;
 }
 
-
+
 /**
  * The body of this request.
  */
 private ByteChunk body = null;
-
+
 public ByteChunk getBody() {
 return (this.body);
 }
@@ -158,16 +158,16 @@ public final class SavedRequest {
 public void setBody(ByteChunk body) {
 this.body = body;
 }
-
+
 /**
  * The content type of the request, used if this is a POST.
  */
 private String contentType = null;
-
+
 public String getContentType() {
 return (this.contentType);
 }
-
+
 public void setContentType(String contentType) {
 this.contentType = contentType;
 }

Modified: 
tomcat/

svn commit: r1187786 [2/2] - in /tomcat/trunk/java/org/apache/catalina/ha: ./ authenticator/ backend/ context/ deploy/ jmx/ session/ tcp/ util/

[markt]

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java?rev=1187786&r1=1187785&r2=1187786&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java Sat Oct 
22 21:08:24 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,7 @@ package org.apache.catalina.ha.session;
 
 /**
  * This class is used to track the series of actions that happens when
- * a request is executed. These actions will then translate into invocations 
of methods 
+ * a request is executed. These actions will then translate into invocations 
of methods
  * on the actual session.
  * This class is NOT thread safe. One DeltaRequest per session
  * @author mailto:fha...@apache.org";>Filip Hanik
@@ -67,13 +67,13 @@ public class DeltaRequest implements Ext
 private LinkedList actions = new 
LinkedList();
 private LinkedList actionPool =
 new LinkedList();
-
+
 private boolean recordAllActions = false;
 
 public DeltaRequest() {
-
+
 }
-
+
 public DeltaRequest(String sessionId, boolean recordAllActions) {
 this.recordAllActions=recordAllActions;
 if(sessionId != null)
@@ -95,7 +95,7 @@ public class DeltaRequest implements Ext
 int action = ACTION_SET;
 
addAction(TYPE_MAXINTERVAL,action,NAME_MAXINTERVAL,Integer.valueOf(interval));
 }
-
+
 /**
  * convert principal at SerializablePrincipal for backup nodes.
  * Only support principals from type {@link GenericPrincipal 
GenericPrincipal}
@@ -154,7 +154,7 @@ public class DeltaRequest implements Ext
 //add the action
 actions.addLast(info);
 }
-
+
 public void execute(DeltaSession session, boolean notifyListeners) {
 if ( !this.sessionId.equals( session.getId() ) )
 throw new java.lang.IllegalArgumentException("Session id mismatch, 
not executing the delta request");
@@ -170,7 +170,7 @@ public class DeltaRequest implements Ext
 if ( log.isTraceEnabled() ) 
log.trace("Session.removeAttribute('"+info.getName()+"')");
 
session.removeAttribute(info.getName(),notifyListeners,false);
 }
-
+
 break;
 }//case
 case TYPE_ISNEW: {
@@ -219,7 +219,7 @@ public class DeltaRequest implements Ext
 }
 actions.clear();
 }
-
+
 public String getSessionId() {
 return sessionId;
 }
@@ -232,12 +232,12 @@ public class DeltaRequest implements Ext
 public int getSize() {
 return actions.size();
 }
-
+
 public void clear() {
 actions.clear();
 actionPool.clear();
 }
-
+
 @Override
 public void readExternal(java.io.ObjectInput in) throws 
IOException,ClassNotFoundException {
 //sessionId - String
@@ -285,11 +285,11 @@ public class DeltaRequest implements Ext
 info.writeExternal(out);
 }
 }
-
+
 /**
  * serialize DeltaRequest
  * @see DeltaRequest#writeExternal(java.io.ObjectOutput)
- * 
+ *
  * @return serialized delta request
  * @throws IOException
  */
@@ -301,7 +301,7 @@ public class DeltaRequest implements Ext
 oos.close();
 return bos.toByteArray();
 }
-
+
 private static class AttributeInfo implements java.io.Externalizable {
 private String name = null;
 private Object value = null;
@@ -349,7 +349,7 @@ public class DeltaRequest implements Ext
 public String getName() {
 return name;
 }
-
+
 public void recycle() {
 name = null;
 value = null;
@@ -363,7 +363,7 @@ public class DeltaRequest implements Ext
 AttributeInfo other =  (AttributeInfo)o;
 return other.getName().equals(this.getName());
 }
-
+
 @Override
 public void readExternal(java.io.ObjectInput in ) throws 
IOException,ClassNotFoundException {
 //type - int
@@ -391,7 +391,7 @@ public class DeltaRequest implements Ext
 out.writeBoolean(getValue()!=null);
 if (getValue()!=null) out.writeObject(getValue());
 }
-
+
 @Ov

svn commit: r1187787 [4/5] - /tomcat/trunk/java/org/apache/catalina/core/

[markt]

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1187787&r1=1187786&r2=1187787&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Sat Oct 22 
21:08:51 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -113,12 +113,12 @@ public class StandardWrapper extends Con
  * servlet is considered permanent.
  */
 protected long available = 0L;
-
+
 /**
- * The broadcaster that sends j2ee notifications. 
+ * The broadcaster that sends j2ee notifications.
  */
 protected NotificationBroadcasterSupport broadcaster = null;
-
+
 /**
  * The count of allocations that are currently active (even if they
  * are for the same instance, as will be true on a non-STM servlet).
@@ -223,12 +223,12 @@ public class StandardWrapper extends Con
  */
 protected Stack instancePool = null;
 
-
+
 /**
  * Wait time for servlet unload in ms.
  */
 protected long unloadDelay = 2000;
-
+
 
 /**
  * True if this StandardWrapper is for the JspServlet
@@ -251,12 +251,12 @@ public class StandardWrapper extends Con
 protected StandardWrapperValve swValve;
 protected long loadTime=0;
 protected int classLoadTime=0;
-
+
 /**
  * Multipart config
  */
 protected MultipartConfigElement multipartConfigElement = null;
-
+
 /**
  * Async support
  */
@@ -270,22 +270,22 @@ public class StandardWrapper extends Con
 protected volatile boolean servletSecurityAnnotationScanRequired = false;
 
 private boolean overridable = false;
-
+
 /**
- * Static class array used when the SecurityManager is turned on and 
+ * Static class array used when the SecurityManager is turned on and
  * Servlet.init is invoked.
  */
 protected static Class[] classType = new Class[]{ServletConfig.class};
-
-
+
+
 /**
- * Static class array used when the SecurityManager is turned on and 
+ * Static class array used when the SecurityManager is turned on and
  * Servlet.service  is invoked.
- */ 
+ */
 protected static Class[] classTypeUsedInService = new Class[]{
  ServletRequest.class,
  
ServletResponse.class};
-
+
 
 // - Properties
 
@@ -548,11 +548,11 @@ public class StandardWrapper extends Con
 
 // Short-cuts
 // If singleThreadModel is true, must have already checked this
-// If instance != null, must have already loaded 
+// If instance != null, must have already loaded
 if (singleThreadModel || instance != null) {
 return singleThreadModel;
 }
-
+
 // The logic to determine this safely is more complex than one might
 // expect. allocate() already has the necessary logic so re-use it.
 try {
@@ -599,7 +599,7 @@ public class StandardWrapper extends Con
 public String[] getServletMethods() throws ServletException {
 
 instance = loadServlet();
-
+
 Class servletClazz = instance.getClass();
 if (!javax.servlet.http.HttpServlet.class.isAssignableFrom(
 servletClazz)) {
@@ -639,8 +639,8 @@ public class StandardWrapper extends Con
 public Servlet getServlet() {
 return instance;
 }
-
-
+
+
 /**
  * Set the associated servlet instance.
  */
@@ -649,7 +649,7 @@ public class StandardWrapper extends Con
 instance = servlet;
 }
 
-
+
 /**
  * {@inheritDoc}
  */
@@ -669,19 +669,19 @@ public class StandardWrapper extends Con
 @Override
 public void backgroundProcess() {
 super.backgroundProcess();
-
+
 if (!getState().isAvailable())
 return;
-
+
 if (getServlet() != null && (getServlet() instanceof 
PeriodicEventListener)) {
 ((PeriodicEventListener) getServlet()).periodicEvent();
 }
 }
-
-
+
+
 /**
  * Extract the root cause from a servlet excepti

svn commit: r1187787 [2/5] - /tomcat/trunk/java/org/apache/catalina/core/

[markt]

Modified: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java?rev=1187787&r1=1187786&r2=1187787&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java 
Sat Oct 22 21:08:51 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,7 +26,7 @@ public class ApplicationSessionCookieCon
 
 private static final String DEFAULT_SESSION_COOKIE_NAME = "JSESSIONID";
 private static final String DEFAULT_SESSION_PARAMETER_NAME = "jsessionid";
-
+
 private boolean httpOnly;
 private boolean secure;
 private int maxAge = -1;
@@ -34,7 +34,7 @@ public class ApplicationSessionCookieCon
 private String domain;
 private String name;
 private String path;
-
+
 @Override
 public String getComment() {
 return comment;
@@ -125,11 +125,11 @@ public class ApplicationSessionCookieCon
 //   3. Defaults
 
 Cookie cookie = new Cookie(getSessionCookieName(context), sessionId);
-   
+
 // Just apply the defaults.
 cookie.setMaxAge(scc.getMaxAge());
 cookie.setComment(scc.getComment());
-   
+
 if (context.getSessionCookieDomain() == null) {
 // Avoid possible NPE
 if (scc.getDomain() != null) {
@@ -148,7 +148,7 @@ public class ApplicationSessionCookieCon
 if (scc.isHttpOnly() || context.getUseHttpOnly()) {
 cookie.setHttpOnly(true);
 }
-   
+
 String contextPath = context.getSessionCookiePath();
 if (contextPath == null || contextPath.length() == 0) {
 contextPath = scc.getPath();
@@ -175,10 +175,10 @@ public class ApplicationSessionCookieCon
 
 return cookie;
 }
-
-
+
+
 private static String getConfiguredSessionCookieName(Context context) {
-
+
 // Priority is:
 // 1. Cookie name defined in context
 // 2. Cookie name configured for app
@@ -188,7 +188,7 @@ public class ApplicationSessionCookieCon
 if (cookieName != null && cookieName.length() > 0) {
 return cookieName;
 }
-
+
 SessionCookieConfig scc =
 context.getServletContext().getSessionCookieConfig();
 cookieName = scc.getName();
@@ -199,37 +199,37 @@ public class ApplicationSessionCookieCon
 
 return null;
 }
-
-
+
+
 /**
  * Determine the name to use for the session cookie for the provided
  * context.
  * @param context
  */
 public static String getSessionCookieName(Context context) {
-
+
 String result = getConfiguredSessionCookieName(context);
-
+
 if (result == null) {
-result = DEFAULT_SESSION_COOKIE_NAME; 
+result = DEFAULT_SESSION_COOKIE_NAME;
 }
-
-return result; 
+
+return result;
 }
-
+
 /**
  * Determine the name to use for the session cookie for the provided
  * context.
  * @param context
  */
 public static String getSessionUriParamName(Context context) {
-
+
 String result = getConfiguredSessionCookieName(context);
-
+
 if (result == null) {
-result = DEFAULT_SESSION_PARAMETER_NAME; 
+result = DEFAULT_SESSION_PARAMETER_NAME;
 }
-
-return result; 
+
+return result;
 }
 }

Modified: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java?rev=1187787&r1=1187786&r2=1187787&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java 
Sat Oct 22 21:08:51 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  *

svn commit: r1187793 - /tomcat/trunk/java/org/apache/catalina/filters/

[markt]

Author: markt
Date: Sat Oct 22 21:12:47 2011
New Revision: 1187793

URL: http://svn.apache.org/viewvc?rev=1187793&view=rev
Log:
Whitespace removal from /java/org/apache/catalina/filters

Modified:
tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
tomcat/trunk/java/org/apache/catalina/filters/Constants.java
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
tomcat/trunk/java/org/apache/catalina/filters/FilterBase.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RequestFilter.java
tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java

Modified: 
tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java?rev=1187793&r1=1187792&r2=1187793&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java 
Sat Oct 22 21:12:47 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,7 +40,7 @@ import org.apache.juli.logging.LogFactor
  * auto-detect the character set. This may be exploited by an attacker to
  * perform an XSS attack. Internet Explorer has this behaviour by default. 
Other
  * browsers have an option to enable it.
- * 
+ *
  * This filter prevents the attack by explicitly setting a character set. 
Unless
  * the provided character set is explicitly overridden by the user - in which
  * case they deserve everything they get - the browser will adhere to an
@@ -52,7 +52,7 @@ public class AddDefaultCharsetFilter ext
 LogFactory.getLog(AddDefaultCharsetFilter.class);
 
 private static final String DEFAULT_ENCODING = "ISO-8859-1";
-
+
 private String encoding;
 
 public void setEncoding(String encoding) {
@@ -81,7 +81,7 @@ public class AddDefaultCharsetFilter ext
 @Override
 public void doFilter(ServletRequest request, ServletResponse response,
 FilterChain chain) throws IOException, ServletException {
-
+
 // Wrap the response
 if (response instanceof HttpServletResponse) {
 ResponseWrapper wrapped =
@@ -99,7 +99,7 @@ public class AddDefaultCharsetFilter ext
 public static class ResponseWrapper extends HttpServletResponseWrapper {
 
 private String encoding;
-
+
 public ResponseWrapper(HttpServletResponse response, String encoding) {
 super(response);
 this.encoding = encoding;
@@ -107,7 +107,7 @@ public class AddDefaultCharsetFilter ext
 
 @Override
 public void setContentType(String ct) {
-
+
 if (ct != null && ct.startsWith("text/")) {
 if (ct.indexOf("charset=") < 0) {
 super.setContentType(ct + ";charset=" + encoding);

Modified: tomcat/trunk/java/org/apache/catalina/filters/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/Constants.java?rev=1187793&r1=1187792&r2=1187793&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/Constants.java Sat Oct 22 
21:12:47 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,10 +30,10 @@ package org.apache.catalina.filters;
 public final class Constants {
 
 public static final String Package = "org.apache.catalina.filters";
-
+
 public static final String CSRF_NONCE_SESSION

svn commit: r1187795 - /tomcat/trunk/java/org/apache/catalina/session/

[markt]

Author: markt
Date: Sat Oct 22 21:13:48 2011
New Revision: 1187795

URL: http://svn.apache.org/viewvc?rev=1187795&view=rev
Log:
Whitespace removal from /java/org/apache/catalina/session

Modified:
tomcat/trunk/java/org/apache/catalina/session/Constants.java
tomcat/trunk/java/org/apache/catalina/session/FileStore.java
tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/java/org/apache/catalina/session/StandardSessionFacade.java
tomcat/trunk/java/org/apache/catalina/session/StoreBase.java
tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml

Modified: tomcat/trunk/java/org/apache/catalina/session/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/Constants.java?rev=1187795&r1=1187794&r2=1187795&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/Constants.java Sat Oct 22 
21:13:48 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: tomcat/trunk/java/org/apache/catalina/session/FileStore.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/FileStore.java?rev=1187795&r1=1187794&r2=1187795&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/FileStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/FileStore.java Sat Oct 22 
21:13:48 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -199,7 +199,7 @@ public final class FileStore extends Sto
 }
 
 String files[] = file.list();
-
+
 // Bugzilla 32130
 if((files == null) || (files.length < 1)) {
 return (new String[0]);

Modified: tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java?rev=1187795&r1=1187794&r2=1187795&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java Sat Oct 22 
21:13:48 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -111,7 +111,7 @@ public class JDBCStore extends StoreBase
  * DataSource to use
  */
 protected DataSource dataSource = null;
-
+
 // - Table & 
cols
 
 /**
@@ -598,7 +598,7 @@ public class JDBCStore extends StoreBase
 ObjectInputStream ois = null;
 BufferedInputStream bis = null;
 Container container = manager.getContainer();
- 
+
 synchronized (this) {
 int numberOfTries = 2;
 while (numberOfTries > 0) {
@@ -721,7 +721,7 @@ public class JDBCStore extends StoreBase
  * Remove the Session with the specified session identifier from
  * this Store, if present.  If no such Session is present, this method
  * takes no action.
- * 
+ *
 

svn commit: r1187798 - /tomcat/trunk/java/org/apache/catalina/ssi/

[markt]

Author: markt
Date: Sat Oct 22 21:14:59 2011
New Revision: 1187798

URL: http://svn.apache.org/viewvc?rev=1187798&view=rev
Log:
Whitespace removal from /java/org/apache/catalina/ssi

Modified:
tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java
tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
tomcat/trunk/java/org/apache/catalina/ssi/SSICommand.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIConditional.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIConditionalState.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIConfig.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIEcho.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIExternalResolver.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIFlastmod.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIFsize.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIInclude.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIPrintenv.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIProcessor.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletRequestUtil.java
tomcat/trunk/java/org/apache/catalina/ssi/SSISet.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIStopProcessingException.java

Modified: 
tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java 
Sat Oct 22 21:14:59 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java Sat Oct 
22 21:14:59 2011
@@ -24,7 +24,7 @@ import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 /**
  * Represents a parsed expression.
- * 
+ *
  * @version $Revision$
  * @author Paul Speed
  */
@@ -352,7 +352,7 @@ public class ExpressionParseTree {
 protected int compareBranches() {
 String val1 = ((StringNode)left).getValue();
 String val2 = ((StringNode)right).getValue();
-
+
 int val2Len = val2.length();
 if (val2Len > 1 && val2.charAt(0) == '/' &&
 val2.charAt(val2Len - 1) == '/') {

Modified: tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java Sat Oct 
22 21:14:59 2011
@@ -21,7 +21,7 @@ package org.apache.catalina.ssi;
  * Parses an expression string to return the individual tokens. This is
  * patterned similar to the StreamTokenizer in the JDK but customized for SSI
  * conditional expression parsing.
- * 
+ *
  * @version $Revision$
  * @author Paul Speed
  */

Modified: tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java 
(origina

svn commit: r1187799 - in /tomcat/trunk/java/org/apache/catalina/users: AbstractGroup.java AbstractRole.java AbstractUser.java Constants.java MemoryGroup.java MemoryRole.java MemoryUser.java MemoryUse

[markt]

Author: markt
Date: Sat Oct 22 21:15:28 2011
New Revision: 1187799

URL: http://svn.apache.org/viewvc?rev=1187799&view=rev
Log:
Whitespace removal from /java/org/apache/catalina/users

Modified:
tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java
tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java
tomcat/trunk/java/org/apache/catalina/users/AbstractUser.java
tomcat/trunk/java/org/apache/catalina/users/Constants.java
tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java
tomcat/trunk/java/org/apache/catalina/users/MemoryRole.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java

Modified: tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java?rev=1187799&r1=1187798&r2=1187799&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java Sat Oct 22 
21:15:28 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -121,7 +121,7 @@ public abstract class AbstractGroup impl
 
 
 /**
- * Return an Iterator over the set of {@link org.apache.catalina.User}s 
that 
+ * Return an Iterator over the set of {@link org.apache.catalina.User}s 
that
  * are members of this group.
  */
 @Override

Modified: tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java?rev=1187799&r1=1187798&r2=1187799&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java Sat Oct 22 
21:15:28 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: tomcat/trunk/java/org/apache/catalina/users/AbstractUser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/AbstractUser.java?rev=1187799&r1=1187798&r2=1187799&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/users/AbstractUser.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/AbstractUser.java Sat Oct 22 
21:15:28 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: tomcat/trunk/java/org/apache/catalina/users/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/Constants.java?rev=1187799&r1=1187798&r2=1187799&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/users/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/Constants.java Sat Oct 22 
21:15:28 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified:

svn commit: r1187800 - /tomcat/trunk/java/org/apache/catalina/loader/

[markt]

Author: markt
Date: Sat Oct 22 21:15:59 2011
New Revision: 1187800

URL: http://svn.apache.org/viewvc?rev=1187800&view=rev
Log:
Whitespace removal from /java/org/apache/catalina/loader

Modified:
tomcat/trunk/java/org/apache/catalina/loader/Constants.java
tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/loader/ResourceEntry.java
tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoader.java
tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoaderMBean.java
tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml

Modified: tomcat/trunk/java/org/apache/catalina/loader/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/Constants.java?rev=1187800&r1=1187799&r2=1187800&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/Constants.java Sat Oct 22 
21:15:59 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java?rev=1187800&r1=1187799&r2=1187800&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java Sat 
Oct 22 21:15:59 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,7 +32,7 @@ import java.util.List;
  * classloading hacks involved - see {@link 
WebappClassLoader#clearReferences()}
  * for details - but the short version is do not just create a new instance of
  * this class with the new keyword.
- * 
+ *
  * Since this class is loaded by {@link WebappClassLoader}, it can not refer to
  * any internal Tomcat classes as that will cause the security manager to
  * complain.

Modified: tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties?rev=1187800&r1=1187799&r2=1187800&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties Sat 
Oct 22 21:15:59 2011
@@ -47,7 +47,7 @@ webappClassLoader.clearRmiFail=Failed to
 webappClassLoader.checkThreadLocalsForLeaks.badKey=Unable to determine string 
representation of key of type [{0}]
 webappClassLoader.checkThreadLocalsForLeaks.badValue=Unable to determine 
string representation of value of type [{0}]
 webappClassLoader.checkThreadLocalsForLeaks.unknown=Unknown
-webappClassLoader.checkThreadLocalsForLeaks=The web application [{0}] created 
a ThreadLocal with key of type [{1}] (value [{2}]) and a value of type [{3}] 
(value [{4}]) but failed to remove it when the web application was stopped. 
Threads are going to be renewed over time to try and avoid a probable memory 
leak. 
+webappClassLoader.checkThreadLocalsForLeaks=The web application [{0}] created 
a ThreadLocal with key of type [{1}] (value [{2}]) and a value of type [{3}] 
(value [{4}]) but failed to remove it when the web application was stopped. 
Threads are going to be renewed over time to try and avoid a probable memory 
leak.
 webappClassLoader.checkThreadLocalsForLeaksDebug=The web application [{0}] 
created a ThreadLocal with key of type [{1}] (value [{2}]). The ThreadLocal has 
been correctly set to null and the key will be removed

svn commit: r1187802 - in /tomcat/trunk/java/org/apache/el: ./ lang/ parser/ util/

[markt]

Author: markt
Date: Sat Oct 22 21:17:12 2011
New Revision: 1187802

URL: http://svn.apache.org/viewvc?rev=1187802&view=rev
Log:
Whitespace removal from remaining /java/org/apache/el

Modified:
tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java
tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java
tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java
tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java
tomcat/trunk/java/org/apache/el/ValueExpressionLiteral.java
tomcat/trunk/java/org/apache/el/lang/ELSupport.java
tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java
tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java
tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
tomcat/trunk/java/org/apache/el/lang/VariableMapperFactory.java
tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java
tomcat/trunk/java/org/apache/el/parser/ArithmeticNode.java
tomcat/trunk/java/org/apache/el/parser/AstDotSuffix.java
tomcat/trunk/java/org/apache/el/parser/AstFunction.java
tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java
tomcat/trunk/java/org/apache/el/parser/AstMethodParameters.java
tomcat/trunk/java/org/apache/el/parser/AstValue.java
tomcat/trunk/java/org/apache/el/parser/BooleanNode.java
tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java
tomcat/trunk/java/org/apache/el/parser/Node.java
tomcat/trunk/java/org/apache/el/parser/NodeVisitor.java
tomcat/trunk/java/org/apache/el/parser/SimpleNode.java
tomcat/trunk/java/org/apache/el/util/MessageFactory.java
tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
tomcat/trunk/java/org/apache/el/util/Validation.java

Modified: tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==
--- tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java Sat Oct 22 
21:17:12 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,14 +29,14 @@ import org.apache.el.util.MessageFactory
 
 /**
  * @see javax.el.ExpressionFactory
- * 
+ *
  * @author Jacob Hookom [ja...@hookom.net]
  * @version $Id$
  */
 public class ExpressionFactoryImpl extends ExpressionFactory {
 
 /**
- * 
+ *
  */
 public ExpressionFactoryImpl() {
 super();

Modified: tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java?rev=1187802&r1=1187801&r2=1187802&view=diff
==
--- tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java Sat Oct 22 
21:17:12 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,38 +39,38 @@ import org.apache.el.util.ReflectionUtil
 
 /**
  * An Expression that refers to a method on an object.
- * 
+ *
  * 
  * The {@link javax.el.ExpressionFactory#createMethodExpression} method
  * can be used to parse an expression string and return a concrete instance
  * of MethodExpression that encapsulates the parsed expression.
- * The {@link FunctionMapper} is used at parse time, not evaluation time, 
- * so one is not needed to evaluate an expression using this class.  
+ * The {@link FunctionMapper} is used at parse time, not evaluation time,
+ * so one is not needed to evaluate an expression using this class.
  * However, the {@link ELContext} is needed at evaluation time.
  *
- * The {@link #getMethodInfo} and {@link #invoke} methods will evaluate the 
- * expression each time they are called. The {@link javax.el.ELResolver} in 
the 
- * ELContext is used to resolve the top-level variables and to 
- * determine the behavior of the . and [] 
+ * The {@link

svn commit: r1187803 [6/6] - in /tomcat/trunk/java/org/apache/jasper: ./ compiler/ compiler/tagplugin/ el/ resources/ runtime/ security/ servlet/ tagplugins/jstl/ tagplugins/jstl/core/ util/ xmlparser

[markt]

Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java?rev=1187803&r1=1187802&r2=1187803&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java Sat 
Oct 22 21:18:03 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,7 +40,7 @@ import org.apache.jasper.compiler.JspUti
 import org.apache.jasper.compiler.Localizer;
 
 public class XMLEncodingDetector {
-
+
 private InputStream stream;
 private String encoding;
 private boolean isEncodingSetInProlog;
@@ -48,7 +48,7 @@ public class XMLEncodingDetector {
 private int skip;
 private Boolean isBigEndian;
 private Reader reader;
-
+
 // org.apache.xerces.impl.XMLEntityManager fields
 public static final int DEFAULT_BUFFER_SIZE = 2048;
 public static final int DEFAULT_XMLDECL_BUFFER_SIZE = 64;
@@ -56,7 +56,7 @@ public class XMLEncodingDetector {
 private SymbolTable fSymbolTable;
 private XMLEncodingDetector fCurrentEntity;
 private int fBufferSize = DEFAULT_BUFFER_SIZE;
-
+
 // org.apache.xerces.impl.XMLEntityManager.ScannedEntity fields
 private int lineNumber = 1;
 private int columnNumber = 1;
@@ -65,15 +65,15 @@ public class XMLEncodingDetector {
 private int position;
 private int count;
 private boolean mayReadChunks = false;
-
+
 // org.apache.xerces.impl.XMLScanner fields
-private XMLString fString = new XMLString();
+private XMLString fString = new XMLString();
 private XMLStringBuffer fStringBuffer = new XMLStringBuffer();
 private XMLStringBuffer fStringBuffer2 = new XMLStringBuffer();
 private static final String fVersionSymbol = "version";
 private static final String fEncodingSymbol = "encoding";
 private static final String fStandaloneSymbol = "standalone";
-
+
 // org.apache.xerces.impl.XMLDocumentFragmentScannerImpl fields
 private int fMarkupDepth = 0;
 private String[] fStrings = new String[3];
@@ -97,7 +97,7 @@ public class XMLEncodingDetector {
  *
  * @return Two-element array, where the first element (of type
  * java.lang.String) contains the name of the (auto)detected encoding, and
- * the second element (of type java.lang.Boolean) specifies whether the 
+ * the second element (of type java.lang.Boolean) specifies whether the
  * encoding was specified using the 'encoding' attribute of an XML prolog
  * (TRUE) or autodetected (FALSE).
  */
@@ -128,11 +128,11 @@ public class XMLEncodingDetector {
   Boolean.valueOf(this.isBomPresent),
   Integer.valueOf(this.skip) };
 }
-
+
 // stub method
 void endEntity() {
 }
-
+
 // Adapted from:
 // org.apache.xerces.impl.XMLEntityManager.startEntity()
 private void createInitialReader() throws IOException, JasperException {
@@ -152,7 +152,7 @@ public class XMLEncodingDetector {
 Object [] encodingDesc = getEncodingName(b4, count);
 encoding = (String)(encodingDesc[0]);
 isBigEndian = (Boolean)(encodingDesc[1]);
-
+
 if (encodingDesc.length > 3) {
 isBomPresent = ((Boolean)(encodingDesc[2])).booleanValue();
 skip = ((Integer)(encodingDesc[3])).intValue();
@@ -388,12 +388,12 @@ public class XMLEncodingDetector {
  * @throws EOFException Thrown on end of file.
  */
 public int peekChar() throws IOException {
-
+
 // load more characters, if needed
 if (fCurrentEntity.position == fCurrentEntity.count) {
 load(0, true);
 }
-
+
 // peek at character
 int c = fCurrentEntity.ch[fCurrentEntity.position];
 
@@ -404,9 +404,9 @@ public class XMLEncodingDetector {
 else {
 return c;
 }
-
+
 } // peekChar():int
-
+
 // Adapted from:
 // org.apache.xerces.impl.XMLEntityManager.EntityScanner.scanChar
 /**
@@ -446,7 +446,7 @@ public class XMLEncodingDetector {
 // return character that was scanned
 fCurrentEntity.columnNumber++;
 return c;
-
+
 }
 
 // Adapted from:
@@ -468,12 +468,12 @@ publ

svn commit: r1187804 - in /tomcat/trunk/java/org/apache/juli: ./ logging/

[markt]

Author: markt
Date: Sat Oct 22 21:21:17 2011
New Revision: 1187804

URL: http://svn.apache.org/viewvc?rev=1187804&view=rev
Log:
Whitespace removal from remaining /java/org/apache/juli

Modified:
tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/trunk/java/org/apache/juli/FileHandler.java
tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java
tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
tomcat/trunk/java/org/apache/juli/VerbatimFormatter.java
tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java
tomcat/trunk/java/org/apache/juli/logging/Log.java
tomcat/trunk/java/org/apache/juli/logging/LogConfigurationException.java
tomcat/trunk/java/org/apache/juli/logging/LogFactory.java
tomcat/trunk/java/org/apache/juli/logging/package.html

Modified: tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java?rev=1187804&r1=1187803&r2=1187804&view=diff
==
--- tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java Sat Oct 22 21:21:17 
2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,7 +26,7 @@ import java.util.logging.LogRecord;
  * class. This class does not add its own configuration properties for the
  * logging configuration, but relies on the following system properties
  * instead:
- * 
+ *
  * 
  *   org.apache.juli.AsyncOverflowDropType
  *Default value: 1
@@ -35,9 +35,9 @@ import java.util.logging.LogRecord;
  *   org.apache.juli.AsyncLoggerPollInterval
  *Default value: 1000
  * 
- * 
+ *
  * See the System Properties page in the configuration reference of 
Tomcat.
- * 
+ *
  * @author Filip Hanik
  *
  */
@@ -47,21 +47,21 @@ public class AsyncFileHandler extends Fi
 public static final int OVERFLOW_DROP_FIRST = 2;
 public static final int OVERFLOW_DROP_FLUSH = 3;
 public static final int OVERFLOW_DROP_CURRENT = 4;
-
+
 public static final int OVERFLOW_DROP_TYPE = 
Integer.parseInt(System.getProperty("org.apache.juli.AsyncOverflowDropType","1"));
 public static final int DEFAULT_MAX_RECORDS = 
Integer.parseInt(System.getProperty("org.apache.juli.AsyncMaxRecordCount","1"));
 public static final int LOGGER_SLEEP_TIME = 
Integer.parseInt(System.getProperty("org.apache.juli.AsyncLoggerPollInterval","1000"));
-   
+
 protected static LinkedBlockingDeque queue = new 
LinkedBlockingDeque(DEFAULT_MAX_RECORDS);
-
+
 protected static LoggerThread logger = new LoggerThread();
-
+
 static {
 logger.start();
 }
-
+
 protected volatile boolean closed = false;
-
+
 public AsyncFileHandler() {
 this(null,null,null);
 }
@@ -78,7 +78,7 @@ public class AsyncFileHandler extends Fi
 // TODO Auto-generated method stub
 super.close();
 }
-
+
 @Override
 protected void open() {
 if(!closed) return;
@@ -86,7 +86,7 @@ public class AsyncFileHandler extends Fi
 // TODO Auto-generated method stub
 super.open();
 }
-
+
 
 @Override
 public void publish(LogRecord record) {
@@ -100,7 +100,7 @@ public class AsyncFileHandler extends Fi
 switch (OVERFLOW_DROP_TYPE) {
 case OVERFLOW_DROP_LAST: {
 //remove the last added element
-queue.pollLast(); 
+queue.pollLast();
 break;
 }
 case OVERFLOW_DROP_FIRST: {
@@ -123,9 +123,9 @@ public class AsyncFileHandler extends Fi
 //after this we clear the flag
 Thread.interrupted();
 }
-
+
 }
-
+
 protected void publishInternal(LogRecord record) {
 super.publish(record);
 }
@@ -136,7 +136,7 @@ public class AsyncFileHandler extends Fi
 this.setDaemon(true);
 
this.setName("AsyncFileHandlerWriter-"+System.identityHashCode(this));
 }
-
+
 @Override
 public void run() {
 while (run) {
@@ -151,7 +151,7 @@ public class AsyncFileHandler extends Fi
 }//while
 }
 }
-
+
 protected static class LogEntry {
 private LogRecord record;
 private AsyncFileHandler handler;
@@ -160,

svn commit: r1187805 - in /tomcat/trunk/res: ./ META-INF/ checkstyle/ deployer/ findbugs/ maven/

[markt]

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 @@
 
   
   
+  
+
+
+  
 
   
 
@@ -45,7 +49,7 @@
 
 
 
-
+
 
 
 
@@ -62,13 +66,13 @@
 
 
 
-
+
 
 
 
-
+
 
 
 
   
@@ -98,7 +98,7 @@
   
   
 
-
+
 
 
 
@@ -225,7 +225,7 @@
 
-
+
 
@@ -325,7 +325,7 @@
   
 
   
-  
+
   
 Help is on the way!
   

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 @@
   compile
 
   
- 
+

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 @@
   compile
 
   
- 
+

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

svn commit: r1187812 [1/8] - in /tomcat/trunk/modules/tomcat-lite: ./ java/org/apache/coyote/lite/ java/org/apache/tomcat/lite/http/ java/org/apache/tomcat/lite/io/ java/org/apache/tomcat/lite/io/jsse

[markt]

Author: markt
Date: Sat Oct 22 21:30:59 2011
New Revision: 1187812

URL: http://svn.apache.org/viewvc?rev=1187812&view=rev
Log:
Trailing whitespace removal from /modules/tomcat-lite

Modified:
tomcat/trunk/modules/tomcat-lite/build.xml
tomcat/trunk/modules/tomcat-lite/ivy.xml

tomcat/trunk/modules/tomcat-lite/java/org/apache/coyote/lite/LiteProtocolHandler.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/BaseMapper.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/CompressFilter.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/ContentType.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/DefaultHttpConnector.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/Dispatcher.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/Http11Connection.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpChannel.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpClient.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpConnectionPool.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpConnector.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpMessage.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpRequest.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpResponse.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpServer.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/HttpWriter.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/MappingData.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/MultiMap.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/ServerCookie.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/http/SpdyConnection.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/BBucket.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/BBuffer.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/BufferedIOReader.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/CBucket.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/CBuffer.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/DumpChannel.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/FastHttpDateFormat.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/FileConnector.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/FileConnectorJavaIo.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/FutureCallbacks.java
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/Hex.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOBuffer.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOChannel.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOConnector.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOInputStream.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOOutputStream.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOReader.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/IOWriter.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/MemoryIOConnector.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/NioChannel.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/NioThread.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SocketConnector.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SocketIOChannel.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/SslProvider.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/UrlEncoding.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/WrappedException.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/jsse/JsseSslProvider.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/io/jsse/SslChannel.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/proxy/CopyCallback.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/proxy/HttpProxyService.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/proxy/ProxyFlushedCallback.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/proxy/SocksServer.java

tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/proxy/StaticContentService.java

tomcat/trunk/modules/tomca

svn commit: r1187813 - in /tomcat/trunk: BUILDING.txt TOMCAT-NEXT.txt build.xml

[markt]

Author: markt
Date: Sat Oct 22 21:31:27 2011
New Revision: 1187813

URL: http://svn.apache.org/viewvc?rev=1187813&view=rev
Log:
Trailing whitespace removal from /

Modified:
tomcat/trunk/BUILDING.txt
tomcat/trunk/TOMCAT-NEXT.txt
tomcat/trunk/build.xml

Modified: tomcat/trunk/BUILDING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1187813&r1=1187812&r2=1187813&view=diff
==
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Sat Oct 22 21:31:27 2011
@@ -24,7 +24,7 @@ $Id$
 This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a 
container that
 implements the Servlet 3.0 and JSP 2.1 specifications from the Java
 Community Process .  In order to build a binary
-distribution version of the container from a source distribution, 
+distribution version of the container from a source distribution,
 do the following:
 
 
@@ -75,8 +75,8 @@ do the following:
   http://tomcat.apache.org/download-@version_ma...@0.cgi
 
 * Checkout the source using SVN, selecting the desired version or
-  branch (current development source is at 
-  http://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/trunk/), or 
+  branch (current development source is at
+  http://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/trunk/), or
   unpack the source package. The location where the source has been
   placed will be referred as ${tomcat.source}.
 
@@ -90,9 +90,9 @@ do the following:
 * NOTE: Users accessing the Internet through a proxy must use a properties
   file to indicate to Ant the proxy configuration. Read below.
 
-* WARNING: Running this command will download binaries to the /usr/share/java 
-  directory. Make sure this is appropriate to do on your computer. On Windows, 
-  this usually corresponds to the "C:\usr\share\java" directory, unless Cygwin 
+* WARNING: Running this command will download binaries to the /usr/share/java
+  directory. Make sure this is appropriate to do on your computer. On Windows,
+  this usually corresponds to the "C:\usr\share\java" directory, unless Cygwin
   is used. Read below to customize the directory used to download the binaries.
 
 * The build can be controlled by creating a ${tomcat.source}/build.properties

Modified: tomcat/trunk/TOMCAT-NEXT.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-NEXT.txt?rev=1187813&r1=1187812&r2=1187813&view=diff
==
--- tomcat/trunk/TOMCAT-NEXT.txt (original)
+++ tomcat/trunk/TOMCAT-NEXT.txt Sat Oct 22 21:31:27 2011
@@ -42,6 +42,6 @@ but possibly 7.1.x).
 
 8. Review the connector shutdown code for timing and threading issues
particularly any that may result in a client socket being left open after a
-   connector.stop(). 
+   connector.stop().
 
-9. Remove the svn keywords from all the files. (Just Java files?) 
\ No newline at end of file
+9. Remove the svn keywords from all the files. (Just Java files?)

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1187813&r1=1187812&r2=1187813&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sat Oct 22 21:31:27 2011
@@ -34,7 +34,7 @@
 
   
   
-
+
   
   
   
@@ -69,7 +69,7 @@
   
   
   
-   
+  
   
 
   
@@ -146,12 +146,12 @@
   
   
   
-  
-  
+
+
   
   
   
-  
+
   
   
 
@@ -425,7 +425,7 @@
 
   
 
-
+
   
 
   
@@ -508,8 +508,8 @@
 
 
   
-  
-  
+
+
 
   
@@ -864,7 +864,7 @@
 
 
   
-  
+
   
 
 
   
-  
+
   
 
   
-  
+
   
 
   
-  
+
   
 
   
-  
+
   
 
@@ -1246,7 +1246,7 @@
 
   
 
-
+
 
 
@@ -1323,7 +1323,7 @@
 
   
 
-
+
 
@@ -1376,7 +1376,7 @@
   
 
-
+
 
   
@@ -1482,7 +1482,7 @@ Apache Tomcat ${version} native binaries
 
 Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
 
-
+
   
 
   
   
 
- 
+
 
   
 
@@ -2151,7 +2151,7 @@ Apache Tomcat ${version} native binaries
 
   
 
-
+
   
 
   

svn commit: r1187816 - in /tomcat/tc7.0.x/trunk/java/javax/servlet: LocalStrings_fr.properties http/LocalStrings.properties http/LocalStrings_fr.properties

[kkolinko]

Author: kkolinko
Date: Sat Oct 22 21:51:20 2011
New Revision: 1187816

URL: http://svn.apache.org/viewvc?rev=1187816&view=rev
Log:
Remove trailing whitespace from values in *.properties files in java/javax/
These were part of r1187778

Modified:
tomcat/tc7.0.x/trunk/java/javax/servlet/LocalStrings_fr.properties
tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings_fr.properties

Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/LocalStrings_fr.properties?rev=1187816&r1=1187815&r2=1187816&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/LocalStrings_fr.properties 
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/LocalStrings_fr.properties Sat Oct 
22 21:51:20 2011
@@ -18,6 +18,6 @@
 
 err.not_iso8859_1={0} n''est pas un caract\u00e8re ISO 8859-1
 value.true=true
-value.false=false 
+value.false=false
 
 

Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties?rev=1187816&r1=1187815&r2=1187816&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties 
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings.properties Sat 
Oct 22 21:51:20 2011
@@ -21,7 +21,7 @@ err.cookie_name_blank=Cookie name may no
 err.io.negativelength=Negative Length given in write method
 err.io.short_read=Short Read
 
-http.method_not_implemented=Method {0} is not is not implemented by this 
servlet for this URI 
+http.method_not_implemented=Method {0} is not is not implemented by this 
servlet for this URI
 
 http.method_get_not_supported=HTTP method GET is not supported by this URL
 http.method_post_not_supported=HTTP method POST is not supported by this URL

Modified: 
tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings_fr.properties?rev=1187816&r1=1187815&r2=1187816&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings_fr.properties 
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/http/LocalStrings_fr.properties Sat 
Oct 22 21:51:20 2011
@@ -25,4 +25,4 @@ http.method_not_implemented=Le m\u00e9th
 http.method_get_not_supported=La m\u00e9thode HTTP GET n''est pas 
support\u00e9e par cette URL
 http.method_post_not_supported=La m\u00e9thode HTTP POST n''est pas 
support\u00e9e par cette URL
 http.method_put_not_supported=La m\u00e9thode HTTP PUT n''est pas 
support\u00e9e par cette URL
-http.method_delete_not_supported=La m\u00e9thode HTTP DELETE n''est pas 
support\u00e9e par cette URL 
+http.method_delete_not_supported=La m\u00e9thode HTTP DELETE n''est pas 
support\u00e9e par cette URL



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Removing whitespace from *.xsd and *.dtd files

[Konstantin Kolinko]

Hi!

http://svn.apache.org/viewvc?rev=1187778&view=rev
affected a number of *.xsd and *.dtd files.

I think we should not touch those without a good reason.

   tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_1.xsd
   tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_2.xsd
   tomcat/trunk/java/javax/servlet/jsp/resources/jspxml.dtd
   tomcat/trunk/java/javax/servlet/jsp/resources/jspxml.xsd
   tomcat/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd

   tomcat/trunk/java/javax/servlet/resources/XMLSchema.dtd
   tomcat/trunk/java/javax/servlet/resources/datatypes.dtd
   tomcat/trunk/java/javax/servlet/resources/javaee_6.xsd
   tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_3.xsd
   tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd
   tomcat/trunk/java/javax/servlet/resources/web-app_2_2.dtd
   tomcat/trunk/java/javax/servlet/resources/web-app_2_5.xsd
   tomcat/trunk/java/javax/servlet/resources/web-app_3_0.xsd
   tomcat/trunk/java/javax/servlet/resources/web-common_3_0.xsd
   tomcat/trunk/java/javax/servlet/resources/web-fragment_3_0.xsd
   tomcat/trunk/java/javax/servlet/resources/xml.xsd


Other interesting note is that this commit removed some trailing
whitespace from values in *.properties files.

Generally, this change might be visible to users, as trailing
whitespace is preserved when reading properties. Though those that I
noticed thus far look more like an editor's error - backported to tc7
in r1187816. More is likely to follow.


Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Removing whitespace from *.xsd and *.dtd files

[Mark Thomas]

On 22/10/2011 22:54, Konstantin Kolinko wrote:
> Hi!
> 
> http://svn.apache.org/viewvc?rev=1187778&view=rev
> affected a number of *.xsd and *.dtd files.
> 
> I think we should not touch those without a good reason.
> 
>tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_1.xsd
>tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_2.xsd
>tomcat/trunk/java/javax/servlet/jsp/resources/jspxml.dtd
>tomcat/trunk/java/javax/servlet/jsp/resources/jspxml.xsd
>tomcat/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd
> 
>tomcat/trunk/java/javax/servlet/resources/XMLSchema.dtd
>tomcat/trunk/java/javax/servlet/resources/datatypes.dtd
>tomcat/trunk/java/javax/servlet/resources/javaee_6.xsd
>tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_3.xsd
>
> tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd
>tomcat/trunk/java/javax/servlet/resources/web-app_2_2.dtd
>tomcat/trunk/java/javax/servlet/resources/web-app_2_5.xsd
>tomcat/trunk/java/javax/servlet/resources/web-app_3_0.xsd
>tomcat/trunk/java/javax/servlet/resources/web-common_3_0.xsd
>tomcat/trunk/java/javax/servlet/resources/web-fragment_3_0.xsd
>tomcat/trunk/java/javax/servlet/resources/xml.xsd

I don't see the harm in removing the trailing white-space from these
files. It shouldn't change their meaning.

> Other interesting note is that this commit removed some trailing
> whitespace from values in *.properties files.
> 
> Generally, this change might be visible to users, as trailing
> whitespace is preserved when reading properties. Though those that I
> noticed thus far look more like an editor's error - backported to tc7
> in r1187816. More is likely to follow.

Given that trailing white-space is extremely hard to see in .properties
files, I doubt that any of it was deliberate. I certainly can't recall
an instance where trailing white-space necessary.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Removing whitespace from *.xsd and *.dtd files

[Konstantin Kolinko]

2011/10/23 Mark Thomas :
> On 22/10/2011 22:54, Konstantin Kolinko wrote:
>> Hi!
>>
>> http://svn.apache.org/viewvc?rev=1187778&view=rev
>> affected a number of *.xsd and *.dtd files.
>>
>> I think we should not touch those without a good reason.
>>
>>    tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_1.xsd
>>    tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_2.xsd
>>    tomcat/trunk/java/javax/servlet/jsp/resources/jspxml.dtd
>>    tomcat/trunk/java/javax/servlet/jsp/resources/jspxml.xsd
>>    tomcat/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd
>>
>>    tomcat/trunk/java/javax/servlet/resources/XMLSchema.dtd
>>    tomcat/trunk/java/javax/servlet/resources/datatypes.dtd
>>    tomcat/trunk/java/javax/servlet/resources/javaee_6.xsd
>>    tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_3.xsd
>>    
>> tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd
>>    tomcat/trunk/java/javax/servlet/resources/web-app_2_2.dtd
>>    tomcat/trunk/java/javax/servlet/resources/web-app_2_5.xsd
>>    tomcat/trunk/java/javax/servlet/resources/web-app_3_0.xsd
>>    tomcat/trunk/java/javax/servlet/resources/web-common_3_0.xsd
>>    tomcat/trunk/java/javax/servlet/resources/web-fragment_3_0.xsd
>>    tomcat/trunk/java/javax/servlet/resources/xml.xsd
>
> I don't see the harm in removing the trailing white-space from these
> files. It shouldn't change their meaning.

>From technical point of view it should not. But all of them originate
from somewhere, and I would not want them to differ from their
originals more than necessary.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1187822 - in /tomcat/trunk/java/org/apache/catalina: ha/session/mbeans-descriptors.xml ha/tcp/mbeans-descriptors.xml tribes/membership/mbeans-descriptors.xml valves/mbeans-descriptors.xml

[markt]

Author: markt
Date: Sat Oct 22 22:49:22 2011
New Revision: 1187822

URL: http://svn.apache.org/viewvc?rev=1187822&view=rev
Log:
Remove references to getInfo() methods that have been deleted

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml

tomcat/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=1187822&r1=1187821&r2=1187822&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Sat 
Oct 22 22:49:22 2011
@@ -40,11 +40,6 @@
   description="enable a jvm Route check"
   type="boolean"/>
 
-
 
-
 
-http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml?rev=1187822&r1=1187821&r2=1187822&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml Sat Oct 
22 22:49:22 2011
@@ -43,11 +43,6 @@
   is="true"
   type="boolean"/>
 
-
 
-http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml?rev=1187822&r1=1187821&r2=1187822&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml 
Sat Oct 22 22:49:22 2011
@@ -42,11 +42,6 @@
   description="Ping Frequency at msec"
   type="long"/>
 
-http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml?rev=1187822&r1=1187821&r2=1187822&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml Sat Oct 
22 22:49:22 2011
@@ -72,11 +72,6 @@
description="The format for the date for date based log 
rotation"
type="java.lang.String"/>
 
-
-
 
@@ -173,11 +168,6 @@
type="java.lang.String"
writeable="false"/>
 
-
-
 
 
-
-
 
@@ -310,11 +295,6 @@
description="Use a fair semaphore"
type="boolean"/>
 
-
-
 
@@ -350,11 +330,6 @@
description="The comma-delimited set of deny expressions"
type="java.lang.String"/>
 
-
-
 
 
-
-
 
 
-
-
 
 
-
-
 

Re: Removing whitespace from *.xsd and *.dtd files

[Mark Thomas]

On 22/10/2011 23:33, Konstantin Kolinko wrote:
> 2011/10/23 Mark Thomas :
>> On 22/10/2011 22:54, Konstantin Kolinko wrote:
>>> Hi!
>>>
>>> http://svn.apache.org/viewvc?rev=1187778&view=rev
>>> affected a number of *.xsd and *.dtd files.
>>>
>>> I think we should not touch those without a good reason.



>> I don't see the harm in removing the trailing white-space from these
>> files. It shouldn't change their meaning.
> 
> From technical point of view it should not. But all of them originate
> from somewhere, and I would not want them to differ from their
> originals more than necessary.

That is a fair point.

My own preference is for not having to list them as exclusions in the
checkstyle config. Thinking about it, I'm not sure how easy that would
be. It is easy enough to filter by file extension but that doesn't quite
work in this case. I'd rather not have a separate checkstyle file just
for trailing white-space but I don't see another way to exclude the spec
files.

Given that diff tools can be easily configured to ignore white-space I'm
leaning towards leaving things as they currently are.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1187825 - /tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java

[markt]

Author: markt
Date: Sat Oct 22 23:22:35 2011
New Revision: 1187825

URL: http://svn.apache.org/viewvc?rev=1187825&view=rev
Log:
fileOwned is always false. Taking that into account allows some unused
code to be identified and removed.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java?rev=1187825&r1=1187824&r2=1187825&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java 
Sat Oct 22 23:22:35 2011
@@ -19,11 +19,8 @@ package org.apache.tomcat.util.bcel.clas
 
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
 
 import org.apache.tomcat.util.bcel.Constants;
 
@@ -45,9 +42,7 @@ import org.apache.tomcat.util.bcel.Const
 public final class ClassParser {
 
 private DataInputStream file;
-private boolean fileOwned;
 private String file_name;
-private String zip_file;
 private int class_name_index, superclass_name_index;
 private int major, minor; // Compiler version
 private int access_flags; // Access rights of parsed class
@@ -56,7 +51,6 @@ public final class ClassParser {
 private Field[] fields; // class fields, i.e., its variables
 private Method[] methods; // methods defined in the class
 private Attribute[] attributes; // attributes defined in the class
-private boolean is_zip; // Loaded from zip file
 private static final int BUFSIZE = 8192;
 
 
@@ -68,9 +62,6 @@ public final class ClassParser {
  */
 public ClassParser(InputStream file, String file_name) {
 this.file_name = file_name;
-fileOwned = false;
-String clazz = file.getClass().getName(); // Not a very clean solution 
...
-is_zip = clazz.startsWith("java.util.zip.") || 
clazz.startsWith("java.util.jar.");
 if (file instanceof DataInputStream) {
 this.file = (DataInputStream) file;
 } else {
@@ -91,72 +82,40 @@ public final class ClassParser {
  * @throws  ClassFormatException
  */
 public JavaClass parse() throws IOException, ClassFormatException {
-ZipFile zip = null;
-try {
-if (fileOwned) {
-if (is_zip) {
-zip = new ZipFile(zip_file);
-ZipEntry entry = zip.getEntry(file_name);
-
-if (entry == null) {
-throw new IOException("File " + file_name + " not 
found");
-}
-
-file = new DataInputStream(new 
BufferedInputStream(zip.getInputStream(entry),
-BUFSIZE));
-} else {
-file = new DataInputStream(new BufferedInputStream(new 
FileInputStream(
-file_name), BUFSIZE));
-}
-}
-/** Read headers /
-// Check magic tag of class file
-readID();
-// Get compiler version
-readVersion();
-/** Read constant pool and related **/
-// Read constant pool entries
-readConstantPool();
-// Get class information
-readClassInfo();
-// Get interface information, i.e., implemented interfaces
-readInterfaces();
-/** Read class fields and methods ***/
-// Read class fields, i.e., the variables of the class
-readFields();
-// Read class methods, i.e., the functions in the class
-readMethods();
-// Read class attributes
-readAttributes();
-// Check for unknown variables
-//Unknown[] u = Unknown.getUnknownAttributes();
-//for(int i=0; i < u.length; i++)
-//  System.err.println("WARNING: " + u[i]);
-// Everything should have been read now
-//  if(file.available() > 0) {
-//int bytes = file.available();
-//byte[] buf = new byte[bytes];
-//file.read(buf);
-//if(!(is_zip && (buf.length == 1))) {
-//  System.err.println("WARNING: Trailing garbage at end 
of " + file_name);
-//  System.err.println(bytes + " extra bytes: " + 
Utility.toHexString(buf));
-//}
-//  }
-} finally {
-// Read everything of interest, so

svn commit: r1187826 - in /tomcat/trunk: java/org/apache/tomcat/util/net/ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/ modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ te

[markt]

Author: markt
Date: Sat Oct 22 23:24:31 2011
New Revision: 1187826

URL: http://svn.apache.org/viewvc?rev=1187826&view=rev
Log:
Fix some low-hanging FindBugs fruit

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConcurrency.java
tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java

tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1187826&r1=1187825&r2=1187826&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Sat Oct 22 
23:24:31 2011
@@ -1565,7 +1565,7 @@ public class NioEndpoint extends Abstrac
 if (ka!=null) ka.setComet(false);
 socket.getPoller().cancelledKey(key, 
SocketStatus.ERROR, false);
 }
-if (socket!=null) nioChannels.offer(socket);
+nioChannels.offer(socket);
 socket = null;
 if ( ka!=null ) keyCache.offer(ka);
 ka = null;
@@ -1579,7 +1579,7 @@ public class NioEndpoint extends Abstrac
 ka = (KeyAttachment) key.attachment();
 socket.getPoller().cancelledKey(key, 
SocketStatus.DISCONNECT, false);
 }
-if (socket!=null) nioChannels.offer(socket);
+nioChannels.offer(socket);
 socket = null;
 if ( ka!=null ) keyCache.offer(ka);
 ka = null;

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java?rev=1187826&r1=1187825&r2=1187826&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
 Sat Oct 22 23:24:31 2011
@@ -128,7 +128,7 @@ public class GenericNamingResourcesFacto
 // Try a setFoo ( boolean )
 } else if ("java.lang.Boolean".equals(paramType.getName())
 || "boolean".equals(paramType.getName())) {
-params[0] = new Boolean(value);
+params[0] = Boolean.valueOf(value);
 
 // Try a setFoo ( InetAddress )
 } else if ("java.net.InetAddress".equals(paramType

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConcurrency.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConcurrency.java?rev=1187826&r1=1187825&r2=1187826&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConcurrency.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConcurrency.java
 Sat Oct 22 23:24:31 2011
@@ -34,8 +34,8 @@ public class TestConcurrency extends Def
 }
 
 @Override
-public void setUp() {
-// TODO Auto-generated method stub
+public void setUp() throws Exception {
+super.setUp();
 ds = createDefaultDataSource();
 ds.getPoolProperties().setDriverClassName(Driver.class.getName());
 ds.getPoolProperties().setUrl(Driver.url);

Modified: tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java?rev=1187826&r1=1187825&r2=1187826&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java Sat Oct 
22 23:24:31 2011
@@ -214,7 +214,7 @@ public class TestCometProcessor extends 
 // Failure expected only expected for the fail on begin
 // Failure at any later stage an

svn commit: r1187827 - in /tomcat/trunk: ./ bin/ res/ res/maven/

[markt]

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  && pgpk -xa ) >> this file.
   or
 (gpg --fingerprint --list-sigs 

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 

buildbot failure in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/2404

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1187822
Blamelist: markt

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot

buildbot success in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/2405

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1187827
Blamelist: markt

Build succeeded!

sincerely,
 -The Buildbot