Browse Source

hmm, using fw_get seems to break the build. cleaning up and reverting to wget for now

Nick Kasvosve 9 years ago
parent
commit
eb60fd2155

+ 1 - 1
frameworks/Java/beyondj/beyondj-launcher/deploy/README.txt

@@ -1 +1 @@
-run folder
+run dir

BIN
frameworks/Java/beyondj/beyondj-launcher/src/main/resources/launchers/webapp-launchers/beyondj-service.war


+ 1 - 1
frameworks/Java/beyondj/beyondj-launcher/src/main/resources/props/core-config.properties

@@ -1,4 +1,4 @@
-BEYONDJ_HOME=results
+BEYONDJ_HOME=beyondj-launcher/deploy
 system.platform.enable.activemq=false
 system.platform.enable.activemq=false
 bundleActor.healthcheck.initial.delay.value=1
 bundleActor.healthcheck.initial.delay.value=1
 bundleActor.healthcheck.initial.delay.unit=MINUTES
 bundleActor.healthcheck.initial.delay.unit=MINUTES

+ 8 - 11
frameworks/Java/beyondj/setup.sh

@@ -1,18 +1,15 @@
-#!/bin/bash
-
-fw_depends java8
-
+RKING_DIR=beyondj-launcher/deploy
 FILE=beyondj-launcher/deploy/beyondj.jar
 FILE=beyondj-launcher/deploy/beyondj.jar
-DIRECTORY=results
 
 
-if [ ! -d "$DIRECTORY" ]; then
-	mkdir results
+if [ ! -d "$WORKING_DIR" ]; then
+        mkdir $WORKING_DIR
 fi
 fi
 
 
-cd beyondj-launcher/deploy/
-fw_get http://beyondj.com/beyondj.jar
-chmod 775 beyondj.jar
-cd ../../
+#if [ ! -f "$FILE" ]; then
+        cd beyondj-launcher/deploy/
+        wget http://beyondj.com/beyondj.jar
+        cd ../../
+#fi
 
 
 echo "Launching BeyondJ from location:$PWD"
 echo "Launching BeyondJ from location:$PWD"
 java -jar beyondj-launcher/deploy/beyondj.jar system.platform.dbserver=${DBHOST} numInstances=10
 java -jar beyondj-launcher/deploy/beyondj.jar system.platform.dbserver=${DBHOST} numInstances=10