From a0d3e8ee8d78d41e4a58437983bc4c894d0024df Mon Sep 17 00:00:00 2001
From: Venkata Harish K Kajur <vk250x@att.com>
Date: Tue, 6 Feb 2018 15:06:44 -0500
Subject: Update traversal from AJSC 2 to Spring Boot

Issue-ID: AAI-799
Change-Id: I6500f661db704726f529f665203a9c0605e8193e
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
---
 aai-traversal/src/main/scripts/deleteNamedQuery.sh | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'aai-traversal/src/main/scripts/deleteNamedQuery.sh')

diff --git a/aai-traversal/src/main/scripts/deleteNamedQuery.sh b/aai-traversal/src/main/scripts/deleteNamedQuery.sh
index 2d19a9c..43aaae7 100644
--- a/aai-traversal/src/main/scripts/deleteNamedQuery.sh
+++ b/aai-traversal/src/main/scripts/deleteNamedQuery.sh
@@ -22,15 +22,11 @@
 #
 
 #
-# This script deletes the named query in bundleconfig/etc/scriptdata/named-query-json directory
+# This script deletes the named query in resources/etc/scriptdata/named-query-json directory
 #
 
 PROGNAME=$(basename $0)
-<<<<<<< HEAD
-OUTFILE=$PROJECT_HOME/logs/misc/${PROGNAME}.log.$(date +\%Y-\%m-\%d)
-=======
 OUTFILE=/opt/app/aai-traversal/logs/misc/${PROGNAME}.log.$(date +\%Y-\%m-\%d)
->>>>>>> codecloud/release/1802
 #OUTFILE=/c/temp/${PROGNAME}.log.$(date +\%Y-\%m-\%d)
 
 TS=$(date "+%Y-%m-%d %H:%M:%S")
@@ -49,23 +45,15 @@ error_exit () {
 }
 
 j=0
-<<<<<<< HEAD
-for filepath in `ls $PROJECT_HOME/bundleconfig/etc/scriptdata/named-query-json/*.json|sort -f`
-=======
-for filepath in `ls /opt/app/aai-traversal/bundleconfig/etc/scriptdata/named-query-json/*.json|sort -f`
->>>>>>> codecloud/release/1802
-#for filepath in `ls /c/sources/aai/aaigitnew/bundleconfig-local/etc/scriptdata/named-query-json/*.json|sort -f`
+for filepath in `ls /opt/app/aai-traversal/resources/etc/scriptdata/named-query-json/*.json|sort -f`
+#for filepath in `ls /c/sources/aai/aaigitnew/resources-local/etc/scriptdata/named-query-json/*.json|sort -f`
 do
 j=$(expr "$j" + 1)
 filename=$(basename $filepath)
 echo "Begin deleteTool for named-query $filename" | tee -a $OUTFILE
 vers=`grep named-query-uuid $filepath|cut -d':' -f2|cut -d'"' -f2`
 resource=service-design-and-creation/named-queries/named-query/$vers
-<<<<<<< HEAD
-echo "y" | $PROJECT_HOME/scripts/deleteTool.sh $resource >> $OUTFILE 2>&1 || error_exit "$resource $filepath" $j
-=======
 echo "y" | /opt/app/aai-traversal/scripts/deleteTool.sh $resource >> $OUTFILE 2>&1 || error_exit "$resource $filepath" $j
->>>>>>> codecloud/release/1802
 echo "End deleteTool for named-query $filename" | tee -a $OUTFILE
 done
 
-- 
cgit 1.2.3-korg