[GUMP@vmgump-vm3]: 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.
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-vm3.apache.org/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-vm3.apache.org/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: 31 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-8.4-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/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-junit4.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-8.4-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20171013.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/commons-cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.7-SNAPSHOT.jar:/srv/g
 
ump/public/workspace/apache-commons/logging/target/commons-logging-20171013.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20171013.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-HEAD-jre-SNAPSHOT.jar
-
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/TestELInJsp.java:23: 
Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/TestMethodExpressionImpl.java:30:
 Extra separation in import group before 'org.junit.Before' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/TestValueExpressionImpl.java:34:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/lang/TestELArithmetic.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/lang/TestELSupport.java:29:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/parser/TestELParser.java:28:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/compiler/TestAttributeParser.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/compiler/TestCompiler.java:28:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/compiler/TestGenerator.java:37:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/compiler/TestJspConfig.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/pu

[GUMP@vmgump-vm3]: Project tomcat-trunk-validate (in module tomcat-trunk) 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-trunk-validate has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-validate :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-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-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 31 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-8.4-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/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-junit4.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-8.4-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20171013.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/commons-cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.7-SNAPSHOT.jar:/srv/g
 
ump/public/workspace/apache-commons/logging/target/commons-logging-20171013.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20171013.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-HEAD-jre-SNAPSHOT.jar
-
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/el/TestValueExpressionImpl.java:34:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/el/lang/TestELArithmetic.java:26:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/el/lang/TestELSupport.java:30:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/el/parser/TestELParser.java:30:
 Extra separation in import group before 'org.junit.Ignore' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestAttributeParser.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestCompiler.java:29:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestGenerator.java:36:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestJspConfig.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestParser.java:25:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java:26:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv

[GUMP@vmgump-vm3]: Project tomcat-tc8.0.x-validate (in module tomcat-8.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-tc8.0.x-validate has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-validate :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.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-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-validate/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-validate.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 38 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-8.4-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/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-junit4.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-8.4-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20171013.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/commons-cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.7-SNAPSHOT.jar:/srv/g
 
ump/public/workspace/apache-commons/logging/target/commons-logging-20171013.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20171013.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-HEAD-jre-SNAPSHOT.jar
-
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/el/TestValueExpressionImpl.java:34:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/el/lang/TestELArithmetic.java:26:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/el/lang/TestELSupport.java:30:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/el/parser/TestELParser.java:28:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestAttributeParser.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestCompiler.java:29:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestGenerator.java:36:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestJspConfig.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestParser.java:25:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java:26:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle]

[GitHub] tomcat issue #63: added portOffset attribute to server.xml per BZ-61171

[markt-asf]

Github user markt-asf commented on the issue:

https://github.com/apache/tomcat/pull/63
  
I've added some comments to the bugzilla issue on how this might be 
addressed.


---

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

[GitHub] tomcat issue #73: Bug 57767 - Websocket client proprietary configuration

[markt-asf]

Github user markt-asf commented on the issue:

https://github.com/apache/tomcat/pull/73
  
Chris's original concern with the BZ 57767 patch (lack of Javadoc) still 
needs to be addressed.


---

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

[GitHub] tomcat issue #76: added SessionInitializerFilter

[markt-asf]

Github user markt-asf commented on the issue:

https://github.com/apache/tomcat/pull/76
  
I did wonder if this would be better as configuration on WsFilter but on 
reflection a separate Filter looks to be simpler for users to configure.

The patch needs documentation (webapps/docs/config/filter.xml)

No need to patches for the back-ports. We'll use svn merge and add NO-OP 
methods as necessary.


---

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

[GitHub] tomcat issue #77: Removed findbugs bad practice warnings by making classes f...

[markt-asf]

Github user markt-asf commented on the issue:

https://github.com/apache/tomcat/pull/77
  
Making those classes final will cause problems if users have extended any 
of them. While that seems unlikely, experience suggests it has probably been 
done somewhere.  Is there any reason super.clone() can't be used instead for 
these?


---

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

svn commit: r1812088 - in /tomcat/trunk: java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/ha/deploy/FileMessageFactory.java res/findbugs/filter-false-positives.xml

[markt]

Author: markt
Date: Fri Oct 13 09:11:52 2017
New Revision: 1812088

URL: http://svn.apache.org/viewvc?rev=1812088&view=rev
Log:
Fix some FindBugs false positives
Patch provided by isapir

Modified:
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
tomcat/trunk/res/findbugs/filter-false-positives.xml

Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1812088&r1=1812087&r2=1812088&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Fri Oct 
13 09:11:52 2017
@@ -18,6 +18,7 @@ package org.apache.catalina.filters;
 
 import java.io.IOException;
 import java.text.DateFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Collections;
 import java.util.Date;
