Re: svn commit: r1574785 - in /tomcat/trunk: java/org/apache/jasper/JspC.java java/org/apache/jasper/servlet/JspCServletContext.java test/org/apache/jasper/servlet/TestJspCServletContext.java

2014-03-06 Thread Konstantin Kolinko 
2014-03-06 11:40 GMT+04:00  :
> Author: markt
> Date: Thu Mar  6 07:40:12 2014
> New Revision: 1574785
>
> URL: http://svn.apache.org/r1574785
> Log:
> Better fix for BZ56199
> Fix failing unit tests caused by original fix.
>
> Modified:
> tomcat/trunk/java/org/apache/jasper/JspC.java
> tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
> tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java
>
> Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1574785&r1=1574784&r2=1574785&view=diff
> ==
> --- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
> +++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Mar  6 07:40:12 2014
> @@ -1463,17 +1463,11 @@ public class JspC extends Task implement
>  PrintWriter log = new PrintWriter(System.out);
>  URL resourceBase = new 
> File(uriRoot).getCanonicalFile().toURI().toURL();
>
> -context = new JspCServletContext(log, resourceBase, classLoader);
> +context = new JspCServletContext(log, resourceBase, classLoader,
> +isValidateXml(), isBlockExternal());
>  if (isValidateTld()) {
>  
> context.setInitParameter(Constants.XML_VALIDATION_TLD_INIT_PARAM, "true");
>  }
> -if (isValidateXml()) {
> -context.setInitParameter(Constants.XML_VALIDATION_INIT_PARAM, 
> "true");
> -}
> -context.setInitParameter(Constants.XML_BLOCK_EXTERNAL_INIT_PARAM,
> -String.valueOf(isBlockExternal()));


Aren't there classes in Jasper that are reading
Constants.XML_BLOCK_EXTERNAL_INIT_PARAM
init parameter.  With this change it is not set any more.

Though setting it can be moved into JspCServletContext constructor.

> -
> -context.processWebXml();
>
>  TldScanner scanner = new TldScanner(
>  context, true, isValidateTld(), isBlockExternal());
>
(...)

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

2014-03-06 Thread Bill Barker 
To whom it may engage...

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

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


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/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.
 -DEBUG- Dependency on tomcat-trunk exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/build/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html
Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build)
Work ended in a state of : Failed
Elapsed: 55 mins 53 secs
Command Line: /usr/lib/jvm/java-7-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.12-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140306-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar
 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20140306.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140306-native-src.tar.gz
 -Dtest.accesslog=true 
-Dcommons-pool.home=/srv/gump/public/workspace/apache-commons/pool 
-Dcommons-dbcp
 .home=/srv/gump/public/workspace/apache-commons/dbcp 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar
 
-Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/hamcrest-java/build/hamcrest-core-20140306.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-7-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/servle
 
t-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat
 
-trunk/output/build/lib/tomcat-spdy.jar:/srv/gump/public/workspace/tomcat-trunk/output/build

Re: svn commit: r1574785 - in /tomcat/trunk: java/org/apache/jasper/JspC.java java/org/apache/jasper/servlet/JspCServletContext.java test/org/apache/jasper/servlet/TestJspCServletContext.java

2014-03-06 Thread Mark Thomas 
On 06/03/2014 08:46, Konstantin Kolinko wrote:
> 2014-03-06 11:40 GMT+04:00  :
>> Author: markt
>> Date: Thu Mar  6 07:40:12 2014
>> New Revision: 1574785
>>
>> URL: http://svn.apache.org/r1574785
>> Log:
>> Better fix for BZ56199
>> Fix failing unit tests caused by original fix.
>>
>> Modified:
>> tomcat/trunk/java/org/apache/jasper/JspC.java
>> tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
>> tomcat/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java
>>
>> Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1574785&r1=1574784&r2=1574785&view=diff
>> ==
>> --- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
>> +++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Mar  6 07:40:12 2014
>> @@ -1463,17 +1463,11 @@ public class JspC extends Task implement
>>  PrintWriter log = new PrintWriter(System.out);
>>  URL resourceBase = new 
>> File(uriRoot).getCanonicalFile().toURI().toURL();
>>
>> -context = new JspCServletContext(log, resourceBase, classLoader);
>> +context = new JspCServletContext(log, resourceBase, classLoader,
>> +isValidateXml(), isBlockExternal());
>>  if (isValidateTld()) {
>>  
>> context.setInitParameter(Constants.XML_VALIDATION_TLD_INIT_PARAM, "true");
>>  }
>> -if (isValidateXml()) {
>> -context.setInitParameter(Constants.XML_VALIDATION_INIT_PARAM, 
>> "true");
>> -}
>> -context.setInitParameter(Constants.XML_BLOCK_EXTERNAL_INIT_PARAM,
>> -String.valueOf(isBlockExternal()));
> 
> 
> Aren't there classes in Jasper that are reading
> Constants.XML_BLOCK_EXTERNAL_INIT_PARAM
> init parameter.  With this change it is not set any more.
> 
> Though setting it can be moved into JspCServletContext constructor.

