asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mb...@apache.org
Subject asterixdb git commit: Make setupQueryWebServer Accessible From Extensions
Date Mon, 22 Aug 2016 15:52:59 GMT
Repository: asterixdb
Updated Branches:
  refs/heads/master 6cc59cacb -> 7f1704a2d


Make setupQueryWebServer Accessible From Extensions

Change-Id: Iaf5f86cb133d7b135a8edb621b97a7794014aefc
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1100
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <tillw@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/7f1704a2
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/7f1704a2
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/7f1704a2

Branch: refs/heads/master
Commit: 7f1704a2d00449582672ca2c353f7b9a8323d175
Parents: 6cc59ca
Author: Michael Blow <mblow@apache.org>
Authored: Mon Aug 22 04:28:38 2016 -0400
Committer: Michael Blow <mblow@apache.org>
Committed: Mon Aug 22 08:52:36 2016 -0700

----------------------------------------------------------------------
 .../hyracks/bootstrap/CCApplicationEntryPoint.java        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7f1704a2/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java
index 1e40d837..6a2456d 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java
@@ -18,9 +18,6 @@
  */
 package org.apache.asterix.hyracks.bootstrap;
 
-import static org.apache.asterix.api.http.servlet.ServletConstants.ASTERIX_BUILD_PROP_ATTR;
-import static org.apache.asterix.api.http.servlet.ServletConstants.HYRACKS_CONNECTION_ATTR;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
@@ -29,7 +26,6 @@ import java.util.logging.Logger;
 import javax.servlet.Servlet;
 
 import org.apache.asterix.api.http.servlet.APIServlet;
-import org.apache.asterix.api.http.servlet.QueryWebInterfaceServlet;
 import org.apache.asterix.api.http.servlet.AQLAPIServlet;
 import org.apache.asterix.api.http.servlet.ClusterAPIServlet;
 import org.apache.asterix.api.http.servlet.ConnectorAPIServlet;
@@ -39,6 +35,7 @@ import org.apache.asterix.api.http.servlet.QueryAPIServlet;
 import org.apache.asterix.api.http.servlet.QueryResultAPIServlet;
 import org.apache.asterix.api.http.servlet.QueryServiceServlet;
 import org.apache.asterix.api.http.servlet.QueryStatusAPIServlet;
+import org.apache.asterix.api.http.servlet.QueryWebInterfaceServlet;
 import org.apache.asterix.api.http.servlet.ShutdownAPIServlet;
 import org.apache.asterix.api.http.servlet.UpdateAPIServlet;
 import org.apache.asterix.api.http.servlet.VersionAPIServlet;
@@ -72,6 +69,9 @@ import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 
+import static org.apache.asterix.api.http.servlet.ServletConstants.ASTERIX_BUILD_PROP_ATTR;
+import static org.apache.asterix.api.http.servlet.ServletConstants.HYRACKS_CONNECTION_ATTR;
+
 public class CCApplicationEntryPoint implements ICCApplicationEntryPoint {
 
     private static final Logger LOGGER = Logger.getLogger(CCApplicationEntryPoint.class.getName());
@@ -218,7 +218,7 @@ public class CCApplicationEntryPoint implements ICCApplicationEntryPoint
{
         return jsonAPIServer;
     }
 
-    private Server setupQueryWebServer(AsterixExternalProperties externalProperties) throws
Exception {
+    protected Server setupQueryWebServer(AsterixExternalProperties externalProperties) throws
Exception {
 
         Server queryWebServer = new Server(externalProperties.getQueryWebInterfacePort());
 


Mime
View raw message