Update titan code to janus graph code

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

17 files changed, 20 insertions, 15 deletions

diff --git a/aai-resources/src/main/resources/etc/appprops/createDBSchema-logback.xml b/aai-resources/src/main/resources/etc/appprops/createDBSchema-logback.xml
index 5fcdf9b..ef93d9c 100644
--- a/aai-resources/src/main/resources/etc/appprops/createDBSchema-logback.xml
+++ b/aai-resources/src/main/resources/etc/appprops/createDBSchema-logback.xml
@@ -91,7 +91,7 @@
 		<appender-ref ref="createDBSchemametric"/>
 		<appender-ref ref="STDOUT"/>
 	</logger>
-	<logger name="com.thinkaurelius" level="WARN" additivity="false">
+	<logger name="org.janusgraph" level="WARN" additivity="false">
 		<appender-ref ref="createDBSchema"/>
 		<appender-ref ref="createDBSchemadebug"/>
 		<appender-ref ref="createDBSchemametric"/>
diff --git a/aai-resources/src/main/resources/etc/appprops/dataGrooming-logback.xml b/aai-resources/src/main/resources/etc/appprops/dataGrooming-logback.xml
index d899d90..73d72d4 100644
--- a/aai-resources/src/main/resources/etc/appprops/dataGrooming-logback.xml
+++ b/aai-resources/src/main/resources/etc/appprops/dataGrooming-logback.xml
@@ -88,7 +88,7 @@
 		<appender-ref ref="dataGroomingdebug"/>
 		<appender-ref ref="dataGroomingmetric"/>
 	</logger>
-	<logger name="com.thinkaurelius" level="WARN" additivity="false">
+	<logger name="org.janusgraph" level="WARN" additivity="false">
 		<appender-ref ref="dataGrooming"/>
 		<appender-ref ref="dataGroomingdebug"/>
 		<appender-ref ref="dataGroomingmetric"/>
diff --git a/aai-resources/src/main/resources/etc/appprops/dataSnapshot-logback.xml b/aai-resources/src/main/resources/etc/appprops/dataSnapshot-logback.xml
index 9633971..0985f39 100644
--- a/aai-resources/src/main/resources/etc/appprops/dataSnapshot-logback.xml
+++ b/aai-resources/src/main/resources/etc/appprops/dataSnapshot-logback.xml
@@ -89,7 +89,7 @@
 		<appender-ref ref="dataSnapshotmetric"/>
 		<appender-ref ref="STDOUT"/>
 	</logger>
-	<logger name="com.thinkaurelius" level="WARN" additivity="false">
+	<logger name="org.janusgraph" level="WARN" additivity="false">
 		<appender-ref ref="dataSnapshot"/>
 		<appender-ref ref="dataSnapshotdebug"/>
 		<appender-ref ref="dataSnapshotmetric"/>
diff --git a/aai-resources/src/main/resources/etc/appprops/default-logback.xml b/aai-resources/src/main/resources/etc/appprops/default-logback.xml
index 655157b..0b1178c 100644
--- a/aai-resources/src/main/resources/etc/appprops/default-logback.xml
+++ b/aai-resources/src/main/resources/etc/appprops/default-logback.xml
@@ -33,7 +33,7 @@
 	<logger name="org.reflections" level="WARN"/>
 	<logger name="org.apache.zookeeper" level="WARN"/>
 	<logger name="org.apache.hadoop" level="WARN"/>
-	<logger name="com.thinkaurelius" level="WARN"/>
+	<logger name="org.janusgraph" level="WARN"/>
 	<logger name="ch.qos.logback.classic" level="WARN" />
 	<logger name="ch.qos.logback.core" level="WARN" />
 
diff --git a/aai-resources/src/main/resources/etc/appprops/dupeTool-logback.xml b/aai-resources/src/main/resources/etc/appprops/dupeTool-logback.xml
index 8c3e977..ae2c7d3 100644
--- a/aai-resources/src/main/resources/etc/appprops/dupeTool-logback.xml
+++ b/aai-resources/src/main/resources/etc/appprops/dupeTool-logback.xml
@@ -39,7 +39,7 @@
 	<logger name="org.apache.hadoop" level="ERROR" additivity="false">
 		<appender-ref ref="dupeToollog" />
 	</logger>
-	<logger name="com.thinkaurelius" level="ERROR" additivity="false">
+	<logger name="org.janusgraph" level="ERROR" additivity="false">
 		<appender-ref ref="dupeToollog" />
 	</logger>
 	<logger name="ch.qos.logback.classic" level="ERROR" additivity="false">
diff --git a/aai-resources/src/main/resources/etc/appprops/dynamicPayloadGenerator-logback.xml b/aai-resources/src/main/resources/etc/appprops/dynamicPayloadGenerator-logback.xml
index 025b49b..3942af0 100644
--- a/aai-resources/src/main/resources/etc/appprops/dynamicPayloadGenerator-logback.xml
+++ b/aai-resources/src/main/resources/etc/appprops/dynamicPayloadGenerator-logback.xml
@@ -62,7 +62,7 @@
 	<logger name="org.apache.hadoop" level="ERROR" additivity="false">
 		<appender-ref ref="dynamicPayloadGeneratorlog" />
 	</logger>
