Copy test input to image when allImage is specified

dgomezferro · Jun 8, 2011 · f5c7c16 · f5c7c16
1 parent ea9f23c
commit f5c7c16
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -197,6 +197,13 @@ allDistImage = copySpec {
 				}
 				break
 
+			case "s4-example-testinput":
+			        print "Got here"
+				into("s4-example-testinput") {
+					from proj.sourceSets.main.resources
+				}
+				break
+
 			case ~/(s4\-example).*/:
 				into ("s4-example-apps/" + proj.name + "/lib") {
 					from(

diff --git a/s4-examples/testinput/pe-query → ...les/testinput/src/main/resources/pe-query b/s4-examples/testinput/pe-query → ...les/testinput/src/main/resources/pe-query
diff --git a/s4-examples/testinput/proto-query → .../testinput/src/main/resources/proto-query b/s4-examples/testinput/proto-query → .../testinput/src/main/resources/proto-query
diff --git a/s4-examples/testinput/sentence.in → .../testinput/src/main/resources/sentence.in b/s4-examples/testinput/sentence.in → .../testinput/src/main/resources/sentence.in
diff --git a/s4-examples/testinput/speech.in → ...es/testinput/src/main/resources/speech.in b/s4-examples/testinput/speech.in → ...es/testinput/src/main/resources/speech.in
diff --git a/s4-examples/testinput/speeches.txt → ...testinput/src/main/resources/speeches.txt b/s4-examples/testinput/speeches.txt → ...testinput/src/main/resources/speeches.txt
diff --git a/s4-tools/loadgenerator/src/main/resources/scripts/generate-load.sh b/s4-tools/loadgenerator/src/main/resources/scripts/generate-load.sh
@@ -68,13 +68,6 @@ if [ "x$LOCK_DIR" == "x" ] ; then
     LOCK_DIR="${CORE_HOME}/lock"
 fi
 
-echo "core home is ${CORE_HOME}"
-echo "load generator home is ${LOAD_GENERATOR_HOME}"
-echo "Adapter adress ${ADAPTER_ADDRESS}"
-echo "Rate ${RATE}"
-echo "Display interval ${DISPLAY_INTERVAL}"
-echo "Schema list ${SCHEMA_FILE_LIST}"
-
 JAVA_LOC=""
 if [ "x$JAVA_HOME" != "x" ] ; then
   JAVA_LOC=${JAVA_HOME}"/bin/"
@@ -85,9 +78,9 @@ if [ "x$LOCK_DIR" != "x" ] ; then
   JAVA_OPTS="$JAVA_OPTS -Dlock_dir=$LOCK_DIR "
 fi
 
-echo "java location is ${JAVA_LOC}"
-echo -n "JAVA VERSION="
-echo `${JAVA_LOC}java -version`
+#echo "java location is ${JAVA_LOC}"
+#echo -n "JAVA VERSION="
+#echo `${JAVA_LOC}java -version`
 #---------------------------------------------
 #ADDING CORE JARS TO CLASSPATH
 #---------------------------------------------
@@ -96,5 +89,5 @@ CLASSPATH=`find $CORE_HOME -name "*.jar" | awk '{p=$0"'$CP_SEP'"p;} END {print p
 CLASSPATH=$CLASSPATH$CP_SEP`find $LOAD_GENERATOR_HOME -name "*.jar" | awk '{p=$0"'$CP_SEP'"p;} END {print p}'`
 
 CMD="${JAVA_LOC}java $JAVA_OPTS -classpath $CLASSPATH io.s4.tools.loadgenerator.LoadGenerator -a ${ADAPTER_ADDRESS} -r${RATE} -d ${DISPLAY_INTERVAL} $INPUT_FILE"
-echo "Running ${CMD}"
+#echo "Running ${CMD}"
 $CMD
diff --git a/settings.gradle b/settings.gradle
@@ -24,6 +24,7 @@ include 's4-example-twittertopiccount-scala'
 include 's4-example-speech01'
 include 's4-example-speech01-scala'
 include 's4-example-speech02'
+include 's4-example-testinput'
 include 's4-tools-loadgenerator'
 
 /* Set dirs for projects whose name doesn't follow the dir structure. */
@@ -35,4 +36,5 @@ project(':s4-example-twittertopiccount-scala').projectDir = new File(settingsDir
 project(':s4-example-speech01').projectDir = new File(settingsDir, 's4-examples/speech01')
 project(':s4-example-speech01-scala').projectDir = new File(settingsDir, 's4-examples/speech01-scala')
 project(':s4-example-speech02').projectDir = new File(settingsDir, 's4-examples/speech02')
+project(':s4-example-testinput').projectDir = new File(settingsDir, 's4-examples/testinput')
 project(':s4-tools-loadgenerator').projectDir = new File(settingsDir, 's4-tools/loadgenerator')