[Bug 57438] Infinite redirect loop when maximum upload size exceeded

[bugzilla]

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

Martin Visser  changed:

   What|Removed |Added

Summary|Inifinite redirect loop |Infinite redirect loop when
   |when maximum upload size|maximum upload size
   |exceeded|exceeded

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

[Bug 57438] New: Inifinite redirect loop when maximum upload size exceeded

[bugzilla]

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

Bug ID: 57438
   Summary: Inifinite redirect loop when maximum upload size
exceeded
   Product: Tomcat 7
   Version: 7.0.55
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Servlet & JSP API
  Assignee: dev@tomcat.apache.org
  Reporter: martinvis...@gmail.com

Created attachment 32366
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=32366&action=edit
The stack trace of the loop

Running a Spring MVC 4.1.4 web application on JDK 7, Ubuntu 14.10 (and Debian
Wheezy).
Tested on version 7.0.53 through 7.0.57. The web application works as expected
in versions 7.0.53 and 7.0.54. Version 7.0.55 and up display the following
issue.

When uploading a large file, larger than the specified maximum, the exception
org.springframework.web.multipart.MaxUploadSizeExceededException (caused by a
org.apache.commons.fileupload.FileUploadBase.SizeLimitExceededException) is
caught via an @ExceptionHandler. After logging the exception and resolving some
parameters from the inputstream a redirect is performed like this:

return new org.springframework.web.servlet.ModelAndView("redirect:/error", new
org.springframework.ui.ExtendedModelMap());

I expect that this would generate a HTTP 302 redirect and will trigger a GET
request on "/error". The upload obviously is a POST request and the redirect
would perform a GET request. Tomcat version 7.0.54 and .53 indeed do that, but
in version 55 and up it remains a POST request. The complete multipart
content-type is saved and the whole request is repeated until the server throws
an error: (failed) net::ERR_CONNECTION_RESET.

Provisional headers:
Request URL:https://localhost:8443/import/ratings
Request Headers
Provisional headers are shown
Accept:text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8
Content-Type:multipart/form-data;
boundary=WebKitFormBoundaryNT3MUmtXDpFSSCLy
Origin:https://localhost:8443
Referer:https://localhost:8443/import/ratings
User-Agent:Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/39.0.2171.95 Safari/537.36
Request Payload
--WebKitFormBoundaryNT3MUmtXDpFSSCLy
Content-Disposition: form-data; name="commandName"

importRatingsCommand
--WebKitFormBoundaryNT3MUmtXDpFSSCLy
Content-Disposition: form-data; name="ratings"; filename="file.pdf"
Content-Type: application/pdf

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

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

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID
 OS||All

--- Comment #1 from Mark Thomas  ---
Bugzilla is not a support forum.

Read this:
http://www.catb.org/esr/faqs/smart-questions.html

and then ask for help on the Apache Tomcat Users mailing list.

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

[GitHub] tomcat pull request: now json is fashion

[hazendaz]

Github user hazendaz commented on the pull request:

https://github.com/apache/tomcat/pull/15#issuecomment-69741658
  
We run json using Jackson with jersey in tomcat.  No issues.  This code 
doesn't do anything.  So unclear how it solves anything.  All you did was add 
an empty if statement.

--- Original Message ---