Yes. I'll get that fixed.

The XML validation constant can be removed though. It is no longer used.

Mark


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

svn commit: r1574809 - in /tomcat/trunk/java/org/apache/jasper: Constants.java servlet/JspCServletContext.java

2014-03-06 Thread markt 
Author: markt
Date: Thu Mar  6 08:58:31 2014
New Revision: 1574809

URL: http://svn.apache.org/r1574809
Log:
Follow up to r1574785
- Ensure blockExternal init param is set
- Remove unused constant

Modified:
tomcat/trunk/java/org/apache/jasper/Constants.java
tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java

Modified: tomcat/trunk/java/org/apache/jasper/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/Constants.java?rev=1574809&r1=1574808&r2=1574809&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/trunk/java/org/apache/jasper/Constants.java Thu Mar  6 08:58:31 2014
@@ -162,16 +162,6 @@ public class Constants {
 "org.apache.jasper.XML_VALIDATE_TLD";
 
 /**
- * Name of the ServletContext init-param that determines if the XML parser
- * used for web.xml files will be validating or not. Note that this is only
- * used when using JspC. In normal operation, Jasper obtains the JspConfig
- * information directly from the ServletContext and therefore does not need
- * to parse web.xml.
- */
-public static final String XML_VALIDATION_INIT_PARAM =
-"org.apache.jasper.XML_VALIDATE";
-
-/**
  * Name of the ServletContext init-param that determines if the XML parsers
  * will block the resolution of external entities.
  * 

Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1574809&r1=1574808&r2=1574809&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Thu Mar 
 6 08:58:31 2014
@@ -45,6 +45,7 @@ import javax.servlet.SessionCookieConfig
 import javax.servlet.SessionTrackingMode;
 import javax.servlet.descriptor.JspConfigDescriptor;
 
+import org.apache.jasper.Constants;
 import org.apache.jasper.JasperException;
 import org.apache.jasper.compiler.Localizer;
 import org.apache.jasper.util.ExceptionUtils;
@@ -126,6 +127,8 @@ public class JspCServletContext implemen
 
 myAttributes = new HashMap<>();
 myParameters = new ConcurrentHashMap<>();
+myParameters.put(Constants.XML_BLOCK_EXTERNAL_INIT_PARAM,
+String.valueOf(blockExternal));
 myLogWriter = aLogWriter;
 myResourceBaseURL = aResourceBaseURL;
 this.loader = classLoader;



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

buildbot success in ASF Buildbot on tomcat-trunk

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

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

Buildslave for this Build: bb-vm_ubuntu

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

Build succeeded!

sincerely,
 -The Buildbot

[Bug 56190] Connection keep-alive not working with asynchronous servlet

2014-03-06 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=56190

--- Comment #9 from Mark Thomas  ---
I have the first pass at a fix for this ready. The required changes are minimal
but it breaks a lot of unit tests. The unit tests depend on being able to write
to the response after the async complete. I need to implement an alternative
solution for these tests.

-- 
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 56215] sendError doesn't send error page with AsyncContext

2014-03-06 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=56215

--- Comment #2 from alexalta...@gmail.com ---
Thank you. Is there a way to reproduce the synchronous behaviour easily?

-- 
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: r1574923 - in /tomcat/trunk: java/org/apache/catalina/core/AsyncContextImpl.java java/org/apache/coyote/AsyncContextCallback.java java/org/apache/coyote/AsyncStateMachine.java test/org/apa

2014-03-06 Thread markt 
Author: markt
Date: Thu Mar  6 15:36:29 2014
New Revision: 1574923

URL: http://svn.apache.org/r1574923
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56190
AsyncContext.complete() should close the response. dispatch() should be used if 
further output to the response is required.

Modified:
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
tomcat/trunk/java/org/apache/coyote/AsyncContextCallback.java
tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java

Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=1574923&r1=1574922&r2=1574923&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Thu Mar  6 
15:36:29 2014
@@ -83,13 +83,14 @@ public class AsyncContextImpl implements
 logDebug("complete   ");
 }
 check();
-request.getCoyoteRequest().action(ActionCode.COMMIT, null);
 request.getCoyoteRequest().action(ActionCode.ASYNC_COMPLETE, null);
 clearServletRequestResponse();
 }
 
 @Override
-public void fireOnComplete() {
+public void fireOnComplete() throws IOException {
+// Before firing the event, close the response
+request.getResponse().finishResponse();
 List listenersCopy = new ArrayList<>();
 listenersCopy.addAll(listeners);
 

Modified: tomcat/trunk/java/org/apache/coyote/AsyncContextCallback.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AsyncContextCallback.java?rev=1574923&r1=1574922&r2=1574923&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AsyncContextCallback.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AsyncContextCallback.java Thu Mar  6 
15:36:29 2014
@@ -16,6 +16,8 @@
  */
 package org.apache.coyote;
 
+import java.io.IOException;
+
 /**
  * Provides a mechanism for the Coyote connectors to signal to a
  * {@link javax.servlet.AsyncContext} implementation that an action, such as
@@ -24,5 +26,5 @@ package org.apache.coyote;
  * org.apache.coyote package.
  */
 public interface AsyncContextCallback {
-public void fireOnComplete();
+public void fireOnComplete() throws IOException;
 }

Modified: tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1574923&r1=1574922&r2=1574923&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java Thu Mar  6 
15:36:29 2014
@@ -16,6 +16,7 @@
  */
 package org.apache.coyote;
 
+import java.io.IOException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
@@ -203,11 +204,21 @@ public class AsyncStateMachine {
 state = AsyncState.STARTED;
 return SocketState.LONG;
 } else if (state == AsyncState.MUST_COMPLETE) {
-asyncCtxt.fireOnComplete();
+try {
+asyncCtxt.fireOnComplete();
+} catch (IOException e) {
+// Socket is in unknown state. Close it.
+return SocketState.CLOSED;
+}
 state = AsyncState.DISPATCHED;
 return SocketState.ASYNC_END;
 } else if (state == AsyncState.COMPLETING) {
-asyncCtxt.fireOnComplete();
+try {
+asyncCtxt.fireOnComplete();
+} catch (IOException e) {
+// Socket is in unknown state. Close it.
+return SocketState.CLOSED;
+}
 state = AsyncState.DISPATCHED;
 return SocketState.ASYNC_END;
 } else if (state == AsyncState.MUST_DISPATCH) {

Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1574923&r1=1574922&r2=1574923&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Thu 
Mar  6 15:36:29 2014
@@ -14,12 +14,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.apache.catalina.core;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.HashMap;
 import java.util.LinkedHashM

svn commit: r1574936 - /tomcat/trunk/webapps/docs/changelog.xml

2014-03-06 Thread markt 
Author: markt
Date: Thu Mar  6 15:58:06 2014
New Revision: 1574936

URL: http://svn.apache.org/r1574936
Log:
Update changelog

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1574936&r1=1574935&r2=1574936&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Mar  6 15:58:06 2014
@@ -86,6 +86,11 @@
 while web application is being stopped, print their stack traces to
 the log. (kkolinko)
   
+  
+56190: The response should be closed (i.e. no further output
+is permitted) when a call to AsyncContext.complete() takes
+effect. (markt)
+  
 
   
   



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

svn commit: r1574937 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/coyote/ test/org/apache/catalina/core/ webapps/docs/

2014-03-06 Thread markt 
Author: markt
Date: Thu Mar  6 15:59:03 2014
New Revision: 1574937

URL: http://svn.apache.org/r1574937
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56190
AsyncContext.complete() should close the response. dispatch() should be used if 
further output to the response is required.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncContextCallback.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1574923,1574936

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=1574937&r1=1574936&r2=1574937&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java 
Thu Mar  6 15:59:03 2014
@@ -88,12 +88,13 @@ public class AsyncContextImpl implements
 logDebug("complete   ");
 }
 check();
-request.getCoyoteRequest().action(ActionCode.COMMIT, null);
 request.getCoyoteRequest().action(ActionCode.ASYNC_COMPLETE, null);
 }
 
 @Override