-	<logger name="com.thinkaurelius" level="ERROR" additivity="false">
+	<logger name="org.janusgraph" level="ERROR" additivity="false">
 		<appender-ref ref="dynamicPayloadGeneratorlog" />
 	</logger>
 	<logger name="ch.qos.logback.classic" level="ERROR" additivity="false">
diff --git a/aai-resources/src/main/resources/etc/appprops/error.properties b/aai-resources/src/main/resources/etc/appprops/error.properties
index d3dbf9f..745f4fb 100644
--- a/aai-resources/src/main/resources/etc/appprops/error.properties
+++ b/aai-resources/src/main/resources/etc/appprops/error.properties
@@ -67,7 +67,7 @@ AAI_5107=5:2:WARN:5107:400:3000:Required information missing
 AAI_5108=5:2:WARN:5108:200:0:Unexpected information in request being ignored
 
 #--- aaidbgen: 6101-6199
-AAI_6101=5:4:ERROR:6101:500:3002:null TitanGraph object passed
+AAI_6101=5:4:ERROR:6101:500:3002:null JanusGraph object passed
 AAI_6102=5:4:WARN:6102:400:3000:Passed-in property is not valid for this nodeType
 AAI_6103=5:4:WARN:6103:400:3000:Required Node-property not found in input data
 AAI_6104=5:4:WARN:6104:400:3000:Required Node-property was passed with no data
diff --git a/aai-resources/src/main/resources/etc/appprops/forceDelete-logback.xml b/aai-resources/src/main/resources/etc/appprops/forceDelete-logback.xml
index 16ea13c..41d33c1 100644
--- a/aai-resources/src/main/resources/etc/appprops/forceDelete-logback.xml
+++ b/aai-resources/src/main/resources/etc/appprops/forceDelete-logback.xml
@@ -62,7 +62,7 @@
 	<logger name="org.apache.hadoop" level="ERROR" additivity="false">
 		<appender-ref ref="forceDeletelog" />
 	</logger>
-	<logger name="com.thinkaurelius" level="ERROR" additivity="false">
+	<logger name="org.janusgraph" level="ERROR" additivity="false">
 		<appender-ref ref="forceDeletelog" />
 	</logger>
 	<logger name="ch.qos.logback.classic" level="ERROR" additivity="false">
diff --git a/aai-resources/src/main/resources/etc/appprops/getres-logback.xml b/aai-resources/src/main/resources/etc/appprops/getres-logback.xml
index 2a71a22..441f807 100644
--- a/aai-resources/src/main/resources/etc/appprops/getres-logback.xml
+++ b/aai-resources/src/main/resources/etc/appprops/getres-logback.xml
@@ -88,7 +88,7 @@
 		<appender-ref ref="getTooldebug"/>
 		<appender-ref ref="getToolmetric"/>
 	</logger>
-	<logger name="com.thinkaurelius" level="WARN" additivity="false">
+	<logger name="org.janusgraph" level="WARN" additivity="false">
 		<appender-ref ref="getTool"/>
 		<appender-ref ref="getTooldebug"/>
 		<appender-ref ref="getToolmetric"/>
diff --git a/aai-resources/src/main/resources/etc/appprops/titan-cached.properties b/aai-resources/src/main/resources/etc/appprops/janusgraph-cached.properties
index 3465453..ecd4dbf 100644
--- a/aai-resources/src/main/resources/etc/appprops/titan-cached.properties
+++ b/aai-resources/src/main/resources/etc/appprops/janusgraph-cached.properties
@@ -21,10 +21,12 @@
 #
 
 query.fast-property=true
+query.smart-limit=false
 # the following parameters are not reloaded automatically and require a manual bounce
 storage.backend=inmemory
 storage.hostname=localhost
 
+#graph.titan-version=1.0.0
 #schema.default=none
 storage.lock.wait-time=300
 storage.hbase.table=aaigraph-dev1.dev
diff --git a/aai-resources/src/main/resources/etc/appprops/titan-realtime.properties b/aai-resources/src/main/resources/etc/appprops/janusgraph-realtime.properties
index 869872c..cfe8312 100644
--- a/aai-resources/src/main/resources/etc/appprops/titan-realtime.properties
+++ b/aai-resources/src/main/resources/etc/appprops/janusgraph-realtime.properties
@@ -21,10 +21,13 @@
 #
 
 query.fast-property=true
+query.smart-limit=false
 # the following parameters are not reloaded automatically and require a manual bounce
 storage.backend=inmemory
 storage.hostname=localhost
 
+#graph.titan-version=1.0.0
+
 #schema.default=none
 storage.lock.wait-time=300
 storage.hbase.table=aaigraph-dev1.dev