@@ -496,7 +497,7 @@ public class RemoteIpFilter extends Gene
 DateFormat dateFormat = dateFormats[i];
 try {
 date = dateFormat.parse(value);
-} catch (Exception ParseException) {
+} catch (ParseException ex) {
 // Ignore
 }
 }

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java?rev=1812088&r1=1812087&r2=1812088&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java Fri 
Oct 13 09:11:52 2017
@@ -310,12 +310,12 @@ public class FileMessageFactory {
 if (in != null)
 try {
 in.close();
-} catch (Exception ignore) {
+} catch (IOException ignore) {
 }
 if (out != null)
 try {
 out.close();
-} catch (Exception ignore) {
+} catch (IOException ignore) {
 }
 in = null;
 out = null;

Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1812088&r1=1812087&r2=1812088&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Fri Oct 13 09:11:52 
2017
@@ -28,6 +28,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -50,6 +56,13 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -188,12 +201,33 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
 
   
   
+
+
+
+
+  
+  
+
+
+
+  
+  
+
+
+  
+  
 
 
 
@@ -506,19 +540,19 @@
   
 
 
-
+
 
   
   
 
 
-
+
 
   
   
 
 
-
+
 
   
   



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

svn commit: r1812087 - /tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java

[markt]

Author: markt
Date: Fri Oct 13 09:11:47 2017
New Revision: 1812087

URL: http://svn.apache.org/viewvc?rev=1812087&view=rev
Log:
Fix SpotBugs warning
Better null handling

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1812087&r1=1812086&r2=1812087&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Fri Oct 
13 09:11:47 2017
@@ -257,8 +257,11 @@ public abstract class AbstractEndpoint

svn commit: r1812089 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/ha/deploy/FileMessageFactory.java res/findbugs/filter-false-positives.

[markt]

Author: markt
Date: Fri Oct 13 09:14:03 2017
New Revision: 1812089

URL: http://svn.apache.org/viewvc?rev=1812089&view=rev
Log:
Fix some FindBugs false positives
Patch provided by isapir

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
tomcat/tc8.5.x/trunk/res/findbugs/filter-false-positives.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 13 09:14:03 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-17633

svn commit: r1812090 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/ha/deploy/FileMessageFactory.java res/findbugs/filter-false-positives.

[markt]

Author: markt
Date: Fri Oct 13 09:15:31 2017
New Revision: 1812090

URL: http://svn.apache.org/viewvc?rev=1812090&view=rev
Log:
Fix some FindBugs false positives
Patch provided by isapir

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
tomcat/tc8.0.x/trunk/res/findbugs/filter-false-positives.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 13 09:15:31 2017
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842

svn commit: r1812091 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/ha/deploy/FileMessageFactory.java res/findbugs/filter-false-positives.

[markt]

Author: markt
Date: Fri Oct 13 09:16:58 2017
New Revision: 1812091

URL: http://svn.apache.org/viewvc?rev=1812091&view=rev
Log:
Fix some FindBugs false positives
Patch provided by isapir

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
tomcat/tc7.0.x/trunk/res/findbugs/filter-false-positives.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 13 09:16:58 2017
@@ -1,3 +1,3 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842
+/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,16410

[GitHub] tomcat pull request #78: added findbugs false positive

[markt-asf]

Github user markt-asf closed the pull request at:

https://github.com/apache/tomcat/pull/78


---

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

[GitHub] tomcat issue #78: added findbugs false positive

[markt-asf]

Github user markt-asf commented on the issue:

https://github.com/apache/tomcat/pull/78
  
Thanks. Patch applied to trunk and back-ported to 8.5.x, 8.0.x and 7.0.x.


---

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

svn commit: r1812092 - /tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml

[rjung]

Author: rjung
Date: Fri Oct 13 09:27:55 2017
New Revision: 1812092

URL: http://svn.apache.org/viewvc?rev=1812092&view=rev
Log:
Fix trivial copy and paste error in JMX operation
description for Wrapper.findInitParameter().

Modified:
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1812092&r1=1812091&r2=1812092&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Fri Oct 
13 09:27:55 2017
@@ -1665,11 +1665,11 @@
 
 
 
   
 
 



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

svn commit: r1812093 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/mbeans-descriptors.xml

[rjung]

Author: rjung
Date: Fri Oct 13 09:30:03 2017
New Revision: 1812093

URL: http://svn.apache.org/viewvc?rev=1812093&view=rev
Log:
Fix trivial copy and paste error in JMX operation
description for Wrapper.findInitParameter().

Backport of r1812092 from trunk.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 13 09:30:03 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,17635

svn commit: r1812094 - /tomcat/trunk/res/findbugs/filter-false-positives.xml

[markt]

Author: markt
Date: Fri Oct 13 09:30:25 2017
New Revision: 1812094

URL: http://svn.apache.org/viewvc?rev=1812094&view=rev
Log:
Fix additional false positives exposed by previous fixes for typos

Modified:
tomcat/trunk/res/findbugs/filter-false-positives.xml

Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1812094&r1=1812093&r2=1812094&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Fri Oct 13 09:30:25 
2017
@@ -540,7 +540,7 @@
   
 
 
-
+
 
   
   
@@ -552,7 +552,10 @@
   
 
 
-
+
+  
+  
+
 
   
   



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

svn commit: r1812095 - in /tomcat/tc8.5.x/trunk: ./ res/findbugs/filter-false-positives.xml

[markt]

Author: markt
Date: Fri Oct 13 09:31:10 2017
New Revision: 1812095

URL: http://svn.apache.org/viewvc?rev=1812095&view=rev
Log:
Fix additional false positives exposed by previous fixes for typos

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/res/findbugs/filter-false-positives.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 13 09:31:10 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,

svn commit: r1812096 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/mbeans-descriptors.xml webapps/docs/changelog.xml

[rjung]

Author: rjung
Date: Fri Oct 13 09:37:41 2017
New Revision: 1812096

URL: http://svn.apache.org/viewvc?rev=1812096&view=rev
Log:
Fix JMX descriptor for Wrapper.findInitParameter().

Extended backport of r1812092 from trunk and r1812093
from TC 8.5.x.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 13 09:37:41 2017
@@ -1,2 +1,2 @@
-/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168

svn commit: r1812098 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/mbeans-descriptors.xml webapps/docs/changelog.xml

[rjung]

Author: rjung
Date: Fri Oct 13 09:40:27 2017
New Revision: 1812098

URL: http://svn.apache.org/viewvc?rev=1812098&view=rev
Log:
Fix JMX descriptor for Wrapper.findInitParameter().

Extended backport of r1812092 from trunk and r1812093
from TC 8.5.x.

Backport of r1812096 from TC 8.0.x.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 13 09:40:27 2017
@@ -1,3 +1,3 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090
-/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,174

svn commit: r1812103 - in /tomcat/trunk: java/org/apache/catalina/webresources/ java/org/apache/tomcat/util/compat/ java/org/apache/tomcat/util/scan/ test/org/apache/catalina/webresources/

[markt]

Author: markt
Date: Fri Oct 13 10:10:33 2017
New Revision: 1812103

URL: http://svn.apache.org/viewvc?rev=1812103&view=rev
Log:
Partial fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=61601
Handle multi-release JARs for unpacked web applications

Modified:

tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java

tomcat/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
tomcat/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java
tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java

tomcat/trunk/test/org/apache/catalina/webresources/TestJarInputStreamWrapper.java

Modified: 
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java?rev=1812103&r1=1812102&r2=1812103&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
 Fri Oct 13 10:10:33 2017
@@ -30,6 +30,7 @@ import java.util.jar.Manifest;
 import org.apache.catalina.WebResource;
 import org.apache.catalina.WebResourceRoot;
 import org.apache.catalina.util.ResourceSet;
+import org.apache.tomcat.util.compat.JreCompat;
 
 public abstract class AbstractArchiveResourceSet extends AbstractResourceSet {
 
@@ -247,23 +248,28 @@ public abstract class AbstractArchiveRes
 return new JarResourceRoot(root, new File(getBase()),
 baseUrlString, path);
 } else {
-Map jarEntries = getArchiveEntries(true);
 JarEntry jarEntry = null;
-if (!(pathInJar.charAt(pathInJar.length() - 1) == '/')) {
-if (jarEntries == null) {
-jarEntry = getArchiveEntry(pathInJar + '/');
-} else {
-jarEntry = jarEntries.get(pathInJar + '/');
-}
-if (jarEntry != null) {
-path = path + '/';
+if (isMultiRelease()) {
+// Calls JarFile.getJarEntry() which is multi-release aware
+jarEntry = getArchiveEntry(pathInJar);
+} else {
+Map jarEntries = getArchiveEntries(true);
+if (!(pathInJar.charAt(pathInJar.length() - 1) == '/')) {
+if (jarEntries == null) {
+jarEntry = getArchiveEntry(pathInJar + '/');
+} else {
+jarEntry = jarEntries.get(pathInJar + '/');
+}
+if (jarEntry != null) {
+path = path + '/';
+}
 }
-}
-if (jarEntry == null) {
-if (jarEntries == null) {
-jarEntry = getArchiveEntry(pathInJar);
-} else {
-jarEntry = jarEntries.get(pathInJar);
+if (jarEntry == null) {
+if (jarEntries == null) {
+jarEntry = getArchiveEntry(pathInJar);
+} else {
+jarEntry = jarEntries.get(pathInJar);
+}
 }
 }
 if (jarEntry == null) {
@@ -277,6 +283,8 @@ public abstract class AbstractArchiveRes
 }
 }
 
+protected abstract boolean isMultiRelease();
+
 protected abstract WebResource createArchiveResource(JarEntry jarEntry,
 String webAppPath, Manifest manifest);
 
@@ -299,7 +307,7 @@ public abstract class AbstractArchiveRes
 protected JarFile openJarFile() throws IOException {
 synchronized (archiveLock) {
 if (archive == null) {
-archive = new JarFile(getBase());
+archive = 
JreCompat.getInstance().jarFileNewInstance(getBase());
 }
 archiveUseCount++;
 return archive;

Modified: 
tomcat/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java?rev=1812103&r1=1812102&r2=1812103&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
 F

buildbot failure in on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1812103
Blamelist: markt

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot




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

svn commit: r1812107 - /tomcat/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java

[markt]

Author: markt
Date: Fri Oct 13 10:38:00 2017
New Revision: 1812107

URL: http://svn.apache.org/viewvc?rev=1812107&view=rev
Log:
multiRelease needs to be volatile for DCL to work correctly (thanks SpotBugs)

Modified:

tomcat/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java

Modified: 
tomcat/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java?rev=1812107&r1=1812106&r2=1812107&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
 Fri Oct 13 10:38:00 2017
@@ -36,7 +36,7 @@ import org.apache.tomcat.util.compat.Jre
  */
 public abstract class AbstractSingleArchiveResourceSet extends 
AbstractArchiveResourceSet {
 
-private Boolean multiRelease;
+private volatile Boolean multiRelease;
 
 /**
  * A no argument constructor is required for this to work with the 
digester.



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

svn commit: r1812113 - /tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java

[markt]

Author: markt
Date: Fri Oct 13 11:40:48 2017
New Revision: 1812113

URL: http://svn.apache.org/viewvc?rev=1812113&view=rev
Log:
Fix Javadoc

Modified:
tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java?rev=1812113&r1=1812112&r2=1812113&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java Fri Oct 13 
11:40:48 2017
@@ -139,6 +139,8 @@ public class JreCompat {
  *
  * @param s The JAR file to open
  *
+ * @return A JarFile instance based on the provided path
+ *
  * @throws IOException  If an I/O error occurs creating the JarFile 
instance
  */
 public final JarFile jarFileNewInstance(String s) throws IOException {
@@ -152,6 +154,8 @@ public class JreCompat {
  *
  * @param f The JAR file to open
  *
+ * @return A JarFile instance based on the provided file
+ *
  * @throws IOException  If an I/O error occurs creating the JarFile 
instance
  */
 public JarFile jarFileNewInstance(File f) throws IOException {



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

[GitHub] tomcat issue #73: Bug 57767 - Websocket client proprietary configuration

[rmaucher]

Github user rmaucher commented on the issue:

https://github.com/apache/tomcat/pull/73
  
Well, it looks ok to me overall, so I'll add a bit of javadoc and merge it. 
Any issue with backporting it ?


---

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

buildbot success in on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1812113
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1812119 - in /tomcat/trunk/test/org/apache/catalina: authenticator/jaspic/ connector/ core/ loader/ startup/

[markt]

Author: markt
Date: Fri Oct 13 12:01:23 2017
New Revision: 1812119

URL: http://svn.apache.org/viewvc?rev=1812119&view=rev
Log:
Fix some FindBugs warnings in the test cases

Modified:

tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java

tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java

tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java

tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java

Modified: 
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java?rev=1812119&r1=1812118&r2=1812119&view=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
 (original)
+++ 
tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
 Fri Oct 13 12:01:23 2017
@@ -81,7 +81,7 @@ public class TestPersistentProviderRegis
 validateSimple(end);
 
 if (f.exists()) {
-f.delete();
+Assert.assertTrue("Failed to clean up [" + f + "]", f.delete());
 }
 }
 }

Modified: tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java?rev=1812119&r1=1812118&r2=1812119&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java Fri Oct 
13 12:01:23 2017
@@ -88,7 +88,7 @@ public class TestSendFile extends Tomcat
 }
 } finally {
 for (File f : files) {
-f.delete();
+Assert.assertTrue("Failed to clean up [" + f + "]", 
f.delete());
 }
 }
 }
@@ -205,7 +205,9 @@ public class TestSendFile extends Tomcat
 req.setAttribute(Globals.SENDFILE_FILENAME_ATTR, 
file.getAbsolutePath());
 req.setAttribute(Globals.SENDFILE_FILE_START_ATTR, 
Long.valueOf(0));
 req.setAttribute(Globals.SENDFILE_FILE_END_ATTR, 
Long.valueOf(file.length()));
-file.delete();
+if (!file.delete()) {
+throw new ServletException("Failed to delete [" + file + 
"]");
+}
 } else {
 byte[] c = new byte[1024];
 Random rd = new Random();

Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1812119&r1=1812118&r2=1812119&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Fri 
Oct 13 12:01:23 2017
@@ -2032,7 +2032,7 @@ public class TestAsyncContextImpl extend
 
 private static final long serialVersionUID = 1L;
 
-private AsyncContext asyncContext;
+private transient AsyncContext asyncContext;
 
 @Override
 protected void doGet(HttpServletRequest req, HttpServletResponse resp)

Modified: tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java?rev=1812119&r1=1812118&r2=1812119&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java Fri 
Oct 13 12:01:23 2017
@@ -308,7 +308,7 @@ public class TestVirtualContext extends
 assertPageContains("/test/annotatedServlet", 
MyAnnotatedServlet.MESSAGE);
 tomcat.stop();
 FileUtils.deleteDirectory(additionWebInfClasses);
-tempFile.delete();
+Assert.assertTrue("Failed to clean up [" + tempFile + "]", 
tempFile.delete());
 }
 
 private void assertPageContains(String pageUrl, String expectedBody)

Modified: 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestW

[GitHub] tomcat issue #73: Bug 57767 - Websocket client proprietary configuration

[markt-asf]

Github user markt-asf commented on the issue:

https://github.com/apache/tomcat/pull/73
  
No objections to back-porting here.


---

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

svn commit: r1812129 - in /tomcat/trunk: java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/ webapps/docs/

[remm]

Author: remm
Date: Fri Oct 13 13:42:25 2017
New Revision: 1812129

URL: http://svn.apache.org/viewvc?rev=1812129&view=rev
Log:
57767: Add support for authentication to the websocket client. Patch submitted 
by J Fernandez.

Added:
tomcat/trunk/java/org/apache/tomcat/websocket/AuthenticationException.java  
 (with props)
tomcat/trunk/java/org/apache/tomcat/websocket/Authenticator.java   (with 
props)
tomcat/trunk/java/org/apache/tomcat/websocket/AuthenticatorFactory.java   
(with props)
tomcat/trunk/java/org/apache/tomcat/websocket/BasicAuthenticator.java   
(with props)
tomcat/trunk/java/org/apache/tomcat/websocket/DigestAuthenticator.java   
(with props)
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
tomcat/trunk/webapps/docs/changelog.xml

Added: 
tomcat/trunk/java/org/apache/tomcat/websocket/AuthenticationException.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/AuthenticationException.java?rev=1812129&view=auto
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/AuthenticationException.java 
(added)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/AuthenticationException.java 
Fri Oct 13 13:42:25 2017
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.tomcat.websocket;
+
+/**
+ * Exception thrown on authentication error connecting to a remote
+ * websocket endpoint.
+ */
+public class AuthenticationException extends Exception {
+
+private static final long serialVersionUID = 5709887412240096441L;
+
+/**
+ * Create authentication exception.
+ * @param message the error message
+ */
+public AuthenticationException(String message) {
+super(message);
+}
+
+}

Propchange: 
tomcat/trunk/java/org/apache/tomcat/websocket/AuthenticationException.java
--
svn:eol-style = native

Added: tomcat/trunk/java/org/apache/tomcat/websocket/Authenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Authenticator.java?rev=1812129&view=auto
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/Authenticator.java (added)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Authenticator.java Fri Oct 13 
13:42:25 2017
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.tomcat.websocket;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Base class for the authentication methods used by the websocket client.
+ */
+public abstract class Authenticator {
+private static final Pattern pattern = Pattern
+.compile("(\\w+)\\s*=\\s*(\"([^\"]+)\"|([^,=\"]+))\\s*,?");
+
+/**
+ * Generate the authentication header that will be sent to the server.
+ * @param requestUri The request URI
+ * @param WWWAuthenticate The server auth challenge
+ * @param UserProperties The user information
+ * @return The auth header
+ * @throws Authent

[Bug 57767] Websocket client proprietary configuration

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=57767

--- Comment #20 from Remy Maucherat  ---
I committed the patch to trunk, with a few changes:
- Adding javadocs
- Merged all client code back to WsWebSocketContainer (the new client class was
taking over nearly all its code so I didn't really see the point)

If nobody complains about other mandatory improvements, I will proceed with
backporting the feature addition.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57767] Websocket client proprietary configuration

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=57767

--- Comment #21 from Mark Thomas  ---
Wasn't the point of the new class that the redirectSet wasn't thread safe?

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57767] Websocket client proprietary configuration

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=57767

--- Comment #22 from Remy Maucherat  ---
Yes, that would be a big problem with my "simplification" then. Ooops. I will
restore the separate client class, it's a good solution for the issue.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1812134 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

[remm]

Author: remm
Date: Fri Oct 13 14:14:22 2017
New Revision: 1812134

URL: http://svn.apache.org/viewvc?rev=1812134&view=rev
Log:
Remove redirectSet field to avoid thread safety problems.

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1812134&r1=1812133&r2=1812134&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Fri 
Oct 13 14:14:22 2017
@@ -85,8 +85,6 @@ public class WsWebSocketContainer implem
 private static final byte[] HTTP_VERSION_BYTES =
 " HTTP/1.1\r\n".getBytes(StandardCharsets.ISO_8859_1);
 
-private Set redirectSet = null;
-
 private volatile AsynchronousChannelGroup asynchronousChannelGroup = null;
 private final Object asynchronousChannelGroupLock = new Object();
 
@@ -522,6 +520,8 @@ public class WsWebSocketContainer implem
 maxRedirects = Integer.parseInt(maxRedirectsValue);
 }
 
+Set redirectSet = null;
+
 if (httpResponse.status != 101) {
 if(isRedirectStatus(httpResponse.status)){
 List locationHeader =
@@ -658,10 +658,6 @@ public class WsWebSocketContainer implem
 if (!success) {
 channel.close();
 }
-
-if (redirectSet != null && !redirectSet.isEmpty()) {
-redirectSet.clear();
-}
 }
 
 // Switch to WebSocket



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

svn commit: r1812135 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

[remm]

Author: remm
Date: Fri Oct 13 14:18:37 2017
New Revision: 1812135

URL: http://svn.apache.org/viewvc?rev=1812135&view=rev
Log:
Follow up to fix bad interaction with the recursive algorithm.

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1812135&r1=1812134&r2=1812135&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Fri 
Oct 13 14:18:37 2017
@@ -192,7 +192,7 @@ public class WsWebSocketContainer implem
 public Session connectToServer(Endpoint endpoint,
 ClientEndpointConfig clientEndpointConfiguration, URI path)
 throws DeploymentException {
-return connectToServerRecursive(endpoint, clientEndpointConfiguration, 
path);
+return connectToServerRecursive(endpoint, clientEndpointConfiguration, 
path, new HashSet<>());
 }
 
 protected void registerSession(Endpoint endpoint, WsSession wsSession) {
@@ -362,7 +362,8 @@ public class WsWebSocketContainer implem
 
 
 private Session connectToServerRecursive(Endpoint endpoint,
-ClientEndpointConfig clientEndpointConfiguration, URI path)
+ClientEndpointConfig clientEndpointConfiguration, URI path,
+Set redirectSet)
 throws DeploymentException {
 
 boolean secure = false;
@@ -520,8 +521,6 @@ public class WsWebSocketContainer implem
 maxRedirects = Integer.parseInt(maxRedirectsValue);
 }
 
-Set redirectSet = null;
-
 if (httpResponse.status != 101) {
 if(isRedirectStatus(httpResponse.status)){
 List locationHeader =
@@ -550,10 +549,6 @@ public class WsWebSocketContainer implem
 redirectLocation.getQuery(), 
redirectLocation.getFragment());
 }
 
-if (redirectSet == null) {
-redirectSet = new HashSet<>(maxRedirects);
-}
-
 if (!redirectSet.add(redirectLocation) || 
redirectSet.size() > maxRedirects) {
 throw new DeploymentException(sm.getString(
 "wsWebSocketClient.redirectThreshold", 
redirectLocation,
@@ -561,7 +556,7 @@ public class WsWebSocketContainer implem
 Integer.toString(maxRedirects)));
 }
 
-return connectToServerRecursive(endpoint, 
clientEndpointConfiguration, redirectLocation);
+return connectToServerRecursive(endpoint, 
clientEndpointConfiguration, redirectLocation, redirectSet);
 
 }
 
@@ -597,7 +592,7 @@ public class WsWebSocketContainer implem
 userProperties.put(Constants.AUTHORIZATION_HEADER_NAME, 
auth.getAuthorization(
 requestUri, wwwAuthenticateHeaders.get(0), 
userProperties));
 
-return connectToServerRecursive(endpoint, 
clientEndpointConfiguration, path);
+return connectToServerRecursive(endpoint, 
clientEndpointConfiguration, path, redirectSet);
 
 }
 



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

[Bug 57767] Websocket client proprietary configuration

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=57767

--- Comment #23 from Remy Maucherat  ---
I prefer getting rid of the field instead, the GC savings are minimal and not
worth it IMO.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1812136 - in /tomcat/trunk/java/org/apache/tomcat/websocket: DigestAuthenticator.java WsWebSocketContainer.java

[markt]

Author: markt
Date: Fri Oct 13 14:42:19 2017
New Revision: 1812136

URL: http://svn.apache.org/viewvc?rev=1812136&view=rev
Log:
Fix IDE nags

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/DigestAuthenticator.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/DigestAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/DigestAuthenticator.java?rev=1812136&r1=1812135&r2=1812136&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/DigestAuthenticator.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/DigestAuthenticator.java Fri 
Oct 13 14:42:19 2017
@@ -16,7 +16,6 @@
  */
 package org.apache.tomcat.websocket;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -78,7 +77,7 @@ public class DigestAuthenticator extends
 realm, nonce, messageQop, algorithm) + "\",");
 }
 
-catch (UnsupportedEncodingException | NoSuchAlgorithmException e) {
+catch (NoSuchAlgorithmException e) {
 throw new AuthenticationException(
 "Unable to generate request digest " + e.getMessage());
 }
@@ -89,7 +88,7 @@ public class DigestAuthenticator extends
 if (!messageQop.isEmpty()) {
 challenge.append("qop=\"" + messageQop + "\"");
 challenge.append(",cnonce=\"" + cNonce + "\",");
-challenge.append("nc=" + String.format("%08X", nonceCount));
+challenge.append("nc=" + String.format("%08X", 
Integer.valueOf(nonceCount)));
 }
 
 return challenge.toString();
@@ -98,7 +97,7 @@ public class DigestAuthenticator extends
 
 private String calculateRequestDigest(String requestUri, String userName, 
String password,
 String realm, String nonce, String qop, String algorithm)
-throws UnsupportedEncodingException, NoSuchAlgorithmException {
+throws NoSuchAlgorithmException {
 
 StringBuilder preDigest = new StringBuilder();
 String A1;
@@ -122,7 +121,7 @@ public class DigestAuthenticator extends
 
 if (qop.toLowerCase().contains("auth")) {
 preDigest.append(":");
-preDigest.append(String.format("%08X", nonceCount));
+preDigest.append(String.format("%08X", 
Integer.valueOf(nonceCount)));
 preDigest.append(":");
 preDigest.append(String.valueOf(cNonce));
 preDigest.append(":");
@@ -136,8 +135,7 @@ public class DigestAuthenticator extends
 
 }
 
-private String encodeMD5(String value)
-throws UnsupportedEncodingException, NoSuchAlgorithmException {
+private String encodeMD5(String value) throws NoSuchAlgorithmException {
 byte[] bytesOfMessage = value.getBytes(StandardCharsets.ISO_8859_1);
 MessageDigest md = MessageDigest.getInstance("MD5");
 byte[] thedigest = md.digest(bytesOfMessage);

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1812136&r1=1812135&r2=1812136&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Fri 
Oct 13 14:42:19 2017
@@ -564,7 +564,8 @@ public class WsWebSocketContainer implem
 
 if 
(userProperties.get(Constants.AUTHORIZATION_HEADER_NAME) != null) {
 throw new DeploymentException(sm.getString(
-"wsWebSocketClient.failedAuthentication", 
httpResponse.status));
+"wsWebSocketClient.failedAuthentication",
+Integer.valueOf(httpResponse.status)));
 }
 
 List wwwAuthenticateHeaders = 
httpResponse.getHandshakeResponse()
@@ -586,7 +587,7 @@ public class WsWebSocketContainer implem
 if (auth == null) {
 throw new DeploymentException(
 
sm.getString("wsWebSocketClient.unsupportedAuthScheme",
-httpResponse.status, authScheme));
+Integer.valueOf(httpResponse.status), 
authScheme));
 }
 
 userProperties.put(Constants.AUTHORIZATION_HEADER_NAME, 
auth.getAuthorization(



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

Hello everyone!

[Kapil Kumar]

Hello everyone,

 

Hope you find this well.

 

My name is Kapil Kumar and I joined the mailing list today.

 

I work as an Oracle DBA professionally and I really appreciate the efforts
of the apache community.

 

Mark helped me getting subscribed and I am thankful for that but I would
really appreciate some pointers on how to get started.

 

Consider me as a novice and please help me build and upscale myself with the
community.

 

And, a happy weekend to all.

 

 

Regards

Kapil Kumar

 



---
This email has been checked for viruses by Avast antivirus software.
https://www.avast.com/antivirus

svn commit: r1812139 - in /tomcat/trunk/test/org/apache: catalina/valves/ coyote/http11/upgrade/ jasper/ tomcat/util/net/

[markt]

Author: markt
Date: Fri Oct 13 15:04:47 2017
New Revision: 1812139

URL: http://svn.apache.org/viewvc?rev=1812139&view=rev
Log:
Fix some SpotBugs false positives

Modified:

tomcat/trunk/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java

tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
tomcat/trunk/test/org/apache/jasper/TestJspC.java
tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java
tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java

Modified: 
tomcat/trunk/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java?rev=1812139&r1=1812138&r2=1812139&view=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java 
(original)
+++ 
tomcat/trunk/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java 
Fri Oct 13 15:04:47 2017
@@ -129,9 +129,11 @@ public class TestLoadBalancerDrainingVal
 
 @Override
 public boolean equals(Object o) {
-if(null == o) return false;
-MyCookie mc = (MyCookie)o;
+if(!(o instanceof MyCookie)) {
+return false;
+}
 
+MyCookie mc = (MyCookie)o;
 return mc.getName().equals(this.getName())
 && mc.getPath().equals(this.getPath())
 && mc.getValue().equals(this.getValue())

Modified: tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java?rev=1812139&r1=1812138&r2=1812139&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java 
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java Fri Oct 
13 15:04:47 2017
@@ -148,6 +148,7 @@ public class TestUpgrade extends TomcatB
 Assert.assertEquals(MESSAGE, response);
 
 uc.shutdownInput();
+pw.close();
 }
 
 

Modified: 
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java?rev=1812139&r1=1812138&r2=1812139&view=diff
==
--- 
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
 (original)
+++ 
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
 Fri Oct 13 15:04:47 2017
@@ -80,6 +80,7 @@ public class TestUpgradeInternalHandler
 Assert.assertEquals(MESSAGE, response);
 
 uc.shutdownInput();
+pw.close();
 }
 
 private UpgradeConnection doUpgrade(

Modified: tomcat/trunk/test/org/apache/jasper/TestJspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/TestJspC.java?rev=1812139&r1=1812138&r2=1812139&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/TestJspC.java (original)
+++ tomcat/trunk/test/org/apache/jasper/TestJspC.java Fri Oct 13 15:04:47 2017
@@ -114,7 +114,7 @@ public class TestJspC {
 
 private void precompile(File appDir, File webappOut) throws IOException {
 remove(webappOut);
-webappOut.mkdirs();
+Assert.assertTrue("Failed to create [" + webappOut + "]", 
webappOut.mkdirs());
 jspc.setUriroot(appDir.toString());
 jspc.setOutputDir(webappOut.toString());
 jspc.setValidateTld(false);

Modified: tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java?rev=1812139&r1=1812138&r2=1812139&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java 
(original)
+++ tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java Fri Oct 
13 15:04:47 2017
@@ -58,7 +58,8 @@ public class TestJspCompilationContext e
 Assert.assertTrue(body.toString().contains("00 - OK"));
 
 File jsp = new File("test/webapp/jsp/tagFileInJar.jsp");
-jsp.setLastModified(jsp.lastModified() + 1);
+Assert.assertTrue("Failed to set last modified for [" + jsp + "]",
+jsp.setLastModified(jsp.lastModified() + 1));
 
 // This test requires that modificationTestInterval is set to zero in
 // web.xml. If not, a sleep longer that modificationTestInterval is

Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.j

[GitHub] tomcat issue #76: added SessionInitializerFilter

[isapir]

Github user isapir commented on the issue:

https://github.com/apache/tomcat/pull/76
  
Sure, I will add the documentation.

Thanks :)


---

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

[GitHub] tomcat issue #77: Removed findbugs bad practice warnings by making classes f...

[isapir]

Github user isapir commented on the issue:

https://github.com/apache/tomcat/pull/77
  
I actually started with using super.clone() but upon further research opted 
for marking the classes as `final`.  All the "best practices" advocates say to 
avoid using the faulty clone() method as described in Joshua Bloch's book 
_Effective Java_, and also described in articles online like 
http://www.artima.com/intv/bloch13.html

I will refactor these to use `super.clone()`.


---

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

svn commit: r1812142 - in /tomcat/trunk/java/org/apache/tomcat/websocket: LocalStrings.properties WsWebSocketContainer.java

[remm]

Author: remm
Date: Fri Oct 13 15:25:23 2017
New Revision: 1812142

URL: http://svn.apache.org/viewvc?rev=1812142&view=rev
Log:
Fix the merge mess caused by me cut&pasting the client code back to the 
container class. Noticed while porting to 8.5. Also fix the i18n property names.

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1812142&r1=1812141&r2=1812142&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Fri 
Oct 13 15:25:23 2017
@@ -127,18 +127,18 @@ wsWebSocketContainer.maxBuffer=This impl
 wsWebSocketContainer.missingAnnotation=Cannot use POJO class [{0}] as it is 
not annotated with @ClientEndpoint
 wsWebSocketContainer.sessionCloseFail=Session with ID [{0}] did not close 
cleanly
 
-wsWebSocketClient.asynchronousSocketChannelFail=Unable to open a connection to 
the server
-wsWebSocketClient.httpRequestFailed=The HTTP request to initiate the WebSocket 
connection failed
-wsWebSocketClient.invalidExtensionParameters=The server responded with 
extension parameters the client is unable to support
-wsWebSocketClient.invalidHeader=Unable to parse HTTP header as no colon is 
present to delimit header name and header value in [{0}]. The header has been 
skipped.
-wsWebSocketClient.invalidStatus=The HTTP response from the server [{0}] did 
not permit the HTTP upgrade to WebSocket
-wsWebSocketClient.invalidSubProtocol=The WebSocket server returned multiple 
values for the Sec-WebSocket-Protocol header
-wsWebSocketClient.pathNoHost=No host was specified in URI
-wsWebSocketClient.pathWrongScheme=The scheme [{0}] is not supported. The 
supported schemes are ws and wss
-wsWebSocketClient.proxyConnectFail=Failed to connect to the configured Proxy 
[{0}]. The HTTP response code was [{1}]
-wsWebSocketClient.sslEngineFail=Unable to create SSLEngine to support SSL/TLS 
connections
-wsWebSocketClient.missingLocationHeader=Failed to handle HTTP response code 
[{0}]. Missing Location header in response
-wsWebSocketClient.redirectThreshold=Cyclic Location header [{0}] detected / 
reached max number of redirects [{1}] of max [{2}]
-wsWebSocketClient.unsupportedAuthScheme=Failed to handle HTTP response code 
[{0}]. Unsupported Authentication scheme [{1}] returned in response
-wsWebSocketClient.failedAuthentication=Failed to handle HTTP response code 
[{0}]. Authentication header was not accepted by server.
-wsWebSocketClient.missingWWWAuthenticateHeader=Failed to handle HTTP response 
code [{0}]. Missing WWW-Authenticate header in response
\ No newline at end of file
+wsWebSocketContainer.asynchronousSocketChannelFail=Unable to open a connection 
to the server
+wsWebSocketContainer.httpRequestFailed=The HTTP request to initiate the 
WebSocket connection failed
+wsWebSocketContainer.invalidExtensionParameters=The server responded with 
extension parameters the client is unable to support
+wsWebSocketContainer.invalidHeader=Unable to parse HTTP header as no colon is 
present to delimit header name and header value in [{0}]. The header has been 
skipped.
+wsWebSocketContainer.invalidStatus=The HTTP response from the server [{0}] did 
not permit the HTTP upgrade to WebSocket
+wsWebSocketContainer.invalidSubProtocol=The WebSocket server returned multiple 
values for the Sec-WebSocket-Protocol header
+wsWebSocketContainer.pathNoHost=No host was specified in URI
+wsWebSocketContainer.pathWrongScheme=The scheme [{0}] is not supported. The 
supported schemes are ws and wss
+wsWebSocketContainer.proxyConnectFail=Failed to connect to the configured 
Proxy [{0}]. The HTTP response code was [{1}]
+wsWebSocketContainer.sslEngineFail=Unable to create SSLEngine to support 
SSL/TLS connections
+wsWebSocketContainer.missingLocationHeader=Failed to handle HTTP response code 
[{0}]. Missing Location header in response
+wsWebSocketContainer.redirectThreshold=Cyclic Location header [{0}] detected / 
reached max number of redirects [{1}] of max [{2}]
+wsWebSocketContainer.unsupportedAuthScheme=Failed to handle HTTP response code 
[{0}]. Unsupported Authentication scheme [{1}] returned in response
+wsWebSocketContainer.failedAuthentication=Failed to handle HTTP response code 
[{0}]. Authentication header was not accepted by server.
+wsWebSocketContainer.missingWWWAuthenticateHeader=Failed to handle HTTP 
response code [{0}]. Missing WWW-Authenticate header in response
\ No newline at end of file

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocke

svn commit: r1812143 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/ webapps/docs/

[remm]

Author: remm
Date: Fri Oct 13 15:27:32 2017
New Revision: 1812143

URL: http://svn.apache.org/viewvc?rev=1812143&view=rev
Log:
57767: Add support for authentication to the websocket client. Patch submitted 
by J Fernandez.

Added:

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/AuthenticationException.java
  - copied unchanged from r1812129, 
tomcat/trunk/java/org/apache/tomcat/websocket/AuthenticationException.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/Authenticator.java
  - copied unchanged from r1812129, 
tomcat/trunk/java/org/apache/tomcat/websocket/Authenticator.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/AuthenticatorFactory.java
  - copied unchanged from r1812129, 
tomcat/trunk/java/org/apache/tomcat/websocket/AuthenticatorFactory.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/BasicAuthenticator.java
  - copied unchanged from r1812129, 
tomcat/trunk/java/org/apache/tomcat/websocket/BasicAuthenticator.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/DigestAuthenticator.java
  - copied, changed from r1812129, 
tomcat/trunk/java/org/apache/tomcat/websocket/DigestAuthenticator.java
Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/Constants.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 13 15:27:32 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,17571

svn commit: r1812145 - /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/BasicAuthenticator.java

[remm]

Author: remm
Date: Fri Oct 13 15:44:43 2017
New Revision: 1812145

URL: http://svn.apache.org/viewvc?rev=1812145&view=rev
Log:
Fix compilation of BasicAuthenticator.

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/BasicAuthenticator.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/BasicAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/BasicAuthenticator.java?rev=1812145&r1=1812144&r2=1812145&view=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/BasicAuthenticator.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/BasicAuthenticator.java 
Fri Oct 13 15:44:43 2017
@@ -18,9 +18,10 @@ package org.apache.tomcat.websocket;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.util.Base64;
 import java.util.Map;
 
+import org.apache.tomcat.util.codec.binary.Base64;
+
 /**
  * Authenticator supporting the BASIC auth method.
  */
@@ -53,7 +54,7 @@ public class BasicAuthenticator extends
 charset = StandardCharsets.ISO_8859_1;
 }
 
-String base64 = 
Base64.getEncoder().encodeToString(userPass.getBytes(charset));
+String base64 = Base64.encodeBase64String(userPass.getBytes(charset));
 
 return " Basic " + base64;
 }



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

svn commit: r1812150 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/ webapps/docs/

[remm]

Author: remm
Date: Fri Oct 13 16:30:39 2017
New Revision: 1812150

URL: http://svn.apache.org/viewvc?rev=1812150&view=rev
Log:
57767: Add support for authentication to the websocket client. Patch submitted 
by J Fernandez.

Added:

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/AuthenticationException.java
  - copied unchanged from r1812143, 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/AuthenticationException.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/Authenticator.java
  - copied unchanged from r1812143, 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/Authenticator.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/AuthenticatorFactory.java
  - copied unchanged from r1812143, 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/AuthenticatorFactory.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/BasicAuthenticator.java
  - copied, changed from r1812143, 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/BasicAuthenticator.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/DigestAuthenticator.java
  - copied unchanged from r1812143, 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/DigestAuthenticator.java
Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/Constants.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 13 16:30:39 2017
@@ -1,2 +1,2 @@
-/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,

svn commit: r1812151 - in /tomcat/trunk: res/findbugs/filter-false-positives.xml test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java test/org/apache/catalina/startup/SimpleHttpClient.java tes

[markt]

Author: markt
Date: Fri Oct 13 16:50:39 2017
New Revision: 1812151

URL: http://svn.apache.org/viewvc?rev=1812151&view=rev
Log:
Fix remaining SpotBugs failures in the test code when the rank is set to 16
(the maximum rank is 20 so there are still quite a few other issues to look at)

Modified:
tomcat/trunk/res/findbugs/filter-false-positives.xml
tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java
tomcat/trunk/test/org/apache/juli/TestFileHandler.java

Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1812151&r1=1812150&r2=1812151&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Fri Oct 13 16:50:39 
2017
@@ -1183,6 +1183,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -1229,6 +1235,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
   

Modified: 
tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java?rev=1812151&r1=1812150&r2=1812151&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java 
Fri Oct 13 16:50:39 2017
@@ -19,6 +19,7 @@ package org.apache.catalina.nonblocking;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.Serializable;
 import java.net.HttpURLConnection;
 import java.net.Socket;
 import java.net.URL;
@@ -154,7 +155,13 @@ public class TestNonBlockingAPI extends
 "Host: localhost:" + getPort() + "\r\n" +
 "\r\n").getBytes(StandardCharsets.ISO_8859_1));
 os.flush();
-is.read(buffer);
+// Make sure the entire response has been read.
+int read = is.read(buffer);
+// The response should end with CRLFCRLF
+Assert.assertEquals(buffer[read - 4], '\r');
+Assert.assertEquals(buffer[read - 3], '\n');
+Assert.assertEquals(buffer[read - 2], '\r');
+Assert.assertEquals(buffer[read - 1], '\n');
 }
 os.write(("GET / HTTP/1.1\r\n" +
 "Host: localhost:" + getPort() + "\r\n" +
@@ -843,7 +850,7 @@ public class TestNonBlockingAPI extends
 private static final class DelayedNBWriteServlet extends TesterServlet {
 private static final long serialVersionUID = 1L;
 private final Set emitters = new HashSet<>();
-private final CountDownLatch latch;
+private transient final CountDownLatch latch;
 
 public DelayedNBWriteServlet(CountDownLatch latch) {
 this.latch = latch;
@@ -870,8 +877,11 @@ public class TestNonBlockingAPI extends
 
 }
 
-private static final class Emitter {
-private final AsyncContext ctx;
+private static final class Emitter implements Serializable {
+
+private static final long serialVersionUID = 1L;
+
+private transient final AsyncContext ctx;
 
 Emitter(AsyncContext ctx) {
 this.ctx = ctx;

Modified: tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java?rev=1812151&r1=1812150&r2=1812151&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java Fri Oct 
13 16:50:39 2017
@@ -33,6 +33,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import org.junit.Assert;
+
 /**
  * Simple client for unit testing. It isn't robust, it isn't secure and
  * should not be used as the basis for production code. Its only purpose
@@ -298,7 +300,8 @@ public abstract class SimpleHttpClient {
 if (wantBody) {
 if (useContentLength && (contentLength > -1)) {
 char[] body = new char[contentLength];
-reader.read(body);
+int read = reader.read(body);
+Assert.assertEquals(contentLength, read);
 builder.append(body);
 }
 else {

Modified: tomcat/trunk/test/org/apache/juli/TestFileHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/juli/TestFileHandler.java?rev=1812151&r1=1812150&r2=1812151&view=diff
==
---

svn commit: r1812154 - in /tomcat/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java

[markt]

Author: markt
Date: Fri Oct 13 17:22:07 2017
New Revision: 1812154

URL: http://svn.apache.org/viewvc?rev=1812154&view=rev
Log:
Fix remaining SpotBugs failures in the jdbc-pool code when the rank is set to 16
(the maximum rank is 20 so there are still quite a few other issues to look at)

Modified:

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

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
tomcat/trunk/res/findbugs/filter-false-positives.xml

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1812154&r1=1812153&r2=1812154&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 Fri Oct 13 17:22:07 2017
@@ -621,7 +621,10 @@ public class ConnectionPool {
 // we could have threads stuck in idle.poll(timeout) that will never be
 // notified
 if (waitcount.get() > 0) {
-idle.offer(create(true));
+if (!idle.offer(create(true))) {
+log.warn("Failed to add a new connection to the pool after 
releasing a connection " +
+"when at least one thread was waiting for a 
connection.");
+}
 }
 }
 

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=1812154&r1=1812153&r2=1812154&view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
 Fri Oct 13 17:22:07 2017
@@ -54,7 +54,7 @@ public class PoolProperties implements P
 private volatile String validationQuery;
 private volatile int validationQueryTimeout = -1;
 private volatile String validatorClassName;
-private volatile Validator validator;
+private volatile transient Validator validator;
 private volatile boolean testOnBorrow = false;
 private volatile boolean testOnReturn = false;
 private volatile boolean testWhileIdle = false;

Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1812154&r1=1812153&r2=1812154&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Fri Oct 13 17:22:07 
2017
@@ -738,6 +738,14 @@
 
   
   
+
+
+  
+  
+
+
+  
+  
 
 
 
@@ -762,6 +770,11 @@
 
   
   
+
+
+
+  
+  
 
 
 



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

Re: Hello everyone!

[Mark Thomas]

On 13/10/2017 16:02, Kapil Kumar wrote:
> Hello everyone,
> 
> Hope you find this well.
> 
> My name is Kapil Kumar and I joined the mailing list today.
> 
> I work as an Oracle DBA professionally and I really appreciate the efforts
> of the apache community.
> 
> Mark helped me getting subscribed and I am thankful for that but I would
> really appreciate some pointers on how to get started.
> 
> Consider me as a novice and please help me build and upscale myself with the
> community.

Welcome to the Tomcat development community.

First thing to do is to get a copy of the source code. You can use git
or svn. Details here:
http://tomcat.apache.org/svn.html

If you opt for git, I recommend working with the GitHub mirrors.

Once you have the source code, follow the instructions in BUILDING.txt
in the root directory to build a local Tomcat instance from source.

Once you built a local Tomcat instance and confirmed it is working, we
can point you towards some development tasks to get you started.

Any questions, just ask. I'm sure there are places where we could make
the documentation clearer.

Mark


> And, a happy weekend to all.
> 
> Regards
> 
> Kapil Kumar


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

[GitHub] tomcat issue #63: added portOffset attribute to server.xml per BZ-61171

[isapir]

Github user isapir commented on the issue:

https://github.com/apache/tomcat/pull/63
  
Great, I will implement as advised on BZ.


---

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

[Bug 61614] New: The request object has been recycled and is no longer associated with this facade] with root

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61614

Bug ID: 61614
   Summary: The request object has been recycled and is no longer
associated with this facade] with root
   Product: Tomcat 9
   Version: 9.0.0.M6
  Hardware: Other
OS: Solaris
Status: NEW
  Severity: regression
  Priority: P2
 Component: Servlet
  Assignee: dev@tomcat.apache.org
  Reporter: mkrik...@gmail.com
  Target Milestone: -

Hi,

   We are getting the below errors in the tomcat localhost log and this error
started appearing after 3 to 5 days of the restart. If I restart again this
error message not happening for few days. 

org.apache.catalina.core.StandardWrapperValve.invoke Servlet.service() for
servlet [jsp] in context with path [] threw exception
[java.lang.NullPointerException] with root cause

org.apache.catalina.core.StandardWrapperValve.invoke Servlet.service() for
servlet [default] in context with path [] threw exception

org.apache.catalina.core.StandardWrapperValve.invoke Servlet.service() for
servlet [jsp] in context with path [] threw exception
[java.lang.IllegalStateException: The request object has been recycled and is
no longer associated with this facade] with root cause

- Karthick

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 61615] New: Haked mr.B45T4RD

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61615

Bug ID: 61615
   Summary: Haked mr.B45T4RD
   Product: Tomcat Modules
   Version: unspecified
  Hardware: HP
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: jdbc-pool
  Assignee: dev@tomcat.apache.org
  Reporter: azizulhakim...@gmail.com
  Target Milestone: ---

Created attachment 35418
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=35418&action=edit
Deface

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GUMP@vmgump-vm3]: 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.
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-vm3.apache.org/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-vm3.apache.org/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-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-8.4-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/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-junit4.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-8.4-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20171013.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/commons-cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.7-SNAPSHOT.jar:/srv/g
 
ump/public/workspace/apache-commons/logging/target/commons-logging-20171013.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20171013.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-HEAD-jre-SNAPSHOT.jar
-
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/TestELInJsp.java:23: 
Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/TestMethodExpressionImpl.java:30:
 Extra separation in import group before 'org.junit.Before' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/TestValueExpressionImpl.java:34:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/lang/TestELArithmetic.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/lang/TestELSupport.java:29:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/parser/TestELParser.java:28:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/compiler/TestAttributeParser.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/compiler/TestCompiler.java:28:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/compiler/TestGenerator.java:37:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/compiler/TestJspConfig.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/pu

[GUMP@vmgump-vm3]: Project tomcat-tc8.0.x-validate (in module tomcat-8.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-tc8.0.x-validate has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-validate :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.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-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-validate/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-validate.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 27 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-8.4-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/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-junit4.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-8.4-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20171013.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/commons-cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.7-SNAPSHOT.jar:/srv/g
 
ump/public/workspace/apache-commons/logging/target/commons-logging-20171013.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20171013.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-HEAD-jre-SNAPSHOT.jar
-
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/el/TestValueExpressionImpl.java:34:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/el/lang/TestELArithmetic.java:26:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/el/lang/TestELSupport.java:30:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/el/parser/TestELParser.java:28:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestAttributeParser.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestCompiler.java:29:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestGenerator.java:36:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestJspConfig.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestParser.java:25:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java:26:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle]

[GUMP@vmgump-vm3]: Project tomcat-trunk-validate (in module tomcat-trunk) 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-trunk-validate has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-validate :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-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-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 26 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-8.4-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/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-junit4.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-8.4-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20171013.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/commons-cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.7-SNAPSHOT.jar:/srv/g
 
ump/public/workspace/apache-commons/logging/target/commons-logging-20171013.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20171013.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-HEAD-jre-SNAPSHOT.jar
-
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/el/lang/TestELArithmetic.java:26:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/el/lang/TestELSupport.java:30:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/el/parser/TestELParser.java:30:
 Extra separation in import group before 'org.junit.Ignore' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestAttributeParser.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestCompiler.java:29:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestGenerator.java:36:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestJspConfig.java:24:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestParser.java:25:
 Extra separation in import group before 'org.junit.Assert' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java:26:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java:29:
 Extra separation in import group before 'org.junit.Test' [ImportOrder]
[checkstyle] [

[Bug 61615] Haked mr.B45T4RD

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61615

Azizul  changed:

   What|Removed |Added

  Alias||Web

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 61615] Haked mr.B45T4RD

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61615

Azizul  changed:

   What|Removed |Added

 CC||azizulhakim...@gmail.com

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 61615] Haked mr.B45T4RD

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61615

--- Comment #1 from Azizul  ---
Created attachment 35419
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=35419&action=edit
Deface

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 61615] Haked mr.B45T4RD

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61615

Coty Sutherland  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|NEW |RESOLVED

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 61615] Haked mr.B45T4RD

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61615

Azizul  changed:

   What|Removed |Added

  Attachment #35419|0   |1
is obsolete||

--- Comment #2 from Azizul  ---
Created attachment 35420
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=35420&action=edit
Deface

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 61615] Haked mr.B45T4RD

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61615

--- Comment #3 from Azizul  ---
Comment on attachment 35420
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=35420
Deface

>
>
>
>
>   
>
>   
>
>   
>
>   
>
>
>
>   
>
>
>
>   
>
>   
>
>   
>
>   http://www.animateit.net/data/media/june2010/animated_60.gif'); 
> background-repeat: repeat;">
>
>   
>
>   
>
>   
>
>   
>
>   Hacked by MR.B45T4RD
>
>   
>
>   
>
>   
>
>  
> `   
>
>   .@@@ 
> ` 
>
> 
> :@`   
>
>
>   
> :```  
>  
>
>  
> @@,`  
>   
>
>
> +@@@:`@@+@@`  
> 
>
>   
> @@``;@#+@@`   
>  
>
>  
> @,.@@++@@ 
>   
>
>
> `@@@+`,@#+#@; 
> 
>
>   
> `@@##@@@##@::,@#+@@:```   
>  
>
>  
> `@@#@:::;;''++##@@#+@@.```
>   
>
>
> ```##++'''#:@++@@@``` 
> 
>
>  
> `@@@``.,:;'###@+++@@@```  
>   
>
> 
> `;@@```@#++@@@
>
>
>   
> ```#@`,@+@@@`
>   
>
>  
> @;::,,..`@#++;`
>  
>
> 
> `#:'''##@##``
> 
>
>
> ``+@@@:::#..:@@@``
> 
>
>  
> .@@@###@+'''@#```
>
>
> 
> ``@@+##`,@:
>   
>
>
> ```@@+++@``.@@@``
>  
>
>   
> `@@+++@+``,:``
>  
>
>  
> ```@#++@:@#++@@`
> 
>
> 
> `@#+@';'@@@``
> 
>
>
> ```@@#,
>

Re: [Bug 61615] Haked mr.B45T4RD

[Igal @ Lucee.org]

Can anyone ban this idiot from BZ/mailing-lists/etc.?

Igal Sapir
Lucee Core Developer
Lucee.org 

[Bug 60195] No javadoc in Maven Central

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=60195

Тарас  changed:

   What|Removed |Added

 OS|All |Windows XP
   Hardware|PC  |Other
   Priority|P2  |P1

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 61614] The request object has been recycled and is no longer associated with this facade] with root

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61614

Christopher Schultz  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|NEW |RESOLVED

--- Comment #1 from Christopher Schultz  ---
You have a bug in your web application that is causing it to retain a reference
to a request-scoped object (e.g. HttpServletRequest) past the lifetime of the
request.

Please use the users' mailing list to help resolve your issue.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 61614] The request object has been recycled and is no longer associated with this facade] with root

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=61614

--- Comment #2 from Chuck Caldarale  ---
Also, consider moving up to the current version of 9.0.  The one you specified
is almost a year and a half old.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [Bug 61615] Haked mr.B45T4RD

[Mark Thomas]

On 13/10/17 20:44, Igal @ Lucee.org wrote:
> Can anyone ban this idiot from BZ/mailing-lists/etc.?

Account locked in Bugzilla.

The issue containing the failed attempt to deface Bugzilla has been deleted.

I didn't bother adding the address to the ASF block list as they aren't
subscribed to any mailing lists and experience suggests they won't try
posting.

Mark

> 
> Igal Sapir
> Lucee Core Developer
> Lucee.org 
> 
> 


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

svn commit: r1812171 [1/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/ webapps/docs/

[remm]

Author: remm
Date: Sat Oct 14 05:51:02 2017
New Revision: 1812171

URL: http://svn.apache.org/viewvc?rev=1812171&view=rev
Log:
57767: Add support for authentication to the websocket client. Patch submitted 
by J Fernandez.

Added:

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/AuthenticationException.java
  - copied unchanged from r1812150, 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/AuthenticationException.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Authenticator.java
  - copied, changed from r1812150, 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/Authenticator.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/AuthenticatorFactory.java
  - copied, changed from r1812150, 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/AuthenticatorFactory.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/BasicAuthenticator.java
  - copied unchanged from r1812150, 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/BasicAuthenticator.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/DigestAuthenticator.java
  - copied unchanged from r1812150, 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/DigestAuthenticator.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Constants.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 14 05:51:02 2017
@@ -1,3 +1,3 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,17269

svn commit: r1812171 [2/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/ webapps/docs/

[remm]

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1812171&r1=1812170&r2=1812171&view=diff
==
--- 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
 Sat Oct 14 05:51:02 2017
@@ -30,13 +30,22 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.catalina.Context;
+import org.apache.catalina.authenticator.AuthenticatorBase;
 import org.apache.catalina.servlets.DefaultServlet;
 import org.apache.catalina.startup.Tomcat;
+import org.apache.tomcat.util.descriptor.web.LoginConfig;
+import org.apache.tomcat.util.descriptor.web.SecurityCollection;
+import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
 import org.apache.tomcat.websocket.TesterMessageCountClient.BasicText;
 import 
org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEndpoint;
 
 public class TestWebSocketFrameClient extends WebSocketBaseTest {
 
+private static final String USER = "Aladdin";
+private static final String PWD = "open sesame";
+private static final String ROLE = "role";
+private static final String URI_PROTECTED = "/foo";
+
 @Test
 public void testConnectToServerEndpoint() throws Exception {
 Tomcat tomcat = getTomcatInstance();
@@ -92,15 +101,19 @@ public class TestWebSocketFrameClient ex
 
 tomcat.start();
 
-echoTester("");
-echoTester("/");
-echoTester("/foo");
-echoTester("/foo/");
+echoTester("",null);
+echoTester("/",null);
+echoTester("/foo",null);
+echoTester("/foo/",null);
 }
 
-public void echoTester(String path) throws Exception {
+public void echoTester(String path, ClientEndpointConfig 
clientEndpointConfig)
+throws Exception {
 WebSocketContainer wsContainer = 
ContainerProvider.getWebSocketContainer();
-ClientEndpointConfig clientEndpointConfig = 
ClientEndpointConfig.Builder.create().build();
+
+if (clientEndpointConfig == null) {
+clientEndpointConfig = 
ClientEndpointConfig.Builder.create().build();
+}
 Session wsSession = 
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
 clientEndpointConfig, new URI("ws://localhost:" + getPort() + 
path));
 CountDownLatch latch = new CountDownLatch(1);
@@ -119,4 +132,80 @@ public class TestWebSocketFrameClient ex
 wsSession.close();
 }
 
+@Test
+public void testConnectToBasicEndpoint() throws Exception {
+
+Tomcat tomcat = getTomcatInstance();
+Context ctx = tomcat.addContext(URI_PROTECTED, null);
+ctx.addApplicationListener(TesterEchoServer.Config.class.getName());
+Tomcat.addServlet(ctx, "default", new DefaultServlet());
+ctx.addServletMappingDecoded("/", "default");
+
+SecurityCollection collection = new SecurityCollection();
+collection.addPatternDecoded("/");
+String utf8User = "test";
+String utf8Pass = "123£";
+
+tomcat.addUser(utf8User, utf8Pass);
+tomcat.addRole(utf8User, ROLE);
+
+SecurityConstraint sc = new SecurityConstraint();
+sc.addAuthRole(ROLE);
+sc.addCollection(collection);
+ctx.addConstraint(sc);
+
+LoginConfig lc = new LoginConfig();
+lc.setAuthMethod("BASIC");
+ctx.setLoginConfig(lc);
+
+AuthenticatorBase basicAuthenticator = new 
org.apache.catalina.authenticator.BasicAuthenticator();
+ctx.getPipeline().addValve(basicAuthenticator);
+
+tomcat.start();
+
+ClientEndpointConfig clientEndpointConfig = 
ClientEndpointConfig.Builder.create().build();
+
clientEndpointConfig.getUserProperties().put(Constants.WS_AUTHENTICATION_USER_NAME,
 utf8User);
+
clientEndpointConfig.getUserProperties().put(Constants.WS_AUTHENTICATION_PASSWORD,
 utf8Pass);
+
+echoTester(URI_PROTECTED, clientEndpointConfig);
+
+}
+
+@Test
+public void testConnectToDigestEndpoint() throws Exception {
+
+Tomcat tomcat = getTomcatInstance();
+Context ctx = tomcat.addContext(URI_PROTECTED, null);
+ctx.addApplicationListener(TesterEchoServer.Config.class.getName());
+Tomcat.addServlet(ctx, "default", new DefaultServlet());
+ctx.addServletMappingDecoded("/", "default");
+
+SecurityCollection collection = new SecurityCollection();
+collection.addPatternDecoded("/*");
+
+tomcat.addUser(USER, PWD);
+tomcat.addRole(USER, ROLE);
+
+SecurityConstraint sc = new SecurityConstraint();
+sc.addAuthRole(ROLE);
+sc.addCollection(collection);
+ctx.addCo

buildbot failure in on tomcat-7-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1812171
Blamelist: remm

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

svn commit: r1812172 - /tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

[remm]

Author: remm
Date: Sat Oct 14 06:23:35 2017
New Revision: 1812172

URL: http://svn.apache.org/viewvc?rev=1812172&view=rev
Log:
Fix test cases for Tomcat 7 API.

Modified:

tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1812172&r1=1812171&r2=1812172&view=diff
==
--- 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
 Sat Oct 14 06:23:35 2017
@@ -31,11 +31,11 @@ import org.junit.Test;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.authenticator.AuthenticatorBase;
+import org.apache.catalina.deploy.LoginConfig;
+import org.apache.catalina.deploy.SecurityCollection;
+import org.apache.catalina.deploy.SecurityConstraint;
 import org.apache.catalina.servlets.DefaultServlet;
 import org.apache.catalina.startup.Tomcat;
-import org.apache.tomcat.util.descriptor.web.LoginConfig;
-import org.apache.tomcat.util.descriptor.web.SecurityCollection;
-import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
 import org.apache.tomcat.websocket.TesterMessageCountClient.BasicText;
 import 
org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEndpoint;
 
@@ -139,12 +139,12 @@ public class TestWebSocketFrameClient ex
 Context ctx = tomcat.addContext(URI_PROTECTED, null);
 ctx.addApplicationListener(TesterEchoServer.Config.class.getName());
 Tomcat.addServlet(ctx, "default", new DefaultServlet());
-ctx.addServletMappingDecoded("/", "default");
+ctx.addServletMapping("/", "default");
 
 SecurityCollection collection = new SecurityCollection();
-collection.addPatternDecoded("/");
+collection.addPattern("/");
 String utf8User = "test";
-String utf8Pass = "123£";
+String utf8Pass = "123�";
 
 tomcat.addUser(utf8User, utf8Pass);
 tomcat.addRole(utf8User, ROLE);
@@ -178,10 +178,10 @@ public class TestWebSocketFrameClient ex
 Context ctx = tomcat.addContext(URI_PROTECTED, null);
 ctx.addApplicationListener(TesterEchoServer.Config.class.getName());
 Tomcat.addServlet(ctx, "default", new DefaultServlet());
-ctx.addServletMappingDecoded("/", "default");
+ctx.addServletMapping("/", "default");
 
 SecurityCollection collection = new SecurityCollection();
-collection.addPatternDecoded("/*");
+collection.addPattern("/*");
 
 tomcat.addUser(USER, PWD);
 tomcat.addRole(USER, ROLE);



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

[Bug 57767] Websocket client proprietary configuration

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=57767

Remy Maucherat  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

--- Comment #24 from Remy Maucherat  ---
This should make the enhancement "done" as it adds the most important features.

This is included in 9.0.2, 8.5.24, 8.0.48, 7.0.83.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org