You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/08/15 23:31:50 UTC
svn commit: r1514505 - in /tomcat/tc7.0.x/trunk: ./ java/javax/websocket/
java/javax/websocket/DefaultClientConfiguration.java
java/javax/websocket/DefaultServerConfiguration.java
res/checkstyle/javax-import-control.xml
Author: markt
Date: Thu Aug 15 21:31:50 2013
New Revision: 1514505
URL: http://svn.apache.org/r1514505
Log:
Start to back-port JSR-356 implementation to 7.0.x
Added:
tomcat/tc7.0.x/trunk/java/javax/websocket/
- copied from r1412268, tomcat/trunk/java/javax/websocket/
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultClientConfiguration.java
tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultServerConfiguration.java
tomcat/tc7.0.x/trunk/res/checkstyle/javax-import-control.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1412268
Modified: tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultClientConfiguration.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultClientConfiguration.java?rev=1514505&r1=1412268&r2=1514505&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultClientConfiguration.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultClientConfiguration.java Thu Aug 15 21:31:50 2013
@@ -20,10 +20,10 @@ import java.util.ArrayList;
import java.util.List;
public class DefaultClientConfiguration implements ClientEndpointConfiguration {
- private List<String> preferredSubprotocols = new ArrayList<>();
- private List<String> extensions = new ArrayList<>();
- private List<Encoder> encoders = new ArrayList<>();
- private List<Decoder> decoders = new ArrayList<>();
+ private List<String> preferredSubprotocols = new ArrayList<String>();
+ private List<String> extensions = new ArrayList<String>();
+ private List<Encoder> encoders = new ArrayList<Encoder>();
+ private List<Decoder> decoders = new ArrayList<Decoder>();
@Override
public List<String> getPreferredSubprotocols() {
Modified: tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultServerConfiguration.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultServerConfiguration.java?rev=1514505&r1=1412268&r2=1514505&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultServerConfiguration.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultServerConfiguration.java Thu Aug 15 21:31:50 2013
@@ -23,11 +23,11 @@ import java.util.List;
public class DefaultServerConfiguration implements ServerEndpointConfiguration {
private String path;
@SuppressWarnings("unused") // TODO Remove this once implemented
- private List<String> subprotocols = new ArrayList<>();
+ private List<String> subprotocols = new ArrayList<String>();
@SuppressWarnings("unused") // TODO Remove this once implemented
- private List<String> extensions = new ArrayList<>();
- private List<Encoder> encoders = new ArrayList<>();
- private List<Decoder> decoders = new ArrayList<>();
+ private List<String> extensions = new ArrayList<String>();
+ private List<Encoder> encoders = new ArrayList<Encoder>();
+ private List<Decoder> decoders = new ArrayList<Decoder>();
protected DefaultServerConfiguration() {
}
Modified: tomcat/tc7.0.x/trunk/res/checkstyle/javax-import-control.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/checkstyle/javax-import-control.xml?rev=1514505&r1=1514504&r2=1514505&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/checkstyle/javax-import-control.xml (original)
+++ tomcat/tc7.0.x/trunk/res/checkstyle/javax-import-control.xml Thu Aug 15 21:31:50 2013
@@ -33,6 +33,10 @@
<subpackage name="mail">
<allow pkg="javax.mail"/>
</subpackage>
+ <subpackage name="websocket">
+ <allow pkg="javax.websocket"/>
+ <allow pkg="javax.websocket.extensions"/>
+ </subpackage>
<subpackage name="persistence">
<allow pkg="javax.persistence"/>
</subpackage>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Fwd: svn commit: r1514505 - in /tomcat/tc7.0.x/trunk: ./
java/javax/websocket/ java/javax/websocket/DefaultClientConfiguration.java
java/javax/websocket/DefaultServerConfiguration.java res/checkstyle/javax-import-control.xml
Posted by Romain Manni-Bucau <rm...@gmail.com>.
Great, thanks Mark.
Le 15 août 2013 23:56, "Mark Thomas" <ma...@apache.org> a écrit :
> On 15/08/2013 22:34, Romain Manni-Bucau wrote:
> > Hi
> >
> > how will it be backported?
>
> It will be a straight copy from trunk with the minimal modifications
> necessary to get it to work including:
> - No Java 7 notation
> - No Servlet 3.1 APIs
> - Any updates to Tomcat's internals to make HTTP upgrade compatible.
>
> > i ask because in tomee we can't provide it out of the box since we need
> to
> > be certified against JavaEE 6 Web Profile which doesn't contain it
> (that's
> > why we have several distribution and not only the "plus" one).
> >
> > If it is backported in tomcat without a spi or another pluggable solution
> > we will not be able to update tomcat versions then :(
>
> The JSR-356 implementation is already pluggable. If you don't want it,
> just remove the JARs.
>
> Mark
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
Re: Fwd: svn commit: r1514505 - in /tomcat/tc7.0.x/trunk: ./ java/javax/websocket/
java/javax/websocket/DefaultClientConfiguration.java java/javax/websocket/DefaultServerConfiguration.java
res/checkstyle/javax-import-control.xml
Posted by Mark Thomas <ma...@apache.org>.
On 15/08/2013 22:34, Romain Manni-Bucau wrote:
> Hi
>
> how will it be backported?
It will be a straight copy from trunk with the minimal modifications
necessary to get it to work including:
- No Java 7 notation
- No Servlet 3.1 APIs
- Any updates to Tomcat's internals to make HTTP upgrade compatible.
> i ask because in tomee we can't provide it out of the box since we need to
> be certified against JavaEE 6 Web Profile which doesn't contain it (that's
> why we have several distribution and not only the "plus" one).
>
> If it is backported in tomcat without a spi or another pluggable solution
> we will not be able to update tomcat versions then :(
The JSR-356 implementation is already pluggable. If you don't want it,
just remove the JARs.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Fwd: svn commit: r1514505 - in /tomcat/tc7.0.x/trunk: ./
java/javax/websocket/ java/javax/websocket/DefaultClientConfiguration.java
java/javax/websocket/DefaultServerConfiguration.java res/checkstyle/javax-import-control.xml
Posted by Romain Manni-Bucau <rm...@gmail.com>.
Hi
how will it be backported?
i ask because in tomee we can't provide it out of the box since we need to
be certified against JavaEE 6 Web Profile which doesn't contain it (that's
why we have several distribution and not only the "plus" one).
If it is backported in tomcat without a spi or another pluggable solution
we will not be able to update tomcat versions then :(
*Romain Manni-Bucau*
*Twitter: @rmannibucau <https://twitter.com/rmannibucau>*
*Blog: **http://rmannibucau.wordpress.com/*<http://rmannibucau.wordpress.com/>
*LinkedIn: **http://fr.linkedin.com/in/rmannibucau*
*Github: https://github.com/rmannibucau*
---------- Forwarded message ----------
From: <ma...@apache.org>
Date: 2013/8/15
Subject: svn commit: r1514505 - in /tomcat/tc7.0.x/trunk: ./
java/javax/websocket/ java/javax/websocket/DefaultClientConfiguration.java
java/javax/websocket/DefaultServerConfiguration.java
res/checkstyle/javax-import-control.xml
To: dev@tomcat.apache.org
Author: markt
Date: Thu Aug 15 21:31:50 2013
New Revision: 1514505
URL: http://svn.apache.org/r1514505
Log:
Start to back-port JSR-356 implementation to 7.0.x
Added:
tomcat/tc7.0.x/trunk/java/javax/websocket/
- copied from r1412268, tomcat/trunk/java/javax/websocket/
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultClientConfiguration.java
tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultServerConfiguration.java
tomcat/tc7.0.x/trunk/res/checkstyle/javax-import-control.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1412268
Modified:
tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultClientConfiguration.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultClientConfiguration.java?rev=1514505&r1=1412268&r2=1514505&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultClientConfiguration.java
(original)
+++
tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultClientConfiguration.java
Thu Aug 15 21:31:50 2013
@@ -20,10 +20,10 @@ import java.util.ArrayList;
import java.util.List;
public class DefaultClientConfiguration implements
ClientEndpointConfiguration {
- private List<String> preferredSubprotocols = new ArrayList<>();
- private List<String> extensions = new ArrayList<>();
- private List<Encoder> encoders = new ArrayList<>();
- private List<Decoder> decoders = new ArrayList<>();
+ private List<String> preferredSubprotocols = new ArrayList<String>();
+ private List<String> extensions = new ArrayList<String>();
+ private List<Encoder> encoders = new ArrayList<Encoder>();
+ private List<Decoder> decoders = new ArrayList<Decoder>();
@Override
public List<String> getPreferredSubprotocols() {
Modified:
tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultServerConfiguration.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultServerConfiguration.java?rev=1514505&r1=1412268&r2=1514505&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultServerConfiguration.java
(original)
+++
tomcat/tc7.0.x/trunk/java/javax/websocket/DefaultServerConfiguration.java
Thu Aug 15 21:31:50 2013
@@ -23,11 +23,11 @@ import java.util.List;
public class DefaultServerConfiguration implements
ServerEndpointConfiguration {
private String path;
@SuppressWarnings("unused") // TODO Remove this once implemented
- private List<String> subprotocols = new ArrayList<>();
+ private List<String> subprotocols = new ArrayList<String>();
@SuppressWarnings("unused") // TODO Remove this once implemented
- private List<String> extensions = new ArrayList<>();
- private List<Encoder> encoders = new ArrayList<>();
- private List<Decoder> decoders = new ArrayList<>();
+ private List<String> extensions = new ArrayList<String>();
+ private List<Encoder> encoders = new ArrayList<Encoder>();
+ private List<Decoder> decoders = new ArrayList<Decoder>();
protected DefaultServerConfiguration() {
}
Modified: tomcat/tc7.0.x/trunk/res/checkstyle/javax-import-control.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/checkstyle/javax-import-control.xml?rev=1514505&r1=1514504&r2=1514505&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/checkstyle/javax-import-control.xml (original)
+++ tomcat/tc7.0.x/trunk/res/checkstyle/javax-import-control.xml Thu Aug 15
21:31:50 2013
@@ -33,6 +33,10 @@
<subpackage name="mail">
<allow pkg="javax.mail"/>
</subpackage>
+ <subpackage name="websocket">
+ <allow pkg="javax.websocket"/>
+ <allow pkg="javax.websocket.extensions"/>
+ </subpackage>
<subpackage name="persistence">
<allow pkg="javax.persistence"/>
</subpackage>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org