4:42 p.m.
Author: remy.maucherat(a)jboss.com
Date: 2013-09-18 10:42:28 -0400 (Wed, 18 Sep 2013)
New Revision: 2260
Modified:
branches/7.2.x/pom.xml
branches/7.2.x/src/main/java/org/apache/catalina/websocket/WebSocketServlet.java
branches/7.3.x/pom.xml
branches/7.4.x/.classpath
branches/7.4.x/pom.xml
Log:
- Branch cleanup.
- Disable Tomcat websockets API in 7.2.
Modified: branches/7.2.x/pom.xml
===================================================================
--- branches/7.2.x/pom.xml 2013-09-17 09:44:30 UTC (rev 2259)
+++ branches/7.2.x/pom.xml 2013-09-18 14:42:28 UTC (rev 2260)
@@ -33,7 +33,7 @@
<groupId>org.jboss.web</groupId>
<artifactId>jbossweb</artifactId>
- <version>7.2.3.Final</version>
+ <version>7.2.4.Final</version>
<name>JBoss Web</name>
<description>Servlet 3.0 container</description>
Modified:
branches/7.2.x/src/main/java/org/apache/catalina/websocket/WebSocketServlet.java
===================================================================
---
branches/7.2.x/src/main/java/org/apache/catalina/websocket/WebSocketServlet.java 2013-09-17
09:44:30 UTC (rev 2259)
+++
branches/7.2.x/src/main/java/org/apache/catalina/websocket/WebSocketServlet.java 2013-09-18
14:42:28 UTC (rev 2260)
@@ -45,8 +45,10 @@
* Provides the base implementation of a Servlet for processing WebSocket
* connections as per RFC6455. It is expected that applications will extend this
* implementation and provide application specific functionality.
+ *
+ * Note: In this branch, the API is disabled.
*/
-public abstract class WebSocketServlet extends HttpServlet implements HttpEventServlet
{
+public final class WebSocketServlet extends HttpServlet implements HttpEventServlet {
private static final long serialVersionUID = 1L;
private static final byte[] WS_ACCEPT =
@@ -276,6 +278,8 @@
* method. If Tomcat detects such access, it will throw
* an IllegalStateException
*/
- protected abstract StreamInbound createWebSocketInbound(String subProtocol,
- HttpServletRequest request);
+ protected /*abstract*/ StreamInbound createWebSocketInbound(String subProtocol,
+ HttpServletRequest request) {
+ return null;
+ }
}
Modified: branches/7.3.x/pom.xml
===================================================================
--- branches/7.3.x/pom.xml 2013-09-17 09:44:30 UTC (rev 2259)
+++ branches/7.3.x/pom.xml 2013-09-18 14:42:28 UTC (rev 2260)
@@ -33,7 +33,7 @@
<groupId>org.jboss.web</groupId>
<artifactId>jbossweb</artifactId>
- <version>7.2.3.Final</version>
+ <version>7.3.0.Final</version>
<name>JBoss Web</name>
<description>Servlet 3.0 container</description>
Modified: branches/7.4.x/.classpath
===================================================================
--- branches/7.4.x/.classpath 2013-09-17 09:44:30 UTC (rev 2259)
+++ branches/7.4.x/.classpath 2013-09-18 14:42:28 UTC (rev 2260)
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<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="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<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/websocket/jboss-websocket-api_1.0_spec/1.0.0.Beta1/jboss-websocket-api_1.0_spec-1.0.0.Beta1.jar"/>
<classpathentry kind="output" path=".settings/output"/>
</classpath>
Modified: branches/7.4.x/pom.xml
===================================================================
--- branches/7.4.x/pom.xml 2013-09-17 09:44:30 UTC (rev 2259)
+++ branches/7.4.x/pom.xml 2013-09-18 14:42:28 UTC (rev 2260)
@@ -45,6 +45,7 @@
<version.org.jboss.spec.javax.el>1.0.1.Final</version.org.jboss.spec.javax.el>
<version.org.jboss.spec.javax.servlet>1.0.1.Final</version.org.jboss.spec.javax.servlet>
<version.org.jboss.spec.javax.servlet.jsp>1.0.1.Final</version.org.jboss.spec.javax.servlet.jsp>
+
<version.org.jboss.spec.javax.websocket>1.0.0.Beta1</version.org.jboss.spec.javax.websocket>
<version.org.eclipse.jdt.core.compiler.ecj>3.7.2</version.org.eclipse.jdt.core.compiler.ecj>
<version.org.jboss.xnio>3.0.4.GA</version.org.jboss.xnio>
<!-- Build configuration -->
@@ -156,6 +157,13 @@
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.websocket</groupId>
+ <artifactId>jboss-websocket-api_1.0_spec</artifactId>
+ <version>${version.org.jboss.spec.javax.websocket}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
<version>${version.org.eclipse.jdt.core.compiler.ecj}</version>