From: "ahu0605" 
Sent: January 12, 2015 10:09 PM
To: "apache/tomcat" 
Subject: Re: [tomcat] now json is fashion (#15)

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

---
Reply to this email directly or view it on GitHub:
https://github.com/apache/tomcat/pull/15#issuecomment-69689061


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

[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-69742518
  
I'm pretty sure Jersey does something.


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

[GitHub] tomcat pull request: now json is fashion

[hazendaz]

Github user hazendaz commented on the pull request:

https://github.com/apache/tomcat/pull/15#issuecomment-69744890
  
Sure...what I meant here is that this patch does nothing from tomcat 
perspective.  It's just an empty if statement.  It does nothing at all.

--- Original Message ---

From: "Martin Grigorov" 
Sent: January 13, 2015 8:18 AM
To: "apache/tomcat" 
Cc: "Jeremy Landis" 
Subject: Re: [tomcat] now json is fashion (#15)

I'm pretty sure Jersey does something.

---
Reply to this email directly or view it on GitHub:
https://github.com/apache/tomcat/pull/15#issuecomment-69742518


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

[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-69754848
  
I am very sad this bug is not be modifed, PHP had surpported  content -type 
:JSON ,but java ...


---
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: r1651389 - /tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java

[markt]

Author: markt
Date: Tue Jan 13 15:48:06 2015
New Revision: 1651389

URL: http://svn.apache.org/r1651389
Log:
Fix refactoring regression. Don't read more data than there is space
for.

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=1651389&r1=1651388&r2=1651389&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Tue 
Jan 13 15:48:06 2015
@@ -181,10 +181,11 @@ public class InternalAprInputBuffer exte
 
 boolean readDone = false;
 int result = 0;
+int readLimit = Math.min(bbuf.capacity(), buf.length - lastValid);
 readLock.lock();
 try {
 if (wrapper.getBlockingStatus() == block) {
-result = Socket.recvbb(socket, 0, buf.length - lastValid);
+result = Socket.recvbb(socket, 0, readLimit);
 readDone = true;
 }
 } finally {
@@ -206,7 +207,7 @@ public class InternalAprInputBuffer exte
 readLock.lock();
 try {
 writeLock.unlock();
-result = Socket.recvbb(socket, 0, buf.length - lastValid);
+result = Socket.recvbb(socket, 0, readLimit);
 } finally {
 readLock.unlock();
 }



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

svn commit: r1651388 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Processor.java Http11AprProcessor.java Http11Nio2Processor.java Http11NioProcessor.java

[markt]

Author: markt
Date: Tue Jan 13 15:48:01 2015
New Revision: 1651388

URL: http://svn.apache.org/r1651388
Log:
Use same handling for incomplete reads now all InputBuffers support
non-blcoking reading of request line and headers. Pull method up into
base class to reduce duplication.

Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1651388&r1=1651387&r2=1651388&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Tue 
Jan 13 15:48:01 2015
@@ -902,15 +902,6 @@ public abstract class AbstractHttp11Proc
 
 
 /**
- * Defines how a connector handles an incomplete request line read.
- *
- * @return true if the processor should break out of the
- * processing loop, otherwise false.
- */
-protected abstract boolean handleIncompleteRequestLineRead();
-
-
-/**
  * Set the socket timeout.
  */
 protected abstract void setSocketTimeout(int timeout) throws IOException;
@@ -1145,6 +1136,39 @@ public abstract class AbstractHttp11Proc
 }
 
 
+private boolean handleIncompleteRequestLineRead() {
+// Haven't finished reading the request so keep the socket
+// open
+openSocket = true;
+// Check to see if we have read any of the request line yet
+if (getInputBuffer().getParsingRequestLinePhase() < 1) {
+if (keptAlive) {
+// Haven't read the request line and have previously processed 
a
+// request. Must be keep-alive. Make sure poller uses 
keepAlive.
+socketWrapper.setTimeout(endpoint.getKeepAliveTimeout());
+}
+} else {
+// Started to read request line.
+if (request.getStartTime() < 0) {
+request.setStartTime(System.currentTimeMillis());
+}
+if (endpoint.isPaused()) {
+// Partially processed the request so need to respond
+response.setStatus(503);
+setErrorState(ErrorState.CLOSE_CLEAN, null);
+getAdapter().log(request, response, 0);
+return false;
+} else {
+// Need to keep processor associated with socket
+readComplete = false;
+// Make sure poller uses soTimeout from here onwards
+socketWrapper.setTimeout(endpoint.getSoTimeout());
+}
+}
+return true;
+}
+
+
 private void checkExpectationAndResponseStatus() {
 if (expectation && (response.getStatus() < 200 || response.getStatus() 
> 299)) {
 // Client sent Expect: 100-continue but received a

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=1651388&r1=1651387&r2=1651388&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Tue Jan 
13 15:48:01 2015
@@ -92,17 +92,6 @@ public class Http11AprProcessor extends
 
 // - Public Methods
 
-
-@Override
-protected boolean handleIncompleteRequestLineRead() {
-// This means that no data is available right now
-// (long keepalive), so that the processor should be recycled
-// and the method should return true
-openSocket = true;
-return true;
-}
-
-
 @Override
 protected void setSocketTimeout(int timeout) {
 Socket.timeoutSet(socketWrapper.getSocket().longValue(), timeout * 
1000);

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=1651388&r1=1651387&r2=1651388&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java Tue Jan 
13 15:48:01 2015
@@ -122,41 +122,6 @@ public class Http11Nio2Processor extends
 
 
 @Override
-protected boolean handleIncompleteRequestLineRead() {
-// Haven't f

svn commit: r1651387 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractInputBuffer.java AbstractNioInputBuffer.java InternalAprInputBuffer.java InternalNio2InputBuffer.java InternalNioInputBuf

[markt]

Author: markt
Date: Tue Jan 13 15:47:56 2015
New Revision: 1651387

URL: http://svn.apache.org/r1651387
Log:
Merge AbtsractNioInputBuffer into AbstractInputBuffer now all input
buffers support non-blocking reads of HTTP rquest line and headers.

Removed:
tomcat/trunk/java/org/apache/coyote/http11/AbstractNioInputBuffer.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java?rev=1651387&r1=1651386&r2=1651387&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java Tue Jan 
13 15:47:56 2015
@@ -18,11 +18,13 @@ package org.apache.coyote.http11;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 
 import org.apache.coyote.InputBuffer;
 import org.apache.coyote.Request;
 import org.apache.juli.logging.Log;
 import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.buf.MessageBytes;
 import org.apache.tomcat.util.http.MimeHeaders;
 import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -30,7 +32,7 @@ import org.apache.tomcat.util.res.String
 
 public abstract class AbstractInputBuffer implements InputBuffer{
 
-protected static final boolean[] HTTP_TOKEN_CHAR = new boolean[128];
+// -- Constants
 
 /**
  * The string manager for this package.
@@ -39,6 +41,7 @@ public abstract class AbstractInputBuffe
 StringManager.getManager(Constants.Package);
 
 
+protected static final boolean[] HTTP_TOKEN_CHAR = new boolean[128];
 static {
 for (int i = 0; i < 128; i++) {
 if (i < 32) {
@@ -164,6 +167,55 @@ public abstract class AbstractInputBuffe
 protected int lastActiveFilter;
 
 
+/**
+ * Parsing state - used for non blocking parsing so that
+ * when more data arrives, we can pick up where we left off.
+ */
+private boolean parsingRequestLine;
+private int parsingRequestLinePhase = 0;
+private boolean parsingRequestLineEol = false;
+private int parsingRequestLineStart = 0;
+private int parsingRequestLineQPos = -1;
+private HeaderParsePosition headerParsePos;
+private final HeaderParseData headerData = new HeaderParseData();
+
+/**
+ * Maximum allowed size of the HTTP request line plus headers plus any
+ * leading blank lines.
+ */
+protected final int headerBufferSize;
+
+/**
+ * Known size of the NioChannel read buffer.
+ */
+protected int socketReadBufferSize;
+
+
+// --- Constructors
+
+public AbstractInputBuffer(Request request, int headerBufferSize) {
+
+this.request = request;
+headers = request.getMimeHeaders();
+
+this.headerBufferSize = headerBufferSize;
+
+filterLibrary = new InputFilter[0];
+activeFilters = new InputFilter[0];
+lastActiveFilter = -1;
+
+parsingHeader = true;
+parsingRequestLine = true;
+parsingRequestLinePhase = 0;
+parsingRequestLineEol = false;
+parsingRequestLineStart = 0;
+parsingRequestLineQPos = -1;
+headerParsePos = HeaderParsePosition.HEADER_START;
+headerData.recycle();
+swallowInput = true;
+}
+
+
 // - Properties
 
 /**
@@ -229,14 +281,24 @@ public abstract class AbstractInputBuffe
 }
 
 
+//  InputBuffer Methods
+
 /**
- * Implementations are expected to call {@link Request#setStartTime(long)}
- * as soon as the first byte is read from the request.
+ * Read some bytes.
  */
-public abstract boolean parseRequestLine(boolean useAvailableDataOnly)
-throws IOException;
+@Override
+public int doRead(ByteChunk chunk, Request req)
+throws IOException {
 
-public abstract boolean parseHeaders() throws IOException;
+if (lastActiveFilter == -1)
+return inputStreamInputBuffer.doRead(chunk, req);
+else
+return activeFilters[lastActiveFilter].doRead(chunk,req);
+
+}
+
+
+// --- Abstract Methods
 
 /**
  * Attempts to read some data into the input buffer.
@@ -259,11 +321,8 @@ public abstract cl

svn commit: r1651386 - in /tomcat/trunk/java/org/apache/coyote/http11: InternalAprInputBuffer.java InternalNioInputBuffer.java

[markt]

Author: markt
Date: Tue Jan 13 15:47:50 2015
New Revision: 1651386

URL: http://svn.apache.org/r1651386
Log:
Switch APR to using non-blocking reads for HTTP request line and headers

Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.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=1651386&r1=1651385&r2=1651386&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Tue 
Jan 13 15:47:50 2015
@@ -16,11 +16,9 @@
  */
 package org.apache.coyote.http11;
 
-import java.io.EOFException;
 import java.io.IOException;
 import java.net.SocketTimeoutException;
 import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
@@ -31,7 +29,6 @@ import org.apache.juli.logging.LogFactor
 import org.apache.tomcat.jni.Socket;
 import org.apache.tomcat.jni.Status;
 import org.apache.tomcat.util.buf.ByteChunk;
-import org.apache.tomcat.util.buf.MessageBytes;
 import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.SocketWrapperBase;
 
@@ -41,7 +38,7 @@ import org.apache.tomcat.util.net.Socket
  *
  * @author mailto:r...@apache.org";>Remy Maucherat
  */
-public class InternalAprInputBuffer extends AbstractInputBuffer {
+public class InternalAprInputBuffer extends AbstractNioInputBuffer {
 
 private static final Log log =
 LogFactory.getLog(InternalAprInputBuffer.class);
@@ -53,11 +50,8 @@ public class InternalAprInputBuffer exte
  * Alternate constructor.
  */
 public InternalAprInputBuffer(Request request, int headerBufferSize) {
+super(request, headerBufferSize);
 
-this.request = request;
-headers = request.getMimeHeaders();
-
-buf = new byte[headerBufferSize];
 if (headerBufferSize < (8 * 1024)) {
 bbuf = ByteBuffer.allocateDirect(6 * 1500);
 } else {
@@ -65,14 +59,6 @@ public class InternalAprInputBuffer exte
 }
 
 inputStreamInputBuffer = new SocketInputBuffer();
-
-filterLibrary = new InputFilter[0];
-activeFilters = new InputFilter[0];
-lastActiveFilter = -1;
-
-parsingHeader = true;
-swallowInput = true;
-
 }
 
 
@@ -108,432 +94,26 @@ public class InternalAprInputBuffer exte
 }
 
 
-/**
- * Read the request line. This function is meant to be used during the
- * HTTP request header parsing. Do NOT attempt to read the request body
- * using it.
- *
- * @throws IOException If an exception occurs during the underlying socket
- * read operations, or if the given buffer is not big enough to accommodate
- * the whole line.
- * @return true if data is properly fed; false if no data is available
- * immediately and thread should be freed
- */
-@Override
-public boolean parseRequestLine(boolean useAvailableData)
-throws IOException {
-
-int start = 0;
-
-//
-// Skipping blank lines
-//
-
-byte chr = 0;
-do {
-
-// Read new bytes if needed
-if (pos >= lastValid) {
-if (useAvailableData) {
-return false;
-}
-if (!fill(true))
-throw new EOFException(sm.getString("iib.eof.error"));
-}
-// Set the start time once we start reading data (even if it is
-// just skipping blank lines)
-if (request.getStartTime() < 0) {
-request.setStartTime(System.currentTimeMillis());
-}
-chr = buf[pos++];
-} while ((chr == Constants.CR) || (chr == Constants.LF));
-
-pos--;
-
-// Mark the current buffer position
-start = pos;
-
-if (pos >= lastValid) {
-if (useAvailableData) {
-return false;
-}
-if (!fill(true))
-throw new EOFException(sm.getString("iib.eof.error"));
-}
-
-//
-// Reading the method name
-// Method name is always US-ASCII
-//
-
-boolean space = false;
-
-while (!space) {
-
-// Read new bytes if needed
-if (pos >= lastValid) {
-if (!fill(true))
-throw new EOFException(sm.getString("iib.eof.error"));
-}
-
-// Spec says no CR or LF in method name
-if (buf[pos] == Constants.CR || buf[pos] == Constants.LF) {
-throw new IllegalArgumentExcep

svn commit: r1651390 - in /tomcat/trunk/java/org/apache: coyote/http11/InternalAprInputBuffer.java tomcat/util/net/AprEndpoint.java

[markt]

Author: markt
Date: Tue Jan 13 15:48:17 2015
New Revision: 1651390

URL: http://svn.apache.org/r1651390
Log:
Push InternalAprInputBuffer read down to AprSocketWrapper
- Remove socket level input buffer. The AbstractInputBuffer is
  sufficient
- Copy code to handle timeout return values to AprSocketWrapper
- Remove I/O code from InternalAprInputBuffer

Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.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=1651390&r1=1651389&r2=1651390&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Tue 
Jan 13 15:48:17 2015
@@ -17,17 +17,11 @@
 package org.apache.coyote.http11;
 
 import java.io.IOException;
-import java.net.SocketTimeoutException;
-import java.nio.ByteBuffer;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import org.apache.coyote.InputBuffer;
 import org.apache.coyote.Request;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.jni.Socket;
-import org.apache.tomcat.jni.Status;
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -51,32 +45,12 @@ public class InternalAprInputBuffer exte
  */
 public InternalAprInputBuffer(Request request, int headerBufferSize) {
 super(request, headerBufferSize);
-
-if (headerBufferSize < (8 * 1024)) {
-bbuf = ByteBuffer.allocateDirect(6 * 1500);
-} else {
-bbuf = ByteBuffer.allocateDirect((headerBufferSize / 1500 + 1) * 
1500);
-}
-
 inputStreamInputBuffer = new SocketInputBuffer();
 }
 
 
 // - Instance Variables
 
-
-/**
- * Direct byte buffer used to perform actual reading.
- */
-private final ByteBuffer bbuf;
-
-
-/**
- * Underlying socket.
- */
-private long socket;
-
-
 private SocketWrapperBase wrapper;
 
 
@@ -88,7 +62,6 @@ public class InternalAprInputBuffer exte
  */
 @Override
 public void recycle() {
-socket = 0;
 wrapper = null;
 super.recycle();
 }
@@ -106,15 +79,12 @@ public class InternalAprInputBuffer exte
 protected void init(SocketWrapperBase socketWrapper,
 AbstractEndpoint endpoint) throws IOException {
 
-socket = socketWrapper.getSocket().longValue();
 wrapper = socketWrapper;
 
-int bufLength = headerBufferSize + bbuf.capacity();
+int bufLength = Math.max(headerBufferSize, 8192);
 if (buf == null || buf.length < bufLength) {
 buf = new byte[bufLength];
 }
-
-Socket.setrbb(this.socket, bbuf);
 }
 
 
@@ -129,98 +99,16 @@ public class InternalAprInputBuffer exte
 (sm.getString("iib.requestheadertoolarge.error"));
 }
 } else {
-if (buf.length - end < 4500) {
-// In this case, the request header was really large, so we 
allocate a
-// brand new one; the old one will get GCed when subsequent 
requests
-// clear all references
-buf = new byte[buf.length];
-end = 0;
-}
-pos = end;
-lastValid = pos;
+lastValid = pos = end;
 }
 
-bbuf.clear();
-
-nRead = doReadSocket(block);
+nRead = wrapper.read(block, buf, pos, buf.length - pos);
 if (nRead > 0) {
-bbuf.limit(nRead);
-bbuf.get(buf, pos, nRead);
 lastValid = pos + nRead;
-} else if (-nRead == Status.EAGAIN) {
-return false;
-} else if ((-nRead) == Status.ETIMEDOUT || (-nRead) == Status.TIMEUP) {
-if (block) {
-throw new SocketTimeoutException(
-sm.getString("iib.readtimeout"));
-} else {
-// Attempting to read from the socket when the poller
-// has not signalled that there is data to read appears
-// to behave like a blocking read with a short timeout
-// on OSX rather than like a non-blocking read. If no
-// data is read, treat the resulting timeout like a
-// non-blocking read that returned no data.
-return false;
-}
-} else if (nRead == 0) {
-// APR_STATUS_IS_EOF, since native 1.1.22
-return false;
-} else {
-

[GitHub] tomcat pull request: now json is fashion

[ebourg]

Github user ebourg commented on the pull request:

https://github.com/apache/tomcat/pull/15#issuecomment-69768016
  
As I understand this pull request is more a request for enhancement than an 
actual code contribution. I guess you suggest that Tomcat implements the [W3C 
HTML JSON form submission](http://www.w3.org/TR/html-json-forms/) draft, 
correct? 


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

[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-69769556
  
yes,from Perspective of development. it is benifit  java ,it is benifit  
Tomcat ,our company has choice resin,if the problem keep alive, i maybe choice  
PHP or Python


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

[fschumacher]

Author: fschumacher
Date: Tue Jan 13 17:33:58 2015
New Revision: 1651420

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

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 13 17:33:58 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1651420&r1=1651419&r2=1651420&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java Tue Jan 
13 17:33:58 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;
@@ -496,7 +497,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);
@@ -523,7 +524,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);
@@ -689,6 +690,40 @@ public class Tomcat {
 }
 
 /**
+ * Create the configured 

svn commit: r1651421 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/ha/context/ReplicatedContext.java test/org/apache/catalina/ha/ webapps/docs/changelog.xml

[fschumacher]

Author: fschumacher
Date: Tue Jan 13 17:37:18 2015
New Revision: 1651421

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

Avoid NPE on shutdown of ReplicatedContext.

Added:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/ha/
  - copied from r1651120, tomcat/trunk/test/org/apache/catalina/ha/
Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 13 17:37:18 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java?rev=1651421&r1=1651420&r2=1651421&view=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java 
Tue Jan 13 17:37:18 2015
@@ -83,13 +83,15 @@ public class ReplicatedContext extends S
 @Override
 protected synchronized void stopInternal() throws LifecycleException {
 
+Map map = ((ReplApplContext) this.context)
+.getAttributeMap();
+
 super.stopInternal();
 
-Map map =
-((ReplApplContext)this.context).getAttributeMap();
 if ( map!=null && 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"));
+}

svn commit: r1651422 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/ha/context/TestReplicatedContext.java test/org/apache/catalina/startup/TestTomcat.java

[fschumacher]

Author: fschumacher
Date: Tue Jan 13 17:38:48 2015
New Revision: 1651422

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

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 13 17:38:48 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280

Modified: 
tomcat/tc8.0.x/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java?rev=1651422&r1=1651421&r2=1651422&view=diff
==
--- 
tomcat/tc8.0.x/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java
 Tue Jan 13 17:38:48 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.ht

svn commit: r1651437 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/Tomcat.java test/org/apache/catalina/startup/TestTomcat.java webapps/docs/changelog.xml

[fschumacher]

Author: fschumacher
Date: Tue Jan 13 18:19:53 2015
New Revision: 1651437

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

Merged r165142 from /tomcat/tc8.0.x/trunk (r1651116 from 
/tomcat/trunk:r1651116).

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 13 18:19:53 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1370549,1370553,1370879,1370916,13709

svn commit: r1651439 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ha/context/ReplicatedContext.java test/org/apache/catalina/ha/context/ test/org/apache/catalina/ha/context/TestReplicatedCo

[fschumacher]

Author: fschumacher
Date: Tue Jan 13 18:40:37 2015
New Revision: 1651439

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

Avoid NPE on shutdown of ReplicatedContext.

Merged r1651421 from /tomcat/tc8.0.x/trunk (merged r1651120 from 
/tomcat/trunk:r1651120).

Added:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/ha/context/

tomcat/tc7.0.x/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 13 18:40:37 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,136414

svn commit: r1651441 - in /tomcat/trunk/java/org/apache/tomcat/util/net: NioEndpoint.java SecureNioChannel.java

[markt]

Author: markt
Date: Tue Jan 13 19:03:30 2015
New Revision: 1651441

URL: http://svn.apache.org/r1651441
Log:
Remove NO-OP method from interface

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

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=1651441&r1=1651440&r2=1651441&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue Jan 13 
19:03:30 2015
@@ -1588,12 +1588,9 @@ public class NioEndpoint extends Abstrac
 }
 
 @Override
-public ByteBuffer expand(ByteBuffer buffer, int remaining) {return 
buffer;}
-@Override
 public ByteBuffer getReadBuffer() {return readbuf;}
 @Override
 public ByteBuffer getWriteBuffer() {return writebuf;}
-
 }
 
 //  Handler Inner Interface

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1651441&r1=1651440&r2=1651441&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Tue Jan 
13 19:03:30 2015
@@ -63,10 +63,6 @@ public class SecureNioChannel extends Ni
 //selector pool for blocking operations
 this.pool = pool;
 
-//ensure that the application has a large enough read/write buffers
-//by doing this, we should not encounter any buffer overflow errors
-bufHandler.expand(bufHandler.getReadBuffer(), appBufSize);
-bufHandler.expand(bufHandler.getWriteBuffer(), appBufSize);
 reset();
 }
 
@@ -531,7 +527,6 @@ public class SecureNioChannel extends Ni
  * when buffer overflow exceptions happen
  */
 public static interface ApplicationBufferHandler {
-public ByteBuffer expand(ByteBuffer buffer, int remaining);
 public ByteBuffer getReadBuffer();
 public ByteBuffer getWriteBuffer();
 }



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

svn commit: r1651446 - /tomcat/tc7.0.x/trunk/

[fschumacher]

Author: fschumacher
Date: Tue Jan 13 19:23:04 2015
New Revision: 1651446

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

Merged r1651422 from /tomcat/tc8.0.x/trunk (merged r1651280 from /tomcat/trunk).
(The change was already included mistakenly in r1651439)

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 13 19:23:04 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651421
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1370549,1370553,1370879,1370916,1370958,1370960,1370973,1371017,1371283,1371336,1371620,1371812,1371823,1371896,1371976,1371978,1371995,1371999,1372131,137

[Bug 57431] Enable custom context implementation when using embedded tomcat

[bugzilla]

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

Felix Schumacher  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Felix Schumacher  ---
Included in trunk (r1651116). Will be included in 8.0.18 (r165142) and 7.0.58
(r1651437).

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

[Bug 57425] ReplicatedContext implementation throws NullPointerException for attributes with null value

[bugzilla]

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

Felix Schumacher  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #5 from Felix Schumacher  ---
Included in trunk (r1651120, r1651280). Will be included in 8.0.18 (r1651421,
r1651422) and tomcat 7.0.58 (r1651439, r1651446).

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

[Bug 57425] ReplicatedContext implementation throws NullPointerException for attributes with null value

[bugzilla]

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

--- Comment #6 from Josh Landin  ---
Looks good. Thanks for the quick attention on this.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

svn commit: r1651470 - /tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java

[markt]

Author: markt
Date: Tue Jan 13 20:16:20 2015
New Revision: 1651470

URL: http://svn.apache.org/r1651470
Log:
Fix IDE warning

Modified:
tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.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=1651470&r1=1651469&r2=1651470&view=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 20:16:20 2015
@@ -38,7 +38,7 @@ import org.apache.tomcat.util.buf.ByteCh
 public class TestReplicatedContext extends TomcatBaseTest {
 
 @Test
-public void testBug57425() throws LifecycleException, IOException, 
ServletException {
+public void testBug57425() throws LifecycleException, IOException {
 Tomcat tomcat = getTomcatInstance();
 Host host = tomcat.getHost();
 if (host instanceof StandardHost) {



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

svn commit: r1651478 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractInputBuffer.java InternalAprInputBuffer.java InternalNio2InputBuffer.java InternalNioInputBuffer.java

[markt]

Author: markt
Date: Tue Jan 13 20:39:22 2015
New Revision: 1651478

URL: http://svn.apache.org/r1651478
Log:
checkpoint
 - add readByteBuffer

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

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java?rev=1651478&r1=1651477&r2=1651478&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java Tue Jan 
13 20:39:22 2015
@@ -118,10 +118,26 @@ public abstract class AbstractInputBuffe
 
 
 /**
- * Pointer to the current read buffer.
+ * The read buffer represented as a byte[].
+ * 
+ * SocketWrapper uses ByteBuffer (since reading from socket to ByteBuffer 
is
+ * the only API common to all current I/O implementations) but this class
+ * uses byte[] since that is more efficient for parsing. readByteBuffer
+ * therefore wraps buf. The byte[] representation is only used for reading.
+ * The ByteBuffer representation is only used for writing.
  */
 protected byte[] buf;
 
+/**
+ * The read buffer represented as a ByteBuffer.
+ * 
+ * SocketWrapper uses ByteBuffer (since reading from socket to ByteBuffer 
is
+ * the only API common to all current I/O implementations) but this class
+ * uses byte[] since that is more efficient for parsing. readByteBuffer
+ * therefore wraps buf. The byte[] representation is only used for reading.
+ * The ByteBuffer representation is only used for writing.
+ */
+protected ByteBuffer readByteBuffer;
 
 /**
  * Last valid byte.
@@ -371,6 +387,7 @@ public abstract class AbstractInputBuffe
 
 // Reset pointers
 lastValid = lastValid - pos;
+readByteBuffer.position(lastValid);
 pos = 0;
 lastActiveFilter = -1;
 parsingHeader = true;
@@ -631,6 +648,8 @@ public abstract class AbstractInputBuffe
 byte[] tmp = new byte[newsize];
 System.arraycopy(buf,0,tmp,0,buf.length);
 buf = tmp;
+readByteBuffer = ByteBuffer.wrap(buf);
+readByteBuffer.position(lastValid);
 }
 }
 

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=1651478&r1=1651477&r2=1651478&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Tue 
Jan 13 20:39:22 2015
@@ -17,6 +17,7 @@
 package org.apache.coyote.http11;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
 
 import org.apache.coyote.InputBuffer;
 import org.apache.coyote.Request;
@@ -84,6 +85,7 @@ public class InternalAprInputBuffer exte
 int bufLength = Math.max(headerBufferSize, 8192);
 if (buf == null || buf.length < bufLength) {
 buf = new byte[bufLength];
+readByteBuffer = ByteBuffer.wrap(buf);
 }
 }
 

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java?rev=1651478&r1=1651477&r2=1651478&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java Tue 
Jan 13 20:39:22 2015
@@ -146,6 +146,7 @@ public class InternalNio2InputBuffer ext
 int bufLength = headerBufferSize + socketReadBufferSize;
 if (buf == null || buf.length < bufLength) {
 buf = new byte[bufLength];
+readByteBuffer = ByteBuffer.wrap(buf);
 }
 
 // Initialize the completion handler

Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1651478&r1=1651477&r2=1651478&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Tue 
Jan 13 20:39:22 2015
@@ -98,6 +98,7 @@ public class InternalNioInputBuffe

Re: svn commit: r1651478 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractInputBuffer.java InternalAprInputBuffer.java InternalNio2InputBuffer.java InternalNioInputBuffer.java

[Mark Thomas]

On 13/01/2015 20:39, ma...@apache.org wrote:
> Author: markt
> Date: Tue Jan 13 20:39:22 2015
> New Revision: 1651478
> 
> URL: http://svn.apache.org/r1651478
> Log:
> checkpoint
>  - add readByteBuffer
> 
> Modified:
> tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
> tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
> tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java
> tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java

Sorry for the noise. This was meant to be a local git commit.

It shouldn't break anything but if it does feel free to revert it.

Mark

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

Re: svn commit: r1651470 - /tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java

[Felix Schumacher]

Am 13.01.2015 um 21:16 schrieb ma...@apache.org:

Author: markt
Date: Tue Jan 13 20:16:20 2015
New Revision: 1651470

URL: http://svn.apache.org/r1651470
Log:
Fix IDE warning

I have changed my ide settings now, so that it should not happen again.

I will merge the changes into tomcat 8 and 7 tomorrow, if you haven't 
done it by then.


Regards
 Felix


Modified:
 tomcat/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.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=1651470&r1=1651469&r2=1651470&view=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 20:16:20 2015
@@ -38,7 +38,7 @@ import org.apache.tomcat.util.buf.ByteCh
  public class TestReplicatedContext extends TomcatBaseTest {
  
  @Test

-public void testBug57425() throws LifecycleException, IOException, 
ServletException {
+public void testBug57425() throws LifecycleException, IOException {
  Tomcat tomcat = getTomcatInstance();
  Host host = tomcat.getHost();
  if (host instanceof StandardHost) {



-
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,
 and has been outstanding for 6 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 51 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-20150114-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-20150114/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150114.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150114-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-20150114/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-20150114.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/workspac

[Bug 57441] New: EL Lambda expression in a JSP fails with The function incr must be used with a prefix when a default namespace is not specified

[bugzilla]

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

Bug ID: 57441
   Summary: EL Lambda expression in a JSP fails with The function
incr must be used with a prefix when a default
namespace is not specified
   Product: Tomcat 8
   Version: 8.0.15
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: EL
  Assignee: dev@tomcat.apache.org
  Reporter: codeteste...@gmail.com

Run the following Lambda EL expression in a JSP 

${incr = x->x+1; incr(10)}

fails with this exception,

message /TestLambda.jsp (line: 59, column: 42) The function incr must be used
with a prefix when a default namespace is not specified

description The server encountered an internal error that prevented it from
fulfilling this request.

exception

org.apache.jasper.JasperException: /TestLambda.jsp (line: 59, column: 42) The
function incr must be used with a prefix when a default namespace is not
specified
   
org.apache.jasper.compiler.DefaultErrorHandler.jspError(DefaultErrorHandler.java:42)

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

[Bug 57441] EL Lambda expression in a JSP fails with The function incr must be used with a prefix when a default namespace is not specified

[bugzilla]

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

Konstantin Kolinko  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Konstantin Kolinko  ---
Reproducible in 8.0.17.

The exception occurs during Validator$ValidateVisitor.validateFunctions() call.

Stacktrace in 8.0.17:

 org.apache.jasper.JasperException: /test.jsp (line: 1, column: 9) The function
incr must be used with a prefix when a default namespace is not specified
at
org.apache.jasper.compiler.DefaultErrorHandler.jspError(DefaultErrorHandler.java:41)
at
org.apache.jasper.compiler.ErrorDispatcher.dispatch(ErrorDispatcher.java:275)
at
org.apache.jasper.compiler.ErrorDispatcher.jspError(ErrorDispatcher.java:107)
at
org.apache.jasper.compiler.Validator$ValidateVisitor$1FVVisitor.visit(Validator.java:1585)
at org.apache.jasper.compiler.ELNode$Function.accept(ELNode.java:139)
at org.apache.jasper.compiler.ELNode$Nodes.visit(ELNode.java:214)
at org.apache.jasper.compiler.ELNode$Visitor.visit(ELNode.java:256)
at org.apache.jasper.compiler.ELNode$Root.accept(ELNode.java:61)
at org.apache.jasper.compiler.ELNode$Nodes.visit(ELNode.java:214)
at
org.apache.jasper.compiler.Validator$ValidateVisitor.validateFunctions(Validator.java:1607)
at
org.apache.jasper.compiler.Validator$ValidateVisitor.prepareExpression(Validator.java:1612)
at
org.apache.jasper.compiler.Validator$ValidateVisitor.visit(Validator.java:750)
at org.apache.jasper.compiler.Node$ELExpression.accept(Node.java:950)
at org.apache.jasper.compiler.Node$Nodes.visit(Node.java:2376)
at org.apache.jasper.compiler.Node$Visitor.visitBody(Node.java:2428)
at org.apache.jasper.compiler.Node$Visitor.visit(Node.java:2434)
at org.apache.jasper.compiler.Node$Root.accept(Node.java:464)
at org.apache.jasper.compiler.Node$Nodes.visit(Node.java:2376)
at
org.apache.jasper.compiler.Validator.validateExDirectives(Validator.java:1846)
at org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:217)
at org.apache.jasper.compiler.Compiler.compile(Compiler.java:356)
at org.apache.jasper.compiler.Compiler.compile(Compiler.java:336)
at org.apache.jasper.compiler.Compiler.compile(Compiler.java:323)
at
org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:570)
at
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:356)
at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:396)
at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:340)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:725)

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

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

[Bill Barker]

To whom it may engage...

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

Project tomcat-tc7.0.x-validate has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-validate :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/index.html

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 29 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-7.0.x]
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-20150114.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-20150114.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150114.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20150114.jar:/srv/gump/packages/guava/guava-18.0.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-7.0.x/build.xml

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

compile-prepare:

download-validate:

proxyflags:

setproxy:

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

downloadfile:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-7.0.x/output/res/checkstyle
[checkstyle] Running Checkstyle 6.3-SNAPSHOT on 2581 files
[checkstyle] 
/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/catalina/startup/TestTomcat.java:56:
 Wrong order for 'org.apache.catalina.core.StandardHost' import.

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

Total time: 29 seconds
-

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

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

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

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

[Felix Schumacher]

Am 14. Januar 2015 08:15:55 MEZ, schrieb Bill Barker :
>To whom it may engage...
>
>This is an automated request, but not an unsolicited one. For 
>more information please visit http://gump.apache.org/nagged.html, 
>and/or contact the folk at gene...@gump.apache.org.
>
>Project tomcat-tc7.0.x-validate has an issue affecting its community
>integration.
>This issue affects 1 projects.
>The current state of this project is 'Failed', with reason 'Build
>Failed'.
>For reference only, the following projects are affected by this:
>- tomcat-tc7.0.x-validate :  Tomcat 7.x, a web server implementing Java
>Servlet 3.0,
>...
>
>
>Full details are available at:
>http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/index.html
>
>That said, some information snippets are provided here.
>
>The following annotations (debug/informational/warning/error messages)
>were provided:
>-DEBUG- Dependency on checkstyle exists, no need to add for property
>checkstyle.jar.
> -INFO- Failed with reason build failed
>
>
>
>The following work was performed:
>http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html
>Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build)
>Work ended in a state of : Failed
>Elapsed: 29 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-7.0.x]
>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-20150114.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-20150114.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150114.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20150114.jar:/srv/gump/packages/guava/guava-18.0.jar
>-
>Buildfile: /srv/gump/public/workspace/tomcat-7.0.x/build.xml
>
>build-prepare:
>[delete] Deleting directory
>/srv/gump/public/workspace/tomcat-7.0.x/output/build/temp
>[mkdir] Created dir:
>/srv/gump/public/workspace/tomcat-7.0.x/output/build/temp
>
>compile-prepare:
>
>download-validate:
>
>proxyflags:
>
>setproxy:
>
>testexist:
>[echo] Testing  for
>/srv/gump/public/workspace/checkstyle/target/checkstyle-6.3-SNAPSHOT.jar
>
>downloadfile:
>
>validate:
>[mkdir] Created dir:
>/srv/gump/public/workspace/tomcat-7.0.x/output/res/checkstyle
>[checkstyle] Running Checkstyle 6.3-SNAPSHOT on 2581 files
>[checkstyle]
>/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/catalina/startup/TestTomcat.java:56:
>Wrong order for 'org.apache.catalina.core.StandardHost' import.

Oops. I will correct it this evening, when I am home again. 


Regards
Felix 

>
>BUILD FAILED
>/srv/gump/public/workspace/tomcat-7.0.x/build.xml:510: Got 1 errors and
>0 warnings.
>
>Total time: 29 seconds
>-
>
>To subscribe to this information via syndicated feeds:
>- RSS:
>http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/rss.xml
>- Atom:
>http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/atom.xml
>
>== Gump Tracking Only ===
>Produced by Apache Gump(TM) version 2.3.
>Gump Run 20150114060004, vmgump.apache.org:vmgump:20150114060004
>Gump E-mail Identifier (unique within run) #1.
>
>--
>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


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

svn commit: r1651578 - /tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java

[violetagg]

Author: violetagg
Date: Wed Jan 14 07:41:59 2015
New Revision: 1651578

URL: http://svn.apache.org/r1651578
Log:
Correct import order.

Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java

Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1651578&r1=1651577&r2=1651578&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java 
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java Wed 
Jan 14 07:41:59 2015
@@ -49,12 +49,12 @@ 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.deploy.ContextEnvironment;
 import org.apache.catalina.deploy.ContextResourceLink;
+import org.apache.catalina.ha.context.ReplicatedContext;
 import org.apache.catalina.realm.GenericPrincipal;
 import org.apache.catalina.realm.RealmBase;
-import org.apache.catalina.core.StandardHost;
-import org.apache.catalina.ha.context.ReplicatedContext;
 import org.apache.tomcat.util.buf.ByteChunk;
 
 public class TestTomcat extends TomcatBaseTest {



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

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

[Violeta Georgieva]

2015-01-14 9:34 GMT+02:00 Felix Schumacher <
felix.schumac...@internetallee.de>:
>
>
>
> Am 14. Januar 2015 08:15:55 MEZ, schrieb Bill Barker <
billbar...@apache.org>:
> >To whom it may engage...
> >
> >This is an automated request, but not an unsolicited one. For
> >more information please visit http://gump.apache.org/nagged.html,
> >and/or contact the folk at gene...@gump.apache.org.
> >
> >Project tomcat-tc7.0.x-validate has an issue affecting its community
> >integration.
> >This issue affects 1 projects.
> >The current state of this project is 'Failed', with reason 'Build
> >Failed'.
> >For reference only, the following projects are affected by this:
> >- tomcat-tc7.0.x-validate :  Tomcat 7.x, a web server implementing Java
> >Servlet 3.0,
> >...
> >
> >
> >Full details are available at:
> >
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/index.html
> >
> >That said, some information snippets are provided here.
> >
> >The following annotations (debug/informational/warning/error messages)
> >were provided:
> >-DEBUG- Dependency on checkstyle exists, no need to add for property
> >checkstyle.jar.
> > -INFO- Failed with reason build failed
> >
> >
> >
> >The following work was performed:
> >
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html
> >Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build)
> >Work ended in a state of : Failed
> >Elapsed: 29 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-7.0.x]
> >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-20150114.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-20150114.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150114.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20150114.jar:/srv/gump/packages/guava/guava-18.0.jar
> >-
> >Buildfile: /srv/gump/public/workspace/tomcat-7.0.x/build.xml
> >
> >build-prepare:
> >[delete] Deleting directory
> >/srv/gump/public/workspace/tomcat-7.0.x/output/build/temp
> >[mkdir] Created dir:
> >/srv/gump/public/workspace/tomcat-7.0.x/output/build/temp
> >
> >compile-prepare:
> >
> >download-validate:
> >
> >proxyflags:
> >
> >setproxy:
> >
> >testexist:
> >[echo] Testing  for
> >/srv/gump/public/workspace/checkstyle/target/checkstyle-6.3-SNAPSHOT.jar
> >
> >downloadfile:
> >
> >validate:
> >[mkdir] Created dir:
> >/srv/gump/public/workspace/tomcat-7.0.x/output/res/checkstyle
> >[checkstyle] Running Checkstyle 6.3-SNAPSHOT on 2581 files
> >[checkstyle]
>
>/srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/catalina/startup/TestTomcat.java:56:
> >Wrong order for 'org.apache.catalina.core.StandardHost' import.
>
> Oops. I will correct it this evening, when I am home again.

I corrected it ;)

Regards,
Violeta

>
> Regards
> Felix
>
> >
> >BUILD FAILED
> >/srv/gump/public/workspace/tomcat-7.0.x/build.xml:510: Got 1 errors and
> >0 warnings.
> >
> >Total time: 29 seconds
> >-
> >
> >To subscribe to this information via syndicated feeds:
> >- RSS:
> >
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/rss.xml
> >- Atom:
> >
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/atom.xml
> >
> >== Gump Tracking Only ===
> >Produced by Apache Gump(TM) version 2.3.
> >Gump Run 20150114060004, vmgump.apache.org:vmgump:20150114060004
> >Gump E-mail Identifier (unique within run) #1.
> >
> >--
> >Apache Gump
> >http://gump.apache.org/ [Instance: vmgump]
> >
> >--