reverts - commited by accident :-/

Revert "special j1 version" Revert "create container with external Grizzly server" This reverts commit 6a1c05f. This reverts commit 2a3038b.
facundofarias · Oct 5, 2015 · aa899a9 · aa899a9
1 parent 2a3038b
commit aa899a9
Show file tree

Hide file tree

Showing 71 changed files with 70 additions and 209 deletions.
diff --git a/archetypes/echo/pom.xml b/archetypes/echo/pom.xml
@@ -44,7 +44,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.archetypes</groupId>
         <artifactId>tyrus-archetypes-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>

diff --git a/archetypes/pom.xml b/archetypes/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.glassfish.tyrus.archetypes</groupId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -52,7 +52,7 @@
 
     <groupId>org.glassfish.tyrus</groupId>
     <artifactId>tyrus-bom</artifactId>
-    <version>2.0-J1-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Tyrus BOM</name>
 

diff --git a/bundles/client-jdk/pom.xml b/bundles/client-jdk/pom.xml
@@ -44,7 +44,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.bundles</groupId>
         <artifactId>tyrus-bundles</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/bundles/client/pom.xml b/bundles/client/pom.xml
@@ -44,7 +44,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.bundles</groupId>
         <artifactId>tyrus-bundles</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/bundles/pom.xml b/bundles/pom.xml
@@ -47,7 +47,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.glassfish.tyrus.bundles</groupId>

diff --git a/bundles/samples/pom.xml b/bundles/samples/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.bundles</groupId>
         <artifactId>tyrus-bundles</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>tyrus-samples</artifactId>

diff --git a/bundles/websocket-ri-archive/pom.xml b/bundles/websocket-ri-archive/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.bundles</groupId>
         <artifactId>tyrus-bundles</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>websocket-ri-archive</artifactId>

diff --git a/bundles/websocket-ri-bundle/pom.xml b/bundles/websocket-ri-bundle/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.bundles</groupId>
         <artifactId>tyrus-bundles</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>websocket-ri-bundle</artifactId>

diff --git a/client/pom.xml b/client/pom.xml
@@ -44,7 +44,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/containers/glassfish/cdi/pom.xml b/containers/glassfish/cdi/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-glassfish-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <packaging>bundle</packaging>

diff --git a/containers/glassfish/ejb/pom.xml b/containers/glassfish/ejb/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-glassfish-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <packaging>bundle</packaging>

diff --git a/containers/glassfish/pom.xml b/containers/glassfish/pom.xml
@@ -44,7 +44,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/containers/grizzly-client/pom.xml b/containers/grizzly-client/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <packaging>bundle</packaging>

diff --git a/containers/grizzly-server/pom.xml b/containers/grizzly-server/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <packaging>bundle</packaging>

diff --git a/...er/src/main/java/org/glassfish/tyrus/container/grizzly/server/GrizzlyServerContainer.java b/...er/src/main/java/org/glassfish/tyrus/container/grizzly/server/GrizzlyServerContainer.java
@@ -233,145 +233,6 @@ public void stop() {
         };
     }
 
