novnc console added

Author: memebasenitw

server/src/com/cloud/servlet/ConsoleProxyServlet.java

@@ -49,6 +49,16 @@
       <artifactId>cloudstack-service-console-proxy-rdpclient</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>9.2.20.v20161216</version>
+    </dependency>
+    <dependency>
+        <groupId>org.eclipse.jetty.websocket</groupId>
+        <artifactId>websocket-server</artifactId>
+        <version>9.2.20.v20161216</version>
+    </dependency>
   </dependencies>
   <build>
     <resources>
@@ -60,4 +70,4 @@
       </resource>
     </resources>
   </build>
-</project>
+</project>

services/console-proxy/server/pom.xml

@@ -41,6 +41,7 @@
 
 import com.cloud.consoleproxy.util.Logger;
 import com.cloud.utils.PropertiesUtil;
+import org.eclipse.jetty.server.Server;
 
 /**
  *
@@ -328,7 +329,7 @@ public static void start(Properties conf) {
         }
 
         if (httpListenPort != 0) {
-            startupHttpMain();
+            startServerForNoVNC();
         } else {
             s_logger.error("A valid HTTP server port is required to be specified, please check your consoleproxy.httpListenPort settings");
             System.exit(1);
@@ -345,27 +346,6 @@ public static void start(Properties conf) {
         cthread.start();
     }
 
-    private static void startupHttpMain() {
-        try {
-            ConsoleProxyServerFactory factory = getHttpServerFactory();
-            if (factory == null) {
-                s_logger.error("Unable to load HTTP server factory");
-                System.exit(1);
-            }
-
-            HttpServer server = factory.createHttpServerInstance(httpListenPort);
-            server.createContext("/getscreen", new ConsoleProxyThumbnailHandler());
-            server.createContext("/resource/", new ConsoleProxyResourceHandler());
-            server.createContext("/ajax", new ConsoleProxyAjaxHandler());
-            server.createContext("/ajaximg", new ConsoleProxyAjaxImageHandler());
-            server.setExecutor(new ThreadExecutor()); // creates a default executor
-            server.start();
-        } catch (Exception e) {
-            s_logger.error(e.getMessage(), e);
-            System.exit(1);
-        }
-    }
-
     private static void startupHttpCmdPort() {
         try {
             s_logger.info("Listening for HTTP CMDs on port " + httpCmdListenPort);
@@ -379,7 +359,23 @@ private static void startupHttpCmdPort() {
         }
     }
 
-    public static void main(String[] argv) {
+    private static void startServerForNoVNC() {
+        try {
+            ConsoleProxyServerFactory factory = getHttpServerFactory();
+            if (factory == null) {
+                s_logger.error("Unable to load HTTP server factory");
+                System.exit(1);
+            }
+            Server webServer = factory.
+                    createConsoleProxyServer(443);
+            webServer.start();
+        } catch (Exception e) {
+            s_logger.error(" could not start webserver at 80", e);
+            throw new RuntimeException("could not start webserver at 80");
+        }
+    }
+
+    public static void main(String[] argv) throws Exception {
         standaloneStart = true;
         configLog4j();
         Logger.setFactory(new ConsoleProxyLoggerFactory());