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

[markt]

Author: markt
Date: Wed Feb 10 13:43:52 2016
New Revision: 1729597

URL: http://svn.apache.org/viewvc?rev=1729597&view=rev
Log:
Update with 8.0.32 release date

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=1729597&r1=1729596&r2=1729597&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Feb 10 13:43:52 2016
@@ -60,7 +60,7 @@
 
   
 
-
+
   
 
   



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

svn commit: r1729603 - in /tomcat/site/trunk: ./ docs/ xdocs/

[markt]

Author: markt
Date: Wed Feb 10 14:03:36 2016
New Revision: 1729603

URL: http://svn.apache.org/viewvc?rev=1729603&view=rev
Log:
Update for 8.0.32 release

Modified:
tomcat/site/trunk/build.properties.default
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/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1729603&r1=1729602&r2=1729603&view=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Wed Feb 10 14:03:36 2016
@@ -38,7 +38,7 @@ tomcat.loc=http://www.apache.org/dist/to
 # - Tomcat versions -
 tomcat60=6.0.43
 tomcat70=7.0.67
-tomcat80=8.0.30
+tomcat80=8.0.32
 tomcat90=9.0.0.M3
 
 # - Download destination -

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1729603&r1=1729602&r2=1729603&view=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Wed Feb 10 14:03:36 2016
@@ -60,8 +60,8 @@
 
   
 Latest Stable 8.0.x Release
-2015-12-06
-8.0.30
+2016-02-08
+8.0.32
   
 
 

Modified: tomcat/site/trunk/docs/download-80.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1729603&r1=1729602&r2=1729603&view=diff
==
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Wed Feb 10 14:03:36 2016
@@ -215,7 +215,7 @@
 Quick Navigation
 
 