-    /**
-     * Create container - user provided HttpServer.
-     *
-     * @param server server.
-     * @param properties properties.
-     * @return new ServerContainer.
-     * @see #createContainer(java.util.Map)
-     */
-    public ServerContainer createContainer(final HttpServer server, Map<String, Object> properties) {
-
-        final Map<String, Object> localProperties;
-        // defensive copy
-        if (properties == null) {
-            localProperties = Collections.emptyMap();
-        } else {
-            localProperties = new HashMap<String, Object>(properties);
-        }
-
-        final Integer incomingBufferSize =
-                Utils.getProperty(localProperties, TyrusWebSocketEngine.INCOMING_BUFFER_SIZE, Integer.class);
-        final ClusterContext clusterContext =
-                Utils.getProperty(localProperties, ClusterContext.CLUSTER_CONTEXT, ClusterContext.class);
-        final ApplicationEventListener applicationEventListener =
-                Utils.getProperty(localProperties, ApplicationEventListener.APPLICATION_EVENT_LISTENER,
-                        ApplicationEventListener.class);
-        final Integer maxSessionsPerApp =
-                Utils.getProperty(localProperties, TyrusWebSocketEngine.MAX_SESSIONS_PER_APP, Integer.class);
-        final Integer maxSessionsPerRemoteAddr =
-                Utils.getProperty(localProperties, TyrusWebSocketEngine.MAX_SESSIONS_PER_REMOTE_ADDR, Integer.class);
-        final Boolean parallelBroadcastEnabled =
-                Utils.getProperty(localProperties, TyrusWebSocketEngine.PARALLEL_BROADCAST_ENABLED, Boolean.class);
-        final DebugContext.TracingType tracingType =
-                Utils.getProperty(localProperties, TyrusWebSocketEngine.TRACING_TYPE, DebugContext.TracingType.class,
-                        DebugContext.TracingType.OFF);
-        final DebugContext.TracingThreshold tracingThreshold =
-                Utils.getProperty(localProperties, TyrusWebSocketEngine.TRACING_THRESHOLD,
-                        DebugContext.TracingThreshold.class, DebugContext.TracingThreshold.TRACE);
-
-        return new TyrusServerContainer((Set<Class<?>>) null) {
-
-            private final WebSocketEngine engine =
-                    TyrusWebSocketEngine.builder(this)
-                            .incomingBufferSize(incomingBufferSize)
-                            .clusterContext(clusterContext)
-                            .applicationEventListener(applicationEventListener)
-                            .maxSessionsPerApp(maxSessionsPerApp)
-                            .maxSessionsPerRemoteAddr(maxSessionsPerRemoteAddr)
-                            .parallelBroadcastEnabled(parallelBroadcastEnabled)
-                            .tracingType(tracingType)
-                            .tracingThreshold(tracingThreshold)
-                            .build();
-
-            private String contextPath;
-
-            @Override
-            public void register(Class<?> endpointClass) throws DeploymentException {
-                engine.register(endpointClass, contextPath);
-            }
-
-            @Override
-            public void register(ServerEndpointConfig serverEndpointConfig) throws DeploymentException {
-                engine.register(serverEndpointConfig, contextPath);
-            }
-
-            @Override
-            public WebSocketEngine getWebSocketEngine() {
-                return engine;
-            }
-
-            @Override
-            public void start(final String rootPath, int port) throws IOException, DeploymentException {
-                contextPath = rootPath;
-                final ServerConfiguration config = server.getServerConfiguration();
-
-                final NetworkListener listener = new NetworkListener("grizzly", "0.0.0.0", port);
-                server.addListener(listener);
-
-                // server = HttpServer.createSimpleServer(rootPath, port);
-                ThreadPoolConfig workerThreadPoolConfig =
-                        Utils.getProperty(localProperties, WORKER_THREAD_POOL_CONFIG, ThreadPoolConfig.class);
-                ThreadPoolConfig selectorThreadPoolConfig =
-                        Utils.getProperty(localProperties, SELECTOR_THREAD_POOL_CONFIG, ThreadPoolConfig.class);
-
-                // TYRUS-287: configurable server thread pools
-                if (workerThreadPoolConfig != null || selectorThreadPoolConfig != null) {
-                    TCPNIOTransportBuilder transportBuilder = TCPNIOTransportBuilder.newInstance();
-                    if (workerThreadPoolConfig != null) {
-                        transportBuilder.setWorkerThreadPoolConfig(workerThreadPoolConfig);
-                    }
-                    if (selectorThreadPoolConfig != null) {
-                        transportBuilder.setSelectorThreadPoolConfig(selectorThreadPoolConfig);
-                    }
-                    transportBuilder.setIOStrategy(WorkerThreadIOStrategy.getInstance());
-                    server.getListener("grizzly").setTransport(transportBuilder.build());
-                } else {
-                    // if no configuration is set, just update IO Strategy to worker thread strat.
-                    server.getListener("grizzly").getTransport().setIOStrategy(WorkerThreadIOStrategy.getInstance());
-                }
-
-                // idle timeout set to indefinite.
-                server.getListener("grizzly").getKeepAlive().setIdleTimeoutInSeconds(-1);
-                server.getListener("grizzly").registerAddOn(new WebSocketAddOn(this, contextPath));
-
-                final WebSocketEngine webSocketEngine = getWebSocketEngine();
-
-                final Object staticContentPath = localProperties.get(Server.STATIC_CONTENT_ROOT);
-                HttpHandler staticHandler = null;
-                if (staticContentPath != null && !staticContentPath.toString().isEmpty()) {
-                    staticHandler = new StaticHttpHandler(staticContentPath.toString());
-                }
-
-                final Object wsadl = localProperties.get(TyrusWebSocketEngine.WSADL_SUPPORT);
-
-                if (wsadl != null && wsadl.toString().equalsIgnoreCase("true")) { // wsadl enabled
-                    config.addHttpHandler(new WsadlHttpHandler((TyrusWebSocketEngine) webSocketEngine, staticHandler));
-                } else if (staticHandler != null) { // wsadl disabled
-                    config.addHttpHandler(staticHandler);
-                }
-
-                if (applicationEventListener != null) {
-                    applicationEventListener.onApplicationInitialized(rootPath);
-                }
-
-                // server.start();
-                super.start(rootPath, port);
-            }
-
-            @Override
-            public void stop() {
-                super.stop();
-                // server.shutdownNow();
-                if (applicationEventListener != null) {
-                    applicationEventListener.onApplicationDestroyed();
-                }
-            }
-        };
-    }
-
-
     private static class WsadlHttpHandler extends HttpHandler {
 
         private final TyrusWebSocketEngine engine;

diff --git a/containers/inmemory/pom.xml b/containers/inmemory/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <packaging>bundle</packaging>

diff --git a/containers/jdk-client/pom.xml b/containers/jdk-client/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <packaging>bundle</packaging>

diff --git a/containers/pom.xml b/containers/pom.xml
@@ -44,7 +44,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/containers/servlet/pom.xml b/containers/servlet/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-containers-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/core/pom.xml b/core/pom.xml
@@ -44,7 +44,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -45,7 +45,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>tyrus-documentation</artifactId>

diff --git a/ext/client-cli/pom.xml b/ext/client-cli/pom.xml
@@ -44,7 +44,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.ext</groupId>
         <artifactId>tyrus-extensions-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/ext/client-java8/pom.xml b/ext/client-java8/pom.xml
@@ -44,7 +44,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.ext</groupId>
         <artifactId>tyrus-extensions-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/ext/extension-deflate/pom.xml b/ext/extension-deflate/pom.xml
@@ -44,7 +44,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.ext</groupId>
         <artifactId>tyrus-extensions-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/ext/monitoring-jmx/pom.xml b/ext/monitoring-jmx/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.ext</groupId>
         <artifactId>tyrus-extensions-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>tyrus-monitoring-jmx</artifactId>

diff --git a/ext/pom.xml b/ext/pom.xml
@@ -44,7 +44,7 @@
     <parent>
         <groupId>org.glassfish.tyrus</groupId>
         <artifactId>tyrus-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -51,7 +51,7 @@
 
     <groupId>org.glassfish.tyrus</groupId>
     <artifactId>tyrus-project</artifactId>
-    <version>2.0-J1-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>tyrus</name>
     <description>Tyrus is the reference implementation of Java API for WebSocket (JSR-356).</description>

diff --git a/samples/auction/pom.xml b/samples/auction/pom.xml
@@ -46,7 +46,7 @@
     <parent>
         <groupId>org.glassfish.tyrus.samples</groupId>
         <artifactId>tyrus-samples-project</artifactId>
-        <version>2.0-J1-SNAPSHOT</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>