-public void fireOnComplete() {
+public void fireOnComplete() throws IOException {
+// Before firing the event, close the response
+request.getResponse().finishResponse();
 List listenersCopy =
 new ArrayList();
 listenersCopy.addAll(listeners);

Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncContextCallback.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncContextCallback.java?rev=1574937&r1=1574936&r2=1574937&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncContextCallback.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncContextCallback.java Thu 
Mar  6 15:59:03 2014
@@ -16,6 +16,8 @@
  */
 package org.apache.coyote;
 
+import java.io.IOException;
+
 /**
  * Provides a mechanism for the Coyote connectors to signal to a
  * {@link javax.servlet.AsyncContext} implementation that an action, such as
@@ -24,5 +26,5 @@ package org.apache.coyote;
  * org.apache.coyote package.  
  */
 public interface AsyncContextCallback {
-public void fireOnComplete();
+public void fireOnComplete() throws IOException;
 }

Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1574937&r1=1574936&r2=1574937&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java Thu Mar  
6 15:59:03 2014
@@ -16,6 +16,7 @@
  */
 package org.apache.coyote;
 
+import java.io.IOException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
@@ -187,11 +188,21 @@ public class AsyncStateMachine {
 state = AsyncState.STARTED;
 return SocketState.LONG;
 } else if (state == AsyncState.MUST_COMPLETE) {
-asyncCtxt.fireOnComplete();
+try {
+asyncCtxt.fireOnComplete();
+} catch (IOException e) {
+// Socket is in unknown state. Close it.
+return SocketState.CLOSED;
+}
 state = AsyncState.DISPATCHED;
 return SocketState.ASYNC_END;
 } else if (state == AsyncState.COMPLETING) {
-asyncCtxt.fireOnComplete();
+try {
+asyncCtxt.fireOnComplete();
+} catch (IOException e) {
+// Socket is in unknown state. Close it.
+return SocketState.CLOSED;
+}
 state = AsyncState.DISPATCHED;
 return SocketState.ASYNC_END;
 } else if (state == AsyncState.MUST_DISPATCH) {

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1574937&r1=1574936&r2=1574937&view=diff
==
--- 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/tes

[Bug 56190] Connection keep-alive not working with asynchronous servlet

2014-03-06 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=56190

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

--- Comment #10 from Mark Thomas  ---
This has been fixed in 7.0.x for 7.0.53 onwards and in 8.0.x for 8.0.4 onwards.

-- 
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: r1574943 - in /tomcat/trunk: java/org/apache/catalina/core/ApplicationContext.java java/org/apache/catalina/core/LocalStrings.properties test/org/apache/catalina/core/TestApplicationContex

2014-03-06 Thread markt 
Author: markt
Date: Thu Mar  6 16:19:44 2014
New Revision: 1574943

URL: http://svn.apache.org/r1574943
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56223
Throw an IllegalStateException if a call is made to 
ServletContext.setInitParameter() after the ServletContext has been initialized

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1574943&r1=1574942&r2=1574943&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Thu Mar  
6 16:19:44 2014
@@ -1200,6 +1200,12 @@ public class ApplicationContext
 
 @Override
 public boolean setInitParameter(String name, String value) {
+if (!context.getState().equals(LifecycleState.STARTING_PREP)) {
+throw new IllegalStateException(
+sm.getString("applicationContext.setInitParam.ise",
+getContextPath()));
+}
+
 return parameters.putIfAbsent(name, value) == null;
 }
 

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1574943&r1=1574942&r2=1574943&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Thu Mar  
6 16:19:44 2014
@@ -29,6 +29,7 @@ applicationContext.resourcePaths.iae=Pat
 applicationContext.role.iae=An individual role to declare for context [{0}] 
may not be null nor the empty string
 applicationContext.roles.iae=Array of roles to declare for context [{0}] 
cannot be null
 applicationContext.setAttribute.namenull=Name cannot be null
+applicationContext.setInitParam.ise=Initialization parameters can not be set 
after the context has been initialized
 applicationContext.setSessionTracking.ise=The session tracking modes for 
context {0} cannot be set whilst the context is running
 applicationContext.setSessionTracking.iae.invalid=The session tracking mode 
{0} requested for context {1} is not supported by that context
 applicationContext.setSessionTracking.iae.ssl=The session tracking modes 
requested for context {0} included SSL and at least one other mode. SSL may not 
be configured with other modes.

Modified: tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java?rev=1574943&r1=1574942&r2=1574943&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java Thu 
Mar  6 16:19:44 2014
@@ -157,4 +157,11 @@ public class TestApplicationContext exte
 
 return standardContext.getServletContext();
 }
+
+
+@Test(expected = IllegalStateException.class)
+public void testSetInitParameter() throws Exception {
+getTomcatInstance().start();
+getServletContext().setInitParameter("name", "value");
+}
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1574943&r1=1574942&r2=1574943&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Mar  6 16:19:44 2014
@@ -128,6 +128,11 @@
 56199: Restore validateXml option for JspC which determines
 if web.xml will be parsed with a validating parser. (markt)
   
+  
+56223: Throw an IllegalStateException if a call
+is made to ServletContext.setInitParameter() after the
+ServletContext has been initialized. (markt)
+  
 
   
   



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

[Bug 56223] ServletContext#setInitParameter(..) does not throw IllegalStateException after it's been initialized

2014-03-06 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=56223

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Thanks for the report.

This has been fixed in 7.0.x for 7.0.53 onwards and in 8.0.x for 8.0.4 onwards.

-- 
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: r1574944 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationContext.java java/org/apache/catalina/core/LocalStrings.properties test/org/apache/catalina/core/TestApplic

2014-03-06 Thread markt 
Author: markt
Date: Thu Mar  6 16:21:11 2014
New Revision: 1574944

URL: http://svn.apache.org/r1574944
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56223
Throw an IllegalStateException if a call is made to 
ServletContext.setInitParameter() after the ServletContext has been initialized

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties

tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1574943

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1574944&r1=1574943&r2=1574944&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java 
Thu Mar  6 16:21:11 2014
@@ -1280,6 +1280,12 @@ public class ApplicationContext
 
 @Override
 public boolean setInitParameter(String name, String value) {
+if (!context.getState().equals(LifecycleState.STARTING_PREP)) {
+throw new IllegalStateException(
+sm.getString("applicationContext.setInitParam.ise",
+getContextPath()));
+}
+
 return parameters.putIfAbsent(name, value) == null;
 }
 

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1574944&r1=1574943&r2=1574944&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties 
Thu Mar  6 16:21:11 2014
@@ -30,6 +30,7 @@ applicationContext.role.iae=An individua
 applicationContext.roles.iae=Array of roles to declare for context [{0}] 
cannot be null
 applicationContext.setAttribute.namenull=Name cannot be null
 applicationContext.addSessionCookieConfig.ise=Session Cookie configuration 
cannot be set for context {0} as the context has been initialised
+applicationContext.setInitParam.ise=Initialization parameters can not be set 
after the context has been initialized
 applicationContext.setSessionTracking.ise=The session tracking modes for 
context {0} cannot be set whilst the context is running
 applicationContext.setSessionTracking.iae.invalid=The session tracking mode 
{0} requested for context {1} is not supported by that context
 applicationContext.setSessionTracking.iae.ssl=The session tracking modes 
requested for context {0} included SSL and at least one other mode. SSL may not 
be configured with other modes.

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java?rev=1574944&r1=1574943&r2=1574944&view=diff
==
--- 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java 
Thu Mar  6 16:21:11 2014
@@ -127,4 +127,11 @@ public class TestApplicationContext exte
 
 return standardContext.getServletContext();
 }
+
+
+@Test(expected = IllegalStateException.class)
+public void testSetInitParameter() throws Exception {
+getTomcatInstance().start();
+getServletContext().setInitParameter("name", "value");
+}
 }

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1574944&r1=1574943&r2=1574944&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar  6 16:21:11 2014
@@ -102,6 +102,11 @@
 validation of web.xml files when Jasper parses them and validateTld
 controls the validation of *.tld files when Jasper parses them. (markt)
   
