Re: [VOTE] Release Apache Tomcat Connectors 1.2.35
> Due to one bug that can crash httpd in case someone > has typo in JkMount directive, 1.2.34 was cancelled and > here is 1.2.35. > > The VOTE will remain open for at least 48 hours. > > The Apache Tomcat Connectors 1.2.35 is > [X] Stable, go ahead and release > [ ] Broken because of ... Works for me on OSX Lion. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304249 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11NioProcessor.java Http11Processor.java
Author: markt
Date: Fri Mar 23 09:48:34 2012
New Revision: 1304249
URL: http://svn.apache.org/viewvc?rev=1304249&view=rev
Log:
Remove unused code after upgrade was refactored
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
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=1304249&r1=1304248&r2=1304249&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Fri Mar
23 09:48:34 2012
@@ -57,15 +57,6 @@ public class Http11AprProcessor extends
// --- Constructors
-/**
- * Intended for use by the Upgrade sub-classes that have no need to
- * initialise the request, response, etc.
- */
-protected Http11AprProcessor() {
-// NOOP
-}
-
-
public Http11AprProcessor(int headerBufferSize, AprEndpoint endpoint,
int maxTrailerSize) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1304249&r1=1304248&r2=1304249&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Fri Mar
23 09:48:34 2012
@@ -62,15 +62,6 @@ public class Http11NioProcessor extends
// --- Constructors
-/**
- * Intended for use by the Upgrade sub-classes that have no need to
- * initialise the request, response, etc.
- */
-protected Http11NioProcessor() {
-// NOOP
-}
-
-
public Http11NioProcessor(int maxHttpHeaderSize, NioEndpoint endpoint,
int maxTrailerSize) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1304249&r1=1304248&r2=1304249&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Fri Mar 23
09:48:34 2012
@@ -49,15 +49,6 @@ public class Http11Processor extends Abs
// Constructor
-/**
- * Intended for use by the Upgrade sub-classes that have no need to
- * initialise the request, response, etc.
- */
-protected Http11Processor() {
-// NOOP
-}
-
-
public Http11Processor(int headerBufferSize, JIoEndpoint endpoint,
int maxTrailerSize) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304250 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/Http11AprProcessor.java java/org/apache/coyote/http11/Http11NioProcessor.java java/org/apache/coyote/http11/Http11Proc
Author: markt
Date: Fri Mar 23 09:49:08 2012
New Revision: 1304250
URL: http://svn.apache.org/viewvc?rev=1304250&view=rev
Log:
Remove unused code after upgrade was refactored
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1304249
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1304250&r1=1304249&r2=1304250&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
Fri Mar 23 09:49:08 2012
@@ -57,15 +57,6 @@ public class Http11AprProcessor extends
// --- Constructors
-/**
- * Intended for use by the Upgrade sub-classes that have no need to
- * initialise the request, response, etc.
- */
-protected Http11AprProcessor() {
-// NOOP
-}
-
-
public Http11AprProcessor(int headerBufferSize, AprEndpoint endpoint,
int maxTrailerSize) {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1304250&r1=1304249&r2=1304250&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Fri Mar 23 09:49:08 2012
@@ -62,15 +62,6 @@ public class Http11NioProcessor extends
// --- Constructors
-/**
- * Intended for use by the Upgrade sub-classes that have no need to
- * initialise the request, response, etc.
- */
-protected Http11NioProcessor() {
-// NOOP
-}
-
-
public Http11NioProcessor(int maxHttpHeaderSize, NioEndpoint endpoint,
int maxTrailerSize) {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1304250&r1=1304249&r2=1304250&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java Fri
Mar 23 09:49:08 2012
@@ -49,15 +49,6 @@ public class Http11Processor extends Abs
// Constructor
-/**
- * Intended for use by the Upgrade sub-classes that have no need to
- * initialise the request, response, etc.
- */
-protected Http11Processor() {
-// NOOP
-}
-
-
public Http11Processor(int headerBufferSize, JIoEndpoint endpoint,
int maxTrailerSize) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304253 - in /tomcat/trunk/java/org/apache/tomcat/util/net: NioEndpoint.java res/LocalStrings.properties
Author: markt
Date: Fri Mar 23 09:55:08 2012
New Revision: 1304253
URL: http://svn.apache.org/viewvc?rev=1304253&view=rev
Log:
kkolinko review of r1304011: Always close selector
Additionally, ensure that an exception during the close does not prevent the
poller loop from ending
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1304253&r1=1304252&r2=1304253&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri Mar 23
09:55:08 2012
@@ -1121,6 +1121,12 @@ public class NioEndpoint extends Abstrac
if (close) {
events();
timeout(0, false);
+try {
+selector.close();
+} catch (IOException ioe) {
+log.error(sm.getString(
+"endpoint.nio.selectorCloseFail"), ioe);
+}
break;
} else {
hasEvents = events();
@@ -1139,7 +1145,12 @@ public class NioEndpoint extends Abstrac
if (close) {
events();
timeout(0, false);
-selector.close();
+try {
+selector.close();
+} catch (IOException ioe) {
+log.error(sm.getString(
+"endpoint.nio.selectorCloseFail"),
ioe);
+}
break;
}
} catch ( NullPointerException x ) {
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties?rev=1304253&r1=1304252&r2=1304253&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
Fri Mar 23 09:55:08 2012
@@ -36,3 +36,4 @@ endpoint.debug.channelCloseFail=Failed t
endpoint.debug.socketCloseFail=Failed to close socket
endpoint.apr.noSslCertFile=Connector attribute SSLCertificateFile must be
defined when using SSL with APR
endpoint.apr.invalidSslProtocol=An invalid value [{0}] was provided for the
SSLProtocol attribute
+endpoint.nio.selectorCloseFail=Failed to close selector when closing the poller
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304255 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/NioEndpoint.java java/org/apache/tomcat/util/net/res/LocalStrings.properties
Author: markt
Date: Fri Mar 23 09:56:35 2012
New Revision: 1304255
URL: http://svn.apache.org/viewvc?rev=1304255&view=rev
Log:
kkolinko review of r1304011: Always close selector
Additionally, ensure that an exception during the close does not prevent the
poller loop from ending
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1304253
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1304255&r1=1304254&r2=1304255&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri
Mar 23 09:56:35 2012
@@ -1122,6 +1122,12 @@ public class NioEndpoint extends Abstrac
if (close) {
events();
timeout(0, false);
+try {
+selector.close();
+} catch (IOException ioe) {
+log.error(sm.getString(
+"endpoint.nio.selectorCloseFail"), ioe);
+}
break;
} else {
hasEvents = events();
@@ -1140,7 +1146,12 @@ public class NioEndpoint extends Abstrac
if (close) {
events();
timeout(0, false);
-selector.close();
+try {
+selector.close();
+} catch (IOException ioe) {
+log.error(sm.getString(
+"endpoint.nio.selectorCloseFail"),
ioe);
+}
break;
}
} catch ( NullPointerException x ) {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties?rev=1304255&r1=1304254&r2=1304255&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
Fri Mar 23 09:56:35 2012
@@ -47,3 +47,4 @@ endpoint.debug.channelCloseFail=Failed t
endpoint.debug.socketCloseFail=Failed to close socket
endpoint.apr.noSslCertFile=Connector attribute SSLCertificateFile must be
defined when using SSL with APR
endpoint.apr.invalidSslProtocol=An invalid value [{0}] was provided for the
SSLProtocol attribute
+endpoint.nio.selectorCloseFail=Failed to close selector when closing the poller
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304259 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml
Author: kkolinko Date: Fri Mar 23 10:09:28 2012 New Revision: 1304259 URL: http://svn.apache.org/viewvc?rev=1304259&view=rev Log: Add mod_jk 1.2.33 issues warning to the front page. Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs/index.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1304259&r1=1304258&r2=1304259&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Fri Mar 23 10:09:28 2012 @@ -247,6 +247,13 @@ Apache Tomcat Connectors. This version is principally a bugfix release. + +Warning: There are stability issues with the mod_jk 1.2.33 +release. If you have not yet upgraded to mod_jk 1.2.33 we recommend that you +wait for the mod_jk 1.2.35 release which is currently in progress. If you have +upgraded and are experienced issues we recommend that you downgrade to +mod_jk 1.2.32 until mod_jk 1.2.35 is available. + Download | Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1304259&r1=1304258&r2=1304259&view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Fri Mar 23 10:09:28 2012 @@ -43,6 +43,11 @@ The Apache Tomcat Project is proud to an Apache Tomcat Connectors. This version is principally a bugfix release. +Warning: There are stability issues with the mod_jk 1.2.33 +release. If you have not yet upgraded to mod_jk 1.2.33 we recommend that you +wait for the mod_jk 1.2.35 release which is currently in progress. If you have +upgraded and are experienced issues we recommend that you downgrade to +mod_jk 1.2.32 until mod_jk 1.2.35 is available. Download | ChangeLog for 1.2.33 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304260 - /tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Author: markt
Date: Fri Mar 23 10:11:59 2012
New Revision: 1304260
URL: http://svn.apache.org/viewvc?rev=1304260&view=rev
Log:
Remove unused code after upgrade was refactored
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1304260&r1=1304259&r2=1304260&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Fri Mar 23 10:11:59 2012
@@ -61,14 +61,6 @@ public abstract class AbstractHttp11Proc
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
-/**
- * Intended for use by the Upgrade sub-classes that have no need to
- * initialise the request, response, etc.
- */
-protected AbstractHttp11Processor() {
-// NOOP
-}
-
/*
* Tracks how many internal filters are in the filter library so they
* are skipped when looking for pluggable filters.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304261 - /tomcat/tc7.0.x/trunk/
Author: markt Date: Fri Mar 23 10:12:51 2012 New Revision: 1304261 URL: http://svn.apache.org/viewvc?rev=1304261&view=rev Log: Remove unused code after upgrade was refactored Modified: tomcat/tc7.0.x/trunk/ (props changed) Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1304260 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304263 - in /tomcat/site/trunk: docs/ci.html xdocs/ci.xml
Author: kkolinko Date: Fri Mar 23 10:25:12 2012 New Revision: 1304263 URL: http://svn.apache.org/viewvc?rev=1304263&view=rev Log: Add links to Taglibs-All at Jenkins and tomcat-taglibs at Gump Modified: tomcat/site/trunk/docs/ci.html tomcat/site/trunk/xdocs/ci.xml Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1304263&r1=1304262&r2=1304263&view=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Fri Mar 23 10:25:12 2012 @@ -642,6 +642,47 @@ prepared and published by ASF Buildbot, + + +http://vmgump.apache.org/gump/public/tomcat-taglibs/";>tomcat-taglibs + + + + +Source path: /tomcat/taglibs/trunks + + + +Projects: + + + + +http://vmgump.apache.org/gump/public/tomcat-taglibs/taglibs-parent/";>taglibs-parent + + + +http://vmgump.apache.org/gump/public/tomcat-taglibs/taglibs-standard-spec/";>taglibs-standard-spec + + + +http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/";>tomcat-taglibs-standard + + + +http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard-install/";>tomcat-taglibs-standard-install + + + + + + + + + + + + @@ -780,6 +821,43 @@ on the Gump project page. Links to them + + + + + + + +http://gump.zones.apache.org/gump/public/tomcat-taglibs/index.html";>tomcat-taglibs module + + + + +http://gump.zones.apache.org/gump/public/tomcat-taglibs/taglibs-parent/";>taglibs-parent + + + +http://gump.zones.apache.org/gump/public/tomcat-taglibs/taglibs-standard-spec/";>taglibs-standard-spec + + + +http://gump.zones.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/";>tomcat-taglibs-standard + + + +http://gump.zones.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard-install/";>tomcat-taglibs-standard-install + + + + + + + + + + + + Apache - Adam (Mac OS X Server) @@ -898,6 +976,43 @@ on the Gump project page. Links to them + + + + + + + +http://adam.apache.org/gump/tomcat-taglibs/index.html";>tomcat-taglibs module + + + + +http://adam.apache.org/gump/tomcat-taglibs/taglibs-parent/";>taglibs-parent + + + +http://adam.apache.org/gump/tomcat-taglibs/taglibs-standard-spec/";>taglibs-standard-spec + + + +http://adam.apache.org/gump/tomcat-taglibs/tomcat-taglibs-standard/";>tomcat-taglibs-standard + + + +http://adam.apache.org/gump/tomcat-taglibs/tomcat-taglibs-standard-install/";>tomcat-taglibs-standard-install + + + + + + + + + + + + @@ -937,6 +1052,10 @@ on the Gump project page. Links to them https://builds.apache.org/job/Tomcat-7.x/";>Tomcat-7.x (experimental) + + +https://builds.apache.org/job/Taglibs-All/";>Taglibs-All + Modified: tomcat/site/trunk/xdocs/ci.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/ci.xml?rev=1304263&r1=1304262&r2=1304263&view=diff == --- tomcat/site/trunk/xdocs/ci.xml (original) +++ tomcat/site/trunk/xdocs/ci.xml Fri Mar 23 10:25:12 2012 @@ -170,6 +170,22 @@ prepared and published by ASF Buildbot, + + http://vmgump.apache.org/gump/public/tomcat-taglibs/";>tomcat-taglibs + + + Source path: /tomcat/taglibs/trunks + Projects: + + http://vmgump.apache.org/gump/public/tomcat-taglibs/taglibs-parent/";>taglibs-parent + http://vmgump.apache.org/gump/public/tomcat-taglibs/taglibs-standard-spec/";>taglibs-standard-spec + http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/";>tomcat-taglibs-standard + http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard-install/";>tomcat-taglibs-standard-install + + + + + @@ -228,6 +244,20 @@ on the Gump project page. Links to them + + + + http://gump.zones.apache.org/gump/public/tomcat-taglibs/index.html";>tomcat-taglibs module + + http://gump.zones.apache.org/gump/public/tomcat-taglibs/taglibs-parent/";>taglibs-parent + http://gump.zones.apache.org/gump/public/tomcat-taglibs/taglibs-standard-spec/";>taglibs-standard-spec + http://gump.zones.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/";>tomcat-taglibs-standard + http://gump.zones.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard-install/";>tomcat-taglibs-standard-install + + + + + Apache - Adam (Mac OS X Server) @@ -273,6 +303,20 @@ on the Gump project page. Links to them + + + + http://adam.apache.org/gump/tomcat-taglibs/index.html";>tomcat-taglibs module + +
Re: svn commit: r1304261 - /tomcat/tc7.0.x/trunk/
2012/3/23 : > Author: markt > Date: Fri Mar 23 10:12:51 2012 > New Revision: 1304261 > > URL: http://svn.apache.org/viewvc?rev=1304261&view=rev > Log: > Remove unused code after upgrade was refactored > > Modified: > tomcat/tc7.0.x/trunk/ (props changed) > > Propchange: tomcat/tc7.0.x/trunk/ > -- > Merged /tomcat/trunk:r1304260 > > > Mergeinfo only? The revision number is OK. If you already have the changed file - just commit it. If you do not have it - apply the change manually. (r1304260 being in mergeinfo will cause changes to be ignored if you re-run the merge). 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: r1304271 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Author: markt
Date: Fri Mar 23 10:38:42 2012
New Revision: 1304271
URL: http://svn.apache.org/viewvc?rev=1304271&view=rev
Log:
Remove unused code after upgrade was refactored
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1304271&r1=1304270&r2=1304271&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Fri
Mar 23 10:38:42 2012
@@ -61,14 +61,6 @@ public abstract class AbstractHttp11Proc
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
-/**
- * Intended for use by the Upgrade sub-classes that have no need to
- * initialise the request, response, etc.
- */
-protected AbstractHttp11Processor() {
-// NOOP
-}
-
/*
* Tracks how many internal filters are in the filter library so they
* are skipped when looking for pluggable filters.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304273 - /tomcat/tc7.0.x/trunk/
Author: markt Date: Fri Mar 23 10:40:01 2012 New Revision: 1304273 URL: http://svn.apache.org/viewvc?rev=1304273&view=rev Log: Update merge info Modified: tomcat/tc7.0.x/trunk/ (props changed) Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1304271 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304275 - in /tomcat/trunk/java/org/apache/tomcat/util/http/parser: AstMediaType.java HttpParser.java HttpParser.jjt HttpParserConstants.java HttpParserTokenManager.java
Author: markt
Date: Fri Mar 23 10:43:17 2012
New Revision: 1304275
URL: http://svn.apache.org/viewvc?rev=1304275&view=rev
Log:
kkolinko review of r1300154
Correctly parse quoted-pair
'charset' parameter name should be case insensitive
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/parser/AstMediaType.java
tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.jjt
tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParserConstants.java
tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParserTokenManager.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/parser/AstMediaType.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/AstMediaType.java?rev=1304275&r1=1304274&r2=1304275&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/AstMediaType.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/AstMediaType.java Fri
Mar 23 10:43:17 2012
@@ -21,6 +21,9 @@ package org.apache.tomcat.util.http.pars
* by http://javacc.java.net/doc/JJTree.html";> JJTree.
*/
public class AstMediaType extends SimpleNode {
+
+private static final String CHARSET = "charset";
+
public AstMediaType(int id) {
super(id);
}
@@ -33,10 +36,10 @@ public class AstMediaType extends Simple
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(children[0].toString());
-sb.append("/");
+sb.append('/');
sb.append(children[1].toString());
for (int i = 2; i < children.length; i++) {
-sb.append(";");
+sb.append(';');
sb.append(children[i].toString());
}
return sb.toString();
@@ -45,12 +48,13 @@ public class AstMediaType extends Simple
public String toStringNoCharset() {
StringBuilder sb = new StringBuilder();
sb.append(children[0].toString());
-sb.append("/");
+sb.append('/');
sb.append(children[1].toString());
for (int i = 2; i < children.length; i++) {
AstParameter p = (AstParameter) children[i];
-if (!"charset".equals(p.children[0].jjtGetValue())) {
-sb.append(";");
+if (!CHARSET.equals(
+p.children[0].jjtGetValue().toString().toLowerCase())) {
+sb.append(';');
sb.append(p.toString());
}
}
@@ -60,7 +64,8 @@ public class AstMediaType extends Simple
public String getCharset() {
for (int i = 2; i < children.length; i++) {
AstParameter p = (AstParameter) children[i];
-if ("charset".equals(p.children[0].jjtGetValue())) {
+if (CHARSET.equals(
+p.children[0].jjtGetValue().toString().toLowerCase())) {
return p.children[1].jjtGetValue().toString();
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1304275&r1=1304274&r2=1304275&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java Fri
Mar 23 10:43:17 2012
@@ -302,7 +302,7 @@ public class HttpParser/*@bgen(jjtree)*/
/** Generate ParseException. */
public ParseException generateParseException() {
jj_expentries.clear();
-boolean[] la1tokens = new boolean[14];
+boolean[] la1tokens = new boolean[15];
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
@@ -316,7 +316,7 @@ public class HttpParser/*@bgen(jjtree)*/
}
}
}
-for (int i = 0; i < 14; i++) {
+for (int i = 0; i < 15; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.jjt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.jjt?rev=1304275&r1=1304274&r2=1304275&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.jjt
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.jjt Fri Mar
23 10:43:17 2012
@@ -119,7 +119,7 @@ void Value() #Value : { Token t = null;
TOKEN :
{
- < #QUOTED_TEXT : (("\\" ( | "\"")) |
)* >
+ < #QUOTED_TEXT : ( | ("\\" ))* >
| < #END_QUOTE : "\"" >
| < #QUOTED_TEXT_CHAR:
[
@@ -129,4 +129,9 @@ void Value() #Value : { Token t = null;
"\u005d"-"\u00ff"
]
>
+| < #CHAR:
+
Re: svn commit: r1300154 [1/2] - in /tomcat/trunk: ./ java/org/apache/coyote/ java/org/apache/tomcat/util/http/parser/ test/org/apache/tomcat/util/http/parser/
On 23/03/2012 01:41, Konstantin Kolinko wrote:
> 2012/3/13 :
>> Author: markt
>> Date: Tue Mar 13 14:39:24 2012
>> New Revision: 1300154
> 1) It seems that quoted text handling (" TOKEN"
> construct) is slightly wrong in its handling of backslash character.
Agreed. Fixed.
> 2) RFC2616: ch.3.7 Media Types
> "Linear white space
>(LWS) MUST NOT be used between the type and subtype, nor between an
>attribute and its value."
> I am OK with it though, because I do not see any problem from it, but
> maybe LWS could be removed from TOKEN and QUOTED_STRING constructs
> along with those trim() calls.
Keeping the code as is should make re-use of the parser for other
headers easier. As long as the LWS does not cause an issue, I'm OK with
the current approach. After all, servers are meant to be tolerant where
they can be.
> 3)
> I do not see where we allow "charset" parameter name to be
> case-insensitive. We allow lowercase only.
Agreed. Fixed.
> 4) The "value" of a parameter can be quoted-string. We do not handle
> unquoting of charset parameter value. I am OK with leaving as is,
> because nobody asked.
We do handle this. jjtGetValue() will unquote the value if it is quoted.
toString() will return the original value.
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/2886 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1304253 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
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/500 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] 1304261 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
AJP13: response message with container remote user
Hi All, I have several web applications running on distinct tomcat instances. Apache httpd is in front of all the tomcat instances, running as a reverse proxy. Authentication is realized at the container side. Access log files are active on the httpd side. What I am missing in the httpd log files is the remote user information. I know it is not available via mod_proxy. So I plan to switch to mod_jk. But it is not available in mod_jk either. And I would like to contribute on this. I know a possible work around would be to include the remote user information in the response headers and log this via httpd; but I am not sure I can count on the software owners to make the changes in a short time. If there is not difficulty in tomcat for grabbing the remote user, I would like to add a new response message in AJP13. The new response message would be as follow: AJP13_CONTAINER_REMOTE_USER := prefix_code7 remote_user (string) Any comments before I start working on this ? Thanks for your interest, -- Issa Gorissen
Re: AJP13: response message with container remote user
2012/3/23 : > Hi All, > > I have several web applications running on distinct tomcat instances. Apache > httpd is in front of all the tomcat instances, running as a reverse proxy. > Authentication is realized at the container side. Access log files are active > on the httpd side. "at the container side" = in Tomcat? > > What I am missing in the httpd log files is the remote user information. I > know it is not available via mod_proxy. So I plan to switch to mod_jk. But it > is not available in mod_jk either. And I would like to contribute on this. I > know a possible work around would be to include the remote user information > in the response headers and log this via httpd; but I am not sure I can count > on the software owners to make the changes in a short time. > > If there is not difficulty in tomcat for grabbing the remote user, I would > like to add a new response message in AJP13. Just enable access logs (aka AccessLogValve) in Tomcat itself. It will print whatever user Tomcat authenticated. That works only if authentication is done by Tomcat. In many cases authentication is done by 3-rd party frameworks e.g. Spring Security, inside the web application itself. I think patching the connectors and mod_jk is not a good idea here. > The new response message would be as follow: > > AJP13_CONTAINER_REMOTE_USER := > prefix_code 7 > remote_user (string) > > > Any comments before I start working on this ? > > Thanks for your interest, > -- > Issa Gorissen > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: AJP13: response message with container remote user
> > I have several web applications running on distinct tomcat instances. > Apache httpd is in front of all the tomcat instances, running as a reverse > proxy. Authentication is realized at the container side. Access log files are > active on the httpd side. > > "at the container side" = in Tomcat? Yes container side being Tomcat. > > Just enable access logs (aka AccessLogValve) in Tomcat itself. It will > print whatever user Tomcat authenticated. > > That works only if authentication is done by Tomcat. In many cases > authentication is done by 3-rd party frameworks e.g. Spring Security, > inside the web application itself. > > I think patching the connectors and mod_jk is not a good idea here. > Well, I have indeed seen that this information can be printed by Tomcat. My goal is to have all the access information in one file, not two or more, because I have one httpd instance and five tomcat instances served by this httpd instance. This would mean having to process six access files... Not practical IMO. Can you explain for my understanding why you think it would be a bad idea to patch the connectors & mod_jk ? Thx -- Issa
Re: svn commit: r1300154 [1/2] - in /tomcat/trunk: ./ java/org/apache/coyote/ java/org/apache/tomcat/util/http/parser/ test/org/apache/tomcat/util/http/parser/
2012/3/23 Mark Thomas :
> On 23/03/2012 01:41, Konstantin Kolinko wrote:
>> 2012/3/13 :
>>> Author: markt
>>> Date: Tue Mar 13 14:39:24 2012
>>> New Revision: 1300154
>
>> 1) It seems that quoted text handling (" TOKEN"
>> construct) is slightly wrong in its handling of backslash character.
>
> Agreed. Fixed.
>
OK
>> 2) RFC2616: ch.3.7 Media Types
>
>> "Linear white space
>> (LWS) MUST NOT be used between the type and subtype, nor between an
>> attribute and its value."
>
>> I am OK with it though, because I do not see any problem from it, but
>> maybe LWS could be removed from TOKEN and QUOTED_STRING constructs
>> along with those trim() calls.
>
> Keeping the code as is should make re-use of the parser for other
> headers easier. As long as the LWS does not cause an issue, I'm OK with
> the current approach. After all, servers are meant to be tolerant where
> they can be.
>
ACK
>> 3)
>> I do not see where we allow "charset" parameter name to be
>> case-insensitive. We allow lowercase only.
>
> Agreed. Fixed.
>
toLowerCase()? We are passing Locale.ENGLISH to such calls elsewhere.
I think that String.equalsIgnoreCase() would be faster (no additional
object creation and stops on first mismatch)
It does not matter for charset though.
>> 4) The "value" of a parameter can be quoted-string. We do not handle
>> unquoting of charset parameter value. I am OK with leaving as is,
>> because nobody asked.
>
> We do handle this. jjtGetValue() will unquote the value if it is quoted.
> toString() will return the original value.
>
OK, I see - in AstValue.java
Unquoting is actually not as trivial as just replacing \" with ", but
for our use case (charset value) it is OK.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: AJP13: response message with container remote user
2012/3/23 : >> >> That works only if authentication is done by Tomcat. In many cases >> authentication is done by 3-rd party frameworks e.g. Spring Security, >> inside the web application itself. >> >> I think patching the connectors and mod_jk is not a good idea here. >> > > > Well, I have indeed seen that this information can be printed by Tomcat. My > goal is to have all the access information in one file, not two or more, > because I have one httpd instance and five tomcat instances served by this > httpd instance. This would mean having to process six access files... Not > practical IMO. > > > Can you explain for my understanding why you think it would be a bad idea to > patch the connectors & mod_jk ? 1. I do not think that your amendment to the AJP protocol can be contributed to official releases without much of work. There is no protocol capabilities negotiation between httpd and tomcat, so it has to be somehow explicitly enabled on both sides. Note, that there are several independent server-side ajp implementations (e.g. mod_proxy_ajp) and client-side implementations (e.g. jetty). There are 3 different implementations of Ajp connector in Tomcat itself. 2. In many cases Tomcat does not know how user is authenticated, as I already mentioned. 3. You would need some additional work and configuration on httpd side to make the information provided by Tomcat be printed into the logs. 4. It is easier to pass the information back via AJP13_SEND_HEADERS message.instead of inventing a new message type and marshalling it over the wire. 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: r1304011 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
2012/3/23 Konstantin Kolinko : > 2012/3/22 : > >> URL: http://svn.apache.org/viewvc?rev=1304011&view=rev > > Comparing (1) and (2), > both are terminating the loop, but the (2)nd block has > "selector.close()" call and (1)st does not have the call. I suspect > that both should have the close() call. OK. I saw you fixed it. Just noting, that recent buildbot run did show testCometConnectorStop() failure again, http://ci.apache.org/projects/tomcat/tomcat8/logs/1304275/TEST-org.apache.catalina.comet.TestCometProcessor.NIO.txt So something is still there. 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: r1304468 - /tomcat/trunk/java/org/apache/naming/SelectorContext.java
Author: kkolinko
Date: Fri Mar 23 16:38:43 2012
New Revision: 1304468
URL: http://svn.apache.org/viewvc?rev=1304468&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=52830#c6
Alternative implementation of the fix,
which does not require that name were an instance of CompositeName.
(I am not sure that this change is worth it, but I think it is better this way).
Modified:
tomcat/trunk/java/org/apache/naming/SelectorContext.java
Modified: tomcat/trunk/java/org/apache/naming/SelectorContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/SelectorContext.java?rev=1304468&r1=1304467&r2=1304468&view=diff
==
--- tomcat/trunk/java/org/apache/naming/SelectorContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/SelectorContext.java Fri Mar 23
16:38:43 2012
@@ -21,7 +21,6 @@ package org.apache.naming;
import java.util.Hashtable;
import javax.naming.Binding;
-import javax.naming.CompositeName;
import javax.naming.Context;
import javax.naming.Name;
import javax.naming.NameClassPair;
@@ -773,9 +772,8 @@ public class SelectorContext implements
if (name.get(0).equals(prefix)) {
return name.getSuffix(1);
} else {
-Name result = new CompositeName();
-result.add(name.get(0).substring(prefixLength));
-result.addAll(name.getSuffix(1));
+Name result = name.getSuffix(1);
+result.add(0, name.get(0).substring(prefixLength));
return result;
}
} else {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304471 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/naming/SelectorContext.java
Author: kkolinko
Date: Fri Mar 23 16:41:38 2012
New Revision: 1304471
URL: http://svn.apache.org/viewvc?rev=1304471&view=rev
Log:
Merged revision 1304468 from tomcat/trunk:
https://issues.apache.org/bugzilla/show_bug.cgi?id=52830#c6
Alternative implementation of the fix,
which does not require that name were an instance of CompositeName.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/naming/SelectorContext.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1304468
Modified: tomcat/tc7.0.x/trunk/java/org/apache/naming/SelectorContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/SelectorContext.java?rev=1304471&r1=1304470&r2=1304471&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/SelectorContext.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/SelectorContext.java Fri Mar 23
16:41:38 2012
@@ -21,7 +21,6 @@ package org.apache.naming;
import java.util.Hashtable;
import javax.naming.Binding;
-import javax.naming.CompositeName;
import javax.naming.Context;
import javax.naming.Name;
import javax.naming.NameClassPair;
@@ -772,9 +771,8 @@ public class SelectorContext implements
if (name.get(0).equals(prefix)) {
return name.getSuffix(1);
} else {
-Name result = new CompositeName();
-result.add(name.get(0).substring(prefixLength));
-result.addAll(name.getSuffix(1));
+Name result = name.getSuffix(1);
+result.add(0, name.get(0).substring(prefixLength));
return result;
}
} else {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1304472 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Mar 23 16:44:00 2012 New Revision: 1304472 URL: http://svn.apache.org/viewvc?rev=1304472&view=rev Log: update 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=1304472&r1=1304471&r2=1304472&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar 23 16:44:00 2012 @@ -130,9 +130,9 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1298635&view=rev +1: markt +1: fhanik - would have been easier to read if 90% of the patch wasn't document/formatting related - +1: kkolinko, though see - https://issues.apache.org/bugzilla/show_bug.cgi?id=52830#c6 - for a possible minor fix. + +1: kkolinko, though see alternative implementation, + http://svn.apache.org/viewvc?rev=1304468&view=rev + (explained in https://issues.apache.org/bugzilla/show_bug.cgi?id=52830#c6 ) -1: * https://issues.apache.org/bugzilla/show_bug.cgi?id=52811 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52830] DataSource JNDI lookup with javax.naming.Name failed
https://issues.apache.org/bugzilla/show_bug.cgi?id=52830 --- Comment #7 from Konstantin Kolinko 2012-03-23 16:44:30 UTC --- (In reply to comment #6) I've applied this alternative implementation in r1304468 (trunk), r1304471 (TC7) -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1304483 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml
Author: kkolinko
Date: Fri Mar 23 17:00:20 2012
New Revision: 1304483
URL: http://svn.apache.org/viewvc?rev=1304483&view=rev
Log:
Merged revision 1298140 from tomcat/trunk:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52719
Correct theoretical resource leak during Jar validation
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
Merged /tomcat/trunk:r1298140
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1304483&r1=1304482&r2=1304483&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar 23 17:00:20 2012
@@ -95,12 +95,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: rjung, mturk, fhanik, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52719
- Correct theoretical resource leak during Jar validation
- http://svn.apache.org/viewvc?rev=1298143&view=rev
- +1: markt, fhanik, kkolinko
- -1:
-
* Replicate Principal in ClusterSingleSignOn.
http://svn.apache.org/viewvc?view=revision&revision=1298299
+1: kfujino, fhanik, markt
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1304483&r1=1304482&r2=1304483&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Fri Mar 23 17:00:20 2012
@@ -3256,44 +3256,53 @@ public class WebappClassLoader
* Check the specified JAR file, and return true if it does
* not contain any of the trigger classes.
*
- * @param jarfile The JAR file to be checked
+ * @param file The JAR file to be checked
*
* @exception IOException if an input/output error occurs
*/
-protected boolean validateJarFile(File jarfile)
+protected boolean validateJarFile(File file)
throws IOException {
if (triggers == null)
return (true);
-JarFile jarFile = new JarFile(jarfile);
-for (int i = 0; i < triggers.length; i++) {
-Class clazz = null;
-try {
-if (parent != null) {
-clazz = parent.loadClass(triggers[i]);
-} else {
-clazz = Class.forName(triggers[i]);
+
+JarFile jarFile = null;
+try {
+jarFile = new JarFile(file);
+for (int i = 0; i < triggers.length; i++) {
+Class clazz = null;
+try {
+if (parent != null) {
+clazz = parent.loadClass(triggers[i]);
+} else {
+clazz = Class.forName(triggers[i]);
+}
+} catch (Throwable t) {
+clazz = null;
+}
+if (clazz == null)
+continue;
+String name = triggers[i].replace('.', '/') + ".class";
+if (log.isDebugEnabled())
+log.debug(" Checking for " + name);
+JarEntry jarEntry = jarFile.getJarEntry(name);
+if (jarEntry != null) {
+log.info("validateJarFile(" + file +
+") - jar not loaded. See Servlet Spec 2.3, "
++ "section 9.7.2. Offending class: " + name);
+return false;
}
-} catch (Throwable t) {
-clazz = null;
}
-if (clazz == null)
-continue;
-String name = triggers[i].replace('.', '/') + ".class";
-if (log.isDebugEnabled())
-log.debug(" Checking for " + name);
-JarEntry jarEntry = jarFile.getJarEntry(name);
-if (jarEntry != null) {
-log.info("validateJarFile(" + jarfile +
-") - jar not loaded. See Servlet Spec 2.3, "
-+ "section 9.7.2. Offending class: " + name);
-jarFile.close();
-return (false);
+return true;
+} finally {
+if (jarFile != null) {
+try {
+jarFile.close();
+} catch (IOException ioe) {
+// Ignore
+}
}
}
-jarFile.close();
-return (true);
-
}
Modified: tomcat/tc6.0.x/trunk/weba
DO NOT REPLY [Bug 52719] An incomplete fix for the resource leak bug in WebappClassLoader.java
https://issues.apache.org/bugzilla/show_bug.cgi?id=52719 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Konstantin Kolinko 2012-03-23 17:02:47 UTC --- Fixed in 6.0 with r1304483 and will be in 6.0.36 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1304509 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/jni/Library.java java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/apr.xml webapps/docs/changelog.xml
Author: kkolinko
Date: Fri Mar 23 17:25:38 2012
New Revision: 1304509
URL: http://svn.apache.org/viewvc?rev=1304509&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51477
Support all SSL/TLS protocol combinations in APR connector.
(rjung)
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc6.0.x/trunk/webapps/docs/apr.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1304509&r1=1304508&r2=1304509&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar 23 17:25:38 2012
@@ -86,15 +86,6 @@ PATCHES PROPOSED TO BACKPORT:
-0: markt - https://issues.apache.org/bugzilla/show_bug.cgi?id=52579#c8
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51477
- Support all SSL/TLS protocol combinations in APR connector.
- trunk/TC7 (applies clean except for docs):
-http://svn.apache.org/viewvc?rev=1145209&view=rev
- TC 6 patch:
-
http://people.apache.org/~rjung/patches/tc6-apr-all-sslprotocol-r1145209.patch
- +1: rjung, mturk, fhanik, markt
- -1:
-
* Replicate Principal in ClusterSingleSignOn.
http://svn.apache.org/viewvc?view=revision&revision=1298299
+1: kfujino, fhanik, markt
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java?rev=1304509&r1=1304508&r2=1304509&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java Fri Mar 23
17:25:38 2012
@@ -85,6 +85,8 @@ public final class Library {
public static int TCN_PATCH_VERSION = 0;
/* TCN_IS_DEV_VERSION */
public static int TCN_IS_DEV_VERSION = 0;
+/* TCN_FULL_VERSION */
+public static int TCN_FULL_VERSION = 0;
/* APR_MAJOR_VERSION */
public static int APR_MAJOR_VERSION = 0;
/* APR_MINOR_VERSION */
@@ -161,6 +163,9 @@ public final class Library {
TCN_MINOR_VERSION = version(0x02);
TCN_PATCH_VERSION = version(0x03);
TCN_IS_DEV_VERSION = version(0x04);
+TCN_FULL_VERSION = TCN_MAJOR_VERSION * 1000 +
+ TCN_MINOR_VERSION * 100 +
+ TCN_PATCH_VERSION;
APR_MAJOR_VERSION = version(0x11);
APR_MINOR_VERSION = version(0x12);
APR_PATCH_VERSION = version(0x13);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1304509&r1=1304508&r2=1304509&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri
Mar 23 17:25:38 2012
@@ -705,24 +705,52 @@ public class AprEndpoint {
if (SSLEnabled) {
// SSL protocol
-int value = SSL.SSL_PROTOCOL_ALL;
-if ("SSLv2".equalsIgnoreCase(SSLProtocol)) {
-value = SSL.SSL_PROTOCOL_SSLV2;
-} else if ("SSLv3".equalsIgnoreCase(SSLProtocol)) {
-value = SSL.SSL_PROTOCOL_SSLV3;
-} else if ("TLSv1".equalsIgnoreCase(SSLProtocol)) {
-value = SSL.SSL_PROTOCOL_TLSV1;
-} else if ("SSLv2+SSLv3".equalsIgnoreCase(SSLProtocol)) {
-value = SSL.SSL_PROTOCOL_SSLV2 | SSL.SSL_PROTOCOL_SSLV3;
-} else if ("all".equalsIgnoreCase(SSLProtocol) ||
-SSLProtocol == null || SSLProtocol.length() == 0) {
-// NOOP, use the default defined above
+int value;
+// This branch can be removed, once the required version is at
least 1.1.21.
+if (Library.TCN_FULL_VERSION <= 1120) {
+value = SSL.SSL_PROTOCOL_ALL;
+if ("SSLv2".equalsIgnoreCase(SSLProtocol)) {
+value = SSL.SSL_PROTOCOL_SSLV2;
+} else if ("SSLv3".equalsIgnoreCase(SSLProtocol)) {
+value = SSL.SSL_PROTOCOL_SSLV3;
+} else if ("TLSv1".equalsIgnoreCase(SSLProtocol)) {
+value = SSL.SSL_PROTOCOL_TLSV1;
+} else if ("SSLv2+SSLv3".equalsIgnoreCase(SSLProtocol)) {
+value = SSL.SSL_PROTOCOL_SSLV2 | SSL.SSL_PROTOCOL_SSLV3;
+} else if ("all".equalsIgnoreCase(SSLProtocol) ||
+SS
DO NOT REPLY [Bug 51477] Support all protocol combinations in SSLProtocol of APR Connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=51477 --- Comment #20 from Konstantin Kolinko 2012-03-23 17:27:16 UTC --- Applied to 6.0 in r1304509 and will be in 6.0.36 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1304011 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Konstantin Kolinko wrote: >2012/3/23 Konstantin Kolinko : >> 2012/3/22 : >> >>> URL: http://svn.apache.org/viewvc?rev=1304011&view=rev >> >> Comparing (1) and (2), >> both are terminating the loop, but the (2)nd block has >> "selector.close()" call and (1)st does not have the call. I suspect >> that both should have the close() call. > >OK. I saw you fixed it. > >Just noting, that recent buildbot run did show >testCometConnectorStop() failure again, > >http://ci.apache.org/projects/tomcat/tomcat8/logs/1304275/TEST-org.apache.catalina.comet.TestCometProcessor.NIO.txt > >So something is still there. I know. :( I thought I had fixed this one. Things seem better (fewer failures) but it looks like there are still some fixes required. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Created] (MTOMCAT-131) maven-Tomcat-plugin Overlay Task execution fails in windows with java.io.IOException[The filename, directory name, or volume label syntax is incorrect], when targetPath
maven-Tomcat-plugin Overlay Task execution fails in windows with
java.io.IOException[The filename, directory name, or volume label syntax is
incorrect], when targetPath is present
---
Key: MTOMCAT-131
URL: https://issues.apache.org/jira/browse/MTOMCAT-131
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Environment: Fails in Windows, it works fine in Mac & Linux/Unix
Reporter: Tony Kollamparambil
Priority: Minor
Thanks for introducing the "Overlay concept", which is very helpful. we have a
scenario in which we need to overlay a war file over the other. we have
successfully implemented the overlay in our project.
maven install is failing with java.io exception when we build the module in
WINDOWS with some path in the overlays:overlay:targetpath tag(its works fine in
the mac/linux/unix/solaris).
Trace :
ERROR] Failed to execute goal org.apache.maven.plugins:maven-war-plugin:2.2:war
(default-war) on project enrollment-rest: Failed to copy file for overlay [ id
xxx:]: The filename, directory name, or volume label syntax is
incorrect -> [Help 1]
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal
org.apache.maven.plugins:maven-war-plugin:2.2:war (default-war) on project
xxx-: Failed to copy file for overlay [ id xxx:].
Root Cause:
As per the analysis that we had performed, its a code bug. Please refer line#
84-88 present in the
http://code.google.com/p/maven-alfresco-archetypes/source/browse/trunk/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/packaging/OverlayPackagingTask.java?r=127.
ie;
String targetPath = overlay.getTargetPath();
if (!targetPath.endsWith( "/" ))
{
targetPath = targetPath + "/";
}
by considering the above code snippet as a source of truth, windows will not
recognize the forward slash ("/") as a valid file separator. file separator
would vary from OS to OS(it works fine in linux and mac, since the file
separator for these operating systems are "/").
System.getProperties("file.separator") can be used for computing the
file.separator. Please do the needful. Thanks in advance
Stack Trace :
[DEBUG] OverlayPackagingTask performPackaging overlay.getTargetPath()
C:\projects\xxx\yy\target
[INFO] Processing overlay [ id xxx:]
[DEBUG] Overlay [ id xxx:] was already unpacked
ERROR] Failed to execute goal org.apache.maven.plugins:maven-war-plugin:2.2:war
(default-war) on project enrollment-rest: Failed to copy file for overlay [ id
xxx:]: The filename, directory name, or volume label syntax is
incorrect -> [Help 1]
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal
org.apache.maven.plugins:maven-war-plugin:2.2:war (default-war) on project
xxx-: Failed to copy file for overlay [ id xxx:].
at
org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:217)
at
org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at
org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at
org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at
org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at
org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at
org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:319)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156)
at org.apache.maven.cli.MavenCli.execute(MavenCli.java:537)
at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:196)
at org.apache.maven.cli.MavenCli.main(MavenCli.java:141)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at
org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:290)
at
org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:230)
at
org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:409)
at
org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:352)
Caused by: org.apache.maven.pl
[jira] [Updated] (MTOMCAT-131) maven-Tomcat-plugin Overlay Task execution fails in windows with java.io.IOException[The filename, directory name, or volume label syntax is incorrect], when targetPath
[
https://issues.apache.org/jira/browse/MTOMCAT-131?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Tony Kollamparambil updated MTOMCAT-131:
Description:
Thanks for introducing the "Overlay concept", which is very helpful. we have a
scenario in which we need to overlay a war file over the other. we have
successfully implemented the overlay in our project.
maven install is failing with java.io exception when we build the module in
WINDOWS with some path in the overlays:overlay:targetpath tag(its works fine in
the mac/linux/unix/solaris).
Trace :
ERROR] Failed to execute goal org.apache.maven.plugins:maven-war-plugin:2.2:war
(default-war) on project xx: Failed to copy file for overlay [ id
xxx:]: The filename, directory name, or volume label syntax is
incorrect -> [Help 1]
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal
org.apache.maven.plugins:maven-war-plugin:2.2:war (default-war) on project
xxx-: Failed to copy file for overlay [ id xxx:].
Root Cause:
As per the analysis that we had performed, its a code bug. Please refer line#
84-88 present in the
http://code.google.com/p/maven-alfresco-archetypes/source/browse/trunk/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/packaging/OverlayPackagingTask.java?r=127.
ie;
String targetPath = overlay.getTargetPath();
if (!targetPath.endsWith( "/" ))
{
targetPath = targetPath + "/";
}
by considering the above code snippet as a source of truth, windows will not
recognize the forward slash ("/") as a valid file separator. file separator
would vary from OS to OS(it works fine in linux and mac, since the file
separator for these operating systems are "/").
System.getProperties("file.separator") can be used for computing the
file.separator. Please do the needful. Thanks in advance
Stack Trace :
[DEBUG] OverlayPackagingTask performPackaging overlay.getTargetPath()
C:\projects\xxx\yy\target
[INFO] Processing overlay [ id xxx:]
[DEBUG] Overlay [ id xxx:] was already unpacked
ERROR] Failed to execute goal org.apache.maven.plugins:maven-war-plugin:2.2:war
(default-war) on project enrollment-rest: Failed to copy file for overlay [ id
xxx:]: The filename, directory name, or volume label syntax is
incorrect -> [Help 1]
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal
org.apache.maven.plugins:maven-war-plugin:2.2:war (default-war) on project
xxx-: Failed to copy file for overlay [ id xxx:].
at
org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:217)
at
org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at
org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at
org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at
org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at
org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at
org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:319)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156)
at org.apache.maven.cli.MavenCli.execute(MavenCli.java:537)
at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:196)
at org.apache.maven.cli.MavenCli.main(MavenCli.java:141)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at
org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:290)
at
org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:230)
at
org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:409)
at
org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:352)
Caused by: org.apache.maven.plugin.MojoExecutionException: Failed to copy file
for overlay [ id x:y]
at
org.apache.maven.plugin.war.packaging.OverlayPackagingTask.performPackaging(OverlayPackagingTask.java:97)
at
org.apache.maven.plugin.war.AbstractWarMojo.buildWebapp(AbstractWarMojo.java:472)
at
org.apache.maven.plugin.war.AbstractWarMojo.buildExplodedWebapp(AbstractWarMojo.java:404)
at
org.apache.maven.plugin.war.WarMojo.performPackaging(Wa
[jira] [Updated] (MTOMCAT-131) maven-Tomcat-plugin Overlay Task execution fails in windows with java.io.IOException[The filename, directory name, or volume label syntax is incorrect], when targetPath
[
https://issues.apache.org/jira/browse/MTOMCAT-131?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Tony Kollamparambil updated MTOMCAT-131:
Description:
Thanks for introducing the "Overlay concept", which is very helpful. we have a
scenario in which we need to overlay a war file over the other. we have
successfully implemented the overlay in our project.
maven install is failing with java.io exception when we build the module in
WINDOWS with some path in the overlays:overlay:targetpath tag(its works fine in
the mac/linux/unix/solaris).
Trace :
ERROR] Failed to execute goal org.apache.maven.plugins:maven-war-plugin:2.2:war
(default-war) on project xx: Failed to copy file for overlay [ id
xxx:]: The filename, directory name, or volume label syntax is
incorrect -> [Help 1]
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal
org.apache.maven.plugins:maven-war-plugin:2.2:war (default-war) on project
xxx-: Failed to copy file for overlay [ id xxx:].
Root Cause:
As per the analysis that we had performed, its a code bug. Please refer line#
84-88 present in the
http://code.google.com/p/maven-alfresco-archetypes/source/browse/trunk/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/packaging/OverlayPackagingTask.java?r=127.
ie;
String targetPath = overlay.getTargetPath();
if (!targetPath.endsWith( "/" ))
{
targetPath = targetPath + "/";
}
by considering the above code snippet as a source of truth, windows will not
recognize the forward slash ("/") as a valid file separator. file separator
would vary from OS to OS, and hence It must not be hardcoded(it works fine in
linux and mac, since the file separator for these operating systems are "/").
System.getProperties("file.separator") can be used for computing the file
separator during runtime. Please do the needful. Thanks in advance
Stack Trace :
[DEBUG] OverlayPackagingTask performPackaging overlay.getTargetPath()
C:\projects\xxx\yy\target
[INFO] Processing overlay [ id xxx:]
[DEBUG] Overlay [ id xxx:] was already unpacked
ERROR] Failed to execute goal org.apache.maven.plugins:maven-war-plugin:2.2:war
(default-war) on project enrollment-rest: Failed to copy file for overlay [ id
xxx:]: The filename, directory name, or volume label syntax is
incorrect -> [Help 1]
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal
org.apache.maven.plugins:maven-war-plugin:2.2:war (default-war) on project
xxx-: Failed to copy file for overlay [ id xxx:].
at
org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:217)
at
org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at
org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at
org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at
org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at
org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at
org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:319)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156)
at org.apache.maven.cli.MavenCli.execute(MavenCli.java:537)
at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:196)
at org.apache.maven.cli.MavenCli.main(MavenCli.java:141)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at
org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:290)
at
org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:230)
at
org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:409)
at
org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:352)
Caused by: org.apache.maven.plugin.MojoExecutionException: Failed to copy file
for overlay [ id x:y]
at
org.apache.maven.plugin.war.packaging.OverlayPackagingTask.performPackaging(OverlayPackagingTask.java:97)
at
org.apache.maven.plugin.war.AbstractWarMojo.buildWebapp(AbstractWarMojo.java:472)
at
org.apache.maven.plugin.war.AbstractWarMojo.buildExplodedWebapp(AbstractWarMojo.java:404)
at
org
[jira] [Updated] (MTOMCAT-131) maven-Tomcat-plugin Overlay Task execution fails in windows with java.io.IOException[The filename, directory name, or volume label syntax is incorrect], when targetPath
[
https://issues.apache.org/jira/browse/MTOMCAT-131?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Tony Kollamparambil updated MTOMCAT-131:
Description:
Thanks for introducing the "Overlay concept", which is very helpful. we have a
scenario in which we need to overlay a war file over the other.
maven install is failing with java.io exception when we build the module in
WINDOWS with some path in the overlays:overlay:targetpath tag(its works fine in
the mac/linux/unix/solaris).
Trace :
ERROR] Failed to execute goal org.apache.maven.plugins:maven-war-plugin:2.2:war
(default-war) on project xx: Failed to copy file for overlay [ id
xxx:]: The filename, directory name, or volume label syntax is
incorrect -> [Help 1]
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal
org.apache.maven.plugins:maven-war-plugin:2.2:war (default-war) on project
xxx-: Failed to copy file for overlay [ id xxx:].
Root Cause:
As per the analysis that we had performed, its a code bug. Please refer line#
84-88 present in the
http://code.google.com/p/maven-alfresco-archetypes/source/browse/trunk/plugins/maven-amp-plugin/src/main/java/org/alfresco/maven/plugin/amp/packaging/OverlayPackagingTask.java?r=127.
ie;
String targetPath = overlay.getTargetPath();
if (!targetPath.endsWith( "/" ))
{
targetPath = targetPath + "/";
}
by considering the above code snippet as a source of truth, windows will not
recognize the forward slash ("/") as a valid file separator. file separator
would vary from OS to OS, and hence It must not be hardcoded(it works fine in
linux and mac, since the file separator for these operating systems are "/").
System.getProperties("file.separator") can be used for computing the file
separator during runtime. Please do the needful. Thanks in advance
Stack Trace :
[DEBUG] OverlayPackagingTask performPackaging overlay.getTargetPath()
C:\projects\xxx\yy\target
[INFO] Processing overlay [ id xxx:]
[DEBUG] Overlay [ id xxx:] was already unpacked
ERROR] Failed to execute goal org.apache.maven.plugins:maven-war-plugin:2.2:war
(default-war) on project enrollment-rest: Failed to copy file for overlay [ id
xxx:]: The filename, directory name, or volume label syntax is
incorrect -> [Help 1]
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal
org.apache.maven.plugins:maven-war-plugin:2.2:war (default-war) on project
xxx-: Failed to copy file for overlay [ id xxx:].
at
org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:217)
at
org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at
org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at
org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at
org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at
org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at
org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:319)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156)
at org.apache.maven.cli.MavenCli.execute(MavenCli.java:537)
at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:196)
at org.apache.maven.cli.MavenCli.main(MavenCli.java:141)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at
org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:290)
at
org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:230)
at
org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:409)
at
org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:352)
Caused by: org.apache.maven.plugin.MojoExecutionException: Failed to copy file
for overlay [ id x:y]
at
org.apache.maven.plugin.war.packaging.OverlayPackagingTask.performPackaging(OverlayPackagingTask.java:97)
at
org.apache.maven.plugin.war.AbstractWarMojo.buildWebapp(AbstractWarMojo.java:472)
at
org.apache.maven.plugin.war.AbstractWarMojo.buildExplodedWebapp(AbstractWarMojo.java:404)
at
org.apache.maven.plugin.war.WarMojo.performPackaging(WarMojo.java:
[GUMP@vmgump]: Project tomcat-tc7.0.x-test (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 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 : 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/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/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test (Type: Build) Work ended in a state of : Failed Elapsed: 22 mins 5 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-24032012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-24032012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-24032012-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/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-24032012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-24032012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-6-openjdk/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-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.jar:/srv/gump/public/workspace/tomcat-7.0.x/outp ut/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:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-7. 0.x/tomcat-deps/tomcat-dbcp-24032012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-24032012.jar:/srv/gump/public/workspace/junit/dist/j
[GUMP@vmgump]: Project tomcat-trunk-test (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 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-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-trunk-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-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 22 mins 28 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-24032012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-24032012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-24032012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-24032012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-24032012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/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-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.jar:/srv/gump/public/workspace/tomcat-trunk/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-tr unk/tomcat-deps/tomcat-dbcp-24032012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-24032012.jar:/srv/gump/public/workspace/junit/dist/junit-24032012.j
