Re: svn commit: r1295978 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11NioProtocol.java upgrade/UpgradeNioProcessor.java

2012-03-02 Thread Mark Thomas
On 01/03/2012 23:47, Filip Hanik - Dev Lists wrote:
 Thanks for that John, I'll fix that too.

That probably explains the Comet failures we have been seeing in the
unit tests. Excellent.

Mark

 
 Filip
 
 On 3/1/2012 4:42 PM, Johno Crawford wrote:
 On 2/03/2012 12:05 AM, fha...@apache.org wrote:
 Author: fhanik
 Date: Thu Mar  1 23:05:51 2012
 New Revision: 1295978

 URL: http://svn.apache.org/viewvc?rev=1295978view=rev
 Log:
 Fix WebSocket's non blocking call
 http://tomcat.markmail.org/thread/drj7zgq2csfdnvoh#query:+page:1+mid:y4dheqpm2wx5xzba+state:results


 Looks like the same usage in
 org.apache.coyote.http11.Http11NioProtocol.Http11ConnectionHandler#longPoll
 ?


 Modified:
  tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
 
 tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java


 Modified:
 tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
 URL:
 http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1295978r1=1295977r2=1295978view=diff

 ==

 --- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
 (original)
 +++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
 Thu Mar  1 23:05:51 2012
 @@ -296,12 +296,7 @@ public class Http11NioProtocol extends A
   protected void upgradePoll(SocketWrapperNioChannel  socket,
   ProcessorNioChannel  processor) {
   connections.put(socket.getSocket(), processor);
 -
 -SelectionKey key =
 socket.getSocket().getIOChannel().keyFor(
 -socket.getSocket().getPoller().getSelector());
 -key.interestOps(SelectionKey.OP_READ);
 -((KeyAttachment) socket).interestOps(
 -SelectionKey.OP_READ);
 +socket.getSocket().getPoller().add(socket.getSocket());
   }
   }
   }

 Modified:
 tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java

 URL:
 http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java?rev=1295978r1=1295977r2=1295978view=diff

 ==

 ---
 tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java
 (original)
 +++
 tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java
 Thu Mar  1 23:05:51 2012
 @@ -104,12 +104,10 @@ public class UpgradeNioProcessor extends
   @Override
   public int read(boolean block, byte[] bytes, int off, int len)
   throws IOException {
 -// TODO Implement non-blocking reads. Should be as simple as
 replacing
 -// true with block in the two lines below
   if (len  maxRead) {
 -return readSocket(true, bytes, off, maxRead);
 +return readSocket(block, bytes, off, maxRead);
   } else {
 -return readSocket(true, bytes, off, len);
 +return readSocket(block, bytes, off, len);
   }
   }




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


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


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


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



Re: WebSocket status

2012-03-02 Thread Mark Thomas
On 01/03/2012 22:55, Filip Hanik - Dev Lists wrote:
 You can't register on a selector using another thread.

Bingo. That explains it. Is that documented anywhere? I don't recall
reading it but I may well have missed it. Looking at the code, it looks
like HTTP would have been unaffected which is good news. Looks like this
problem started with [1] which fixed some other issues with Comet but
introduced this one. My bad.

 On a completely separate note, this WebSocket implementation seems to
 have caused a lot of duplicate code.

There is a little duplicate code in the UpgradeProcessor implementations
to read the actual bytes but apart from that it is all pretty much new
code. There is probably a way to refactor some of that into the
endpoints (since it is really endpoint specific) but I haven't looked at
that.

 I would have assumed the most
 simple way to implement WebSockets would be on top of the existing Comet
 implementation.

There are a couple of problems / concerns I would have with doing that.

1. Comet is not implemented for BIO and a generic upgrade process
ideally needs to support all three connectors. Further, there is very
likely to be some form of generic upgrade support in Servlet 3.1 and
that will obviously have to work with all three connectors.

2. It would mean retaining an HttpProcessor object, a Request object and
a Response object for each connection. If you look back at the short
history of the WebSocket implementation you'll see that Costin raised
some scalability concerns about the initial implementation that used the
HttpProcessor. The move to the deliberately very light-weight
UpgradeProcessor was as a direct result of those concerns.

3. Comet doesn't currently support switching from HTTP to Comet. That
could be added but it would increase complexity to the current Comet
implementation.

 if there is more data to be read. This would too have avoided single
 byte reads from the system buffers, since Comet reads in as much as
 possible, and then you can single byte read from Java heap memory.

4. When I looked at using / adapting the existing InputBuffers I hit
various complications and I ended up adding more code to re-use the
existing buffers than I needed to add if I didn't use them.

5. Not having a buffer between the system buffer and the reads doesn't
seem to impact performance at all. I experimented with adding a
BufferedInputStream to the existing implementation and there was a
negligible impact on performance - positive or negative.

(As an aside, the performance of the current implementation appears to
be on par with other implementations based on the results of the
Autobahn tests. Those tests are far from comprehensive as performance
tests and don't test performance under load or scalability but they are
the best indication we have at the moment.)

 The only thing you would have had to do, had you used Comet, was to turn
 off the filters that cause chunked-encoding, and you would have had
 access to raw data directly from within.

I disagree. There would have been more work required than that -
handling the HTTP upgrade and getting it working with BIO for starters
and the result would have been much more heavy-weight (and hence more
likely to have scalability issues) than the current implementation. I'm
not saying that these issues couldn't be overcome, but based on my
initial experience heading in this direction a separate implementation
was simpler to implement and will be easier to maintain. The little
duplicate code this has introduced can probably be refactored out at
some pointy in the future.

 All the Upgrade classes,
 everything, would have sat directly in the highest level, never touching
 the low level connectors.
 
 Something food for thought :)

Absolutely. I'm sure there is room for improvement in the current
implementation. I'm not convinced that refactoring WebSocket to be built
on top of Comet is the way to go but I wouldn't be at all surprised is
there was some lower level refactoring that could be done to simplify
the connectors generally, further reduce duplication and improve
performance.

Mark

[1] http://svn.apache.org/viewvc?view=revisionrevision=1063366

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



Re: [Tomcat Wiki] Update of PageD'Accueil by Roger Mbiama

