perfsonar development work

Author: roman
Date: 2007-10-05 09:11:21 -0400 (Fri, 05 Oct 2007)
New Revision: 2915

Modified:
   branches/geant2_java-rrd-ma-extra/bin/perfsonar-rrdma.sh
   branches/geant2_java-rrd-ma-extra/doc/readme.txt
Log:

- setting LD_LIBRARY_PATH improved
- doc updated



Modified: branches/geant2_java-rrd-ma-extra/bin/perfsonar-rrdma.sh
===================================================================
--- branches/geant2_java-rrd-ma-extra/bin/perfsonar-rrdma.sh    2007-10-05 
12:39:30 UTC (rev 2914)
+++ branches/geant2_java-rrd-ma-extra/bin/perfsonar-rrdma.sh    2007-10-05 
13:11:21 UTC (rev 2915)
@@ -182,7 +182,9 @@
     echo "Other OS is not supported by this script"
   fi
 
-  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RRDTOOL_LIB_DIR:$RRDJTOOL/build
+  #export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RRDTOOL_LIB_DIR:$RRDJTOOL/build
+  echo "$LD_LIBRARY_PATH:$RRDTOOL_LIB_DIR:$RRDJTOOL/build" > 
$CONF_DIR/rrdjtool-env
+  chmod u+x $CONF_DIR/rrdjtool-env
 
   return 0
 }
@@ -327,6 +329,10 @@
 {
   chmod u+x $SERVER_DIR/bin/*.sh
 
+  test -e $CONF_DIR/rrdjtool-env || (echo $CONF_DIR/rrdjtool-env does not 
exist!; exit 1)
+  RRDJTOOL_LIBRARY_PATH=$(cat $CONF_DIR/rrdjtool-env)
+  export LD_LIBRARY_PATH=$RRDJTOOL_LIBRARY_PATH
+
   PORTLINE=$(grep "service.port" 
$SERVER_DIR/webapps/$SERVICE_NAME-$SERVICE_VERSION/WEB-INF/classes/perfsonar/conf/service.properties)
   SERVICE_PORT=$(echo $PORTLINE | awk -F'=' '{print $2}')
 
@@ -394,7 +400,7 @@
   echo
 
   #errors
-  java_client_call $BASE_DIR/samples/requests/MetadataKeyRequest-Errors-1 \
+  java_client_call 
$BASE_DIR/samples/requests/MetadataKeyRequest-Errors-1.xml \
                    $BASE_DIR/samples/requests/response-7.xml
   echo
   java_client_call $BASE_DIR/samples/requests/SetupDataRequest-Errors-1.xml \
@@ -402,7 +408,7 @@
   echo
 
   #discards
-  java_client_call $BASE_DIR/samples/requests/MetadataKeyRequest-Discards-1 \
+  java_client_call 
$BASE_DIR/samples/requests/MetadataKeyRequest-Discards-1.xml \
                    $BASE_DIR/samples/requests/response-9.xml
   java_client_call 
$BASE_DIR/samples/requests/SetupDataRequest-Discards-1.xml \
                    $BASE_DIR/samples/requests/response-10.xml

Modified: branches/geant2_java-rrd-ma-extra/doc/readme.txt
===================================================================
--- branches/geant2_java-rrd-ma-extra/doc/readme.txt    2007-10-05 12:39:30 
UTC (rev 2914)
+++ branches/geant2_java-rrd-ma-extra/doc/readme.txt    2007-10-05 13:11:21 
UTC (rev 2915)
@@ -45,7 +45,6 @@
     - OS type
     - the directory path of rrd.h
     - the directory path of RRDTool libraries
-    - accepting new measurement data and storing them in rrd files
     - LS register functionality
     - service description
     - contact e-mail