perfsonar development work

Author: roman
Date: 2007-11-27 06:47:48 -0500 (Tue, 27 Nov 2007)
New Revision: 3076

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

- classpath fixed
- cleaning



Modified: branches/geant2_java-rrd-ma-extra/bin/perfsonar-rrdma.sh
===================================================================
--- branches/geant2_java-rrd-ma-extra/bin/perfsonar-rrdma.sh    2007-11-26 
11:13:27 UTC (rev 3075)
+++ branches/geant2_java-rrd-ma-extra/bin/perfsonar-rrdma.sh    2007-11-27 
11:47:48 UTC (rev 3076)
@@ -217,7 +217,7 @@
 
   cp $CONF_DIR/service.properties.template $CONF_DIR/service.properties
 
-  echo "service.port=$SERVICE_PORT\n\n" >> $CONF_DIR/service.properties
+  echo "service.port=$SERVICE_PORT" >> $CONF_DIR/service.properties
 
   echo "component.ma.xmldb.db_status=on" >> $CONF_DIR/service.properties
   echo "component.ma.xmldb.db_access=http" >> $CONF_DIR/service.properties
@@ -226,18 +226,18 @@
   echo "component.ma.xmldb.db_username=rrdmaservice" >> 
$CONF_DIR/service.properties
   echo "component.ma.xmldb.db_adminpassword=" >> $CONF_DIR/service.properties
   echo "component.ma.xmldb.db_password=rrdmaservice" >> 
$CONF_DIR/service.properties
-  echo "component.ma.xmldb.type=webapp\n\n" >> $CONF_DIR/service.properties
+  echo "component.ma.xmldb.type=webapp" >> $CONF_DIR/service.properties
 
-  echo "service.ma.xmldb.db_store=off\n\n" >> $CONF_DIR/service.properties
+  echo "service.ma.xmldb.db_store=off" >> $CONF_DIR/service.properties
 
   echo "service.r.service_description=$SERVICE_DESC" >> 
$CONF_DIR/service.properties
   echo "service.r.organization_name=$ORGANIZATION_NAME" >> 
$CONF_DIR/service.properties
   echo "service.r.service_name=$SERVICE_NAME" >> $CONF_DIR/service.properties
   echo "service.r.service_version=$SERVICE_VERSION" >> 
$CONF_DIR/service.properties
-  echo "service.r.contact_email=$CONTACT_EMAIL\n\n" >> 
$CONF_DIR/service.properties
+  echo "service.r.contact_email=$CONTACT_EMAIL" >> 
$CONF_DIR/service.properties
 
   echo 
"service.log.log4j.config=$BASE_DIR/server/$SERVER/webapps/$SERVICE_NAME-$SERVICE_VERSION/WEB-INF/classes/perfsonar/conf/log4j.properties"
 >> $CONF_DIR/service.properties
-  echo 
"service.sax_parser.config=$BASE_DIR/server/$SERVER/webapps/$SERVICE_NAME-$SERVICE_VERSION/WEB-INF/classes/perfsonar/conf/objects.config\n\n"
 >> $CONF_DIR/service.properties
+  echo 
"service.sax_parser.config=$BASE_DIR/server/$SERVER/webapps/$SERVICE_NAME-$SERVICE_VERSION/WEB-INF/classes/perfsonar/conf/objects.config"
 >> $CONF_DIR/service.properties
 }
 
 service_conf_create_2()
@@ -253,7 +253,7 @@
 
     echo "service.r.ls_url=$LS_URL" >> $CONF_DIR/service.properties
     echo 
"service.r.access_point=http://HOST_ADDRESS:$SERVICE_PORT/$SERVICE_NAME-$SERVICE_VERSION/services/MeasurementArchiveService";
 >> ${CONF_DIR}/service.properties
-    echo "component.registrator.interval=$REGISTER_INTERVAL\n\n" >> 
$CONF_DIR/service.properties
+    echo "component.registrator.interval=$REGISTER_INTERVAL" >> 
$CONF_DIR/service.properties
   fi
 }
 
@@ -353,7 +353,7 @@
 }
 
 
-JARS=$(ls -Rl $LIB_DIR/repository | grep .jar | awk '{ print $8 }')
+JARS=$(find $LIB_DIR/repository/ | grep .jar | rev |  awk -F'/' '{ print $1 
}' | rev)
 CPATH=""
 for jar in $JARS
 do
@@ -361,6 +361,14 @@
   CPATH=$CPATH:$path
 done
 
+RRDJARS=$(find $BASE_DIR/build/ | grep .jar | rev |  awk -F'/' '{ print $1 
}' | rev)
+for jar in $RRDJARS
+do
+  path=$(find $BASE_DIR/build -name $jar -print)
+  CPATH=$CPATH:$path
+done
+
+
 java_client_call()
 {
   PORTLINE=$(grep "service.port" 
$SERVER_DIR/webapps/$SERVICE_NAME-$SERVICE_VERSION/WEB-INF/classes/perfsonar/conf/service.properties)