2012-03-02 Thread Pid
On 01/03/2012 20:42, Apache Wiki wrote:
 Dear Wiki user,
 
 You have subscribed to a wiki page or wiki category on Tomcat Wiki for 
 change notification.
 
 The PageD'Accueil page has been changed by Roger Mbiama:
 http://wiki.apache.org/tomcat/PageD%27Accueil?action=diffrev1=1rev2=2
 
   ## For more information, please see MoinMaster:MoinPagesEditorGroup.
   ## Merci de n'éditer les pages systèmes et d'aide QUE sur MoinMaster !
   ## Pour plus d'information, consultez MoinMaster:MoinPagesEditorGroup.
 - ##master-page:FrontPage
 + ##master-page:Auth: 
 [http://localhost:8080/host-manager/html/add?org.apache.catalina.filters.CSRF_NONCE=8E125BADDC7EF6E514C6B06138B895DF]
 - ##master-date:2004-12-02 00:47:10
 + ##master-date:2012-03-01 00:47:10
   #format wiki
   #language fr
   #pragma section-numbers off
 @@ -31, +31 @@

What is Roger up to this time?


p


   Pour en savoir plus sur ce qu'est un [:WikiWikiWebVF: WikiWikiWeb], lisez 
 MoinMoin:WhyWikiWorks et MoinMoin:WikiNature. Vous pouvez également consulter 
 la MoinMoin:WikiWikiWebFaq.
   
   Ce site utilise le moteur [:MoinMoinVF: MoinMoin].
 + == Managing Tomcat ==
 + For security, access to the manager webapp is restricted. Users are defined 
 in:
 + $CATALINA_HOME/conf/tomcat-users
 + In Tomcat 7.0 access to the manager application is split between different 
 users.
 + $CATALINA_HOME/RUNNING.text
 + 
 http://localhost:8080/manager/status?org.apache.catalina.filters.CSRF_NONCE=7F004F6531785E6DD588EF4B8C70012C
   
   
 
 -
 To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
 For additional commands, e-mail: dev-h...@tomcat.apache.org
 




signature.asc
Description: OpenPGP digital signature


svn commit: r1296102 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/Http11NioProtocol.java webapps/docs/changelog.xml

2012-03-02 Thread markt
Author: markt
Date: Fri Mar  2 09:38:33 2012
New Revision: 1296102

URL: http://svn.apache.org/viewvc?rev=1296102view=rev
Log: (empty)

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  2 09:38:33 2012
@@ -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,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,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,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
 

Re: buildbot failure in ASF Buildbot on tomcat-trunk

2012-03-02 Thread Mark Thomas
On 02/03/2012 00:13, build...@apache.org wrote:
 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/2802
 
 Buildbot URL: http://ci.apache.org/
 
 Buildslave for this Build: bb-vm_ubuntu
 
 Build Reason: scheduler
 Build Source Stamp: [branch tomcat/trunk] 1295998
 Blamelist: fhanik
 
 BUILD FAILED: failed compile_1

Odd. That is an async failure. Maybe timing related. I don't believe we
have access to the logs to see which test failed on buildbot.

Mark

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



Re: [VOTE] Release Apache Tomcat Native 1.1.23

2012-03-02 Thread jean-frederic clere

On 02/28/2012 03:39 PM, Mladen Turk wrote:

[+1] Released


Tested on Fedora16 compiled on Solaris/HPUX/RHEL4/5.

Cheers

Jean-Frederic

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



svn commit: r1296171 - /tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java

2012-03-02 Thread markt
Author: markt
Date: Fri Mar  2 12:41:03 2012
New Revision: 1296171

URL: http://svn.apache.org/viewvc?rev=1296171view=rev
Log:
Remove unused imports

Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1296171r1=1296170r2=1296171view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Fri Mar  
2 12:41:03 2012
@@ -17,7 +17,6 @@
 package org.apache.coyote.http11;
 
 import java.io.IOException;
-import java.nio.channels.SelectionKey;
 import java.nio.channels.SocketChannel;
 import java.util.Iterator;
 
@@ -31,7 +30,6 @@ import org.apache.tomcat.util.net.Abstra
 import org.apache.tomcat.util.net.NioChannel;
 import org.apache.tomcat.util.net.NioEndpoint;
 import org.apache.tomcat.util.net.NioEndpoint.Handler;
-import org.apache.tomcat.util.net.NioEndpoint.KeyAttachment;
 import org.apache.tomcat.util.net.SSLImplementation;
 import org.apache.tomcat.util.net.SecureNioChannel;
 import org.apache.tomcat.util.net.SocketWrapper;



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



svn commit: r1296172 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java ajp/AbstractAjpProtocol.java http11/Http11AprProtocol.java http11/Http11NioProtocol.java http11/Http11Protocol.jav

2012-03-02 Thread markt
Author: markt
Date: Fri Mar  2 12:41:54 2012
New Revision: 1296172

URL: http://svn.apache.org/viewvc?rev=1296172view=rev
Log:
No need for an upgrade specific poll method. Delete some more code :)

Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1296172r1=1296171r2=1296172view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Fri Mar  2 
12:41:54 2012
@@ -591,7 +591,7 @@ public abstract class AbstractProtocol i
 release(socket, processor, false, false);
 } else if (state == SocketState.UPGRADED) {
 // Need to keep the connection associated with the 
processor
-upgradePoll(socket, processor);
+longPoll(socket, processor);
 } else {
 // Connection closed. OK to recycle the processor.
 if (!(processor instanceof UpgradeProcessor)) {
@@ -630,8 +630,6 @@ public abstract class AbstractProtocol i
 ProcessorS processor);
 protected abstract void longPoll(SocketWrapperS socket,
 ProcessorS processor);
-protected abstract void upgradePoll(SocketWrapperS socket,
-ProcessorS processor);
 protected abstract void release(SocketWrapperS socket,
 ProcessorS processor, boolean socketClosing,
 boolean addToPoller);

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1296172r1=1296171r2=1296172view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Fri Mar  2 
12:41:54 2012
@@ -91,12 +91,6 @@ public abstract class AbstractAjpProtoco
 }
 
 @Override
-protected void upgradePoll(SocketWrapperS socket,
-ProcessorS processor) {
-// TODO Should never happen. ISE?
-}
-
-@Override
 protected P createUpgradeProcessor(SocketWrapperS socket,
 UpgradeInbound inbound) {
 // TODO should fail - throw IOE

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1296172r1=1296171r2=1296172view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Fri Mar  
2 12:41:54 2012
@@ -293,22 +293,20 @@ public class Http11AprProtocol extends A
 connections.put(socket.getSocket(), processor);
 
 if (processor.isAsync()) {
+// Async
 socket.setAsync(true);
 } else if (processor.isComet()  proto.endpoint.isRunning()) {
+// Comet
 ((AprEndpoint) proto.endpoint).getCometPoller().add(
 socket.getSocket().longValue(), false);
+} else {
+// Upgraded
+((AprEndpoint) proto.endpoint).getPoller().add(
+socket.getSocket().longValue(), false);
 }
 }
 
 @Override
-protected void upgradePoll(SocketWrapperLong socket,
-ProcessorLong processor) {
-connections.put(socket.getSocket(), processor);
-((AprEndpoint) proto.endpoint).getPoller().add(
-socket.getSocket().longValue(), false);
-}
-
-@Override
 protected Http11AprProcessor createProcessor() {
 Http11AprProcessor processor = new Http11AprProcessor(
 proto.getMaxHttpHeaderSize(), (AprEndpoint)proto.endpoint,

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1296172r1=1296171r2=1296172view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ 

DO NOT REPLY [Bug 51181] Add support for Web Sockets

2012-03-02 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181

--- Comment #48 from Johno Crawford jo...@sulake.com 2012-03-02 12:53:06 UTC 
---
Created attachment 28410
  -- https://issues.apache.org/bugzilla/attachment.cgi?id=28410
Improved echo example

Please find attached proposal for improved echo example. Still working on a
much more exciting example by the way!

-- 
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 52811] New: HttpServletResponse.setContentType() parses the content type incorrectly

2012-03-02 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52811

 Bug #: 52811
   Summary: HttpServletResponse.setContentType() parses the
content type incorrectly
   Product: Tomcat 6
   Version: 6.0.29
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Servlet  JSP API
AssignedTo: dev@tomcat.apache.org
ReportedBy: martin.ha...@acision.com
Classification: Unclassified


When creating the HttpServletResponse the setContentType(type) is used for
setting the content type and character encoding.
If the type is for example:

multipart/related;boundary=1_4F50BD36_CDF8C28;Start=31671603.smil;Type=application/smil;charset=UTF-8

it is parsed and the content type is set to:

multipart/related;boundary=1_4F50BD36_CDF8C28;Start=31671603.smil;Type=application/smil

and character encoding to:

UTF-8

I believe it is incorrect, the content type should be:

multipart/related;boundary=1_4F50BD36_CDF8C28;Start=31671603.smil;Type=application/smil;charset=UTF-8

and the character encoding should be set to default (ISO-8859-1).

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



buildbot success in ASF Buildbot on tomcat-trunk

2012-03-02 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/2803

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1296172
Blamelist: markt

Build succeeded!

sincerely,
 -The Buildbot





Re: svn commit: r1296172 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java ajp/AbstractAjpProtocol.java http11/Http11AprProtocol.java http11/Http11NioProtocol.java http11/Http11Protocol

2012-03-02 Thread Johno Crawford

Hi Mark,

Quick question regarding web socket socket states, using the BIO 
connector I have observed the socket state never transitions to 
UPGRADED.. Is this the expected behaviour?


Cheers,

Johno

On 2/03/2012 1:41 PM, ma...@apache.org wrote:

Author: markt
Date: Fri Mar  2 12:41:54 2012
New Revision: 1296172

URL: http://svn.apache.org/viewvc?rev=1296172view=rev
Log:
No need for an upgrade specific poll method. Delete some more code :)

Modified:
 tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
 tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
 tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
 tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
 tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1296172r1=1296171r2=1296172view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Fri Mar  2 
12:41:54 2012
@@ -591,7 +591,7 @@ public abstract class AbstractProtocol i
  release(socket, processor, false, false);
  } else if (state == SocketState.UPGRADED) {
  // Need to keep the connection associated with the 
processor
-upgradePoll(socket, processor);
+longPoll(socket, processor);
  } else {
  // Connection closed. OK to recycle the processor.
  if (!(processor instanceof UpgradeProcessor)) {
@@ -630,8 +630,6 @@ public abstract class AbstractProtocol i
  ProcessorS  processor);
  protected abstract void longPoll(SocketWrapperS  socket,
  ProcessorS  processor);
-protected abstract void upgradePoll(SocketWrapperS  socket,
-ProcessorS  processor);
  protected abstract void release(SocketWrapperS  socket,
  ProcessorS  processor, boolean socketClosing,
  boolean addToPoller);

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1296172r1=1296171r2=1296172view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Fri Mar  2 
12:41:54 2012
@@ -91,12 +91,6 @@ public abstract class AbstractAjpProtoco
  }

  @Override