+  
+56223: Throw an IllegalStateException if a call
+is made to ServletContext.setInitParameter() after the
+ServletContext has been initialized. (markt)
+  
 
   
   



-
To unsubscribe, e-mai

buildbot success in ASF Buildbot on tomcat-7-trunk

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

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1574937
Blamelist: markt

Build succeeded!

sincerely,
 -The Buildbot

buildbot failure in ASF Buildbot on tomcat-7-trunk

2014-03-06 Thread buildbot 
The Buildbot has detected a new failure on builder tomcat-7-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-7-trunk/builds/1792

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1574944
Blamelist: markt

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot

JDK 8 : Third Release Candidate - Build 132 is available on java.net

2014-03-06 Thread Rory O'Donnell Oracle, Dublin Ireland 

Hi Mladen,

JDK 8 Third Release Candidate , Build 132 is now available for download 
 & test.

Please log all show stopper issues as soon as possible.

Rgds,Rory

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

Re: buildbot failure in ASF Buildbot on tomcat-7-trunk

2014-03-06 Thread Konstantin Kolinko 
2014-03-06 22:04 GMT+04:00  :
> The Buildbot has detected a new failure on builder tomcat-7-trunk while 
> building ASF Buildbot.
> Full details are available at:
>  http://ci.apache.org/builders/tomcat-7-trunk/builds/1792
>
> Buildbot URL: http://ci.apache.org/
>
> Buildslave for this Build: bb-vm_ubuntu
>
> Build Reason: scheduler
> Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1574944
> Blamelist: markt
>
> BUILD FAILED: failed compile_1
>


