DO NOT REPLY [Bug 41697] make visible in debug output if charset from browser ignored

2012-01-08 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=41697

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|VERIFIED|CLOSED

--- Comment #5 from Mark Thomas ma...@apache.org 2012-01-08 12:55:56 UTC ---
Marked as closed rather than verified since verified indicates an open,
confirmed bug. This will remove this issue from the weekly bug reports.

-- 
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-01-08 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181

--- Comment #23 from Mark Thomas ma...@apache.org 2012-01-08 13:03:42 UTC ---
(In reply to comment #22)
 Is there any estimate when WebSockets support will be implemented?

No.

The preparatory work of aligning the connectors is pretty much complete which
will make implementation easier. There is some ongoing discussion in Servlet
3.1 EG on how Servlet 3.1 and Web Sockets will work together.

I have some rough ideas implemented that I really should get around to sharing.
Nag me (on the dev list) in a couple of weeks if I haven't done anything.

 As far as API, I would not mind if it is somewhat similar to the Comet
 functionality. In fact it would be nice if the same Servlet instance could
 handle both WebSocket and Comet requests.

As long as it doesn't create additional complexities, that should be possible.

 So it may looks something like:

Thanks for the API suggestion. It is good to see someone finally responding my
request from September. Further input from other potential users welcome. Jetty
have offered to work on a joint API - there is clearly some benefit in that.

 One longstanding limitation to the Tomcat Comet API is the ability to specify
 maximum send queue size threshold to disconnect slow consumers when send
 backlog crosses a limit. I have requested this in the past with no luck. This
 is is absolutely critical for the production application. We had situations
 when a slow consumer would block IO thread dedicated to multiple clients
 eventually causing Tomcat run out of memory.

That is really a separate issue. The best way to approach that is to create an
enhancement request in Bugziila. Enhancement requests with test cases and
patches tend to get looked at faster.

-- 
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: r1228908 - in /tomcat/trunk/java/org/apache/tomcat/util/buf: Ascii.java B2CConverter.java ByteChunk.java C2BConverter.java CharChunk.java HexUtils.java MessageBytes.java UDecoder.java UEnc

2012-01-08 Thread markt 
Author: markt
Date: Sun Jan  8 18:42:10 2012
New Revision: 1228908

URL: http://svn.apache.org/viewvc?rev=1228908view=rev
Log:
Mark unused code as deprecated
Based on the UCDector report

Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java
tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/HexUtils.java
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java?rev=1228908r1=1228907r2=1228908view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java Sun Jan  8 18:42:10 
2012
@@ -75,8 +75,9 @@ public final class Ascii {
 
 /**
  * Returns the upper case equivalent of the specified ASCII character.
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
  */
-
+@Deprecated
 public static int toUpper(int c) {
 return toUpper[c  0xff]  0xff;
 }
@@ -91,32 +92,36 @@ public final class Ascii {
 
 /**
  * Returns true if the specified ASCII character is upper or lower case.
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
  */
-
+@Deprecated
 public static boolean isAlpha(int c) {
 return isAlpha[c  0xff];
 }
 
 /**
  * Returns true if the specified ASCII character is upper case.
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
  */
-
+@Deprecated
 public static boolean isUpper(int c) {
 return isUpper[c  0xff];
 }
 
 /**
  * Returns true if the specified ASCII character is lower case.
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
  */
-
+@Deprecated
 public static boolean isLower(int c) {
 return isLower[c  0xff];
 }
 
 /**
  * Returns true if the specified ASCII character is white space.
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
  */
-
+@Deprecated
 public static boolean isWhite(int c) {
 return isWhite[c  0xff];
 }
@@ -214,6 +219,10 @@ public final class Ascii {
 return n;
 }
 
+/**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+@Deprecated
 public static long parseLong(char[] b, int off, int len)
 throws NumberFormatException
 {

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=1228908r1=1228907r2=1228908view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Sun Jan  8 
18:42:10 2012
@@ -81,6 +81,10 @@ public class B2CConverter {
 private ReadConvertor conv;
 private String encoding;
 
+/**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+@Deprecated
 protected B2CConverter() {
 }
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1228908r1=1228907r2=1228908view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Sun Jan  8 
18:42:10 2012
@@ -141,7 +141,10 @@ public final class ByteChunk implements 
 allocate( initial, -1 );
 }
 
-//
+/**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+@Deprecated
 public ByteChunk getClone() {
 try {
 return (ByteChunk)this.clone();
@@ -195,6 +198,10 @@ public final class ByteChunk implements 
 isSet=true;
 }
 
+/**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+@Deprecated
 public void setOptimizedWrite(boolean optimizedWrite) {
 this.optimizedWrite = optimizedWrite;
 }
@@ -295,7 +302,9 @@ public final class ByteChunk implements 
  *
  * @param c
  * @throws IOException
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
  */
+@Deprecated
 public void append( char c )
 throws

svn commit: r1228909 - in /tomcat/trunk: java/org/apache/tomcat/util/buf/ test/org/apache/tomcat/util/buf/

2012-01-08 Thread markt 
Author: markt
Date: Sun Jan  8 18:43:32 2012
New Revision: 1228909

URL: http://svn.apache.org/viewvc?rev=1228909view=rev
Log:
Removed deprecated and unused code

Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/HexUtils.java
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java?rev=1228909r1=1228908r2=1228909view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java Sun Jan  8 18:43:32 
2012
@@ -26,18 +26,11 @@ public final class Ascii {
 /*
  * Character translation tables.
  */
-
-private static final byte[] toUpper = new byte[256];
 private static final byte[] toLower = new byte[256];
 
 /*
  * Character type tables.
  */
-
-private static final boolean[] isAlpha = new boolean[256];
-private static final boolean[] isUpper = new boolean[256];
-private static final boolean[] isLower = new boolean[256];
-private static final boolean[] isWhite = new boolean[256];
 private static final boolean[] isDigit = new boolean[256];
 
 /*
@@ -46,43 +39,21 @@ public final class Ascii {
 
 static {
 for (int i = 0; i  256; i++) {
-toUpper[i] = (byte)i;
 toLower[i] = (byte)i;
 }
 
 for (int lc = 'a'; lc = 'z'; lc++) {
 int uc = lc + 'A' - 'a';
 
-toUpper[lc] = (byte)uc;
 toLower[uc] = (byte)lc;
-isAlpha[lc] = true;
-isAlpha[uc] = true;
-isLower[lc] = true;
-isUpper[uc] = true;
 }
 
-isWhite[ ' '] = true;
-isWhite['\t'] = true;
-isWhite['\r'] = true;
-isWhite['\n'] = true;
-isWhite['\f'] = true;
-isWhite['\b'] = true;
-
 for (int d = '0'; d = '9'; d++) {
 isDigit[d] = true;
 }
 }
 
 /**
- * Returns the upper case equivalent of the specified ASCII character.
- * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
- */
-@Deprecated
-public static int toUpper(int c) {
-return toUpper[c  0xff]  0xff;
-}
-
-/**
  * Returns the lower case equivalent of the specified ASCII character.
  */
 
@@ -91,42 +62,6 @@ public final class Ascii {
 }
 
 /**
- * Returns true if the specified ASCII character is upper or lower case.
- * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
- */
-@Deprecated
-public static boolean isAlpha(int c) {
-return isAlpha[c  0xff];
-}
-
-/**
- * Returns true if the specified ASCII character is upper case.
- * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
- */
-@Deprecated
-public static boolean isUpper(int c) {
-return isUpper[c  0xff];
-}
-
-/**
- * Returns true if the specified ASCII character is lower case.
- * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
- */
-@Deprecated
-public static boolean isLower(int c) {
-return isLower[c  0xff];
-}
-
-/**
- * Returns true if the specified ASCII character is white space.
- * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
- */
-@Deprecated
-public static boolean isWhite(int c) {
-return isWhite[c  0xff];
-}
-
-/**
  * Returns true if the specified ASCII character is a digit.
  */
 
@@ -218,38 +153,4 @@ public final class Ascii {
 
 return n;
 }
-
-/**
- * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
- */
-@Deprecated
-public static long parseLong(char[] b, int off, int len)
-throws NumberFormatException
-{
-int c;
-
-if (b == null || len = 0 || !isDigit(c = b[off++])) {
-throw new NumberFormatException();
-}
-
-long n = c - '0';
-long m;
-
-while (--len  0) {
-if (!isDigit(c = b[off++])) {
-throw new NumberFormatException();
-}
-m = n * 10 + c - '0';
-
-if (m  n) {
-// Overflow
-throw new NumberFormatException();
-} else {
-n = m;
-}
-}
-
-return n;
-}
-
 }

Modified:

svn commit: r1228910 - in /tomcat/trunk/java/org/apache/tomcat/util/buf: B2CConverter.java StringCache.java

2012-01-08 Thread markt 
Author: markt
Date: Sun Jan  8 18:44:21 2012
New Revision: 1228910

URL: http://svn.apache.org/viewvc?rev=1228910view=rev
Log:
Add final where necessary.
Remove some unused code.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=1228910r1=1228909r2=1228910view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Sun Jan  8 
18:44:21 2012
@@ -79,14 +79,7 @@ public class B2CConverter {
 
 private IntermediateInputStream iis;
 private ReadConvertor conv;
-private String encoding;
-
-/**
- * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
- */
-@Deprecated
-protected B2CConverter() {
-}
+private final String encoding;
 
 /** Create a converter, with bytes going to a byte buffer
  */
@@ -106,7 +99,7 @@ public class B2CConverter {
 }
 
 static final int BUFFER_SIZE=8192;
-char result[]=new char[BUFFER_SIZE];
+final char result[]=new char[BUFFER_SIZE];
 
 /**
  * Convert a buffer of bytes into a chars.

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java?rev=1228910r1=1228909r2=1228910view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java Sun Jan  8 
18:44:21 2012
@@ -56,14 +56,15 @@ public class StringCache {
 tomcat.util.buf.StringCache.cacheSize, 200));
 
 
-protected static int maxStringSize = Integer.parseInt(System.getProperty(
-tomcat.util.buf.StringCache.maxStringSize, 128));
+protected static final int maxStringSize =
+Integer.parseInt(System.getProperty(
+tomcat.util.buf.StringCache.maxStringSize, 128));
 
 
/**
  * Statistics hash map for byte chunk.
  */
-protected static HashMapByteEntry,int[] bcStats =
+protected static final HashMapByteEntry,int[] bcStats =
 new HashMapByteEntry,int[](cacheSize);
 
 
@@ -82,7 +83,7 @@ public class StringCache {
 /**
  * Statistics hash map for char chunk.
  */
-protected static HashMapCharEntry,int[] ccStats =
+protected static final HashMapCharEntry,int[] ccStats =
 new HashMapCharEntry,int[](cacheSize);
 
 



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

svn commit: r1228918 - /tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java

2012-01-08 Thread kkolinko 
Author: kkolinko
Date: Sun Jan  8 19:02:55 2012
New Revision: 1228918

URL: http://svn.apache.org/viewvc?rev=1228918view=rev
Log:
Change TestCometProcessor#testCometConnectorStop() to test whether END event 
was processed by servlet
and write other information as a log message.
The old test was not 100% reliable and fails for me with APR. It needs more 
investigation.

Modified:
tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java

Modified: tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java?rev=1228918r1=1228917r2=1228918view=diff
==
--- tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java Sun Jan 
 8 19:02:55 2012
@@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletRes
 import javax.servlet.http.HttpSession;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -52,6 +51,7 @@ public class TestCometProcessor extends 
 public void testAsyncClose() throws Exception {
 
 if (!isCometSupported()) {
+log.info(This test is skipped, because this connector does not 
support Comet.);
 return;
 }
 
@@ -138,6 +138,7 @@ public class TestCometProcessor extends 
 
 private void doSimpleCometTest(String initParam) throws Exception {
 if (!isCometSupported()) {
+log.info(This test is skipped, because this connector does not 
support Comet.);
 return;
 }
 
@@ -233,13 +234,15 @@ public class TestCometProcessor extends 
 public void testCometConnectorStop() throws Exception {
 
 if (!isCometSupported()) {
+log.info(This test is skipped, because this connector does not 
support Comet.);
 return;
 }
 
 // Setup Tomcat instance
+SimpleCometServlet servlet = new SimpleCometServlet();
 Tomcat tomcat = getTomcatInstance();
 Context root = tomcat.addContext(, TEMP_DIR);
-Tomcat.addServlet(root, comet, new SimpleCometServlet());
+Tomcat.addServlet(root, comet, servlet);
 root.addServletMapping(/, comet);
 tomcat.start();
 
@@ -267,15 +270,16 @@ public class TestCometProcessor extends 
 
 tomcat.getConnector().stop();
 
-// Wait for the write thread to stop
 int count = 0;
-while (writeThread.isAlive()  count  50) {
+// Wait for the read thread to stop
+while (readThread.isAlive()  count  50) {
 Thread.sleep(100);
 count ++;
 }
 
-// Wait for the read thread to stop
-while (readThread.isAlive()  count  50) {
+// Wait for the write thread to stop
+count = 0;
+while (writeThread.isAlive()  count  50) {
 Thread.sleep(100);
 count ++;
 }
@@ -283,15 +287,43 @@ public class TestCometProcessor extends 
 // Destroy the connector once the executor has sent the end event
 tomcat.getConnector().destroy();
 
-// Write should trigger an exception once the connector stops since the
-// socket should be closed
-assertNotNull(No exception in writing thread,
-writeThread.getException());
-
-// Termination of Read thread varies by platform and protocol
-// In all cases, the END event should be sent.
+String[] response = readThread.getResponse().split(\r\n);
+String lastMessage = ;
+String lastResponseLine = ;
+for (int i = response.length; --i = 0;) {
+lastMessage = response[i];
+if (lastMessage.startsWith(Client:)) {
+break;
+}
+}
+for (int i = response.length; --i = 0;) {
+lastResponseLine = response[i];
+if (lastResponseLine.length()  0) {
+break;
+}
+}
+StringBuilder status = new StringBuilder();
+// Expected, but is not 100% reliable:
+// WriteThread exception: java.net.SocketException
+// ReaderThread exception: null
+// Last message: [Client: END]
+// Last response line: [0] (empty chunk)
+// Last comet event: [END]
+status.append(Status:);
+status.append(\nWriterThread exception:  + 
writeThread.getException());
+status.append(\nReaderThread exception:  + 
readThread.getException());
+status.append(\nLast message: [ + lastMessage + ]);
+status.append(\nLast response line: [ + lastResponseLine + ]);
+status.append(\nLast comet event: [ + servlet.getLastEvent() + ]);
+if (writeThread.getException() == null
+||

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

2012-01-08 Thread kkolinko 
Author: kkolinko
Date: Sun Jan  8 19:04:55 2012
New Revision: 1228920

URL: http://svn.apache.org/viewvc?rev=1228920view=rev
Log:
Re-enable TestCometProcessor test.
It reverts r1225632

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=1228920r1=1228919r2=1228920view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Sun Jan  8 19:04:55 2012
@@ -36,9 +36,6 @@ version.suffix=-dev
 execute.validate=false
 execute.test.bio=true
 execute.test.nio=true
-# Comet tests fail regularly during shutdown. Disable for now as the frequent
-# failures make it harder to spot other test failures in the CI builds
-execute.test.comet=false
 # Still requires APR/native library to be present
 execute.test.apr=true
 # Stop testing if a failure occurs

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1228920r1=1228919r2=1228920view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sun Jan  8 19:04:55 2012
@@ -1138,8 +1138,6 @@
 exclude name=**/Tester*.java /
 !-- Exclude the tests known to fail --
 exclude name=org/apache/catalina/tribes/test/** /
-exclude name=org/apache/catalina/comet/TestCometProcessor.java
- unless=${execute.test.comet}/
   /fileset
 /batchtest
   /junit



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

svn commit: r1228922 - in /tomcat/trunk/java/org/apache/tomcat/util/buf: Ascii.java ByteChunk.java C2BConverter.java MessageBytes.java

2012-01-08 Thread markt 
Author: markt
Date: Sun Jan  8 19:12:14 2012
New Revision: 1228922

URL: http://svn.apache.org/viewvc?rev=1228922view=rev
Log:
Deprecate unused code

Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java?rev=1228922r1=1228921r2=1228922view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java Sun Jan  8 19:12:14 
2012
@@ -75,7 +75,9 @@ public final class Ascii {
  * @param off the start offset of the bytes
  * @param len the length of the bytes
  * @exception NumberFormatException if the integer format was invalid
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
  */
+@Deprecated
 public static int parseInt(byte[] b, int off, int len)
 throws NumberFormatException
 {
@@ -97,6 +99,10 @@ public final class Ascii {
 return n;
 }
 
+/**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+@Deprecated
 public static int parseInt(char[] b, int off, int len)
 throws NumberFormatException
 {

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1228922r1=1228921r2=1228922view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Sun Jan  8 
19:12:14 2012
@@ -492,6 +492,10 @@ public final class ByteChunk implements 
 return new String(cb.array(), cb.arrayOffset(), cb.length());
 }
 
+/**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+@Deprecated
 public int getInt()
 {
 return Ascii.parseInt(buff, start,end-start);
@@ -600,7 +604,9 @@ public final class ByteChunk implements 
 /**
  * Returns true if the message bytes starts with the specified string.
  * @param s the string
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
  */
+@Deprecated
 public boolean startsWith(String s) {
 // Works only if enc==UTF
 byte[] b = buff;

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java?rev=1228922r1=1228921r2=1228922view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java Sun Jan  8 
19:12:14 2012
@@ -200,6 +200,10 @@ final class IntermediateOutputStream ext
 
 //  Internal methods 
 
+/**
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
+ */
+@Deprecated
 void setByteChunk( ByteChunk bb ) {
 tbuff=bb;
 }

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java?rev=1228922r1=1228921r2=1228922view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java Sun Jan  8 
19:12:14 2012
@@ -426,7 +426,9 @@ public final class MessageBytes implemen
  * Returns true if the message bytes starts with the specified string.
  * @param c the character
  * @param starting The start position
+ * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
  */
+@Deprecated
 public int indexOf(char c, int starting) {
 switch (type) {
 case T_STR:



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

svn commit: r1228924 - in /tomcat/trunk/java/org/apache/tomcat/util/buf: Ascii.java ByteChunk.java C2BConverter.java CharChunk.java MessageBytes.java

2012-01-08 Thread markt 
Author: markt
Date: Sun Jan  8 19:15:52 2012
New Revision: 1228924

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

Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java?rev=1228924r1=1228923r2=1228924view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java Sun Jan  8 19:15:52 
2012
@@ -70,61 +70,6 @@ public final class Ascii {
 }
 
 /**
- * Parses an unsigned integer from the specified subarray of bytes.
- * @param b the bytes to parse
- * @param off the start offset of the bytes
- * @param len the length of the bytes
- * @exception NumberFormatException if the integer format was invalid
- * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
- */
-@Deprecated
-public static int parseInt(byte[] b, int off, int len)
-throws NumberFormatException
-{
-int c;
-
-if (b == null || len = 0 || !isDigit(c = b[off++])) {
-throw new NumberFormatException();
-}
-
-int n = c - '0';
-
-while (--len  0) {
-if (!isDigit(c = b[off++])) {
-throw new NumberFormatException();
-}
-n = n * 10 + c - '0';
-}
-
-return n;
-}
-
-/**
- * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
- */
-@Deprecated
-public static int parseInt(char[] b, int off, int len)
-throws NumberFormatException
-{
-int c;
-
-if (b == null || len = 0 || !isDigit(c = b[off++])) {
-throw new NumberFormatException();
-}
-
-int n = c - '0';
-
-while (--len  0) {
-if (!isDigit(c = b[off++])) {
-throw new NumberFormatException();
-}
-n = n * 10 + c - '0';
-}
-
-return n;
-}
-
-/**
  * Parses an unsigned long from the specified subarray of bytes.
  * @param b the bytes to parse
  * @param off the start offset of the bytes

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1228924r1=1228923r2=1228924view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Sun Jan  8 
19:15:52 2012
@@ -492,15 +492,6 @@ public final class ByteChunk implements 
 return new String(cb.array(), cb.arrayOffset(), cb.length());
 }
 
-/**
- * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
- */
-@Deprecated
-public int getInt()
-{
-return Ascii.parseInt(buff, start,end-start);
-}
-
 public long getLong() {
 return Ascii.parseLong(buff, start,end-start);
 }
@@ -604,28 +595,6 @@ public final class ByteChunk implements 
 /**
  * Returns true if the message bytes starts with the specified string.
  * @param s the string
- * @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
- */
-@Deprecated
-public boolean startsWith(String s) {
-// Works only if enc==UTF
-byte[] b = buff;
-int blen = s.length();
-if (b == null || blen  end-start) {
-return false;
-}
-int boff = start;
-for (int i = 0; i  blen; i++) {
-if (b[boff++] != s.charAt(i)) {
-return false;
-}
-}
-return true;
-}
-
-/**
- * Returns true if the message bytes starts with the specified string.
- * @param s the string
  * @param pos The position
  */
 public boolean startsWithIgnoreCase(String s, int pos) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java?rev=1228924r1=1228923r2=1228924view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java Sun Jan  8 
19:15:52 2012
@@ -200,14 +200,6 @@ final class IntermediateOutputStream ext
 
 //  Internal methods 
 
-/**
- *

svn commit: r1228925 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/buf/

2012-01-08 Thread markt 
Author: markt
Date: Sun Jan  8 19:21:21 2012
New Revision: 1228925

URL: http://svn.apache.org/viewvc?rev=1228925view=rev
Log:
Mark unused code as deprecated. It has been removed for 8.0.x onwards.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/Ascii.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/HexUtils.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan  8 19:21:21 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

svn commit: r1228926 - in /tomcat/trunk/java/org/apache/tomcat/util/buf: C2BConverter.java MessageBytes.java

2012-01-08 Thread markt 
Author: markt
Date: Sun Jan  8 19:22:05 2012
New Revision: 1228926

URL: http://svn.apache.org/viewvc?rev=1228926view=rev
Log:
Use final

Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java?rev=1228926r1=1228925r2=1228926view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java Sun Jan  8 
19:22:05 2012
@@ -32,7 +32,7 @@ public final class C2BConverter {
 
 private final IntermediateOutputStream ios;
 private final WriteConvertor conv;
-private ByteChunk bb;
+private final ByteChunk bb;
 
 /** Create a converter, with bytes going to a byte buffer
  */
@@ -166,7 +166,7 @@ public final class C2BConverter {
 not be called if recycling the converter and if data was not flushed.
 */
 final class IntermediateOutputStream extends OutputStream {
-private ByteChunk tbuff;
+private final ByteChunk tbuff;
 private boolean enabled=true;
 
 public IntermediateOutputStream(ByteChunk tbuff) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java?rev=1228926r1=1228925r2=1228926view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java Sun Jan  8 
19:22:05 2012
@@ -518,7 +518,7 @@ public final class MessageBytes implemen
 
 //  Future may be different 
 
-private static MessageBytesFactory factory=new MessageBytesFactory();
+private static final MessageBytesFactory factory=new MessageBytesFactory();
 
 public static class MessageBytesFactory {
 protected MessageBytesFactory() {



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

svn commit: r1228929 - in /tomcat/trunk: java/org/apache/catalina/connector/Connector.java test/org/apache/catalina/mbeans/TestRegistration.java

2012-01-08 Thread kkolinko 
Author: kkolinko
Date: Sun Jan  8 19:33:57 2012
New Revision: 1228929

URL: http://svn.apache.org/viewvc?rev=1228929view=rev
Log:
Followup to Mark's r1228724
The ObjectName.quote() must always be called with address, because ip6 
addresses have characters that are must be quoted in QName. The Connector.java 
changes in r1228724 bypassed that call.
Update TestRegistration.java accordingly.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1228929r1=1228928r2=1228929view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Sun Jan  8 
19:33:57 2012
@@ -882,15 +882,15 @@ public class Connector extends Lifecycle
 sb.append(auto-);
 sb.append(getProperty(nameIndex));
 }
+String address = ;
 if (addressObj instanceof InetAddress) {
+address = ((InetAddress) addressObj).getHostAddress();
+} else if (addressObj != null) {
+address = addressObj.toString();
+}
+if (address.length()  0) {
 sb.append(,address=);
-sb.append(((InetAddress) addressObj).getHostAddress());
-} else if(addressObj != null) {
-String address = addressObj.toString();
-if (address.length()  0) {
-sb.append(,address=);
-sb.append(ObjectName.quote(address));
-}
+sb.append(ObjectName.quote(address));
 }
 return sb.toString();
 }

Modified: tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java?rev=1228929r1=1228928r2=1228929view=diff
==
--- tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java Sun Jan  
8 19:33:57 2012
@@ -110,14 +110,16 @@ public class TestRegistration extends To
 
 private static String[] connectorMBeanNames(String port, String type) {
 return new String[] {
-Tomcat:type=Connector,port= + port + ,address= + ADDRESS,
-Tomcat:type=GlobalRequestProcessor,name=\http- + type + - +
-ADDRESS + - + port + \,
-Tomcat:type=Mapper,port= + port + ,address= + ADDRESS,
-Tomcat:type=ProtocolHandler,port= + port + ,address=\ + ADDRESS +
-\,
-Tomcat:type=ThreadPool,name=\http- + type + - + ADDRESS + - +
-port + \,
+Tomcat:type=Connector,port= + port + ,address=
++ ObjectName.quote(ADDRESS),
+Tomcat:type=GlobalRequestProcessor,name=
++ ObjectName.quote(http- + type + - + ADDRESS + - + 
port),
+Tomcat:type=Mapper,port= + port + ,address=
++ ObjectName.quote(ADDRESS),
+Tomcat:type=ProtocolHandler,port= + port + ,address=
++ ObjectName.quote(ADDRESS),
+Tomcat:type=ThreadPool,name=
++ ObjectName.quote(http- + type + - + ADDRESS + - + 
port),
 };
 }
 



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

Re: svn commit: r1228929 - in /tomcat/trunk: java/org/apache/catalina/connector/Connector.java test/org/apache/catalina/mbeans/TestRegistration.java

2012-01-08 Thread Konstantin Kolinko 
2012/1/8  kkoli...@apache.org:
 Author: kkolinko
 Date: Sun Jan  8 19:33:57 2012
 New Revision: 1228929

 URL: http://svn.apache.org/viewvc?rev=1228929view=rev
 Log:
 Followup to Mark's r1228724
 The ObjectName.quote() must always be called with address, because ip6 
 addresses have characters that are must be quoted in QName. The 
 Connector.java changes in r1228724 bypassed that call.
 Update TestRegistration.java accordingly.

 Modified:
    tomcat/trunk/java/org/apache/catalina/connector/Connector.java
    tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java

 Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
 URL: 
 http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1228929r1=1228928r2=1228929view=diff
 ==
 --- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
 +++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Sun Jan  8 
 19:33:57 2012
 @@ -882,15 +882,15 @@ public class Connector extends Lifecycle
             sb.append(auto-);
             sb.append(getProperty(nameIndex));
         }
 +        String address = ;
         if (addressObj instanceof InetAddress) {
 +            address = ((InetAddress) addressObj).getHostAddress();
 +        } else if (addressObj != null) {
 +            address = addressObj.toString();
 +        }
 +        if (address.length()  0) {
             sb.append(,address=);
 -            sb.append(((InetAddress) addressObj).getHostAddress());
 -        } else if(addressObj != null) {
 -            String address = addressObj.toString();
 -            if (address.length()  0) {
 -                sb.append(,address=);
 -                sb.append(ObjectName.quote(address));
 -            }
 +            sb.append(ObjectName.quote(address));
         }
         return sb.toString();
     }

 Modified: tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
 URL: 
 http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java?rev=1228929r1=1228928r2=1228929view=diff
 ==
 --- tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java 
 (original)
 +++ tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java Sun 
 Jan  8 19:33:57 2012
 @@ -110,14 +110,16 @@ public class TestRegistration extends To

     private static String[] connectorMBeanNames(String port, String type) {
         return new String[] {
 -        Tomcat:type=Connector,port= + port + ,address= + ADDRESS,
 -        Tomcat:type=GlobalRequestProcessor,name=\http- + type + - +
 -                ADDRESS + - + port + \,
 -        Tomcat:type=Mapper,port= + port + ,address= + ADDRESS,
 -        Tomcat:type=ProtocolHandler,port= + port + ,address=\ + ADDRESS 
 +
 -                \,
 -        Tomcat:type=ThreadPool,name=\http- + type + - + ADDRESS + - +
 -                port + \,
 +        Tomcat:type=Connector,port= + port + ,address=
 +                + ObjectName.quote(ADDRESS),
 +        Tomcat:type=GlobalRequestProcessor,name=
 +                + ObjectName.quote(http- + type + - + ADDRESS + - + 
 port),
 +        Tomcat:type=Mapper,port= + port + ,address=
 +                + ObjectName.quote(ADDRESS),
 +        Tomcat:type=ProtocolHandler,port= + port + ,address=
 +                + ObjectName.quote(ADDRESS),
 +        Tomcat:type=ThreadPool,name=
 +                + ObjectName.quote(http- + type + - + ADDRESS + - + 
 port),
         };
     }


It would be nice if someone could test this on an ip6-only machine,
or make the localhost name from r1228724 configurable so that it
could be set to localhost6 or explicit ::1.

Both Gump and buildbot use 127.0.0.1 is the tests.

Best regards,
Konstantin Kolinko

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

DO NOT REPLY [Bug 52429] Wrong exports in tomcat-jdbc MANIFEST

2012-01-08 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=52429

Pid bugzi...@pidster.com changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE

--- Comment #1 from Pid bugzi...@pidster.com 2012-01-08 21:55:56 UTC ---


*** This bug has been marked as a duplicate of bug 52318 ***

-- 
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 52318] Version in tomcat-jdbc POM is conflicted with Version in MANIFEST for JULI JAR

2012-01-08 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=52318

--- Comment #3 from Pid bugzi...@pidster.com 2012-01-08 21:55:56 UTC ---
*** Bug 52429 has been marked as a duplicate of this bug. ***

-- 
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: r1228969 - /tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java

2012-01-08 Thread kkolinko 
Author: kkolinko
Date: Sun Jan  8 22:03:24 2012
New Revision: 1228969

URL: http://svn.apache.org/viewvc?rev=1228969view=rev
Log:
Update TestAsyncContextImpl:
Always add a host-level AccessLogValve, so that the test logic does not need to 
change when the tests are run with test.accesslog=true. The test is about 
error 500 for unhandled request. That access log entry is written into topmost 
AccessLogValve.

Modified:
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java

Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1228969r1=1228968r2=1228969view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Sun 
Jan  8 22:03:24 2012
@@ -431,6 +431,8 @@ public class TestAsyncContextImpl extend
 
 TesterAccessLogValve alv = new TesterAccessLogValve();
 ctx.getPipeline().addValve(alv);
+TesterAccessLogValve alvGlobal = new TesterAccessLogValve();
+tomcat.getHost().getPipeline().addValve(alvGlobal);
 
 tomcat.start();
 ByteChunk res = new ByteChunk();
@@ -464,11 +466,14 @@ public class TestAsyncContextImpl extend
 
 // Check the access log
 if (completeOnTimeout  dispatchUrl != null) {
-if (!isAccessLogEnabled()) {
-alv.validateAccessLog(1, 500, 0, TimeoutServlet.ASYNC_TIMEOUT +
-TIMEOUT_MARGIN + REQUEST_TIME);
-}
+// This error is written into Host-level AccessLogValve only
+alvGlobal.validateAccessLog(1, 500, 0, TimeoutServlet.ASYNC_TIMEOUT
++ TIMEOUT_MARGIN + REQUEST_TIME);
+alv.validateAccessLog(0, 500, 0, 0);
 } else {
+alvGlobal.validateAccessLog(1, 200, TimeoutServlet.ASYNC_TIMEOUT,
+TimeoutServlet.ASYNC_TIMEOUT + TIMEOUT_MARGIN +
+REQUEST_TIME);
 alv.validateAccessLog(1, 200, TimeoutServlet.ASYNC_TIMEOUT,
 TimeoutServlet.ASYNC_TIMEOUT + TIMEOUT_MARGIN +
 REQUEST_TIME);



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

Re: [VOTE] Release Tomcat 5.5.35 Build

2012-01-08 Thread Jim Jagielski 
Done
On Jan 7, 2012, at 5:54 PM, Rainer Jung wrote:

 The signature files for all bin tarballs are missing. Can you please add them?
 
 src and zip/exe are OK.
 
 Thanks!
 
 Rainer
 
 -
 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

svn commit: r1228979 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/comet/TestCometProcessor.java

2012-01-08 Thread kkolinko 
Author: kkolinko
Date: Sun Jan  8 22:19:49 2012
New Revision: 1228979

URL: http://svn.apache.org/viewvc?rev=1228979view=rev
Log:
Merged revision 1228918 from tomcat/trunk:
Change TestCometProcessor#testCometConnectorStop() to test whether END event 
was processed by servlet
and write other information as a Status: log message.
The old test was not 100% reliable and fails for me with APR. It needs more 
investigation.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan  8 22:19:49 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,1228922

svn commit: r1228980 - in /tomcat/tc7.0.x/trunk: ./ build.properties.default build.xml

2012-01-08 Thread kkolinko 
Author: kkolinko
Date: Sun Jan  8 22:21:39 2012
New Revision: 1228980

URL: http://svn.apache.org/viewvc?rev=1228980view=rev
Log:
Merged revision 1228920 from tomcat/trunk:
Re-enable TestCometProcessor test.
It reverts r1225632

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/build.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan  8 22:21:39 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,1228922

svn commit: r1228981 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/Connector.java test/org/apache/catalina/mbeans/TestRegistration.java

2012-01-08 Thread kkolinko 
Author: kkolinko
Date: Sun Jan  8 22:25:00 2012
New Revision: 1228981

URL: http://svn.apache.org/viewvc?rev=1228981view=rev
Log:
Merged revision 1228929 from tomcat/trunk:
Followup to Mark's r1228724
The ObjectName.quote() must always be called with address, because ip6 
addresses have characters that are must be quoted in QName. The Connector.java 
changes in r1228724 bypassed that call.
Update TestRegistration.java accordingly.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan  8 22:25:00 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

svn commit: r1228983 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/core/TestAsyncContextImpl.java

2012-01-08 Thread kkolinko 
Author: kkolinko
Date: Sun Jan  8 22:27:15 2012
New Revision: 1228983

URL: http://svn.apache.org/viewvc?rev=1228983view=rev
Log:
Merged revision 1228969 from tomcat/trunk:
Update TestAsyncContextImpl,
so that the test logic does not need to change when the tests are run with 
test.accesslog=true:
Always add a host-level AccessLogValve. The test is about error 500 for 
unhandled request. That access log entry is written into topmost AccessLogValve.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan  8 22:27:15 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

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

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

--- Comment #24 from gober...@msn.com 2012-01-08 22:38:44 UTC ---
I actually played with Jetty WebSocket API last Friday and was able to embed it
into Tomcat quite easily. The only issue is that it has to be on a separate
port.
As I mentioned before, it would be a good selling point if Tomcat could handle
WebSockets, Comet, and normal http requests from a single port.

As far as controlling client send queue, I have already requested it over a
year ago: https://issues.apache.org/bugzilla/show_bug.cgi?id=50495. It was
suggested that I propose a patch and the request was closed with will not fix
status. I was given some pointers on how it works, but did not think that
patching Tomcat source code is a good long term solution for us. I thought that
now will be a good time to address it for both WebSockets and Tomcat Comet
since the underlying plumbing is getting reworked anyway and may be shared. 
By the way, Grizzly framework actually does have the ability to limit client
send queue with a single API method call.
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

ant build failing: could not find file modules/jdbc-pool/doc/jdbc-pool.xml to copy

2012-01-08 Thread S Ahmed 
Hi,
Exciting to get the source working locally!

I'm on Mac osx lion.

1. I did a git clone from:https://github.com/apache/tomcat70
2. sudo ant
And I got:

compile-prepare:

BUILD FAILED
/Users/me/dev/sources/tomcat70/build.xml:493: Warning: Could not find file
/Users/me/dev/sources/tomcat70/modules/jdbc-pool/doc/jdbc-pool.xml to copy.

Total time: 1 second


I don't see the modules folder in the repo.


Also, does the tomcat source import smoothly into IntelliJ 9?  Are you guys
using IntelliJ or Eclipse?

Re: [GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed

2012-01-08 Thread Konstantin Kolinko 
 2012/1/7 Rainer Jung rainer.j...@kippdata.de:

 Maybe enable the accesslog during testing with test.accesslog=true, so one
 can check after the next failure whether the contents agree with your
 assumption. Not sure, whether Gump offers access to the access log for
 checking.

 +1, but needs some fixes in the tests that check their own access logs.

 IIRC they disable their own access logging and checks if that flag is
 set. That is because some time ago Tomcat allowed only single
 AccessLogValve per container.

 I implemented support for multiple AccessLogValves per container in
 TC7 several releases ago, so it should be possible to remove that
 logic from tests. It is somewhere on my TODO list.

 Maybe you'll get to it before I do :)


There was only one issue with access log in the tests and I fixed it
with r1228983.

I updated Gump configuration for tc7 and trunk enabling the access
log. We will see how it goes with next run.


Those Gump projects have report nested=output/build/logs /, so
access_log.-mm-dd files there should be available, like other
junit report files that are written in the same directory.

I do not plan to change build.properties.default  nor ask for a change
in Buildbot configuration.

Best regards,
Konstantin Kolinko

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

Re: ant build failing: could not find file modules/jdbc-pool/doc/jdbc-pool.xml to copy

2012-01-08 Thread Konstantin Kolinko 
2012/1/9 S Ahmed sahmed1...@gmail.com:
 Hi,
 Exciting to get the source working locally!

 I'm on Mac osx lion.

 1. I did a git clone from:https://github.com/apache/tomcat70
 2. sudo ant
 And I got:

 compile-prepare:

 BUILD FAILED
 /Users/me/dev/sources/tomcat70/build.xml:493: Warning: Could not find file
 /Users/me/dev/sources/tomcat70/modules/jdbc-pool/doc/jdbc-pool.xml to copy.

 Total time: 1 second

jdbc-pool sources belong to tomcat-trunk and are pulled into tc7.0.x
using an svn:externals property.

Unfortunately Git does not support svn:externals (AFAIK), so the
sources you are using are not complete, and little could be done with
that.

You can either:
a) use svn client to get the source
b) use tomcat trunk (the jdbc-pool sources should be present there).


 Also, does the tomcat source import smoothly into IntelliJ 9?  Are you guys
 using IntelliJ or Eclipse?

Most of us are using Eclipse IDE.

The building.html page in the docs has some useful instructions (for
Eclipse). There are also some useful files in res/ide-support

Best regards,
Konstantin Kolinko

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

Re: ant build failing: could not find file modules/jdbc-pool/doc/jdbc-pool.xml to copy

2012-01-08 Thread Konstantin Kolinko 
2012/1/9 S Ahmed sahmed1...@gmail.com:
 2. sudo ant

Just curious regarding the above command:  you do not need root rights
to build Tomcat!

Actually you should never be using root rights when building, testing
and using Tomcat.

(The only exception is running it with jsvc service wrapper).

http://xkcd.com/149/

Best regards,
Konstantin Kolinko

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

Re: ant build failing: could not find file modules/jdbc-pool/doc/jdbc-pool.xml to copy

2012-01-08 Thread S Ahmed 
Well the readme said it may fail on mac osx because it tries to write to
/usr/share/java to store the libraries etc.

When I ran ant, the build didn't work, running sudo allowed it continue
(but from now on running just ant w/o sudo is fine, I guess it was just
initially to write to that folder).

Anyhow, I'll try the svn then thanks.

On Sun, Jan 8, 2012 at 5:52 PM, Konstantin Kolinko
knst.koli...@gmail.comwrote:

 2012/1/9 S Ahmed sahmed1...@gmail.com:
  2. sudo ant

 Just curious regarding the above command:  you do not need root rights
 to build Tomcat!

 Actually you should never be using root rights when building, testing
 and using Tomcat.

 (The only exception is running it with jsvc service wrapper).

 http://xkcd.com/149/

 Best regards,
 Konstantin Kolinko

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

Re: ant build failing: could not find file modules/jdbc-pool/doc/jdbc-pool.xml to copy

2012-01-08 Thread S Ahmed 
svn worked fine.

Sorry about this, but I'm new to Eclipse kinda.

So I when to file, import, general | existing projects into workspace.

Now which is the root folder in the source?


On Sun, Jan 8, 2012 at 6:44 PM, S Ahmed sahmed1...@gmail.com wrote:

 Well the readme said it may fail on mac osx because it tries to write to
 /usr/share/java to store the libraries etc.

 When I ran ant, the build didn't work, running sudo allowed it continue
 (but from now on running just ant w/o sudo is fine, I guess it was just
 initially to write to that folder).

 Anyhow, I'll try the svn then thanks.


 On Sun, Jan 8, 2012 at 5:52 PM, Konstantin Kolinko knst.koli...@gmail.com
  wrote:

 2012/1/9 S Ahmed sahmed1...@gmail.com:
  2. sudo ant

 Just curious regarding the above command:  you do not need root rights
 to build Tomcat!

 Actually you should never be using root rights when building, testing
 and using Tomcat.

 (The only exception is running it with jsvc service wrapper).

 http://xkcd.com/149/

 Best regards,
 Konstantin Kolinko

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

Re: ant build failing: could not find file modules/jdbc-pool/doc/jdbc-pool.xml to copy

2012-01-08 Thread Konstantin Kolinko 
2012/1/9 S Ahmed sahmed1...@gmail.com:
 Well the readme said it may fail on mac osx because it tries to write to
 /usr/share/java to store the libraries etc.

Eh, which readme?
It is a bad idea to let them been written to /usr/share/java. That is
just a default value.

You should really reconfigure it to use some other place (as
documented in BUILDING.txt).

You should not run any random things with sudo, unless you
understand the consequences.


 When I ran ant, the build didn't work, running sudo allowed it continue
 (but from now on running just ant w/o sudo is fine, I guess it was just
 initially to write to that folder).

 Anyhow, I'll try the svn then thanks.

 On Sun, Jan 8, 2012 at 5:52 PM, Konstantin Kolinko
 knst.koli...@gmail.comwrote:

 2012/1/9 S Ahmed sahmed1...@gmail.com:
  2. sudo ant

 Just curious regarding the above command:  you do not need root rights
 to build Tomcat!

 Actually you should never be using root rights when building, testing
 and using Tomcat.

 (The only exception is running it with jsvc service wrapper).

 http://xkcd.com/149/

Best regards,
Konstantin Kolinko

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

svn commit: r1229027 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/http/LocalStrings.properties java/org/apache/tomcat/util/http/Parameters.java webapps/docs/changelog.xml

2012-01-08 Thread kkolinko 
Author: kkolinko
Date: Mon Jan  9 04:50:17 2012
New Revision: 1229027

URL: http://svn.apache.org/viewvc?rev=1229027view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52384
Do not fail in Parameter parsing when debug logging is enabled.
Also do not flag extra '' in parameters as errors.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1229027r1=1229026r2=1229027view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan  9 04:50:17 2012
@@ -90,13 +90,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, rjung
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52384
-  Do not fail in Parameter parsing when debug logging is enabled.
-  Also do not flag extra '' as errors.
-  http://svn.apache.org/viewvc?rev=1224659view=rev
-  +1: kkolinko, rjung, markt
-  -1:
-
 * Reduce log level for the message about hitting maxParameterCount limit
   from WARN to INFO.
   in java/org/apache/tomcat/util/http/Parameters.java line 242:

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties?rev=1229027r1=1229026r2=1229027view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties 
Mon Jan  9 04:50:17 2012
@@ -17,6 +17,7 @@ parameters.bytes=Start processing with i
 parameters.copyFail=Failed to create copy of original parameter values for 
debug logging purposes
 parameters.decodeFail.debug=Character decoding failed. Parameter [{0}] with 
value [{1}] has been ignored.
 parameters.decodeFail.info=Character decoding failed. Parameter [{0}] with 
value [{1}] has been ignored. Note that the name and value quoted here may be 
corrupted due to the failed decoding. Use debug level logging to see the 
original, non-corrupted values.
+parameters.emptyChunk=Empty parameter chunk ignored
 parameters.invalidChunk=Invalid chunk starting at byte [{0}] and ending at 
byte [{1}] with a value of [{2}] ignored
 parameters.maxCountFail=More than the maximum number of request parameters 
(GET plus POST) for a single request ([{0}]) were detected. Any parameters 
beyond this limit have been ignored. To change this limit, set the 
maxParameterCount attribute on the Connector.
 parameters.multipleDecodingFail=Character decoding failed. A total of [{0}] 
failures were detected but only the first was logged. Enable debug level 
logging for this logger to log all failures.

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1229027r1=1229026r2=1229027view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java Mon 
Jan  9 04:50:17 2012
@@ -314,6 +314,15 @@ public final class Parameters {
 }
 
 if (nameEnd = nameStart ) {
+if (valueStart == -1) {
+// 
+if (log.isDebugEnabled()) {
+log.debug(sm.getString(parameters.emptyChunk));
+}
+// Do not flag as error
+continue;
+}
+// =foo
 if (log.isInfoEnabled()) {
 if (valueEnd = nameStart  log.isDebugEnabled()) {
 String extract = null;
@@ -341,7 +350,11 @@ public final class Parameters {
 }
 
 tmpName.setBytes(bytes, nameStart, nameEnd - nameStart);
-tmpValue.setBytes(bytes, valueStart, valueEnd - valueStart);
+if (valueStart = 0) {
+tmpValue.setBytes(bytes, valueStart, valueEnd - valueStart);
+} else {
+tmpValue.setBytes(bytes, 0, 0);
+}
 
 // Take copies as if anything goes wrong originals will be
 // corrupted. This means original values can be logged.
@@ -349,7 +362,11 @@ public final class Parameters {
 if (log.isDebugEnabled()) {
 try {
 origName.append(bytes, nameStart, nameEnd - nameStart);
-

DO NOT REPLY [Bug 52384] URL parameter without value should be parsed successfully when logging level = DEBUG

2012-01-08 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=52384

Konstantin Kolinko knst.koli...@gmail.com changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #3 from Konstantin Kolinko knst.koli...@gmail.com 2012-01-09 
04:54:29 UTC ---
Fixed in 6.0 with r1229027 and will be in 6.0.36.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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