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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
