Use install.sh from run_local.sh

.gitignore

@@ -30,3 +30,4 @@ scripts/*.json
 docker/BuildInDockerAndDeployViaAnsible/.m2
 docker/BuildInDockerAndDeployViaAnsible/repos
 docker/BuildInDockerAndDeployViaAnsible/ssh
+localrun/

ansible/roles/cyc-container/files/scripts/run.sh

@@ -47,5 +47,9 @@ else
 	XMX=512M
 fi
 
-$_java -Xms$XMX -Xmx$XMX $OPTS -XX:+UseConcMarkSweepGC -Djava.security.policy=/usr/local/cyc-engine-container/security.policy \
-    -Dcyc.home=/usr/local/cyc-engine-container -jar /usr/local/cyc-engine-container/engine-container-jar-with-dependencies.jar
+if [ -z "$CYC_ENGINE_CONTAINER" ]; then
+    CYC_ENGINE_CONTAINER=/usr/local/cyc-engine-container
+fi  
+
+$_java -Xms$XMX -Xmx$XMX $OPTS -XX:+UseConcMarkSweepGC -Djava.security.policy=$CYC_ENGINE_CONTAINER/security.policy \
+    -Dcyc.home=$CYC_ENGINE_CONTAINER -jar $CYC_ENGINE_CONTAINER/engine-container-jar-with-dependencies.jar

run_local.sh

@@ -5,34 +5,31 @@ trap cleanup 2
 cleanup()
 {
 	echo "****************************************************************"
-	echo "Stopping Docker, Tomcat and CYC-Container.....please wait...."
+	echo "Stopping CouchDB, Tomcat and CYC-Container.....please wait...."
 	echo "****************************************************************"
 	docker rm -f $containerID
-	./apache-tomcat-$TOMCAT_VERSION/bin/shutdown.sh
+	$CYC_WEBAPPS/../bin/shutdown.sh
 	exit 0
 }
 
 # vars
 export JAVA_HOME=$(/usr/libexec/java_home -v 1.8)
 TOMCAT_VERSION=7.0.90
 TOMCAT_URL=http://mirrors.ocf.berkeley.edu/apache/tomcat/tomcat-7/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz
+CYC_WEBAPPS=./localrun/apache-tomcat-$TOMCAT_VERSION/webapps
+CYC_ENGINE_CONTAINER=./localrun
 
 # check for dependencies
-mvn --version 1>/dev/null || exit 1
 npm --version 1>/dev/null || exit 1
-java -version 2>/dev/null || exit 1
 jq --version 1>/dev/null || exit 1
 curl --version 1>/dev/null || exit 1
 docker --version 1>/dev/null || exit 1
 
-#build
-mvn package
-
 # prepare env
-mkdir -p target/localrun
-cd target/localrun
+mkdir -p localrun
+cd localrun
 
-# set up the couchdb views
+# set up couchdb and its views
 containerID=$(docker run -d -p 5984:5984 couchdb:1.7)
 if [ ! -d ./node_modules/couchviews ]; then
 	npm install --no-package-lock --loglevel=error couchviews
@@ -42,23 +39,23 @@ while [ "$(curl -s http://localhost:5984|jq -r '.couchdb')" != "Welcome" ]; do
 	sleep 1
 done
 curl -X PUT http://localhost:5984/cyc
-./node_modules/.bin/couchviews push http://localhost:5984/cyc ../../persistence/src/couchdb/
-
-# deploy the engine
-
-mkdir -p cyc001/
-cp ../../engine/target/engine-jar-with-dependencies.jar cyc001/
+./node_modules/.bin/couchviews push http://localhost:5984/cyc ../persistence/src/couchdb/
 
-
-# ready the tomcat
+# download tomcat
+if [ ! -f "/$TMPDIR/apache-tomcat-$TOMCAT_VERSION.tar" ]; then
+	curl -s $TOMCAT_URL | gzip -d >/$TMPDIR/apache-tomcat-$TOMCAT_VERSION.tar
+fi
+# extract tomcat
 if [ ! -d "./apache-tomcat-$TOMCAT_VERSION" ]; then
-	curl -s $TOMCAT_URL | tar -xz
+	tar -xf /$TMPDIR/apache-tomcat-$TOMCAT_VERSION.tar -C ./
 fi
-cp ../../web/target/*.war apache-tomcat-$TOMCAT_VERSION/webapps/
+
+# build and install via install.sh
+cd ../
+./install.sh -l site
 
 # start tomcat
-./apache-tomcat-$TOMCAT_VERSION/bin/startup.sh
+$CYC_WEBAPPS/../bin/startup.sh
 
 # start engine-container (blocking)
-cp ../../engine-container/target/engine-container-jar-with-dependencies.jar .
-java -Dcyc.home=./ -Djava.security.policy=../../ansible/roles/cyc-container/files/scripts/security.policy -jar engine-container-jar-with-dependencies.jar
+$CYC_ENGINE_CONTAINER/run.sh