Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3198 from eclipse/jetty-10.0.x-3129-websocket 

Issue #3129 rename websocket directories, modules and artifacts
This commit is contained in:
Greg Wilkins 2018-12-18 09:28:25 +11:00 committed by GitHub
parent 14ffa0d981 f2f6598ddc
commit 1999b23d67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
410 changed files with 973 additions and 948 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aggregates/jetty-all/pom.xml
View File

@ -183,7 +183,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-server-impl</artifactId> <artifactId>javax-websocket-server</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>

2
aggregates/jetty-websocket-all/pom.xml
View File

@ -114,7 +114,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-server-impl</artifactId> <artifactId>javax-websocket-server</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

2
examples/embedded/pom.xml
View File

@ -52,7 +52,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-server-impl</artifactId> <artifactId>javax-websocket-server</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>

2
examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java
View File

@ -25,7 +25,7 @@ import javax.websocket.server.ServerEndpoint;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketServerContainerInitializer; import org.eclipse.jetty.websocket.javax.server.JavaxWebSocketServerContainerInitializer;
/** /**
* Example of setting up a javax.websocket server with Jetty embedded * Example of setting up a javax.websocket server with Jetty embedded

4
jetty-bom/pom.xml
View File

@ -316,12 +316,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-client-impl</artifactId> <artifactId>javax-websocket-client</artifactId>
<version>10.0.0-SNAPSHOT</version> <version>10.0.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-server-impl</artifactId> <artifactId>javax-websocket-server</artifactId>
<version>10.0.0-SNAPSHOT</version> <version>10.0.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>

4
jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc
View File

@ -189,8 +189,8 @@ Note: order presented here is how they would appear on the classpath.
32: 1.2 | ${jetty.home}/lib/annotations/javax.annotation-api-1.2.jar 32: 1.2 | ${jetty.home}/lib/annotations/javax.annotation-api-1.2.jar
33: {VERSION} | ${jetty.home}/lib/jetty-deploy-{VERSION}.jar 33: {VERSION} | ${jetty.home}/lib/jetty-deploy-{VERSION}.jar
34: 1.0 | ${jetty.home}/lib/websocket/javax.websocket-api-1.0.jar 34: 1.0 | ${jetty.home}/lib/websocket/javax.websocket-api-1.0.jar
35: {VERSION} | ${jetty.home}/lib/websocket/javax-websocket-client-impl-{VERSION}.jar 35: {VERSION} | ${jetty.home}/lib/websocket/javax-websocket-client-{VERSION}.jar
36: {VERSION} | ${jetty.home}/lib/websocket/javax-websocket-server-impl-{VERSION}.jar 36: {VERSION} | ${jetty.home}/lib/websocket/javax-websocket-server-{VERSION}.jar
37: {VERSION} | ${jetty.home}/lib/websocket/websocket-api-{VERSION}.jar 37: {VERSION} | ${jetty.home}/lib/websocket/websocket-api-{VERSION}.jar
38: {VERSION} | ${jetty.home}/lib/websocket/websocket-client-{VERSION}.jar 38: {VERSION} | ${jetty.home}/lib/websocket/websocket-client-{VERSION}.jar
39: {VERSION} | ${jetty.home}/lib/websocket/websocket-common-{VERSION}.jar 39: {VERSION} | ${jetty.home}/lib/websocket/websocket-common-{VERSION}.jar

4
jetty-documentation/src/main/asciidoc/administration/startup/startup-classpath.adoc
View File

@ -99,8 +99,8 @@ Note: order presented here is how they would appear on the classpath.
32: 1.2 | ${jetty.home}/lib/annotations/javax.annotation-api-1.2.jar 32: 1.2 | ${jetty.home}/lib/annotations/javax.annotation-api-1.2.jar
33: {VERSION} | ${jetty.home}/lib/jetty-deploy-{VERSION}.jar 33: {VERSION} | ${jetty.home}/lib/jetty-deploy-{VERSION}.jar
34: 1.0 | ${jetty.home}/lib/websocket/javax.websocket-api-1.0.jar 34: 1.0 | ${jetty.home}/lib/websocket/javax.websocket-api-1.0.jar
35: {VERSION} | ${jetty.home}/lib/websocket/javax-websocket-client-impl-{VERSION}.jar 35: {VERSION} | ${jetty.home}/lib/websocket/javax-websocket-client-{VERSION}.jar
36: {VERSION} | ${jetty.home}/lib/websocket/javax-websocket-server-impl-{VERSION}.jar 36: {VERSION} | ${jetty.home}/lib/websocket/javax-websocket-server-{VERSION}.jar
37: {VERSION} | ${jetty.home}/lib/websocket/websocket-api-{VERSION}.jar 37: {VERSION} | ${jetty.home}/lib/websocket/websocket-api-{VERSION}.jar
38: {VERSION} | ${jetty.home}/lib/websocket/websocket-client-{VERSION}.jar 38: {VERSION} | ${jetty.home}/lib/websocket/websocket-client-{VERSION}.jar
39: {VERSION} | ${jetty.home}/lib/websocket/websocket-common-{VERSION}.jar 39: {VERSION} | ${jetty.home}/lib/websocket/websocket-common-{VERSION}.jar

2
jetty-home/pom.xml
View File

@ -595,7 +595,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-server-impl</artifactId> <artifactId>javax-websocket-server</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>

2
jetty-maven-plugin/pom.xml
View File

@ -217,7 +217,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-server-impl</artifactId> <artifactId>javax-websocket-server</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>

2
jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml
View File

@ -95,7 +95,7 @@
<Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item> <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
<Item>org.eclipse.jetty.webapp.JmxConfiguration</Item> <Item>org.eclipse.jetty.webapp.JmxConfiguration</Item>
<Item>org.eclipse.jetty.websocket.server.JettyWebSocketConfiguration</Item> <Item>org.eclipse.jetty.websocket.server.JettyWebSocketConfiguration</Item>
<Item>org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketConfiguration</Item> <Item>org.eclipse.jetty.websocket.javax.server.JavaxWebSocketConfiguration</Item>
<Item>org.eclipse.jetty.osgi.annotations.AnnotationConfiguration</Item> <Item>org.eclipse.jetty.osgi.annotations.AnnotationConfiguration</Item>
<Item>org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration</Item> <Item>org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration</Item>
<Item>org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration</Item> <Item>org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration</Item>

22
jetty-osgi/test-jetty-osgi/pom.xml
View File

@ -14,8 +14,8 @@
<bundle-symbolic-name>${project.groupId}.boot.test.osgi</bundle-symbolic-name> <bundle-symbolic-name>${project.groupId}.boot.test.osgi</bundle-symbolic-name>
<jetty-orbit-url>http://download.eclipse.org/jetty/orbit/</jetty-orbit-url> <jetty-orbit-url>http://download.eclipse.org/jetty/orbit/</jetty-orbit-url>
<assembly-directory>target/distribution</assembly-directory> <assembly-directory>target/distribution</assembly-directory>
<exam.version>4.12.0</exam.version> <pax.exam.version>4.13.0</pax.exam.version>
<url.version>2.5.2</url.version> <pax.url.version>2.5.4</pax.url.version>
<injection.bundle.version>1.0</injection.bundle.version> <injection.bundle.version>1.0</injection.bundle.version>
</properties> </properties>
<dependencies> <dependencies>
@ -23,38 +23,38 @@
<dependency> <dependency>
<groupId>org.ops4j.pax.exam</groupId> <groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId> <artifactId>pax-exam</artifactId>
<version>${exam.version}</version> <version>${pax.exam.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ops4j.pax.exam</groupId> <groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-inject</artifactId> <artifactId>pax-exam-inject</artifactId>
<version>${exam.version}</version> <version>${pax.exam.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- Use the forked container so we can pass it system properties eg for alpn --> <!-- Use the forked container so we can pass it system properties eg for alpn -->
<dependency> <dependency>
<groupId>org.ops4j.pax.exam</groupId> <groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-forked</artifactId> <artifactId>pax-exam-container-forked</artifactId>
<version>${exam.version}</version> <version>${pax.exam.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ops4j.pax.exam</groupId> <groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId> <artifactId>pax-exam-junit4</artifactId>
<version>${exam.version}</version> <version>${pax.exam.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ops4j.pax.exam</groupId> <groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId> <artifactId>pax-exam-link-mvn</artifactId>
<version>${exam.version}</version> <version>${pax.exam.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ops4j.pax.url</groupId> <groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId> <artifactId>pax-url-aether</artifactId>
<version>${url.version}</version> <version>${pax.url.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -65,7 +65,7 @@
<dependency> <dependency>
<groupId>org.ops4j.pax.url</groupId> <groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId> <artifactId>pax-url-wrap</artifactId>
<version>2.5.4</version> <version>${pax.url.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -287,7 +287,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-client-impl</artifactId> <artifactId>javax-websocket-client</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
@ -310,7 +310,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-server-impl</artifactId> <artifactId>javax-websocket-server</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>

2
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml
View File

@ -82,7 +82,7 @@
<Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item> <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
<Item>org.eclipse.jetty.webapp.JmxConfiguration</Item> <Item>org.eclipse.jetty.webapp.JmxConfiguration</Item>
<Item>org.eclipse.jetty.websocket.server.JettyWebSocketConfiguration</Item> <Item>org.eclipse.jetty.websocket.server.JettyWebSocketConfiguration</Item>
<Item>org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketConfiguration</Item> <Item>org.eclipse.jetty.websocket.javax.server.JavaxWebSocketConfiguration</Item>
<Item>org.eclipse.jetty.osgi.annotations.AnnotationConfiguration</Item> <Item>org.eclipse.jetty.osgi.annotations.AnnotationConfiguration</Item>
<Item>org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration</Item> <Item>org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration</Item>
<Item>org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration</Item> <Item>org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration</Item>

4
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
View File

@ -85,9 +85,9 @@
<Item>org.eclipse.jetty.plus.webapp.PlusConfiguration</Item> <Item>org.eclipse.jetty.plus.webapp.PlusConfiguration</Item>
<Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item> <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
<Item>org.eclipse.jetty.webapp.JmxConfiguration</Item> <Item>org.eclipse.jetty.webapp.JmxConfiguration</Item>
<Item>org.eclipse.jetty.websocket.server.JettyWebSocketConfiguration</Item>
<Item>org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketConfiguration</Item>
<Item>org.eclipse.jetty.osgi.annotations.AnnotationConfiguration</Item> <Item>org.eclipse.jetty.osgi.annotations.AnnotationConfiguration</Item>
<Item>org.eclipse.jetty.websocket.server.JettyWebSocketConfiguration</Item>
<Item>org.eclipse.jetty.websocket.javax.server.JavaxWebSocketConfiguration</Item>
<Item>org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration</Item> <Item>org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration</Item>
<Item>org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration</Item> <Item>org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration</Item>
</Array> </Array>

76
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java
View File

@ -48,6 +48,7 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
import aQute.bnd.osgi.Constants; import aQute.bnd.osgi.Constants;
import org.osgi.framework.BundleException;
/** /**
* Test using websocket in osgi * Test using websocket in osgi
@ -64,6 +65,7 @@ public class TestJettyOSGiBootWithJavaxWebSocket
public static Option[] configure() public static Option[] configure()
{ {
ArrayList<Option> options = new ArrayList<>(); ArrayList<Option> options = new ArrayList<>();
// options.add(TestOSGiUtil.optionalRemoteDebug());
options.add(CoreOptions.junitBundles()); options.add(CoreOptions.junitBundles());
options.addAll(TestOSGiUtil.configureJettyHomeAndPort(false, "jetty-http-boot-with-javax-websocket.xml")); options.addAll(TestOSGiUtil.configureJettyHomeAndPort(false, "jetty-http-boot-with-javax-websocket.xml"));
options.add(CoreOptions.bootDelegationPackages("org.xml.sax", "org.xml.*", "org.w3c.*", "javax.sql.*","javax.xml.*", "javax.activation.*")); options.add(CoreOptions.bootDelegationPackages("org.xml.sax", "org.xml.*", "org.w3c.*", "javax.sql.*","javax.xml.*", "javax.activation.*"));
@ -75,7 +77,7 @@ public class TestJettyOSGiBootWithJavaxWebSocket
options.add(systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(LOG_LEVEL)); options.add(systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(LOG_LEVEL));
options.add(systemProperty("org.eclipse.jetty.LEVEL").value(LOG_LEVEL)); options.add(systemProperty("org.eclipse.jetty.LEVEL").value(LOG_LEVEL));
options.addAll(jspDependencies()); options.addAll(jspDependencies());
options.addAll(annotationDependencies()); options.addAll(testJettyWebApp());
options.addAll(extraDependencies()); options.addAll(extraDependencies());
return options.toArray(new Option[options.size()]); return options.toArray(new Option[options.size()]);
} }
@ -86,13 +88,10 @@ public class TestJettyOSGiBootWithJavaxWebSocket
return TestOSGiUtil.jspDependencies(); return TestOSGiUtil.jspDependencies();
} }
public static List<Option> annotationDependencies() public static List<Option> testJettyWebApp()
{ {
List<Option> res = new ArrayList<>(); List<Option> res = new ArrayList<>();
res.add(mavenBundle().groupId( "org.eclipse.jetty.orbit" ).artifactId( "javax.mail.glassfish" ).version( "1.4.1.v201005082020" ).noStart()); res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("test-jetty-webapp").classifier("webbundle").versionAsInProject().noStart());
res.add(mavenBundle().groupId("org.eclipse.jetty.tests").artifactId("test-mock-resources").versionAsInProject());
//test webapp bundle
res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("test-jetty-webapp").classifier("webbundle").versionAsInProject());
return res; return res;
} }
public static List<Option> extraDependencies() public static List<Option> extraDependencies()
@ -103,43 +102,29 @@ public class TestJettyOSGiBootWithJavaxWebSocket
return res; return res;
} }
@Ignore @Ignore
public void assertAllBundlesActiveOrResolved() public void assertAllBundlesActiveOrResolved() throws BundleException
{ {
fixJavaxWebSocketApi();
startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.websocket.common");
startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.websocket.client");
startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.websocket.server");
startBundle(bundleContext, "org.eclipse.jetty.tests.webapp");
TestOSGiUtil.assertAllBundlesActiveOrResolved(bundleContext); TestOSGiUtil.assertAllBundlesActiveOrResolved(bundleContext);
TestOSGiUtil.debugBundles(bundleContext); TestOSGiUtil.debugBundles(bundleContext);
} }
@Test @Test
public void testWebsocket() throws Exception public void testWebsocket() throws Exception
{ {
//this is necessary because the javax.websocket-api jar does not have manifest headers fixJavaxWebSocketApi();
//that allow it to use ServiceLoader in osgi, this corrects that defect
TinyBundle bundle = TinyBundles.bundle();
bundle.set(Constants.FRAGMENT_HOST, "javax.websocket-api");
bundle.set(Constants.REQUIRE_CAPABILITY,
"osgi.serviceloader;filter:=\"(osgi.serviceloader=javax.websocket.ContainerProvider)\";resolution:=optional;cardinality:=multiple, osgi.extender; filter:=\"(osgi.extender=osgi.serviceloader.processor)\"");
bundle.set(Constants.BUNDLE_SYMBOLICNAME, "javax.websocket.api.fragment");
InputStream is = bundle.build(TinyBundles.withBnd());
bundleContext.installBundle("dummyLocation", is);
Bundle websocketApiBundle = TestOSGiUtil.getBundle(bundleContext, "javax.websocket-api");
assertNotNull(websocketApiBundle);
websocketApiBundle.update();
websocketApiBundle.start();
Bundle javaxWebsocketClient = TestOSGiUtil.getBundle(bundleContext, "org.eclipse.jetty.websocket.javax.websocket");
assertNotNull(javaxWebsocketClient);
javaxWebsocketClient.start();
Bundle javaxWebsocketServer = TestOSGiUtil.getBundle(bundleContext, "org.eclipse.jetty.websocket.javax.websocket.server");
assertNotNull(javaxWebsocketServer);
javaxWebsocketServer.start();
startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.websocket.common");
startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.websocket.client");
startBundle(bundleContext, "org.eclipse.jetty.websocket.javax.websocket.server");
startBundle(bundleContext, "org.eclipse.jetty.tests.webapp");
String port = System.getProperty("boot.javax.websocket.port"); String port = System.getProperty("boot.javax.websocket.port");
assertNotNull(port); assertNotNull(port);
@ -163,4 +148,29 @@ public class TestJettyOSGiBootWithJavaxWebSocket
assertTrue(socket.closeLatch.await(1,TimeUnit.SECONDS)); // give remote 1 second to acknowledge response assertTrue(socket.closeLatch.await(1,TimeUnit.SECONDS)); // give remote 1 second to acknowledge response
} }
} }
private void fixJavaxWebSocketApi() throws BundleException
{
// this is necessary because the javax.websocket-api jar does not have manifest headers
// that allow it to use ServiceLoader in osgi, this corrects that defect
TinyBundle bundle = TinyBundles.bundle();
bundle.set(Constants.FRAGMENT_HOST, "javax.websocket-api");
bundle.set(Constants.REQUIRE_CAPABILITY,
"osgi.serviceloader;filter:=\"(osgi.serviceloader=javax.websocket.ContainerProvider)\";resolution:=optional;cardinality:=multiple, osgi.extender; filter:=\"(osgi.extender=osgi.serviceloader.processor)\"");
bundle.set(Constants.BUNDLE_SYMBOLICNAME, "javax.websocket.api.fragment");
InputStream is = bundle.build(TinyBundles.withBnd());
bundleContext.installBundle("dummyLocation", is);
Bundle websocketApiBundle = TestOSGiUtil.getBundle(bundleContext, "javax.websocket-api");
assertNotNull(websocketApiBundle);
websocketApiBundle.update();
websocketApiBundle.start();
}
private void startBundle(BundleContext bundleContext, String symbolicName) throws BundleException
{
Bundle bundle = TestOSGiUtil.getBundle(bundleContext, symbolicName);
assertNotNull("Bundle[" + symbolicName + "] should exist",bundle);
bundle.start();
}
} }

6
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithWebSocket.java
View File

@ -67,7 +67,7 @@ public class TestJettyOSGiBootWithWebSocket
options.add(systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(LOG_LEVEL)); options.add(systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(LOG_LEVEL));
options.add(systemProperty("org.eclipse.jetty.LEVEL").value(LOG_LEVEL)); options.add(systemProperty("org.eclipse.jetty.LEVEL").value(LOG_LEVEL));
options.addAll(jspDependencies()); options.addAll(jspDependencies());
options.addAll(annotationDependencies()); options.addAll(testJettyWebApp());
return options.toArray(new Option[options.size()]); return options.toArray(new Option[options.size()]);
} }
@ -76,11 +76,9 @@ public class TestJettyOSGiBootWithWebSocket
return TestOSGiUtil.jspDependencies(); return TestOSGiUtil.jspDependencies();
} }
public static List<Option> annotationDependencies() public static List<Option> testJettyWebApp()
{ {
List<Option> res = new ArrayList<>(); List<Option> res = new ArrayList<>();
res.add(mavenBundle().groupId( "org.eclipse.jetty.orbit" ).artifactId( "javax.mail.glassfish" ).version( "1.4.1.v201005082020" ).noStart());
res.add(mavenBundle().groupId("org.eclipse.jetty.tests").artifactId("test-mock-resources").versionAsInProject());
//test webapp bundle //test webapp bundle
res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("test-jetty-webapp").classifier("webbundle").versionAsInProject()); res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("test-jetty-webapp").classifier("webbundle").versionAsInProject());
return res; return res;

9
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
View File

@ -134,10 +134,11 @@ public class TestOSGiUtil
res.add(mavenBundle().groupId( "org.eclipse.jetty.websocket" ).artifactId( "websocket-servlet" ).versionAsInProject().start()); res.add(mavenBundle().groupId( "org.eclipse.jetty.websocket" ).artifactId( "websocket-servlet" ).versionAsInProject().start());
res.add(mavenBundle().groupId( "org.eclipse.jetty.websocket" ).artifactId( "websocket-server" ).versionAsInProject().start()); res.add(mavenBundle().groupId( "org.eclipse.jetty.websocket" ).artifactId( "websocket-server" ).versionAsInProject().start());
res.add(mavenBundle().groupId( "org.eclipse.jetty.websocket" ).artifactId( "websocket-client" ).versionAsInProject().start()); res.add(mavenBundle().groupId( "org.eclipse.jetty.websocket" ).artifactId( "websocket-client" ).versionAsInProject().start());
res.add(mavenBundle().groupId( "javax.websocket" ).artifactId( "javax.websocket-api" ).versionAsInProject().start());
res.add(mavenBundle().groupId( "org.eclipse.jetty.websocket" ).artifactId( "javax-websocket-common").versionAsInProject().start()); res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("javax-websocket-common").versionAsInProject().noStart());
res.add(mavenBundle().groupId( "org.eclipse.jetty.websocket" ).artifactId( "javax-websocket-client-impl").versionAsInProject().start()); res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("javax-websocket-client").versionAsInProject().noStart());
res.add(mavenBundle().groupId( "org.eclipse.jetty.websocket" ).artifactId( "javax-websocket-server-impl").versionAsInProject().start()); res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("javax-websocket-server").versionAsInProject().noStart());
res.add(mavenBundle().groupId("javax.websocket").artifactId("javax.websocket-api").versionAsInProject().noStart());
res.add(mavenBundle().groupId( "org.eclipse.jetty.osgi" ).artifactId( "jetty-osgi-boot" ).versionAsInProject().start()); res.add(mavenBundle().groupId( "org.eclipse.jetty.osgi" ).artifactId( "jetty-osgi-boot" ).versionAsInProject().start());
return res; return res;
} }

2
jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java
View File

@ -113,7 +113,7 @@ public class SslContextFactory extends AbstractLifeCycle implements Dumpable
}}; }};
private static final Logger LOG = Log.getLogger(SslContextFactory.class); private static final Logger LOG = Log.getLogger(SslContextFactory.class);
private static final Logger LOG_CONFIG = LOG.getLogger("config"); private static final Logger LOG_CONFIG = LOG.getLogger("SslContextFactoryConfig");
public static final String DEFAULT_KEYMANAGERFACTORY_ALGORITHM = public static final String DEFAULT_KEYMANAGERFACTORY_ALGORITHM =
(Security.getProperty("ssl.KeyManagerFactory.algorithm") == null ? (Security.getProperty("ssl.KeyManagerFactory.algorithm") == null ?

3
jetty-util/src/test/java/org/eclipse/jetty/util/TypeUtilTest.java
View File

@ -30,6 +30,7 @@ import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnJre; import org.junit.jupiter.api.condition.DisabledOnJre;
import org.junit.jupiter.api.condition.EnabledOnJre; import org.junit.jupiter.api.condition.EnabledOnJre;
@ -134,12 +135,14 @@ public class TypeUtilTest
} }
@Test @Test
@Disabled // TODO fails if the mavenRepo is a symbolic link
public void testGetLocationOfClass() throws Exception public void testGetLocationOfClass() throws Exception
{ {
String mavenRepoPathProperty = System.getProperty( "mavenRepoPath"); String mavenRepoPathProperty = System.getProperty( "mavenRepoPath");
assumeTrue(mavenRepoPathProperty != null); assumeTrue(mavenRepoPathProperty != null);
Path mavenRepoPath = Paths.get( mavenRepoPathProperty ); Path mavenRepoPath = Paths.get( mavenRepoPathProperty );
System.err.println("mavenRepoPath "+mavenRepoPath);
String mavenRepo = mavenRepoPath.toFile().getPath().replaceAll("\\\\", "/"); String mavenRepo = mavenRepoPath.toFile().getPath().replaceAll("\\\\", "/");
// Classes from maven dependencies // Classes from maven dependencies

15
jetty-websocket/javax-websocket-client/pom.xml
View File

@ -9,11 +9,11 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>javax-websocket-client-impl</artifactId> <artifactId>javax-websocket-client</artifactId>
<name>Jetty :: Websocket :: javax.websocket :: Client Implementation</name> <name>Jetty :: Websocket :: javax.websocket :: Client Implementation</name>
<properties> <properties>
<bundle-symbolic-name>${project.groupId}.javax.websocket</bundle-symbolic-name> <bundle-symbolic-name>${project.groupId}.javax.websocket.client</bundle-symbolic-name>
</properties> </properties>
<dependencies> <dependencies>
@ -53,10 +53,15 @@
<instructions> <instructions>
<Bundle-Description>javax.websocket.client Implementation</Bundle-Description> <Bundle-Description>javax.websocket.client Implementation</Bundle-Description>
<Export-Package> <Export-Package>
org.eclipse.jetty.websocket.jsr356.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" org.eclipse.jetty.websocket.javax.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
</Export-Package> </Export-Package>
<Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional</Require-Capability> <Require-Capability>
<Provide-Capability>osgi.serviceloader;osgi.serviceloader=javax.websocket.ContainerProvider</Provide-Capability> osgi.extender;
filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional
</Require-Capability>
<Provide-Capability>
osgi.serviceloader;osgi.serviceloader=javax.websocket.ContainerProvider
</Provide-Capability>
</instructions> </instructions>
</configuration> </configuration>
</execution> </execution>

4
jetty-websocket/javax-websocket-client/src/main/java/module-info.java
View File

@ -18,11 +18,11 @@
import javax.websocket.ContainerProvider; import javax.websocket.ContainerProvider;
import org.eclipse.jetty.websocket.jsr356.client.JavaxWebSocketClientContainerProvider; import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider;
module org.eclipse.jetty.websocket.javax.client module org.eclipse.jetty.websocket.javax.client
{ {
exports org.eclipse.jetty.websocket.jsr356.client; exports org.eclipse.jetty.websocket.javax.client;
requires javax.websocket.api; requires javax.websocket.api;
requires org.eclipse.jetty.util; requires org.eclipse.jetty.util;

4
jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/AnnotatedClientEndpointConfig.java → jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/AnnotatedClientEndpointConfig.java
View File

@ -16,9 +16,9 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException;
import javax.websocket.ClientEndpoint; import javax.websocket.ClientEndpoint;
import javax.websocket.ClientEndpointConfig; import javax.websocket.ClientEndpointConfig;

8
jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/ClientUpgradeRequestImpl.java → jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/ClientUpgradeRequestImpl.java
View File

@ -16,14 +16,14 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import org.eclipse.jetty.client.HttpResponse; import org.eclipse.jetty.client.HttpResponse;
import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.FrameHandler;
import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandler; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandler;
import org.eclipse.jetty.websocket.jsr356.UpgradeRequest; import org.eclipse.jetty.websocket.javax.common.UpgradeRequest;
import org.eclipse.jetty.websocket.jsr356.UpgradeResponse; import org.eclipse.jetty.websocket.javax.common.UpgradeResponse;
import javax.websocket.Session; import javax.websocket.Session;
import java.net.URI; import java.net.URI;

4
jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/DelegatedClientUpgradeRequest.java → jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/DelegatedClientUpgradeRequest.java
View File

@ -16,9 +16,9 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import org.eclipse.jetty.websocket.jsr356.UpgradeRequest; import org.eclipse.jetty.websocket.javax.common.UpgradeRequest;
import java.net.URI; import java.net.URI;
import java.security.Principal; import java.security.Principal;

4
jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/DelegatedClientUpgradeResponse.java → jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/DelegatedClientUpgradeResponse.java
View File

@ -16,12 +16,12 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import org.eclipse.jetty.client.HttpResponse; import org.eclipse.jetty.client.HttpResponse;
import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.ExtensionConfig;
import org.eclipse.jetty.websocket.jsr356.UpgradeResponse; import org.eclipse.jetty.websocket.javax.common.UpgradeResponse;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;

2
jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/EmptyClientEndpointConfig.java → jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/EmptyClientEndpointConfig.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import javax.websocket.ClientEndpointConfig; import javax.websocket.ClientEndpointConfig;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/EmptyConfigurator.java → jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/EmptyConfigurator.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import javax.websocket.ClientEndpointConfig; import javax.websocket.ClientEndpointConfig;
import javax.websocket.HandshakeResponse; import javax.websocket.HandshakeResponse;

12
jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JavaxWebSocketClientContainer.java → jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainer.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.ByteBufferPool;
@ -24,11 +24,11 @@ import org.eclipse.jetty.util.DecoratedObjectFactory;
import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedObject;
import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry; import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry;
import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
import org.eclipse.jetty.websocket.jsr356.ConfiguredEndpoint; import org.eclipse.jetty.websocket.javax.common.ConfiguredEndpoint;
import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketContainer; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketExtensionConfig; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketExtensionConfig;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandlerFactory; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
import javax.websocket.ClientEndpoint; import javax.websocket.ClientEndpoint;
import javax.websocket.ClientEndpointConfig; import javax.websocket.ClientEndpointConfig;

2
jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JavaxWebSocketClientContainerProvider.java → jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainerProvider.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import org.eclipse.jetty.util.component.LifeCycle; import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.thread.ShutdownThread; import org.eclipse.jetty.util.thread.ShutdownThread;

10
jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JavaxWebSocketClientFrameHandlerFactory.java → jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientFrameHandlerFactory.java
View File

@ -16,12 +16,12 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketContainer; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandlerFactory; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandlerMetadata; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerMetadata;
import org.eclipse.jetty.websocket.jsr356.util.InvokerUtils; import org.eclipse.jetty.websocket.javax.common.util.InvokerUtils;
import javax.websocket.ClientEndpoint; import javax.websocket.ClientEndpoint;
import javax.websocket.Endpoint; import javax.websocket.Endpoint;

2
jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JsrUpgradeListener.java → jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JsrUpgradeListener.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import org.eclipse.jetty.client.HttpRequest; import org.eclipse.jetty.client.HttpRequest;
import org.eclipse.jetty.client.HttpResponse; import org.eclipse.jetty.client.HttpResponse;

2
jetty-websocket/javax-websocket-client/src/main/resources/META-INF/services/javax.websocket.ContainerProvider
View File

@ -1 +1 @@
org.eclipse.jetty.websocket.jsr356.client.JavaxWebSocketClientContainerProvider org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider

2
jetty-websocket/javax-websocket-common/pom.xml
View File

@ -31,7 +31,7 @@
<instructions> <instructions>
<Bundle-Description>javax.websocket.client Implementation</Bundle-Description> <Bundle-Description>javax.websocket.client Implementation</Bundle-Description>
<Export-Package> <Export-Package>
org.eclipse.jetty.websocket.jsr356.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" org.eclipse.jetty.websocket.javax.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
</Export-Package> </Export-Package>
</instructions> </instructions>
</configuration> </configuration>

10
jetty-websocket/javax-websocket-common/src/main/java/module-info.java
View File

@ -18,11 +18,11 @@
module org.eclipse.jetty.websocket.javax.common module org.eclipse.jetty.websocket.javax.common
{ {
exports org.eclipse.jetty.websocket.jsr356; exports org.eclipse.jetty.websocket.javax.common;
exports org.eclipse.jetty.websocket.jsr356.decoders; exports org.eclipse.jetty.websocket.javax.common.decoders;
exports org.eclipse.jetty.websocket.jsr356.encoders; exports org.eclipse.jetty.websocket.javax.common.encoders;
exports org.eclipse.jetty.websocket.jsr356.messages; exports org.eclipse.jetty.websocket.javax.common.messages;
exports org.eclipse.jetty.websocket.jsr356.util; exports org.eclipse.jetty.websocket.javax.common.util;
requires javax.websocket.api; requires javax.websocket.api;
requires org.eclipse.jetty.util; requires org.eclipse.jetty.util;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/BasicEndpointConfig.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/BasicEndpointConfig.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import javax.websocket.Decoder; import javax.websocket.Decoder;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/CompletableFutureCallback.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/CompletableFutureCallback.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/ConfiguredEndpoint.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ConfiguredEndpoint.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import javax.websocket.EndpointConfig; import javax.websocket.EndpointConfig;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/DuplicateCoderException.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/DuplicateCoderException.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
/** /**
* Thrown when a duplicate coder is encountered when attempting to identify a Endpoint's metadata ({@link javax.websocket.Decoder} or {@link javax.websocket.Encoder}) * Thrown when a duplicate coder is encountered when attempting to identify a Endpoint's metadata ({@link javax.websocket.Decoder} or {@link javax.websocket.Encoder})

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/InitException.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InitException.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
/** /**
* Exception during initialization of the Endpoint * Exception during initialization of the Endpoint

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/InvalidWebSocketException.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InvalidWebSocketException.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.websocket.core.WebSocketException; import org.eclipse.jetty.websocket.core.WebSocketException;

8
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketAsyncRemote.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.util.FutureCallback;
@ -25,9 +25,9 @@ import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.FrameHandler;
import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.OpCode;
import org.eclipse.jetty.websocket.jsr356.messages.MessageOutputStream; import org.eclipse.jetty.websocket.javax.common.messages.MessageOutputStream;
import org.eclipse.jetty.websocket.jsr356.messages.MessageWriter; import org.eclipse.jetty.websocket.javax.common.messages.MessageWriter;
import org.eclipse.jetty.websocket.jsr356.util.TextUtil; import org.eclipse.jetty.websocket.javax.common.util.TextUtil;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

4
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketBasicRemote.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.SharedBlockingCallback; import org.eclipse.jetty.util.SharedBlockingCallback;
@ -25,7 +25,7 @@ import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.FrameHandler;
import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.OpCode;
import org.eclipse.jetty.websocket.jsr356.util.TextUtil; import org.eclipse.jetty.websocket.javax.common.util.TextUtil;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.RemoteEndpoint; import javax.websocket.RemoteEndpoint;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketContainer.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.ByteBufferPool;
import org.eclipse.jetty.util.DecoratedObjectFactory; import org.eclipse.jetty.util.DecoratedObjectFactory;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketExtension.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtension.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.ExtensionConfig;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketExtensionConfig.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtensionConfig.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.ExtensionConfig;

46
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
@ -29,15 +29,15 @@ import org.eclipse.jetty.websocket.core.OpCode;
import org.eclipse.jetty.websocket.core.ProtocolException; import org.eclipse.jetty.websocket.core.ProtocolException;
import org.eclipse.jetty.websocket.core.WebSocketConstants; import org.eclipse.jetty.websocket.core.WebSocketConstants;
import org.eclipse.jetty.websocket.core.WebSocketException; import org.eclipse.jetty.websocket.core.WebSocketException;
import org.eclipse.jetty.websocket.jsr356.decoders.AvailableDecoders; import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedBinaryMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedBinaryStreamMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryStreamMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedTextMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedTextStreamMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextStreamMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.PartialByteArrayMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.PartialByteArrayMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.PartialByteBufferMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.PartialByteBufferMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.PartialStringMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.PartialStringMessageSink;
import org.eclipse.jetty.websocket.jsr356.util.InvokerUtils; import org.eclipse.jetty.websocket.javax.common.util.InvokerUtils;
import javax.websocket.CloseReason; import javax.websocket.CloseReason;
import javax.websocket.Decoder; import javax.websocket.Decoder;
@ -57,8 +57,6 @@ import java.util.Set;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandlerMetadata.MessageMetadata;
public class JavaxWebSocketFrameHandler implements FrameHandler public class JavaxWebSocketFrameHandler implements FrameHandler
{ {
private final Logger LOG; private final Logger LOG;
@ -94,8 +92,8 @@ public class JavaxWebSocketFrameHandler implements FrameHandler
private MethodHandle openHandle; private MethodHandle openHandle;
private MethodHandle closeHandle; private MethodHandle closeHandle;
private MethodHandle errorHandle; private MethodHandle errorHandle;
private MessageMetadata textMetadata; private JavaxWebSocketFrameHandlerMetadata.MessageMetadata textMetadata;
private MessageMetadata binaryMetadata; private JavaxWebSocketFrameHandlerMetadata.MessageMetadata binaryMetadata;
// TODO: need pingHandle ? // TODO: need pingHandle ?
private MethodHandle pongHandle; private MethodHandle pongHandle;
/** /**
@ -124,8 +122,8 @@ public class JavaxWebSocketFrameHandler implements FrameHandler
Object endpointInstance, Object endpointInstance,
UpgradeRequest upgradeRequest, UpgradeResponse upgradeResponse, UpgradeRequest upgradeRequest, UpgradeResponse upgradeResponse,
MethodHandle openHandle, MethodHandle closeHandle, MethodHandle errorHandle, MethodHandle openHandle, MethodHandle closeHandle, MethodHandle errorHandle,
MessageMetadata textMetadata, JavaxWebSocketFrameHandlerMetadata.MessageMetadata textMetadata,
MessageMetadata binaryMetadata, JavaxWebSocketFrameHandlerMetadata.MessageMetadata binaryMetadata,
MethodHandle pongHandle, MethodHandle pongHandle,
String id, String id,
EndpointConfig endpointConfig, EndpointConfig endpointConfig,
@ -245,8 +243,8 @@ public class JavaxWebSocketFrameHandler implements FrameHandler
closeHandle = InvokerUtils.bindTo(closeHandle, session); closeHandle = InvokerUtils.bindTo(closeHandle, session);
errorHandle = InvokerUtils.bindTo(errorHandle, session); errorHandle = InvokerUtils.bindTo(errorHandle, session);
MessageMetadata actualTextMetadata = MessageMetadata.copyOf(textMetadata); JavaxWebSocketFrameHandlerMetadata.MessageMetadata actualTextMetadata = JavaxWebSocketFrameHandlerMetadata.MessageMetadata.copyOf(textMetadata);
MessageMetadata actualBinaryMetadata = MessageMetadata.copyOf(binaryMetadata); JavaxWebSocketFrameHandlerMetadata.MessageMetadata actualBinaryMetadata = JavaxWebSocketFrameHandlerMetadata.MessageMetadata.copyOf(binaryMetadata);
pongHandle = InvokerUtils.bindTo(pongHandle, session); pongHandle = InvokerUtils.bindTo(pongHandle, session);
@ -333,12 +331,12 @@ public class JavaxWebSocketFrameHandler implements FrameHandler
return messageHandlerMap; return messageHandlerMap;
} }
public MessageMetadata getBinaryMetadata() public JavaxWebSocketFrameHandlerMetadata.MessageMetadata getBinaryMetadata()
{ {
return binaryMetadata; return binaryMetadata;
} }
public MessageMetadata getTextMetadata() public JavaxWebSocketFrameHandlerMetadata.MessageMetadata getTextMetadata()
{ {
return textMetadata; return textMetadata;
} }
@ -368,7 +366,7 @@ public class JavaxWebSocketFrameHandler implements FrameHandler
assertBasicTypeNotRegistered(OpCode.BINARY, this.binaryMetadata, handler.getClass().getName()); assertBasicTypeNotRegistered(OpCode.BINARY, this.binaryMetadata, handler.getClass().getName());
MessageSink messageSink = new PartialByteArrayMessageSink(session, partialMessageHandler); MessageSink messageSink = new PartialByteArrayMessageSink(session, partialMessageHandler);
this.binarySink = registerMessageHandler(OpCode.BINARY, clazz, handler, messageSink); this.binarySink = registerMessageHandler(OpCode.BINARY, clazz, handler, messageSink);
MessageMetadata metadata = new MessageMetadata(); JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata();
metadata.handle = partialMessageHandler; metadata.handle = partialMessageHandler;
metadata.sinkClass = PartialByteArrayMessageSink.class; metadata.sinkClass = PartialByteArrayMessageSink.class;
this.binaryMetadata = metadata; this.binaryMetadata = metadata;
@ -378,7 +376,7 @@ public class JavaxWebSocketFrameHandler implements FrameHandler
assertBasicTypeNotRegistered(OpCode.BINARY, this.binaryMetadata, handler.getClass().getName()); assertBasicTypeNotRegistered(OpCode.BINARY, this.binaryMetadata, handler.getClass().getName());
MessageSink messageSink = new PartialByteBufferMessageSink(session, partialMessageHandler); MessageSink messageSink = new PartialByteBufferMessageSink(session, partialMessageHandler);
this.binarySink = registerMessageHandler(OpCode.BINARY, clazz, handler, messageSink); this.binarySink = registerMessageHandler(OpCode.BINARY, clazz, handler, messageSink);
MessageMetadata metadata = new MessageMetadata(); JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata();
metadata.handle = partialMessageHandler; metadata.handle = partialMessageHandler;
metadata.sinkClass = PartialByteBufferMessageSink.class; metadata.sinkClass = PartialByteBufferMessageSink.class;
this.binaryMetadata = metadata; this.binaryMetadata = metadata;
@ -388,7 +386,7 @@ public class JavaxWebSocketFrameHandler implements FrameHandler
assertBasicTypeNotRegistered(OpCode.TEXT, this.textMetadata, handler.getClass().getName()); assertBasicTypeNotRegistered(OpCode.TEXT, this.textMetadata, handler.getClass().getName());
MessageSink messageSink = new PartialStringMessageSink(session, partialMessageHandler); MessageSink messageSink = new PartialStringMessageSink(session, partialMessageHandler);
this.textSink = registerMessageHandler(OpCode.TEXT, clazz, handler, messageSink); this.textSink = registerMessageHandler(OpCode.TEXT, clazz, handler, messageSink);
MessageMetadata metadata = new MessageMetadata(); JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata();
metadata.handle = partialMessageHandler; metadata.handle = partialMessageHandler;
metadata.sinkClass = PartialStringMessageSink.class; metadata.sinkClass = PartialStringMessageSink.class;
this.textMetadata = metadata; this.textMetadata = metadata;
@ -435,7 +433,7 @@ public class JavaxWebSocketFrameHandler implements FrameHandler
throw new IllegalStateException("Unable to find Decoder for type: " + clazz); throw new IllegalStateException("Unable to find Decoder for type: " + clazz);
} }
MessageMetadata metadata = new MessageMetadata(); JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata();
metadata.handle = wholeMsgMethodHandle; metadata.handle = wholeMsgMethodHandle;
metadata.registeredDecoder = registeredDecoder; metadata.registeredDecoder = registeredDecoder;

131
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandlerFactory.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java
View File

@ -16,26 +16,26 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec; import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec;
import org.eclipse.jetty.websocket.jsr356.decoders.AvailableDecoders; import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
import org.eclipse.jetty.websocket.jsr356.messages.ByteArrayMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.ByteArrayMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.ByteBufferMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.ByteBufferMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedBinaryMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedBinaryStreamMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryStreamMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.DecodedMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedTextMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedTextStreamMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextStreamMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.InputStreamMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.InputStreamMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.PartialByteArrayMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.PartialByteArrayMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.PartialByteBufferMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.PartialByteBufferMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.PartialStringMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.PartialStringMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.ReaderMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.ReaderMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.StringMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.StringMessageSink;
import org.eclipse.jetty.websocket.jsr356.util.InvalidSignatureException; import org.eclipse.jetty.websocket.javax.common.util.InvalidSignatureException;
import org.eclipse.jetty.websocket.jsr356.util.InvokerUtils; import org.eclipse.jetty.websocket.javax.common.util.InvokerUtils;
import org.eclipse.jetty.websocket.jsr356.util.ReflectUtils; import org.eclipse.jetty.websocket.javax.common.util.ReflectUtils;
import javax.websocket.CloseReason; import javax.websocket.CloseReason;
import javax.websocket.Decoder; import javax.websocket.Decoder;
@ -63,8 +63,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import static java.nio.charset.StandardCharsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import static org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandlerMetadata.MessageMetadata; import static org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerMetadata.MessageMetadata;
import static org.eclipse.jetty.websocket.jsr356.util.InvokerUtils.Arg;
public abstract class JavaxWebSocketFrameHandlerFactory public abstract class JavaxWebSocketFrameHandlerFactory
{ {
@ -396,8 +395,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory
if (onmethod != null) if (onmethod != null)
{ {
assertSignatureValid(endpointClass, onmethod, OnOpen.class); assertSignatureValid(endpointClass, onmethod, OnOpen.class);
final Arg SESSION = new Arg(Session.class); final InvokerUtils.Arg SESSION = new InvokerUtils.Arg(Session.class);
final Arg ENDPOINT_CONFIG = new Arg(EndpointConfig.class); final InvokerUtils.Arg ENDPOINT_CONFIG = new InvokerUtils.Arg(EndpointConfig.class);
MethodHandle methodHandle = InvokerUtils MethodHandle methodHandle = InvokerUtils
.mutatedInvoker(endpointClass, onmethod, paramIdentifier, metadata.getNamedTemplateVariables(), SESSION, ENDPOINT_CONFIG); .mutatedInvoker(endpointClass, onmethod, paramIdentifier, metadata.getNamedTemplateVariables(), SESSION, ENDPOINT_CONFIG);
metadata.setOpenHandler(methodHandle, onmethod); metadata.setOpenHandler(methodHandle, onmethod);
@ -408,8 +407,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory
if (onmethod != null) if (onmethod != null)
{ {
assertSignatureValid(endpointClass, onmethod, OnClose.class); assertSignatureValid(endpointClass, onmethod, OnClose.class);
final Arg SESSION = new Arg(Session.class); final InvokerUtils.Arg SESSION = new InvokerUtils.Arg(Session.class);
final Arg CLOSE_REASON = new Arg(CloseReason.class); final InvokerUtils.Arg CLOSE_REASON = new InvokerUtils.Arg(CloseReason.class);
MethodHandle methodHandle = InvokerUtils MethodHandle methodHandle = InvokerUtils
.mutatedInvoker(endpointClass, onmethod, paramIdentifier, metadata.getNamedTemplateVariables(), SESSION, CLOSE_REASON); .mutatedInvoker(endpointClass, onmethod, paramIdentifier, metadata.getNamedTemplateVariables(), SESSION, CLOSE_REASON);
metadata.setCloseHandler(methodHandle, onmethod); metadata.setCloseHandler(methodHandle, onmethod);
@ -419,8 +418,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory
if (onmethod != null) if (onmethod != null)
{ {
assertSignatureValid(endpointClass, onmethod, OnError.class); assertSignatureValid(endpointClass, onmethod, OnError.class);
final Arg SESSION = new Arg(Session.class); final InvokerUtils.Arg SESSION = new InvokerUtils.Arg(Session.class);
final Arg CAUSE = new Arg(Throwable.class).required(); final InvokerUtils.Arg CAUSE = new InvokerUtils.Arg(Throwable.class).required();
MethodHandle methodHandle = InvokerUtils MethodHandle methodHandle = InvokerUtils
.mutatedInvoker(endpointClass, onmethod, paramIdentifier, metadata.getNamedTemplateVariables(), SESSION, CAUSE); .mutatedInvoker(endpointClass, onmethod, paramIdentifier, metadata.getNamedTemplateVariables(), SESSION, CAUSE);
metadata.setErrorHandler(methodHandle, onmethod); metadata.setErrorHandler(methodHandle, onmethod);
@ -431,52 +430,52 @@ public abstract class JavaxWebSocketFrameHandlerFactory
if (onMessages != null && onMessages.length > 0) if (onMessages != null && onMessages.length > 0)
{ {
// The different kind of @OnMessage method parameter signatures expected // The different kind of @OnMessage method parameter signatures expected
Arg textCallingArgs[] = new Arg[] { InvokerUtils.Arg textCallingArgs[] = new InvokerUtils.Arg[] {
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(String.class).required() new InvokerUtils.Arg(String.class).required()
}; };
Arg textPartialCallingArgs[] = new Arg[] { InvokerUtils.Arg textPartialCallingArgs[] = new InvokerUtils.Arg[] {
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(String.class).required(), new InvokerUtils.Arg(String.class).required(),
new Arg(boolean.class).required() new InvokerUtils.Arg(boolean.class).required()
}; };
Arg binaryBufferCallingArgs[] = new Arg[] { InvokerUtils.Arg binaryBufferCallingArgs[] = new InvokerUtils.Arg[] {
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(ByteBuffer.class).required() new InvokerUtils.Arg(ByteBuffer.class).required()
}; };
Arg binaryPartialBufferCallingArgs[] = new Arg[] { InvokerUtils.Arg binaryPartialBufferCallingArgs[] = new InvokerUtils.Arg[] {
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(ByteBuffer.class).required(), new InvokerUtils.Arg(ByteBuffer.class).required(),
new Arg(boolean.class).required() new InvokerUtils.Arg(boolean.class).required()
}; };
Arg binaryArrayCallingArgs[] = new Arg[] { InvokerUtils.Arg binaryArrayCallingArgs[] = new InvokerUtils.Arg[] {
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(byte[].class).required() new InvokerUtils.Arg(byte[].class).required()
}; };
Arg binaryPartialArrayCallingArgs[] = new Arg[] { InvokerUtils.Arg binaryPartialArrayCallingArgs[] = new InvokerUtils.Arg[] {
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(byte[].class).required(), new InvokerUtils.Arg(byte[].class).required(),
new Arg(boolean.class).required() new InvokerUtils.Arg(boolean.class).required()
}; };
Arg inputStreamCallingArgs[] = new Arg[] { InvokerUtils.Arg inputStreamCallingArgs[] = new InvokerUtils.Arg[] {
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(InputStream.class).required() new InvokerUtils.Arg(InputStream.class).required()
}; };
Arg readerCallingArgs[] = new Arg[] { InvokerUtils.Arg readerCallingArgs[] = new InvokerUtils.Arg[] {
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(Reader.class).required() new InvokerUtils.Arg(Reader.class).required()
}; };
Arg pongCallingArgs[] = new Arg[] { InvokerUtils.Arg pongCallingArgs[] = new InvokerUtils.Arg[] {
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(PongMessage.class).required() new InvokerUtils.Arg(PongMessage.class).required()
}; };
List<DecodedArgs> decodedTextCallingArgs = new ArrayList<>(); List<DecodedArgs> decodedTextCallingArgs = new ArrayList<>();
@ -490,8 +489,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory
{ {
decodedTextCallingArgs.add( decodedTextCallingArgs.add(
new DecodedArgs(decoder, new DecodedArgs(decoder,
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(decoder.objectType).required() new InvokerUtils.Arg(decoder.objectType).required()
)); ));
} }
@ -499,8 +498,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory
{ {
decodedTextStreamCallingArgs.add( decodedTextStreamCallingArgs.add(
new DecodedArgs(decoder, new DecodedArgs(decoder,
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(decoder.objectType).required() new InvokerUtils.Arg(decoder.objectType).required()
)); ));
} }
@ -508,8 +507,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory
{ {
decodedBinaryCallingArgs.add( decodedBinaryCallingArgs.add(
new DecodedArgs(decoder, new DecodedArgs(decoder,
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(decoder.objectType).required() new InvokerUtils.Arg(decoder.objectType).required()
)); ));
} }
@ -517,8 +516,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory
{ {
decodedBinaryStreamCallingArgs.add( decodedBinaryStreamCallingArgs.add(
new DecodedArgs(decoder, new DecodedArgs(decoder,
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(decoder.objectType).required() new InvokerUtils.Arg(decoder.objectType).required()
)); ));
} }
} }
@ -767,9 +766,9 @@ public abstract class JavaxWebSocketFrameHandlerFactory
private static class DecodedArgs private static class DecodedArgs
{ {
public final AvailableDecoders.RegisteredDecoder registeredDecoder; public final AvailableDecoders.RegisteredDecoder registeredDecoder;
public final Arg[] args; public final InvokerUtils.Arg[] args;
public DecodedArgs(AvailableDecoders.RegisteredDecoder registeredDecoder, Arg... args) public DecodedArgs(AvailableDecoders.RegisteredDecoder registeredDecoder, InvokerUtils.Arg... args)
{ {
this.registeredDecoder = registeredDecoder; this.registeredDecoder = registeredDecoder;
this.args = args; this.args = args;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandlerMetadata.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java
View File

@ -16,11 +16,11 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec; import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec;
import org.eclipse.jetty.websocket.jsr356.decoders.AvailableDecoders; import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
import org.eclipse.jetty.websocket.jsr356.encoders.AvailableEncoders; import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders;
import javax.websocket.Decoder; import javax.websocket.Decoder;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketPongMessage.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketPongMessage.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketRemoteEndpoint.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
@ -28,8 +28,8 @@ import org.eclipse.jetty.websocket.core.FrameHandler;
import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.OpCode;
import org.eclipse.jetty.websocket.core.OutgoingFrames; import org.eclipse.jetty.websocket.core.OutgoingFrames;
import org.eclipse.jetty.websocket.core.WebSocketException; import org.eclipse.jetty.websocket.core.WebSocketException;
import org.eclipse.jetty.websocket.jsr356.messages.MessageOutputStream; import org.eclipse.jetty.websocket.javax.common.messages.MessageOutputStream;
import org.eclipse.jetty.websocket.jsr356.messages.MessageWriter; import org.eclipse.jetty.websocket.javax.common.messages.MessageWriter;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

9
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketSession.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.util.SharedBlockingCallback; import org.eclipse.jetty.util.SharedBlockingCallback;
import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.component.AbstractLifeCycle;
@ -24,9 +24,9 @@ import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.ExtensionConfig;
import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.FrameHandler;
import org.eclipse.jetty.websocket.jsr356.decoders.AvailableDecoders; import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
import org.eclipse.jetty.websocket.jsr356.encoders.AvailableEncoders; import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders;
import org.eclipse.jetty.websocket.jsr356.util.ReflectUtils; import org.eclipse.jetty.websocket.javax.common.util.ReflectUtils;
import javax.websocket.CloseReason; import javax.websocket.CloseReason;
import javax.websocket.EndpointConfig; import javax.websocket.EndpointConfig;
@ -37,7 +37,6 @@ import javax.websocket.RemoteEndpoint.Basic;
import javax.websocket.Session; import javax.websocket.Session;
import javax.websocket.WebSocketContainer; import javax.websocket.WebSocketContainer;
import java.io.IOException; import java.io.IOException;
import java.lang.invoke.MethodHandle;
import java.net.URI; import java.net.URI;
import java.security.Principal; import java.security.Principal;
import java.time.Duration; import java.time.Duration;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketUpgradeRequest.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeRequest.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import java.net.URI; import java.net.URI;
import java.util.List; import java.util.List;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketUpgradeResponse.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeResponse.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.ExtensionConfig;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/MessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/MessageSink.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;

4
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/PathParamProvider.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PathParamProvider.java
View File

@ -16,13 +16,13 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import java.util.Map; import java.util.Map;
/** /**
* Optional interface for custom {@link javax.websocket.EndpointConfig} implementations * Optional interface for custom {@link javax.websocket.EndpointConfig} implementations
* in Jetty to expose Path Param values used during the {@link org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandler} * in Jetty to expose Path Param values used during the {@link JavaxWebSocketFrameHandler}
* resolution of methods. * resolution of methods.
* <p> * <p>
* Mostly a feature of the JSR356 Server implementation and its {@code &#064;javax.websocket.server.PathParam} annotation. * Mostly a feature of the JSR356 Server implementation and its {@code &#064;javax.websocket.server.PathParam} annotation.

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/RegisteredMessageHandler.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/RegisteredMessageHandler.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import javax.websocket.MessageHandler; import javax.websocket.MessageHandler;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/SendHandlerCallback.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SendHandlerCallback.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeRequest.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequest.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import java.net.URI; import java.net.URI;
import java.security.Principal; import java.security.Principal;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeRequestAdapter.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequestAdapter.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import java.net.URI; import java.net.URI;
import java.security.Principal; import java.security.Principal;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeResponse.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponse.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.ExtensionConfig;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeResponseAdapter.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponseAdapter.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.ExtensionConfig;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/AbstractDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AbstractDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.Decoder; import javax.websocket.Decoder;
import javax.websocket.EndpointConfig; import javax.websocket.EndpointConfig;

10
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/AvailableDecoders.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java
View File

@ -16,12 +16,12 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import org.eclipse.jetty.websocket.jsr356.InitException; import org.eclipse.jetty.websocket.javax.common.InitException;
import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException;
import org.eclipse.jetty.websocket.jsr356.util.InvalidSignatureException; import org.eclipse.jetty.websocket.javax.common.util.InvalidSignatureException;
import org.eclipse.jetty.websocket.jsr356.util.ReflectUtils; import org.eclipse.jetty.websocket.javax.common.util.ReflectUtils;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/BooleanDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/BooleanDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ByteArrayDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteArrayDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ByteBufferDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteBufferDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ByteDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/CharacterDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/CharacterDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/DoubleDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/DoubleDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/FloatDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/FloatDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/InputStreamDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/InputStreamDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/IntegerDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/IntegerDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/LongDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/LongDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/PongMessageDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/PongMessageDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ReaderDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ReaderDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ShortDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ShortDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/StringDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/StringDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/AbstractEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AbstractEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.Encoder; import javax.websocket.Encoder;
import javax.websocket.EndpointConfig; import javax.websocket.EndpointConfig;

10
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/AvailableEncoders.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java
View File

@ -16,12 +16,12 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import org.eclipse.jetty.websocket.jsr356.InitException; import org.eclipse.jetty.websocket.javax.common.InitException;
import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException;
import org.eclipse.jetty.websocket.jsr356.util.InvalidSignatureException; import org.eclipse.jetty.websocket.javax.common.util.InvalidSignatureException;
import org.eclipse.jetty.websocket.jsr356.util.ReflectUtils; import org.eclipse.jetty.websocket.javax.common.util.ReflectUtils;
import javax.websocket.Encoder; import javax.websocket.Encoder;
import javax.websocket.EndpointConfig; import javax.websocket.EndpointConfig;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/BooleanEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/BooleanEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ByteArrayEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteArrayEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ByteBufferEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteBufferEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ByteEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/CharacterEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/CharacterEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/DoubleEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/DoubleEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/EncodeFailedFuture.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/EncodeFailedFuture.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.Encoder; import javax.websocket.Encoder;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/FloatEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/FloatEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/IntegerEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/IntegerEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/LongEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/LongEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ShortEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ShortEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/StringEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/StringEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/AbstractMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSink.java
View File

@ -16,10 +16,10 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import org.eclipse.jetty.websocket.jsr356.MessageSink; import org.eclipse.jetty.websocket.javax.common.MessageSink;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;
import java.util.Objects; import java.util.Objects;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/ByteArrayMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteArrayMessageSink.java
View File

@ -16,14 +16,14 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.MessageTooLargeException; import org.eclipse.jetty.websocket.core.MessageTooLargeException;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import org.eclipse.jetty.websocket.jsr356.util.InvalidSignatureException; import org.eclipse.jetty.websocket.javax.common.util.InvalidSignatureException;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;

4
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/ByteBufferMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteBufferMessageSink.java
View File

@ -16,13 +16,13 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.MessageTooLargeException; import org.eclipse.jetty.websocket.core.MessageTooLargeException;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/CallbackBuffer.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/CallbackBuffer.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedBinaryMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java
View File

@ -16,11 +16,11 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.websocket.core.CloseException; import org.eclipse.jetty.websocket.core.CloseException;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import org.eclipse.jetty.websocket.jsr356.MessageSink; import org.eclipse.jetty.websocket.javax.common.MessageSink;
import javax.websocket.CloseReason; import javax.websocket.CloseReason;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedBinaryStreamMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java
View File

@ -16,11 +16,11 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.websocket.core.CloseException; import org.eclipse.jetty.websocket.core.CloseException;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import org.eclipse.jetty.websocket.jsr356.MessageSink; import org.eclipse.jetty.websocket.javax.common.MessageSink;
import javax.websocket.CloseReason; import javax.websocket.CloseReason;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java
View File

@ -16,14 +16,14 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import org.eclipse.jetty.websocket.jsr356.MessageSink; import org.eclipse.jetty.websocket.javax.common.MessageSink;
import javax.websocket.Decoder; import javax.websocket.Decoder;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedTextMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java
View File

@ -16,11 +16,11 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.websocket.core.CloseException; import org.eclipse.jetty.websocket.core.CloseException;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import org.eclipse.jetty.websocket.jsr356.MessageSink; import org.eclipse.jetty.websocket.javax.common.MessageSink;
import javax.websocket.CloseReason; import javax.websocket.CloseReason;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedTextStreamMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java
View File

@ -16,11 +16,11 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.websocket.core.CloseException; import org.eclipse.jetty.websocket.core.CloseException;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import org.eclipse.jetty.websocket.jsr356.MessageSink; import org.eclipse.jetty.websocket.javax.common.MessageSink;
import javax.websocket.CloseReason; import javax.websocket.CloseReason;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DispatchedMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DispatchedMessageSink.java
View File

@ -16,12 +16,12 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import org.eclipse.jetty.websocket.jsr356.MessageSink; import org.eclipse.jetty.websocket.javax.common.MessageSink;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;
import java.util.Objects; import java.util.Objects;

Some files were not shown because too many files have changed in this diff Show More