-[define v]8.0.30[end]
+[define v]8.0.32[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=1729603&r1=1729602&r2=1729603&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Feb 10 14:03:36 2016
@@ -237,6 +237,44 @@ project logo are trademarks of the Apach
 
 
 
+
+2015-02-08 Tomcat 8.0.32 Released
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 8.0.32
+of Apache Tomcat. Apache Tomcat 8.0.32 includes fixes for issues identified in
+8.0.30 as well as other enhancements and changes. The notable changes since
+8.0.30 include:
+
+
+
+Restore the default for mapperContextRootRedirectEnabled to
+true
+
+
+Update the packaged version of the Tomcat Native Library to 1.2.4 to pick 
up
+the Windows binaries that are based on OpenSSL 1.0.2e
+
+Expand session attribute filtering on load/unload to all managers
+
+
+
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 8
+changelog.
+
+
+
+
+
+Download
+
+
+
+
 
 2016-02-05 Tomcat 9.0.0.M3 (alpha) 
Released
 
@@ -374,43 +412,6 @@ Full details of these changes, and all t
 
 
 
-
-
-2015-12-06 Tomcat 8.0.30 Released
-
-
-
-The Apache Tomcat Project is proud to announce the release of version 8.0.30
-of Apache Tomcat. Apache Tomcat 8.0.30 includes fixes for issues identified in
-8.0.29 as well as other enhancements and changes. The notable changes since
-8.0.29 include:
-
-
-
-Location headers for redirects now use relative URIs. This can be 
controlled
-per Context with the useRelativeRedirects attribute.
-
-Correct a regression in 8.0.29 that broke redirects for context roots.
-
-Restore the default setting of quoteAttributeEL in Jasper to true to align
-with 8.0.26/7.0.64 and earlier as well as other JSP implementations.
-
-
-
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 8
-changelog.
-
-
-
-
-
-Download
-
-
-
 
 
 2015-08-11 Tomcat Connectors 1.2.41 
Released

Modified: tomcat/site/trunk/docs/migration-8.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-8.html?rev=1729603&r1=1729602&r2=1729603&view=diff
==
--- tomcat/site/trunk/docs/migration-8.html (original)
+++ tomcat/site/trunk/docs/migration-8.html Wed Feb 10 14:03:36 2016
@@ -733,7 +733,8 @@ of Apache Tomcat.
   "8.0.27":"1704937",
   "8.0.28":"1707356",
 

svn commit: r1729602 - in /tomcat/site/trunk/docs/tomcat-8.0-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/

[markt]

Author: markt
Date: Wed Feb 10 14:02:41 2016
New Revision: 1729602

URL: http://svn.apache.org/viewvc?rev=1729602&view=rev
Log:
Update docs for 8.0.32 release


[This commit notification would consist of 85 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

svn commit: r12331 - /release/tomcat/tomcat-8/v8.0.30/

[markt]

Author: markt
Date: Wed Feb 10 14:04:15 2016
New Revision: 12331

Log:
Drop 8.0.32 from mirrors

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


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

[ANN] Apache Tomcat 8.0.32 available

[Mark Thomas]

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

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.32 includes fixes for issues identified in 8.0.30 as
well as other enhancements and changes. The notable changes since 8.0.30
include:

- Restore the default for mapperContextRootRedirectEnabled to true

- Update the packaged version of the Tomcat Native Library to 1.2.4
  to pick up the Windows binaries that are based on OpenSSL 1.0.2e

- Expand session attribute filtering on load/unload to all managers


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

Re: JASPIC progress

[Arjan Tijms]

Mark Thomas-2 wrote
> As I thought about this some more, I realised that there is nothing in 
> the Servlet Container profile in the JASPIC spec (that I have been able 
> to find) about when AuthConfigProvider registration takes place. This 
> means that AuthConfigProvider registrations and de-registrations could 
> take place while the web application is running. 

It's a good point indeed. In practice it always seems to be either a
ServletContainerInitializer or a ServletContextListener, or of course via a
server proprietary method (outside the application).

I'm not entirely sure what the use case was for having this flexibility.
I'll try to see if I can get a clarification from Ron about this. I wonder
how many implementations even support registrations and de-registrations at
arbitrary moments.



Mark Thomas-2 wrote
> - have authenticate() check (i.e. on every request) for a JASPIC config
>   and use it if present
> - cache what I can (for speed) and use a RegistrationListener to track
>   updates

That should indeed be the approach.

What the RI roughly does is from its embedded Tomcat in
AuthenticatorBase#invoke it calls an adapter:
com.sun.web.security.RealmAdapter#invokeAuthenticateDelegate

That contains code like the following (simplified):

ServerAuthConfig serverAuthConfig = null;

if (helper != null) {
serverAuthConfig = helper.getServerAuthConfig();
} 

if (serverAuthConfig != null) {
// JSR 196 is enabled for this application. Call it.
result = validate(request, response, config, authenticator,
calledFromAuthenticate);
} else {
// JSR 196 is not enabled for this application. Use the current
authenticator
result = ((AuthenticatorBase) authenticator).authenticate(request,
response, config);
}

The "helper" variable is set outside the request call, so it functions as a
very quick switch.

getServerAuthConfig() essentially does the following:

AuthConfig authConfig = listener.getConfig();
if (authConfig == null) {
authConfig = factory.getConfigProvider(layer, appCtxt, listener);
listener.setConfig(authConfig);
}

return authConfig;

Where listener and the AuthConfig it holds are just instance variables. One
subtle thing to notice is that when the listener is called to track an
update the config it holds is null'ed instead of actually being updated at
that point.

The actual implementation is a bit more hairy but in broad lines it boils
down to the above, see:
com.sun.enterprise.security.jmac.config.ConfigHelper#getServerAuthConfig

Hope this helps.

Kind regards,
Arjan Tijms







--
View this message in context: 
http://tomcat.10.x6.nabble.com/JASPIC-progress-tp5046266p5046307.html
Sent from the Tomcat - Dev mailing list archive at Nabble.com.

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

[Bug 58988] New: $ escaping for rewrite

[bugzilla]

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

Bug ID: 58988
   Summary: $ escaping for rewrite
   Product: Tomcat 9
   Version: unspecified
  Hardware: PC
OS: All
Status: NEW
  Severity: major
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: r...@apache.org

The following escaping behavior should be implemented:
https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html#quoting

-- 
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

buildbot success in on tomcat-8-trunk

[buildbot]

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

Buildbot URL: https://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] 1729597
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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

[Bug 58988] $ escaping for rewrite

[bugzilla]

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

--- Comment #1 from Felix Schumacher  ---
Created attachment 33544
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=33544&action=edit
Let backslashes escape characters

This will enable escaping (quoting) by using an backslash.

Apart from this, it will enable escaping the percent sign by using %%. It also
fixes a bug, when % was not followed by a digit or a curly brace.

The functionality for %% should probably not be added.

Documentation for the quotation feature is missing, too.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Bug 58988] $ escaping for rewrite

[bugzilla]

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

--- Comment #2 from Remy Maucherat  ---
Normally % should be escaped with \% according to the documentation, not
anything else.

-- 
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: r1729619 - in /tomcat/trunk/java/org/apache/catalina: connector/Connector.java core/AprLifecycleListener.java

[remm]

Author: remm
Date: Wed Feb 10 15:04:23 2016
New Revision: 1729619

URL: http://svn.apache.org/viewvc?rev=1729619&view=rev
Log:
Rename aprPreferred to useAprConnector, which is more explicit [same default 
value to false].

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1729619&r1=1729618&r2=1729619&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Wed Feb 10 
15:04:23 2016
@@ -563,14 +563,14 @@ public class Connector extends Lifecycle
  */
 public String getProtocol() {
 if 
(("org.apache.coyote.http11.Http11NioProtocol".equals(getProtocolHandlerClassName())
 &&
-(!AprLifecycleListener.isAprAvailable() || 
!AprLifecycleListener.isAprPreferred())) ||
+(!AprLifecycleListener.isAprAvailable() || 
!AprLifecycleListener.getUseAprConnector())) ||
 
"org.apache.coyote.http11.Http11AprProtocol".equals(getProtocolHandlerClassName())
 &&
-AprLifecycleListener.isAprPreferred()) {
+AprLifecycleListener.getUseAprConnector()) {
 return "HTTP/1.1";
 } else if 
(("org.apache.coyote.ajp.AjpNioProtocol".equals(getProtocolHandlerClassName()) 
&&
-(!AprLifecycleListener.isAprAvailable() || 
!AprLifecycleListener.isAprPreferred())) ||
+(!AprLifecycleListener.isAprAvailable() || 
!AprLifecycleListener.getUseAprConnector())) ||
 
"org.apache.coyote.ajp.AjpAprProtocol".equals(getProtocolHandlerClassName()) &&
-AprLifecycleListener.isAprPreferred()) {
+AprLifecycleListener.getUseAprConnector()) {
 return "AJP/1.3";
 }
 return getProtocolHandlerClassName();
