perfsonar development work

Author: roman
Date: 2006-10-25 09:47:30 -0400 (Wed, 25 Oct 2006)
New Revision: 1716

Modified:
   branches/romradz-ant4rel-20061017/ant/java-compile-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-client-run-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-release-targets.xml
Log:
update of targets needed to create a release

Modified: branches/romradz-ant4rel-20061017/ant/java-compile-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/java-compile-targets.xml      
2006-10-25 10:51:03 UTC (rev 1715)
+++ branches/romradz-ant4rel-20061017/ant/java-compile-targets.xml      
2006-10-25 13:47:30 UTC (rev 1716)
@@ -82,8 +82,8 @@
             <include name="org/perfsonar/service/commons/**" />
             <include name="org/perfsonar/client/commons/**" />
             <include name="org/perfsonar/client/axis/**" />
-            <include name="org/perfsonar/client/testHarness/SOAPClient.java" 
/>
-            <include 
name="org/perfsonar/client/testHarness/SOAPClientMulti.java" />
+            <include name="org/perfsonar/client/testHarness/**" />
+            <exclude name="**/LSTestClient.java" />
             <include name="org/ggf/**" />
             <classpath refid="classpath"/>
         </javac>
@@ -100,8 +100,7 @@
                 <include name="org/perfsonar/service/commons/**" />
                 <include name="org/perfsonar/client/commons/**" />
                 <include name="org/perfsonar/client/axis/**" />
-                <include 
name="org/perfsonar/client/testHarness/SOAPClient.java" />
-                <include 
name="org/perfsonar/client/testHarness/SOAPClientMulti.java" />
+                <include name="org/perfsonar/client/testHarness/**" />
                 <include name="org/ggf/**" />
             </fileset>
         </jar>

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-client-run-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-client-run-targets.xml  
  2006-10-25 10:51:03 UTC (rev 1715)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-client-run-targets.xml  
  2006-10-25 13:47:30 UTC (rev 1716)
@@ -30,6 +30,11 @@
             <arg value="${ma.local}"/>
             <arg 
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-2.xml"/>
             <arg 
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+
+            <classpath>
+                <pathelement location="build/perfSONAR-generic.jar"/>
+            </classpath>
+
         </java>
 
     </target>

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml   
  2006-10-25 10:51:03 UTC (rev 1715)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml   
  2006-10-25 13:47:30 UTC (rev 1716)
@@ -16,7 +16,7 @@
 
 
 
-    <property name="service.name" value="pS-1.0-RRDMA" />
+    <property name="service.name" value="perfSONAR-RRDMA-1.1-beta" />
     <property name="deploy.root" value="${service.name}" />
 
 

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-release-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-release-targets.xml     
  2006-10-25 10:51:03 UTC (rev 1715)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-release-targets.xml     
  2006-10-25 13:47:30 UTC (rev 1716)
@@ -9,7 +9,7 @@
 
 Notes:
    This files contains the target which is used to create
-   a release file of the perfSONAR sources.
+   a release file of RRD MA.
 
 </description>
 ==================================================================== -->
@@ -18,28 +18,106 @@
 <project name="rrdma-release-targets">
 
 
+   <target name="init-release">
 
-    <!-- source release of RRD MA -->
+      <propertyfile file="ant/const.properties" 
+         comment="This file was created by the Ant configuration script.">
+         <entry  key="service.name" value="${service.name}"/>
+         <entry  key="build" value="build"/>
+      </propertyfile>            
 
-    <target name="release-src"
-            description="Build src release.">
+   </target>
 
 
-    </target>
+    <target name="release"
+       depends="init-release, build"
+       description="Build the release.">
 
+       <property file="ant/const.properties" />
 
+       <delete dir="tmp"/>
+       <mkdir dir="tmp/${service.name}/perfsonar"/>
+       <copy todir="tmp/${service.name}/perfsonar">
+          <fileset dir="${basedir}"/>
+       </copy>
+       <delete dir="tmp/${service.name}/perfsonar/tmp"/>
 
-    <!-- binary release of RRD MA -->
+       <delete dir="tmp/${service.name}/perfsonar/src/org"/>
+       <delete dir="tmp/${service.name}/perfsonar/doc"/>
+       <delete dir="tmp/${service.name}/perfsonar/test"/>
+       <delete dir="tmp/${service.name}/perfsonar/releng"/>
+       <delete dir="tmp/${service.name}/perfsonar/build/org"/>
 
-    <target name="release-bin"
-            depends="build"
-            description="Build bin release.">
+       <delete 
file="tmp/${service.name}/perfsonar/conf/components.properties"/>
+       <delete file="tmp/${service.name}/perfsonar/conf/service.properties"/>
+       <delete file="tmp/${service.name}/perfsonar/ant/const.properties"/>
 
+       <delete file="tmp/${service.name}/perfsonar/ant/changes-rrdma"/>
 
+       <delete dir="tmp/${service.name}/perfsonar/ant/clmp"/>
+       <delete dir="tmp/${service.name}/perfsonar/ant/nmsmp"/>
+       <delete dir="tmp/${service.name}/perfsonar/ant/snmpmp"/>
+       <delete dir="tmp/${service.name}/perfsonar/ant/sqlma"/>
+       <delete dir="tmp/${service.name}/perfsonar/ant/tcmp"/>
+       <delete dir="tmp/${service.name}/perfsonar/ant/tops"/>
+       <delete dir="tmp/${service.name}/perfsonar/ant/xmlls"/>
+
+       <delete dir="tmp/${service.name}/perfsonar/conf/template"/>
+
+       <delete dir="tmp/${service.name}/perfsonar/lib/rrd"/>
+
+       <move file="tmp/${service.name}/perfsonar/ant/build-rrdma.xml" 
tofile="tmp/${service.name}/perfsonar/ant/build.xml"/>
+
+       <delete>
+
+          <fileset dir="tmp/${service.name}/perfsonar/log" 
includes="**/*.log"/>
+
+          <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.cl"/>
+          <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.mp"/>
+          <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.sqlma"/>
+          <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.tops"/>
+          <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.tcmp"/>
+
+          <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.cl"/>
+          <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.mp"/>
+          <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.sqlma"/>
+          <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.tops"/>
+          <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.tcmp"/>
+
+          <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/build-*.xml"/>
+
+          <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*-old.*"/>
+          <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*-old.*"/>
+
+          <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd" 
includes="**/clmp-*.wsdd"/>
+          <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd" 
includes="**/ls-*.wsdd"/>
+          <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd" 
includes="**/mp-*.wsdd"/>
+          <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd" 
includes="**/tops-*.wsdd"/>
+
+          <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/ibatis-*.*"/>
+          <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/mysql-*.*"/>
+          <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/psql-*.*"/>
+          <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/sql-*.*"/>
+          <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/tcmp-*.*"/>
+
+       </delete>
+
+       <tar destfile="${service.name}.tar"
+          basedir="tmp/"
+          longfile="gnu"
+          excludes=".svn/**"
+       />
+
+       <delete dir="tmp"/>
+
+       <gzip zipfile="${service.name}.tar.gz"
+          src="${service.name}.tar"
+       />
+
+       <delete file="${service.name}.tar"/>
+
     </target>
 
 
 
 </project>
-
-