Author: remy.maucherat(a)jboss.com Date: 2013-03-06 11:31:29 -0500 (Wed, 06 Mar 2013) New Revision: 2174 Modified: branches/8.0.x/.classpath branches/8.0.x/pom.xml branches/8.0.x/src/main/java/org/apache/catalina/connector/Connector.java branches/8.0.x/src/main/java/org/apache/catalina/connector/CoyoteInputStream.java branches/8.0.x/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java branches/8.0.x/src/main/java/org/apache/catalina/connector/Request.java branches/8.0.x/src/main/java/org/apache/catalina/connector/RequestFacade.java branches/8.0.x/src/main/java/org/apache/catalina/connector/Response.java branches/8.0.x/src/main/java/org/apache/catalina/connector/ResponseFacade.java branches/8.0.x/src/main/java/org/apache/catalina/core/DummyRequest.java branches/8.0.x/src/main/java/org/apache/catalina/core/DummyResponse.java branches/8.0.x/src/main/java/org/apache/catalina/filters/ExpiresFilter.java branches/8.0.x/src/main/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java branches/8.0.x/src/main/java/org/apache/jasper/compiler/JDTCompiler.java branches/8.0.x/src/main/java/org/apache/jasper/tagplugins/jstl/Util.java branches/8.0.x/src/main/java/org/jboss/web/CatalinaMessages.java branches/8.0.x/webapps/docs/changelog.xml Log: Dependencies updates, plus do the basics so that it builds. Modified: branches/8.0.x/.classpath =================================================================== --- branches/8.0.x/.classpath 2013-03-05 10:51:21 UTC (rev 2173) +++ branches/8.0.x/.classpath 2013-03-06 16:31:29 UTC (rev 2174) @@ -3,9 +3,9 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry kind="lib" path="/home/remm/.m2/repository/org/jboss/logging/jboss-logging/3.1.1.GA/jboss-logging-3.1.1.GA.jar"/> - <classpathentry kind="lib" path="/home/remm/.m2/repository/org/jboss/spec/javax/servlet/jboss-servlet-api_3.0_spec/1.0.1.Final/jboss-servlet-api_3.0_spec-1.0.1.Final.jar"/> <classpathentry kind="lib" path="/home/remm/.m2/repository/org/jboss/spec/javax/servlet/jsp/jboss-jsp-api_2.2_spec/1.0.1.Final/jboss-jsp-api_2.2_spec-1.0.1.Final.jar"/> <classpathentry kind="lib" path="/home/remm/.m2/repository/org/jboss/spec/javax/el/jboss-el-api_2.2_spec/1.0.1.Final/jboss-el-api_2.2_spec-1.0.1.Final.jar"/> - <classpathentry kind="lib" path="/home/remm/.m2/repository/org/jboss/web/jasper-jdt/7.0.3.Final/jasper-jdt-7.0.3.Final.jar"/> + <classpathentry kind="lib" path="/home/remm/.m2/repository/org/jboss/spec/javax/servlet/jboss-servlet-api_3.1_spec/1.0.0.Alpha1/jboss-servlet-api_3.1_spec-1.0.0.Alpha1.jar"/> + <classpathentry kind="lib" path="/home/remm/.m2/repository/org/eclipse/jdt/core/compiler/ecj/4.2.1/ecj-4.2.1.jar"/> <classpathentry kind="output" path=".settings/output"/> </classpath> Modified: branches/8.0.x/pom.xml =================================================================== (Binary files differ) Modified: branches/8.0.x/src/main/java/org/apache/catalina/connector/Connector.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/connector/Connector.java 2013-03-05 10:51:21 UTC (rev 2173) +++ branches/8.0.x/src/main/java/org/apache/catalina/connector/Connector.java 2013-03-06 16:31:29 UTC (rev 2174) @@ -585,18 +585,8 @@ } } else { if ("HTTP/1.1".equals(protocol) || "http".equals(protocol)) { - /*try { - Class.forName("java.nio.channels.CompletionHandler"); - setProtocolHandlerClassName - ("org.apache.coyote.http11.Http11NioProtocol"); - } catch (Exception e) { - // NIO 2 is not available - setProtocolHandlerClassName - ("org.apache.coyote.http11.Http11Protocol"); - CatalinaLogger.CONNECTOR_LOGGER.usingJavaIoConnector(); - }*/ setProtocolHandlerClassName - ("org.apache.coyote.http11.Http11Protocol"); + ("org.apache.coyote.http11.Http11NioProtocol"); } else if ("AJP/1.3".equals(protocol) || "ajp".equals(protocol)) { setProtocolHandlerClassName ("org.apache.coyote.ajp.AjpProtocol"); Modified: branches/8.0.x/src/main/java/org/apache/catalina/connector/CoyoteInputStream.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/connector/CoyoteInputStream.java 2013-03-05 10:51:21 UTC (rev 2173) +++ branches/8.0.x/src/main/java/org/apache/catalina/connector/CoyoteInputStream.java 2013-03-06 16:31:29 UTC (rev 2174) @@ -23,6 +23,7 @@ import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; +import javax.servlet.ReadListener; import javax.servlet.ServletInputStream; import org.apache.catalina.security.SecurityUtil; @@ -107,7 +108,6 @@ } public int available() throws IOException { - if (SecurityUtil.isPackageProtectionEnabled()){ try{ Integer result = @@ -231,4 +231,20 @@ } } + + public boolean isFinished() { + return ib.isEof(); + } + + + public boolean isReady() { + return (ib.available() > 0); + } + + + @Override + public void setReadListener(ReadListener arg0) { + // TODO Auto-generated method stub + } + } Modified: branches/8.0.x/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java 2013-03-05 10:51:21 UTC (rev 2173) +++ branches/8.0.x/src/main/java/org/apache/catalina/connector/CoyoteOutputStream.java 2013-03-06 16:31:29 UTC (rev 2174) @@ -21,6 +21,7 @@ import java.io.IOException; import javax.servlet.ServletOutputStream; +import javax.servlet.WriteListener; /** * Coyote implementation of the servlet output stream. @@ -105,5 +106,17 @@ } + public boolean isReady() { + return (ob.lastWrite() > 0); + } + + + @Override + public void setWriteListener(WriteListener arg0) { + // TODO Auto-generated method stub + + } + + } Modified: branches/8.0.x/src/main/java/org/apache/catalina/connector/Request.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/connector/Request.java 2013-03-05 10:51:21 UTC (rev 2173) +++ branches/8.0.x/src/main/java/org/apache/catalina/connector/Request.java 2013-03-06 16:31:29 UTC (rev 2174) @@ -62,6 +62,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpUpgradeHandler; import javax.servlet.http.Part; import org.apache.catalina.Container; @@ -3295,6 +3296,30 @@ } + public long getContentLengthLong() { + return (coyoteRequest.getContentLengthLong()); + } + + public String changeSessionId() { + Session session = getSessionInternal(false); + if (session == null) { + throw MESSAGES.nullSession(); + } + Manager manager = context.getManager(); + manager.changeSessionId(session, getRandom()); + String sessionId = session.getId(); + changeSessionId(sessionId); + return sessionId; + } + + @Override + public <T extends HttpUpgradeHandler> T upgrade(Class<T> arg0) + throws IOException { + // TODO Auto-generated method stub + return null; + } + + public String toString() { StringBuilder buf = new StringBuilder(); buf.append("Current Servlet stack for thread ").append(Thread.currentThread().getName()); Modified: branches/8.0.x/src/main/java/org/apache/catalina/connector/RequestFacade.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/connector/RequestFacade.java 2013-03-05 10:51:21 UTC (rev 2173) +++ branches/8.0.x/src/main/java/org/apache/catalina/connector/RequestFacade.java 2013-03-06 16:31:29 UTC (rev 2174) @@ -41,6 +41,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpUpgradeHandler; import javax.servlet.http.Part; import org.apache.catalina.Globals; @@ -1044,4 +1045,32 @@ return request.hasSendfile(); } + + public long getContentLengthLong() { + if (request == null) { + throw MESSAGES.nullRequestFacade(); + } + + return request.getContentLengthLong(); + } + + + public String changeSessionId() { + if (request == null) { + throw MESSAGES.nullRequestFacade(); + } + + return request.changeSessionId(); + } + + + public <T extends HttpUpgradeHandler> T upgrade(Class<T> upgradeHandler) + throws IOException { + if (request == null) { + throw MESSAGES.nullRequestFacade(); + } + + return request.upgrade(upgradeHandler); + } + } Modified: branches/8.0.x/src/main/java/org/apache/catalina/connector/Response.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/connector/Response.java 2013-03-05 10:51:21 UTC (rev 2173) +++ branches/8.0.x/src/main/java/org/apache/catalina/connector/Response.java 2013-03-06 16:31:29 UTC (rev 2174) @@ -1781,5 +1781,21 @@ } + @Override + public void setContentLengthLong(long length) { + if (isCommitted()) + return; + + // Ignore any call from an included servlet + if (included) + return; + + if (usingWriter) + return; + + coyoteResponse.setContentLength(length); + + } + } Modified: branches/8.0.x/src/main/java/org/apache/catalina/connector/ResponseFacade.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/connector/ResponseFacade.java 2013-03-05 10:51:21 UTC (rev 2173) +++ branches/8.0.x/src/main/java/org/apache/catalina/connector/ResponseFacade.java 2013-03-06 16:31:29 UTC (rev 2174) @@ -605,4 +605,13 @@ return response.getStatus(); } + + public void setContentLengthLong(long contentLength) { + if (response == null) { + throw MESSAGES.nullResponseFacade(); + } + + response.setContentLengthLong(contentLength); + } + } Modified: branches/8.0.x/src/main/java/org/apache/catalina/core/DummyRequest.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/core/DummyRequest.java 2013-03-05 10:51:21 UTC (rev 2173) +++ branches/8.0.x/src/main/java/org/apache/catalina/core/DummyRequest.java 2013-03-06 16:31:29 UTC (rev 2174) @@ -45,6 +45,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpUpgradeHandler; import javax.servlet.http.Part; import org.apache.catalina.Context; @@ -293,6 +294,10 @@ public long getAsyncTimeout() { return 0; } public Part getPart(String name) throws IllegalArgumentException { return null; } public Collection<Part> getParts() { return null; } + + public long getContentLengthLong() { return -1; } + public String changeSessionId() { return null; } + public <T extends HttpUpgradeHandler> T upgrade(Class<T> upgradeHandler) throws IOException { return null; } } Modified: branches/8.0.x/src/main/java/org/apache/catalina/core/DummyResponse.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/core/DummyResponse.java 2013-03-05 10:51:21 UTC (rev 2173) +++ branches/8.0.x/src/main/java/org/apache/catalina/core/DummyResponse.java 2013-03-06 16:31:29 UTC (rev 2174) @@ -125,6 +125,6 @@ public void enable() {} public boolean isDisabled() { return false; } public Collection<String> getHeaders(String name) { return null; } + public void setContentLengthLong(long contentLength) {} - } Modified: branches/8.0.x/src/main/java/org/apache/catalina/filters/ExpiresFilter.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/filters/ExpiresFilter.java 2013-03-05 10:51:21 UTC (rev 2173) +++ branches/8.0.x/src/main/java/org/apache/catalina/filters/ExpiresFilter.java 2013-03-06 16:31:29 UTC (rev 2174) @@ -39,6 +39,7 @@ import javax.servlet.ServletOutputStream; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import javax.servlet.WriteListener; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; @@ -1008,6 +1009,16 @@ servletOutputStream.write(b); } + @Override + public boolean isReady() { + return servletOutputStream.isReady(); + } + + @Override + public void setWriteListener(WriteListener listener) { + servletOutputStream.setWriteListener(listener); + } + } /** Modified: branches/8.0.x/src/main/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java 2013-03-05 10:51:21 UTC (rev 2173) +++ branches/8.0.x/src/main/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java 2013-03-06 16:31:29 UTC (rev 2174) @@ -19,6 +19,7 @@ import java.io.ByteArrayOutputStream; import javax.servlet.ServletOutputStream; +import javax.servlet.WriteListener; /** @@ -60,4 +61,13 @@ public void write(int b) { buf.write(b); } + + + public boolean isReady() { + return true; + } + + + public void setWriteListener(WriteListener listener) { + } } Modified: branches/8.0.x/src/main/java/org/apache/jasper/compiler/JDTCompiler.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/jasper/compiler/JDTCompiler.java 2013-03-05 10:51:21 UTC (rev 2173) +++ branches/8.0.x/src/main/java/org/apache/jasper/compiler/JDTCompiler.java 2013-03-06 16:31:29 UTC (rev 2174) @@ -155,6 +155,10 @@ } return result; } + + public boolean ignoreOptionalProblems() { + return false; + } } final INameEnvironment env = new INameEnvironment() { Modified: branches/8.0.x/src/main/java/org/apache/jasper/tagplugins/jstl/Util.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/jasper/tagplugins/jstl/Util.java 2013-03-05 10:51:21 UTC (rev 2173) +++ branches/8.0.x/src/main/java/org/apache/jasper/tagplugins/jstl/Util.java 2013-03-06 16:31:29 UTC (rev 2174) @@ -28,6 +28,7 @@ import java.util.Locale; import javax.servlet.ServletOutputStream; +import javax.servlet.WriteListener; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; @@ -260,6 +261,11 @@ public void write(int b) throws IOException { bos.write(b); } + public boolean isReady() { + return true; + } + public void setWriteListener(WriteListener listener) { + } }; private boolean isWriterUsed; private boolean isStreamUsed; @@ -268,7 +274,6 @@ public ImportResponseWrapper(HttpServletResponse arg0) { super(arg0); - // TODO Auto-generated constructor stub } public PrintWriter getWriter() { Modified: branches/8.0.x/src/main/java/org/jboss/web/CatalinaMessages.java =================================================================== --- branches/8.0.x/src/main/java/org/jboss/web/CatalinaMessages.java 2013-03-05 10:51:21 UTC (rev 2173) +++ branches/8.0.x/src/main/java/org/jboss/web/CatalinaMessages.java 2013-03-06 16:31:29 UTC (rev 2174) @@ -972,4 +972,7 @@ @Message(id = 359, value = "Exception releasing filter %s") String errorStoppingFilter(String filterName); + @Message(id = 360, value = "No session") + IllegalStateException nullSession(); + } Modified: branches/8.0.x/webapps/docs/changelog.xml =================================================================== --- branches/8.0.x/webapps/docs/changelog.xml 2013-03-05 10:51:21 UTC (rev 2173) +++ branches/8.0.x/webapps/docs/changelog.xml 2013-03-06 16:31:29 UTC (rev 2174) @@ -16,6 +16,16 @@ <body> +<section name="JBoss Web 8.0.0.Alpha1 (remm)"> + <subsection name="Jasper"> + <changelog> + <fix> + <jboss-jira>AS7-6670</jboss-jira>: Port missing PA on JspFactoryImpl. (remm). + </fix> + </changelog> + </subsection> +</section> + <section name="JBoss Web 7.2.1.Final (remm)"> <subsection name="Catalina"> <changelog>