diff --git a/aai-resources/src/main/resources/etc/appprops/loadDataForDHV-logback.xml b/aai-resources/src/main/resources/etc/appprops/loadDataForDHV-logback.xml
index cced385..e42128b 100644
--- a/aai-resources/src/main/resources/etc/appprops/loadDataForDHV-logback.xml
+++ b/aai-resources/src/main/resources/etc/appprops/loadDataForDHV-logback.xml
@@ -82,7 +82,7 @@
 		<appender-ref ref="loadDataForDHVdebug"/>
 		<appender-ref ref="loadDataForDHVmetric"/>
 	</logger>
-	<logger name="com.thinkaurelius" level="WARN" additivity="false">
+	<logger name="org.janusgraph" level="WARN" additivity="false">
 		<appender-ref ref="loadDataForDHV"/>
 		<appender-ref ref="loadDataForDHVdebug"/>
 		<appender-ref ref="loadDataForDHVmetric"/>
diff --git a/aai-resources/src/main/resources/etc/appprops/migration-logback.xml b/aai-resources/src/main/resources/etc/appprops/migration-logback.xml
index 74d3d04..a6dbc1e 100644
--- a/aai-resources/src/main/resources/etc/appprops/migration-logback.xml
+++ b/aai-resources/src/main/resources/etc/appprops/migration-logback.xml
@@ -62,7 +62,7 @@
 	<logger name="org.apache.hadoop" level="ERROR" additivity="false">
 		<appender-ref ref="migrationlog" />
 	</logger>
-	<logger name="com.thinkaurelius" level="ERROR" additivity="false">
+	<logger name="org.janusgraph" level="ERROR" additivity="false">
 		<appender-ref ref="migrationlog" />
 	</logger>
 	<logger name="ch.qos.logback.classic" level="ERROR" additivity="false">
diff --git a/aai-resources/src/main/resources/etc/appprops/pullInvData-logback.xml b/aai-resources/src/main/resources/etc/appprops/pullInvData-logback.xml
index 098e1e7..72c60b8 100644
--- a/aai-resources/src/main/resources/etc/appprops/pullInvData-logback.xml
+++ b/aai-resources/src/main/resources/etc/appprops/pullInvData-logback.xml
@@ -88,7 +88,7 @@
 		<appender-ref ref="pullInvDatadebug"/>
 		<appender-ref ref="pullInvDatametric"/>
 	</logger>
-	<logger name="com.thinkaurelius" level="WARN" additivity="false">
+	<logger name="org.janusgraph" level="WARN" additivity="false">
 		<appender-ref ref="pullInvData"/>
 		<appender-ref ref="pullInvDatadebug"/>
 		<appender-ref ref="pullInvDatametric"/>
diff --git a/aai-resources/src/main/resources/etc/appprops/schemaMod-logback.xml b/aai-resources/src/main/resources/etc/appprops/schemaMod-logback.xml
index 0762ee1..5a0316f 100644
--- a/aai-resources/src/main/resources/etc/appprops/schemaMod-logback.xml
+++ b/aai-resources/src/main/resources/etc/appprops/schemaMod-logback.xml
@@ -62,7 +62,7 @@
 	<logger name="org.apache.hadoop" level="ERROR" additivity="false">
 		<appender-ref ref="schemaModlog" />
 	</logger>
-	<logger name="com.thinkaurelius" level="WARN" additivity="false">
+	<logger name="org.janusgraph" level="WARN" additivity="false">
 		<appender-ref ref="schemaModlog" />
 	</logger>
 	<logger name="ch.qos.logback.classic" level="WARN" additivity="false">
diff --git a/aai-resources/src/main/resources/etc/appprops/uniquePropertyCheck-logback.xml b/aai-resources/src/main/resources/etc/appprops/uniquePropertyCheck-logback.xml
index 5f44b1b..5b91003 100644
--- a/aai-resources/src/main/resources/etc/appprops/uniquePropertyCheck-logback.xml
+++ b/aai-resources/src/main/resources/etc/appprops/uniquePropertyCheck-logback.xml
@@ -62,7 +62,7 @@
 	<logger name="org.apache.hadoop" level="ERROR" additivity="false">
 		<appender-ref ref="uniquePropertyChecklog" />
 	</logger>
-	<logger name="com.thinkaurelius" level="WARN" additivity="false">
+	<logger name="org.janusgraph" level="WARN" additivity="false">
 		<appender-ref ref="uniquePropertyChecklog" />
 	</logger>
 	<logger name="ch.qos.logback.classic" level="WARN" additivity="false">
diff --git a/aai-resources/src/main/resources/logback.xml b/aai-resources/src/main/resources/logback.xml
index ee7ee61..e727228 100644
--- a/aai-resources/src/main/resources/logback.xml
+++ b/aai-resources/src/main/resources/logback.xml
@@ -373,7 +373,7 @@
 
 	<logger name="org.apache" level="OFF" />
 	<logger name="org.zookeeper" level="OFF" />
-	<logger name="com.thinkaurelius" level="WARN" />
+	<logger name="org.janusgraph" level="WARN" />
 	<logger name="com.att.aft.dme2" level="WARN" />
 
 	<!-- ============================================================================ -->