From: Dan Timoney <dt5972@att.com>
Date: Fri, 2 Mar 2018 22:08:57 +0000 (+0000)
Subject: Merge "Use dependencies plugin"
X-Git-Tag: v0.2.1~23
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=commitdiff_plain;h=5c8bb0075a6b689e0213ced79d3c1b3a59c8d5ed;hp=e232baec10e9c5dbae446398f6a702befcbf0c0d

Merge "Use dependencies plugin"
---

diff --git a/dgbuilder/svclogic/svclogic.sh b/dgbuilder/svclogic/svclogic.sh
index 4c0d2da2..f89ac98c 100755
--- a/dgbuilder/svclogic/svclogic.sh
+++ b/dgbuilder/svclogic/svclogic.sh
@@ -11,4 +11,4 @@ do
     CLASSPATH=$CLASSPATH:${jar}
 done
 #echo "CLASSPATH is ${CLASSPATH}"
-java  -cp ${CLASSPATH}:${MYSQL_JDBC_DRIVER}:${SLI_COMMON_JAR} org.onap.ccsdk.sli.core.sli.SvcLogicParser $*
+java  -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat="yyyy-MM-dd HH:mm:ss" -cp ${CLASSPATH}:${MYSQL_JDBC_DRIVER}:${SLI_COMMON_JAR} org.onap.ccsdk.sli.core.sli.SvcLogicParser $*
diff --git a/platform-logic/installer/src/main/scripts/install.sh b/platform-logic/installer/src/main/scripts/install.sh
index 2c32e93a..36bf0702 100644
--- a/platform-logic/installer/src/main/scripts/install.sh
+++ b/platform-logic/installer/src/main/scripts/install.sh
@@ -23,32 +23,15 @@
 
 BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 
+echo "Load and activate started at $(date)"
+start=$(date +%s.%N) 
 
-# Load directed graphs
-
-
-for graphlist in $(find $BASEDIR/graphs -name graph.versions -print)
-do
-  curdir=$(dirname $graphlist)
-
-  # Load files from directory containing graph.versions file
-  echo "Loading graphs from $curdir"
-  for file in $(ls $curdir/*.xml)
-  do
-    echo "Loading $file ..."
-    $BASEDIR/bin/svclogic.sh load $file $BASEDIR/config/svclogic.properties
-  done
-
-  # Activate directed graphs
-  while read module rpc version mode
-  do
-     echo "Activating $module $rpc $version $mode"
-     $BASEDIR/bin/svclogic.sh activate $module $rpc $version $mode $BASEDIR/config/svclogic.properties
-  done < $graphlist
-done
-
-
+$BASEDIR/bin/svclogic.sh install $BASEDIR $BASEDIR/config/svclogic.properties
 
+end=$(date +%s.%N)
+echo "Load and activate from $curdir finished at $(date)"
+runtime=$(python -c "print(${end} - ${start})")
+echo "Load and activate took $runtime seconds"