DO NOT REPLY [Bug 51630] java.lang.IllegalStateException: Calling [asyncComplete()]
https://issues.apache.org/bugzilla/show_bug.cgi?id=51630 Konstantin Kolinko changed: What|Removed |Added Status|RESOLVED|REOPENED Component|Catalina|Examples Version|7.0.19 |7.0.22 Resolution|WORKSFORME | --- Comment #3 from Konstantin Kolinko 2011-10-03 11:10:10 UTC --- Observing this as well with current trunk@r1178371 (7.0.22) using Nio connector. WinXP 32-bit, JDK 6u26. Steps to reproduce: 1. Configure Tomcat with org.apache.coyote.http11.Http11NioProtocol I also have logging configured with OneLineFormatter, but that should not matter. 2. Start it and open in web browser the following page: http://localhost:8080/examples/async/async0 3. The following exception is in localhost..log: (not in catalina*.log !) 03-окт-2011 14:35:15.218 SEVERE [http-nio-8080-exec-2] org.apache.catalina.core.StandardWrapperValve.invoke Servlet.service() for servlet [async0] in context with path [/examples] threw exception [java.lang.RuntimeException: java.lang.IllegalStateException: Calling [asyncComplete()] is not valid for a request with Async state [DISPATCHED]] with root cause java.lang.IllegalStateException: Calling [asyncComplete()] is not valid for a request with Async state [DISPATCHED] at org.apache.coyote.AsyncStateMachine.asyncComplete(AsyncStateMachine.java:221) at org.apache.coyote.http11.Http11NioProcessor.actionInternal(Http11NioProcessor.java:476) at org.apache.coyote.http11.AbstractHttp11Processor.action(AbstractHttp11Processor.java:807) at org.apache.coyote.Request.action(Request.java:344) at org.apache.catalina.core.AsyncContextImpl.complete(AsyncContextImpl.java:89) at async.Async0.service(Async0.java:42) at javax.servlet.http.HttpServlet.service(HttpServlet.java:722) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:304) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:210) at org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:684) at org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationDispatcher.java:593) at org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDispatcher.java:530) at org.apache.catalina.core.AsyncContextImpl$1.run(AsyncContextImpl.java:173) at org.apache.catalina.core.AsyncContextImpl.doInternalDispatch(AsyncContextImpl.java:314) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:219) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:169) at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:472) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:168) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:100) at org.apache.catalina.valves.AccessLogValve.invoke(AccessLogValve.java:929) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:118) at org.apache.catalina.connector.CoyoteAdapter.asyncDispatch(CoyoteAdapter.java:296) at org.apache.coyote.http11.AbstractHttp11Processor.asyncDispatch(AbstractHttp11Processor.java:1486) at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:511) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1554) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:662) In catalina..log one can see debug messages from Async0 servlet: 03-окт-2011 14:35:15.218 INFO [http-nio-8080-exec-2] async.Async0.service Received dispatch, completing on the worker thread. 03-окт-2011 14:35:15.218 INFO [http-nio-8080-exec-2] async.Async0.service After complete called started:false What bothers me is that Async0 servlet is not annotated with @WebServlet(asyncSupported=true) as required by ch.2.3.3.3 of servlet-3_0-final-spec.pdf. Page #12 (34/230) there: "It is illegal to call startAsync if the request is within the scope of a servlet or filter that does not support asynchronous operations" The same chapter describes "isAsyncStarted()" saying that it should return false after a dispatch call. That is what we are observing here. >From description of "complete()" in the same chapter, it is container's responsibility to call complete() after service() method exits: "The complete method can be invoked by the container if the request is dispatched to a servlet that does not support async processing, or the target servlet called by AsyncContext.dispatch does not do a subsequent call to startAsync. In this c
Re: [ANN] Apache Tomcat 7.0.22 released
On 10/01/2011 03:03 PM, Mark Thomas wrote: The Apache Tomcat team announces the immediate availability of Apache Tomcat 7.0.22 It seems the maven repo doesn't have it yet, is that normal? Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [ANN] Apache Tomcat 7.0.22 released
On 03/10/2011 04:44, jean-frederic clere wrote: > On 10/01/2011 03:03 PM, Mark Thomas wrote: >> The Apache Tomcat team announces the immediate availability of Apache >> Tomcat 7.0.22 > > It seems the maven repo doesn't have it yet, is that normal? In my rush to get this out before I went to JavaOne, I forgot to upload it. If I get time, I'll do it this week, if not, I'll do it at the weekend. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51940] New: Form Authentication Valve should restore request body on PUT method
https://issues.apache.org/bugzilla/show_bug.cgi?id=51940
Bug #: 51940
Summary: Form Authentication Valve should restore request body
on PUT method
Product: Tomcat 6
Version: 6.0.33
Platform: PC
OS/Version: Linux
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: nsush...@openfinance.com
Classification: Unclassified
In Tomcat 6 (and 7), Form Authentication valve restores the original request
after a POST with successful authentication and redirect is followed by the
client's GET. In case of the POST, the valve also restores the original
request's body. However, it doesn't do that for a PUT. To be consistent, Tomcat
should restore the body on PUT as well.
The patch would be in FormAuthenticator.restoreRequest(Request, Session) [1],
to change from
if ("POST".equalsIgnoreCase(saved.getMethod())) {
to
if ("POST".equalsIgnoreCase(saved.getMethod()) ||
"PUT".equalsIgnoreCase(saved.getMethod())
) {
[1]
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?view=markup#l450
Maybe related to Bug #48692.
This issue was discussed on users mailing list archived at
http://markmail.org/thread/klafrhln32v3zcau
and
http://mail-archives.apache.org/mod_mbox/tomcat-users/201109.mbox/%3C3052451.ZX31eH6Cz8@strela%3E
Regarding "Re: Should Form Authentication Valve restore request body on a
PUT?",
on Thursday, September 29, 2011 17:04:27,
Christopher Schultz wrote to Tomcat Users List
> ...
> The servlet spec (v3.0, SRV 13.6.3.1) has this to say:
> "
> If the form based login is invoked because of an HTTP request, the
> original request parameters must be preserved by the container for use
> if, on successful authentication, it redirects the call to the
> requested resource.
> "
>
> It doesn't say what kinds of HTTP verbs should or should not be
> supported, but GET and PUT seem entirely obvious. It doesn't say that
> the request body needs to be maintained, only the "request
> parameters". Since the servlet specification doesn't have any
> provisions for fetching request parameters from PUT operations, I
> suppose the spec therefore doesn't directly recommend that PUT bodies
> be stored for later use like when POST is used.
> ...
> On the face of it, that seems reasonable. I haven't read-through the
> code that then replays the saved-request so I'm not sure if there's
> more to be done.
Regarding "Re: Should Form Authentication Valve restore request body on a
PUT?",
on Friday, September 30, 2011 13:10:55,
Mark Thomas wrote to Tomcat Users List
> I'd have no objection so the proposed change.
>
> Mark
--
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: r1178449 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/coyote/http11/ test/org/apache/catalina/comet/
Author: markt
Date: Mon Oct 3 16:42:19 2011
New Revision: 1178449
URL: http://svn.apache.org/viewvc?rev=1178449&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51881
Don't mark processors handling comet requests as non-comet too early.
Before this fix, finishing a comet request was processed as non-comet meaning
the comet clean-up code was not executed which was likely to break processing
of the next request on the connection.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
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
tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java?rev=1178449&r1=1178448&r2=1178449&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java Mon Oct
3 16:42:19 2011
@@ -93,11 +93,11 @@ public class CometEventImpl implements C
if (request == null) {
throw new
IllegalStateException(sm.getString("cometEvent.nullRequest"));
}
-boolean iscomet = request.isComet();
-request.setComet(false);
request.finishRequest();
response.finishResponse();
-if (iscomet) request.cometClose();
+if (request.isComet()) {
+request.cometClose();
+}
}
@Override
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1178449&r1=1178448&r2=1178449&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Mon Oct 3
16:42:19 2011
@@ -2514,6 +2514,7 @@ public class Request
public void cometClose() {
coyoteRequest.action(ActionCode.COMET_CLOSE,getEvent());
+setComet(false);
}
public void setCometTimeout(long timeout) {
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=1178449&r1=1178448&r2=1178449&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Mon
Oct 3 16:42:19 2011
@@ -723,7 +723,17 @@ public abstract class AbstractHttp11Proc
@Override
public final void action(ActionCode actionCode, Object param) {
-if (actionCode == ActionCode.COMMIT) {
+if (actionCode == ActionCode.CLOSE) {
+// End the processing of the current request
+
+try {
+getOutputBuffer().endRequest();
+} catch (IOException e) {
+// Set error flag
+error = true;
+}
+
+} else if (actionCode == ActionCode.COMMIT) {
// Commit current response
if (response.isCommitted())
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=1178449&r1=1178448&r2=1178449&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Mon Oct
3 16:42:19 2011
@@ -273,21 +273,7 @@ public class Http11AprProcessor extends
long socketRef = socket.getSocket().longValue();
-if (actionCode == ActionCode.CLOSE) {
-// Close
-
-// End the processing of the current request, and stop any further
-// transactions with the client
-
-comet = false;
-try {
-outputBuffer.endRequest();
-} catch (IOException e) {
-// Set error flag
-error = true;
-}
-
-} else if (actionCode == ActionCode.REQ_HOST_ADDR_ATTRIBUTE) {
+if (actionCode == ActionCode.REQ_HOST_ADDR_ATTRIBUTE) {
// Get remote host address
if (rem
svn commit: r1178456 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/coyote/http11/ test/org/apache/catalina/comet/
Author: markt
Date: Mon Oct 3 17:00:47 2011
New Revision: 1178456
URL: http://svn.apache.org/viewvc?rev=1178456&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51881
Don't mark processors handling comet requests as non-comet too early.
Before this fix, finishing a comet request was processed as non-comet meaning
the comet clean-up code was not executed which was likely to break processing
of the next request on the connection.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CometEventImpl.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
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
tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 3 17:00:47 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256
,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256
,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CometEventImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CometEventImpl.java?rev=1178456&r1=1178455&r2=1178456&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CometEventImpl.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CometEventImpl.java
Mon Oct 3 17:00:47 2011
@@ -93,11 +93,11 @@ public class CometEventImpl implements C
if (request == null) {
throw new
IllegalStateException(sm.getString("cometEvent.nullRequest"));
}
-boolean iscomet = request.isComet();
-request.setComet(false);
request.finish
DO NOT REPLY [Bug 51881] Server incorrectly parses incoming HTTP requests and loses them
https://issues.apache.org/bugzilla/show_bug.cgi?id=51881 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #11 from Mark Thomas 2011-10-03 17:03:17 UTC --- This took a while to track down but was eventually relatively simple. When using NIO and a comet request is closed from a different thread then the poller is used to trigger the processing of the close event. The problem was that that request was marked as non-comet before this poller task was triggered meaning that when it happened the request was treated as a non-Comet request rather than a comet request. This meant that the necessary clean-up was not make and then next request received on the connection (i.e. from the same client) was corrupted. This has been fixed - along with some additional clean-up - in trunk and 7.0.x and will be included in 7.0.23 onwards. Thanks again for the test case. Bugs that involve multiple threads are always tricky to track down but the test case made it a lot easier. -- 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
DO NOT REPLY [Bug 51630] java.lang.IllegalStateException: Calling [asyncComplete()]
https://issues.apache.org/bugzilla/show_bug.cgi?id=51630 --- Comment #4 from Mark Thomas 2011-10-03 17:14:21 UTC --- (In reply to comment #3) > What bothers me is that Async0 servlet is not annotated with > @WebServlet(asyncSupported=true) as required by ch.2.3.3.3 of > servlet-3_0-final-spec.pdf. Page #12 (34/230) there: "It is illegal to call > startAsync if the request is within the scope of a servlet or filter that does > not support asynchronous operations" You can also set async support in web.xml and this is what is done for the examples. -- 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: r1178470 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Mon Oct 3 17:30:27 2011 New Revision: 1178470 URL: http://svn.apache.org/viewvc?rev=1178470&view=rev Log: Update changelog Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml 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=1178470&r1=1178469&r2=1178470&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Oct 3 17:30:27 2011 @@ -65,6 +65,10 @@ +51881: Correctly complete Comet requests when the Comet END +event is triggered asynchronously. (markt) + + 51905: Fix infinite loop in AprEndpoint shutdown if acceptor unlock fails. Reduce timeout before forcefully closing the socket from 30s to 10s. (kkolinko) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1178542 - /tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java
Author: markt
Date: Mon Oct 3 19:50:09 2011
New Revision: 1178542
URL: http://svn.apache.org/viewvc?rev=1178542&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51630
Correct bug in async examples. Remove unnecessary call to
AsyncContext.complete() that triggered an ISE.
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java?rev=1178542&r1=1178541&r2=1178542&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java Mon Oct 3
19:50:09 2011
@@ -39,7 +39,6 @@ public class Async0 extends HttpServlet
log.info("Received dispatch, completing on the worker thread.");
log.info("After complete called started:"+req.isAsyncStarted());
resp.getWriter().write("Async dispatch
worked:+"+System.currentTimeMillis()+"\n");
-req.getAsyncContext().complete();
} else {
resp.setContentType("text/plain");
final AsyncContext actx = req.startAsync();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51630] java.lang.IllegalStateException: Calling [asyncComplete()]
https://issues.apache.org/bugzilla/show_bug.cgi?id=51630 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #5 from Mark Thomas 2011-10-03 19:55:14 UTC --- Fixed in trunk and 7.0.x and will be included in 7.0.23 onwards. -- 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: r1178552 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/examples/WEB-INF/classes/async/Async0.java
Author: markt
Date: Mon Oct 3 19:58:24 2011
New Revision: 1178552
URL: http://svn.apache.org/viewvc?rev=1178552&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51630
Correct bug in async examples. Remove unnecessary call to
AsyncContext.complete() that triggered an ISE.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/async/Async0.java
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 3 19:58:24 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256
,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256
,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542
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=1178552&r1=1178551&r2=1178552&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Oct 3 19:58:24 2011
@@ -88,6 +88,10 @@
50923: Use distinct color for code tag
in Tomcat documentation, for better readability. (kkolinko)
+
+51630: Fix bug in async0 example that triggered an
+IllegalStateException in the application log. (markt)
+
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/async/Async0.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/async/Async0.java?rev=1178552&r1=1178551&r2=1178552&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/async/Async0.java
(original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/async/Async0.java Mon
Oct 3 19:58:24 2011
@@ -39,7 +39,6 @@ public class Async0 extends HttpServlet
log.info("Received dispatch, completing on the worker thread.");
log.info("After complete calle
svn commit: r1178618 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/ common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/ tomcat6-maven-plugin/src/main/java/o
Author: olamy Date: Mon Oct 3 22:21:14 2011 New Revision: 1178618 URL: http://svn.apache.org/viewvc?rev=1178618&view=rev Log: [MTOMCAT-62] tomcat7 support: move Manager classes to common lib to be reusable by both tomcat6/7 mojos Added: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java (contents, props changed) - copied, changed from r1178617, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/TomcatManager.java tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerException.java (contents, props changed) - copied, changed from r1178617, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/TomcatManagerException.java Removed: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/TomcatManager.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/TomcatManagerException.java Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployMojo.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ListMojo.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ReloadMojo.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ResourcesMojo.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RolesMojo.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ServerInfoMojo.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/SessionsMojo.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StartMojo.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StopMojo.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/UndeployMojo.java Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1178618&r1=1178617&r2=1178618&view=diff == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Mon Oct 3 22:21:14 2011 @@ -21,6 +21,10 @@ 1.5.5 compile + + commons-codec + commons-codec + Copied: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java (from r1178617, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/TomcatManager.java) URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java?p2=tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java&p1=tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/TomcatManager.java&r1=1178617&r2=1178618&rev=1178618&view=diff == --- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/TomcatManager.java (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java Mon Oct 3 22:21:14 2011 @@ -1,4 +1,4 @@ -package org.apache.tomcat.maven.plugin.tomcat6; +package org.apache.tomcat.maven.common.deployer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -31,6 +31,9 @@ import java.net.URL; import java.net.URLEncoder; /** + * FIXME http connection tru a proxy + * FIXME preemptive support + * FIXME move to ASF httpclient ? * A Tomcat manager webapp invocation wrapper. * * @author Mark Hobson Propchange: tomcat/maven-plugin/trunk/common
[jira] [Commented] (MTOMCAT-62) Support Tomcat 7
[ https://issues.apache.org/jira/browse/MTOMCAT-62?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13119718#comment-13119718 ] Hudson commented on MTOMCAT-62: --- Integrated in TomcatMavenPlugin #19 (See [https://builds.apache.org/job/TomcatMavenPlugin/19/]) [MTOMCAT-62] tomcat7 support: move Manager classes to common lib to be reusable by both tomcat6/7 mojos [MTOMCAT-62] tomcat7 support: move tomcat6 classes to a dedicated package. [MTOMCAT-62] tomcat7 support: start moving to a compostion model rather than inheritance to ease reuse of component in tomcat6 and 7 mojos [MTOMCAT-62] tomcat7 support: start extracting common classes to an other module which will be shared in tomcat6 and tomcat7 plugins olamy : http://svn.apache.org/viewvc/?view=rev&rev=1178618 Files : * /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml * /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer * /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java * /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerException.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ListMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ReloadMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ResourcesMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RolesMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ServerInfoMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/SessionsMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StartMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StopMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/TomcatManager.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/TomcatManagerException.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/UndeployMojo.java olamy : http://svn.apache.org/viewvc/?view=rev&rev=1178617 Files : * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractCatalinaMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractDeployMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractDeployWarMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractI18NTomcat6Mojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractRunMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractRunWarMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractWarCatalinaMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/DeployMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/DeployOnlyMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/EmbeddedRegistry.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ExplodedMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ExternalRepositoriesReloadableWebappLoader.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/InplaceMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ListMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/RedeployMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/Relo
svn commit: r1178619 - in /tomcat/maven-plugin/trunk: ./ common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/ tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat
Author: olamy
Date: Mon Oct 3 22:22:46 2011
New Revision: 1178619
URL: http://svn.apache.org/viewvc?rev=1178619&view=rev
Log:
add an it test for test deployMojo
Added:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractDeployWarProjectIT.java
- copied, changed from r1178618,
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractSimpleWarProjectIT.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarProjectIT.java
(with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml
(with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/simple-war-project-1.0-SNAPSHOT.war
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/empty.txt
(with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/logging.properties
(with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
(with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/tomcat-users.xml
(with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/index.jsp
(with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/web.xml
(with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/test/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/test/java/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/test/java/WaitIT.java
(with props)
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractSimpleWarProjectIT.java
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java?rev=1178619&r1=1178618&r2=1178619&view=diff
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
Mon Oct 3 22:22:46 2011
@@ -634,7 +634,7 @@ public class TomcatManager
private String deployImpl( String path, URL config, URL war, InputStream
data, boolean update, String tag )
throws TomcatManagerException, IOException
{
-StringBuffer buffer = new StringBuffer( "/deploy" );
+StringBuilder buffer = new StringBuilder( "/deploy" );
buffer.append( "?path=" ).append( URLEncoder.encode( path, charset ) );
if ( config != null )
@@ -646,11 +646,6 @@ public class TomcatManager
{
buffer.append( "&war=" ).append( URLEncoder.encode(
war.toString(), charset ) );
}
-else
-{
-// for Tomcat 5.0.27
-buffer.append( "&war=" );
-}
if ( update )
{
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1178619&r1=1178618&r2=1178619&view=diff
==
--- tomcat/maven-p
svn commit: r1178620 - /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java
Author: olamy
Date: Mon Oct 3 22:23:31 2011
New Revision: 1178620
URL: http://svn.apache.org/viewvc?rev=1178620&view=rev
Log:
do not log password even in debug mode
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java?rev=1178620&r1=1178619&r2=1178620&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java
Mon Oct 3 22:23:31 2011
@@ -222,7 +222,7 @@ public abstract class AbstractCatalinaMo
{
userName = this.username;
password = this.password == null ? "" : this.password;
-getLog( ).debug( "user user/password " + userName + "/" +
password );
+//getLog( ).debug( "user user/password " + userName + "/" +
password );
}
manager = new TomcatManager( url, userName, password, charset );
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1178614 - /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/RunMojo.java
Author: olamy
Date: Mon Oct 3 22:15:17 2011
New Revision: 1178614
URL: http://svn.apache.org/viewvc?rev=1178614&view=rev
Log:
formatting: no code change
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/RunMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/RunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/RunMojo.java?rev=1178614&r1=1178613&r2=1178614&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/RunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/RunMojo.java
Mon Oct 3 22:15:17 2011
@@ -19,15 +19,6 @@ package org.apache.tomcat.maven.plugin;
* under the License.
*/
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
import org.apache.catalina.Context;
import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.startup.Embedded;
@@ -42,18 +33,27 @@ import org.codehaus.plexus.util.xml.Xpp3
import org.codehaus.plexus.util.xml.Xpp3DomWriter;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
/**
* Runs the current project as a dynamic web application using an embedded
Tomcat server.
- *
- * @goal run
- * @execute phase="compile"
- * @requiresDependencyResolution runtime
+ *
* @author Jurgen Lust
* @author Mark Hobson
* @version $Id: RunMojo.java 13551 2011-02-09 16:05:47Z olamy $
+ * @goal run
+ * @execute phase="compile"
+ * @requiresDependencyResolution runtime
*/
public class RunMojo
-extends AbstractRunMojo
+extends AbstractRunMojo
{
// --
// Mojo Parameters
@@ -61,14 +61,14 @@ public class RunMojo
/**
* The classes directory for the web application being run.
- *
+ *
* @parameter expression = "${project.build.outputDirectory}"
*/
private File classesDir;
/**
* The set of dependencies for the web application being run.
- *
+ *
* @parameter default-value = "${project.artifacts}"
* @required
* @readonly
@@ -77,27 +77,29 @@ public class RunMojo
/**
* The web resources directory for the web application being run.
- *
+ *
* @parameter expression="${basedir}/src/main/webapp"
*/
private File warSourceDirectory;
-
+
/**
* Set the "follow standard delegation model" flag used to configure our
ClassLoader.
- * @see
http://tomcat.apache.org/tomcat-6.0-doc/api/org/apache/catalina/loader/WebappLoader.html#setDelegate(boolean)
+ *
* @parameter expression = "${tomcat.delegate}" default-value="true"
+ * @see
http://tomcat.apache.org/tomcat-6.0-doc/api/org/apache/catalina/loader/WebappLoader.html#setDelegate(boolean)
* @since 1.0
- */
+ */
private boolean delegate = true;
-
+
/**
* represents the delay in seconds between each classPathScanning change
invocation
- * @see http://tomcat.apache.org/tomcat-6.0-doc/config/context.html";>http://tomcat.apache.org/tomcat-6.0-doc/config/context.html
+ *
* @parameter expression="${maven.tomcat.backgroundProcessorDelay}"
default-value="-1"
+ * @see http://tomcat.apache.org/tomcat-6.0-doc/config/context.html";>http://tomcat.apache.org/tomcat-6.0-doc/config/context.html
*/
-protected int backgroundProcessorDelay = -1;
-
+protected int backgroundProcessorDelay = -1;
+
private File temporaryContextFile = null;
// --
@@ -106,7 +108,8 @@ public class RunMojo
/**
* {@inheritDoc}
- * @throws MojoExecutionException
+ *
+ * @throws MojoExecutionException
*/
@Override
protected Context createContext( Embedded container )
@@ -114,48 +117,49 @@ public class RunMojo
{
Context context = super.createContext( container );
-context.setReloadable( isContextReloadable() );
-
+context.setReloadable( isContextReloadable( ) );
+
return context;
}
/**
* {@inheritDoc}
- * @throws MojoExecutionException
+ *
+ * @throws MojoExecutionException
*/
@Override
-protected WebappLoader createWebappLoader()
+protected WebappLoader createWeb
svn commit: r1178613 - in /tomcat/maven-plugin/trunk: ./ common-tomcat-maven-plugin/ common-tomcat-maven-plugin/src/ common-tomcat-maven-plugin/src/main/ common-tomcat-maven-plugin/src/main/java/ comm
Author: olamy Date: Mon Oct 3 22:14:49 2011 New Revision: 1178613 URL: http://svn.apache.org/viewvc?rev=1178613&view=rev Log: [MTOMCAT-62] tomcat7 support: start extracting common classes to an other module which will be shared in tomcat6 and tomcat7 plugins Added: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (with props) tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/AbstractI18NTomcatMojo.java (contents, props changed) - copied, changed from r1177745, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractI18NMojo.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractI18NTomcat6Mojo.java (with props) Removed: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractI18NMojo.java Modified: tomcat/maven-plugin/trunk/pom.xml tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractCatalinaMojo.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractRunMojo.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ShutdownMojo.java Added: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1178613&view=auto == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (added) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Mon Oct 3 22:14:49 2011 @@ -0,0 +1,20 @@ + +http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + 4.0.0 + +tomcat-maven-plugin +org.apache.tomcat.maven +2.0-SNAPSHOT + + common-tomcat-maven-plugin + Tomcat Maven Plugin :: Common API + + + + org.apache.maven + maven-plugin-api + + + + Propchange: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml -- svn:eol-style = native Propchange: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml -- svn:keywords = Author Date Id Revision Copied: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/AbstractI18NTomcatMojo.java (from r1177745, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractI18NMojo.java) URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/AbstractI18NTomcatMojo.java?p2=tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/AbstractI18NTomcatMojo.java&p1=tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractI18NMojo.java&r1=1177745&r2=1178613&rev=1178613&view=diff == --- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractI18NMojo.java (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/AbstractI18NTomcatMojo.java Mon Oct 3 22:14:49 2011 @@ -1,4 +1,4 @@ -package org.apache.tomcat.maven.plugin; +package org.apache.tomcat.maven.common; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,33 +19,21 @@ package org.apache.tomcat.maven.plugin; * under the License. */ +import org.apache.maven.plugin.AbstractMojo; + import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import org.apache.maven.plugin.AbstractMojo; - /** * Abstract goal that provides i18n support. - * + * * @author Mark Hobson * @versio
[jira] [Commented] (MTOMCAT-62) Support Tomcat 7
[ https://issues.apache.org/jira/browse/MTOMCAT-62?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13119716#comment-13119716 ] Hudson commented on MTOMCAT-62: --- Integrated in TomcatMavenPlugin-mvn2.x #2 (See [https://builds.apache.org/job/TomcatMavenPlugin-mvn2.x/2/]) [MTOMCAT-62] tomcat7 support: move Manager classes to common lib to be reusable by both tomcat6/7 mojos [MTOMCAT-62] tomcat7 support: move tomcat6 classes to a dedicated package. [MTOMCAT-62] tomcat7 support: start moving to a compostion model rather than inheritance to ease reuse of component in tomcat6 and 7 mojos [MTOMCAT-62] tomcat7 support: start extracting common classes to an other module which will be shared in tomcat6 and tomcat7 plugins olamy : http://svn.apache.org/viewvc/?view=rev&rev=1178618 Files : * /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml * /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer * /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java * /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerException.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ListMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ReloadMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ResourcesMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RolesMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ServerInfoMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/SessionsMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StartMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StopMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/TomcatManager.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/TomcatManagerException.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/UndeployMojo.java olamy : http://svn.apache.org/viewvc/?view=rev&rev=1178617 Files : * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractCatalinaMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractDeployMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractDeployWarMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractI18NTomcat6Mojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractRunMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractRunWarMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractWarCatalinaMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/DeployMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/DeployOnlyMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/EmbeddedRegistry.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ExplodedMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ExternalRepositoriesReloadableWebappLoader.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/InplaceMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ListMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/RedeployMojo.java * /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven
svn commit: r1178679 - /tomcat/tc6.0.x/trunk/RELEASE-NOTES
Author: kkolinko Date: Tue Oct 4 04:25:20 2011 New Revision: 1178679 URL: http://svn.apache.org/viewvc?rev=1178679&view=rev Log: Correct a typo List jars in alphabetical order. CTR: docs Modified: tomcat/tc6.0.x/trunk/RELEASE-NOTES Modified: tomcat/tc6.0.x/trunk/RELEASE-NOTES URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/RELEASE-NOTES?rev=1178679&r1=1178678&r2=1178679&view=diff == --- tomcat/tc6.0.x/trunk/RELEASE-NOTES (original) +++ tomcat/tc6.0.x/trunk/RELEASE-NOTES Tue Oct 4 04:25:20 2011 @@ -43,7 +43,7 @@ KNOWN ISSUES IN THIS RELEASE: === Dependency Changes: === -Tomcat 6.0 is designed to run on JSE 5.0 and later. +Tomcat 6.0 is designed to run on Java SE 5.0 and later. In addition, Tomcat 6.0 uses the Eclipse JDT Java compiler for compiling JSP pages. This means you no longer need to have the complete @@ -85,10 +85,10 @@ for use by web applications (by placing * catalina-ant.jar (Tomcat Catalina Ant tasks) * catalina-ha.jar (High availability package) * catalina-tribes.jar (Group communication) +* ecj-@JDT_VERSION@.jar (Eclipse JDT Java compiler) * el-api.jar (EL 2.1 API) * jasper.jar (Jasper 2 Compiler and Runtime) * jasper-el.jar (Jasper 2 EL implementation) -* ecj-@JDT_VERSION@.jar (Eclipse JDT Java compiler) * jsp-api.jar (JSP 2.1 API) * servlet-api.jar (Servlet 2.5 API) * tomcat-coyote.jar (Tomcat connectors and utility classes) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1178681 - /tomcat/trunk/RELEASE-NOTES
Author: kkolinko Date: Tue Oct 4 04:32:25 2011 New Revision: 1178681 URL: http://svn.apache.org/viewvc?rev=1178681&view=rev Log: List jars in alphabetical order. Modified: tomcat/trunk/RELEASE-NOTES Modified: tomcat/trunk/RELEASE-NOTES URL: http://svn.apache.org/viewvc/tomcat/trunk/RELEASE-NOTES?rev=1178681&r1=1178680&r2=1178681&view=diff == --- tomcat/trunk/RELEASE-NOTES (original) +++ tomcat/trunk/RELEASE-NOTES Tue Oct 4 04:32:25 2011 @@ -104,10 +104,10 @@ for use by web applications (by placing * catalina-ant.jar (Tomcat Catalina Ant tasks) * catalina-ha.jar (High availability package) * catalina-tribes.jar (Group communication) +* ecj-@JDT_VERSION@.jar (Eclipse JDT Java compiler) * el-api.jar (EL 2.2 API) * jasper.jar (Jasper 2 Compiler and Runtime) * jasper-el.jar (Jasper 2 EL implementation) -* ecj-@JDT_VERSION@.jar (Eclipse JDT Java compiler) * jsp-api.jar (JSP 2.2 API) * servlet-api.jar (Servlet 3.0 API) * tomcat-api.jar (Interfaces shared by Catalina and Jasper) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1178683 - in /tomcat/tc7.0.x/trunk: ./ RELEASE-NOTES
Author: kkolinko Date: Tue Oct 4 04:53:18 2011 New Revision: 1178683 URL: http://svn.apache.org/viewvc?rev=1178683&view=rev Log: Merged revision 1178681 from tomcat/trunk: List jars in alphabetical order. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/RELEASE-NOTES Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Oct 4 04:53:18 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256 ,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256 ,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681 Modified: tomcat/tc7.0.x/trunk/RELEASE-NOTES URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/RELEASE-NOTES?rev=1178683&r1=1178682&r2=1178683&view=diff == --- tomcat/tc7.0.x/trunk/RELEASE-NOTES (original) +++ tomcat/tc7.0.x/trunk/RELEASE-NOTES Tue Oct 4 04:53:18 2011 @@ -105,10 +105,10 @@ for use by web applications (by placing * catalina-ant.jar (Tomcat Catalina Ant tasks) * catalina-ha.jar (High availability package) * catalina-tribes.jar (Group communication) +* ecj-@JDT_VERSION@.jar (Eclipse JDT Java compiler) * el-api.jar (EL 2.2 API) * jasper.jar (Jasper 2 Compiler and Runtime) * jasper-el.jar (Jasper 2 EL implementation) -* ecj-@JDT_VERSION@.jar (Eclipse JDT Java compiler) * jsp-api.jar (JSP 2.2 API) * servlet-api.jar (Servlet 3.0 API) * tomcat-api.jar (Interfaces shared by Catalina and Jasper) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1178684 - in /tomcat/trunk/java/org/apache/catalina: ha/session/SerializablePrincipal.java realm/GenericPrincipal.java
Author: kkolinko
Date: Tue Oct 4 05:07:52 2011
New Revision: 1178684
URL: http://svn.apache.org/viewvc?rev=1178684&view=rev
Log:
Do not sort lists that have only one element
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java
tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java?rev=1178684&r1=1178683&r2=1178684&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java
Tue Oct 4 05:07:52 2011
@@ -108,7 +108,7 @@ public class SerializablePrincipal impl
if (roles != null) {
this.roles = new String[roles.size()];
this.roles = roles.toArray(this.roles);
-if (this.roles.length > 0)
+if (this.roles.length > 1)
Arrays.sort(this.roles);
}
if (userPrincipal instanceof Serializable) {
Modified: tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java?rev=1178684&r1=1178683&r2=1178684&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java Tue Oct
4 05:07:52 2011
@@ -127,7 +127,7 @@ public class GenericPrincipal implements
if (roles != null) {
this.roles = new String[roles.size()];
this.roles = roles.toArray(this.roles);
-if (this.roles.length > 0)
+if (this.roles.length > 1)
Arrays.sort(this.roles);
}
this.loginContext = loginContext;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
