Add cql jar to graphadmin

Issue-ID: AAI-1834
Change-Id: Ib41b52ead6800475af3c8def9373a2c84150d871
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>

diff --git a/pom.xml b/pom.xml
index eb4b986..75ddc14 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -423,6 +423,17 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.janusgraph</groupId>
+            <artifactId>janusgraph-cql</artifactId>
+           <version>${janusgraph.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <!-- End of Janus Graph Dependencies -->
         <!-- Start of Tinkerpop Dependencies -->
         <dependency>
@@ -430,6 +441,12 @@
             <artifactId>tinkergraph-gremlin</artifactId>
             <version>${gremlin.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr4-runtime</artifactId>
+            <version>${antlr.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.tinkerpop</groupId>
             <artifactId>gremlin-core</artifactId>

diff --git a/src/main/java/org/onap/aai/schema/GenTester.java b/src/main/java/org/onap/aai/schema/GenTester.java
index 812c7b0..e79256f 100644 (file)
--- a/src/main/java/org/onap/aai/schema/GenTester.java
+++ b/src/main/java/org/onap/aai/schema/GenTester.java
@@ -73,6 +73,8 @@ public class GenTester {
                );
 
                try {
+            LOGGER.info("GenTester uses either cql jar or Cassandra jar");
+
                        AAIConfig.init();
                if (args != null && args.length > 0 ){
                        if( "genDbRulesOnly".equals(args[0]) ){

diff --git a/src/main/resources/etc/appprops/janusgraph-cached.properties b/src/main/resources/etc/appprops/janusgraph-cached.properties
index c90816d..23e5c3d 100644 (file)
--- a/src/main/resources/etc/appprops/janusgraph-cached.properties
+++ b/src/main/resources/etc/appprops/janusgraph-cached.properties
@@ -33,4 +33,21 @@ cache.db-cache-time = 180000
 cache.db-cache-size = 0.3
 
 #load graphson file on startup
-load.snapshot.file=false
\ No newline at end of file
+load.snapshot.file=false
+
+#storage.backend=cql
+#storage.hostname=host1,host2,host3
+#storage.cql.replication-strategy-class=NetworkTopologyStrategy
+#storage.cql.replication-strategy-options=options
+# for single datacenter cluster
+#storage.cql.replication-factor=3
+
+#storage.cql.keyspace=aaigraph_single_dc
+#storage.cql.only-use-local-consistency-for-system-operations=true
+#storage.cql.cluster-name=clusterName
+#storage.cql.local-datacenter=dataCenter
+#storage.cql.read-consistency-level=QUORUM
+#storage.cql.write-consistency-level=QUORUM
+#storage.connection-timeout=100000
+#cache.tx-cache-size = 1000000
+#metrics.enabled=true

diff --git a/src/main/resources/etc/appprops/janusgraph-realtime.properties b/src/main/resources/etc/appprops/janusgraph-realtime.properties
index ccbe5ba..b45d7ee 100644 (file)
--- a/src/main/resources/etc/appprops/janusgraph-realtime.properties
+++ b/src/main/resources/etc/appprops/janusgraph-realtime.properties
@@ -30,4 +30,21 @@ storage.hbase.ext.zookeeper.znode.parent=/hbase-unsecure
 cache.db-cache = false
 
 #load graphson file on startup
-load.snapshot.file=false
\ No newline at end of file
+load.snapshot.file=false
+
+#storage.backend=cql
+#storage.hostname=host1,host2,host3
+#storage.cql.replication-strategy-class=NetworkTopologyStrategy
+#storage.cql.replication-strategy-options=options
+# for single datacenter cluster
+#storage.cql.replication-factor=3
+
+#storage.cql.keyspace=aaigraph_single_dc
+#storage.cql.only-use-local-consistency-for-system-operations=true
+#storage.cql.cluster-name=clusterName
+#storage.cql.local-datacenter=dataCenter
+#storage.cql.read-consistency-level=QUORUM
+#storage.cql.write-consistency-level=QUORUM
+#storage.connection-timeout=100000
+#cache.tx-cache-size = 1000000
+#metrics.enabled=true