org.apache.jasper.compiler.TestELInterpreterFactory
(BIO, NIO)
[[[
Testcase: testBug54239 took 5.942 sec
Caused an ERROR
Initialization parameters can not be set after the context has been initialized
java.lang.IllegalStateException: Initialization parameters can not be
set after the context has been initialized
at 
org.apache.catalina.core.ApplicationContext.setInitParameter(ApplicationContext.java:1284)
at 
org.apache.catalina.core.ApplicationContextFacade.setInitParameter(ApplicationContextFacade.java:624)
at 
org.apache.jasper.compiler.TestELInterpreterFactory.testBug54239(TestELInterpreterFactory.java:79)
]]]

http://ci.apache.org/projects/tomcat/tomcat7/logs/1574944/TEST-org.apache.jasper.compiler.TestELInterpreterFactory.BIO.txt

So the good news is that IllegalStateException patch (r1574944) works.
It is this test case that is broken.


Best regards,
Konstantin Kolinko

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

svn commit: r1575012 - /tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java

2014-03-06 Thread markt 
Author: markt
Date: Thu Mar  6 19:08:23 2014
New Revision: 1575012

URL: http://svn.apache.org/r1575012
Log:
Fix broken test, uncovered by the fix for BZ 56223.

Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java

Modified: 
tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java?rev=1575012&r1=1575011&r2=1575012&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java 
(original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java 
Thu Mar  6 19:08:23 2014
@@ -19,6 +19,8 @@ package org.apache.jasper.compiler;
 import java.io.File;
 
 import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -28,6 +30,7 @@ import org.apache.catalina.startup.Tomca
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.jasper.JspCompilationContext;
 import org.apache.jasper.compiler.ELInterpreterFactory.DefaultELInterpreter;
+import org.apache.tomcat.util.descriptor.web.ApplicationListener;
 
 public class TestELInterpreterFactory extends TomcatBaseTest {
 
@@ -75,14 +78,27 @@ public class TestELInterpreterFactory ex
 
 context.removeAttribute(ELInterpreter.class.getName());
 
+ctx.stop();
+ctx.addApplicationListener((new ApplicationListener(
+Bug54239Listener.class.getName(), false)));
+ctx.start();
 
-context.setInitParameter(ELInterpreter.class.getName(),
-SimpleELInterpreter.class.getName());
-
-interpreter = ELInterpreterFactory.getELInterpreter(context);
+interpreter = 
ELInterpreterFactory.getELInterpreter(ctx.getServletContext());
 Assert.assertNotNull(interpreter);
 Assert.assertTrue(interpreter instanceof SimpleELInterpreter);
+}
 
-context.removeAttribute(ELInterpreter.class.getName());
+public static class Bug54239Listener implements ServletContextListener {
+
+@Override
+public void contextInitialized(ServletContextEvent sce) {
+
sce.getServletContext().setInitParameter(ELInterpreter.class.getName(),
+SimpleELInterpreter.class.getName());
+}
+
+@Override
+public void contextDestroyed(ServletContextEvent sce) {
+// NO-OP
+}
 }
 }



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

