Update the ajsc to use 2.1.0 for all dependencies

Add the named query jsons that was rejected due to another problem
Update the necessary files to make it compatible with ajsc 2.1.0

Change-Id: I4f26e21ef69edff1003a21ead849d10c9cbb8e3a
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

1 files changed, 31 insertions, 9 deletions

diff --git a/aai-traversal/src/main/resources/docker/docker-entrypoint.sh b/aai-traversal/src/main/resources/docker/docker-entrypoint.sh
index d776343..0f14860 100644
--- a/aai-traversal/src/main/resources/docker/docker-entrypoint.sh
+++ b/aai-traversal/src/main/resources/docker/docker-entrypoint.sh
@@ -18,17 +18,39 @@
 # ============LICENSE_END=========================================================
 ###
 
-cd /opt/app/aai-traversal;
+cd /var/chef;
 
-TITAN_CACHED="/opt/app/aai-traversal/bundleconfig/etc/appprops/titan-cached.properties";
-TITAN_REALTIME="/opt/app/aai-traversal/bundleconfig/etc/appprops/titan-realtime.properties";
-SERVER_HOST=${SERVER_HOST:-localhost};
-SERVER_TABLE=${SERVER_TABLE:-aaigraph-dev02};
+CHEF_CONFIG_REPO=${CHEF_CONFIG_REPO:-aai-config};
 
-sed -i 's/^storage.backend=inmemory/storage.backend=hbase/g' $TITAN_CACHED $TITAN_REALTIME;
-sed -i "s/^storage.hostname=.*$/storage.hostname=${SERVER_HOST}/g" $TITAN_CACHED $TITAN_REALTIME;
-sed -i "s/^storage.hbase.table=.*$/storage.hbase.table=${SERVER_TABLE}/g" $TITAN_CACHED $TITAN_REALTIME;
+CHEF_GIT_URL=${CHEF_GIT_URL:-http://nexus.onap.org/r/aai};
 
-/opt/app/aai-traversal/bin/createDBSchema.sh;
+CHEF_CONFIG_GIT_URL=${CHEF_CONFIG_GIT_URL:-$CHEF_GIT_URL};
+CHEF_DATA_GIT_URL=${CHEF_DATA_GIT_URL:-$CHEF_GIT_URL};
+
+if [ ! -d "aai-config" ]; then
+
+    git clone --depth 1 -b ${CHEF_BRANCH} --single-branch ${CHEF_CONFIG_GIT_URL}/${CHEF_CONFIG_REPO}.git aai-config || {
+	echo "Error: Unable to clone the aai-config repo with url: ${CHEF_GIT_URL}/${CHEF_CONFIG_REPO}.git";
+	exit;
+    }
+    
+    (cd aai-config/cookbooks/${project.artifactId}/ && \
+	for f in $(ls); do mv $f ../; done && \
+	cd ../ && rmdir ${project.artifactId});
+fi
+
+if [ ! -d "aai-data" ]; then
+
+    git clone --depth 1 -b ${CHEF_BRANCH} --single-branch ${CHEF_DATA_GIT_URL}/aai-data.git aai-data || {
+	echo "Error: Unable to clone the aai-data repo with url: ${CHEF_GIT_URL}";
+	exit;
+    }
+
+fi
+
+chef-solo \
+      -c /var/chef/aai-data/chef-config/dev/.knife/solo.rb \
+      -j /var/chef/aai-config/cookbooks/runlist-${project.artifactId}.json \
+      -E ${AAI_CHEF_ENV};
 
 java -cp ${CLASSPATH}:/opt/app/commonLibs/*:/opt/app/aai-traversal/etc:/opt/app/aai-traversal/lib/*:/opt/app/aai-traversal/extJars/logback-access-1.1.7.jar:/opt/app/aai-traversal/extJars/logback-core-1.1.7.jar:/opt/app/aai-traversal/extJars/aai-core-${AAI_CORE_VERSION}.jar -server -XX:NewSize=512m -XX:MaxNewSize=512m -XX:SurvivorRatio=8 -XX:+DisableExplicitGC -verbose:gc -XX:+UseParNewGC -XX:+CMSParallelRemarkEnabled -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseBiasedLocking -XX:ParallelGCThreads=4 -XX:LargePageSizeInBytes=128m -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Dsun.net.inetaddr.ttl=180 -XX:+HeapDumpOnOutOfMemoryError -Dhttps.protocols=TLSv1.1,TLSv1.2 -DSOACLOUD_SERVICE_VERSION=1.0.1 -DAJSC_HOME=/opt/app/aai-traversal/ -DAJSC_CONF_HOME=/opt/app/aai-traversal/bundleconfig -DAJSC_SHARED_CONFIG=/opt/app/aai-traversal/bundleconfig -DAFT_HOME=/opt/app/aai-traversal -DAAI_CORE_VERSION=${AAI_CORE_VERSION} -Daai-core.version=${AAI_CORE_VERSION} -Dlogback.configurationFile=/opt/app/aai-traversal/bundleconfig/etc/logback.xml -Xloggc:/opt/app/aai-traversal/logs/ajsc-jetty/gc/graph-query_gc.log com.att.ajsc.runner.Runner context=/ port=8086 sslport=8446