-protected void upgradePoll(SocketWrapperS  socket,
-ProcessorS  processor) {
-// TODO Should never happen. ISE?
-}
-
-@Override
  protected P createUpgradeProcessor(SocketWrapperS  socket,
  UpgradeInbound inbound) {
  // TODO should fail - throw IOE

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1296172r1=1296171r2=1296172view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Fri Mar  
2 12:41:54 2012
@@ -293,22 +293,20 @@ public class Http11AprProtocol extends A
  connections.put(socket.getSocket(), processor);

  if (processor.isAsync()) {
+// Async
  socket.setAsync(true);
  } else if (processor.isComet()  proto.endpoint.isRunning()) {
+// Comet
  ((AprEndpoint) proto.endpoint).getCometPoller().add(
  socket.getSocket().longValue(), false);
+} else {
+// Upgraded
+((AprEndpoint) proto.endpoint).getPoller().add(
+socket.getSocket().longValue(), false);
  }
  }

  @Override
-protected void upgradePoll(SocketWrapperLong  socket,
-ProcessorLong  processor) {
-connections.put(socket.getSocket(), processor);
-((AprEndpoint) proto.endpoint).getPoller().add(
-socket.getSocket().longValue(), false);
-}
-
-@Override
  protected Http11AprProcessor createProcessor() {
  Http11AprProcessor processor = new Http11AprProcessor(
  proto.getMaxHttpHeaderSize(), (AprEndpoint)proto.endpoint,

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: 

Re: WebSocket status

2012-03-02 Thread Filip Hanik - Dev Lists

On 3/2/2012 2:13 AM, Mark Thomas wrote:

You can't register on a selector using another thread.

Bingo. That explains it. Is that documented anywhere?
I'm not sure if the java.nio documentation says it, I think it does. The Selector object is not thread safe. trying to manipulate 
interestops and selectors from multiple threads, can lead to dead locks


I'm off for the weekend, address the other stuff next week. Enjoy the weekend!

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



Re: svn commit: r1296172 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java ajp/AbstractAjpProtocol.java http11/Http11AprProtocol.java http11/Http11NioProtocol.java http11/Http11Protocol

2012-03-02 Thread Mark Thomas
On 02/03/2012 13:17, Johno Crawford wrote:
 Hi Mark,
 
 Quick question regarding web socket socket states, using the BIO
 connector I have observed the socket state never transitions to
 UPGRADED.. Is this the expected behaviour?

Short answer: yes.

Longer answer: In this case state is the state at a particular point in
time rather than state as one might think of in terms of a state
machine. Because BIO is blocking rather than exiting the loop in
StreamInbound#onData() with a state of UPGRADED it blocks waiting for
more data to turn up. It it did exit, all that would happen is that 10s
of lines of code latter the thread (more likely a different thread)
would end up back in StreamInbound#onData() blocking on a read. The
current way of looping is just more efficient.

HTH,

Mark


 Cheers,
 
 Johno
 
 On 2/03/2012 1:41 PM, ma...@apache.org wrote:
 Author: markt
 Date: Fri Mar  2 12:41:54 2012
 New Revision: 1296172

 URL: http://svn.apache.org/viewvc?rev=1296172view=rev
 Log:
 No need for an upgrade specific poll method. Delete some more code :)

 Modified:
  tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
  tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
  tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
  tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
  tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java

 Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
 URL:
 http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1296172r1=1296171r2=1296172view=diff

 ==

 --- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
 +++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Fri Mar 
 2 12:41:54 2012
 @@ -591,7 +591,7 @@ public abstract class AbstractProtocol i
   release(socket, processor, false, false);
   } else if (state == SocketState.UPGRADED) {
   // Need to keep the connection associated with
 the processor
 -upgradePoll(socket, processor);
 +longPoll(socket, processor);
   } else {
   // Connection closed. OK to recycle the processor.
   if (!(processor instanceof UpgradeProcessor)) {
 @@ -630,8 +630,6 @@ public abstract class AbstractProtocol i
   ProcessorS  processor);
   protected abstract void longPoll(SocketWrapperS  socket,
   ProcessorS  processor);
 -protected abstract void upgradePoll(SocketWrapperS  socket,
 -ProcessorS  processor);
   protected abstract void release(SocketWrapperS  socket,
   ProcessorS  processor, boolean socketClosing,
   boolean addToPoller);

 Modified:
 tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
 URL:
 http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1296172r1=1296171r2=1296172view=diff

 ==

 --- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
 (original)
 +++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
 Fri Mar  2 12:41:54 2012
 @@ -91,12 +91,6 @@ public abstract class AbstractAjpProtoco
   }

   @Override
 -protected void upgradePoll(SocketWrapperS  socket,
 -ProcessorS  processor) {
 -// TODO Should never happen. ISE?
 -}
 -
 -@Override
   protected P createUpgradeProcessor(SocketWrapperS  socket,
   UpgradeInbound inbound) {
   // TODO should fail - throw IOE

 Modified:
 tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
 URL:
 http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1296172r1=1296171r2=1296172view=diff

 ==

 --- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
 (original)
 +++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
 Fri Mar  2 12:41:54 2012
 @@ -293,22 +293,20 @@ public class Http11AprProtocol extends A
   connections.put(socket.getSocket(), processor);

   if (processor.isAsync()) {
 +// Async
   socket.setAsync(true);
   } else if (processor.isComet() 
 proto.endpoint.isRunning()) {
 +// Comet
   ((AprEndpoint) proto.endpoint).getCometPoller().add(
   socket.getSocket().longValue(), false);
 +} else {
 +// Upgraded
 +((AprEndpoint) proto.endpoint).getPoller().add(
 +socket.getSocket().longValue(), 

buildbot failure in ASF Buildbot on tomcat-trunk

2012-03-02 Thread buildbot
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/2804

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1296207
Blamelist: markt

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot





[RESULT] Was: [VOTE] Release Apache Tomcat Native 1.1.23

2012-03-02 Thread Mladen Turk

With my implicit +1 we 4 +1's (Henri, Filip, Jean-Frederic and I)
and no other votes. I declare vote as passed.

On 02/28/2012 03:39 PM, Mladen Turk wrote:

Version 1.1.23 is both bugfix release with couple of additional features
that does not change ABI (namely OCSP and pkcs12 support).
The proposed release artefacts can be found at [1],
and the build was done using tag [2].

Please vote. The vote will be open for at least 72 hours.
Apache Tomcat Native 1.1.23 should be:

[+1] Released
[-1] Not released because ...


[1] http://people.apache.org/~mturk/native/1.1.23
[2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_1_23



Regards
--
^TM

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



svn commit: r517 - in /release/tomcat/tomcat-connectors/native: ./ 1.1.23/ 1.1.23/binaries/ 1.1.23/source/

2012-03-02 Thread mturk
Author: mturk
Date: Fri Mar  2 15:11:32 2012
New Revision: 517

Log:
Add 1.1.23 artefacts

Added:
release/tomcat/tomcat-connectors/native/1.1.23/
release/tomcat/tomcat-connectors/native/1.1.23/binaries/

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.asc

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.md5

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.sha1

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-win32-bin.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-win32-bin.zip.asc

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-win32-bin.zip.md5

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-win32-bin.zip.sha1

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23.jar
   (with props)

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23.jar.asc

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23.jar.md5

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23.jar.sha1
release/tomcat/tomcat-connectors/native/1.1.23/source/

release/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz
   (with props)

release/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz.asc

release/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz.md5

release/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz.sha1

release/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-win32-src.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-win32-src.zip.asc

release/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-win32-src.zip.md5

release/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-win32-src.zip.sha1
Modified:
release/tomcat/tomcat-connectors/native/README.html

Added: 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip
--
svn:mime-type = application/octet-stream

Added: 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.asc
==
--- 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.asc
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.asc
 Fri Mar  2 15:11:32 2012
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iEYEABECAAYFAk9M5GgACgkQHFBkB1ZMF6PPcgCgxWmzkLfmzWiaJ3m/Yw29W3Pn
+UGIAni0q6EQpGcYVEPz7XINUj3BW+BRj
+=3DZF
+-END PGP SIGNATURE-

Added: 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.md5
==
--- 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.md5
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.md5
 Fri Mar  2 15:11:32 2012
@@ -0,0 +1 @@
+e782d44f92aad353ef12b5938c7b66d4 *tomcat-native-1.1.23-ocsp-win32-bin.zip

Added: 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.sha1
==
--- 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.sha1
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.sha1
 Fri Mar  2 15:11:32 2012
@@ -0,0 +1 @@
+1158ade11c633be134d2cd6fcd12883a0a6ee126 
*tomcat-native-1.1.23-ocsp-win32-bin.zip

Added: 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-win32-bin.zip
--
svn:mime-type = application/octet-stream

Added: 

svn commit: r517 - in /release/tomcat/tomcat-connectors/native: ./ 1.1.23/ 1.1.23/binaries/ 1.1.23/source/

2012-03-02 Thread mturk
Author: mturk
Date: Fri Mar  2 15:11:32 2012
New Revision: 517

Log:
Add 1.1.23 artefacts

Added:
release/tomcat/tomcat-connectors/native/1.1.23/
release/tomcat/tomcat-connectors/native/1.1.23/binaries/

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.asc

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.md5

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.sha1

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-win32-bin.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-win32-bin.zip.asc

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-win32-bin.zip.md5

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-win32-bin.zip.sha1

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23.jar
   (with props)

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23.jar.asc

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23.jar.md5

release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23.jar.sha1
release/tomcat/tomcat-connectors/native/1.1.23/source/

release/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz
   (with props)

release/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz.asc

release/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz.md5

release/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz.sha1

release/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-win32-src.zip
   (with props)

release/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-win32-src.zip.asc

release/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-win32-src.zip.md5

release/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-win32-src.zip.sha1
Modified:
release/tomcat/tomcat-connectors/native/README.html

Added: 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip
--
svn:mime-type = application/octet-stream

Added: 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.asc
==
--- 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.asc
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.asc
 Fri Mar  2 15:11:32 2012
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iEYEABECAAYFAk9M5GgACgkQHFBkB1ZMF6PPcgCgxWmzkLfmzWiaJ3m/Yw29W3Pn
+UGIAni0q6EQpGcYVEPz7XINUj3BW+BRj
+=3DZF
+-END PGP SIGNATURE-

Added: 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.md5
==
--- 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.md5
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.md5
 Fri Mar  2 15:11:32 2012
@@ -0,0 +1 @@
+e782d44f92aad353ef12b5938c7b66d4 *tomcat-native-1.1.23-ocsp-win32-bin.zip

Added: 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.sha1
==
--- 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.sha1
 (added)
+++ 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-ocsp-win32-bin.zip.sha1
 Fri Mar  2 15:11:32 2012
@@ -0,0 +1 @@
+1158ade11c633be134d2cd6fcd12883a0a6ee126 
*tomcat-native-1.1.23-ocsp-win32-bin.zip

Added: 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
release/tomcat/tomcat-connectors/native/1.1.23/binaries/tomcat-native-1.1.23-win32-bin.zip
--
svn:mime-type = application/octet-stream

Added: 

svn commit: r1296246 - in /tomcat/native/branches/1.1.x: build.properties.default native/include/tcn_version.h xdocs/index.xml xdocs/news/2012.xml

2012-03-02 Thread mturk
Author: mturk
Date: Fri Mar  2 15:21:34 2012
New Revision: 1296246

URL: http://svn.apache.org/viewvc?rev=1296246view=rev
Log:
Update version and release info

Modified:
tomcat/native/branches/1.1.x/build.properties.default
tomcat/native/branches/1.1.x/native/include/tcn_version.h
tomcat/native/branches/1.1.x/xdocs/index.xml
tomcat/native/branches/1.1.x/xdocs/news/2012.xml

Modified: tomcat/native/branches/1.1.x/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.properties.default?rev=1296246r1=1296245r2=1296246view=diff
==
--- tomcat/native/branches/1.1.x/build.properties.default (original)
+++ tomcat/native/branches/1.1.x/build.properties.default Fri Mar  2 15:21:34 
2012
@@ -18,7 +18,7 @@
 # - Version Control Flags -
 version.major=1
 version.minor=1
-version.build=17
+version.build=24
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/native/branches/1.1.x/native/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/tcn_version.h?rev=1296246r1=1296245r2=1296246view=diff
==
--- tomcat/native/branches/1.1.x/native/include/tcn_version.h (original)
+++ tomcat/native/branches/1.1.x/native/include/tcn_version.h Fri Mar  2 
15:21:34 2012
@@ -69,13 +69,13 @@ extern C {
 #define TCN_MINOR_VERSION   1
 
 /** patch level */
-#define TCN_PATCH_VERSION   23
+#define TCN_PATCH_VERSION   24
 
 /**
  *  This symbol is defined for internal, development copies of TCN. This
  *  symbol will be #undef'd for releases.
  */
-#define TCN_IS_DEV_VERSION  0
+#define TCN_IS_DEV_VERSION  1
 
 
 /** The formatted string of APU's version */

Modified: tomcat/native/branches/1.1.x/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/index.xml?rev=1296246r1=1296245r2=1296246view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/index.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/index.xml Fri Mar  2 15:21:34 2012
@@ -45,13 +45,13 @@ manual is described in more detail below
 br /
 ul
 
-lia href=news/2011.html#20110808.108 August 2011 - bTC-Native-1.1.22 
released/b/a
-pThe Apache Tomcat team is proud to announce the immediate availability of 
Tomcat Native 1.1.22 Stable.
+lia href=news/2012.html#20120302.102 March 2012 - bTC-Native-1.1.23 
released/b/a
+pThe Apache Tomcat team is proud to announce the immediate availability of 
Tomcat Native 1.1.23 Stable.
 /p
-pDownload the a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.22/source/tomcat-native-1.1.22-src.tar.gz;TC-native
 1.1.22 release sources/a
- | a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.22/source/tomcat-native-1.1.22-src.tar.gz.asc;PGP
 signature/a
+pDownload the a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz;TC-native
 1.1.23 release sources/a
+ | a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz.asc;PGP
 signature/a
 /p
-pDownload the a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.22/binaries/;binaries/a
 for selected platforms.
+pDownload the a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/binaries/;binaries/a
 for selected platforms.
 /p
 /li
 /ul

Modified: tomcat/native/branches/1.1.x/xdocs/news/2012.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/news/2012.xml?rev=1296246r1=1296245r2=1296246view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/news/2012.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/news/2012.xml Fri Mar  2 15:21:34 2012
@@ -31,6 +31,21 @@
 
 section name=2012 News amp; Status
 br /
+a name=20120302.1
+h308 August - TC-Native-1.1.23 released/h3
+/a
+pThe Apache Tomcat team is proud to announce the immediate availability
+of Tomcat Native 1.1.23. This is a stable release adding some bug fixes and
+experimental support for OCSP and PKCS12 certificates.
+/p
+br /
+p
+ Please see the a href=../miscellaneous/changelog.htmlChangeLog/a for a 
full list of changes.
+/p
+pIf you find any bugs while using this release, please fill in the
+a 
href=http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%206;Bugzilla/a
+Bug Report. When entering bug select bNative:JNI/b Component.
+/p
 hr size=1 noshade=noshade /
 /section
 /body



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



svn commit: r1296248 - /tomcat/site/trunk/xdocs/index.xml

2012-03-02 Thread mturk
Author: mturk
Date: Fri Mar  2 15:29:15 2012
New Revision: 1296248

URL: http://svn.apache.org/viewvc?rev=1296248view=rev
Log:
Add 1.1.23 release section

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

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1296248r1=1296247r2=1296248view=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Fri Mar  2 15:29:15 2012
@@ -37,6 +37,17 @@ project logo are trademarks of the Apach
 
 /section
 
+section name=Tomcat Native 1.1.23 Released rtext=2012-03-02
+p
+The Apache Tomcat Project is proud to announce the release of version 1.1.23 
of Tomcat Native.
+This version is principally a bugfix release.
+/p
+p align=center
+a href=download-native.cgiDownload/a |
+a href=native-doc/miscellaneous/changelog.htmlChangeLog for 1.1.23/a
+/p
+/section
+
 section name=Tomcat 7.0.26 Released rtext=2012-02-21
 p
 The Apache Tomcat Project is proud to announce the release of version 7.0.26 of



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



svn commit: r1296249 - /tomcat/site/trunk/docs/index.html

2012-03-02 Thread mturk
Author: mturk
Date: Fri Mar  2 15:29:35 2012
New Revision: 1296249

URL: http://svn.apache.org/viewvc?rev=1296249view=rev
Log:
Add 1.1.23 release section

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

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1296249r1=1296248r2=1296249view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Fri Mar  2 15:29:35 2012
@@ -233,6 +233,38 @@ project logo are trademarks of the Apach
 /table
 table border=0 cellspacing=0 cellpadding=2 width=100%
 tr
+td bgcolor=#525D76font color=#ff face=arial,helvetica,sanserifa 
name=Tomcat Native 1.1.23 Released
+!--()--/aa name=Tomcat_Native_1.1.23_ReleasedstrongTomcat Native 
1.1.23 Released/strong/a/font/tdtd align=right 
bgcolor=#525D76font color=#ff 
face=arial,helvetica.sanserifstrong2012-03-02/strong/font/td
+/tr
+tr
+td colspan=2
+p
+blockquote
+
+p
+The Apache Tomcat Project is proud to announce the release of version 1.1.23 
of Tomcat Native.
+This version is principally a bugfix release.
+/p
+
+p align=center
+
+a href=download-native.cgiDownload/a |
+a href=native-doc/miscellaneous/changelog.htmlChangeLog for 1.1.23/a
+
+/p
+
+/blockquote
+/p
+/td
+/tr
+tr
+td
+br
+/td
+/tr
+/table
+table border=0 cellspacing=0 cellpadding=2 width=100%
+tr
 td bgcolor=#525D76font color=#ff face=arial,helvetica,sanserifa 
name=Tomcat 7.0.26 Released
 !--()--/aa name=Tomcat_7.0.26_ReleasedstrongTomcat 7.0.26 
Released/strong/a/font/tdtd align=right bgcolor=#525D76font 
color=#ff 
face=arial,helvetica.sanserifstrong2012-02-21/strong/font/td
 /tr



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



DO NOT REPLY [Bug 51181] Add support for Web Sockets

2012-03-02 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181

Johno Crawford jo...@sulake.com changed:

   What|Removed |Added

  Attachment #28408|0   |1
is obsolete||

--- Comment #49 from Johno Crawford jo...@sulake.com 2012-03-02 15:39:30 UTC 
---
Created attachment 28411
  -- https://issues.apache.org/bugzilla/attachment.cgi?id=28411
Overrides for connection open and close

Please find attached revised connection open and close overrides which should
not cause NPE if write happens just after onOpen is called.

-- 
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: r1296257 - in /tomcat/site/trunk: docs/download-native.html xdocs/download-native.xml

2012-03-02 Thread mturk
Author: mturk
Date: Fri Mar  2 15:48:42 2012
New Revision: 1296257

URL: http://svn.apache.org/viewvc?rev=1296257view=rev
Log:
Update 1.1.23 download section

Modified:
tomcat/site/trunk/docs/download-native.html
tomcat/site/trunk/xdocs/download-native.xml

Modified: tomcat/site/trunk/docs/download-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1296257r1=1296256r2=1296257view=diff
==
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Fri Mar  2 15:48:42 2012
@@ -280,20 +280,20 @@
 
 li class=download
   
-a 
href=[preferred]/tomcat/tomcat-connectors/native/1.1.22/source/tomcat-native-1.1.22-src.tar.gz
 rel=nofollow
-Native 1.1.22 Source Release tar.gz
+a 
href=[preferred]/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz
 rel=nofollow
+Native 1.1.23 Source Release tar.gz
   /a (e.g. Unix, Linux, Mac OS)
 ul class=attributes
   
 li
 span class=pgp
-[a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.22/source/tomcat-native-1.1.22-src.tar.gz.asc;PGP/a]
+[a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz.asc;PGP/a]
   /span
 /li
   
 li
 span class=md5
-[a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.22/source/tomcat-native-1.1.22-src.tar.gz.md5;MD5/a]
+[a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz.md5;MD5/a]
   /span
 /li
 
@@ -303,20 +303,20 @@
 
 li class=download
   
-a 
href=[preferred]/tomcat/tomcat-connectors/native/1.1.22/source/tomcat-native-1.1.22-win32-src.zip
 rel=nofollow
-Native 1.1.22 Source Release zip
+a 
href=[preferred]/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-win32-src.zip
 rel=nofollow
+Native 1.1.23 Source Release zip
   /a (e.g. Windows)
 ul class=attributes
   
 li
 span class=pgp
-[a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.22/source/tomcat-native-1.1.22-win32-src.zip.asc;PGP/a]
+[a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-win32-src.zip.asc;PGP/a]
   /span
 /li
   
 li
 span class=md5
-[a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.22/source/tomcat-native-1.1.22-win32-src.zip.md5;MD5/a]
+[a 
href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-win32-src.zip.md5;MD5/a]
   /span
 /li
 
@@ -333,7 +333,7 @@
 pYou can find binaries release too/p
 
 pYou may download them from
-  a 
href=[preferred]/tomcat/tomcat-connectors/native/1.1.22/binaries 
rel=nofollowHERE/a
+  a 
href=[preferred]/tomcat/tomcat-connectors/native/1.1.23/binaries 
rel=nofollowHERE/a
 
 /p
 
@@ -372,7 +372,7 @@
 p
 code
 % pgpk -a KEYSbr
-% pgpv tomcat-native-1.1.22-src.tar.gz.ascbr
+% pgpv tomcat-native-1.1.23-src.tar.gz.ascbr
 
 /code
 emor/em
@@ -380,7 +380,7 @@
 
 code
 % pgp -ka KEYSbr
-% pgp tomcat-native-1.1.22-src.tar.gz.ascbr
+% pgp tomcat-native-1.1.23-src.tar.gz.ascbr
 
 /code
 emor/em
@@ -388,7 +388,7 @@
 
 code
 % gpg --import KEYSbr
-% gpg --verify tomcat-native-1.1.22-src.tar.gz.asc
+% gpg --verify tomcat-native-1.1.23-src.tar.gz.asc
 /code
 /p
 

Modified: tomcat/site/trunk/xdocs/download-native.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1296257r1=1296256r2=1296257view=diff
==
--- tomcat/site/trunk/xdocs/download-native.xml (original)
+++ tomcat/site/trunk/xdocs/download-native.xml Fri Mar  2 15:48:42 2012
@@ -49,28 +49,28 @@
   div class=linksspan class=labelSource (please choose the 
correct format for your platform)/span/div
   ul
 li class=download
-  a 
href=[preferred]/tomcat/tomcat-connectors/native/1.1.22/source/tomcat-native-1.1.22-src.tar.gz
 rel=nofollow
-Native 1.1.22 Source Release tar.gz
+  a 
href=[preferred]/tomcat/tomcat-connectors/native/1.1.23/source/tomcat-native-1.1.23-src.tar.gz
 rel=nofollow
+Native 1.1.23 Source Release tar.gz
   /a (e.g. Unix, Linux, Mac OS)
 ul class=attributes
   lispan class=pgp
-[a 

Re: svn commit: r1296172 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java ajp/AbstractAjpProtocol.java http11/Http11AprProtocol.java http11/Http11NioProtocol.java http11/Http11Protocol

2012-03-02 Thread Johno Crawford


On 2/03/2012 2:52 PM, Mark Thomas wrote:

On 02/03/2012 13:17, Johno Crawford wrote:

Hi Mark,

Quick question regarding web socket socket states, using the BIO
connector I have observed the socket state never transitions to
UPGRADED.. Is this the expected behaviour?

Short answer: yes.

Longer answer: In this case state is the state at a particular point in
time rather than state as one might think of in terms of a state
machine. Because BIO is blocking rather than exiting the loop in
StreamInbound#onData() with a state of UPGRADED it blocks waiting for
more data to turn up. It it did exit, all that would happen is that 10s
of lines of code latter the thread (more likely a different thread)
would end up back in StreamInbound#onData() blocking on a read. The
current way of looping is just more efficient.

HTH,

Mark


Helps a lot, thanks. I have updated the open close override patch with 
where I think makes most sense for the calls to happen. If you feel the 
need to drop the output argument in onOpen that's fine since one could 
simply just grab it using getWsOutbound().


Whilst working on my new websockets example, one question regarding the 
text message implementation came to me. What were the reasons for using 
CharBuffer instead of plain old String?


Cheers,

J





Cheers,

Johno

On 2/03/2012 1:41 PM, ma...@apache.org wrote:

Author: markt
Date: Fri Mar  2 12:41:54 2012
New Revision: 1296172

URL: http://svn.apache.org/viewvc?rev=1296172view=rev
Log:
No need for an upgrade specific poll method. Delete some more code :)

Modified:
  tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
  tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
  tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
  tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
  tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1296172r1=1296171r2=1296172view=diff

==

--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Fri Mar
2 12:41:54 2012
@@ -591,7 +591,7 @@ public abstract class AbstractProtocol i
   release(socket, processor, false, false);
   } else if (state == SocketState.UPGRADED) {
   // Need to keep the connection associated with
the processor
-upgradePoll(socket, processor);
+longPoll(socket, processor);
   } else {
   // Connection closed. OK to recycle the processor.
   if (!(processor instanceof UpgradeProcessor)) {
@@ -630,8 +630,6 @@ public abstract class AbstractProtocol i
   ProcessorS   processor);
   protected abstract void longPoll(SocketWrapperS   socket,
   ProcessorS   processor);
-protected abstract void upgradePoll(SocketWrapperS   socket,
-ProcessorS   processor);
   protected abstract void release(SocketWrapperS   socket,
   ProcessorS   processor, boolean socketClosing,
   boolean addToPoller);

Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1296172r1=1296171r2=1296172view=diff

==

--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
Fri Mar  2 12:41:54 2012
@@ -91,12 +91,6 @@ public abstract class AbstractAjpProtoco
   }

   @Override
-protected void upgradePoll(SocketWrapperS   socket,
-ProcessorS   processor) {
-// TODO Should never happen. ISE?
-}
-
-@Override
   protected P createUpgradeProcessor(SocketWrapperS   socket,
   UpgradeInbound inbound) {
   // TODO should fail - throw IOE

Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1296172r1=1296171r2=1296172view=diff

==

--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
Fri Mar  2 12:41:54 2012
@@ -293,22 +293,20 @@ public class Http11AprProtocol extends A
   connections.put(socket.getSocket(), processor);

   if (processor.isAsync()) {
+// Async

svn commit: r1296284 - in /tomcat/trunk: build.properties.default build.xml

2012-03-02 Thread mturk
Author: mturk
Date: Fri Mar  2 16:21:18 2012
New Revision: 1296284

URL: http://svn.apache.org/viewvc?rev=1296284view=rev
Log:
Use simpler tomcat-native distribution which comes with 1.1.23+

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1296284r1=1296283r2=1296284view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Fri Mar  2 16:21:18 2012
@@ -132,16 +132,13 @@ jdt.loc.1=http://archive.eclipse.org/ecl
 
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
 
 # - Tomcat native library -
-tomcat-native.version=1.1.22
+tomcat-native.version=1.1.23
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
 
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
 
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.dll.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries
-tomcat-native.dll.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries
-tomcat-native.dll.win32=${tomcat-native.home}/tcnative-1.dll.x86
-tomcat-native.dll.x64=${tomcat-native.home}/tcnative-1.dll.x64
-tomcat-native.dll.i64=${tomcat-native.home}/tcnative-1.dll.i64
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
 
 # - Commons DBCP, version 1.1 or later -
 commons-dbcp.version=1.4
@@ -164,7 +161,7 @@ nsis.nsisdl.dll=${nsis.home}/Plugins/NSI
 nsis.loc=${base-sf.loc}/nsis/nsis-2.46.zip
 
 # - Commons Daemon, version 1.0-Alpha or later -
-commons-daemon.version=1.0.9
+commons-daemon.version=1.0.10
 commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
 
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
 commons-daemon.native.win.home=${commons-daemon.home}/windows

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1296284r1=1296283r2=1296284view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Mar  2 16:21:18 2012
@@ -1532,14 +1532,13 @@
 copy file=${commons-daemon.home}/windows/ia64/prunsrv.exe
 tofile=${tomcat.dist}/bin/i64/tomcat${version.major}.exe /
 !-- tc native --
-copy file=${tomcat-native.home}/tcnative-1.dll.x86
-tofile=${tomcat.dist}/bin/tcnative-1.dll /
-!-- tc native 64 bit for amd/emt --
-copy file=${tomcat-native.home}/tcnative-1.dll.x64
-tofile=${tomcat.dist}/bin/x64/tcnative-1.dll /
-!-- tc native 64 bit for ia --
-copy file=${tomcat-native.home}/tcnative-1.dll.i64
-tofile=${tomcat.dist}/bin/i64/tcnative-1.dll /
+copy todir=${tomcat.dist}/bin
+  fileset dir=${tomcat-native.home}/bin
+include name=*.dll/
+include name=**/*.dll/
+  /fileset
+/copy
+
 !-- platform README files --
 echo append=false file=${tomcat.dist}/bin/i64/README
 Apache Tomcat ${version} native binaries for Win64 IA64 platform.
@@ -2339,24 +2338,9 @@ Apache Tomcat ${version} native binaries
   target name=download-dist
   description=Download additional components for a distribution 
 
-antcall target=downloadfile-2
-  param name=sourcefile.1 
value=${tomcat-native.dll.1}/win32/tcnative-1.dll/
-  param name=sourcefile.2 
value=${tomcat-native.dll.2}/win32/tcnative-1.dll/
-  param name=destfile value=${tomcat-native.dll.win32}/
-  param name=destdir value=${tomcat-native.home}/
-/antcall
-
-antcall target=downloadfile-2
-  param name=sourcefile.1 
value=${tomcat-native.dll.1}/win64/x64/tcnative-1.dll/
-  param name=sourcefile.2 
value=${tomcat-native.dll.2}/win64/x64/tcnative-1.dll/
-  param name=destfile value=${tomcat-native.dll.x64}/
-  param name=destdir value=${tomcat-native.home}/
-/antcall
-
-antcall target=downloadfile-2
-  param name=sourcefile.1 
value=${tomcat-native.dll.1}/win64/ia64/tcnative-1.dll/
-  param name=sourcefile.2 
value=${tomcat-native.dll.2}/win64/ia64/tcnative-1.dll/
-  param name=destfile value=${tomcat-native.dll.i64}/
+antcall target=downloadzip-2
+  param name=sourcefile.1 value=${tomcat-native.win.1}/
+  

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

2012-03-02 Thread mturk
Author: mturk
Date: Fri Mar  2 16:44:37 2012
New Revision: 1296302

URL: http://svn.apache.org/viewvc?rev=1296302view=rev
Log:
Catch downloaded dist

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1296302r1=1296301r2=1296302view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Mar  2 16:44:37 2012
@@ -1534,8 +1534,8 @@
 !-- tc native --
 copy todir=${tomcat.dist}/bin
   fileset dir=${tomcat-native.home}/bin
-include name=*.dll/
-include name=**/*.dll/
+exclude name=*.exe/
+exclude name=*.pdb/
   /fileset
 /copy
 
@@ -2341,6 +2341,7 @@ Apache Tomcat ${version} native binaries
 antcall target=downloadzip-2
   param name=sourcefile.1 value=${tomcat-native.win.1}/
   param name=sourcefile.2 value=${tomcat-native.win.2}/
+  param name=destfile value=${tomcat-native.home}/VERSIONS/
   param name=destdir value=${tomcat-native.home}/
 /antcall
 



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



buildbot success in ASF Buildbot on tomcat-trunk

2012-03-02 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/2806

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1296302
Blamelist: mturk

Build succeeded!

sincerely,
 -The Buildbot





[ANN] Apache Tomcat Native 1.1.23 released

2012-03-02 Thread Mladen Turk

The Apache Tomcat team announces the immediate availability of Apache
Tomcat Native 1.1.23 stable.

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

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

Please allow up to 24 hours for your local mirror to sync with
the Apache distribution site.

Note that with this release we changed the Windows binaries packaging.
Instead standalone .dll files we now have a single
tomcat-native-1.1.23-win32-bin.zip file containing libraries for both
32 and 64 bit JVM's. It can be found inside download binaries directory.


Thank you,
--
The Apache Tomcat Team

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



svn commit: r1296388 - in /tomcat/trunk/java/org/apache: catalina/websocket/StreamInbound.java coyote/AbstractProtocol.java coyote/http11/upgrade/UpgradeInbound.java

2012-03-02 Thread markt
Author: markt
Date: Fri Mar  2 19:07:01 2012
New Revision: 1296388

URL: http://svn.apache.org/viewvc?rev=1296388view=rev
Log:
Implement notification of open and close for WebSocket connections.
Patch provided by Johno Crawford.

Modified:
tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java

Modified: tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java?rev=1296388r1=1296387r2=1296388view=diff
==
--- tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java Fri Mar  
2 19:07:01 2012
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.nio.ByteBuffer;
 import java.nio.charset.MalformedInputException;
 import java.nio.charset.UnmappableCharacterException;
 
@@ -113,7 +114,7 @@ public abstract class StreamInbound impl
 try {
 // TODO User defined extensions may define values for rsv
 if (frame.getRsv()  0) {
-getWsOutbound().close(
+closeOutboundConnection(
 Constants.STATUS_PROTOCOL_ERROR, null);
 return SocketState.CLOSED;
 }
@@ -127,7 +128,7 @@ public abstract class StreamInbound impl
 new InputStreamReader(wsIs, new Utf8Decoder());
 onTextData(r);
 } else if (opCode == Constants.OPCODE_CLOSE){
-getWsOutbound().close(frame);
+closeOutboundConnection(frame);
 return SocketState.CLOSED;
 } else if (opCode == Constants.OPCODE_PING) {
 getWsOutbound().pong(frame.getPayLoad());
@@ -135,22 +136,22 @@ public abstract class StreamInbound impl
 // NO-OP
 } else {
 // Unknown OpCode
-getWsOutbound().close(
+closeOutboundConnection(
 Constants.STATUS_PROTOCOL_ERROR, null);
 return SocketState.CLOSED;
 }
 } catch (MalformedInputException mie) {
 // Invalid UTF-8
-getWsOutbound().close(Constants.STATUS_BAD_DATA, null);
+closeOutboundConnection(Constants.STATUS_BAD_DATA, null);
 return SocketState.CLOSED;
 } catch (UnmappableCharacterException uce) {
 // Invalid UTF-8
-getWsOutbound().close(Constants.STATUS_BAD_DATA, null);
+closeOutboundConnection(Constants.STATUS_BAD_DATA, null);
 return SocketState.CLOSED;
 } catch (IOException ioe) {
 // Given something must have gone to reach this point, this
 // might not work but try it anyway.
-getWsOutbound().close(Constants.STATUS_PROTOCOL_ERROR, null);
+closeOutboundConnection(Constants.STATUS_PROTOCOL_ERROR, null);
 return SocketState.CLOSED;
 }
 frame = wsIs.nextFrame(false);
@@ -158,6 +159,49 @@ public abstract class StreamInbound impl
 return SocketState.UPGRADED;
 }
 
+private void closeOutboundConnection(int status, ByteBuffer data) throws 
IOException {
+try {
+getWsOutbound().close(status, data);
+} finally {
+onClose(status);
+}
+}
+
+private void closeOutboundConnection(WsFrame frame) throws IOException {
+try {
+getWsOutbound().close(frame);
+} finally {
+onClose(Constants.OPCODE_CLOSE);
+}
+}
+
+@Override
+public void onUpgradeComplete() {
+onOpen(outbound);
+}
+
+/**
+ * Intended to be overridden by sub-classes that wish to be notified
+ * when the outbound connection is established. The default implementation
+ * is a NO-OP.
+ *
+ * @param outboundThe outbound WebSocket connection.
+ */
+protected void onOpen(WsOutbound outbound) {
+// NO-OP
+}
+
+/**
+ * Intended to be overridden by sub-classes that wish to be notified
+ * when the outbound connection is closed. The default implementation
+ * is a NO-OP.
+ *
+ * @param statusThe status code of the close reason.
+ */
+protected void onClose(int status) {
+// NO-OP
+}
+
 
 /**
  * This method is called when there is a binary WebSocket message available

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java

DO NOT REPLY [Bug 51181] Add support for Web Sockets

2012-03-02 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181

--- Comment #50 from Mark Thomas ma...@apache.org 2012-03-02 19:10:05 UTC ---
(In reply to comment #49)
 Created attachment 28411 [details]
 Overrides for connection open and close

Patch applied (with some minor tweaks). Many thanks.

I can see this evolving over time. We may need to change this to an approach
(particularly for close) where the method intended to be overridden actually
does the work and the developer has to call super.onClose() at an appropriate
point. Alternatively, the can not call super.close() and take responsibility
for sending the close message themselves. However, we can hold off on that
refactoring until someone indicates they need it.

-- 
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 51181] Add support for Web Sockets

2012-03-02 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181

--- Comment #51 from Mark Thomas ma...@apache.org 2012-03-02 19:15:40 UTC ---
(In reply to comment #48)
 Created attachment 28410 [details]
 Improved echo example

Patch applied. Many thanks.

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



buildbot failure in ASF Buildbot on tomcat-trunk

2012-03-02 Thread buildbot
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/2807

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1296388
Blamelist: markt

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot





Re: svn commit: r1295724 - in /tomcat/trunk/webapps/examples/WEB-INF: classes/websocket/EchoMessage.java web.xml

2012-03-02 Thread sebb
On 1 March 2012 18:27,  fha...@apache.org wrote:
 Author: fhanik
 Date: Thu Mar  1 18:27:56 2012
 New Revision: 1295724

 URL: http://svn.apache.org/viewvc?rev=1295724view=rev
 Log:
 Allow the examples to configure the buffer on the fly

 Modified:
    tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoMessage.java
    tomcat/trunk/webapps/examples/WEB-INF/web.xml

 Modified: 
 tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoMessage.java
 URL: 
 http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoMessage.java?rev=1295724r1=1295723r2=1295724view=diff
 ==
 --- tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoMessage.java 
 (original)
 +++ tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoMessage.java 
 Thu Mar  1 18:27:56 2012
 @@ -20,6 +20,8 @@ import java.io.IOException;
  import java.nio.ByteBuffer;
  import java.nio.CharBuffer;

 +import javax.servlet.ServletException;
 +
  import org.apache.catalina.websocket.MessageInbound;
  import org.apache.catalina.websocket.StreamInbound;
  import org.apache.catalina.websocket.WebSocketServlet;
 @@ -28,13 +30,40 @@ import org.apache.catalina.websocket.Web
  public class EchoMessage extends WebSocketServlet {

     private static final long serialVersionUID = 1L;
 +    private volatile int byteBufSize;
 +    private volatile int charBufSize;
 +
 +    @Override
 +    public void init() throws ServletException {
 +        super.init();
 +        byteBufSize = getInitParameterIntValue(byteBufferMaxSize, 2097152);
 +        charBufSize = getInitParameterIntValue(charBufferMaxSize, 2097152);

Value does not agree with below.
Is that intended?

 +    }
 +
 +    public int getInitParameterIntValue(String name, int defaultValue) {
 +        String val = this.getInitParameter(name);
 +        int result = defaultValue;
 +        try {
 +            result = Integer.parseInt(val);
 +        }catch (Exception x) {
 +        }
 +        return result;
 +    }
 +
 +

     @Override
     protected StreamInbound createWebSocketInbound(String subProtocol) {
 -        return new EchoMessageInbound();
 +        return new EchoMessageInbound(byteBufSize,charBufSize);
     }

     private static final class EchoMessageInbound extends MessageInbound {
 +
 +        public EchoMessageInbound(int byteBufferMaxSize, int 
 charBufferMaxSize) {
 +            super();
 +            setByteBufferMaxSize(byteBufferMaxSize);
 +            setCharBufferMaxSize(charBufferMaxSize);
 +        }

         @Override
         protected void onBinaryMessage(ByteBuffer message) throws IOException 
 {

 Modified: tomcat/trunk/webapps/examples/WEB-INF/web.xml
 URL: 
 http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/web.xml?rev=1295724r1=1295723r2=1295724view=diff
 ==
 --- tomcat/trunk/webapps/examples/WEB-INF/web.xml (original)
 +++ tomcat/trunk/webapps/examples/WEB-INF/web.xml Thu Mar  1 18:27:56 2012
 @@ -359,6 +359,8 @@
     servlet
       servlet-namewsEchoMessage/servlet-name
       servlet-classwebsocket.EchoMessage/servlet-class
 +      
 init-paramparam-namebyteBufferMaxSize/param-nameparam-value20971520/param-value/init-param
 +      
 init-paramparam-namecharBufferMaxSize/param-nameparam-value20971520/param-value/init-param

Value does not agree with above.
Is that intended?

     /servlet
     servlet-mapping
       servlet-namewsEchoMessage/servlet-name



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


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



instrumenting classes compiled from JSP

2012-03-02 Thread Louis

Hi,

If I want to dynamically instrument classes compiled from JSP pages, 
what is the best places to begin with? From my understanding, the 
process of JSP handling appears to work as follows:


1 The first request for a JSP page triggers the compilation of the page 
with Jasper.


2 The class file generated is written to the /work directory.

3 A classloader loads the class from the disk.

In steps 3, the class data may be loaded directly in memory by the 
classloader. So the best place to instrument seems to be between 2 and 
3, right before the class is loaded (if loading uses memory data). Since 
I'm new to Tomcat code base, where are the places should I start with, 
if my understanding is correct?


Thanks a lot.
Louis

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



instrumenting classes compiled from JSP

2012-03-02 Thread Louis

My Tomcat is 7.0.x, forgot mentioning.

Louis


Hi,

If I want to dynamically instrument classes compiled from JSP pages, 
what is the best places to begin with? From my understanding, the 
process of JSP handling appears to work as follows:


1 The first request for a JSP page triggers the compilation of the page 
with Jasper.


2 The class file generated is written to the /work directory.

3 A classloader loads the class from the disk.

In steps 3, the class data may be loaded directly in memory by the 
classloader. So the best place to instrument seems to be between 2 and 
3, right before the class is loaded (if loading uses memory data). Since 
I'm new to Tomcat code base, where are the places should I start with, 
if my understanding is correct?


Thanks a lot.
Louis

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



ApplicationContextFacade

2012-03-02 Thread Steven Adriaensen
Hey,

I was reading through the Tomcat source code, trying to figure out how
the tomcat internals are protected against unauthorized access from
servlets.
One thing I noticed was the fact that the servlets gain access to the
StandardContext through the ApplicationContextFacade, which seems
to act as a proxy for the ApplicationContext, rather than allowing servlets
to have direct access to the ApplicationContext.

I was wondering why the ApplicationContextFacade is passed to the servlet
rather then the ApplicationContext.
I suspect this has something to do with security (as the facade is hardly a
simplification of the interface).
I looked at the code and saw that it basically forwards requests (as
expected), but conditioned on some security settings (such as
Globals.IS_SECURITY_ENABLED and SecurityUtil.isPackageProtectionEnabled())
it seems to use java reflection to pass the request.
I know that the permissions change when using reflection, but I'm not
entirely sure how this would enforce some security policy in the
ApplicationContextFacade?

It would be great if somebody could clarify this for me

Thank you in advance for your help.

Tom Lauwers


DO NOT REPLY [Bug 52815] New: ROOT Service

2012-03-02 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52815

 Bug #: 52815
   Summary: ROOT Service
   Product: Tomcat 7
   Version: 7.0.26
  Platform: PC
OS/Version: Windows Vista
Status: NEW
  Severity: normal
  Priority: P2
 Component: Servlet  JSP API
AssignedTo: dev@tomcat.apache.org
ReportedBy: mbi...@voila.fr
Classification: Unclassified


Bug
http://localhost:8080/
AUTH:
host-manager/html/start?name=%24angosso_net+++207.46.222.30org.apache.catalina.filters.CSRF_NONCE=C4B42043B026BA78CB88E77AAA383102

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



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

2012-03-02 Thread Bill Barker
To whom it may engage...

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

Project tomcat-tc7.0.x-validate has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-validate :  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-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 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 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.6-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-03032012.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.1.1-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-03032012.jar:/srv/gump/public/workspace/junit/dist/junit-03032012.jar:/srv/gump
 
/public/workspace/junit/dist/junit-dep-03032012.jar:/srv/gump/public/workspace/google-guava/build/dist/guava-03032012/guava-03032012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-03032012.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-03032012.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/jdom/build/jdom.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-03032012.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-03032012-dep.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
-
Buildfile: /srv/gump/public/workspace/tomcat-7.0.x/build.xml

download-validate:

proxyflags:

setproxy:

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

downloadzip:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-7.0.x/output/res/checkstyle
[checkstyle] Running Checkstyle 5.6-SNAPSHOT on 2203 files
[checkstyle] 
/srv/gump/public/workspace/tomcat-7.0.x/java/org/apache/coyote/http11/Http11NioProtocol.java:19:8:
 Unused import - java.nio.channels.SelectionKey.
[checkstyle] 
/srv/gump/public/workspace/tomcat-7.0.x/java/org/apache/coyote/http11/Http11NioProtocol.java:30:8:
 Unused import - org.apache.tomcat.util.net.NioEndpoint.KeyAttachment.

BUILD FAILED
/srv/gump/public/workspace/tomcat-7.0.x/build.xml:447: Got 2 errors and 0 
warnings.

Total time: 28 seconds
-

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

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

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

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

[GUMP@vmgump]: Project tomcat-taglibs-standard (in module tomcat-taglibs) failed

2012-03-02 Thread Gump
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-taglibs-standard has an issue affecting its community 
integration.
This issue affects 2 projects,
 and has been outstanding for 12 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-taglibs-standard :  Standard Taglib
- tomcat-taglibs-standard-install :  JSP Taglibs


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Optional dependency taglibs-standard-spec failed with reason build 
failed
 -INFO- Optional dependency httpunit prerequisite failed with reason build 
failed
 -DEBUG- (Apache Gump generated) Apache Maven Settings in: 
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml
 -INFO- Failed with reason build failed
 -DEBUG- Maven POM in: 
/srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml
 -INFO- Failed to extract fallback artifacts from Gump Repository



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/gump_work/build_tomcat-taglibs_tomcat-taglibs-standard.html
Work Name: build_tomcat-taglibs_tomcat-taglibs-standard (Type: Build)
Work ended in a state of : Failed
Elapsed: 1 sec
Command Line: /opt/maven2/bin/mvn --batch-mode -DskipTests=true --settings 
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml 
install 
[Working Directory: /srv/gump/public/workspace/tomcat-taglibs/standard]
M2_HOME: /opt/maven2
-
at 
org.apache.maven.cli.compat.CompatibleMain.main(CompatibleMain.java:60)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:616)
at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315)
at org.codehaus.classworlds.Launcher.launch(Launcher.java:255)
at org.codehaus.classworlds.Launcher.mainWithExitCode(Launcher.java:430)
at org.codehaus.classworlds.Launcher.main(Launcher.java:375)
Caused by: org.apache.maven.project.ProjectBuildingException: Cannot find 
parent: org.apache.taglibs:taglibs-parent for project: 
null:taglibs-standard:pom:1.2-SNAPSHOT for project 
null:taglibs-standard:pom:1.2-SNAPSHOT
at 
org.apache.maven.project.DefaultMavenProjectBuilder.assembleLineage(DefaultMavenProjectBuilder.java:1396)
at 
org.apache.maven.project.DefaultMavenProjectBuilder.buildInternal(DefaultMavenProjectBuilder.java:823)
at 
org.apache.maven.project.DefaultMavenProjectBuilder.buildFromSourceFileInternal(DefaultMavenProjectBuilder.java:508)
at 
org.apache.maven.project.DefaultMavenProjectBuilder.build(DefaultMavenProjectBuilder.java:200)
at org.apache.maven.DefaultMaven.getProject(DefaultMaven.java:604)
at org.apache.maven.DefaultMaven.collectProjects(DefaultMaven.java:487)
at org.apache.maven.DefaultMaven.getProjects(DefaultMaven.java:391)
... 12 more
Caused by: org.apache.maven.project.ProjectBuildingException: POM 
'org.apache.taglibs:taglibs-parent' not found in repository: Unable to download 
the artifact from any repository

  org.apache.taglibs:taglibs-parent:pom:1-SNAPSHOT

from the specified remote repositories:
  gump-central (http://localhost:8192/maven2)

 for project org.apache.taglibs:taglibs-parent
at 
org.apache.maven.project.DefaultMavenProjectBuilder.findModelFromRepository(DefaultMavenProjectBuilder.java:605)
at 
org.apache.maven.project.DefaultMavenProjectBuilder.assembleLineage(DefaultMavenProjectBuilder.java:1392)
... 18 more
Caused by: org.apache.maven.artifact.resolver.ArtifactNotFoundException: Unable 
to download the artifact from any repository

  org.apache.taglibs:taglibs-parent:pom:1-SNAPSHOT

from the specified remote repositories:
  gump-central (http://localhost:8192/maven2)


at 
org.apache.maven.artifact.resolver.DefaultArtifactResolver.resolve(DefaultArtifactResolver.java:228)
at 
org.apache.maven.artifact.resolver.DefaultArtifactResolver.resolve(DefaultArtifactResolver.java:90)
at 
org.apache.maven.project.DefaultMavenProjectBuilder.findModelFromRepository(DefaultMavenProjectBuilder.java:558)
... 19 more
Caused by: org.apache.maven.wagon.ResourceDoesNotExistException: Unable to 
download the artifact from any repository