Print

Print


Commit in java/trunk/monitoring-app/src/main/scripts on MAIN
evio_file_producer.sh+19added 619
ldpath.sh+25added 619
start_et_ring.sh+20added 619
start_monitoring_application.sh+8-3618 -> 619
+72-3
3 added + 1 modified, total 4 files
Consolidate all scripts for running and testing the monitoring application into the monitoring-app module.  Fix for HPSJAVA-141 to set load library path automatically in run scripts.  (JM)

java/trunk/monitoring-app/src/main/scripts
evio_file_producer.sh added at 619
--- java/trunk/monitoring-app/src/main/scripts/evio_file_producer.sh	                        (rev 0)
+++ java/trunk/monitoring-app/src/main/scripts/evio_file_producer.sh	2014-05-22 18:56:29 UTC (rev 619)
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Set the load library path.
+. ${project.build.directory}/scripts/ldpath.sh
+
+# First argument, with no command switch, is name of EVIO file.
+eviofile=$1
+
+# Subsequent arguments are appended to the end of the command.
+shift
+
+# Classpath pointing to the hps-evio jar.
+classpath=${project.build.directory}/${project.artifactId}-${project.version}-bin.jar
+
+# Run the file producer, sending any additional arguments to the command.
+#prod="java -classpath $classpath org.hps.evio.EvioFileProducer -e ${eviofile} -f ETBuffer -host localhost -s 10000 -d 100 $@"
+prod="java -classpath $classpath org.hps.evio.EvioFileProducer -e ${eviofile} -f ETBuffer -host localhost -s 10000 $@"
+echo $prod
+exec $prod
\ No newline at end of file

java/trunk/monitoring-app/src/main/scripts
ldpath.sh added at 619
--- java/trunk/monitoring-app/src/main/scripts/ldpath.sh	                        (rev 0)
+++ java/trunk/monitoring-app/src/main/scripts/ldpath.sh	2014-05-22 18:56:29 UTC (rev 619)
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# Get the OS details.
+os=`uname -a`
+
+# Set the base shared lib dir.
+lib_dir=${project.basedir}/src/main/resources/lib
+
+# Set the load library path by OS.
+if [[ $os == *Darwin* ]]; then
+    # Set path for 32-bit OSX, which is also used for 64-bit systems.
+    export DYLD_LIBRARY_PATH=${lib_dir}/Darwin-x86_32/
+    echo DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH
+elif [[ $os == *Linux* ]]; then    
+    if [[ $os == *x86_64* ]]; then
+        # Set path for 64-bit Linux.
+        export LD_LIBRARY_PATH=${lib_dir}/Linux-x86_64/
+    else
+        # Set path for 32-bit Linux.
+        export LD_LIBRARY_PATH=${lib_dir}/Linux-x86_32/
+    fi    
+    echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+else
+    echo "ERROR: Unrecognized platform " $os 
+fi
\ No newline at end of file

java/trunk/monitoring-app/src/main/scripts
start_et_ring.sh added at 619
--- java/trunk/monitoring-app/src/main/scripts/start_et_ring.sh	                        (rev 0)
+++ java/trunk/monitoring-app/src/main/scripts/start_et_ring.sh	2014-05-22 18:56:29 UTC (rev 619)
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Set the load library path.
+. ${project.build.directory}/scripts/ldpath.sh
+
+# Setup the classpath.
+classpath=${project.build.directory}/${project.artifactId}-${project.version}-bin.jar
+
+# Set variable for buffer file.
+buffer_file=ETBuffer
+
+# Delete buffer file if it exists already.
+if [[ -e $buffer_file ]]; then
+    rm $buffer_file              
+fi
+
+# Start the ET ring, sending any script arguments to the end of the command.
+server="java -Xmx1024m -classpath $classpath org.jlab.coda.et.apps.StartEt -f $buffer_file -s 10000 -v $@" 
+echo "$server"
+exec $server

java/trunk/monitoring-app/src/main/scripts
start_monitoring_application.sh 618 -> 619
--- java/trunk/monitoring-app/src/main/scripts/start_monitoring_application.sh	2014-05-22 18:44:39 UTC (rev 618)
+++ java/trunk/monitoring-app/src/main/scripts/start_monitoring_application.sh	2014-05-22 18:56:29 UTC (rev 619)
@@ -1,7 +1,12 @@
 #!/bin/sh
 
-classpath=${project.basedir}/target/${project.artifactId}-${project.version}-bin.jar
-prod="java -Xmx1024m -classpath "$classpath" org.hps.monitoring.MonitoringApplication $@"
-# -c 100"
+# Set the load library path.
+. ${project.build.directory}/scripts/ldpath.sh
+
+# Setup the classpath variable.
+classpath=${project.build.directory}/${project.artifactId}-${project.version}-bin.jar
+
+# Start the monitoring application, sending any script arguments to the end of the command.
+prod="java -Xmx1024m -classpath $classpath org.hps.monitoring.MonitoringApplication $@"
 echo $prod
 exec $prod
SVNspam 0.1