perfsonar development work

Author: roman
Date: 2007-11-26 06:13:27 -0500 (Mon, 26 Nov 2007)
New Revision: 3075

Modified:
   branches/geant2_java-rrd-ma-extra/ant/const.properties.template
   branches/geant2_java-rrd-ma-extra/bin/perfsonar-rrdma.sh
Log:
- one bug related with different output of ls command on different linux 
distros fixed
- new version number added



Modified: branches/geant2_java-rrd-ma-extra/ant/const.properties.template
===================================================================
--- branches/geant2_java-rrd-ma-extra/ant/const.properties.template     
2007-11-23 09:06:27 UTC (rev 3074)
+++ branches/geant2_java-rrd-ma-extra/ant/const.properties.template     
2007-11-26 11:13:27 UTC (rev 3075)
@@ -13,7 +13,7 @@
 
 
 jarfilename=perfsonar-rrd-ma
-version=2.3-extra
+version=2.3.2-extra
 
 wsdd.file.deploy=service-deploy.wsdd
 wsdd.file.undeploy=service-undeploy.wsdd

Modified: branches/geant2_java-rrd-ma-extra/bin/perfsonar-rrdma.sh
===================================================================
--- branches/geant2_java-rrd-ma-extra/bin/perfsonar-rrdma.sh    2007-11-23 
09:06:27 UTC (rev 3074)
+++ branches/geant2_java-rrd-ma-extra/bin/perfsonar-rrdma.sh    2007-11-26 
11:13:27 UTC (rev 3075)
@@ -17,8 +17,8 @@
 SERVER=jetty-6.1.3
 SERVER_DIR=$BASE_DIR/server/$SERVER
 
-SERVICE_NAME=perfSONAR-RRD-MA
-SERVICE_VERSION=2.3-dev
+SERVICE_NAME=geant2_java-rrd-ma
+SERVICE_VERSION=2.3.2
 
 
 if [ -z "$JAVA_HOME" ]
@@ -293,7 +293,8 @@
   mkdir 
$SERVER_DIR/webapps/$SERVICE_NAME-$SERVICE_VERSION/WEB-INF/classes/perfsonar/conf
   mkdir $SERVER_DIR/webapps/$SERVICE_NAME-$SERVICE_VERSION/WEB-INF/logs
 
-  JARS=$(ls -Rl $LIB_DIR/repository/ | grep .jar | awk '{ print $8 }')
+  #JARS=$(ls -Rl $LIB_DIR/repository/ | grep .jar | awk '{ print $8 }')
+  JARS=$(find $LIB_DIR/repository/ | grep .jar | rev |  awk -F'/' '{ print 
$1 }' | rev)
   dest=$SERVER_DIR/webapps/$SERVICE_NAME-$SERVICE_VERSION/WEB-INF/lib/
   for jar in $JARS
   do