From 64c0d41a5dacf4d98273c23e94fe7268e60e2bb3 Mon Sep 17 00:00:00 2001 From: Tommy Lillehagen Date: Tue, 12 Dec 2017 11:47:14 +0000 Subject: [PATCH] ENT-1237 Fix run script for IRS Demo web apps --- samples/irs-demo/README.md | 6 +++--- .../web/src/test/resources/scripts/runwebapps.sh | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/samples/irs-demo/README.md b/samples/irs-demo/README.md index b6576f192a..12af545191 100644 --- a/samples/irs-demo/README.md +++ b/samples/irs-demo/README.md @@ -21,8 +21,8 @@ To run from the command line in Windows: ``samples\irs-demo\build`` 2. Run ``gradlew.bat samples:irs-demo:web:deployWebapps`` to install configs and tools for running webservers 3. Run ``cd samples\irs-demo`` to change current working directory -4. Run ``cordapp\build\nodes\runnodes`` to open up several 3 terminals for each nodes -5. Run ``web\build\webapps\webapps`` to open up several 3 terminals for each nodes' webservers +4. Run ``cordapp\build\nodes\runnodes.bat`` to open up several 3 terminals for each nodes +5. Run ``web\build\webapps\webapps.bat`` to open up several 3 terminals for each nodes' webservers This demo also has a web app. To use this, run nodes and then navigate to http://localhost:10007/ and http://localhost:10010/ to see each node's view of the ledger. @@ -33,4 +33,4 @@ view it. *Note:* The IRS web UI currently has a bug when changing the clock time where it may show no numbers or apply fixings inconsistently. The issues will be addressed in a future milestone release. Meanwhile, you can take a look at a simpler -oracle example here: https://github.com/corda/oracle-example. \ No newline at end of file +oracle example here: https://github.com/corda/oracle-example. diff --git a/samples/irs-demo/web/src/test/resources/scripts/runwebapps.sh b/samples/irs-demo/web/src/test/resources/scripts/runwebapps.sh index c87f95821c..23da672eba 100755 --- a/samples/irs-demo/web/src/test/resources/scripts/runwebapps.sh +++ b/samples/irs-demo/web/src/test/resources/scripts/runwebapps.sh @@ -2,13 +2,13 @@ function run_webapp() { if [ ! -z "$TMUX" ]; then - tmux new-window -n $1 $2; [ $? -eq 0 -o $? -eq 143 ] || sh + tmux new-window -n $1 "$2"; [ $? -eq 0 -o $? -eq 143 ] || sh else - xterm -T $1 -e $2; [ $? -eq 0 -o $? -eq 143 ] || sh + xterm -T $1 -e "$2"; [ $? -eq 0 -o $? -eq 143 ] || sh fi; } -run_webapp "NotaryService" "cd \"#DIR#\" && java -Dspring.profiles.active=NotaryService -jar #JAR_PATH#" -run_webapp "BankA" "cd \"#DIR#\" && java -Dspring.profiles.active=BankA -jar #JAR_PATH#" -run_webapp "BankB" "cd \"#DIR#\" && java -Dspring.profiles.active=BankB -jar #JAR_PATH#" +run_webapp "NotaryService" "cd \"#DIR#\" && java -Dspring.profiles.active=NotaryService -jar #JAR_PATH#" & +run_webapp "BankA" "cd \"#DIR#\" && java -Dspring.profiles.active=BankA -jar #JAR_PATH#" & +run_webapp "BankB" "cd \"#DIR#\" && java -Dspring.profiles.active=BankB -jar #JAR_PATH#" &