Re: Moderators wanted

[Mark Thomas]

On 01/12/2014 16:24, Martin Grigorov wrote:
> Hi,
> 
> On Mon, Dec 1, 2014 at 4:56 PM, Mark Thomas  wrote:
> 
>> Hi,
>>
>> I've been reviewing the moderators for our various lists and if I ignore
>> the no longer active ones we are below the 3 moderators the ASF likes to
>> have on a number of lists.
>>
>> Therefore, can I have some volunteers for the following lists:
>>
>> users@tomcat.a.o- Need two moderators
>> dev@tomct.a.o   - Need one moderator
>> announce@tomcat.a.o - Need one moderator
>> private@tomcat.a.o  - Need one moderator
>> security@tomcat.a.o - Need one moderator
>>
>> You can volunteer for more than one :)
>>
>> There is typically less than one message a week that requires moderator
>> input (security@ is a little higher) which is usually explaining to
>> folks how to unsubscribe themselves or doing it for them if they are
>> unable to.
>>
>> Note all of our public lists automatically reject mails from
>> unsubscribed users so there is no moderator traffic from that source.
>>
>>
> 
>> Generally, you need to be a committer to moderate a list.
>> To moderate the private and security list you need to be a PMC member.
>>
> 
> As an ASF Member I already have access to those lists. I'd volunteer for
> private@ and security@ if this is OK with you.

Martin,

Sorry I dropped the ball on this. Is this still something you are
willing to take on?

Mark


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

[Bug 58489] QueryStatsComparator throws IllegalArgumentException: Comparison method violates its general contract!

[bugzilla]

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

--- Comment #4 from Felix Schumacher  ---
I have ported the fix back to tomcat 7 as well. It will be in tomcat 7.0.66.

And again it would be nice, if you could test the current trunk of tomcat 7.

-- 
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: r1708773 - in /tomcat/site/trunk: ./ docs/tomcat-8.0-doc/ docs/tomcat-8.0-doc/api/ docs/tomcat-8.0-doc/api/org/apache/catalina/ docs/tomcat-8.0-doc/api/org/apache/catalina/ant/ docs/tomcat

[markt]

Author: markt
Date: Thu Oct 15 10:16:55 2015
New Revision: 1708773

URL: http://svn.apache.org/viewvc?rev=1708773=rev
Log:
Update docs for 8.0.28 release.


[This commit notification would consist of 58 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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

Re: Moderators wanted

[Martin Grigorov]

Hi Mark,

On Thu, Oct 15, 2015 at 12:24 PM, Mark Thomas  wrote:

> On 01/12/2014 16:24, Martin Grigorov wrote:
> > Hi,
> >
> > On Mon, Dec 1, 2014 at 4:56 PM, Mark Thomas  wrote:
> >
> >> Hi,
> >>
> >> I've been reviewing the moderators for our various lists and if I ignore
> >> the no longer active ones we are below the 3 moderators the ASF likes to
> >> have on a number of lists.
> >>
> >> Therefore, can I have some volunteers for the following lists:
> >>
> >> users@tomcat.a.o- Need two moderators
> >> dev@tomct.a.o   - Need one moderator
> >> announce@tomcat.a.o - Need one moderator
> >> private@tomcat.a.o  - Need one moderator
> >> security@tomcat.a.o - Need one moderator
> >>
> >> You can volunteer for more than one :)
> >>
> >> There is typically less than one message a week that requires moderator
> >> input (security@ is a little higher) which is usually explaining to
> >> folks how to unsubscribe themselves or doing it for them if they are
> >> unable to.
> >>
> >> Note all of our public lists automatically reject mails from
> >> unsubscribed users so there is no moderator traffic from that source.
> >>
> >>
> >
> >> Generally, you need to be a committer to moderate a list.
> >> To moderate the private and security list you need to be a PMC member.
> >>
> >
> > As an ASF Member I already have access to those lists. I'd volunteer for
> > private@ and security@ if this is OK with you.
>
> Martin,
>
> Sorry I dropped the ball on this. Is this still something you are
> willing to take on?
>

Sure!


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

svn commit: r1708780 - in /tomcat/tc7.0.x/trunk: ./ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/

[fschumacher]

Author: fschumacher
Date: Thu Oct 15 10:40:25 2015
New Revision: 1708780

URL: http://svn.apache.org/viewvc?rev=1708780=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58489

Comparator should follow the rules. If first object has lastInvocation of zero,
we should compare it to the second objects lastInvocation and vice versa.
When we do that, we can use Long#compare just as well.

Merge r1708779 from /tomcat/tc8.0.x/trunk (Merged r1708687 and r1708745 from 
/tomcat/trunk)

Added:

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
  - copied unchanged from r1708779, 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 15 10:40:25 2015
@@ -1,2 +1,2 @@
-/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,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,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,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,1702739,1702742,1702744,1702
 
748,1702751,1702754,1702758,1702760,1702763,1702766,1703949,1704253,1704291,1704321-1704322,1704325,1704486,1704574,1704687,1707053
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 

svn commit: r1708786 - in /tomcat/trunk: java/javax/servlet/http/PushBuilder.java java/org/apache/catalina/core/ApplicationPushBuilder.java webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java

[markt]

Author: markt
Date: Thu Oct 15 10:55:01 2015
New Revision: 1708786

URL: http://svn.apache.org/viewvc?rev=1708786=rev
Log:
Servlet 4.0
Re-order methods in PushBuilder interface to make javap checks between spec API 
definition and Tomcat's API definition easier.
Correct method name setPath() -> path()

Modified:
tomcat/trunk/java/javax/servlet/http/PushBuilder.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java

Modified: tomcat/trunk/java/javax/servlet/http/PushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/PushBuilder.java?rev=1708786=1708785=1708786=diff
==
--- tomcat/trunk/java/javax/servlet/http/PushBuilder.java (original)
+++ tomcat/trunk/java/javax/servlet/http/PushBuilder.java Thu Oct 15 10:55:01 
2015
@@ -25,7 +25,7 @@ import java.util.Set;
  * 
  * The request method is set to GET
  * The path will not be set. This must be set explicitly via a call to
