commit a00d0395481c8ef461561ef508af19742fd6edc5
author Murtadha Hubail <mhubail@apache.org> Tue Dec 18 02:12:14 2018 +0300
committer Murtadha Hubail <mhubail@apache.org> Mon Dec 17 17:29:10 2018 -0800
tree a3f913a7e6f03f277c1919508bc0ca1bc44313a1
parent c5b5deb94babf088fbb881d2d28482370845d717

[NO ISSUE][OTH] No SSL in AsterixHyracksIntegrationUtil

- user model changes: no
- storage format changes: no
- interface changes: no

Details:
- Revert AsterixHyracksIntegrationUtil back to no SSL connections.
  SslAsterixHyracksIntegrationUtil can be used for SSL connections.

Change-Id: Idbc1214aeac89c08bef4cb762e11e92549b0a25a
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3094
Reviewed-by: Ali Alsuliman <ali.al.solaiman@gmail.com>
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Contrib: Jenkins <jenkins@fulliautomatix.ics.uci.edu>

asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java

diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
index 6cc4677..9c24821 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
@@ -72,7 +72,7 @@
     public static final int DEFAULT_HYRACKS_CC_CLIENT_PORT = 1098;
     public static final int DEFAULT_HYRACKS_CC_CLUSTER_PORT = 1099;
     public static final String RESOURCES_PATH = joinPath(getProjectPath().toString(), "src", "test", "resources");
-    public static final String DEFAULT_CONF_FILE = joinPath(RESOURCES_PATH, "cc-ssl.conf");
+    public static final String DEFAULT_CONF_FILE = joinPath(RESOURCES_PATH, "cc.conf");
     private static final String DEFAULT_STORAGE_PATH = joinPath("target", "io", "dir");
     private static String storagePath = DEFAULT_STORAGE_PATH;
     private static final long RESULT_TTL = TimeUnit.MINUTES.toMillis(5);