Re: buildbot failure in ASF Buildbot on tomcat-7-trunk

2014-03-06 Thread Mark Thomas 
On 06/03/2014 18:12, Konstantin Kolinko wrote:



> So the good news is that IllegalStateException patch (r1574944) works.
> It is this test case that is broken.

Fixed.

Mark


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

svn commit: r1575015 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/jasper/compiler/TestELInterpreterFactory.java

2014-03-06 Thread markt 
Author: markt
Date: Thu Mar  6 19:12:21 2014
New Revision: 1575015

URL: http://svn.apache.org/r1575015
Log:
Fix broken test, uncovered by the fix for BZ 56223.

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

tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1575012

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java?rev=1575015&r1=1575014&r2=1575015&view=diff
==
--- 
tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java
 Thu Mar  6 19:12:21 2014
@@ -19,11 +19,14 @@ package org.apache.jasper.compiler;
 import java.io.File;
 
 import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.catalina.Context;
+import org.apache.catalina.deploy.ApplicationListener;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.jasper.JspCompilationContext;
@@ -75,14 +78,27 @@ public class TestELInterpreterFactory ex
 
 context.removeAttribute(ELInterpreter.class.getName());
 
+ctx.stop();
+ctx.addApplicationListener((new ApplicationListener(
+Bug54239Listener.class.getName(), false)));
+ctx.start();
 
