Merge pull request #532 from oleksiys/master

[grizzly] + update grizzly* test: remove System.in.read() call

grizzly-bm/pom.xml

@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.glassfish.grizzly</groupId>
             <artifactId>grizzly-http-server</artifactId>
-            <version>2.3.7-SNAPSHOT</version>
+            <version>2.3.5</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -76,10 +76,10 @@
             <version>2.2.2</version>
         </dependency>
     </dependencies>
-    <repositories>
+    <!-- <repositories>
         <repository>
             <id>grizzly-snapshots</id>
             <url>https://maven.java.net/content/repositories/snapshots/</url>
         </repository>
-    </repositories>
+    </repositories> -->
 </project>

grizzly-bm/src/main/java/org/glassfish/grizzly/bm/Server.java

@@ -12,7 +12,7 @@ import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
 public class Server {
     public static final String SERVER_VERSION = "Grizzly/" + Grizzly.getDotedVersion();
     
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) throws Exception {
         final int port = args.length > 0
                 ? Integer.parseInt(args[0]) : 8080;
         
@@ -39,8 +39,10 @@ public class Server {
         try {
             httpServer.start();
             
-            System.err.print("Server started. Press ENTER to stop.\n");
-            System.in.read();
+            System.err.print("Server started.\n");
+            synchronized (Server.class) {
+		Server.class.wait();
+            }
         } finally {
             httpServer.stop();
         }

grizzly-jersey/src/main/java/hello/JerseyWebServer.java

@@ -34,10 +34,17 @@ public class JerseyWebServer {
     rc.setPropertiesAndFeatures(properties());
     rc.getContainerResponseFilters().add(new ServerResponseFilter());
     HttpServer server = GrizzlyServerFactory.createHttpServer(baseUri, rc);
-    
-    System.err.print("Server started. Press ENTER to stop.");
-    System.in.read();
-    server.stop();
+
+    try {
+        server.start();
+
+        System.err.print("Server started.\n");
+        synchronized (JerseyWebServer.class) {
+            JerseyWebServer.class.wait();
+        }
+    } finally {
+        server.stop();
+    }
   }
 
   private Map<String, Object> properties() {