perfsonar development work

Author: roman
Date: 2006-07-05 06:18:00 -0400 (Wed, 05 Jul 2006)
New Revision: 1379

Modified:
   trunk/perfsonar/ant/rrdma/rrdma-release-targets.xml
Log:
minor changes

Modified: trunk/perfsonar/ant/rrdma/rrdma-release-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-release-targets.xml 2006-07-05 09:27:39 
UTC (rev 1378)
+++ trunk/perfsonar/ant/rrdma/rrdma-release-targets.xml 2006-07-05 10:18:00 
UTC (rev 1379)
@@ -28,33 +28,34 @@
         <property file="ant/const.properties" />
 
         <delete dir="tmp"/>
-        <mkdir 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar"/>
-        <copy 
todir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar">
-            <fileset dir="../../sonar"/>
+        <mkdir 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar"/>
+        <copy 
todir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar">
+            <fileset dir="../perfsonar"/>
         </copy>
-        <delete 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/tmp"/>
+        <delete 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/tmp"/>
 
 
-        <delete 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/src/org/perfsonar/service/lookupService"/>
-        <delete 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/src/org/perfsonar/service/measurementPoint"/>
-        <delete 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/build/org"/>
+        <delete 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src/org/perfsonar/service/lookupService"/>
+        <delete 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src/org/perfsonar/service/measurementPoint"/>
+        <delete 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src/org/perfsonar/service/topologyService"/>
+        <delete 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/build/org"/>
         <delete>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/build"
 includes="**/*.jar"/>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/log"
 includes="**/*.log"/>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/src"
 includes="**/ls-*.wsdd"/>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/src"
 includes="**/mp-*.wsdd"/>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/src"
 includes="**/tcmp-*.wsdd"/>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/conf"
 includes="**/*.ls"/>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/conf"
 includes="**/*.cl"/>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/conf"
 includes="**/*.sqlma"/>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/conf"
 includes="**/*.tcmp"/>
-            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/conf"
 includes="**/*.mp"/>
+            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/build"
 includes="**/*.jar"/>
+            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/log"
 includes="**/*.log"/>
+            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src"
 includes="**/ls-*.wsdd"/>
+            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src"
 includes="**/mp-*.wsdd"/>
+            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/src"
 includes="**/tcmp-*.wsdd"/>
+            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.ls"/>
+            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.cl"/>
+            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.sqlma"/>
+            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.tcmp"/>
+            <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.mp"/>
         </delete>
 
         <tar 
destfile="${release.basename}-${release.servicename}-src-${release.version}.tar"
              basedir="tmp/"
              longfile="gnu"
-             excludes="CVS/**"
+             excludes=".svn/**"
         />
 
         <delete dir="tmp"/>
@@ -78,29 +79,29 @@
         <property file="ant/const.properties" />
 
         <delete dir="tmp"/>
-        <mkdir 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/sonar"/>
-        <copy 
todir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/sonar">
-            <fileset dir="../../sonar"/>
+        <mkdir 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar"/>
+        <copy 
todir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar">
+            <fileset dir="../perfsonar"/>
         </copy>
-        <delete 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/sonar/perfsonar/tmp"/>
+        <delete 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/tmp"/>
 
 
-        <delete 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/sonar/perfsonar/src/org"/>
-        <delete 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/sonar/perfsonar/doc"/>
-        <delete 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/sonar/perfsonar/test"/>
+        <delete 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/src/org"/>
+        <delete 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/doc"/>
+        <delete 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/test"/>
         <delete>
-          <fileset 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/sonar/perfsonar/log"
 includes="**/*.log"/>
-          <fileset 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/sonar/perfsonar/conf"
 includes="**/*.ls"/>
-          <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/conf"
 includes="**/*.cl"/>
-          <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/conf"
 includes="**/*.sqlma"/>
-          <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/conf"
 includes="**/*.tcmp"/>
-          <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/conf"
 includes="**/*.mp"/>
+          <fileset 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/log"
 includes="**/*.log"/>
+          <fileset 
dir="tmp/${release.basename}-${release.servicename}-bin-${release.version}/perfsonar/conf"
 includes="**/*.ls"/>
+          <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.cl"/>
+          <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.sqlma"/>
+          <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.tcmp"/>
+          <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.mp"/>
         </delete>
 
         <tar 
destfile="${release.basename}-${release.servicename}-bin-${release.version}.tar"
              basedir="tmp/"
              longfile="gnu"
-             excludes="CVS/**"
+             excludes=".svn/**"
              />
 
         <delete dir="tmp"/>