svn commit: r1651043 - in /tomcat/trunk: java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/upgrade/ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/websocket/server/ test/org/apache/ca

[markt]

Author: markt
Date: Mon Jan 12 08:59:42 2015
New Revision: 1651043

URL: http://svn.apache.org/r1651043
Log:
A further round of refactoring of writes. Primary change is the
use of socketWriteBuffer by default for all writes

Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1651043r1=1651042r2=1651043view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Mon Jan 12 
08:59:42 2015
@@ -737,6 +737,7 @@ public class AjpProcessorS extends Abs
 cping = true;
 try {
 socketWrapper.write(true, pongMessageArray, 0, 
pongMessageArray.length);
+socketWrapper.flush(true);
 } catch (IOException e) {
 setErrorState(ErrorState.CLOSE_NOW, e);
 }
@@ -1035,6 +1036,7 @@ public class AjpProcessorS extends Abs
 // Request more data immediately
 if (!waitingForBodyMessage) {
 socketWrapper.write(true, getBodyMessageArray, 0, 
getBodyMessageArray.length);
+socketWrapper.flush(true);
 waitingForBodyMessage = true;
 }
 
@@ -1442,6 +1444,7 @@ public class AjpProcessorS extends Abs
 // Write to buffer
 responseMessage.end();
 socketWrapper.write(true, responseMessage.getBuffer(), 0, 
responseMessage.getLen());
+socketWrapper.flush(true);
 }
 
 
@@ -1455,6 +1458,7 @@ public class AjpProcessorS extends Abs
 if (explicit  !finished) {
 // Send the flush message
 socketWrapper.write(true, flushMessageArray, 0, 
flushMessageArray.length);
+socketWrapper.flush(true);
 }
 }
 
@@ -1490,6 +1494,7 @@ public class AjpProcessorS extends Abs
 } else {
 socketWrapper.write(true, endMessageArray, 0, 
endMessageArray.length);
 }
+socketWrapper.flush(true);
 }
 
 
