perfsonar development work

Author: roman
Date: 2007-10-05 06:24:13 -0400 (Fri, 05 Oct 2007)
New Revision: 2910

Added:
   branches/geant2_java-rrd-ma-extra/conf/rrd-database_TEST.xml.template
Removed:
   branches/geant2_java-rrd-ma-extra/conf/rrd-database_TEST.xml
Modified:
   branches/geant2_java-rrd-ma-extra/bin/perfsonar-rrdma.sh
Log:

preparing test metadata config file implemented



Modified: branches/geant2_java-rrd-ma-extra/bin/perfsonar-rrdma.sh
===================================================================
--- branches/geant2_java-rrd-ma-extra/bin/perfsonar-rrdma.sh    2007-10-05 
06:17:02 UTC (rev 2909)
+++ branches/geant2_java-rrd-ma-extra/bin/perfsonar-rrdma.sh    2007-10-05 
10:24:13 UTC (rev 2910)
@@ -127,6 +127,8 @@
   service_conf_create_2
   service_conf_create_3
 
+  test_metadata_conf_prepare
+
   webapp_dir_create
 
   exit 0
@@ -269,6 +271,11 @@
   echo "log4j.appender.psRootAppender.File=$LOGPATH/perfsonar.log" >> 
$CONF_DIR/log4j.properties
 }
 
+test_metadata_conf_prepare()
+{
+  awk '{ sub(/__BASEPATH__/, "'"$BASE_DIR"'"); print }' 
$CONF_DIR/rrd-database_TEST.xml.template > $CONF_DIR/rrd-database_TEST.xml
+}
+
 webapp_dir_create()
 {
   if [ -d $SERVER_DIR/webapps/$SERVICE_NAME-$SERVICE_VERSION ]
@@ -401,6 +408,7 @@
 }
 
 
+
 case "$ACTION" in
   install)
         echo "Installing the service... "

Deleted: branches/geant2_java-rrd-ma-extra/conf/rrd-database_TEST.xml

Added: branches/geant2_java-rrd-ma-extra/conf/rrd-database_TEST.xml.template