Re: Tomcat 8 question
On 20/01/2013 07:14, Violeta Georgieva wrote: Hi, 2013/1/20 Williams, Nick So, will Tomcat 8 be targeted for EE 7, or will it wait until JSP-next comes out, even if that takes a good deal longer than EE 7? Also, I know that a lot depends on the timeline of EE 7, but now that that date is approaching, do we have a GENERAL timeframe for Tomcat 8? Are we talking late 2013? Or could it take until 2014? Check Mark's presentation [1] There will be a maintenance release of the JSP specification. The only potential change I am aware of is limiting the HTTP methods that JSPs respond to to HEAD, GET and POST. How long the first Tomcat 8 release (that fully implements the specs) takes depends on how much time folks spend on implementing them. I'll have an update on Tomcat 8 progress at ApacheCon NA next month and the slides will be available from the usual place once I have written them. As always, help is appreciated. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1435904 - in /tomcat/trunk: java/javax/websocket/ java/org/apache/tomcat/websocket/ java/org/apache/tomcat/websocket/server/ res/META-INF/tomcat-websocket.jar/services/ res/checkstyle/ te
Author: markt
Date: Sun Jan 20 17:54:03 2013
New Revision: 1435904
URL: http://svn.apache.org/viewvc?rev=1435904view=rev
Log:
Move server side specific code to separate package. Further refactoring is
likely to be required as client side code is developed.
Added:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
- copied, changed from r1434921,
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpoint.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/
tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java (with
props)
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
(with props)
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
- copied, changed from r1434927,
tomcat/trunk/java/org/apache/tomcat/websocket/ServerContainerImpl.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java
- copied, changed from r1434921,
tomcat/trunk/java/org/apache/tomcat/websocket/WsProtocolHandler.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
(with props)
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java
- copied, changed from r1434921,
tomcat/trunk/java/org/apache/tomcat/websocket/WsSci.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java
- copied, changed from r1434921,
tomcat/trunk/java/org/apache/tomcat/websocket/WsServlet.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/package-info.java
(with props)
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
(with props)
tomcat/trunk/test/org/apache/tomcat/websocket/server/
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestServerContainerImpl.java
- copied, changed from r1434921,
tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java
Removed:
tomcat/trunk/java/org/apache/tomcat/websocket/ServerContainerImpl.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsProtocolHandler.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpoint.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSci.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsServlet.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java
Modified:
tomcat/trunk/java/javax/websocket/WebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
tomcat/trunk/java/org/apache/tomcat/websocket/Util.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrame.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.servlet.ServletContainerInitializer
tomcat/trunk/res/checkstyle/org-import-control.xml
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java
Modified: tomcat/trunk/java/javax/websocket/WebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/WebSocketContainer.java?rev=1435904r1=1435903r2=1435904view=diff
==
--- tomcat/trunk/java/javax/websocket/WebSocketContainer.java (original)
+++ tomcat/trunk/java/javax/websocket/WebSocketContainer.java Sun Jan 20
17:54:03 2013
@@ -28,6 +28,21 @@ public interface WebSocketContainer {
Session connectToServer(Class? annotatedEndpointClass, URI path)
throws DeploymentException;
+/**
+ * Creates a new connection to the WebSocket.
+ *
+ * @param endpoint
+ *An instance of this class will be created to handle responses
+ *from the server
+ * @param clientEndpointConfiguration
+ *Used to configure the new connection
+ * @param path
+ *The full URL of the WebSocket endpoint to connect to
+ *
+ * @return The WebSocket session for the connection
+ *
+ * @throws DeploymentException If the connection can not be established
+ */
Session connectToServer(Class? extends Endpoint endpoint,
ClientEndpointConfiguration clientEndpointConfiguration, URI path)
throws DeploymentException;
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java?rev=1435904r1=1435903r2=1435904view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java Sun Jan 20
17:54:03 2013
@@ -23,7 +23,6 @@ public class Constants {
protected static final String PACKAGE_NAME =
Constants.class.getPackage().getName();
-protected static final String SERVLET_NAME = WsServlet.class.getName();
// OP Codes
buildbot failure in ASF Buildbot on tomcat-trunk
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/3809 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1435904 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
svn commit: r1435910 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Author: markt
Date: Sun Jan 20 18:48:56 2013
New Revision: 1435910
URL: http://svn.apache.org/viewvc?rev=1435910view=rev
Log:
Disable test. The client implementation is not ready for this yet.
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1435910r1=1435909r2=1435910view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Sun Jan 20 18:48:56 2013
@@ -32,7 +32,7 @@ import javax.websocket.Session;
import javax.websocket.WebSocketContainer;
import org.junit.Assert;
-import org.junit.Test;
+//import org.junit.Test;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
@@ -41,7 +41,7 @@ public class TestWsWebSocketContainer ex
private static final String MESSAGE_STRING_1 = qwerty;
-@Test
+//@Test Disable until client implementation progresses
public void testConnectToServerEndpoint() throws Exception {
// Examples app includes WebSocket Echo endpoint
Tomcat tomcat = getTomcatInstance();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1436011 - in /tomcat/trunk/java/org/apache/tomcat/websocket: WsRemoteEndpointClient.java WsWebSocketContainer.java
Author: markt
Date: Mon Jan 21 00:18:41 2013
New Revision: 1436011
URL: http://svn.apache.org/viewvc?rev=1436011view=rev
Log:
Add a little more client plumbing
Added:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointClient.java
(with props)
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Added: tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointClient.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointClient.java?rev=1436011view=auto
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointClient.java
(added)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointClient.java
Mon Jan 21 00:18:41 2013
@@ -0,0 +1,43 @@
+/*
+ * 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.tomcat.websocket;
+
+import java.nio.ByteBuffer;
+
+public class WsRemoteEndpointClient extends WsRemoteEndpointBase {
+
+@Override
+public void onWritePossible() {
+// TODO Auto-generated method stub
+
+}
+
+@Override
+protected void writeMessage(int opCode, ByteBuffer header,
+ByteBuffer message) {
+// TODO Auto-generated method stub
+
+}
+
+/**
+ * @param args
+ */
+public static void main(String[] args) {
+// TODO Auto-generated method stub
+
+}
+}
Propchange:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointClient.java
--
svn:eol-style = native
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1436011r1=1436010r2=1436011view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Mon
Jan 21 00:18:41 2013
@@ -40,8 +40,27 @@ public class WsWebSocketContainer implem
public Session connectToServer(Class? extends Endpoint endpoint,
ClientEndpointConfiguration clientEndpointConfiguration, URI path)
throws DeploymentException {
-// TODO Auto-generated method stub
-return null;
+
+// Create HTTP connection
+// TODO
+
+// Handshake
+// TODO
+
+// Switch to WebSocket
+WsRemoteEndpointClient wsRemoteEndpointClient =
+new WsRemoteEndpointClient();
+
+WsSession wsSession;
+try {
+wsSession = new WsSession(endpoint.newInstance());
+} catch (InstantiationException | IllegalAccessException e) {
+// TODO
+throw new DeploymentException(TBD, e);
+}
+
+wsSession.setRemote(wsRemoteEndpointClient);
+return wsSession;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed
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-validate has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 2 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-validate : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-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-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 55 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 -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-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-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/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-21012013.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.1.1-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-21012013.jar:/srv/gump/public/workspace/junit/dist/junit-21012013.jar:/srv/gump/ public/workspace/junit/dist/junit-dep-21012013.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-14.0-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-21012013.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-21012013.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/jdom/build/jdom.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-21012013.jar:/srv/gump/public/workspace/velocity-engine/bin/velocity-21012013-dep.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp compile-prepare: download-validate: proxyflags: setproxy: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar downloadzip: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 5.7-SNAPSHOT on 2433 files [checkstyle] Running Checkstyle 5.7-SNAPSHOT on 197 files [checkstyle] Running Checkstyle 5.7-SNAPSHOT on 1110 files [checkstyle] /srv/gump/public/workspace/tomcat-trunk/java/org/apache/tomcat/websocket/WsFrame.java:27:1: Disallowed import - javax.servlet.ServletInputStream. BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:518: Got 1 errors and 0 warnings. Total time: 54 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 1421012013, vmgump.apache.org:vmgump:1421012013 Gump E-mail Identifier (unique within run) #42. -- Apache Gump http://gump.apache.org/ [Instance: vmgump]