@@ -1556,6 +1561,7 @@ public class AjpProcessorS extends Abs
 responseMessage.appendBytes(chunk.getBytes(), chunk.getOffset() + 
off, thisTime);
 responseMessage.end();
 socketWrapper.write(blocking, responseMessage.getBuffer(), 0, 
responseMessage.getLen());
+socketWrapper.flush(blocking);
 
 len -= thisTime;
 off += thisTime;

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java?rev=1651043r1=1651042r2=1651043view=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
 (original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
 Mon Jan 12 08:59:42 2015
@@ -123,6 +123,12 @@ public class UpgradeServletOutputStream
 
 
 @Override
+public void flush() throws IOException {
+socketWrapper.flush(listener == null);
+}
+
+
+@Override
 public void close() throws IOException {
 closeRequired = true;
 socketWrapper.close();
@@ -130,7 +136,7 @@ public class UpgradeServletOutputStream
 
 
 private void preWriteChecks() {
-if (listener != null  socketWrapper.hasDataToWrite()) {
+if (listener != null  !socketWrapper.canWrite()) {
 throw new 
IllegalStateException(sm.getString(upgrade.sis.write.ise));
 }
 }

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1651043r1=1651042r2=1651043view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Jan 12 
08:59:42 2015
@@ -2509,8 +2509,7 @@ public class AprEndpoint extends Abstrac
 
 
 @Override
-protected 

svn commit: r1651044 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java

[markt]

Author: markt
Date: Mon Jan 12 08:59:48 2015
New Revision: 1651044

URL: http://svn.apache.org/r1651044
Log:
Checkpoint - Fix NIO2 deadlock

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1651044r1=1651043r2=1651044view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Mon Jan 12 
08:59:48 2015
@@ -40,6 +40,7 @@ import java.util.concurrent.RejectedExec
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.SSLContext;
@@ -714,10 +715,11 @@ public class Nio2Endpoint extends Abstra
 
 public static class Nio2SocketWrapper extends 
SocketWrapperBaseNio2Channel {
 
-private static final ThreadLocalBoolean writeCompletionInProgress = 
new ThreadLocalBoolean() {
+private static final ThreadLocalAtomicInteger 
nestedWriteCompletionCount =
+new ThreadLocalAtomicInteger() {
 @Override
-protected Boolean initialValue() {
-return Boolean.FALSE;
+protected AtomicInteger initialValue() {
+return new AtomicInteger(0);
 }
 };
 
@@ -787,7 +789,7 @@ public class Nio2Endpoint extends Abstra
 if (nBytes.intValue()  0) {
 failed(new 
EOFException(sm.getString(iob.failedwrite)), attachment);
 } else if 
(Nio2SocketWrapper.this.bufferedWrites.size()  0) {
-writeCompletionInProgress.set(Boolean.TRUE);
+nestedWriteCompletionCount.get().incrementAndGet();
 // Continue writing data using a gathering write
 ArrayListByteBuffer arrayList = new 
ArrayList();
 if (attachment.hasRemaining()) {
@@ -802,13 +804,13 @@ public class Nio2Endpoint extends Abstra
 Nio2SocketWrapper.this.getSocket().write(array, 0, 
array.length,
 Nio2SocketWrapper.this.getTimeout(), 
TimeUnit.MILLISECONDS,
 array, gatheringWriteCompletionHandler);
-writeCompletionInProgress.set(Boolean.FALSE);
+nestedWriteCompletionCount.get().decrementAndGet();
 } else if (attachment.hasRemaining()) {
 // Regular write
-writeCompletionInProgress.set(Boolean.TRUE);
+nestedWriteCompletionCount.get().incrementAndGet();
 
Nio2SocketWrapper.this.getSocket().write(attachment, 
Nio2SocketWrapper.this.getTimeout(),
 TimeUnit.MILLISECONDS, attachment, 
writeCompletionHandler);
-writeCompletionInProgress.set(Boolean.FALSE);
+nestedWriteCompletionCount.get().decrementAndGet();
 } else {
 // All data has been written
 if (writeInterest) {
@@ -820,7 +822,7 @@ public class Nio2Endpoint extends Abstra
 writeBufferFlipped = false;
 }
 }
-if (writeNotify  
!writeCompletionInProgress.get().booleanValue()) {
+if (writeNotify  nestedWriteCompletionCount.get().get() 
== 0) {
 endpoint.processSocket(Nio2SocketWrapper.this, 
SocketStatus.OPEN_WRITE, false);
 }
 }
@@ -848,7 +850,7 @@ public class Nio2Endpoint extends Abstra
 failed(new 
EOFException(sm.getString(iob.failedwrite)), attachment);
 } else if 
(Nio2SocketWrapper.this.bufferedWrites.size()  0 || arrayHasData(attachment)) {
 // Continue writing data
-writeCompletionInProgress.set(Boolean.TRUE);
+nestedWriteCompletionCount.get().incrementAndGet();
 ArrayListByteBuffer arrayList = new 
ArrayList();
 for (ByteBuffer buffer : attachment) {
 if (buffer.hasRemaining()) {
@@ -864,7 +866,7 @@ public class Nio2Endpoint extends Abstra
 Nio2SocketWrapper.this.getSocket().write(array, 0, 
array.length,
 Nio2SocketWrapper.this.getTimeout(), 

svn commit: r1651045 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java Nio2Endpoint.java NioEndpoint.java SocketWrapperBase.java

[markt]

Author: markt
Date: Mon Jan 12 08:59:53 2015
New Revision: 1651045

URL: http://svn.apache.org/r1651045
Log:
Complete a TODO
- Ensure a blocking call to doWrite() always empties the buffer or
  times out
- Remove flip parameter from doWrite() as it is no longer required

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1651045r1=1651044r2=1651045view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Jan 12 
08:59:53 2015
@@ -2509,7 +2509,7 @@ public class AprEndpoint extends Abstrac
 
 
 @Override
-protected int doWrite(boolean block, boolean flip) throws IOException {
+protected int doWrite(boolean block) throws IOException {
 if (closed) {
 throw new IOException(sm.getString(apr.closed, getSocket()));
 }
@@ -2520,7 +2520,7 @@ public class AprEndpoint extends Abstrac
 readLock.lock();
 try {
 if (getBlockingStatus() == block) {
-return doWriteInternal(flip);
+return doWriteInternal();
 }
 } finally {
 readLock.unlock();
@@ -2540,7 +2540,7 @@ public class AprEndpoint extends Abstrac
 readLock.lock();
 try {
 writeLock.unlock();
-return doWriteInternal(flip);
+return doWriteInternal();
 } finally {
 readLock.unlock();
 }
@@ -2554,8 +2554,8 @@ public class AprEndpoint extends Abstrac
 }
 
 
-private int doWriteInternal(boolean flip) throws IOException {
-if (flip) {
+private int doWriteInternal() throws IOException {
+if (!writeBufferFlipped) {
 socketWriteBuffer.flip();
 writeBufferFlipped = true;
 }
@@ -2601,7 +2601,7 @@ public class AprEndpoint extends Abstrac
 }
 written += thisTime;
 socketWriteBuffer.position(socketWriteBuffer.position() + 
thisTime);
-} while (thisTime  0  socketWriteBuffer.hasRemaining());
+} while ((thisTime  0 || getBlockingStatus())  
socketWriteBuffer.hasRemaining());
 
 if (socketWriteBuffer.remaining() == 0) {
 socketWriteBuffer.clear();

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1651045r1=1651044r2=1651045view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Mon Jan 12 
08:59:53 2015
@@ -1148,12 +1148,12 @@ public class Nio2Endpoint extends Abstra
 }
 
 
+/**
+ * @param block Ignored since this method is only called in the
+ *  blocking case
+ */
 @Override
-protected int doWrite(boolean block, boolean flip) throws IOException {
-// Only called in the non-blocking case since
-// writeNonBlocking(byte[], int, int) and flush(boolean, boolean)
-// are over-ridden.
-
+protected int doWrite(boolean block) throws IOException {
 int result = -1;
 try {
 socketWriteBuffer.flip();

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1651045r1=1651044r2=1651045view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Mon Jan 12 
08:59:53 2015
@@ -1512,9 +1512,9 @@ public class NioEndpoint extends Abstrac
 
 
 @Override
-protected synchronized int doWrite(boolean block, boolean flip)
+protected synchronized int doWrite(boolean block)
 throws IOException {
-if (flip) {
+if (!writeBufferFlipped) {
 socketWriteBuffer.flip();
 writeBufferFlipped = true;
 }

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL: 

svn commit: r1651046 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java Nio2Endpoint.java NioEndpoint.java SocketWrapperBase.java

[markt]

Author: markt
Date: Mon Jan 12 08:59:59 2015
New Revision: 1651046

URL: http://svn.apache.org/r1651046
Log:
No need to return value from doWrite so remove it allowing slightly
simpler code.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1651046r1=1651045r2=1651046view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Jan 12 
08:59:59 2015
@@ -2509,7 +2509,7 @@ public class AprEndpoint extends Abstrac
 
 
 @Override
-protected int doWrite(boolean block) throws IOException {
+protected void doWrite(boolean block) throws IOException {
 if (closed) {
 throw new IOException(sm.getString(apr.closed, getSocket()));
 }
@@ -2520,7 +2520,7 @@ public class AprEndpoint extends Abstrac
 readLock.lock();
 try {
 if (getBlockingStatus() == block) {
-return doWriteInternal();
+doWriteInternal();
 }
 } finally {
 readLock.unlock();
@@ -2540,7 +2540,7 @@ public class AprEndpoint extends Abstrac
 readLock.lock();
 try {
 writeLock.unlock();
-return doWriteInternal();
+doWriteInternal();
 } finally {
 readLock.unlock();
 }
@@ -2554,13 +2554,12 @@ public class AprEndpoint extends Abstrac
 }
 
 
-private int doWriteInternal() throws IOException {
+private void doWriteInternal() throws IOException {
 if (!writeBufferFlipped) {
 socketWriteBuffer.flip();
 writeBufferFlipped = true;
 }
 
-int written = 0;
 int thisTime;
 
 do {
@@ -2599,7 +2598,6 @@ public class AprEndpoint extends Abstrac
 throw new 
IOException(sm.getString(socket.apr.write.error,
 Integer.valueOf(-thisTime), getSocket(), this));
 }
-written += thisTime;
 socketWriteBuffer.position(socketWriteBuffer.position() + 
thisTime);
 } while ((thisTime  0 || getBlockingStatus())  
socketWriteBuffer.hasRemaining());
 
@@ -2611,8 +2609,6 @@ public class AprEndpoint extends Abstrac
 // write further up the stack. This is to ensure the socket is only
 // registered for write once as both container and user code can 
trigger
 // write registration.
-
-return written;
 }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1651046r1=1651045r2=1651046view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Mon Jan 12 
08:59:59 2015
@@ -1153,18 +1153,15 @@ public class Nio2Endpoint extends Abstra
  *  blocking case
  */
 @Override
-protected int doWrite(boolean block) throws IOException {
-int result = -1;
+protected void doWrite(boolean block) throws IOException {
 try {
 socketWriteBuffer.flip();
-result = socketWriteBuffer.remaining();
 while (socketWriteBuffer.hasRemaining()) {
 if (getSocket().write(socketWriteBuffer).get(getTimeout(), 
TimeUnit.MILLISECONDS).intValue()  0) {
 throw new 
EOFException(sm.getString(iob.failedwrite));
 }
 }
 socketWriteBuffer.clear();
-return result;
 } catch (ExecutionException e) {
 if (e.getCause() instanceof IOException) {
 throw (IOException) e.getCause();

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1651046r1=1651045r2=1651046view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java 

Re: [VOTE] Release Apache Tomcat 8.0.17

[Rémy Maucherat]

2015-01-09 19:26 GMT+01:00 Mark Thomas ma...@apache.org:

 The proposed 8.0.17 release is:
 [ ] Broken - do not release
 [X] Stable - go ahead and release as 8.0.17

 Rémy

Re: Performance change

[Rémy Maucherat]

2015-01-11 20:40 GMT+01:00 Mark Thomas ma...@apache.org:

 Just for info, I have found that none of the non-blocking IO (including
 that used by the WebSocket impl) was using the socket write buffer. I'm
 making good progress refactoring things so everything is buffered by
 default but it has triggered a lot of bugs that need fixing by inserting
 a ServletOutputStream.flush() at an appropriate point.


Yes, I noted some months ago that upgrade wasn't buffered, but it is not
necessarily a bug. Obviously buffering isn't going to hurt since the bytes
would be copied anyway.


 This might turn into something that causes apps issues (if indeed any
 apps at all are using the HTTP upgrade API). If this is the case we can
 add an option to always flush an upgraded OutputStream after a write but
 for now I plan to leave this as a TODO.

 My impressions of performance so far is good but I want to do some side
 by side comparisons of 8.0.x vs 9.0.x for various cases once I have the
 refactoring complete to see what the real differences are. If it turns
 out to be positive, I may see if I can structure an ApacheCon talk out
 of it.

 APR and NIO2 are now the same as in 8.x in my toy benchamrk, and NIO is
still up. I doubt this makes any real world difference though, it's just a
quick check.

Rémy

Re: [VOTE] Release Apache Tomcat 8.0.17

[Felix Schumacher]

Am 09.01.2015 um 19:26 schrieb Mark Thomas:

The proposed Apache Tomcat 8.0.17 release is now available for voting.

The changes since 8.0.16 are:
- Fix a RequestListener regression
- Fix a bug in NIO2 with sending 100-Continue responses

The main changes since 8.0.15 are:
- Correct a regression in annotation scanning introduced in 8.0.15
- The RemoteAddrValve and RemoteHostValve can now optionally include
   the port when filtering along with a new option to trigger
   authentication rather than denying access
- Various edge cases fixes in WebSocket

There is also a large collection of bug fixes, new features and
performance improvements. For full details, see the changelog:
http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.17/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1029/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_17/

The proposed 8.0.17 release is:
[ ] Broken - do not release
[x] Stable - go ahead and release as 8.0.17
Unit test passes on linux 64 bit with java 7 (openjdk 1.7.0_65) with 
BIO, NIO and NIO2.


Checksums (sha1, md5 and asc) are OK.

Packed source and tag seems to be identical (TAG has modules for bayeux 
and tomcat-lite, which are not present in packed source)


Regards
 Felix




-
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: [VOTE] Release Apache Tomcat 8.0.17

[Konstantin Kolinko]

2015-01-09 21:26 GMT+03:00 Mark Thomas ma...@apache.org:
 The proposed Apache Tomcat 8.0.17 release is now available for voting.

 The proposed 8.0.17 release is:
 [ ] Broken - do not release
 [x] Stable - go ahead and release as 8.0.17

Unit tests pass for all 4 connectors with 32-bit JDK 7u72 on Windows 7.

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: r1651116 - in /tomcat/trunk: java/org/apache/catalina/startup/Tomcat.java test/org/apache/catalina/startup/TestTomcat.java webapps/docs/changelog.xml

[fschumacher]

Author: fschumacher
Date: Mon Jan 12 15:22:16 2015
New Revision: 1651116

URL: http://svn.apache.org/r1651116
Log:
Enable custom context class when using embedded tomcat

Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1651116r1=1651115r2=1651116view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Mon Jan 12 
15:22:16 2015
@@ -18,6 +18,7 @@ package org.apache.catalina.startup;
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.Principal;
@@ -495,7 +496,7 @@ public class Tomcat {
 public Context addContext(Host host, String contextPath, String 
contextName,
 String dir) {
 silence(host, contextPath);
-Context ctx = new StandardContext();
+Context ctx = createContext(host, contextPath);
 ctx.setName(contextName);
 ctx.setPath(contextPath);
 ctx.setDocBase(dir);
@@ -522,7 +523,7 @@ public class Tomcat {
 public Context addWebapp(Host host, String url, String name, String path) {
 silence(host, url);
 
-Context ctx = new StandardContext();
+Context ctx = createContext(host, url);
 ctx.setName(name);
 ctx.setPath(url);
 ctx.setDocBase(path);
@@ -688,6 +689,40 @@ public class Tomcat {
 }
 
 /**
+ * Create the configured {@link Context} for the given codehost/code.
+ * The default constructor of the class that was configured with
+ * {@link StandardHost#setContextClass(String)} will be used
+ *
+ * @param host
+ *host for which the {@link Context} should be created, or
+ *codenull/code if default host should be used
+ * @param url
+ *path of the webapp which should get the {@link Context}
+ * @return newly created {@link Context}
+ */
+private Context createContext(Host host, String url) {
+String contextClass = StandardContext.class.getName();
+if (host == null) {
+host = this.getHost();
+}
+if (host instanceof StandardHost) {
+contextClass = ((StandardHost) host).getContextClass();
+}
+try {
+return (Context) Class.forName(contextClass).getConstructor()
+.newInstance();
+} catch (InstantiationException | IllegalAccessException
+| IllegalArgumentException | InvocationTargetException
+| NoSuchMethodException | SecurityException
+| ClassNotFoundException e) {
+throw new IllegalArgumentException(
+Can't instantiate context-class  + contextClass
++  for host  + host +  and url 
++ url, e);
+}
+}
+
+/**
  * Enables JNDI naming which is disabled by default. Server must implement
  * {@link Lifecycle} in order for the {@link NamingContextListener} to be
  * used.

Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1651116r1=1651115r2=1651116view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Mon Jan 12 
15:22:16 2015
@@ -38,10 +38,13 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
-
+import org.apache.catalina.Host;
 import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.core.StandardHost;
+import org.apache.catalina.ha.context.ReplicatedContext;
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.descriptor.web.ContextEnvironment;
 import org.apache.tomcat.util.descriptor.web.ContextResourceLink;
@@ -417,4 +420,109 @@ public class TestTomcat extends TomcatBa
 
 assertEquals(WAR_CONTEXT, context.getSessionCookieName());
 }
+
+@Test
+public void testGetDefaultContextPerAddWebapp() {
+Tomcat tomcat = getTomcatInstance();
+
+File appFile = new File(test/deployment/context.war);
+org.apache.catalina.Context context = tomcat.addWebapp(null,
+/test, 

svn commit: r1651062 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Protocol.java Http11AprProtocol.java Http11Nio2Protocol.java Http11NioProtocol.java

[markt]

Author: markt
Date: Mon Jan 12 11:16:13 2015
New Revision: 1651062

URL: http://svn.apache.org/r1651062
Log:
Pull up getter/setter for useSendfile

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

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1651062r1=1651061r2=1651062view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Mon 
Jan 12 11:16:13 2015
@@ -184,6 +184,10 @@ public abstract class AbstractHttp11Prot
 }
 
 
+public boolean getUseSendfile() { return getEndpoint().getUseSendfile(); }
+public void setUseSendfile(boolean useSendfile) { 
getEndpoint().setUseSendfile(useSendfile); }
+
+
 /**
  * Maximum number of requests which can be performed over a keepalive
  * connection. The default is the same as for Apache HTTP Server.

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=1651062r1=1651061r2=1651062view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Mon Jan 
12 11:16:13 2015
@@ -62,9 +62,6 @@ public class Http11AprProtocol extends A
 return true;
 }
 
-public boolean getUseSendfile() { return getEndpoint().getUseSendfile(); }
-public void setUseSendfile(boolean useSendfile) { 
((AprEndpoint)getEndpoint()).setUseSendfile(useSendfile); }
-
 public int getPollTime() { return 
((AprEndpoint)getEndpoint()).getPollTime(); }
 public void setPollTime(int pollTime) { 
((AprEndpoint)getEndpoint()).setPollTime(pollTime); }
 

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1651062r1=1651061r2=1651062view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Mon Jan 
12 11:16:13 2015
@@ -77,13 +77,6 @@ public class Http11Nio2Protocol extends
   return ((Nio2Endpoint)getEndpoint()).getAcceptorThreadPriority();
 }
 
-public boolean getUseSendfile() {
-return getEndpoint().getUseSendfile();
-}
-
-public void setUseSendfile(boolean useSendfile) {
-((Nio2Endpoint)getEndpoint()).setUseSendfile(useSendfile);
-}
 
 //  Tcp setup 
 
@@ -91,6 +84,7 @@ public class Http11Nio2Protocol extends
 ((Nio2Endpoint)getEndpoint()).setOomParachute(oomParachute);
 }
 
+
 // - JMX related 
methods
 
 @Override

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=1651062r1=1651061r2=1651062view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Mon Jan 
12 11:16:13 2015
@@ -107,14 +107,6 @@ public class Http11NioProtocol extends A
 }
 
 
-public boolean getUseSendfile() {
-return getEndpoint().getUseSendfile();
-}
-
-public void setUseSendfile(boolean useSendfile) {
-((NioEndpoint)getEndpoint()).setUseSendfile(useSendfile);
-}
-
 //  Tcp setup 
 public void setOomParachute(int oomParachute) {
 ((NioEndpoint)getEndpoint()).setOomParachute(oomParachute);



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

svn commit: r1651063 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11AprProtocol.java Http11Nio2Processor.java Http11Nio2Protocol.java Http11NioProcessor.java Http11Nio

[markt]

Author: markt
Date: Mon Jan 12 11:16:19 2015
New Revision: 1651063

URL: http://svn.apache.org/r1651063
Log:
Remove a cast.

Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1651063r1=1651062r2=1651063view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Mon Jan 
12 11:16:19 2015
@@ -30,6 +30,7 @@ import org.apache.tomcat.jni.SSL;
 import org.apache.tomcat.jni.SSLSocket;
 import org.apache.tomcat.jni.Sockaddr;
 import org.apache.tomcat.jni.Socket;
+import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.AprEndpoint;
 import org.apache.tomcat.util.net.SSLSupport;
 import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -52,7 +53,7 @@ public class Http11AprProcessor extends
 // --- Constructors
 
 
-public Http11AprProcessor(int headerBufferSize, AprEndpoint endpoint,
+public Http11AprProcessor(int headerBufferSize, AbstractEndpointLong 
endpoint,
 int maxTrailerSize, int maxExtensionSize, int maxSwallowSize) {
 
 super(endpoint);

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=1651063r1=1651062r2=1651063view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Mon Jan 
12 11:16:19 2015
@@ -301,7 +301,7 @@ public class Http11AprProtocol extends A
 @Override
 protected Http11AprProcessor createProcessor() {
 Http11AprProcessor processor = new Http11AprProcessor(
-proto.getMaxHttpHeaderSize(), 
(AprEndpoint)proto.getEndpoint(),
+proto.getMaxHttpHeaderSize(), proto.getEndpoint(),
 proto.getMaxTrailerSize(), proto.getMaxExtensionSize(),
 proto.getMaxSwallowSize());
 proto.configureProcessor(processor);

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java?rev=1651063r1=1651062r2=1651063view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java Mon Jan 
12 11:16:19 2015
@@ -27,6 +27,7 @@ import org.apache.coyote.ErrorState;
 import org.apache.coyote.http11.filters.BufferedInputFilter;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
 import org.apache.tomcat.util.net.Nio2Channel;
 import org.apache.tomcat.util.net.Nio2Endpoint;
@@ -56,7 +57,7 @@ public class Http11Nio2Processor extends
 // --- Constructors
 
 
-public Http11Nio2Processor(int maxHttpHeaderSize, Nio2Endpoint endpoint,
+public Http11Nio2Processor(int maxHttpHeaderSize, 
AbstractEndpointNio2Channel endpoint,
 int maxTrailerSize, int maxExtensionSize, int maxSwallowSize) {
 
 super(endpoint);

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1651063r1=1651062r2=1651063view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Mon Jan 
12 11:16:19 2015
@@ -221,7 +221,7 @@ public class Http11Nio2Protocol extends
 @Override
 public Http11Nio2Processor createProcessor() {
 Http11Nio2Processor processor = new Http11Nio2Processor(
-proto.getMaxHttpHeaderSize(), (Nio2Endpoint) 
proto.getEndpoint(),
+proto.getMaxHttpHeaderSize(), 

Re: Currently ignored WebSocket tests

[Mark Thomas]

On 08/01/2015 16:44, Rémy Maucherat wrote:
 2015-01-08 16:56 GMT+01:00 Mark Thomas ma...@apache.org:
 
 There are a couple of WebSocket tests that are currently commented out
 in org.apache.tomcat.websocket.pojo.TestEncodingDecoding

 I've been looking into why the currently fail.

 Failing test 1: testMessagesEndPoints()

 First of all, this test fails with:
 java.lang.IllegalStateException: The remote endpoint was in state
 [TEXT_FULL_WRITING] which is an invalid state for called method

 This is caused by a bug in the server-side endpoint which has this:

 @OnMessage
 public String onMessage(String message, Session session) {
 received.add(message);
 session.getAsyncRemote().sendText(MESSAGE_ONE);
 return message;
 }

 The problem is that because the method is annotated with @OnMessage and
 has a return value, that return value will be sent as a message to the
 client. However, just before the method ends an asynchronous message is
 send with:
 session.getAsyncRemote().sendText(MESSAGE_ONE);

 The first (asynchronous) message has not completed when the second (from
 the return value) message is attempted to be sent.

 The Javadoc for RemoteEndpoint.Basic states:
 If the websocket connection underlying this RemoteEndpoint is busy
 sending a message when a call is made to send another one, for example
 if two threads attempt to call a send method concurrently, or if a
 developer attempts to send a new message while in the middle of sending
 an existing one, the send method called while the connection is already
 busy may throw an IllegalStateException.

 It is arguable (from the Javadoc) that this limitation only applies to
 synchronous messages but I do not believe that that was the intention of
 the WebSocket EG. It was certainly only ever discussed in the context
 sync+async messages.

 If the above issue is fixed (e.g. by changing the return type to void)
 the test then fails at the various calls to testEvent. This is because
 the test does not use the encoders those checks are looking for.

 
 I think I already mentioned that. In the Tomcat implementation, this means
 mixing async with blocking (which obviously fails), but sending the
 returned value is under the control of the container so it's an
 implementation detail. Thus I see where the rationale comes from.
 
 You could discuss it in the EG.
 

 Failing test 2: testBatchedEndPoints()

 This fails because batching is enabled which means that the messages are
 batched (i.e. buffered) until the buffer is full and the two messages
 written do no fill the buffer. If this were addressed then again the
 test will still fail because of the later calls to testEvent. Again the
 test does not use the encoders these checks are looking for.

 
 Yes, it seems implied the value returned should not be concerned with
 batching (it would probably never be sent) and thus the first batched
 message would also be sent at that time. This sounds easier to fix than the
 first one, but I didn't really try because the behavior should be validated
 first.

I'll ask some questions in the EG.

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 8.0.17

[Mark Thomas]

On 09/01/2015 18:26, Mark Thomas wrote:
 The proposed Apache Tomcat 8.0.17 release is now available for voting.
 
 The changes since 8.0.16 are:
 - Fix a RequestListener regression
 - Fix a bug in NIO2 with sending 100-Continue responses
 
 The main changes since 8.0.15 are:
 - Correct a regression in annotation scanning introduced in 8.0.15
 - The RemoteAddrValve and RemoteHostValve can now optionally include
   the port when filtering along with a new option to trigger
   authentication rather than denying access
 - Various edge cases fixes in WebSocket
 
 There is also a large collection of bug fixes, new features and
 performance improvements. For full details, see the changelog:
 http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
 
 It can be obtained from:
 https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.17/
 The Maven staging repo is:
 https://repository.apache.org/content/repositories/orgapachetomcat-1029/
 The svn tag is:
 http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_17/
 
 The proposed 8.0.17 release is:
 [ ] Broken - do not release
 [X] Stable - go ahead and release as 8.0.17

Unit tests pass for BIO, NIO, NIO2 and APR/native on 64-bit Linux,
Windows and OSX.

Mark


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

Re: JDK 9 images are now modular with JDK 9 Early Access build 41

[Rory O'Donnell]

Hi Mark,

Have you been able to test Tomcat with JDK 9 modular images, would
appreciate any feedback you might have ?

Rgds,Rory
On 09/12/2014 08:36, Rory O'Donnell wrote:


Hi Mark/Mladen,

The initial changesets for JEP 220: Modular Run-Time Images [1] are 
available

with JDK 9 early-access build 41 [2].

To summarize (please see the JEP for details):

- The jre subdirectory is no longer present in JDK images.

- The user-editable configuration files in the lib subdirectory
   have been moved to the new conf directory.

- The endorsed-standards override mechanism has been removed.

- The extension mechanism has been removed.

- rt.jar, tools.jar, and dt.jar have been removed.

- A new URI scheme for naming stored modules, classes, and resources
   has been defined.

- For tools that previously accessed rt.jar directly, a built-in NIO
   file-system provider has been defined to provide access to the 
class

   and resource files within a run-time image.

More details are available at Mark Reinhold's latest blog entry [3]

Rgds, Rory

[1] http://openjdk.java.net/jeps/220
[2] https://jdk9.java.net/download/
[3] http://mreinhold.org/blog/jigsaw-modular-images





--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA, Dublin,Ireland


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

[Bug 57282] request process UML diagram seems outdated

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=57282

--- Comment #13 from Mark Thomas ma...@apache.org ---
Broadly it looks OK but the detail around the Pipelines isn't right. Calls to
getFirst() are missing and some method names shown don't exist. Also methods
are being called on the wrong objects (e.g. getHost() on the StandardHost). 

Similar comments apply to the Authentication diagram. For example getContext()
is shown as being called on StandardContext.

I'd consider ignoring the various getHost(), getPipeline() calls and just show
the calls that do the real work.

-- 
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-trunk-test-apr (in module tomcat-trunk) failed

[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-trunk-test-apr has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 23 mins 34 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150112-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150112/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150112.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150112-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest
 .openssl.path=/srv/gump/public/workspace/openssl/dest-20150112/bin/openssl 
-Dexecute.test.apr=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 
-Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20150112.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu
 
ild/lib

[GitHub] tomcat pull request: now json is fashion

[ahu0605]

GitHub user ahu0605 opened a pull request:

https://github.com/apache/tomcat/pull/15

now json is fashion

The class should support data json

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/ahu0605/tomcat patch-1

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/tomcat/pull/15.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #15


commit ca7a2e2d46298c5db6dc10e54e2209e2a5c708b0
Author: ahu0605 zhxy0...@gmail.com
Date:   2015-01-12T15:50:15Z

now json is fashion

The class should support data json




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

Re: [VOTE] Release Apache Tomcat 8.0.17

[Martin Grigorov]

On Fri, Jan 9, 2015 at 7:26 PM, Mark Thomas ma...@apache.org wrote:

 The proposed Apache Tomcat 8.0.17 release is now available for voting.

 The changes since 8.0.16 are:
 - Fix a RequestListener regression
 - Fix a bug in NIO2 with sending 100-Continue responses

 The main changes since 8.0.15 are:
 - Correct a regression in annotation scanning introduced in 8.0.15
 - The RemoteAddrValve and RemoteHostValve can now optionally include
   the port when filtering along with a new option to trigger
   authentication rather than denying access
 - Various edge cases fixes in WebSocket

 There is also a large collection of bug fixes, new features and
 performance improvements. For full details, see the changelog:

 http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

 It can be obtained from:
 https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.17/
 The Maven staging repo is:
 https://repository.apache.org/content/repositories/orgapachetomcat-1029/
 The svn tag is:
 http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_17/

 The proposed 8.0.17 release is:
 [ ] Broken - do not release
 [ ] Stable - go ahead and release as 8.0.17


[ X ] Stable - go ahead and release as 8.0.17

Tested Wicket integration with Tomcat's JSR356 impl.





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

svn commit: r1651120 - in /tomcat/trunk: java/org/apache/catalina/ha/context/ReplicatedContext.java test/org/apache/catalina/ha/ test/org/apache/catalina/ha/context/ test/org/apache/catalina/ha/contex

[fschumacher]

Author: fschumacher
Date: Mon Jan 12 15:29:47 2015
New Revision: 1651120

URL: http://svn.apache.org/r1651120
Log:
Don't add orderedLibs attribute if it is null.
ReplicatedContext will fail otherwise.

Avoid NPE on shutdown of ReplicatedContext.

Added:
tomcat/trunk/test/org/apache/catalina/ha/
tomcat/trunk/test/org/apache/catalina/ha/context/
tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java?rev=1651120r1=1651119r2=1651120view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java Mon 
Jan 12 15:29:47 2015
@@ -83,13 +83,15 @@ public class ReplicatedContext extends S
 @Override
 protected synchronized void stopInternal() throws LifecycleException {
 
+MapString, Object map = ((ReplApplContext) this.context)
+.getAttributeMap();
+
 super.stopInternal();
 
-MapString,Object map =
-((ReplApplContext)this.context).getAttributeMap();
 if (map instanceof ReplicatedMap) {
-((ReplicatedMap?,?)map).breakdown();
+((ReplicatedMap?, ?) map).breakdown();
 }
+
 }
 
 
@@ -160,6 +162,13 @@ public class ReplicatedContext extends S
 
 @Override
 public void setAttribute(String name, Object value) {
+if (name == null) {
+throw new 
IllegalArgumentException(sm.getString(applicationContext.setAttribute.namenull));
+}
+if (value == null) {
+removeAttribute(name);
+return;
+}
 if ( (!getParent().getState().isAvailable()) || 
org.apache.jasper.runtime.JspApplicationContextImpl.equals(name) ){
 tomcatAttributes.put(name,value);
 } else

Added: 
tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java?rev=1651120view=auto
==
--- tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java 
(added)
+++ tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java 
Mon Jan 12 15:29:47 2015
@@ -0,0 +1,56 @@
+package org.apache.catalina.ha.context;
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Host;
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.core.StandardHost;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestReplicatedContext extends TomcatBaseTest {
+
+@Test
+public void testBug57425() throws LifecycleException, IOException, 
ServletException {
+Tomcat tomcat = getTomcatInstance();
+Host host = tomcat.getHost();
+if (host instanceof StandardHost) {
+((StandardHost) 
host).setContextClass(ReplicatedContext.class.getName());
+}
+
+File root = new File(test/webapp);
+Context context = tomcat.addWebapp(host, , , 
root.getAbsolutePath());
+
+Tomcat.addServlet(context, test, new AccessContextServlet());
+context.addServletMapping(/access, test);
+
+tomcat.start();
+
+ByteChunk result = getUrl(http://localhost:; + getPort() + /access);
+
+Assert.assertEquals(OK, result.toString());
+
+}
+
+private static class AccessContextServlet extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+getServletContext().setAttribute(NULL, null);
+resp.getWriter().print(OK);
+}
+}
+}

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1651120r1=1651119r2=1651120view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jan 12 15:29:47 2015
@@ -62,6 +62,9 

[GitHub] tomcat pull request: now json is fashion

[markt-asf]

Github user markt-asf commented on the pull request:

https://github.com/apache/tomcat/pull/15#issuecomment-69624704
  
This pull request is declined. Even ignoring the poor quality of this pull 
request, supporting JSON formatted data is an application concern, not a 
container concern.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

Re: [VOTE] Release Apache Tomcat 8.0.17

[Christopher Schultz]

Mark,

On 1/9/15 1:26 PM, Mark Thomas wrote:
 The proposed Apache Tomcat 8.0.17 release is now available for voting.
 
 The changes since 8.0.16 are:
 - Fix a RequestListener regression
 - Fix a bug in NIO2 with sending 100-Continue responses
 
 The main changes since 8.0.15 are:
 - Correct a regression in annotation scanning introduced in 8.0.15
 - The RemoteAddrValve and RemoteHostValve can now optionally include
   the port when filtering along with a new option to trigger
   authentication rather than denying access
 - Various edge cases fixes in WebSocket
 
 There is also a large collection of bug fixes, new features and
 performance improvements. For full details, see the changelog:
 http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
 
 It can be obtained from:
 https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.17/
 The Maven staging repo is:
 https://repository.apache.org/content/repositories/orgapachetomcat-1029/
 The svn tag is:
 http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_17/
 
 The proposed 8.0.17 release is:
 [ ] Broken - do not release
 [X] Stable - go ahead and release as 8.0.17

* Environment
*  Java: java version 1.7.0_67 Java(TM) SE Runtime Environment
(build 1.7.0_67-b01) Java HotSpot(TM) 64-Bit Server VM (build 24.65-b04,
mixed mode)
*  OS:   Linux 2.6.32-312-ec2 x86_64
*  cc:   cc (Debian 4.7.2-5) 4.7.2
*  make: GNU Make 3.81
*  OpenSSL:  OpenSSL 1.0.1e 11 Feb 2013
*  APR:  1.4.6
*
* Valid MD5 signature for apache-tomcat-8.0.17.zip
* Valid GPG signature for apache-tomcat-8.0.17.zip
* Valid MD5 signature for apache-tomcat-8.0.17.tar.gz
* Valid GPG signature for apache-tomcat-8.0.17.tar.gz
* Valid MD5 signature for apache-tomcat-8.0.17.exe
* Valid GPG signature for apache-tomcat-8.0.17.exe
* Valid MD5 signature for apache-tomcat-8.0.17-src.zip
* Valid GPG signature for apache-tomcat-8.0.17-src.zip
* Valid MD5 signature for apache-tomcat-8.0.17-src.tar.gz
* Valid GPG signature for apache-tomcat-8.0.17-src.tar.gz
*
* Binary Zip and tarball: Same
* Source Zip and tarball: Same
*
* tcnative builds cleanly
* Tomcat builds cleanly
* Junit Tests (all connectors: bio, nio, nio2, apr): FAILED
*
* Tests that failed:

(All these tests are known to fail in my environment which does not have
multicast enabled)

org.apache.catalina.session.TestStandardSession.APR.txt
org.apache.catalina.session.TestStandardSession.BIO.txt
org.apache.catalina.session.TestStandardSession.NIO.txt
org.apache.catalina.session.TestStandardSession.NIO2.txt
org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.APR.txt
org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.BIO.txt
org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.NIO.txt
org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.NIO2.txt
org.apache.catalina.tribes.group.TestGroupChannelSenderConnections.APR.txt
org.apache.catalina.tribes.group.TestGroupChannelSenderConnections.BIO.txt
org.apache.catalina.tribes.group.TestGroupChannelSenderConnections.NIO.txt
org.apache.catalina.tribes.group.TestGroupChannelSenderConnections.NIO2.txt
org.apache.catalina.tribes.group.TestGroupChannelStartStop.APR.txt
org.apache.catalina.tribes.group.TestGroupChannelStartStop.BIO.txt
org.apache.catalina.tribes.group.TestGroupChannelStartStop.NIO.txt
org.apache.catalina.tribes.group.TestGroupChannelStartStop.NIO2.txt
org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator.APR.txt
org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator.BIO.txt
org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator.NIO.txt
org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator.NIO2.txt
org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.APR.txt
org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.BIO.txt
org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.NIO.txt
org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.NIO2.txt
org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector.APR.txt
org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector.BIO.txt
org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector.NIO.txt
org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector.NIO2.txt

Things look good in an old-school web application (no fancy new Servlet
3.0+ features).

-chris



signature.asc
Description: OpenPGP digital signature

Re: [VOTE] Release Apache Tomcat 8.0.17

[Jeanfrancois Arcand]

On 2015-01-09 1:26 PM, Mark Thomas wrote:


The proposed 8.0.17 release is:
[ ] Broken - do not release
[X] Stable - go ahead and release as 8.0.17

Tested WebSocket + AsyncContext

-- Jeanfrancois





-
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

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

[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-trunk-test-apr has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 23 mins 50 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150112-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150112/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150112.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150112-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest
 .openssl.path=/srv/gump/public/workspace/openssl/dest-20150112/bin/openssl 
-Dexecute.test.apr=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 
-Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20150112.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu
 
ild/lib

svn commit: r1651219 - in /tomcat/trunk/java/org/apache: coyote/http11/upgrade/UpgradeServletOutputStream.java tomcat/websocket/server/WsRemoteEndpointImplServer.java

[markt]

Author: markt
Date: Mon Jan 12 22:35:19 2015
New Revision: 1651219

URL: http://svn.apache.org/r1651219
Log:
Fix some flushing issues identified when running the Autobhan WebSocket test 
suite

Modified:

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java?rev=1651219r1=1651218r2=1651219view=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
 (original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
 Mon Jan 12 22:35:19 2015
@@ -45,6 +45,8 @@ public class UpgradeServletOutputStream
 // synchronization may be required (see fireListenerLock for an example).
 private final Object writeLock = new Object();
 
+private volatile boolean flushing = false;
+
 private volatile boolean closeRequired = false;
 
 // Start in blocking-mode
@@ -69,11 +71,17 @@ public class UpgradeServletOutputStream
 }
 
 // Make sure isReady() and onWritePossible() have a consistent view of
-// buffer and fireListener when determining if the listener should fire
+// fireListener when determining if the listener should fire
 synchronized (fireListenerLock) {
-boolean result = socketWrapper.isReadyForWrite();
-fireListener = !result;
-return result;
+if (flushing) {
+socketWrapper.registerWriteInterest();
+fireListener = true;
+return false;
+} else {
+boolean result = socketWrapper.isReadyForWrite();
+fireListener = !result;
+return result;
+}
 }
 }
 
@@ -124,10 +132,30 @@ public class UpgradeServletOutputStream
 
 @Override
 public void flush() throws IOException {
-socketWrapper.flush(listener == null);
+flushInternal(listener == null, true);
 }
 
 
+private void flushInternal(boolean block, boolean updateFlushing) throws 
IOException {
+try {
+synchronized (writeLock) {
+if (updateFlushing) {
+flushing = socketWrapper.flush(block);
+} else {
+socketWrapper.flush(block);
+}
+}
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+onError(t);
+if (t instanceof IOException) {
+throw (IOException) t;
+} else {
+throw new IOException(t);
+}
+}
+}
+
 @Override
 public void close() throws IOException {
 closeRequired = true;
@@ -156,18 +184,14 @@ public class UpgradeServletOutputStream
 
 
 protected final void onWritePossible() throws IOException {
-try {
-synchronized (writeLock) {
-socketWrapper.flush(false);
-}
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-onError(t);
-if (t instanceof IOException) {
-throw t;
-} else {
-throw new IOException(t);
+if (flushing) {
+flushInternal(false, true);
+if (flushing) {
+socketWrapper.registerWriteInterest();
+return;
 }
+} else {
+flushInternal(false, false);
 }
 
 // Make sure isReady() and onWritePossible() have a consistent view

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1651219r1=1651218r2=1651219view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 Mon Jan 12 22:35:19 2015
@@ -104,15 +104,17 @@ public class WsRemoteEndpointImplServer
 }
 if (complete) {
 sos.flush();
-wsWriteTimeout.unregister(this);
-clearHandler(null, useDispatch);
-if (close) {
-close();
+complete = sos.isReady();
+if (complete) {
+wsWriteTimeout.unregister(this);
+clearHandler(null, useDispatch);
+if (close) {

svn commit: r1651235 - /tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java

[markt]

Author: markt
Date: Mon Jan 12 23:51:27 2015
New Revision: 1651235

URL: http://svn.apache.org/r1651235
Log:
Remove over-ridden method that has an identical implementation in the super 
class.

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

Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=1651235r1=1651234r2=1651235view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Mon 
Jan 12 23:51:27 2015
@@ -526,24 +526,6 @@ public class InternalAprInputBuffer exte
 }
 
 
-//  InputBuffer Methods
-
-
-/**
- * Read some bytes.
- */
-@Override
-public int doRead(ByteChunk chunk, Request req)
-throws IOException {
-
-if (lastActiveFilter == -1)
-return inputStreamInputBuffer.doRead(chunk, req);
-else
-return activeFilters[lastActiveFilter].doRead(chunk,req);
-
-}
-
-
 // -- Protected Methods
 
 @Override



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

[Bug 57437] New: got error while start tomcat server in windows

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=57437

Bug ID: 57437
   Summary: got error while start tomcat server in windows
   Product: Tomcat 7
   Version: unspecified
  Hardware: PC
Status: NEW
  Severity: blocker
  Priority: P2
 Component: Integration
  Assignee: dev@tomcat.apache.org
  Reporter: csksarav...@gmail.com

Jan 13, 2015 11:17:03 AM org.apache.catalina.startup.VersionLoggerListener log
INFO: Server version:Apache Tomcat/7.0.57
Jan 13, 2015 11:17:03 AM org.apache.catalina.startup.VersionLoggerListener log
INFO: Server built:  Nov 3 2014 08:39:16 UTC
Jan 13, 2015 11:17:03 AM org.apache.catalina.startup.VersionLoggerListener log
INFO: Server number: 7.0.57.0
Jan 13, 2015 11:17:03 AM org.apache.catalina.startup.VersionLoggerListener log
INFO: OS Name:   Windows 8.1
Jan 13, 2015 11:17:03 AM org.apache.catalina.startup.VersionLoggerListener log
INFO: OS Version:6.3
Jan 13, 2015 11:17:03 AM org.apache.catalina.startup.VersionLoggerListener log
INFO: Architecture:  amd64
Jan 13, 2015 11:17:03 AM org.apache.catalina.startup.VersionLoggerListener log
INFO: JAVA_HOME: C:\Program Files\Java\jdk1.8.0_25\jre
Jan 13, 2015 11:17:03 AM org.apache.catalina.startup.VersionLoggerListener log
INFO: JVM Version:   1.8.0_25-b18
Jan 13, 2015 11:17:03 AM org.apache.catalina.startup.VersionLoggerListener log
INFO: JVM Vendor:Oracle Corporation
Jan 13, 2015 11:17:03 AM org.apache.catalina.startup.VersionLoggerListener log
INFO: CATALINA_BASE: C:\tomcat7
Jan 13, 2015 11:17:03 AM org.apache.catalina.startup.VersionLoggerListener log
INFO: CATALINA_HOME: C:\tomcat7
Jan 13, 2015 11:17:03 AM org.apache.catalina.startup.VersionLoggerListener log
INFO: Command line argument:
-Djava.util.logging.config.file=C:\tomcat7\conf\logging.properties
Jan 13, 2015 11:17:03 AM org.apache.catalina.startup.VersionLoggerListener log
INFO: Command line argument:
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
Jan 13, 2015 11:17:03 AM org.apache.catalina.startup.VersionLoggerListener log
INFO: Command line argument: -Djava.endorsed.dirs=C:\tomcat7\endorsed
Jan 13, 2015 11:17:03 AM org.apache.catalina.startup.VersionLoggerListener log
INFO: Command line argument: -Dcatalina.base=C:\tomcat7
Jan 13, 2015 11:17:03 AM org.apache.catalina.startup.VersionLoggerListener log
INFO: Command line argument: -Dcatalina.home=C:\tomcat7
Jan 13, 2015 11:17:03 AM org.apache.catalina.startup.VersionLoggerListener log
INFO: Command line argument: -Djava.io.tmpdir=C:\tomcat7\temp
Jan 13, 2015 11:17:03 AM org.apache.catalina.core.AprLifecycleListener
lifecycleEvent
INFO: The APR based Apache Tomcat Native library which allows optimal
performance in production environments was not found on the java.library.path:
C:\Program
Files\Java\jdk1.8.0_25\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\ProgramData\Oracle\Java\javapath;C:\Program
Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Program
Files (x86)\NVIDIA
Corporation\PhysX\Common;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program
Files (x86)\EgisTec MyWinLocker\x64;C:\Program Files (x86)\EgisTec
MyWinLocker\;C:\Program Files (x86)\Intel\OpenCL SDK\2.0\bin\x86;C:\Program
Files (x86)\Intel\OpenCL SDK\2.0\bin\x64;C:\Program Files\Intel\Intel(R)
Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management
Engine Components\IPT;C:\Program Files (x86)\Intel\Intel(R) Management Engine
Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine
Components\IPT;C:\Program Files (x86)\Windows Kits\8.1\Windows Performance
Toolkit\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program
Files\nodejs\;C:\Program Files\Microsoft SQL Server\Client
SDK\ODBC\110\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL
Server\120\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL
Server\120\Tools\Binn\;C:\Program Files\Microsoft SQL
Server\120\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL
Server\120\DTS\Binn\;C:\Program Files\Microsoft SQL
Server\120\DTS\Binn\;C:\Program Files (x86)\Microsoft
SDKs\TypeScript\1.0\;C:\Program Files\Microsoft\Web Platform
Installer\;C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET Web
Pages\v1.0\;C:\Program Files (x86)\Microsoft SQL
Server\110\Tools\Binn\;C:\Program Files\Microsoft SQL
Server\110\DTS\Binn\;C:\Program Files (x86)\Git\cmd;C:\Program Files
(x86)\GitExtensions\;C:\Program Files\Java\jdk1.8.0_25\bin;.
Jan 13, 2015 11:17:04 AM org.apache.coyote.AbstractProtocol init
INFO: Initializing ProtocolHandler [http-bio-8080]
Jan 13, 2015 11:17:04 AM org.apache.coyote.AbstractProtocol init
INFO: Initializing ProtocolHandler [ajp-bio-8009]
Jan 13, 2015 11:17:04 AM org.apache.coyote.AbstractProtocol init
SEVERE: Failed to initialize end 

[GitHub] tomcat pull request: now json is fashion

[ahu0605]

Github user ahu0605 commented on the pull request:

https://github.com/apache/tomcat/pull/15#issuecomment-69689061
  
but when i push content type - json，there is some bug , 4 ex :data is 
json {\id\:\asd\},the value  will be a Map key, request.getPamaterMap () 
the key is {id:asd}, value is null ,is not logic


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

svn commit: r1651232 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java http11/Http11AprProtocol.java http11/Http11Nio2Protocol.java http11/Http11NioProtocol.java

[markt]

Author: markt
Date: Mon Jan 12 23:38:24 2015
New Revision: 1651232

URL: http://svn.apache.org/r1651232
Log:
Better parameter name

Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.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=1651232r1=1651231r2=1651232view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Jan 12 
23:38:24 2015
@@ -783,7 +783,7 @@ public abstract class AbstractProtocolS
 boolean addToPoller);
 protected abstract ProcessorS createUpgradeProcessor(
 SocketWrapperBaseS socket, ByteBuffer leftoverInput,
-HttpUpgradeHandler httpUpgradeProcessor) throws IOException;
+HttpUpgradeHandler httpUpgradeHandler) throws IOException;
 
 protected void register(AbstractProcessorS processor) {
 if (getProtocol().getDomain() != null) {

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=1651232r1=1651231r2=1651232view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Mon Jan 
12 23:38:24 2015
@@ -314,9 +314,9 @@ public class Http11AprProtocol extends A
 @Override
 protected ProcessorLong createUpgradeProcessor(
 SocketWrapperBaseLong socket, ByteBuffer leftoverInput,
-HttpUpgradeHandler httpUpgradeProcessor)
+HttpUpgradeHandler httpUpgradeHandler)
 throws IOException {
-return new UpgradeProcessor(socket, leftoverInput, 
httpUpgradeProcessor);
+return new UpgradeProcessor(socket, leftoverInput, 
httpUpgradeHandler);
 }
 }
 }

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1651232r1=1651231r2=1651232view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Mon Jan 
12 23:38:24 2015
@@ -232,9 +232,9 @@ public class Http11Nio2Protocol extends
 @Override
 protected ProcessorNio2Channel createUpgradeProcessor(
 SocketWrapperBaseNio2Channel socket, ByteBuffer 
leftoverInput,
-HttpUpgradeHandler httpUpgradeProcessor)
+HttpUpgradeHandler httpUpgradeHandler)
 throws IOException {
-return new UpgradeProcessor(socket, leftoverInput, 
httpUpgradeProcessor);
+return new UpgradeProcessor(socket, leftoverInput, 
httpUpgradeHandler);
 }
 
 @Override

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=1651232r1=1651231r2=1651232view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Mon Jan 
12 23:38:24 2015
@@ -270,9 +270,9 @@ public class Http11NioProtocol extends A
 @Override
 protected ProcessorNioChannel createUpgradeProcessor(
 SocketWrapperBaseNioChannel socket, ByteBuffer leftoverInput,
-HttpUpgradeHandler httpUpgradeProcessor)
+HttpUpgradeHandler httpUpgradeHandler)
 throws IOException {
-return new UpgradeProcessor(socket, leftoverInput, 
httpUpgradeProcessor);
+return new UpgradeProcessor(socket, leftoverInput, 
httpUpgradeHandler);
 }
 
 @Override



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

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

[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-trunk-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-trunk-validate :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-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-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 32 secs
Command Line: /usr/lib/jvm/java-8-oracle/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-6.3-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/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-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-6.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20150113.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.3.1-SNAPSHOT.j
 
ar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20150113.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150113.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20150113.jar:/srv/gump/packages/guava/guava-18.0.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

build-prepare:
   [delete] Deleting directory 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp

compile-prepare:

download-validate:

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

setproxy:

downloadfile:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle
[checkstyle] Running Checkstyle 6.3-SNAPSHOT on 2894 files
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java:1:
 Line does not match expected header line of '^(rem)?\W*Licensed to the Apache 
Software Foundation \(ASF\) under one or more$'.
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java:18:
 Wrong order for 'org.junit.Assert' import.
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/test/org/apache/catalina/startup/TestTomcat.java:44:
 'org.apache.catalina.Host' should be separated from previous imports.

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:544: Got 3 errors and 0 
warnings.

Total time: 32 seconds
-

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

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

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

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

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

[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-trunk-test-apr has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 2 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 23 mins 32 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150113-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150113/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150113.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150113-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest
 .openssl.path=/srv/gump/public/workspace/openssl/dest-20150113/bin/openssl 
-Dexecute.test.apr=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 
-Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20150113.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 

svn commit: r1651280 - in /tomcat/trunk/test/org/apache/catalina: ha/context/TestReplicatedContext.java startup/TestTomcat.java

[kkolinko]

Author: kkolinko
Date: Tue Jan 13 05:41:52 2015
New Revision: 1651280

URL: http://svn.apache.org/r1651280
Log:
Checkstyle:
1) Missing Apache License header
2) Imports order

Modified:
tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java

Modified: 
tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java?rev=1651280r1=1651279r2=1651280view=diff
==
--- tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java 
Tue Jan 13 05:41:52 2015
@@ -1,3 +1,19 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the License); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an AS IS BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package org.apache.catalina.ha.context;
 
 import java.io.File;
@@ -8,6 +24,9 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 import org.apache.catalina.Context;
 import org.apache.catalina.Host;
 import org.apache.catalina.LifecycleException;
@@ -15,8 +34,6 @@ import org.apache.catalina.core.Standard
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.util.buf.ByteChunk;
-import org.junit.Assert;
-import org.junit.Test;
 
 public class TestReplicatedContext extends TomcatBaseTest {
 

Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1651280r1=1651279r2=1651280view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Tue Jan 13 
05:41:52 2015
@@ -41,6 +41,7 @@ import static org.junit.Assert.assertTru
 import static org.junit.Assert.fail;
 
 import org.junit.Test;
+
 import org.apache.catalina.Host;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.core.StandardHost;



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

svn commit: r1651279 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ java/org/apache/catalina/ha/authenticator/ java/org/apache/catalina/ha/session/ test/org/apache/catalina/ha/context/

[kkolinko]

Author: kkolinko
Date: Tue Jan 13 05:37:55 2015
New Revision: 1651279

URL: http://svn.apache.org/r1651279
Log:
svn:eol-style=native

Modified:

tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOnListener.java   
(props changed)

tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
   (props changed)

tomcat/trunk/java/org/apache/catalina/ha/session/ReplicatedSessionListener.java 
  (props changed)
tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java 
  (props changed)

Propchange: 
tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOnListener.java
--
svn:eol-style = native

Propchange: 
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
--
svn:eol-style = native

Propchange: 
tomcat/trunk/java/org/apache/catalina/ha/session/ReplicatedSessionListener.java
--
svn:eol-style = native

Propchange: 
tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java
--
svn:eol-style = native



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

svn commit: r1651281 - in /tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha: authenticator/ClusterSingleSignOnListener.java session/ReplicatedSessionListener.java

[kkolinko]

Author: kkolinko
Date: Tue Jan 13 05:45:39 2015
New Revision: 1651281

URL: http://svn.apache.org/r1651281
Log:
svn:eol-style=native

Modified:

tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ReplicatedSessionListener.java
   (props changed)

Propchange: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
--
svn:eol-style = native

Propchange: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ReplicatedSessionListener.java
--
svn:eol-style = native



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

[GitHub] tomcat pull request: now json is fashion

[martin-g]

Github user martin-g commented on the pull request:

https://github.com/apache/tomcat/pull/15#issuecomment-69703890
  
When you POST JSON data you should use 
http://docs.oracle.com/javaee/6/api/javax/servlet/ServletRequest.html#getReader()
 to consume the body and parse it as you find appropriate.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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