5:19 p.m.
Author: remy.maucherat(a)jboss.com
Date: 2009-03-18 12:19:55 -0400 (Wed, 18 Mar 2009)
New Revision: 962
Modified:
trunk/ROADMAP.txt
trunk/java/org/apache/catalina/connector/Connector.java
trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
trunk/java/org/apache/catalina/core/StandardWrapperValve.java
trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
Log:
- Use the ioEvents flag (true only for the APR HTTP connector).
- Functionality with no IO events will be exposed through the Servlet 3.0 async API.
Modified: trunk/ROADMAP.txt
===================================================================
--- trunk/ROADMAP.txt 2009-03-18 12:46:31 UTC (rev 961)
+++ trunk/ROADMAP.txt 2009-03-18 16:19:55 UTC (rev 962)
@@ -2,13 +2,13 @@
Main development:
- Setup standalone TCK environment for testing compliance with the new features
-- Implement Servlet 3.0 async over current IO events
+- Servlet 3.0 async API over IO events
- Update digester XML parsing rules for web.xml updates
-- Implement new APIs for programmatic deployment descriptor access
-- Implement annotation scanning for JBoss Web standalone (likely disabled by default
using conf/web.xml)
-- Implement any other Servlet 3.0 changes (web.xml fragments, security, etc)
-- Implement JSP 2.2 changes
-- Implement EL 1.1 changes
+- Annotation scanning for JBoss Web standalone (likely disabled by default using
conf/web.xml)
+- Multipart support (and remove fileupload)
+- Other Servlet 3.0 changes (web.xml fragments, security, etc)
+- JSP 2.2 changes
+- EL 1.1 changes
- Coordinate with AS 6 to implement new web.xml parsing (out of tree)
- JBoss Metadata parsing of .tld files (out of tree)
- Coordinate with AS 6 for annotation updates (out of tree)
Modified: trunk/java/org/apache/catalina/connector/Connector.java
===================================================================
--- trunk/java/org/apache/catalina/connector/Connector.java 2009-03-18 12:46:31 UTC (rev
961)
+++ trunk/java/org/apache/catalina/connector/Connector.java 2009-03-18 16:19:55 UTC (rev
962)
@@ -879,6 +879,16 @@
/**
+ * Indicates if the protocol handler support IO events.
+ *
+ * @return true if IO events are supported
+ */
+ public boolean hasIoEvents() {
+ return protocolHandler.hasIoEvents();
+ }
+
+
+ /**
* Enables or disables the generation of an X-Powered-By header (with value
* Servlet/2.4) for all servlet-generated responses returned by this
* Connector.
Modified: trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
===================================================================
--- trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2009-03-18 12:46:31 UTC
(rev 961)
+++ trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2009-03-18 16:19:55 UTC
(rev 962)
@@ -315,7 +315,7 @@
}
if (connector.getXpoweredBy()) {
- response.addHeader("X-Powered-By", "Servlet/2.5");
+ response.addHeader("X-Powered-By", "Servlet/3.0");
}
boolean comet = false;
Modified: trunk/java/org/apache/catalina/core/StandardWrapperValve.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardWrapperValve.java 2009-03-18 12:46:31 UTC
(rev 961)
+++ trunk/java/org/apache/catalina/core/StandardWrapperValve.java 2009-03-18 16:19:55 UTC
(rev 962)
@@ -157,10 +157,11 @@
servlet = null;
}
- // Identify if the request is Comet related now that the servlet has been
allocated
+ // Identify if the request should be switched to event mode now that
+ // the servlet has been allocated
boolean comet = false;
if (servlet instanceof HttpEventServlet
- &&
request.getAttribute("org.apache.tomcat.comet.support") == Boolean.TRUE) {
+ && request.getConnector().hasIoEvents()) {
comet = true;
request.setComet(true);
}
Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
===================================================================
--- trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2009-03-18 12:46:31 UTC
(rev 961)
+++ trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 2009-03-18 16:19:55 UTC
(rev 962)
@@ -1475,8 +1475,6 @@
if (endpoint.getUseSendfile()) {
request.setAttribute("org.apache.tomcat.sendfile.support",
Boolean.TRUE);
}
- // Advertise comet support through a request attribute
- request.setAttribute("org.apache.tomcat.comet.support", Boolean.TRUE);
}