- * {@link #setPath(String)}
+ * {@link #path(String)}
  * 
  *
  * @since Servlet 4.0
@@ -42,6 +42,36 @@ public interface PushBuilder {
 PushBuilder method(String method);
 
 /**
+ * Sets a HTTP header on the request. Any existing headers of the same name
+ * are first remove.
+ *
+ * @param name  The name of the header to set
+ * @param value The value of the header to set
+ *
+ * @return This builder instance
+ */
+PushBuilder setHeader(String name, String value);
+
+/**
+ * Adds a HTTP header to the request.
+ *
+ * @param name  The name of the header to add
+ * @param value The value of the header to add
+ *
+ * @return This builder instance
+ */
+PushBuilder addHeader(String name, String value);
+
+/**
+ * Removes an HTTP header from the request.
+ *
+ * @param name  The name of the header to remove
+ *
+ * @return This builder instance
+ */
+PushBuilder removeHeader(String name);
+
+/**
  * Sets the URI path to be used for the push request. This must be called
  * before every call to {@link #push()}. If the path includes a query
  * string, the query string will be appended to the existing query string
@@ -54,7 +84,7 @@ public interface PushBuilder {
  *
  * @return This builder instance
  */
-PushBuilder setPath(String path);
+PushBuilder path(String path);
 
 /**
  * Generates the push request. After calling this method the following
@@ -80,36 +110,6 @@ public interface PushBuilder {
 String getMethod();
 
 /**
- * Adds a HTTP header to the request.
- *
- * @param name  The name of the header to add
- * @param value The value of the header to add
- *
- * @return This builder instance
- */
-PushBuilder addHeader(String name, String value);
-
-/**
- * Sets a HTTP header on the request. Any existing headers of the same name
- * are first remove.
- *
- * @param name  The name of the header to set
- * @param value The value of the header to set
- *
- * @return This builder instance
- */
-PushBuilder setHeader(String name, String value);
-
-/**
- * Removes an HTTP header from the request.
- *
- * @param name  The name of the header to remove
- *
- * @return This builder instance
- */
-PushBuilder removeHeader(String name);
-
-/**
  * @return The current set of names of HTTP headers to be used the next 
time
  * {@code push()} is called.
  */

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java?rev=1708786=1708785=1708786=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java Thu 
Oct 15 10:55:01 2015
@@ -75,7 +75,7 @@ public class ApplicationPushBuilder impl
 
 
 @Override
-public PushBuilder setPath(String path) {
+public PushBuilder path(String path) {
 if (path.startsWith("/")) {
 this.path = path;
 } else {

Modified: 
tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java?rev=1708786=1708785=1708786=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java 
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java 
Thu Oct 15 10:55:01 2015
@@ -33,7 +33,7 @@ public class SimpleImagePush extends Htt
 protected 

buildbot failure in ASF Buildbot on tomcat-8-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1708782
Blamelist: fschumacher

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

[ANN] Apache Tomcat 8.0.28 available

[Mark Thomas]

The Apache Tomcat team announces the immediate availability of Apache
Tomcat 8.0.28.

Apache Tomcat 8 is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Unified Expression Language and Java
WebSocket technologies.

Apache Tomcat 8.0.28 includes fixes for issues identified in 8.0.27 as
well as other enhancements and changes. The notable changes since 8.0.27
include:

- Allow file based configuration resources (e.g. key stores) to be
  configured using URLs.

- Restore code signing to the Windows installer and uninstaller.


Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-8.0-doc/changelog.html

Downloads:
http://tomcat.apache.org/download-80.cgi

Migration guides from Apache Tomcat 5.5.x, 6.0.x and 7.0.x:
http://tomcat.apache.org/migration.html

Enjoy!

- The Apache Tomcat team

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

svn commit: r1708781 - /tomcat/trunk/java/javax/servlet/GenericFilter.java

[markt]

Author: markt
Date: Thu Oct 15 10:44:18 2015
New Revision: 1708781

URL: http://svn.apache.org/viewvc?rev=1708781=rev
Log:
Align with changes in Servlet 4.0 b02

Modified:
tomcat/trunk/java/javax/servlet/GenericFilter.java

Modified: tomcat/trunk/java/javax/servlet/GenericFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/GenericFilter.java?rev=1708781=1708780=1708781=diff
==
--- tomcat/trunk/java/javax/servlet/GenericFilter.java (original)
+++ tomcat/trunk/java/javax/servlet/GenericFilter.java Thu Oct 15 10:44:18 2015
@@ -16,7 +16,6 @@
  */
 package javax.servlet;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.util.Enumeration;
 
@@ -27,17 +26,6 @@ public abstract class GenericFilter impl
 private volatile FilterConfig filterConfig;
 
 
-/**
- * {@inheritDoc}
- *
- * Default NO-OP implementation.
- */
-@Override
-public void destroy() {
-// NO-OP
-}
-
-
 @Override
 public String getInitParameter(String name) {
 return getFilterConfig().getInitParameter(name);
@@ -87,11 +75,6 @@ public abstract class GenericFilter impl
 
 
 @Override
-public abstract void doFilter(ServletRequest request, ServletResponse 
response,
-FilterChain chain) throws IOException, ServletException;
-
-
-@Override
 public String getFilterName() {
 return getFilterConfig().getFilterName();
 }



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

svn commit: r1708784 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml

[fschumacher]

Author: fschumacher
Date: Thu Oct 15 10:51:29 2015
New Revision: 1708784

URL: http://svn.apache.org/viewvc?rev=1708784=rev
Log:
Add changelog entry for fix for 58489 (QueryStatsComparator)

Merge r1708782 from /tomcat/tc8.0.x/trunk

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 15 10:51:29 2015
@@ -1,2 +1,2 @@
-/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,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,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,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,1702739,1702742,1702744,1702
 748,1702751,1702754,1702758,1702760,1702763,1702766,1708779
+/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,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,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,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,1702739,1702742,1702744,1702
 748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782
 

svn commit: r1708785 - in /tomcat/trunk/java: javax/servlet/http/PushBuilder.java org/apache/catalina/core/ApplicationPushBuilder.java

[markt]

Author: markt
Date: Thu Oct 15 10:51:55 2015
New Revision: 1708785

URL: http://svn.apache.org/viewvc?rev=1708785=rev
Log:
Servlet 4.0
Add the ability to get/set the HTTP method to the PushBuilder

Modified:
tomcat/trunk/java/javax/servlet/http/PushBuilder.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java

Modified: tomcat/trunk/java/javax/servlet/http/PushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/PushBuilder.java?rev=1708785=1708784=1708785=diff
==
--- tomcat/trunk/java/javax/servlet/http/PushBuilder.java (original)
+++ tomcat/trunk/java/javax/servlet/http/PushBuilder.java Thu Oct 15 10:51:55 
2015
@@ -33,6 +33,15 @@ import java.util.Set;
 public interface PushBuilder {
 
 /**
+ * Specify the HTTP method to use for the push request.
+ *
+ * @param method The method to use for the push request
+ *
+ * @return This builder instance
+ */
+PushBuilder method(String method);
+
+/**
  * Sets the URI path to be used for the push request. This must be called
  * before every call to {@link #push()}. If the path includes a query
  * string, the query string will be appended to the existing query string
@@ -63,6 +72,14 @@ public interface PushBuilder {
 void push();
 
 /**
+ * Obtain the name of the HTTP method that will be used for push requests
+ * generated by future calls to {@code push()}.
+ *
+ * @return The HTTP method to be used for future push requests
+ */
+String getMethod();
+
+/**
  * Adds a HTTP header to the request.
  *
  * @param name  The name of the header to add

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java?rev=1708785=1708784=1708785=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java Thu 
Oct 15 10:51:55 2015
@@ -40,6 +40,7 @@ public class ApplicationPushBuilder impl
 private final HttpServletRequest baseRequest;
 private final org.apache.coyote.Request coyoteRequest;
 
+private String method = "GET";
 private String path;
 private Map headers = new CaseInsensitiveKeyMap<>();
 
@@ -91,6 +92,19 @@ public class ApplicationPushBuilder impl
 
 
 @Override
+public PushBuilder method(String method) {
+this.method = method;
+return this;
+}
+
+
+@Override
+public String getMethod() {
+return method;
+}
+
+
+@Override
 public PushBuilder addHeader(String name, String value) {
 List values = headers.get(name);
 if (values == null) {
@@ -151,7 +165,7 @@ public class ApplicationPushBuilder impl
 
 org.apache.coyote.Request pushTarget = new org.apache.coyote.Request();
 
-pushTarget.method().setString("GET");
+pushTarget.method().setString(method);
 // The next three are implied by the Javadoc getPath()
 pushTarget.serverName().setString(baseRequest.getServerName());
 pushTarget.setServerPort(baseRequest.getServerPort());



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

[Bug 58489] QueryStatsComparator throws IllegalArgumentException: Comparison method violates its general contract!

[bugzilla]

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

--- Comment #3 from Remy Tiitre  ---
I forgot to mention that it affects the Tomcat 7 as well. (Thats where I have
this issue right now). I think the bug was introduced with 7.0.63 release.

-- 
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: Moderators wanted

[Felix Schumacher]

Am 15.10.2015 um 11:56 schrieb Mark Thomas:

On 01/12/2014 19:27, Felix Schumacher wrote:


Am 1. Dezember 2014 16:56:17 MEZ, schrieb Mark Thomas :

Hi,

I've been reviewing the moderators for our various lists and if I
ignore
the no longer active ones we are below the 3 moderators the ASF likes
to
have on a number of lists.

Therefore, can I have some volunteers for the following lists:

users@tomcat.a.o- Need two moderators
dev@tomct.a.o   - Need one moderator
announce@tomcat.a.o - Need one moderator
private@tomcat.a.o  - Need one moderator
security@tomcat.a.o - Need one moderator

You can volunteer for more than one :)

I would be willing to moderate users and/ or dev.

Felix,

I dropped the ball on this. Are you still willing to moderate these? If
so, I'll get you set up.

Yes. I will try to do my best.

Felix


Mark



Regards
Felix


There is typically less than one message a week that requires moderator
input (security@ is a little higher) which is usually explaining to
folks how to unsubscribe themselves or doing it for them if they are
unable to.

Note all of our public lists automatically reject mails from
unsubscribed users so there is no moderator traffic from that source.

Generally, you need to be a committer to moderate a list.
To moderate the private and security list you need to be a PMC member.

Cheers,

Mark

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


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



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




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

svn commit: r1708799 - in /tomcat/trunk/java: javax/servlet/http/PushBuilder.java org/apache/catalina/core/ApplicationPushBuilder.java

[markt]

Author: markt
Date: Thu Oct 15 11:32:50 2015
New Revision: 1708799

URL: http://svn.apache.org/viewvc?rev=1708799=rev
Log:
Servlet 4.0
Complete PushBuilder interface
Still need to complete the push() implementation

Modified:
tomcat/trunk/java/javax/servlet/http/PushBuilder.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java

Modified: tomcat/trunk/java/javax/servlet/http/PushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/PushBuilder.java?rev=1708799=1708798=1708799=diff
==
--- tomcat/trunk/java/javax/servlet/http/PushBuilder.java (original)
+++ tomcat/trunk/java/javax/servlet/http/PushBuilder.java Thu Oct 15 11:32:50 
2015
@@ -42,6 +42,45 @@ public interface PushBuilder {
 PushBuilder method(String method);
 
 /**
+ * Specifies the query string to use in subsequent push requests generated
+ * by a call to {@link #push()}. This will be appended to any query string
+ * specified in the call to {@link #path(String)}.
+ *
+ * @param queryString The query string to use to generate push requests
+ *
+ * @return This builder instance
+ */
+PushBuilder queryString(String queryString);
+
+/**
+ * Specifies the session ID to use in subsequent push requests generated
+ * by a call to {@link #push()}. The session ID will be presented the same
+ * way as it is on the original request (cookie or URL parameter). The
+ * default is determined in the following order:
+ * 
+ * the requested session ID for the originating request
+ * the session ID generated in the originated request
+ * {@code null}
+ * 
+ *
+ * @param sessionId The session ID to use to generate push requests
+ *
+ * @return This builder instance
+ */
+PushBuilder sessionId(String sessionId);
+
+/**
+ * Sets if the request will be conditional. If {@code true} the values from
+ * {@link #getEtag()} and {@link #getLastModified()} will be used to
+ * construct appropriate headers.
+ *
+ * @param conditional Should generated push requests be conditional
+ *
+ * @return This builder instance
+ */
+PushBuilder conditional(boolean conditional);
+
+/**
  * Sets a HTTP header on the request. Any existing headers of the same name
  * are first remove.
  *
@@ -87,6 +126,28 @@ public interface PushBuilder {
 PushBuilder path(String path);
 
 /**
+ * Sets the etag to be used for conditional push requests. This will be
+ * set to {@code null} after a call to {@link #push()} so it must be
+ * explicitly set for every push request that requires it.
+ *
+ * @param etag The etag use for the push request
+ *
+ * @return This builder instance
+ */
+PushBuilder etag(String etag);
+
+/**
+ * Sets the last modified to be used for conditional push requests. This
+ * will be set to {@code null} after a call to {@link #push()} so it must 
be
+ * explicitly set for every push request that requires it.
+ *
+ * @param lastModified The last modified value to use for the push request
+ *
+ * @return This builder instance
+ */
+PushBuilder lastModified(String lastModified);
+
+/**
  * Generates the push request. After calling this method the following
  * fields are set to {@code null}:
  * 
@@ -110,6 +171,30 @@ public interface PushBuilder {
 String getMethod();
 
 /**
+ * Obtain the query string that will be used for push requests generated by
+ * future calls to {@code push()}.
+ *
+ * @return The query string that will be appended to push requests.
+ */
+String getQueryString();
+
+/**
+ * Obtain the session ID that will be used for push requests generated by
+ * future calls to {@code push()}.
+ *
+ * @return The session that will be used for push requests.
+ */
+String getSessionId();
+
+/**
+ * Will push requests generated by future calls to {@code push()} be
+ * conditional.
+ *
+ * @return {@code true} if push requests will be conditional
+ */
+boolean isConditional();
+
+/**
  * @return The current set of names of HTTP headers to be used the next 
time
  * {@code push()} is called.
  */
@@ -126,4 +211,29 @@ public interface PushBuilder {
  * then any may be returned
  */
 String getHeader(String name);
+
+/**
+ * Obtain the path that will be used for the push request that will be
+ * generated by the next call to {@code push()}.
+ *
+ * @return The path value that will be associated with the next push 
request
+ */
+String getPath();
+
+/**
+ * Obtain the etag that will be used for the push request that will be
+ * generated by the next call to {@code push()}.
+ *
+ * @return The etag value that 

svn commit: r1708806 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

[fschumacher]

Author: fschumacher
Date: Thu Oct 15 12:05:58 2015
New Revision: 1708806

URL: http://svn.apache.org/viewvc?rev=1708806=rev
Log:
Add missing / to end tag

Modified:
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1708806=1708805=1708806=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Oct 15 12:05:58 2015
@@ -52,7 +52,7 @@
 general contract for Comparator. (fschumacher)
   
 
-  
+  
 
 
   



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

svn commit: r10822 - /release/tomcat/tomcat-8/v8.0.27/

[markt]

Author: markt
Date: Thu Oct 15 10:32:50 2015
New Revision: 10822

Log:
Remove the 8.0.27 files from the mirrors

Removed:
release/tomcat/tomcat-8/v8.0.27/


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

svn commit: r1708779 - in /tomcat/tc8.0.x/trunk: ./ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/

[fschumacher]

Author: fschumacher
Date: Thu Oct 15 10:37:58 2015
New Revision: 1708779

URL: http://svn.apache.org/viewvc?rev=1708779=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58489

Comparator should follow the rules. If first object has lastInvocation of zero,
we should compare it to the second objects lastInvocation and vice versa.
When we do that, we can use Long#compare just as well.

Merge r1708687 and r1708745 from /tomcat/trunk

Added:

tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
  - copied, changed from r1708687, 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 15 10:37:58 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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-1666387,1666494,1666496,1666552,1666569,1666579,1
 

svn commit: r1708782 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

[fschumacher]

Author: fschumacher
Date: Thu Oct 15 10:48:35 2015
New Revision: 1708782

URL: http://svn.apache.org/viewvc?rev=1708782=rev
Log:
Add changelog entry for fix for 58489 (QueryStatsComparator)

Modified:
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1708782=1708781=1708782=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Oct 15 10:48:35 2015
@@ -45,6 +45,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+58489: Correct QueryStatsComparator to hold up the
+general contract for Comparator. (fschumacher)
+  
+
+  
 
 
   



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

buildbot failure in ASF Buildbot on tomcat-7-trunk

[buildbot]

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

Buildbot URL: http://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] 1708784
Blamelist: fschumacher

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

[Bug 58489] QueryStatsComparator throws IllegalArgumentException: Comparison method violates its general contract!

[bugzilla]

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

Felix Schumacher  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #2 from Felix Schumacher  ---
Thanks for the report.

Will be fixed with 8.0.29. Maybe you could give the trunk of tomcat 8 a try?

-- 
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: r1708807 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml

[fschumacher]

Author: fschumacher
Date: Thu Oct 15 12:07:33 2015
New Revision: 1708807

URL: http://svn.apache.org/viewvc?rev=1708807=rev
Log:
Add missing / to end tag

Merge r1708806 from /tomcat/tc8.0.x/trunk

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 15 12:07:33 2015
@@ -1,2 +1,2 @@
-/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,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,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,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,1702739,1702742,1702744,1702
 748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782
+/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,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,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,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,1702739,1702742,1702744,1702
 748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806
 

[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (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-test-nio2 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-test-nio2 :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 40 mins 12 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 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151015-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151015.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151015-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl
 -master/dest-20151015/bin/openssl -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/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/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat

svn commit: r1708746 - in /tomcat/trunk: java/org/apache/tomcat/util/collections/ java/org/apache/tomcat/websocket/ java/org/apache/tomcat/websocket/server/ test/org/apache/catalina/startup/ test/org/

[markt]

Author: markt
Date: Thu Oct 15 09:26:08 2015
New Revision: 1708746

URL: http://svn.apache.org/viewvc?rev=1708746=rev
Log:
Move CaseInsensitiveKeyMap to o.a.t.util.collections so it is available outside 
of the WebSocket implementation (I want to re-use it in HTTP/2's PushBuilder)

Added:

tomcat/trunk/java/org/apache/tomcat/util/collections/CaseInsensitiveKeyMap.java
  - copied, changed from r1708580, 
tomcat/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java
Removed:
tomcat/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsHandshakeResponse.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestCaseInsensitiveKeyMap.java

Copied: 
tomcat/trunk/java/org/apache/tomcat/util/collections/CaseInsensitiveKeyMap.java 
(from r1708580, 
tomcat/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java)
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/collections/CaseInsensitiveKeyMap.java?p2=tomcat/trunk/java/org/apache/tomcat/util/collections/CaseInsensitiveKeyMap.java=tomcat/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java=1708580=1708746=1708746=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/collections/CaseInsensitiveKeyMap.java 
Thu Oct 15 09:26:08 2015
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tomcat.websocket;
+package org.apache.tomcat.util.collections;
 
 import java.util.AbstractMap;
 import java.util.AbstractSet;

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsHandshakeResponse.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsHandshakeResponse.java?rev=1708746=1708745=1708746=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsHandshakeResponse.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsHandshakeResponse.java Thu 
Oct 15 09:26:08 2015
@@ -23,6 +23,8 @@ import java.util.Map.Entry;
 
 import javax.websocket.HandshakeResponse;
 
+import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
+
 /**
  * Represents the response to a WebSocket handshake.
  */

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=1708746=1708745=1708746=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Thu 
Oct 15 09:26:08 2015
@@ -65,6 +65,7 @@ import javax.websocket.WebSocketContaine
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.codec.binary.Base64;
+import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
 import org.apache.tomcat.util.res.StringManager;
 import org.apache.tomcat.websocket.pojo.PojoEndpointClient;
 

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java?rev=1708746=1708745=1708746=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java 
Thu Oct 15 09:26:08 2015
@@ -30,7 +30,7 @@ import java.util.Map.Entry;
 import javax.servlet.http.HttpServletRequest;
 import javax.websocket.server.HandshakeRequest;
 
-import org.apache.tomcat.websocket.CaseInsensitiveKeyMap;
+import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
 
 /**
  * Represents the request that this session was opened under.

Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1708746=1708745=1708746=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Thu Oct 
15 09:26:08 2015
@@ -65,7 +65,7 @@ import org.apache.catalina.valves.Access
 import 

svn commit: r1708745 - /tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java

[fschumacher]

Author: fschumacher
Date: Thu Oct 15 09:24:56 2015
New Revision: 1708745

URL: http://svn.apache.org/viewvc?rev=1708745=rev
Log:
Change order of import statements and add license header.

Modified:

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java?rev=1708745=1708744=1708745=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
 Thu Oct 15 09:24:56 2015
@@ -1,3 +1,20 @@
+/*
+ *  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.jdbc.test;
 
 import java.lang.reflect.Constructor;
@@ -7,10 +24,11 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport.QueryStats;
 import org.junit.Assert;
 import org.junit.Test;
 
+import org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport.QueryStats;
+
 public class TestSlowQueryComparator {
 
 @Test



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

svn commit: r1708744 - /tomcat/trunk/build.xml

[markt]

Author: markt
Date: Thu Oct 15 09:24:24 2015
New Revision: 1708744

URL: http://svn.apache.org/viewvc?rev=1708744=rev
Log:
Move o.a.tomcat.util.collections from tomcat-coyote.jar to tomcat-util.jar.
This should not break anything since tomcat-coyote.jar already has a dependency 
on tomcat-util.jar

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1708744=1708743=1708744=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Oct 15 09:24:24 2015
@@ -356,6 +356,7 @@
   
 
 
+
 
 
 
@@ -363,7 +364,6 @@
 
 
 
-
 
 
 
@@ -416,7 +416,6 @@
 
 
 
-
 
 
 



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

Re: Moderators wanted

[Mark Thomas]

On 01/12/2014 19:27, Felix Schumacher wrote:
> 
> 
> Am 1. Dezember 2014 16:56:17 MEZ, schrieb Mark Thomas :
>> Hi,
>>
>> I've been reviewing the moderators for our various lists and if I
>> ignore
>> the no longer active ones we are below the 3 moderators the ASF likes
>> to
>> have on a number of lists.
>>
>> Therefore, can I have some volunteers for the following lists:
>>
>> users@tomcat.a.o- Need two moderators
>> dev@tomct.a.o   - Need one moderator
>> announce@tomcat.a.o - Need one moderator
>> private@tomcat.a.o  - Need one moderator
>> security@tomcat.a.o - Need one moderator
>>
>> You can volunteer for more than one :)
> 
> I would be willing to moderate users and/ or dev. 

Felix,

I dropped the ball on this. Are you still willing to moderate these? If
so, I'll get you set up.

Mark


> 
> Regards
> Felix 
> 
>>
>> There is typically less than one message a week that requires moderator
>> input (security@ is a little higher) which is usually explaining to
>> folks how to unsubscribe themselves or doing it for them if they are
>> unable to.
>>
>> Note all of our public lists automatically reject mails from
>> unsubscribed users so there is no moderator traffic from that source.
>>
>> Generally, you need to be a committer to moderate a list.
>> To moderate the private and security list you need to be a PMC member.
>>
>> Cheers,
>>
>> Mark
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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

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


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build timed out
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 1 hour 1 sec
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 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151015-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20151015/lib 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151015.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151015-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -
 Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20151015/bin/openssl
 -Dexecute.test.apr=true -Dtest.excludePerformance=true 
-Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/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/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace

svn commit: r1708756 - in /tomcat/site/trunk: docs/ xdocs/

[markt]

Author: markt
Date: Thu Oct 15 09:46:44 2015
New Revision: 1708756

URL: http://svn.apache.org/viewvc?rev=1708756=rev
Log:
Update for 8.0.28 release excluding docs

Modified:
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-80.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-8.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-80.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-8.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1708756=1708755=1708756=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Thu Oct 15 09:46:44 2015
@@ -60,8 +60,8 @@
 
   
 Latest Stable 8.0.x Release
-2015-10-01
-8.0.27
+2015-10-12
+8.0.28
   
 
 

Modified: tomcat/site/trunk/docs/download-80.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1708756=1708755=1708756=diff
==
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Thu Oct 15 09:46:44 2015
@@ -206,7 +206,7 @@
 Quick Navigation
 
 
-[define v]8.0.27[end]
+[define v]8.0.28[end]
 https://www.apache.org/dist/tomcat/tomcat-8/KEYS;>KEYS |
 [v] |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1708756=1708755=1708756=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Thu Oct 15 09:46:44 2015
@@ -228,32 +228,29 @@ project logo are trademarks of the Apach
 
 
 
-
-2015-10-01 Tomcat 8.0.27 Released
+
+2015-10-12 Tomcat 8.0.28 Released
 
 
 
-The Apache Tomcat Project is proud to announce the release of version 8.0.27
-of Apache Tomcat. Apache Tomcat 8.0.27 includes a numerous fixes for issues
-identified in 8.0.26 as well as a number of other enhancements and changes. The
-notable changes since 8.0.26 include:
+The Apache Tomcat Project is proud to announce the release of version 8.0.28
+of Apache Tomcat. Apache Tomcat 8.0.28 includes fixes for issues identified in
+8.0.27 as well as other enhancements and changes. The notable changes since
+8.0.27 include:
 
 
 
-Correctly handle \${ vs \$ escaping in JSP and EL
+Allow file based configuration resources (e.g. key stores) to be configured
+using URLs.
 
-Fix for issues with NIO + SSL + sendfile
-
-Various TLD parsing fixes
-
-Fix multiple (mostly rare and/or zero impact) concurrency issues
+Restore code signing to the Windows installer and uninstaller.
 
 
 
 
 
 Full details of these changes, and all the other changes, are available in the
-Tomcat 8
+Tomcat 8
 changelog.
 
 

Modified: tomcat/site/trunk/docs/migration-8.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-8.html?rev=1708756=1708755=1708756=diff
==
--- tomcat/site/trunk/docs/migration-8.html (original)
+++ tomcat/site/trunk/docs/migration-8.html Thu Oct 15 09:46:44 2015
@@ -689,7 +689,8 @@ of Apache Tomcat.
   "8.0.23":"1680308",
   "8.0.24":"1688727",
   "8.0.26":"1696400",
-  "8.0.27":"1704937"
+  "8.0.27":"1704937",
+  "8.0.28":"1707356"
 };
 
 formSubmit.action = 
"http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/; +
@@ -740,8 +741,9 @@ of Apache Tomcat.
 8.0.22
 8.0.23
 8.0.24
-8.0.26
-8.0.27
+8.0.26
+8.0.27
+8.0.28
 , new version:
 
 8.0.0-RC1
@@ -765,7 +767,8 @@ of Apache Tomcat.
 8.0.23
 8.0.24
 8.0.26
-8.0.27
+8.0.27
+8.0.28
 trunk (unreleased)
 
 

Modified: tomcat/site/trunk/docs/oldnews.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1708756=1708755=1708756=diff
==
--- tomcat/site/trunk/docs/oldnews.html (original)
+++ tomcat/site/trunk/docs/oldnews.html Thu Oct 15 09:46:44 2015
@@ -225,6 +225,43 @@
 
 
 
+
+2015-10-01 Tomcat 8.0.27 Released
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 8.0.27
+of Apache Tomcat. Apache Tomcat 8.0.27 includes a numerous fixes for issues
+identified in 8.0.26 as well as a number of other enhancements and changes. The
+notable changes since 8.0.26 include:
+
+
+
+Correctly handle \${ vs \$ escaping in JSP and 

svn commit: r1708747 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java

[markt]

Author: markt
Date: Thu Oct 15 09:27:08 2015
New Revision: 1708747

URL: http://svn.apache.org/viewvc?rev=1708747=rev
Log:
Make PushBuilder's handling of HTTP headers case insensitive

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java?rev=1708747=1708746=1708747=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java Thu 
Oct 15 09:27:08 2015
@@ -19,7 +19,6 @@ package org.apache.catalina.core;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -31,6 +30,7 @@ import javax.servlet.http.PushBuilder;
 
 import org.apache.catalina.connector.Request;
 import org.apache.coyote.ActionCode;
+import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
 import org.apache.tomcat.util.res.StringManager;
 
 public class ApplicationPushBuilder implements PushBuilder {
@@ -41,7 +41,7 @@ public class ApplicationPushBuilder impl
 private final org.apache.coyote.Request coyoteRequest;
 
 private String path;
-private Map headers = new HashMap<>();
+private Map headers = new CaseInsensitiveKeyMap<>();
 
 public ApplicationPushBuilder(HttpServletRequest request) {
 baseRequest = request;



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

svn commit: r1708822 - in /tomcat/trunk/java: javax/servlet/http/PushBuilder.java org/apache/catalina/core/ApplicationPushBuilder.java

[markt]

Author: markt
Date: Thu Oct 15 13:57:10 2015
New Revision: 1708822

URL: http://svn.apache.org/viewvc?rev=1708822=rev
Log:
Servlet 4.0
Progress the PushBuilder implementation (not yet complete)
Filter headers from baseRequest and copy them to the push request
Collect necessary session info from base request
Handle query string
Add basic outline for session and conditional handling
Add placeholder for %nn decoding of provided path

Modified:
tomcat/trunk/java/javax/servlet/http/PushBuilder.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java

Modified: tomcat/trunk/java/javax/servlet/http/PushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/PushBuilder.java?rev=1708822=1708821=1708822=diff
==
--- tomcat/trunk/java/javax/servlet/http/PushBuilder.java (original)
+++ tomcat/trunk/java/javax/servlet/http/PushBuilder.java Thu Oct 15 13:57:10 
2015
@@ -23,9 +23,11 @@ import java.util.Set;
  * builder was obtained. The push request will be constructed on the following
  * basis:
  * 
- * The request method is set to GET
+ * The request method is set to GET.
  * The path will not be set. This must be set explicitly via a call to
- * {@link #path(String)}
+ * {@link #path(String)}.
+ * Conditional, range, expectation, authorization and referer headers will
+ * be removed.
  * 
  *
  * @since Servlet 4.0

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java?rev=1708822=1708821=1708822=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java Thu 
Oct 15 13:57:10 2015
@@ -16,6 +16,8 @@
  */
 package org.apache.catalina.core;
 
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -25,11 +27,14 @@ import java.util.Set;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletRequestWrapper;
+import javax.servlet.SessionTrackingMode;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import javax.servlet.http.PushBuilder;
 
 import org.apache.catalina.connector.Request;
 import org.apache.coyote.ActionCode;
+import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
 import org.apache.tomcat.util.res.StringManager;
 
@@ -47,6 +52,8 @@ public class ApplicationPushBuilder impl
 private String lastModified;
 private String queryString;
 private String sessionId;
+private boolean addSessionCookie;
+private boolean addSessionPathParameter;
 private boolean conditional;
 
 public ApplicationPushBuilder(HttpServletRequest request) {
@@ -64,8 +71,6 @@ public class ApplicationPushBuilder impl
 }
 
 // Populate the initial list of HTTP headers
-// TODO Servlet 4.0
-//  Filter headers as required by Servlet spec
 Enumeration headerNames = request.getHeaderNames();
 while (headerNames.hasMoreElements()) {
 String headerName = headerNames.nextElement();
@@ -76,6 +81,33 @@ public class ApplicationPushBuilder impl
 values.add(headerValues.nextElement());
 }
 }
+
+// Remove the headers
+headers.remove("if-match");
+headers.remove("if-none-match");
+headers.remove("if-modified-since");
+headers.remove("if-unmodified-since");
+headers.remove("if-range");
+headers.remove("range");
+headers.remove("expect");
+headers.remove("authorization");
+headers.remove("referer");
+
+HttpSession session = request.getSession(false);
+if (session != null) {
+sessionId = session.getId();
+}
+if (sessionId == null) {
+sessionId = request.getRequestedSessionId();
+}
+addSessionCookie = request.isRequestedSessionIdFromCookie();
+addSessionPathParameter = request.isRequestedSessionIdFromURL();
+if (!addSessionCookie && !addSessionPathParameter && sessionId != 
null) {
+Set sessionTrackingModes =
+
request.getServletContext().getEffectiveSessionTrackingModes();
+addSessionCookie = 
sessionTrackingModes.contains(SessionTrackingMode.COOKIE);
+addSessionPathParameter = 
sessionTrackingModes.contains(SessionTrackingMode.URL);
+}
 }
 
 
@@ -247,13 +279,53 @@ public class ApplicationPushBuilder impl
 pushTarget.setServerPort(baseRequest.getServerPort());
 

buildbot success in ASF Buildbot on tomcat-8-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1708806
Blamelist: fschumacher

Build succeeded!

Sincerely,
 -The Buildbot




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

[GUMP@vmgump]: 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.apache.org/gump/public/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.apache.org/gump/public/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: 1 min 28 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 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.12-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-6.12-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20151015.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.5-SNAPSHOT.ja
 
r:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20151015.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20151015.jar:/srv/gump/packages/guava/guava-18.0.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

build-prepare:
   [delete] Deleting directory 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp

compile-prepare:

download-validate:

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

setproxy:

downloadfile:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle
[checkstyle] Running Checkstyle 6.12-SNAPSHOT on 3060 files
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/tomcat/websocket/TestCaseInsensitiveKeyMap.java:26:
 error: Wrong order for 'org.junit.Assert' import.

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:549: Got 1 errors and 0 
warnings.

Total time: 1 minute 27 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 20151015120008, vmgump.apache.org:vmgump:20151015120008
Gump E-mail Identifier (unique within run) #1.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

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

Re: [VOTE] Release Apache Tomcat 7.0.65

[Martin Grigorov]

[ X ] Stable - go ahead and release as 7.0.65 Stable

Tested our main application. No issues found!

On Fri, Oct 9, 2015 at 1:04 PM, Violeta Georgieva 
wrote:

> The proposed Apache Tomcat 7.0.65 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.65/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1053/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_65/
>
> The proposed 7.0.65 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 7.0.65 Stable
>
> Regards,
> Violeta
>

svn commit: r1708892 - /tomcat/trunk/java/javax/servlet/http/PushBuilder.java

[fschumacher]

Author: fschumacher
Date: Thu Oct 15 20:58:58 2015
New Revision: 1708892

URL: http://svn.apache.org/viewvc?rev=1708892=rev
Log:
Add missing opening brace

Modified:
tomcat/trunk/java/javax/servlet/http/PushBuilder.java

Modified: tomcat/trunk/java/javax/servlet/http/PushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/PushBuilder.java?rev=1708892=1708891=1708892=diff
==
--- tomcat/trunk/java/javax/servlet/http/PushBuilder.java (original)
+++ tomcat/trunk/java/javax/servlet/http/PushBuilder.java Thu Oct 15 20:58:58 
2015
@@ -34,7 +34,7 @@ import java.util.Set;
  * The referer header will be set to
  * {@link HttpServletRequest#getRequestURL()} plus, if present, the query
  * string from {@link HttpServletRequest#getQueryString()}.
- * If either of the headers @code If-Modified-Since} or
+ * If either of the headers {@code If-Modified-Since} or
  * {@code If-None-Match} were present then {@link #isConditional()} will be
  * set to {@code true}.
  * 



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

svn commit: r1708906 - /tomcat/trunk/build.xml

[billbarker]

Author: billbarker
Date: Fri Oct 16 01:27:58 2015
New Revision: 1708906

URL: http://svn.apache.org/viewvc?rev=1708906=rev
Log:
Include collections classes in the jar, not just the package.  Reported by Gump

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1708906=1708905=1708906=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Oct 16 01:27:58 2015
@@ -356,7 +356,7 @@
   
 
 
-
+
 
 
 



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

[GUMP@vmgump]: Project tomcat-tc8.0.x-test-bio (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-test-bio 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-test-bio :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-bio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/logs-BIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-BIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-BIO/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-bio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio (Type: Build)
Work ended in a state of : Failed
Elapsed: 34 mins 20 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 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-BIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151016-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151016.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151016-native-src.tar.gz
 -Dtest.temp=output/test-tmp-BIO -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20151016/bin/o
 penssl -Dexecute.test.bio=true -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/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/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 

svn commit: r1708887 - in /tomcat/trunk/java: javax/servlet/http/PushBuilder.java org/apache/catalina/core/ApplicationPushBuilder.java

[markt]

Author: markt
Date: Thu Oct 15 20:30:47 2015
New Revision: 1708887

URL: http://svn.apache.org/viewvc?rev=1708887=rev
Log:
Servlet 4.0
Complete the implementation for the creation of the PushBuilder.
Work still required on the generation of the push request.

Modified:
tomcat/trunk/java/javax/servlet/http/PushBuilder.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java

Modified: tomcat/trunk/java/javax/servlet/http/PushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/PushBuilder.java?rev=1708887=1708886=1708887=diff
==
--- tomcat/trunk/java/javax/servlet/http/PushBuilder.java (original)
+++ tomcat/trunk/java/javax/servlet/http/PushBuilder.java Thu Oct 15 20:30:47 
2015
@@ -28,6 +28,15 @@ import java.util.Set;
  * {@link #path(String)}.
  * Conditional, range, expectation, authorization and referer headers will
  * be removed.
+ * Cookies added to the associated response will be added to the push
+ * request unless maxAge <= 0 in which case any request cookie with the 
same
+ * name will be removed.
+ * The referer header will be set to
+ * {@link HttpServletRequest#getRequestURL()} plus, if present, the query
+ * string from {@link HttpServletRequest#getQueryString()}.
+ * If either of the headers @code If-Modified-Since} or
+ * {@code If-None-Match} were present then {@link #isConditional()} will be
+ * set to {@code true}.
  * 
  *
  * @since Servlet 4.0

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java?rev=1708887=1708886=1708887=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java Thu 
Oct 15 20:30:47 2015
@@ -21,6 +21,7 @@ import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -28,11 +29,13 @@ import java.util.Set;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletRequestWrapper;
 import javax.servlet.SessionTrackingMode;
+import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.PushBuilder;
 
 import org.apache.catalina.connector.Request;
+import org.apache.catalina.util.SessionConfig;
 import org.apache.coyote.ActionCode;
 import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
@@ -43,19 +46,24 @@ public class ApplicationPushBuilder impl
 private static final StringManager sm = 
StringManager.getManager(ApplicationPushBuilder.class);
 
 private final HttpServletRequest baseRequest;
+private final Request catalinaRequest;
 private final org.apache.coyote.Request coyoteRequest;
+private final String sessionCookieName;
+private final String sessionPathParameterName;
+private final boolean addSessionCookie;
+private final boolean addSessionPathParameter;
 
+private final Map headers = new 
CaseInsensitiveKeyMap<>();
+private final List cookies = new ArrayList<>();
 private String method = "GET";
-private Map headers = new CaseInsensitiveKeyMap<>();
 private String path;
 private String etag;
 private String lastModified;
 private String queryString;
 private String sessionId;
-private boolean addSessionCookie;
-private boolean addSessionPathParameter;
 private boolean conditional;
 
+
 public ApplicationPushBuilder(HttpServletRequest request) {
 baseRequest = request;
 // Need a reference to the CoyoteRequest in order to process the push
@@ -64,7 +72,8 @@ public class ApplicationPushBuilder impl
 current = ((ServletRequestWrapper) current).getRequest();
 }
 if (current instanceof Request) {
-coyoteRequest = ((Request) current).getCoyoteRequest();
+catalinaRequest = ((Request) current);
+coyoteRequest = catalinaRequest.getCoyoteRequest();
 } else {
 throw new UnsupportedOperationException(sm.getString(
 "applicationPushBuilder.noCoyoteRequest", 
current.getClass().getName()));
@@ -84,14 +93,34 @@ public class ApplicationPushBuilder impl
 
 // Remove the headers
 headers.remove("if-match");
-headers.remove("if-none-match");
-headers.remove("if-modified-since");
+if (headers.remove("if-none-match") != null) {
+conditional = true;
+}
+if (headers.remove("if-modified-since") != null) {
+  

svn commit: r1708889 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java

[markt]

Author: markt
Date: Thu Oct 15 20:36:20 2015
New Revision: 1708889

URL: http://svn.apache.org/viewvc?rev=1708889=rev
Log:
Servlet 4.0
Implement a PushBuidler TODO
Conditional requests

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java?rev=1708889=170=1708889=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java Thu 
Oct 15 20:36:20 2015
@@ -375,7 +375,11 @@ public class ApplicationPushBuilder impl
 }
 
 if (conditional) {
-// TODO conditional
+if (etag != null) {
+setHeader("if-none-match", etag);
+} else if (lastModified != null) {
+setHeader("if-modified-since", lastModified);
+}
 }
 
 // Cookies
@@ -388,6 +392,8 @@ public class ApplicationPushBuilder impl
 path = null;
 etag = null;
 lastModified = null;
+headers.remove("if-none-match");
+headers.remove("if-modified-since");
 }
 
 



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

svn commit: r1708896 - in /tomcat/trunk: java/org/apache/catalina/core/ApplicationPushBuilder.java test/org/apache/catalina/core/TestApplicationPushBuilder.java

[markt]

Author: markt
Date: Thu Oct 15 21:44:01 2015
New Revision: 1708896

URL: http://svn.apache.org/viewvc?rev=1708896=rev
Log:
Servlet 4.0
Implement PushBuilder a TODO
Handle %nn encoded paths

Added:
tomcat/trunk/test/org/apache/catalina/core/TestApplicationPushBuilder.java  
 (with props)
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java?rev=1708896=1708895=1708896=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java Thu 
Oct 15 21:44:01 2015
@@ -38,6 +38,7 @@ import org.apache.catalina.connector.Req
 import org.apache.catalina.util.SessionConfig;
 import org.apache.coyote.ActionCode;
 import org.apache.tomcat.util.buf.B2CConverter;
+import org.apache.tomcat.util.buf.HexUtils;
 import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
 import org.apache.tomcat.util.res.StringManager;
 
@@ -397,7 +398,16 @@ public class ApplicationPushBuilder impl
 }
 
 
-private static String decode(String input, String charsetName) {
+// Package private so it can be tested
+static String decode(String input, String charsetName) {
+int start = input.indexOf('%');
+int end = 0;
+
+// Shortcut
+if (start == -1) {
+return input;
+}
+
 Charset charset;
 try {
 charset = B2CConverter.getCharset(charsetName);
@@ -407,7 +417,32 @@ public class ApplicationPushBuilder impl
 throw new IllegalStateException(uee);
 }
 
-// TODO implement %nn decoding
-return input;
+StringBuilder result = new StringBuilder(input.length());
+while (start != -1) {
+// Found the start of a %nn sequence. Copy everything form the last
+// end to this start to the output.
+result.append(input.substring(end, start));
+// Advance the end 3 characters: %nn
+end = start + 3;
+while (end 

svn commit: r1708886 - /tomcat/trunk/java/org/apache/catalina/connector/Response.java

[markt]

Author: markt
Date: Thu Oct 15 20:29:11 2015
New Revision: 1708886

URL: http://svn.apache.org/viewvc?rev=1708886=rev
Log:
Keep a reference to the cookie objects that are added to the response. It makes 
generating HTTP/2 server push requests a lot simpler.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Response.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1708886=1708885=1708886=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Thu Oct 15 
20:29:11 2015
@@ -250,6 +250,12 @@ public class Response
 protected final CharChunk redirectURLCC = new CharChunk();
 
 
+/*
+ * Not strictly required but it makes generating HTTP/2 push requests a lot
+ * easier if these are retained until the response is recycled.
+ */
+private final List cookies = new ArrayList<>();
+
 // - Public Methods
 
 
@@ -259,6 +265,7 @@ public class Response
  */
 public void recycle() {
 
+cookies.clear();
 outputBuffer.recycle();
 usingOutputStream = false;
 usingWriter = false;
@@ -287,6 +294,11 @@ public class Response
 }
 
 
+public List getCookies() {
+return cookies;
+}
+
+
 // --- Response Methods
 
 /**
@@ -894,6 +906,8 @@ public class Response
 return;
 }
 
+cookies.add(cookie);
+
 String header = generateCookieString(cookie);
 //if we reached here, no exception, cookie is valid
 // the header name is Set-Cookie for both "old" and v.1 ( RFC2109 )



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

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


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO]
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (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 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151016-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151016.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151016-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-ma
 ster/dest-20151016/bin/openssl -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/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/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 

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


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2]
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 32 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 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151016-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151016.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151016-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl
 -master/dest-20151016/bin/openssl -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/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/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 

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


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/logs-APR]
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 32 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 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151016-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20151016/lib 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151016.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151016-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -
 Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20151016/bin/openssl
 -Dexecute.test.apr=true -Dtest.excludePerformance=true 
-Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/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/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 

[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (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-test-apr has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 8 runs.
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-test-apr :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 35 mins 15 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 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151016-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20151016/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151016.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151016-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest
 
.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20151016/bin/openssl
 -Dexecute.test.bio=false -Dexecute.test.apr=true 
-Dtest.excludePerformance=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/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/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 

[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (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-test-nio2 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-test-nio2 :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2]
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (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 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151015-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151015.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151015-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl
 -master/dest-20151015/bin/openssl -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/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/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib

[GUMP@vmgump]: Project tomcat-trunk-test-nio (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-test-nio 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-test-nio :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO]
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 30 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 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151015-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151015.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151015-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-ma
 ster/dest-20151015/bin/openssl -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/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/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar

svn commit: r1708856 - in /tomcat/trunk/test/org/apache/tomcat: util/collections/TestCaseInsensitiveKeyMap.java websocket/TestCaseInsensitiveKeyMap.java

[markt]

Author: markt
Date: Thu Oct 15 17:53:27 2015
New Revision: 1708856

URL: http://svn.apache.org/viewvc?rev=1708856=rev
Log:
Move the test case as well as the implementation

Added:

tomcat/trunk/test/org/apache/tomcat/util/collections/TestCaseInsensitiveKeyMap.java
  - copied, changed from r1708855, 
tomcat/trunk/test/org/apache/tomcat/websocket/TestCaseInsensitiveKeyMap.java
Removed:
tomcat/trunk/test/org/apache/tomcat/websocket/TestCaseInsensitiveKeyMap.java

Copied: 
tomcat/trunk/test/org/apache/tomcat/util/collections/TestCaseInsensitiveKeyMap.java
 (from r1708855, 
tomcat/trunk/test/org/apache/tomcat/websocket/TestCaseInsensitiveKeyMap.java)
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/collections/TestCaseInsensitiveKeyMap.java?p2=tomcat/trunk/test/org/apache/tomcat/util/collections/TestCaseInsensitiveKeyMap.java=tomcat/trunk/test/org/apache/tomcat/websocket/TestCaseInsensitiveKeyMap.java=1708855=1708856=1708856=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/websocket/TestCaseInsensitiveKeyMap.java 
(original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/collections/TestCaseInsensitiveKeyMap.java
 Thu Oct 15 17:53:27 2015
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tomcat.websocket;
+package org.apache.tomcat.util.collections;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -22,7 +22,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
 import org.junit.Assert;
 import org.junit.Test;
 



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

Re: Consider support for the Servlet profile of JSR 196 (JASPIC) in Tomcat 7.0.x

[Mark Thomas]

On 15/10/2015 02:03, Fjodor Versinin wrote:
> Hi! Actually, I would like to continue to work on this, but not in
> GSOC scope anymore, because that expirience was too stressful for
> me. What about current JASPIC implementation, it is almost ready, so
> I think it would be better to keep already wroten code than rewriting
> it from a scratch. What about security, I'm not sure, but this code
> has been accepted during the summer time, it has not be changed since
> then. Security must be on the same level,  I hope so.

It isn't really a case of re-writing from scratch but of validating that
the new code is secure. The nature of the code is that a very small
change could introduce a very large security hole.

Because this code is security related it requires a degree of trust in
the source. That trust was eroded when you disappeared without any
communication immediately you passed the mid-term evaluation.

There are two ways the code could be validated. The first is to examine
line, by line, every commit based on your contributed patches. That
would be extremely time consuming. The faster way is to use your patches
as a guide to independently re-create the patches.

Given that the changes need to be ported to the
org.apache.catalina.authenticator package from their current
sub-package, it looks like the best way forward is to combine that
process with validating the code in the jaspic sub-package. That way you
can continue to provide patches/pull-requests against the jaspic
sub-package and the review / porting work can progress independently.
When both are complete we can simply remove the jaspic sub-package.

> However,  some
> places of old auth valves should be rewritten in more readable way.

I'd recommend keeping re-factoring and JASPIC implementation separate.
By all means progress them in parallel but don't mix the purpose of the
patches.

Mark


> 
> Fjodor
> 
>  Mark Thomas wrote 
> 
>> On 14/10/2015 13:00, Arjan Tijms wrote:
>>> Hi there,
>>> 
>>> Haven't seen updates for some time here. Wonder what the current 
>>> status is and what exactly happened in the last months. Last
>>> commits in the Tomcat repo are from 3 months ago.
>> 
>> The GSoC student took the money and ran at the mid-term evaluation.
>> I should have gone with my first instinct which was to fail them at
>> the mid-term due to lack of effort.
>> 
>> Getting back to this is on my TODO list for Tomcat 9. I plan to
>> remove the GSoC work and start again from scratch. While that might
>> seem excessive I simply do not trust the refactoring that Fjodor
>> completed is secure. It will be quicker to re-do the work myself
>> than it will be to check the refactoring line by line.
>> 
>> Mark
>> 
>> 
>>> 
>>> Kind regards, Arjan Tijms

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

svn commit: r1708869 - in /tomcat/trunk/java/org/apache: catalina/connector/Request.java coyote/Request.java

[markt]

Author: markt
Date: Thu Oct 15 19:14:43 2015
New Revision: 1708869

URL: http://svn.apache.org/viewvc?rev=1708869=rev
Log:
Move the path parameters to the Coyote request so it is easier for HTTP/2 push 
requests to inject them.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/coyote/Request.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1708869=1708868=1708869=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Oct 15 
19:14:43 2015
@@ -407,20 +407,14 @@ public class Request implements HttpServ
 protected Boolean asyncSupported = null;
 
 
-/**
- * Path parameters
- */
-protected final Map pathParameters = new HashMap<>();
-
 // - Public Methods
 
-
 protected void addPathParameter(String name, String value) {
-pathParameters.put(name, value);
+coyoteRequest.addPathParameter(name, value);
 }
 
 protected String getPathParameter(String name) {
-return pathParameters.get(name);
+return coyoteRequest.getPathParameter(name);
 }
 
 public void setAsyncSupported(boolean asyncSupported) {
@@ -513,8 +507,6 @@ public class Request implements HttpServ
 asyncContext.recycle();
 }
 asyncContext = null;
-
-pathParameters.clear();
 }
 
 

Modified: tomcat/trunk/java/org/apache/coyote/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Request.java?rev=1708869=1708868=1708869=diff
==
--- tomcat/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Request.java Thu Oct 15 19:14:43 2015
@@ -18,6 +18,7 @@ package org.apache.coyote;
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.servlet.ReadListener;
@@ -97,6 +98,12 @@ public final class Request {
 
 private final MimeHeaders headers = new MimeHeaders();
 
+
+/**
+ * Path parameters
+ */
+private final Map pathParameters = new HashMap<>();
+
 /**
  * Notes.
  */
@@ -399,6 +406,15 @@ public final class Request {
 }
 
 
+public void addPathParameter(String name, String value) {
+pathParameters.put(name, value);
+}
+
+public String getPathParameter(String name) {
+return pathParameters.get(name);
+}
+
+
 //  Other attributes 
 // We can use notes for most - need to discuss what is of general interest
 
@@ -551,6 +567,7 @@ public final class Request {
 
 serverCookies.recycle();
 parameters.recycle();
+pathParameters.clear();
 
 uriMB.recycle();
 decodedUriMB.recycle();



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