Re: Eclipse JAR dependency
2014-08-11 16:36 GMT+04:00 Mark Thomas ma...@apache.org: On 10/08/2014 14:24, Konstantin Kolinko wrote: 2014-08-08 21:12 GMT+04:00 Mark Thomas ma...@apache.org: snip/ 3. We will not normally update Tomcat's dependency on JDT until the 'small' JAR is available in Maven Central. snip/ I disagree (-0, not a stopper) with 3., as this procedure lacks explicit step that triggers upload of small jar. Currently the incentive for the upload is our having started to use the new version. There is no incentive other than that, as I think no other project besides us uses the jar. Essentially we have to announce that we want to update the dependency and wait for a volunteer to notice the announcement. Ah. That makes things more problematic, especially if they wait for the pom to be updated and start to fail before they start their update process. snip/ I think that the procedure is 1) update build.properties.default and IDE project files 2) post a heads-up notice on dev/users and wait a few days 3) update POM (using the fallback options) It is going to be a while before we need to update this again. 4.4.1 (Luna SR1) is planned for end of September https://projects.eclipse.org/projects/eclipse/releases/4.4.1/plan I suspect there will have to be a little bit of trial and error until we find the smoothest process. It would help if we knew who was currently uploading the JDT jar then we could ping them directly (unless they are already watching the dev list). http://markmail.org/message/xyw3bv2flmbhsdt4 ECJ 3.3.1 now in Maven Central for Tomcat Jasper 6.0.32 by Ian, with a blog http://ianbrandt.com/2011/10/10/ecj-3-7-1-published-to-maven-central/ http://markmail.org/message/ezd4aabn4j3cqje4 Tomcat 7.0.34 and ecj 3.7.2/4.2.1 by Ralph http://markmail.org/message/eup4mxfjvxl7c5mp ecj 4.2.2 by Ralph The latter posts were on the users list. I do not remember reading any followup letters for versions (4.3.1, P20140317-1600, 4.4). Maybe there are, but I missed them. So I do not know whom to thank for those. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1617433 - in /tomcat/tc7.0.x/trunk: ./ bin/setclasspath.bat
Author: markt Date: Tue Aug 12 08:23:12 2014 New Revision: 1617433 URL: http://svn.apache.org/r1617433 Log: Fix copy/paste error spotted by kkolinko Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/bin/setclasspath.bat Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1617383 Modified: tomcat/tc7.0.x/trunk/bin/setclasspath.bat URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/setclasspath.bat?rev=1617433r1=1617432r2=1617433view=diff == --- tomcat/tc7.0.x/trunk/bin/setclasspath.bat (original) +++ tomcat/tc7.0.x/trunk/bin/setclasspath.bat Tue Aug 12 08:23:12 2014 @@ -80,7 +80,7 @@ set _RUNJAVA=%JRE_HOME%\bin\java :gotRunJava rem Don't override _RUNJDB if the user has set it previously -if not %_RUNJAVA% == goto gotRunJdb +if not %_RUNJDB% == goto gotRunJdb set _RUNJDB=%JAVA_HOME%\bin\jdb :gotRunJdb - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1617434 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Aug 12 08:24:17 2014 New Revision: 1617434 URL: http://svn.apache.org/r1617434 Log: Update proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1617434r1=1617433r2=1617434view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Aug 12 08:24:17 2014 @@ -56,6 +56,7 @@ PATCHES PROPOSED TO BACKPORT: Based on a patch by Neeme Praks. http://svn.apache.org/r1617364 (the actual fix) http://svn.apache.org/r1617374 (fix typo in changelog) + http://svn.apache.org/r1617433 (copy/paste error) +1: markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/209 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1617433 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 51294] Since 7.0.12 do not work option unpackWARs=true for WARs outside appBase
https://issues.apache.org/bugzilla/show_bug.cgi?id=51294 Andrei Zhuk andrey.z...@gmail.com changed: What|Removed |Added CC||andrey.z...@gmail.com --- Comment #27 from Andrei Zhuk andrey.z...@gmail.com --- The wars outside appBase are not unpacked in 7.0.55 although worked in 7.0.54. Can you please clarify if it is an intentional change or a regression? -- 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: r1617442 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Tue Aug 12 09:58:10 2014 New Revision: 1617442 URL: http://svn.apache.org/r1617442 Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1617442r1=1617441r2=1617442view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Aug 12 09:58:10 2014 @@ -52,12 +52,12 @@ PATCHES PROPOSED TO BACKPORT: -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56829 - Add the ability for users to define their own values for _RUNJAVA and _RUNJBD. + Add the ability for users to define their own values for _RUNJAVA and _RUNJDB. Based on a patch by Neeme Praks. http://svn.apache.org/r1617364 (the actual fix) http://svn.apache.org/r1617374 (fix typo in changelog) http://svn.apache.org/r1617433 (copy/paste error) - +1: markt + +1: markt, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 51294] Since 7.0.12 do not work option unpackWARs=true for WARs outside appBase
https://issues.apache.org/bugzilla/show_bug.cgi?id=51294 --- Comment #28 from Konstantin Kolinko knst.koli...@gmail.com --- (In reply to Andrei Zhuk from comment #27) The wars outside appBase are not unpacked in 7.0.55 although worked in 7.0.54. There is no such change. I have just tested it with 7.0.55 and the feature works. (I tested both with a separate context xml file and with Context element in server.xml. Both deployments successfully unpacked a war.) Ask on the users mailing list if you still have problems. -- 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: r1617443 - /tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Author: markt
Date: Tue Aug 12 10:17:11 2014
New Revision: 1617443
URL: http://svn.apache.org/r1617443
Log:
Restore !included test to correct location
Some other component (e.g. filter) may have already set the vary header so
account for that.
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1617443r1=1617442r2=1617443view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Tue Aug
12 10:17:11 2014
@@ -33,6 +33,7 @@ import java.io.StringReader;
import java.io.StringWriter;
import java.security.AccessController;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.Locale;
@@ -799,11 +800,22 @@ public class DefaultServlet extends Http
// Serve a gzipped version of the file if present
boolean usingGzippedVersion = false;
-if (gzip resource.isFile() !path.endsWith(.gz)) {
+if (gzip !included resource.isFile() !path.endsWith(.gz)) {
WebResource gzipResource = resources.getResource(path + .gz);
if (gzipResource.exists() gzipResource.isFile()) {
-response.addHeader(Vary, accept-encoding);
-if (!included checkIfGzip(request)) {
+CollectionString varyHeaders = response.getHeaders(Vary);
+boolean addRequired = true;
+for (String varyHeader : varyHeaders) {
+if (*.equals(varyHeader) ||
+accept-encoding.equalsIgnoreCase(varyHeader)) {
+addRequired = false;
+break;
+}
+}
+if (addRequired) {
+response.addHeader(Vary, accept-encoding);
+}
+if (checkIfGzip(request)) {
response.addHeader(Content-Encoding, gzip);
resource = gzipResource;
usingGzippedVersion = true;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1615697 - in /tomcat/trunk: java/org/apache/catalina/servlets/DefaultServlet.java webapps/docs/changelog.xml
On 12/08/2014 00:14, Konstantin Kolinko wrote: 2014-08-04 21:22 GMT+04:00 ma...@apache.org: Author: markt Date: Mon Aug 4 17:22:01 2014 New Revision: 1615697 URL: http://svn.apache.org/r1615697 Log: When the gzip option is enabled for the DefaultServlet ensure that a suitable Vary header is returned for resources that might be returned directly in compressed form. Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1615697r1=1615696r2=1615697view=diff == --- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Mon Aug 4 17:22:01 2014 @@ -799,16 +799,15 @@ public class DefaultServlet extends Http // Serve a gzipped version of the file if present boolean usingGzippedVersion = false; -if (gzip -resource.isFile() -!included 1). I do get why !included check was moved to the place below. I think it should not be moved. I think that included flag does not depend on accept-encoding value sent by user. Agreed. Fixed. 2). There may already be a Vary header in the response. Agreed. A filter could set one. This has been fixed too. 3) The code may check response.isCommitted(). (In other words, that addHeader(Content-Encoding, gzip) call has been successful). Is that necessary? It isn't something we check anywhere else in the DefaultServlet (and I am not aware of any problems in that area). Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 51294] Since 7.0.12 do not work option unpackWARs=true for WARs outside appBase
https://issues.apache.org/bugzilla/show_bug.cgi?id=51294 --- Comment #29 from Andrei Zhuk andrey.z...@gmail.com --- My bad - there was a problem with appBase directory permissions. Everything works. Sorry for confusion. -- 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: svn commit: r1615697 - in /tomcat/trunk: java/org/apache/catalina/servlets/DefaultServlet.java webapps/docs/changelog.xml
2014-08-12 14:19 GMT+04:00 Mark Thomas ma...@apache.org: On 12/08/2014 00:14, Konstantin Kolinko wrote: 2014-08-04 21:22 GMT+04:00 ma...@apache.org: Author: markt Date: Mon Aug 4 17:22:01 2014 New Revision: 1615697 URL: http://svn.apache.org/r1615697 Log: When the gzip option is enabled for the DefaultServlet ensure that a suitable Vary header is returned for resources that might be returned directly in compressed form. Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1615697r1=1615696r2=1615697view=diff == --- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Mon Aug 4 17:22:01 2014 @@ -799,16 +799,15 @@ public class DefaultServlet extends Http // Serve a gzipped version of the file if present boolean usingGzippedVersion = false; -if (gzip -resource.isFile() -!included 1). I do get why !included check was moved to the place below. I think it should not be moved. I think that included flag does not depend on accept-encoding value sent by user. Agreed. Fixed. Good. 2). There may already be a Vary header in the response. Agreed. A filter could set one. This has been fixed too. The updated HTTP specification does not allow multiple Vary headers in the response. Multiple headers are allowed only if value is defined as a list, but here it is defined as asterisk or a list. 3) The code may check response.isCommitted(). (In other words, that addHeader(Content-Encoding, gzip) call has been successful). Is that necessary? It isn't something we check anywhere else in the DefaultServlet (and I am not aware of any problems in that area). Just an additional check to add to the condition where if(!included) is checked. I guess that majority of such use cases are already covered by if(!included) check. It matters only if some content have already been generated by a Filter. This gz file serving feature is relatively new and it is off by default, so I think there are not many who are using it to report errors. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Early Access build for JDK 9 b26 is available on java.net
Hi Mladen/Mark, Early Access build for JDK 9 b26 https://jdk9.java.net/download/ is available on java.net. Summary of changes http://download.java.net/jdk9/changes/jdk9-b26.html?q=download/jdk9/changes/jdk9-b26.html in JDK 9 Build 26 Early Access Build Test Results http://download.java.net/openjdk/testresults/9/testresults.html Rgds, Rory -- Rgds,Rory O'Donnell Quality Engineering Manager Oracle EMEA , Dublin, Ireland
svn commit: r1617445 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ test/org/apache/tomcat/util/net/ webapps/docs/
Author: markt
Date: Tue Aug 12 10:41:49 2014
New Revision: 1617445
URL: http://svn.apache.org/r1617445
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56825
Enable pre-emptive authentication to work with the SSL authenticator. Based on
a patch by jlmonteiro.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCert.java
tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1617445r1=1617444r2=1617445view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Tue Aug 12 10:41:49 2014
@@ -41,6 +41,7 @@ import org.apache.catalina.connector.Req
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.SessionIdGenerator;
import org.apache.catalina.valves.ValveBase;
+import org.apache.coyote.ActionCode;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.descriptor.web.LoginConfig;
@@ -566,8 +567,7 @@ public abstract class AuthenticatorBase
}
if (!authRequired context.getPreemptiveAuthentication()) {
-X509Certificate[] certs = (X509Certificate[]) request.getAttribute(
-Globals.CERTIFICATES_ATTR);
+X509Certificate[] certs = getRequestCertificates(request);
authRequired = certs != null certs.length 0;
}
@@ -619,6 +619,35 @@ public abstract class AuthenticatorBase
// -- Protected Methods
+/**
+ * Look for the X509 certificate chain in the Request under the key
+ * codejavax.servlet.request.X509Certificate/code. If not found,
trigger
+ * extracting the certificate chain from the Coyote request.
+ *
+ * @param request Request to be processed
+ *
+ * @return The X509 certificate chain if found, codenull/code
+ * otherwise.
+ */
+protected X509Certificate[] getRequestCertificates(final Request request)
+throws IllegalStateException {
+
+X509Certificate certs[] =
+(X509Certificate[])
request.getAttribute(Globals.CERTIFICATES_ATTR);
+
+if ((certs == null) || (certs.length 1)) {
+try {
+request.getCoyoteRequest().action
(ActionCode.REQ_SSL_CERTIFICATE, null);
+certs = (X509Certificate[])
request.getAttribute(Globals.CERTIFICATES_ATTR);
+} catch (IllegalStateException ise) {
+// Request body was too large for save buffer
+// Return null which will trigger an auth failure
+}
+}
+
+return certs;
+}
+
/**
* Associate the specified single sign on identifier with the
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java?rev=1617445r1=1617444r2=1617445view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
Tue Aug 12 10:41:49 2014
@@ -23,9 +23,7 @@ import java.security.cert.X509Certificat
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.catalina.Globals;
import org.apache.catalina.connector.Request;
-import org.apache.coyote.ActionCode;
/**
* An bAuthenticator/b and bValve/b implementation of authentication
@@ -97,28 +95,15 @@ public class SSLAuthenticator extends Au
containerLog.debug( Looking up certificates);
}
-X509Certificate certs[] = (X509Certificate[])
-request.getAttribute(Globals.CERTIFICATES_ATTR);
-if ((certs == null) || (certs.length 1)) {
-try {
-request.getCoyoteRequest().action
- (ActionCode.REQ_SSL_CERTIFICATE, null);
-} catch (IllegalStateException ise) {
-// Request body was too large for save buffer
-response.sendError(HttpServletResponse.SC_UNAUTHORIZED,
-sm.getString(authenticator.certificates));
-return false;
-}
-certs = (X509Certificate[])
-
svn commit: r1617447 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/authenticator/ test/org/apache/tomcat/util/net/ webapps/docs/
Author: markt
Date: Tue Aug 12 10:53:23 2014
New Revision: 1617447
URL: http://svn.apache.org/r1617447
Log:
Enable pre-emptive authentication to work with the SSL authenticator. Based on
a patch by jlmonteiro.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestClientCert.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1617445
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1617447r1=1617446r2=1617447view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Tue Aug 12 10:53:23 2014
@@ -47,6 +47,7 @@ import org.apache.catalina.deploy.Securi
import org.apache.catalina.util.DateTool;
import org.apache.catalina.util.SessionIdGenerator;
import org.apache.catalina.valves.ValveBase;
+import org.apache.coyote.ActionCode;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
@@ -561,8 +562,7 @@ public abstract class AuthenticatorBase
}
if (!authRequired context.getPreemptiveAuthentication()) {
-X509Certificate[] certs = (X509Certificate[]) request.getAttribute(
-Globals.CERTIFICATES_ATTR);
+X509Certificate[] certs = getRequestCertificates(request);
authRequired = certs != null certs.length 0;
}
@@ -614,6 +614,35 @@ public abstract class AuthenticatorBase
// -- Protected Methods
+/**
+ * Look for the X509 certificate chain in the Request under the key
+ * codejavax.servlet.request.X509Certificate/code. If not found,
trigger
+ * extracting the certificate chain from the Coyote request.
+ *
+ * @param request Request to be processed
+ *
+ * @return The X509 certificate chain if found, codenull/code
+ * otherwise.
+ */
+protected X509Certificate[] getRequestCertificates(final Request request)
+throws IllegalStateException {
+
+X509Certificate certs[] =
+(X509Certificate[])
request.getAttribute(Globals.CERTIFICATES_ATTR);
+
+if ((certs == null) || (certs.length 1)) {
+try {
+request.getCoyoteRequest().action
(ActionCode.REQ_SSL_CERTIFICATE, null);
+certs = (X509Certificate[])
request.getAttribute(Globals.CERTIFICATES_ATTR);
+} catch (IllegalStateException ise) {
+// Request body was too large for save buffer
+// Return null which will trigger an auth failure
+}
+}
+
+return certs;
+}
+
/**
* Associate the specified single sign on identifier with the
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java?rev=1617447r1=1617446r2=1617447view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
Tue Aug 12 10:53:23 2014
@@ -26,10 +26,8 @@ import java.security.cert.X509Certificat
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.catalina.Globals;
import org.apache.catalina.connector.Request;
import org.apache.catalina.deploy.LoginConfig;
-import org.apache.coyote.ActionCode;
@@ -129,27 +127,14 @@ public class SSLAuthenticator
if (containerLog.isDebugEnabled())
containerLog.debug( Looking up certificates);
-X509Certificate certs[] = (X509Certificate[])
-request.getAttribute(Globals.CERTIFICATES_ATTR);
-if ((certs == null) || (certs.length 1)) {
-try {
-request.getCoyoteRequest().action
- (ActionCode.REQ_SSL_CERTIFICATE, null);
-} catch (IllegalStateException ise) {
-// Request body was too large for save buffer
-
[Bug 56825] AuthenticatorBase not looking for Coyote Request certificate
https://issues.apache.org/bugzilla/show_bug.cgi?id=56825 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas ma...@apache.org --- Sorry, I wanted to get the next 8.0.x release out so I have taken you patch and applied to to 8.0.x myself. In addition to the changes I mentioned previously, I also did the unit tests slightly differently to reduce the number of changes required. This has been fixed in 8.0.x for 8.0.11 onwards and in 7.0.x for 7.0.56 onwards. -- 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: svn commit: r1617445 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ test/org/apache/tomcat/util/net/ webapps/docs/
2014-08-12 14:41 GMT+04:00 ma...@apache.org:
Author: markt
Date: Tue Aug 12 10:41:49 2014
New Revision: 1617445
URL: http://svn.apache.org/r1617445
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56825
Enable pre-emptive authentication to work with the SSL authenticator. Based
on a patch by jlmonteiro.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCert.java
tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1617445r1=1617444r2=1617445view=diff
==
---
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Tue Aug 12 10:41:49 2014
@@ -41,6 +41,7 @@ import org.apache.catalina.connector.Req
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.SessionIdGenerator;
import org.apache.catalina.valves.ValveBase;
+import org.apache.coyote.ActionCode;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.descriptor.web.LoginConfig;
@@ -566,8 +567,7 @@ public abstract class AuthenticatorBase
}
if (!authRequired context.getPreemptiveAuthentication()) {
-X509Certificate[] certs = (X509Certificate[])
request.getAttribute(
-Globals.CERTIFICATES_ATTR);
+X509Certificate[] certs = getRequestCertificates(request);
authRequired = certs != null certs.length 0;
}
@@ -619,6 +619,35 @@ public abstract class AuthenticatorBase
// -- Protected
Methods
+/**
+ * Look for the X509 certificate chain in the Request under the key
+ * codejavax.servlet.request.X509Certificate/code. If not found,
trigger
+ * extracting the certificate chain from the Coyote request.
+ *
+ * @param request Request to be processed
+ *
+ * @return The X509 certificate chain if found,
codenull/code
+ * otherwise.
+ */
+protected X509Certificate[] getRequestCertificates(final Request request)
+throws IllegalStateException {
+
+X509Certificate certs[] =
+(X509Certificate[])
request.getAttribute(Globals.CERTIFICATES_ATTR);
+
+if ((certs == null) || (certs.length 1)) {
+try {
+request.getCoyoteRequest().action
(ActionCode.REQ_SSL_CERTIFICATE, null);
This ActionCode causes re-regotiation of HTTPS.
It is understandable in case if webapp expects a certificate (in
SSLAuthenticator), but in AuthenticatorBase this is generic code.
Will it (erroneously) trigger re-authentication for webapps that do
not need it, e.g. protected by BASIC authentication?
I also wonder whether there is some check if renegotiation has already
been attempted once on this connection.
+certs = (X509Certificate[])
request.getAttribute(Globals.CERTIFICATES_ATTR);
+} catch (IllegalStateException ise) {
+// Request body was too large for save buffer
+// Return null which will trigger an auth failure
Regarding the comment. This code may return a zero-length array as
well. (It is processed in the same way as null by the callers, so it
makes no difference).
+}
+}
+
+return certs;
+}
+
(...)
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1617445 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ test/org/apache/tomcat/util/net/ webapps/docs/
On 12/08/2014 11:56, Konstantin Kolinko wrote:
2014-08-12 14:41 GMT+04:00 ma...@apache.org:
Author: markt
Date: Tue Aug 12 10:41:49 2014
New Revision: 1617445
URL: http://svn.apache.org/r1617445
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56825
Enable pre-emptive authentication to work with the SSL authenticator. Based
on a patch by jlmonteiro.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCert.java
tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1617445r1=1617444r2=1617445view=diff
==
---
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Tue Aug 12 10:41:49 2014
@@ -41,6 +41,7 @@ import org.apache.catalina.connector.Req
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.SessionIdGenerator;
import org.apache.catalina.valves.ValveBase;
+import org.apache.coyote.ActionCode;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.descriptor.web.LoginConfig;
@@ -566,8 +567,7 @@ public abstract class AuthenticatorBase
}
if (!authRequired context.getPreemptiveAuthentication()) {
-X509Certificate[] certs = (X509Certificate[])
request.getAttribute(
-Globals.CERTIFICATES_ATTR);
+X509Certificate[] certs = getRequestCertificates(request);
authRequired = certs != null certs.length 0;
}
@@ -619,6 +619,35 @@ public abstract class AuthenticatorBase
// -- Protected
Methods
+/**
+ * Look for the X509 certificate chain in the Request under the key
+ * codejavax.servlet.request.X509Certificate/code. If not found,
trigger
+ * extracting the certificate chain from the Coyote request.
+ *
+ * @param request Request to be processed
+ *
+ * @return The X509 certificate chain if found,
codenull/code
+ * otherwise.
+ */
+protected X509Certificate[] getRequestCertificates(final Request
request)
+throws IllegalStateException {
+
+X509Certificate certs[] =
+(X509Certificate[])
request.getAttribute(Globals.CERTIFICATES_ATTR);
+
+if ((certs == null) || (certs.length 1)) {
+try {
+request.getCoyoteRequest().action
(ActionCode.REQ_SSL_CERTIFICATE, null);
This ActionCode causes re-regotiation of HTTPS.
Ah. I didn't spot that. I need to look more closely at exactly what is
going on where.
It is understandable in case if webapp expects a certificate (in
SSLAuthenticator), but in AuthenticatorBase this is generic code.
Indeed.
Will it (erroneously) trigger re-authentication for webapps that do
not need it, e.g. protected by BASIC authentication?
Let me work through some examples. This might need changing / removing.
I also wonder whether there is some check if renegotiation has already
been attempted once on this connection.
I'm not sure. Logically, there must be something stopping re-negotiation
every time the certs are requested for an authenticated resource but I
need look at the code in a bit more depth.
The other thing to keep in mind is that setting clientAuth=want is
probably the better way to handle this use case.
Thanks for the review.
Mark
-
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-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/359 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1617443 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
buildbot failure in ASF Buildbot on tomcat-7-trunk
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/210 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1617447 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
[Bug 56825] AuthenticatorBase not looking for Coyote Request certificate
https://issues.apache.org/bugzilla/show_bug.cgi?id=56825 --- Comment #5 from jlmonteiro jlmonte...@tomitribe.com --- Thank you very much Mark. I'll check your commit so that I can avoid such mistakes next time. -- 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 56831] javax.faces.application.ViewExpiredException thrown for applications which contextRoot contains dash
https://issues.apache.org/bugzilla/show_bug.cgi?id=56831 --- Comment #7 from Juraj Huska jhu...@redhat.com --- Thanks for your input and guidance. My unhelpful issue description was caused by my lack of expertise. Now I have a bit bigger understanding what is going on, and I will dig in deeper and provide you some more information. -- 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: r1617456 - in /tomcat/trunk: bin/setclasspath.bat webapps/docs/changelog.xml
Author: kkolinko Date: Tue Aug 12 11:57:52 2014 New Revision: 1617456 URL: http://svn.apache.org/r1617456 Log: Followup to fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56829 Be more strict with executable filename on Windows (s/java/java.exe/). When file name extension is not specified, Windows uses the value of %PATHEXT% environment variable to enumerate applicable filename extensions. On my Windows 7 its value is .COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC. I think it is a bit more secure if filename is specified explicitly. There shall be no observable difference in behaviour, as .EXE is at the start of the PATHEXT list (e.g. earlier than .BAT). Modified: tomcat/trunk/bin/setclasspath.bat tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/bin/setclasspath.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.bat?rev=1617456r1=1617455r2=1617456view=diff == --- tomcat/trunk/bin/setclasspath.bat (original) +++ tomcat/trunk/bin/setclasspath.bat Tue Aug 12 11:57:52 2014 @@ -75,13 +75,13 @@ rem Don't override _RUNJAVA if the user if not %_RUNJAVA% == goto gotRunJava rem Set standard command for invoking Java. rem Also note the quoting as JRE_HOME may contain spaces. -set _RUNJAVA=%JRE_HOME%\bin\java +set _RUNJAVA=%JRE_HOME%\bin\java.exe :gotRunJava rem Don't override _RUNJDB if the user has set it previously rem Also note the quoting as JAVA_HOME may contain spaces. if not %_RUNJDB% == goto gotRunJdb -set _RUNJDB=%JAVA_HOME%\bin\jdb +set _RUNJDB=%JAVA_HOME%\bin\jdb.exe :gotRunJdb goto end Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1617456r1=1617455r2=1617456view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Aug 12 11:57:52 2014 @@ -215,8 +215,9 @@ /add add bug56829/bug: Add the ability for users to define their own values -for code_RUNJAVA/code and code_RUNJDB/code. Based on a patch by -Neeme Praks. (markt) +for code_RUNJAVA/code and code_RUNJDB/code environment +variables. Be more strict with executable filename on Windows +(s/java/java.exe/). Based on a patch by Neeme Praks. (markt/kkolinko) /add /changelog /subsection - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1617457 - in /tomcat/tc7.0.x/trunk: ./ bin/setclasspath.bat
Author: kkolinko Date: Tue Aug 12 12:07:16 2014 New Revision: 1617457 URL: http://svn.apache.org/r1617457 Log: Improve comments It is backport of r1617365 Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/bin/setclasspath.bat Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1617365 Modified: tomcat/tc7.0.x/trunk/bin/setclasspath.bat URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/setclasspath.bat?rev=1617457r1=1617456r2=1617457view=diff == --- tomcat/tc7.0.x/trunk/bin/setclasspath.bat (original) +++ tomcat/tc7.0.x/trunk/bin/setclasspath.bat Tue Aug 12 12:07:16 2014 @@ -74,12 +74,12 @@ set JAVA_ENDORSED_DIRS=%CATALINA_HOME%\ rem Don't override _RUNJAVA if the user has set it previously if not %_RUNJAVA% == goto gotRunJava rem Set standard command for invoking Java. -rem Note that NT requires a window name argument when using start. -rem Also note the quoting as JAVA_HOME may contain spaces. +rem Also note the quoting as JRE_HOME may contain spaces. set _RUNJAVA=%JRE_HOME%\bin\java :gotRunJava rem Don't override _RUNJDB if the user has set it previously +rem Also note the quoting as JAVA_HOME may contain spaces. if not %_RUNJDB% == goto gotRunJdb set _RUNJDB=%JAVA_HOME%\bin\jdb :gotRunJdb - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1617458 - in /tomcat/tc7.0.x/trunk: ./ bin/setclasspath.bat webapps/docs/changelog.xml
Author: kkolinko Date: Tue Aug 12 12:08:57 2014 New Revision: 1617458 URL: http://svn.apache.org/r1617458 Log: Followup to fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56829 Be more strict with executable filename on Windows (s/java/java.exe/). When file name extension is not specified, Windows uses the value of %PATHEXT% environment variable to enumerate applicable filename extensions. On my Windows 7 its value is .COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC. I think it is a bit more secure if filename is specified explicitly. There shall be no observable difference in behaviour, as .EXE is at the start of the PATHEXT list (e.g. earlier than .BAT). It is merge of r1617456 from tomcat/trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/bin/setclasspath.bat tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1617456 Modified: tomcat/tc7.0.x/trunk/bin/setclasspath.bat URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/setclasspath.bat?rev=1617458r1=1617457r2=1617458view=diff == --- tomcat/tc7.0.x/trunk/bin/setclasspath.bat (original) +++ tomcat/tc7.0.x/trunk/bin/setclasspath.bat Tue Aug 12 12:08:57 2014 @@ -75,13 +75,13 @@ rem Don't override _RUNJAVA if the user if not %_RUNJAVA% == goto gotRunJava rem Set standard command for invoking Java. rem Also note the quoting as JRE_HOME may contain spaces. -set _RUNJAVA=%JRE_HOME%\bin\java +set _RUNJAVA=%JRE_HOME%\bin\java.exe :gotRunJava rem Don't override _RUNJDB if the user has set it previously rem Also note the quoting as JAVA_HOME may contain spaces. if not %_RUNJDB% == goto gotRunJdb -set _RUNJDB=%JAVA_HOME%\bin\jdb +set _RUNJDB=%JAVA_HOME%\bin\jdb.exe :gotRunJdb goto end Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1617458r1=1617457r2=1617458view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Aug 12 12:08:57 2014 @@ -141,8 +141,9 @@ /add add bug56829/bug: Add the ability for users to define their own values -for code_RUNJAVA/code and code_RUNJDB/code. Based on a patch by -Neeme Praks. (markt) +for code_RUNJAVA/code and code_RUNJDB/code environment +variables. Be more strict with executable filename on Windows +(s/java/java.exe/). Based on a patch by Neeme Praks. (markt/kkolinko) /add /changelog /subsection - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1617459 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Tue Aug 12 12:11:45 2014 New Revision: 1617459 URL: http://svn.apache.org/r1617459 Log: proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1617459r1=1617458r2=1617459view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Aug 12 12:11:45 2014 @@ -57,9 +57,14 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/r1617364 (the actual fix) http://svn.apache.org/r1617374 (fix typo in changelog) http://svn.apache.org/r1617433 (copy/paste error) + http://svn.apache.org/r1617457 (comments) +1: markt, kkolinko -1: +* Be more strict with executable filename on Windows (s/java/java.exe/). + http://svn.apache.org/r1617458 + +1: kkolinko + -1: PATCHES/ISSUES THAT ARE STALLED: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1617461 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ java/org/apache/coyote/http11/ test/org/apache/tomcat/util/net/
Author: markt
Date: Tue Aug 12 12:42:18 2014
New Revision: 1617461
URL: http://svn.apache.org/r1617461
Log:
Follow-on to r1617445
If a client certificate is required and one is not available then force
renegotiation to obtain it.
If a client certificate is optional then do not force renegotiation before
trying to obtain it.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCert.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1617461r1=1617460r2=1617461view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Tue Aug 12 12:42:18 2014
@@ -567,7 +567,7 @@ public abstract class AuthenticatorBase
}
if (!authRequired context.getPreemptiveAuthentication()) {
-X509Certificate[] certs = getRequestCertificates(request);
+X509Certificate[] certs = getRequestCertificates(request, false);
authRequired = certs != null certs.length 0;
}
@@ -625,11 +625,13 @@ public abstract class AuthenticatorBase
* extracting the certificate chain from the Coyote request.
*
* @param request Request to be processed
+ * @param force Should a renegotiation be forced to request
certificates
+ * from the user agent if none have been provided
*
* @return The X509 certificate chain if found, codenull/code
* otherwise.
*/
-protected X509Certificate[] getRequestCertificates(final Request request)
+protected X509Certificate[] getRequestCertificates(final Request request,
boolean force)
throws IllegalStateException {
X509Certificate certs[] =
@@ -637,7 +639,7 @@ public abstract class AuthenticatorBase
if ((certs == null) || (certs.length 1)) {
try {
-request.getCoyoteRequest().action
(ActionCode.REQ_SSL_CERTIFICATE, null);
+
request.getCoyoteRequest().action(ActionCode.REQ_SSL_CERTIFICATE,
Boolean.valueOf(force));
certs = (X509Certificate[])
request.getAttribute(Globals.CERTIFICATES_ATTR);
} catch (IllegalStateException ise) {
// Request body was too large for save buffer
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java?rev=1617461r1=1617460r2=1617461view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
Tue Aug 12 12:42:18 2014
@@ -95,7 +95,7 @@ public class SSLAuthenticator extends Au
containerLog.debug( Looking up certificates);
}
-X509Certificate certs[] = getRequestCertificates(request);
+X509Certificate certs[] = getRequestCertificates(request, true);
if ((certs == null) || (certs.length 1)) {
if (containerLog.isDebugEnabled()) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1617461r1=1617460r2=1617461view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Tue Aug
12 12:42:18 2014
@@ -419,18 +419,26 @@ public class Http11AprProcessor extends
}
case REQ_SSL_CERTIFICATE: {
if (endpoint.isSSLEnabled() (socketRef != 0)) {
-// Consume and buffer the request body, so that it does not
-// interfere with the client's handshake messages
-InputFilter[] inputFilters = inputBuffer.getFilters();
-((BufferedInputFilter)
inputFilters[Constants.BUFFERED_FILTER]).setLimit(maxSavePostSize);
-
inputBuffer.addActiveFilter(inputFilters[Constants.BUFFERED_FILTER]);
+boolean force = ((Boolean)
Re: svn commit: r1617445 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ test/org/apache/tomcat/util/net/ webapps/docs/
On 12/08/2014 12:15, Mark Thomas wrote:
On 12/08/2014 11:56, Konstantin Kolinko wrote:
2014-08-12 14:41 GMT+04:00 ma...@apache.org:
Author: markt
Date: Tue Aug 12 10:41:49 2014
New Revision: 1617445
URL: http://svn.apache.org/r1617445
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56825
Enable pre-emptive authentication to work with the SSL authenticator. Based
on a patch by jlmonteiro.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java
tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCert.java
tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1617445r1=1617444r2=1617445view=diff
==
---
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Tue Aug 12 10:41:49 2014
@@ -41,6 +41,7 @@ import org.apache.catalina.connector.Req
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.SessionIdGenerator;
import org.apache.catalina.valves.ValveBase;
+import org.apache.coyote.ActionCode;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.descriptor.web.LoginConfig;
@@ -566,8 +567,7 @@ public abstract class AuthenticatorBase
}
if (!authRequired context.getPreemptiveAuthentication()) {
-X509Certificate[] certs = (X509Certificate[])
request.getAttribute(
-Globals.CERTIFICATES_ATTR);
+X509Certificate[] certs = getRequestCertificates(request);
authRequired = certs != null certs.length 0;
}
@@ -619,6 +619,35 @@ public abstract class AuthenticatorBase
// -- Protected
Methods
+/**
+ * Look for the X509 certificate chain in the Request under the key
+ * codejavax.servlet.request.X509Certificate/code. If not found,
trigger
+ * extracting the certificate chain from the Coyote request.
+ *
+ * @param request Request to be processed
+ *
+ * @return The X509 certificate chain if found,
codenull/code
+ * otherwise.
+ */
+protected X509Certificate[] getRequestCertificates(final Request
request)
+throws IllegalStateException {
+
+X509Certificate certs[] =
+(X509Certificate[])
request.getAttribute(Globals.CERTIFICATES_ATTR);
+
+if ((certs == null) || (certs.length 1)) {
+try {
+request.getCoyoteRequest().action
(ActionCode.REQ_SSL_CERTIFICATE, null);
This ActionCode causes re-regotiation of HTTPS.
Ah. I didn't spot that. I need to look more closely at exactly what is
going on where.
It is understandable in case if webapp expects a certificate (in
SSLAuthenticator), but in AuthenticatorBase this is generic code.
Indeed.
Will it (erroneously) trigger re-authentication for webapps that do
not need it, e.g. protected by BASIC authentication?
Let me work through some examples. This might need changing / removing.
I also wonder whether there is some check if renegotiation has already
been attempted once on this connection.
I'm not sure. Logically, there must be something stopping re-negotiation
every time the certs are requested for an authenticated resource but I
need look at the code in a bit more depth.
The other thing to keep in mind is that setting clientAuth=want is
probably the better way to handle this use case.
Thanks for the review.
Should be fixed now.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56838] Performance drop when using XML
https://issues.apache.org/bugzilla/show_bug.cgi?id=56838 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|WONTFIX |--- --- Comment #5 from Konstantin Kolinko knst.koli...@gmail.com --- (In reply to Mark Thomas from comment #3) The bulk of the performance difference between 7.0.x and 8.0.x is as a result of different optimisations (e.g. r1539992 ) being applied to 8.0.x when compared to 7.0.x. Regarding r1539992 In case if we are trying to load a class that is already loaded by the system classloader (it is called javaseLoader in the current trunk code). In the old code the system.loadClass() call does system.findLoadedClass() as one of its first steps and will return fast. In the new code it does getResource() lookup which is slower. a) Is r1539992 really worth it? I expect that a typical web application and its libraries do load a lot of classes from the system classloader. b) Implement a cache that lists classes that have been already loaded by system class loader? -- 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
Tomcat for 8.0.next
It has been a while since my aborted attempt at the last 8.0.x release and we have quite a few additional changes so I intend to start a 8.0.x release shortly. I'm starting to run the unit tests on the usual platforms (OSX, Win64, Linux64) now and - assuming they all pass - I'll tag 8.0.11 once the tests complete. I may still tag if we see some failures (e.g. in NIO2) but I'll look at the on a case by case basis. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1615920 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
2014-08-05 16:55 GMT+04:00 ma...@apache.org:
Author: markt
Date: Tue Aug 5 12:55:20 2014
New Revision: 1615920
URL: http://svn.apache.org/r1615920
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56785
Avoid NullPointerException if directory exists on the class path that is not
readable by the Tomcat user.
Would it be better if users had to opt-in for this silent skipping?
My concern that I mentioned in BZ [1] is that if permissions on web
application directories are not correctly configured, it may skip
classes that define a @WebFilter.
[1] https://issues.apache.org/bugzilla/show_bug.cgi?id=56785#c5
My thought is that better default behaviour would be to treat such
unreadable directories as deployment failure, unless a user opts-in
for the feature.
Best regards,
Konstantin Kolinko
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=1615920r1=1615919r2=1615920view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Aug
5 12:55:20 2014
@@ -1960,10 +1960,13 @@ public class ContextConfig implements Li
boolean handlesTypesOnly) {
if (file.isDirectory()) {
+// Returns null if directory is not readable
String[] dirs = file.list();
-for (String dir : dirs) {
-processAnnotationsFile(
-new File(file,dir), fragment, handlesTypesOnly);
+if (dirs != null) {
+for (String dir : dirs) {
+processAnnotationsFile(
+new File(file,dir), fragment, handlesTypesOnly);
+}
}
} else if (file.canRead() file.getName().endsWith(.class)) {
try (FileInputStream fis = new FileInputStream(file)) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1615920r1=1615919r2=1615920view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Aug 5 12:55:20 2014
@@ -81,6 +81,11 @@
Cédric Couralet. (markt)
/fix
fix
+bug56785/bug: Avoid codeNullPointerException/code if
directory
+exists on the class path that is not readable by the Tomcat user.
+(markt)
+ /fix
+ fix
bug56796/bug: Remove unnecessary sleep when stopping a web
application. (markt)
/fix
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat for 8.0.next
2014-08-12 14:42 GMT+02:00 Mark Thomas ma...@apache.org: I may still tag if we see some failures (e.g. in NIO2) but I'll look at the on a case by case basis. From what I understand, any problem would be a regression, which means it would be a good plan to investigate before tagging. Other than that, +1 Rémy
[Bug 56838] Performance drop when using XML
https://issues.apache.org/bugzilla/show_bug.cgi?id=56838 --- Comment #6 from Mark Thomas ma...@apache.org --- (In reply to Konstantin Kolinko from comment #5) (In reply to Mark Thomas from comment #3) The bulk of the performance difference between 7.0.x and 8.0.x is as a result of different optimisations (e.g. r1539992 ) being applied to 8.0.x when compared to 7.0.x. Regarding r1539992 In case if we are trying to load a class that is already loaded by the system classloader (it is called javaseLoader in the current trunk code). In the old code the system.loadClass() call does system.findLoadedClass() as one of its first steps and will return fast. In the new code it does getResource() lookup which is slower. But the new code doesn't trigger a CNFE. Generation of that exception is really slow. a) Is r1539992 really worth it? I expect that a typical web application and its libraries do load a lot of classes from the system classloader. The benefit (or cost) will vary from app to app but those CNFE were really killing the start time of medium to large apps. b) Implement a cache that lists classes that have been already loaded by system class loader? I thought about that. If an app tries to load 1000 difference classes from the system class loader the cache wouldn't help and woudl actually make things worse. If an app tries to load the same class 1000 times from the system class loader then a cache would help. The cache solution penalises what looks like (to me) sensible behaviour and rewards what looks like (to me) non-sensible behaviour. That didn't seem right to me. We can't call findLoadedClass(String) since that is a protected method. Unless... One option to speed things up would be to use reflection to make findLoadedClass(String) accessible and then call it directly. That would give the benefits of r1539992 without and additional costs. I'll take a look... -- 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: Tomcat for 8.0.next
2014-08-12 16:59 GMT+04:00 Rémy Maucherat r...@apache.org: 2014-08-12 14:42 GMT+02:00 Mark Thomas ma...@apache.org: I may still tag if we see some failures (e.g. in NIO2) but I'll look at the on a case by case basis. From what I understand, any problem would be a regression, which means it would be a good plan to investigate before tagging. Other than that, +1 Gump shows repeatable failures with NIO2 for many days (I think that started since OS update on vmgump). [junit] Test org.apache.catalina.nonblocking.TestNonBlockingAPI FAILED Testsuite: org.apache.catalina.nonblocking.TestNonBlockingAPI Tests run: 5, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 27.534 sec - Standard Error - (a lot of lines - omitting...) - --- Testcase: testBug55438NonBlockingReadWriteEmptyRead took 2 sec Testcase: testNonBlockingRead took 2.172 sec Testcase: testNonBlockingWriteError took 14.015 sec FAILED Error listener should have been invoked. junit.framework.AssertionFailedError: Error listener should have been invoked. at org.apache.catalina.nonblocking.TestNonBlockingAPI.testNonBlockingWriteError(TestNonBlockingAPI.java:347) Testcase: testNonBlockingReadIgnoreIsReady took 1.661 sec Testcase: testNonBlockingWrite took 7.672 sec Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1615920 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
On 12/08/2014 13:54, Konstantin Kolinko wrote:
2014-08-05 16:55 GMT+04:00 ma...@apache.org:
Author: markt
Date: Tue Aug 5 12:55:20 2014
New Revision: 1615920
URL: http://svn.apache.org/r1615920
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56785
Avoid NullPointerException if directory exists on the class path that is not
readable by the Tomcat user.
Would it be better if users had to opt-in for this silent skipping?
I went for behaviour that was consistent with how this was handled in
previous versions. I'm not aware that the silent skipping has caused
issues but I can see the benefits of such an option. I'm not going to
object - unless the patch is crazy :) - if you want to add it.
Mark
My concern that I mentioned in BZ [1] is that if permissions on web
application directories are not correctly configured, it may skip
classes that define a @WebFilter.
[1] https://issues.apache.org/bugzilla/show_bug.cgi?id=56785#c5
My thought is that better default behaviour would be to treat such
unreadable directories as deployment failure, unless a user opts-in
for the feature.
Best regards,
Konstantin Kolinko
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=1615920r1=1615919r2=1615920view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Aug
5 12:55:20 2014
@@ -1960,10 +1960,13 @@ public class ContextConfig implements Li
boolean handlesTypesOnly) {
if (file.isDirectory()) {
+// Returns null if directory is not readable
String[] dirs = file.list();
-for (String dir : dirs) {
-processAnnotationsFile(
-new File(file,dir), fragment, handlesTypesOnly);
+if (dirs != null) {
+for (String dir : dirs) {
+processAnnotationsFile(
+new File(file,dir), fragment, handlesTypesOnly);
+}
}
} else if (file.canRead() file.getName().endsWith(.class)) {
try (FileInputStream fis = new FileInputStream(file)) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1615920r1=1615919r2=1615920view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Aug 5 12:55:20 2014
@@ -81,6 +81,11 @@
Cédric Couralet. (markt)
/fix
fix
+bug56785/bug: Avoid codeNullPointerException/code if
directory
+exists on the class path that is not readable by the Tomcat user.
+(markt)
+ /fix
+ fix
bug56796/bug: Remove unnecessary sleep when stopping a web
application. (markt)
/fix
-
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
[Bug 56840] New: RewriteValve in context.xml throws NullPointerException
https://issues.apache.org/bugzilla/show_bug.cgi?id=56840
Bug ID: 56840
Summary: RewriteValve in context.xml throws
NullPointerException
Product: Tomcat 8
Version: 8.0.9
Hardware: PC
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: stuer...@afi-stuttgart.de
I've added a RewriteValve in my context.xml, and have a simple rewrite.config
with one line:
RewriteRule ^/(?:[^/]+/)?(resources/.*)$ /SAPUI5/$1
When requesting a page with the matching URL, a 500 error is returned:
java.lang.NullPointerException
org.apache.catalina.connector.Request.getContextPath(Request.java:1901)
org.apache.catalina.valves.rewrite.RewriteValve.invoke(RewriteValve.java:451)
[...]
I think the problem lies around line 447 in RewriteValve.java:
447request.getCoyoteRequest().requestURI().setString(null);
448CharChunk chunk =
request.getCoyoteRequest().requestURI().getCharChunk();
449chunk.recycle();
450if (context) {
451chunk.append(request.getContextPath());
452}
setString(null) sets the MessageBytes type to TYPE_NULL, and (context is true
in my case) request.getContextPath() tries to access cleared value, which
fails.
--
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: Tomcat for 8.0.next
2014-08-12 15:08 GMT+02:00 Konstantin Kolinko knst.koli...@gmail.com: [junit] Test org.apache.catalina.nonblocking.TestNonBlockingAPI FAILED Testsuite: org.apache.catalina.nonblocking.TestNonBlockingAPI Tests run: 5, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 27.534 sec - Standard Error - (a lot of lines - omitting...) - --- Testcase: testBug55438NonBlockingReadWriteEmptyRead took 2 sec Testcase: testNonBlockingRead took 2.172 sec Testcase: testNonBlockingWriteError took 14.015 sec FAILED Error listener should have been invoked. junit.framework.AssertionFailedError: Error listener should have been invoked. at org.apache.catalina.nonblocking.TestNonBlockingAPI.testNonBlockingWriteError(TestNonBlockingAPI.java:347) Yes, but this is actually not new, since I had it fail for me once in a while locally. So it seems less occasional now in gump. It looked to me like a timing issue (the NIO2 is a bit different from the other connector for this sort of errors) and I didn't care much about it. Rémy
[Bug 56838] Performance drop when using XML
https://issues.apache.org/bugzilla/show_bug.cgi?id=56838 --- Comment #7 from Konstantin Kolinko knst.koli...@gmail.com --- (In reply to Mark Thomas from comment #6) One option to speed things up would be to use reflection to make findLoadedClass(String) accessible and then call it directly. That would give the benefits of r1539992 without and additional costs. I'll take a look... I thought that as well. It looks promising, but looking into Java 7 I see two caveats: a) If the system classloader has a parent, there is a question of calling parent.findLoadedClass() as well. b) In ClassLoader#loadClass() it obtains a lock before calling findLoadedClass(), so it might be not safe to call it without a lock. -- 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: r1617469 - /tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
Author: markt
Date: Tue Aug 12 13:27:07 2014
New Revision: 1617469
URL: http://svn.apache.org/r1617469
Log:
Follow-up to 1617445.
Updated expected value that has changed in 1617445
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java?rev=1617469r1=1617468r2=1617469view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java Tue Aug 12
13:27:07 2014
@@ -144,7 +144,7 @@ public class TestCustomSsl extends Tomca
}
if (serverTrustAll) {
assertEquals(200, rc);
-assertEquals(OK, res.toString());
+assertEquals(OK- + TesterSupport.ROLE, res.toString());
} else {
assertTrue(rc != 200);
assertEquals(, res.toString());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1617470 - /tomcat/trunk/java/org/apache/tomcat/util/file/Matcher.java
Author: kkolinko
Date: Tue Aug 12 13:29:52 2014
New Revision: 1617470
URL: http://svn.apache.org/r1617470
Log:
Review of fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56801
Revert public API changes from r1615876
I think match(String, char[], boolean) is a bad signature to expose such method
as public.
My concerns:
a) Maybe there is a way to cache String-char[] conversions for the pattern set
as well.
In that case the method signature will become (char[],char[],..).
As of now the current improvement is an incomplete one.
b) I am not sure that using String vs char[] array has much difference.
Is it worth to stick to char[] in the API?
Modified:
tomcat/trunk/java/org/apache/tomcat/util/file/Matcher.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/file/Matcher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/file/Matcher.java?rev=1617470r1=1617469r2=1617470view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/file/Matcher.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/file/Matcher.java Tue Aug 12
13:29:52 2014
@@ -56,10 +56,22 @@ public final class Matcher {
/**
- * @deprecated Use {@link #match(String, char[], boolean)}. This method
will
- * be removed in Tomcat 9.0.x onwards.
+ * Tests whether or not a string matches against a pattern.
+ * The pattern may contain two special characters:br
+ * '*' means zero or more charactersbr
+ * '?' means one and only one character
+ *
+ * @param pattern The pattern to match against.
+ *Must not be codenull/code.
+ * @param str The string which must be matched against the
+ *pattern. Must not be codenull/code.
+ * @param caseSensitive Whether or not matching should be performed
+ *case sensitively.
+ *
+ *
+ * @return codetrue/code if the string matches against the pattern,
+ * or codefalse/code otherwise.
*/
-@Deprecated
public static boolean match(String pattern, String str,
boolean caseSensitive) {
@@ -84,7 +96,7 @@ public final class Matcher {
* @return codetrue/code if the string matches against the pattern,
* or codefalse/code otherwise.
*/
-public static boolean match(String pattern, char[] strArr,
+private static boolean match(String pattern, char[] strArr,
boolean caseSensitive) {
char[] patArr = pattern.toCharArray();
int patIdxStart = 0;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1617471 - in /tomcat/trunk: java/org/apache/catalina/valves/rewrite/RewriteValve.java webapps/docs/changelog.xml
Author: remm
Date: Tue Aug 12 13:31:17 2014
New Revision: 1617471
URL: http://svn.apache.org/r1617471
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56840
BZ56840: Tomcat gets the context path from the URI (rather than from the
mapping data, which is another possible source) so it is not possible to reset
it before getting it.
Modified:
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1617471r1=1617470r2=1617471view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java Tue
Aug 12 13:31:17 2014
@@ -444,11 +444,15 @@ public class RewriteValve extends ValveB
urlString = urlString.substring(0, queryIndex);
}
// Set the new URL
+String contextPath = null;
+if (context) {
+contextPath = request.getContextPath();
+}
request.getCoyoteRequest().requestURI().setString(null);
CharChunk chunk =
request.getCoyoteRequest().requestURI().getCharChunk();
chunk.recycle();
if (context) {
-chunk.append(request.getContextPath());
+chunk.append(contextPath);
}
chunk.append(urlString);
request.getCoyoteRequest().requestURI().toChars();
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1617471r1=1617470r2=1617471view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Aug 12 13:31:17 2014
@@ -132,6 +132,10 @@
bug56825/bug: Enable pre-emptive authentication to work with the
SSL authenticator. Based on a patch by jlmonteiro. (markt)
/fix
+ fix
+bug56840/bug: Avoid NPE when the rewrite valve is mapped to
+a context. (remm)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat-maven-plugin pull request: basic support for tomcat 8
GitHub user kalgon opened a pull request: https://github.com/apache/tomcat-maven-plugin/pull/6 basic support for tomcat 8 This is a basic port of tomcat7-maven-plugin to use the new tomcat 8.0.9 engine. No new feature from tomcat 8 has been added. You can merge this pull request into a Git repository by running: $ git pull https://github.com/kalgon/tomcat-maven-plugin tc8.x Alternatively you can review and apply these changes as the patch at: https://github.com/apache/tomcat-maven-plugin/pull/6.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #6 commit d0d93503cb520606fd2df9179e3f2521dda6be1e Author: kalgon kal...@hotmail.com Date: 2014-08-12T13:30:27Z basic support for tomcat 8 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56840] RewriteValve in context.xml throws NullPointerException
https://issues.apache.org/bugzilla/show_bug.cgi?id=56840 Remy Maucherat r...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #1 from Remy Maucherat r...@apache.org --- The fix will be included in 8.0.11+. -- 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: r1617475 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/file/Matcher.java webapps/docs/changelog.xml
Author: kkolinko
Date: Tue Aug 12 13:49:51 2014
New Revision: 1617475
URL: http://svn.apache.org/r1617475
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56801
Improve performance of org.apache.tomcat.util.file.Matcher which is to filter
JARs for scanning during web application start. Based on a patch by Sheldon
Shao.
It is backport of r1615876 and r1617470.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/file/Matcher.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1615876,1617470
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/file/Matcher.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/file/Matcher.java?rev=1617475r1=1617474r2=1617475view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/file/Matcher.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/file/Matcher.java Tue Aug
12 13:49:51 2014
@@ -45,14 +45,16 @@ public final class Matcher {
* file name, or codefalse/code otherwise.
*/
public static boolean matchName(SetString patternSet, String fileName) {
+char[] fileNameArray = fileName.toCharArray();
for (String pattern: patternSet) {
-if (match(pattern, fileName, true)) {
+if (match(pattern, fileNameArray, true)) {
return true;
}
}
return false;
}
+
/**
* Tests whether or not a string matches against a pattern.
* The pattern may contain two special characters:br
@@ -61,8 +63,8 @@ public final class Matcher {
*
* @param pattern The pattern to match against.
*Must not be codenull/code.
- * @param str The string which must be matched against the pattern.
- *Must not be codenull/code.
+ * @param str The string which must be matched against the
+ *pattern. Must not be codenull/code.
* @param caseSensitive Whether or not matching should be performed
*case sensitively.
*
@@ -71,9 +73,32 @@ public final class Matcher {
* or codefalse/code otherwise.
*/
public static boolean match(String pattern, String str,
+boolean caseSensitive) {
+
+return match(pattern, str.toCharArray(), caseSensitive);
+}
+
+
+/**
+ * Tests whether or not a string matches against a pattern.
+ * The pattern may contain two special characters:br
+ * '*' means zero or more charactersbr
+ * '?' means one and only one character
+ *
+ * @param pattern The pattern to match against.
+ *Must not be codenull/code.
+ * @param strArr The character array which must be matched against the
+ *pattern. Must not be codenull/code.
+ * @param caseSensitive Whether or not matching should be performed
+ *case sensitively.
+ *
+ *
+ * @return codetrue/code if the string matches against the pattern,
+ * or codefalse/code otherwise.
+ */
+private static boolean match(String pattern, char[] strArr,
boolean caseSensitive) {
char[] patArr = pattern.toCharArray();
-char[] strArr = str.toCharArray();
int patIdxStart = 0;
int patIdxEnd = patArr.length - 1;
int strIdxStart = 0;
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1617475r1=1617474r2=1617475view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Aug 12 13:49:51 2014
@@ -89,6 +89,12 @@
application. (markt)
/fix
fix
+bug56801/bug: Improve performance of
+codeorg.apache.tomcat.util.file.Matcher/code which is to filter
JARs
+for scanning during web application start. Based on a patch by Sheldon
+Shao. (kkolinko)
+ /fix
+ fix
bug56825/bug: Enable pre-emptive authentication to work with the
SSL authenticator. Based on a patch by jlmonteiro. (markt)
/fix
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56801] Avoid duplicated String to CharArray conversion in the loop of Matcher#matchName
https://issues.apache.org/bugzilla/show_bug.cgi?id=56801 --- Comment #3 from Konstantin Kolinko knst.koli...@gmail.com --- (In reply to Christopher Schultz from comment #1) I think the real question is whether or not the String.toCharArray even belongs here. Agreed. I changed visibility of the new method to be private, so that we were able to review the API later. There is also a question that patterns are also repeatedly converted to arrays. I backported this to Tomcat 7 in r1617475 and it will be in 7.0.56 onwards. -- 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 56842] New: Simplify Cipher code in OpenSSL syntax
https://issues.apache.org/bugzilla/show_bug.cgi?id=56842 Bug ID: 56842 Summary: Simplify Cipher code in OpenSSL syntax Product: Tomcat 8 Version: trunk Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: emmanuel.hugon...@gmail.com Created attachment 31909 -- https://issues.apache.org/bugzilla/attachment.cgi?id=31909action=edit Patch for simpler code The cipher code in openssl syntax could take advantage of varargs to make it easier to use. -- 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 56842] Simplify Cipher code in OpenSSL syntax
https://issues.apache.org/bugzilla/show_bug.cgi?id=56842 Mark Thomas ma...@apache.org changed: What|Removed |Added Severity|normal |enhancement -- 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 56842] Simplify Cipher code in OpenSSL syntax
https://issues.apache.org/bugzilla/show_bug.cgi?id=56842 ehsavoie emmanuel.hugon...@gmail.com changed: What|Removed |Added Attachment #31909|0 |1 is obsolete|| --- Comment #1 from ehsavoie emmanuel.hugon...@gmail.com --- Created attachment 31910 -- https://issues.apache.org/bugzilla/attachment.cgi?id=31910action=edit Fixing the patch as it was in reverse mode Fixing the patch as it was in reverse mode -- 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: r1617512 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: markt
Date: Tue Aug 12 15:45:56 2014
New Revision: 1617512
URL: http://svn.apache.org/r1617512
Log:
Fix failures in testAllOpenSSLCiphersMapped() after changes to how unit test
reports cipher names in r1615205
Start to fix testOpenSSLCipherAvailability() but more work required
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1617512r1=1617511r2=1617512view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Tue Aug 12 15:45:56 2014
@@ -114,7 +114,7 @@ public class TestCipher {
if (openSSLAlias.contains(RC2-MD5)) {
continue;
}
-expectedCipherSuites.add(openSSLAlias);
+expectedCipherSuites.add(openSSLAlias + + +
cipher.getProtocol());
}
SetString unavailableCipherSuites = new HashSet();
@@ -142,7 +142,7 @@ public class TestCipher {
/**
* Check that the elements of the Cipher enumeration are all using standard
- * names from the TLS registry orare known exceptions.
+ * names from the TLS registry or are known exceptions.
*/
@Test
public void testNames() {
@@ -389,10 +389,13 @@ public class TestCipher {
*/
private static SetString OPENSSL_UNMAPPED_ORACLE =
Collections.unmodifiableSet(new HashSet(Arrays.asList(
-DES-CBC-MD5,
-DES-CBC3-MD5,
-IDEA-CBC-MD5,
-RC2-CBC-MD5)));
+DES-CBC-MD5+SSLv2,
+DES-CBC3-MD5+SSLv2,
+EXP-RC2-CBC-MD5+SSLv2,
+EXP-RC4-MD5+SSLv2,
+IDEA-CBC-MD5+SSLv2,
+RC2-CBC-MD5+SSLv2,
+RC4-MD5+SSLv2)));
/**
@@ -525,36 +528,39 @@ public class TestCipher {
*/
private static SetString OPENSSL_UNMAPPED_IBM =
Collections.unmodifiableSet(new HashSet(Arrays.asList(
-ADH-CAMELLIA128-SHA,
-ADH-CAMELLIA256-SHA,
-ADH-SEED-SHA,
-CAMELLIA128-SHA,
-CAMELLIA256-SHA,
-DES-CBC-MD5,
-DES-CBC3-MD5,
-DHE-DSS-CAMELLIA128-SHA,
-DHE-DSS-CAMELLIA256-SHA,
-DHE-DSS-SEED-SHA,
-DHE-RSA-CAMELLIA128-SHA,
-DHE-RSA-CAMELLIA256-SHA,
-DHE-RSA-SEED-SHA,
-IDEA-CBC-MD5,
-IDEA-CBC-SHA,
-PSK-3DES-EDE-CBC-SHA,
-PSK-AES128-CBC-SHA,
-PSK-AES256-CBC-SHA,
-PSK-RC4-SHA,
-RC2-CBC-MD5,
-SEED-SHA,
-SRP-AES-128-CBC-SHA,
-SRP-AES-256-CBC-SHA,
-SRP-3DES-EDE-CBC-SHA,
-SRP-DSS-3DES-EDE-CBC-SHA,
-SRP-DSS-AES-128-CBC-SHA,
-SRP-DSS-AES-256-CBC-SHA,
-SRP-RSA-3DES-EDE-CBC-SHA,
-SRP-RSA-AES-128-CBC-SHA,
-SRP-RSA-AES-256-CBC-SHA)));
+ADH-CAMELLIA128-SHA+SSLv3,
+ADH-CAMELLIA256-SHA+SSLv3,
+ADH-SEED-SHA+SSLv3,
+CAMELLIA128-SHA+SSLv3,
+CAMELLIA256-SHA+SSLv3,
+DES-CBC-MD5+SSLv2,
+DES-CBC3-MD5+SSLv2,
+DHE-DSS-CAMELLIA128-SHA+SSLv3,
+DHE-DSS-CAMELLIA256-SHA+SSLv3,
+DHE-DSS-SEED-SHA+SSLv3,
+DHE-RSA-CAMELLIA128-SHA+SSLv3,
+DHE-RSA-CAMELLIA256-SHA+SSLv3,
+DHE-RSA-SEED-SHA+SSLv3,
+EXP-RC2-CBC-MD5+SSLv2,
+EXP-RC4-MD5+SSLv2,
+IDEA-CBC-MD5+SSLv2,
+IDEA-CBC-SHA+SSLv3,
+PSK-3DES-EDE-CBC-SHA+SSLv3,
+PSK-AES128-CBC-SHA+SSLv3,
+PSK-AES256-CBC-SHA+SSLv3,
+PSK-RC4-SHA+SSLv3,
+RC2-CBC-MD5+SSLv2,
+RC4-MD5+SSLv2,
+SEED-SHA+SSLv3,
+SRP-AES-128-CBC-SHA+SSLv3,
+SRP-AES-256-CBC-SHA+SSLv3,
+SRP-3DES-EDE-CBC-SHA+SSLv3,
+SRP-DSS-3DES-EDE-CBC-SHA+SSLv3,
+SRP-DSS-AES-128-CBC-SHA+SSLv3,
+SRP-DSS-AES-256-CBC-SHA+SSLv3,
+SRP-RSA-3DES-EDE-CBC-SHA+SSLv3,
+
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/362 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1617471 Blamelist: kkolinko,markt,remm Build succeeded! sincerely, -The Buildbot - 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-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/363 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1617512 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
[Bug 56842] Simplify Cipher code in OpenSSL syntax
https://issues.apache.org/bugzilla/show_bug.cgi?id=56842 Konstantin Kolinko knst.koli...@gmail.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #2 from Konstantin Kolinko knst.koli...@gmail.com --- In the current code the jsse and openssl names are near each other. It makes it easier to review them. Your patch breaks that, so I am -1. -- 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: r1617553 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java
Author: markt
Date: Tue Aug 12 18:26:55 2014
New Revision: 1617553
URL: http://svn.apache.org/r1617553
Log:
Map protocol names to the name used by OpenSSL with ciphers -v
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java?rev=1617553r1=1617552r2=1617553view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java Tue
Aug 12 18:26:55 2014
@@ -18,5 +18,24 @@
package org.apache.tomcat.util.net.jsse.openssl;
enum Protocol {
-SSLv3, SSLv2, TLSv1, TLSv1_2;
+
+SSLv3(SSLv3),
+SSLv2(SSLv2),
+TLSv1(SSLv3),
+TLSv1_2(TLSv1.2);
+
+private final String openSSLName;
+
+private Protocol(String openSSLName) {
+this.openSSLName = openSSLName;
+}
+
+/**
+ * The name returned by OpenSSL in the protocol column when using
+ * codeopenssl ciphers -v/code. This is currently only used by the unit
+ * tests hence it is package private.
+ */
+String getOpenSSLName() {
+return openSSLName;
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1617554 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Author: markt
Date: Tue Aug 12 18:29:00 2014
New Revision: 1617554
URL: http://svn.apache.org/r1617554
Log:
Correct an Cipher name in OpenSSL
Re-enable disabled Cipher 0x020080 now we can differentiate between it and
cipher 0x03
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1617554r1=1617553r2=1617554view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Tue
Aug 12 18:29:00 2014
@@ -2446,7 +2446,7 @@ enum Cipher {
),
// RC2_128_CBC_EXPORT40_WITH_MD5
SSL_CK_RC2_128_CBC_EXPORT40_WITH_MD5(
-EXP-RC2-MD5,
+EXP-RC2-CBC-MD5,
null,
KeyExchange.RSA,
Authentication.RSA,
@@ -2520,11 +2520,7 @@ enum Cipher {
256,
256
};*/
-
// Cipher 0x020080
-/*
- * Same as Cipher 03 and name isn't recognised by JSSE so ignore this as it
- * adds no value and complicates the unit tests.
SSL2_RC4_128_EXPORT40_WITH_MD5(
EXP-RC4-MD5,
null,
@@ -2539,7 +2535,6 @@ enum Cipher {
40,
128
),
-*/
// Cipher 0x030080 / 0x040080
SSL2_RC2_CBC_128_CBC_WITH_MD5(
RC2-CBC-MD5,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1617556 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: markt
Date: Tue Aug 12 18:30:23 2014
New Revision: 1617556
URL: http://svn.apache.org/r1617556
Log:
Take account of different protocol names returned by openssl ciphers -v
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1617556r1=1617555r2=1617556view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Tue Aug 12 18:30:23 2014
@@ -114,7 +114,8 @@ public class TestCipher {
if (openSSLAlias.contains(RC2-MD5)) {
continue;
}
-expectedCipherSuites.add(openSSLAlias + + +
cipher.getProtocol());
+expectedCipherSuites.add(openSSLAlias + + +
+cipher.getProtocol().getOpenSSLName());
}
SetString unavailableCipherSuites = new HashSet();
@@ -136,7 +137,6 @@ public class TestCipher {
unexpectedList.append(' ');
}
Assert.assertEquals(unexpectedList.toString(), 0,
unexpectedCipherSuites.size());
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1617558 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Author: markt
Date: Tue Aug 12 18:33:04 2014
New Revision: 1617558
URL: http://svn.apache.org/r1617558
Log:
OpenSSL does implement SSL_CK_RC2_128_CBC_EXPORT40_WITH_MD5
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java?rev=1617558r1=1617557r2=1617558view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Tue Aug 12 18:33:04 2014
@@ -61,7 +61,6 @@ public class TesterOpenSSL {
Cipher.TLS_DH_DSS_WITH_SEED_CBC_SHA,
Cipher.TLS_DHE_DSS_WITH_RC4_128_SHA,
Cipher.SSL_CK_RC2_128_CBC_WITH_MD5,
-Cipher.SSL_CK_RC2_128_CBC_EXPORT40_WITH_MD5,
Cipher.SSL_FORTEZZA_DMS_WITH_NULL_SHA,
Cipher.SSL_FORTEZZA_DMS_WITH_FORTEZZA_CBC_SHA,
Cipher.SSL_FORTEZZA_DMS_WITH_RC4_128_SHA,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56842] Simplify Cipher code in OpenSSL syntax
https://issues.apache.org/bugzilla/show_bug.cgi?id=56842 Remy Maucherat r...@apache.org changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|WONTFIX |--- --- Comment #3 from Remy Maucherat r...@apache.org --- Let's see if someone seconds your veto, which is not justified with legitimate arguments at the moment since varargs are probably cleaner in the code than arrays. So for now, it is invalid, please change that to -0 at least :) I'd also like to remind that Emmanuel is the author of the OpenSSL code that was contributed.. -- 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 56842] Simplify Cipher code in OpenSSL syntax
https://issues.apache.org/bugzilla/show_bug.cgi?id=56842 --- Comment #4 from Filip Hanik fha...@apache.org --- (In reply to Remy Maucherat from comment #3) Let's see if someone seconds your veto, which is not justified with legitimate arguments at the moment since varargs are probably cleaner in the code than arrays. So for now, it is invalid, please change that to -0 at least :) I agree with Remy on this one. -1 rejection based on code style is something we must move away from in order to encourage more contributions. It's already hard enough to contribute code through patches as it is. -- 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 56842] Simplify Cipher code in OpenSSL syntax
https://issues.apache.org/bugzilla/show_bug.cgi?id=56842 --- Comment #5 from ehsavoie emmanuel.hugon...@gmail.com --- Hum I don't agree : you have a lot of null values or a lot of verbosity with arrays which leads to less readibility. In the current code you have : - jsse name (as a enum constant) - openssl name - jsse aliases Also I might add that moving the aliases to the end makes the code closer to the declaration in openssl code. -- 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 56842] Simplify Cipher code in OpenSSL syntax
https://issues.apache.org/bugzilla/show_bug.cgi?id=56842 --- Comment #6 from Konstantin Kolinko knst.koli...@gmail.com --- (In reply to Remy Maucherat from comment #3) Ack. I revoke my veto and abstain from voting. I still do not see much worth in this patch. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed
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. 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: 16 mins 47 secs Command Line: /usr/lib/jvm/java-7-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.12-SNAPSHOT.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140812-native-src.tar.gz -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140812-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20140812.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dexecute.test.nio=true -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/pub lic/workspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=false -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20140812.jar -Dtest.temp=output/test-tmp-NIO -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/hamcrest-java/build/hamcrest-core-20140812.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-7-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/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat
svn commit: r1617578 - /tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/changelog.xml
Author: kkolinko Date: Tue Aug 12 20:14:53 2014 New Revision: 1617578 URL: http://svn.apache.org/r1617578 Log: In JDBC Pool changelog file: - Add a note that this changelog file is obsolete. - Add XSLT stylesheet reference so that the file is viewable in a web browser (such as Firefox). - Fix a pair of markup errors. It is backport of r1617576 from tomcat/trunk. Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/changelog.xml Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/changelog.xml?rev=1617578r1=1617577r2=1617578view=diff == --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/changelog.xml Tue Aug 12 20:14:53 2014 @@ -18,6 +18,7 @@ !DOCTYPE document [ !ENTITY project SYSTEM @TOMCAT_PROJECT_DEST@ ] +?xml-stylesheet type=text/xsl href=package.xsl? document url=changelog.html project; @@ -28,6 +29,15 @@ /properties body +section name=Tomcat JDBC Connection Pool - Apache Tomcat 7.0.19 and later + p +Starting with Apache Tomcat 7.0.19 in July 2011, Tomcat JDBC Connection Pool +is built and released as a component in official releases of Tomcat. +The changes are now listed in jdbc-pool sections of Apache Tomcat +changelog file. This changelog file is obsolete. + /p +/section + section name=Tomcat JDBC Connection Pool 1.1.0.0 subsection name=pool changelog @@ -64,12 +74,12 @@ section name=Tomcat JDBC Connection Pool 1.0.9.0 subsection name=pool changelog - fixrev997321/rev/fix Ensure threads borrowing connections do not + fixrev997321/rev Ensure threads borrowing connections do not get stuck waiting for a new connection if a connection is released in - another thread. (markt) - fixrev995432/rev/fix Make interceptor class names, property names + another thread. (markt)/fix + fixrev995432/rev Make interceptor class names, property names and property values tolerant of whitespace by trimming the values before - use. (markt) + use. (markt)/fix fixrev995091/rev bug49831/bug Make sure pooled XAConnections are closed when the connection pool shuts down. Patch provided by Daniel Mikusa. (markt)/fix - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (in module tomcat-7.0.x) failed
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-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-tc7.0.x-test-bio : 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-bio/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-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 16 mins Command Line: /usr/lib/jvm/java-7-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.12-SNAPSHOT.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140812-native-src.tar.gz -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140812-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20140812.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dexecute.test.nio=false -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/pu blic/workspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20140812.jar -Dtest.temp=output/test-tmp-BIO -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/hamcrest-java/build/hamcrest-core-20140812.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-7-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/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/365 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1617576 Blamelist: kkolinko 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: r1617631 - in /tomcat/maven-plugin/branches/tc8.x: ./ tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ tomcat8-war-runner/src/main/java/org/apache/tomcat/mave
Author: olamy
Date: Wed Aug 13 00:17:18 2014
New Revision: 1617631
URL: http://svn.apache.org/r1617631
Log:
formatting
Modified:
tomcat/maven-plugin/branches/tc8.x/pom.xml
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractStandaloneWarMojo.java
tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8RunnerCli.java
Modified: tomcat/maven-plugin/branches/tc8.x/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/pom.xml?rev=1617631r1=1617630r2=1617631view=diff
==
--- tomcat/maven-plugin/branches/tc8.x/pom.xml (original)
+++ tomcat/maven-plugin/branches/tc8.x/pom.xml Wed Aug 13 00:17:18 2014
@@ -302,7 +302,7 @@
moduletomcat6-maven-plugin/module
moduletomcat7-war-runner/module
moduletomcat7-maven-plugin/module
- moduletomcat8-war-runner/module
+moduletomcat8-war-runner/module
moduletomcat8-maven-plugin/module
moduletomcat-maven-archetype/module
/modules
Modified:
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java?rev=1617631r1=1617630r2=1617631view=diff
==
---
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java
(original)
+++
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java
Wed Aug 13 00:17:18 2014
@@ -322,10 +322,10 @@ public abstract class AbstractExecWarMoj
Dependency ' + dependency.getGroupId() +
':' + dependency.getArtifactId()
+ ' does not have version specified );
}
-Artifact artifact =
artifactFactory.createArtifactWithClassifier( dependency.getGroupId(),
-
dependency.getArtifactId(),
-
version,
-
dependency.getType(),
+Artifact artifact =
artifactFactory.createArtifactWithClassifier( dependency.getGroupId(), //
+
dependency.getArtifactId(), //
+
version, //
+
dependency.getType(), //
dependency.getClassifier() );
artifactResolver.resolve( artifact, this.remoteRepos,
this.local );
@@ -385,10 +385,10 @@ public abstract class AbstractExecWarMoj
// add tomcat classes
for ( Artifact pluginArtifact : pluginArtifacts )
{
-if ( StringUtils.equals( org.apache.tomcat,
pluginArtifact.getGroupId() ) || StringUtils.equals(
-org.apache.tomcat.embed, pluginArtifact.getGroupId() )
|| StringUtils.equals(
-org.eclipse.jdt.core.compiler,
pluginArtifact.getGroupId() ) || StringUtils.equals( commons-cli,
-
pluginArtifact.getArtifactId() )
+if ( StringUtils.equals( org.apache.tomcat,
pluginArtifact.getGroupId() ) //
+|| StringUtils.equals( org.apache.tomcat.embed,
pluginArtifact.getGroupId() ) //
+|| StringUtils.equals( org.eclipse.jdt.core.compiler,
pluginArtifact.getGroupId() ) //
+|| StringUtils.equals( commons-cli,
pluginArtifact.getArtifactId() ) //
|| StringUtils.equals( tomcat8-war-runner,
pluginArtifact.getArtifactId() ) )
{
JarFile jarFile = new JarFile( pluginArtifact.getFile() );
@@ -415,9 +415,11 @@ public abstract class AbstractExecWarMoj
}
// String groupId, String artifactId, String version,
String scope, String type
-Artifact artifact =
-artifactFactory.createArtifact(
svn commit: r1617630 [3/3] - in /tomcat/maven-plugin/branches/tc8.x: ./ tomcat8-maven-plugin/ tomcat8-maven-plugin/src/it/simple-war-exec-project/ tomcat8-maven-plugin/src/main/java/org/apache/tomcat/
Modified:
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/site/apt/adjust-embedded-tomcat-version.apt.vm
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/site/apt/adjust-embedded-tomcat-version.apt.vm?rev=1617630r1=1617629r2=1617630view=diff
==
---
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/site/apt/adjust-embedded-tomcat-version.apt.vm
(original)
+++
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/site/apt/adjust-embedded-tomcat-version.apt.vm
Wed Aug 13 00:17:06 2014
@@ -44,7 +44,7 @@ Adjust Tomcat Version
plugins
plugin
groupIdorg.apache.tomcat.maven/groupId
- artifactIdtomcat7-maven-plugin/artifactId
+ artifactIdtomcat8-maven-plugin/artifactId
version${project.version}/version
dependencies
dependency
Modified:
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/site/apt/index.apt?rev=1617630r1=1617629r2=1617630view=diff
==
---
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/site/apt/index.apt
(original)
+++
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/site/apt/index.apt
Wed Aug 13 00:17:06 2014
@@ -28,7 +28,7 @@
Tomcat Maven Plugin
- The Tomcat7 Maven Plugin provides goals to manipulate WAR projects within the
{{{http://tomcat.apache.org/}Tomcat}} servlet container version 7.x
+ The Tomcat8 Maven Plugin provides goals to manipulate WAR projects within the
{{{http://tomcat.apache.org/}Tomcat}} servlet container version 7.x
* Goals Overview
Modified:
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/site/apt/usage.apt.vm
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/site/apt/usage.apt.vm?rev=1617630r1=1617629r2=1617630view=diff
==
---
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/site/apt/usage.apt.vm
(original)
+++
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/site/apt/usage.apt.vm
Wed Aug 13 00:17:06 2014
@@ -28,7 +28,7 @@
Usage
- If no explicit configuration is provided then the Tomcat7 Maven Plugin
defaults to
+ If no explicit configuration is provided then the Tomcat8 Maven Plugin
defaults to
the following:
* Tomcat manager URL of http://localhost:8080/manager
@@ -55,7 +55,7 @@ Usage
...
plugin
groupIdorg.apache.tomcat.maven/groupId
-artifactIdtomcat7-maven-plugin/artifactId
+artifactIdtomcat8-maven-plugin/artifactId
version${project.version}/version
configuration
urlhttp://www.mydomain.com:1234/mymanager/url
@@ -87,7 +87,7 @@ Usage
...
plugin
groupIdorg.apache.tomcat.maven/groupId
-artifactIdtomcat7-maven-plugin/artifactId
+artifactIdtomcat8-maven-plugin/artifactId
version${project.version}/version
configuration
servermyserver/server
@@ -138,7 +138,7 @@ Usage
...
plugin
groupIdorg.apache.tomcat.maven/groupId
-artifactIdtomcat7-maven-plugin/artifactId
+artifactIdtomcat8-maven-plugin/artifactId
version${project.version}/version
configuration
path/mycontext/path
@@ -167,7 +167,7 @@ Usage
...
plugin
groupIdorg.apache.tomcat.maven/groupId
-artifactIdtomcat7-maven-plugin/artifactId
+artifactIdtomcat8-maven-plugin/artifactId
version${project.version}/version
configuration
path/\${project.build.finalName}/path
Copied:
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8DeployWarOnlyProjectIT.java
(from r1612479,
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarOnlyProjectIT.java)
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8DeployWarOnlyProjectIT.java?p2=tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8DeployWarOnlyProjectIT.javap1=tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarOnlyProjectIT.javar1=1612479r2=1617630rev=1617630view=diff
==
---
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarOnlyProjectIT.java
(original)
+++
svn commit: r1617630 [2/3] - in /tomcat/maven-plugin/branches/tc8.x: ./ tomcat8-maven-plugin/ tomcat8-maven-plugin/src/it/simple-war-exec-project/ tomcat8-maven-plugin/src/main/java/org/apache/tomcat/
Modified: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/resources/conf/web.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/resources/conf/web.xml?rev=1617630r1=1617629r2=1617630view=diff == --- tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/resources/conf/web.xml (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/resources/conf/web.xml Wed Aug 13 00:17:06 2014 @@ -1,4283 +1,4614 @@ -?xml version=1.0 encoding=ISO-8859-1? -!-- - 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. --- -web-app xmlns=http://java.sun.com/xml/ns/javaee; - xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation=http://java.sun.com/xml/ns/javaee - http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd; - version=3.0 - - !-- Introduction == -- - !-- This document defines default values for *all* web applications -- - !-- loaded into this instance of Tomcat. As each application is -- - !-- deployed, this file is processed, followed by the-- - !-- /WEB-INF/web.xml deployment descriptor from your own -- - !-- applications.-- - !-- -- - !-- WARNING: Do not configure application-specific resources here! -- - !-- They should go in the /WEB-INF/web.xml file in your application. -- - - - !-- == Built In Servlet Definitions -- - - - !-- The default servlet for all web applications, that serves static -- - !-- resources. It processes all requests that are not mapped to other -- - !-- servlets with servlet mappings (defined either here or in your own -- - !-- web.xml file). This servlet supports the following initialization -- - !-- parameters (default values are in square brackets): -- - !-- -- - !-- debug Debugging detail level for messages logged -- - !-- by this servlet. [0] -- - !-- -- - !-- fileEncodingEncoding to be used to read static resources -- - !-- [platform default] -- - !-- -- - !-- input Input buffer size (in bytes) when reading -- - !-- resources to be served. [2048]-- - !-- -- - !-- listingsShould directory listings be produced if there -- - !-- is no welcome file in this directory? [false] -- - !-- WARNING: Listings for directories with many-- - !-- entries can be slow and may consume-- - !-- significant proportions of server resources. -- - !-- -- - !-- output Output buffer size (in bytes) when writing -- - !-- resources to be served. [2048]-- - !-- -- - !-- readonlyIs this context read only, so HTTP -- - !-- commands like PUT and DELETE are -- - !-- rejected? [true] -- - !-- -- - !-- readmeFile File to display together with the directory-- - !-- contents. [null] -- - !-- -- - !-- sendfileSizeIf the connector used supports sendfile, this --
svn commit: r1617630 [1/3] - in /tomcat/maven-plugin/branches/tc8.x: ./ tomcat8-maven-plugin/ tomcat8-maven-plugin/src/it/simple-war-exec-project/ tomcat8-maven-plugin/src/main/java/org/apache/tomcat/
Author: olamy Date: Wed Aug 13 00:17:06 2014 New Revision: 1617630 URL: http://svn.apache.org/r1617630 Log: basic support for tomcat 8 Added: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java (contents, props changed) - copied, changed from r1612479, tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat7Mojo.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8DeployWarOnlyProjectIT.java (contents, props changed) - copied, changed from r1612479, tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarOnlyProjectIT.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8DeployWarProjectIT.java (contents, props changed) - copied, changed from r1612479, tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarProjectIT.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8RunMultiConfigIT.java (contents, props changed) - copied, changed from r1612479, tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7RunMultiConfigIT.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8SimpleWarProjectIT.java (contents, props changed) - copied, changed from r1612479, tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7SimpleWarProjectIT.java tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/ tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/NOTES.TXT tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/pom.xml (with props) tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/ tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/ tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/ tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/ tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/ tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/tomcat/ tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/ tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/ tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/PasswordUtil.java (with props) tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8Runner.java (with props) tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8RunnerCli.java (with props) Removed: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat7Mojo.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarOnlyProjectIT.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarProjectIT.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7RunMultiConfigIT.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7SimpleWarProjectIT.java Modified: tomcat/maven-plugin/branches/tc8.x/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/it/simple-war-exec-project/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractCatalinaMojo.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractStandaloneWarMojo.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ShutdownMojo.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/resources/conf/logging.properties tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/resources/conf/tomcat-users.xml
svn commit: r1617632 - /tomcat/maven-plugin/branches/tc8.x/pom.xml
Author: olamy Date: Wed Aug 13 00:18:21 2014 New Revision: 1617632 URL: http://svn.apache.org/r1617632 Log: add contributor Modified: tomcat/maven-plugin/branches/tc8.x/pom.xml Modified: tomcat/maven-plugin/branches/tc8.x/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/pom.xml?rev=1617632r1=1617631r2=1617632view=diff == --- tomcat/maven-plugin/branches/tc8.x/pom.xml (original) +++ tomcat/maven-plugin/branches/tc8.x/pom.xml Wed Aug 13 00:18:21 2014 @@ -183,6 +183,9 @@ contributor nameSylvain Guillope/name /contributor +contributor + nameXavier Dury/name +/contributor /contributors licenses - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed
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 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-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: 16 mins 37 secs Command Line: /usr/lib/jvm/java-7-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.12-SNAPSHOT.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140813-native-src.tar.gz -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140813-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20140813.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dexecute.test.nio=true -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/pub lic/workspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=false -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20140813.jar -Dtest.temp=output/test-tmp-NIO -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/hamcrest-java/build/hamcrest-core-20140813.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-7-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
[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed
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 27 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 8.x, a web server implementing the Java Servlet 3.1, ... 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 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: 24 mins 35 secs Command Line: /usr/lib/jvm/java-7-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.12-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140813-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20140813.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140813-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/dest-20140813/bi n/openssl -Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/hamcrest-java/build/hamcrest-core-20140813.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-7-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-tc7.0.x-test-bio (in module tomcat-7.0.x) failed
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-bio 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-tc7.0.x-test-bio : 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-bio/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-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 15 mins 57 secs Command Line: /usr/lib/jvm/java-7-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.12-SNAPSHOT.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140813-native-src.tar.gz -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140813-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20140813.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dexecute.test.nio=false -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/pu blic/workspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20140813.jar -Dtest.temp=output/test-tmp-BIO -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/hamcrest-java/build/hamcrest-core-20140813.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-7-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
[Bug 56844] New: Update to OpenSSL 1.0.1i
https://issues.apache.org/bugzilla/show_bug.cgi?id=56844 Bug ID: 56844 Summary: Update to OpenSSL 1.0.1i Product: Tomcat Native Version: 1.1.31 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Library Assignee: dev@tomcat.apache.org Reporter: knst.koli...@gmail.com OpenSSL 1.0.1i has been released on 06-Aug-2014 and contains security fixes. Security advisory: http://www.openssl.org/news/secadv_20140806.txt -- 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