@@ -585,7 +585,7 @@ public class Connector extends Lifecycle
 public void setProtocol(String protocol) {
 
 boolean aprConnector = AprLifecycleListener.isAprAvailable() &&
-AprLifecycleListener.isAprPreferred();
+AprLifecycleListener.getUseAprConnector();
 
 if ("HTTP/1.1".equals(protocol) || protocol == null) {
 if (aprConnector) {

Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1729619&r1=1729618&r2=1729619&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Wed 
Feb 10 15:04:23 2016
@@ -78,7 +78,7 @@ public class AprLifecycleListener
 protected static boolean sslInitialized = false;
 protected static boolean aprInitialized = false;
 protected static boolean aprAvailable = false;
-protected static boolean aprPreferred = false;
+protected static boolean useAprConnector = false;
 protected static boolean fipsModeActive = false;
 
 /**
@@ -395,14 +395,14 @@ public class AprLifecycleListener
 return fipsModeActive;
 }
 
-public void setAprPreferred(boolean aprPreferred) {
-if (aprPreferred != AprLifecycleListener.aprPreferred) {
-AprLifecycleListener.aprPreferred = aprPreferred;
+public void setUseAprConnector(boolean useAprConnector) {
+if (useAprConnector != AprLifecycleListener.useAprConnector) {
+AprLifecycleListener.useAprConnector = useAprConnector;
 }
 }
 
-public static boolean isAprPreferred() {
-return aprPreferred;
+public static boolean getUseAprConnector() {
+return useAprConnector;
 }
 
 }



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

svn commit: r1729625 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Feb 10 15:13:17 2016
New Revision: 1729625

URL: http://svn.apache.org/viewvc?rev=1729625&view=rev
Log:
Correct a regression in the fix for 58867. When configuring a Context to use an 
external directory for the docBase, and that directory happens to be located 
along side the original WAR, use the directory as the docBase rather than 
expanding the WAR into the appBase and using the newly created expanded 
directory as the docBase.

Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1729625&r1=1729624&r2=1729625&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Wed Feb 10 
15:13:17 2016
@@ -579,8 +579,7 @@ public class ContextConfig implements Li
  * Adjust docBase.
  * @throws IOException cannot access the context base path
  */
-protected void fixDocBase()
-throws IOException {
+protected void fixDocBase() throws IOException {
 
 Host host = (Host) context.getParent();
 File appBase = host.getAppBaseFile();
@@ -616,6 +615,8 @@ public class ContextConfig implements Li
 }
 }
 
+boolean docBaseInAppBase = docBase.startsWith(appBase.getPath() + 
File.separatorChar);
+
 if (docBase.toLowerCase(Locale.ENGLISH).endsWith(".war") && 
!file.isDirectory()) {
 URL war = new URL("jar:" + (new File(docBase)).toURI().toURL() + 
"!/");
 if (unpackWARs) {
@@ -632,7 +633,7 @@ public class ContextConfig implements Li
 File docDir = new File(docBase);
 File warFile = new File(docBase + ".war");
 URL war = null;
-if (warFile.exists()) {
+if (warFile.exists() && docBaseInAppBase) {
 war = new URL("jar:" + warFile.toURI().toURL() + "!/");
 }
 if (docDir.exists()) {
@@ -660,7 +661,7 @@ public class ContextConfig implements Li
 }
 }
 
-if (docBase.startsWith(appBase.getPath() + File.separatorChar)) {
+if (docBaseInAppBase) {
 docBase = docBase.substring(appBase.getPath().length());
 docBase = docBase.replace(File.separatorChar, '/');
 if (docBase.startsWith("/")) {
@@ -671,7 +672,6 @@ public class ContextConfig implements Li
 }
 
 context.setDocBase(docBase);
-
 }
 
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1729625&r1=1729624&r2=1729625&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Feb 10 15:13:17 2016
@@ -62,6 +62,14 @@
 authenticate() to ensure compatibility with future
 improvements to AuthenticatorBase. (markt)
   
+  
+Correct a regression in the fix for 58867. When configuring 
a
+Context to use an external directory for the docBase, and
+that directory happens to be located along side the original WAR, use
+the directory as the docBase rather than expanding the
+WAR into the appBase and using the newly created expanded
+directory as the docBase. (markt) 
+  
 
   
   



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

svn commit: r1729626 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Feb 10 15:15:00 2016
New Revision: 1729626

URL: http://svn.apache.org/viewvc?rev=1729626&view=rev
Log:
Correct a regression in the fix for 58867. When configuring a Context to use an 
external directory for the docBase, and that directory happens to be located 
along side the original WAR, use the directory as the docBase rather than 
expanding the WAR into the appBase and using the newly created expanded 
directory as the docBase.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

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

Re: regression due to https://bz.apache.org/bugzilla/show_bug.cgi?id=58867 ?

[Mark Thomas]

On 09/02/2016 08:29, Mark Thomas wrote:
> On 09/02/2016 07:33, Romain Manni-Bucau wrote:
>> Hi mark,
>>
>> if you put a war in a specific folder then expand it yourself next to the
>> war and do something like:
>>
>> StandardContext ctx = new StandardContext();
>> // several set
>> ctx.setDocBase("/my/expanded/"); // /my/expanded.war exists since that's
>> where we come from
>> host.addChild(ctx);
>>
>> then you get a duplicated deployment with autodeploy settings and unpackWAR
>> set to true. It sounds like the wrong behavior to me since the auto deploy
>> doesnt apply to /my/ folder but ${tomcat.base}/webapps - by default.
> 
> Thanks for the additional detail. I was indeed making some invalid
> assumptions about what the problem was.
> 
> I'll take a look at this later today.

Sorry for the delay. I got side-tracked.

This is fixed in trunk and 8.0.x and will be in the next release of each
(in around a month's time).

Mark


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

buildbot failure in on tomcat-8-trunk

[buildbot]

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

Buildbot URL: https://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] 1729626
Blamelist: markt

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot




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

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

[markt]

Author: markt
Date: Wed Feb 10 15:58:55 2016
New Revision: 1729637

URL: http://svn.apache.org/viewvc?rev=1729637&view=rev
Log:
Fix merge error

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=1729637&r1=1729636&r2=1729637&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Feb 10 15:58:55 2016
@@ -46,6 +46,7 @@
 -->
 
   
+
   
 Correct a regression in the fix for 58867. When configuring 
a
 Context to use an external directory for the docBase, and



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

Re: regression due to https://bz.apache.org/bugzilla/show_bug.cgi?id=58867 ?

[Romain Manni-Bucau]

Thanks a lot Mark!


Romain Manni-Bucau
@rmannibucau  |  Blog
 | Github  |
LinkedIn  | Tomitriber


2016-02-10 16:17 GMT+01:00 Mark Thomas :

> On 09/02/2016 08:29, Mark Thomas wrote:
> > On 09/02/2016 07:33, Romain Manni-Bucau wrote:
> >> Hi mark,
> >>
> >> if you put a war in a specific folder then expand it yourself next to
> the
> >> war and do something like:
> >>
> >> StandardContext ctx = new StandardContext();
> >> // several set
> >> ctx.setDocBase("/my/expanded/"); // /my/expanded.war exists since that's
> >> where we come from
> >> host.addChild(ctx);
> >>
> >> then you get a duplicated deployment with autodeploy settings and
> unpackWAR
> >> set to true. It sounds like the wrong behavior to me since the auto
> deploy
> >> doesnt apply to /my/ folder but ${tomcat.base}/webapps - by default.
> >
> > Thanks for the additional detail. I was indeed making some invalid
> > assumptions about what the problem was.
> >
> > I'll take a look at this later today.
>
> Sorry for the delay. I got side-tracked.
>
> This is fixed in trunk and 8.0.x and will be in the next release of each
> (in around a month's time).
>
> Mark
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

svn commit: r1729644 - in /tomcat/trunk/webapps/docs: apr.xml config/http.xml ssl-howto.xml

[remm]

Author: remm
Date: Wed Feb 10 16:31:51 2016
New Revision: 1729644

URL: http://svn.apache.org/viewvc?rev=1729644&view=rev
Log:
Update SSL documentation.

Modified:
tomcat/trunk/webapps/docs/apr.xml
tomcat/trunk/webapps/docs/config/http.xml
tomcat/trunk/webapps/docs/ssl-howto.xml

Modified: tomcat/trunk/webapps/docs/apr.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/apr.xml?rev=1729644&r1=1729643&r2=1729644&view=diff
==
--- tomcat/trunk/webapps/docs/apr.xml (original)
+++ tomcat/trunk/webapps/docs/apr.xml Wed Feb 10 16:31:51 2016
@@ -90,7 +90,7 @@
 
 
   APR 1.2+ development headers (libapr1-dev package)
-  OpenSSL 0.9.7+ development headers (libssl-dev package)
+  OpenSSL 1.0.2+ development headers (libssl-dev package)
   JNI headers from Java compatible JDK 1.4+
   GNU development environment (gcc, make)
 
@@ -132,6 +132,14 @@
   
 
 
+
+
+  Allows using OpenSSL FIPS mode. If set to on, Tomcat will 
enter FIPS mode if needed.
+  If set to require, Tomcat will fail to start if FIPS mode 
was not active. If set
+  to enter, Tomcat will enter FIPS mode and will cause an 
error if FIPS mode was active.
+  If unset or set to off, Tomcat will not check FIPS status.
+
+
 
 
   Name of the SSLEngine to use. off: Do not use SSL, on: Use SSL but no 
specific ENGINE.
@@ -145,6 +153,17 @@
website for more details on SSL hardware engines and manufacturers.
 
 
+
+
+  If specified, this sets a random source that will be used by OpenSSL.
+
+
+
+
+  Set to true to use the APR connector by default. The 
default value is
+  false, which will use the NIO connector with the JSSE 
OpenSSL implementation instead.
+
+
 
 
   

Modified: tomcat/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1729644&r1=1729643&r2=1729644&view=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Wed Feb 10 16:31:51 2016
@@ -172,10 +172,12 @@
 either a Java NIO based connector or an APR/native based connector.
 If the PATH (Windows) or LD_LIBRARY_PATH (on
 most unix systems) environment variables contain the Tomcat native
-library, the APR/native connector will be used. If the native library
-cannot be found, the Java NIO based connector will be used. Note
-that the APR/native connector has different settings for HTTPS than the
-Java connectors.
+library, and the AprLifecycleListener that is used to
+initialize APR has its useAprConnector attribute set to
+true, the APR/native connector will be used. If the 
native library
+cannot be found or the attribute is not configured, the Java NIO based
+connector will be used. Note that the APR/native connector has 
different
+settings for HTTPS than the Java connectors.
 To use an explicit protocol rather than rely on the auto-switching
 mechanism described above, the following values may be used:
 org.apache.coyote.http11.Http11NioProtocol -
@@ -987,12 +989,14 @@
   attributes to the values https and true
   respectively, to pass correct information to the servlets.
 
-  The NIO and NIO2 connectors use the JSSE SSL implementation whereas the
-  APR/native connector uses OpenSSL. Prior to Tomcat 9, different configuration
+  The NIO and NIO2 connectors use either the JSSE Java SSL implementation or
+  an OpenSSL implementation, whereas the
+  APR/native connector uses OpenSSL only. Prior to Tomcat 9, different 
configuration
   attributes were used for JSSE and OpenSSL. From Tomcat 9 onwards, and as far
   as possible, common configuration attributes are used for both JSSE and
-  OpenSSL. This is to aid simpler switching between connector implementations
-  for SSL connectors.
+  OpenSSL. Also if using the JSSE OpenSSL implementation, configuration can be 
set using
+  either the JSSE or APR attributes (note: but not both types within the same 
configuration).
+  This is to aid simpler switching between connector implementations for SSL 
connectors.
 
   Each secure connector must define at least one
   SSLHostConfig. The names of the
@@ -1357,6 +1361,10 @@
 
   
 
+  When APR/native is enabled, the connectors will default to using OpenSSL 
through JSSE,
+  which may be more optimized than the JSSE Java implementation depending on 
the processor being used,
+  and can be complemented with many commercial accelerator components.
+
   The following NIO and NIO2 SSL configuration attributes are not specific 
to
   a virtual host and, therefore, must be configured on the connector.
 
@@ -1367,7 +1375,7 @@
   message received on 

buildbot success in on tomcat-8-trunk

[buildbot]

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

Buildbot URL: https://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] 1729637
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1729670 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml

[markt]

Author: markt
Date: Wed Feb 10 17:24:08 2016
New Revision: 1729670

URL: http://svn.apache.org/viewvc?rev=1729670&view=rev
Log:
Fix copy/paste error

Modified:
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/xdocs/index.xml

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1729670&r1=1729669&r2=1729670&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Feb 10 17:24:08 2016
@@ -238,7 +238,7 @@ project logo are trademarks of the Apach
 
 
 
-2015-02-08 Tomcat 8.0.32 Released
+2016-02-08 Tomcat 8.0.32 Released
 
 
 

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1729670&r1=1729669&r2=1729670&view=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Wed Feb 10 17:24:08 2016
@@ -38,7 +38,7 @@ project logo are trademarks of the Apach
 
 
 
-
+
 
 The Apache Tomcat Project is proud to announce the release of version 8.0.32
 of Apache Tomcat. Apache Tomcat 8.0.32 includes fixes for issues identified in



-
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-nio (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-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-tc8.0.x-test-nio :  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-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-8.0.x/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 37 mins 48 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-20160210-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-20160210.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160210-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-1.0.2/dest-20160210/bin/op
 enssl -Dexecute.test.bio=false -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
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/out

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

[markt]

Author: markt
Date: Wed Feb 10 19:37:10 2016
New Revision: 1729701

URL: http://svn.apache.org/viewvc?rev=1729701&view=rev
Log:
whitespace police

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

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1729701&r1=1729700&r2=1729701&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Feb 10 19:37:10 2016
@@ -68,7 +68,7 @@
 that directory happens to be located along side the original WAR, use
 the directory as the docBase rather than expanding the
 WAR into the appBase and using the newly created expanded
-directory as the docBase. (markt) 
+directory as the docBase. (markt)
   
 
   



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

[Bug 58351] Provide JMX access to server.built and server.number

[bugzilla]

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

--- Comment #2 from Honza Hejzl  ---
markt testing a reported issue using Bugzilla's sudo feature. Please ignore.

-- 
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: r1729730 - in /tomcat/trunk: java/org/apache/catalina/valves/rewrite/Substitution.java test/org/apache/catalina/valves/rewrite/TestRewriteValve.java webapps/docs/changelog.xml webapps/docs

[fschumacher]

Author: fschumacher
Date: Wed Feb 10 20:56:55 2016
New Revision: 1729730

URL: http://svn.apache.org/viewvc?rev=1729730&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58988
Add quotation of special characters in substitutions of the RewriteValve.

Modified:
tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/rewrite.xml

Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java?rev=1729730&r1=1729729&r2=1729730&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java Wed 
Feb 10 20:56:55 2016
@@ -111,17 +111,27 @@ public class Substitution {
 int pos = 0;
 int percentPos = 0;
 int dollarPos = 0;
+int backslashPos = 0;
 
 while (pos < sub.length()) {
 percentPos = sub.indexOf('%', pos);
 dollarPos = sub.indexOf('$', pos);
-if (percentPos == -1 && dollarPos == -1) {
+backslashPos = sub.indexOf('\\', pos);
+if (percentPos == -1 && dollarPos == -1 && backslashPos == -1) {
 // Static text
 StaticElement newElement = new StaticElement();
 newElement.value = sub.substring(pos, sub.length());
 pos = sub.length();
 elements.add(newElement);
-} else if (percentPos == -1 || ((dollarPos != -1) && (dollarPos < 
percentPos))) {
+} else if (isFirstPos(backslashPos, dollarPos, percentPos)) {
+if (backslashPos + 1 == sub.length()) {
+throw new IllegalArgumentException(sub);
+}
+StaticElement newElement = new StaticElement();
+newElement.value = sub.substring(pos, backslashPos) + 
sub.substring(backslashPos + 1, backslashPos + 2);
+pos = backslashPos + 2;
+elements.add(newElement);
+} else if (isFirstPos(dollarPos, percentPos)) {
 // $: back reference to rule or map lookup
 if (dollarPos + 1 == sub.length()) {
 throw new IllegalArgumentException(sub);
@@ -240,4 +250,28 @@ public class Substitution {
 }
 return buf.toString();
 }
+
+/**
+ * Checks whether the first int is non negative and smaller than any non 
negative other int
+ * given with {@code others}.
+ *
+ * @param testPos
+ *integer to test against
+ * @param others
+ *list of integers that are paired against {@code testPos}. Any
+ *negative integer will be ignored.
+ * @return {@code true} if {@code testPos} is not negative and is less 
then any given other
+ * integer, {@code false} otherwise
+ */
+private boolean isFirstPos(int testPos, int... others) {
+if (testPos < 0) {
+return false;
+}
+for (int other : others) {
+if (other >= 0 && other < testPos) {
+return false;
+}
+}
+return true;
+}
 }

Modified: 
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java?rev=1729730&r1=1729729&r2=1729730&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java 
Wed Feb 10 20:56:55 2016
@@ -33,6 +33,11 @@ public class TestRewriteValve extends To
 }
 
 @Test
+public void testBackslashPercentSign() throws Exception {
+doTestRewrite("RewriteRule ^(.*) /a/\\%5A", "/", "/a/%255A");
+}
+
+@Test
 public void testNoopRewrite() throws Exception {
 doTestRewrite("RewriteRule ^(.*) $1", "/a/%255A", "/a/%255A");
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1729730&r1=1729729&r2=1729730&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Feb 10 20:56:55 2016
@@ -70,6 +70,10 @@
 WAR into the appBase and using the newly created expanded
 directory as the docBase. (markt)
   
+  
+58988: Special characters in the substitutions for the 
RewriteValve
+can now be quote

svn commit: r1729742 - in /tomcat/trunk: java/org/apache/catalina/authenticator/jaspic/ test/org/apache/catalina/authenticator/jaspic/ test/org/apache/catalina/startup/

[markt]

Author: markt
Date: Wed Feb 10 21:26:46 2016
New Revision: 1729742

URL: http://svn.apache.org/viewvc?rev=1729742&view=rev
Log:
Next stage of JASPIC implementation (excluding the changes to AuthenticatorBase 
to integrate JASPIC support).
With the necessary integration, this code passes the javaee7-samples JASPIC 
unit tests as far as the lifecycle tests (which currently all fail).

Added:

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
   (with props)

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
   (with props)

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
   (with props)

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/MessageInfoImpl.java 
  (with props)
Modified:

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java

tomcat/trunk/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java

Added: 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java?rev=1729742&view=auto
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
 (added)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
 Wed Feb 10 21:26:46 2016
@@ -0,0 +1,298 @@
+/**
+ *  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.catalina.authenticator.jaspic;
+
+import java.io.File;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import javax.security.auth.message.config.AuthConfigFactory;
+import javax.security.auth.message.config.AuthConfigProvider;
+import javax.security.auth.message.config.RegistrationListener;
+
+import org.apache.catalina.Globals;
+import 
org.apache.catalina.authenticator.jaspic.PersistentProviderRegistrations.Provider;
+import 
org.apache.catalina.authenticator.jaspic.PersistentProviderRegistrations.Providers;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
+
+public class AuthConfigFactoryImpl extends AuthConfigFactory {
+
+private static final Log log = 
LogFactory.getLog(AuthConfigFactoryImpl.class);
+private static final StringManager sm = 
StringManager.getManager(AuthConfigFactoryImpl.class);
+
+private static final String CONFIG_PATH = "conf/jaspic-providers.xml";
+private static final File CONFIG_FILE =
+new File(System.getProperty(Globals.CATALINA_BASE_PROP), 
CONFIG_PATH);
+private static final Object CONFIG_FILE_LOCK = new Object();
+
+private static final String[] EMPTY_STRING_ARRAY = new String[0];
+
+private final Map registrations = new 
ConcurrentHashMap<>();
+
+
+// TODO: Handle parallel deployment. Can this be done if web application is
+//   not aware it is being deployed in parallel?
+public AuthConfigFactoryImpl() {
+loadPersistentRegistrations();
+}
+
+
+@Override
+public AuthConfigProvider getConfigProvider(String layer, String 
appContext,
+RegistrationListener listener) {
+String registrationID = getRegistrarionID(layer, appContext);
+RegistrationContextImpl registrationContext = 
registrations.get(registrationID);
+if (registrationContext != null) {
+registrationContext.addListener(null);
+return registrationContext.getProvider();
+}
+return null;
+}
+
+
+@Override
+public String registerConfigProvider(String className,
+@SuppressWarnings("rawt

Re: JASPIC progress

[Mark Thomas]

On 10/02/2016 14:03, Arjan Tijms wrote:
> Mark Thomas-2 wrote
>> As I thought about this some more, I realised that there is nothing in 
>> the Servlet Container profile in the JASPIC spec (that I have been able 
>> to find) about when AuthConfigProvider registration takes place. This 
>> means that AuthConfigProvider registrations and de-registrations could 
>> take place while the web application is running. 
> 
> It's a good point indeed. In practice it always seems to be either a
> ServletContainerInitializer or a ServletContextListener, or of course via a
> server proprietary method (outside the application).

Thanks for the confirmation.

> I'm not entirely sure what the use case was for having this flexibility.
> I'll try to see if I can get a clarification from Ron about this. I wonder
> how many implementations even support registrations and de-registrations at
> arbitrary moments.

Generally, JASPIC appears to favour flexibility over simplicity. My
first impression is that there is too much flexibility but I am only
looking at it from the fairly narrow scope of a Servlet container.


> Mark Thomas-2 wrote
>> - have authenticate() check (i.e. on every request) for a JASPIC config
>>   and use it if present
>> - cache what I can (for speed) and use a RegistrationListener to track
>>   updates
> 
> That should indeed be the approach.
> 
> What the RI roughly does is from its embedded Tomcat in
> AuthenticatorBase#invoke it calls an adapter:

Thanks but I'm not planning on reading the rest as I am concerned about
licensing.



> Hope this helps.

It did. Thanks. It is good to know the code is heading in the right
direction. That some of the javaee7-sample unit tests now pass is alsi
reassuring.

Mark


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

Re: svn commit: r1729742 - in /tomcat/trunk: java/org/apache/catalina/authenticator/jaspic/ test/org/apache/catalina/authenticator/jaspic/ test/org/apache/catalina/startup/

[Mark Thomas]

On 10/02/2016 21:26, ma...@apache.org wrote:
> Author: markt
> Date: Wed Feb 10 21:26:46 2016
> New Revision: 1729742
> 
> URL: http://svn.apache.org/viewvc?rev=1729742&view=rev
> Log:
> Next stage of JASPIC implementation (excluding the changes to 
> AuthenticatorBase to integrate JASPIC support).
> With the necessary integration, this code passes the javaee7-samples JASPIC 
> unit tests as far as the lifecycle tests (which currently all fail).

My plan is to continue to work through the unit tests fixing the
failures. Once I have something that I think is complete I'll commit the
integration code for AuthenticatorBase. If people would prefer me to
commit that know (with the possible performance impacts that might have)
I'm happy to do so.

Mark

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

buildbot failure in on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

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

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

Re: svn commit: r1729390 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ webapps/docs/

[Mark Thomas]

On 09/02/2016 14:22, ma...@apache.org wrote:
> Author: markt
> Date: Tue Feb  9 14:22:29 2016
> New Revision: 1729390
> 
> URL: http://svn.apache.org/viewvc?rev=1729390&view=rev
> Log:
> Refactor AuthenticatorBase to support future plans for the JASPIC 
> implementation.

Just a heads up that I'm currently thinking I'm going to need to revert
this. As I learn more about JASPIC the authenticate() doesn't look like
the best integration point. invoke() looks better.

However, I currently have bigger problems. JASPIC wants to be able to
wrap requests and responses. Something that isn't possible in a Valve. I
am currently looking at ways to make that work.

Mark


-
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,
 and has been outstanding for 6 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-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: 43 mins 48 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-20160211-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-20160211.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160211-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-20160211/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
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/t

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

[Bill Barker]

To whom it may engage...

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

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


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-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 tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -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.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 38 mins 39 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 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-NIO 
-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
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160211.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/w
 
orkspace/apache-commons/daemon/dist/bin/commons-daemon-20160211-native-src.tar.gz
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160211-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dexecute.test.nio=true -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160211.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/