-context.setInitParameter(ELInterpreter.class.getName(),
-SimpleELInterpreter.class.getName());
-
-interpreter = ELInterpreterFactory.getELInterpreter(context);
+interpreter = 
ELInterpreterFactory.getELInterpreter(ctx.getServletContext());
 Assert.assertNotNull(interpreter);
 Assert.assertTrue(interpreter instanceof SimpleELInterpreter);
+}
 
-context.removeAttribute(ELInterpreter.class.getName());
+public static class Bug54239Listener implements ServletContextListener {
+
+@Override
+public void contextInitialized(ServletContextEvent sce) {
+
sce.getServletContext().setInitParameter(ELInterpreter.class.getName(),
+SimpleELInterpreter.class.getName());
+}
+
+@Override
+public void contextDestroyed(ServletContextEvent sce) {
+// NO-OP
+}
 }
 }



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

buildbot failure in ASF Buildbot on tomcat-trunk

2014-03-06 Thread buildbot 
The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/5562

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

Buildslave for this Build: bb-vm_ubuntu

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

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot

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

2014-03-06 Thread Bill Barker 
To whom it may engage...

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

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


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/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.
 -DEBUG- Dependency on tomcat-trunk exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/build/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html
Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build)
Work ended in a state of : Failed
Elapsed: 55 mins 36 secs
Command Line: /usr/lib/jvm/java-7-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.12-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140306-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar
 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20140306.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140306-native-src.tar.gz
 -Dtest.accesslog=true 
-Dcommons-pool.home=/srv/gump/public/workspace/apache-commons/pool 
-Dcommons-dbcp
 .home=/srv/gump/public/workspace/apache-commons/dbcp 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar
 
-Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/hamcrest-java/build/hamcrest-core-20140306.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-7-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/servle
 
t-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat
 
-trunk/output/build/lib/tomcat-spdy.jar:/srv/gump/public/workspace/tomcat-trunk/output/build

buildbot success in ASF Buildbot on tomcat-trunk

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

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

Buildslave for this Build: bb-vm_ubuntu

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

Build succeeded!

sincerely,
 -The Buildbot