perfsonar development work

Author: roman
Date: 2006-12-06 05:27:39 -0500 (Wed, 06 Dec 2006)
New Revision: 1802

Modified:
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-client-run-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-test-run-targets.xml
Log:
- two more tests in test target
- rrdjtool target allows to leave bulding the library to a user (manual 
building)

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-client-run-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-client-run-targets.xml  
  2006-12-06 10:20:11 UTC (rev 1801)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-client-run-targets.xml  
  2006-12-06 10:27:39 UTC (rev 1802)
@@ -23,15 +23,51 @@
     <!-- fetching -->
 
 
-    <target name="run-rrdma-client-1" description="Runs Java client2">
+    <target name="run-rrdma-client-1" description="Runs Java client">
 
+        <java classname="org.perfsonar.client.testHarness.SOAPClient"
+            classpathref="classpath" fork="true">
+            <arg value="${ma.local}"/>
+            <arg 
value="${basedir}/schema/example-instances/sonar/MetadataKey-Filter-Req-1.xml"/>
+            <arg 
value="${basedir}/schema/example-instances/sonar/response-1.xml"/>
+
+            <classpath>
+                <pathelement location="build/perfSONAR-generic.jar"/>
+            </classpath>
+
+        </java>
+
+    </target>
+
+
+    <target name="run-rrdma-client-2" description="Runs Java client">
+
+        <replace 
file="${basedir}/schema/example-instances/sonar/MetadataKey-Filter-Req-2.xml" 
token="__BASEPATH__" value="${basedir}"/>
+
+        <java classname="org.perfsonar.client.testHarness.SOAPClient"
+            classpathref="classpath" fork="true">
+            <arg value="${ma.local}"/>
+            <arg 
value="${basedir}/schema/example-instances/sonar/MetadataKey-Filter-Req-2.xml"/>
+            <arg 
value="${basedir}/schema/example-instances/sonar/response-2.xml"/>
+
+            <classpath>
+                <pathelement location="build/perfSONAR-generic.jar"/>
+            </classpath>
+
+        </java>
+
+    </target>
+
+
+    <target name="run-rrdma-client-3" description="Runs Java client">
+
         <replace 
file="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect.xml"
 token="__BASEPATH__" value="${basedir}"/>
 
         <java classname="org.perfsonar.client.testHarness.SOAPClient"
             classpathref="classpath" fork="true">
             <arg value="${ma.local}"/>
             <arg 
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect.xml"/>
-            <arg 
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+            <arg 
value="${basedir}/schema/example-instances/sonar/response-3.xml"/>
 
             <classpath>
                 <pathelement location="build/perfSONAR-generic.jar"/>
@@ -42,13 +78,13 @@
     </target>
 
 
-    <target name="run-rrdma-client-2" description="Runs Java client2">
+    <target name="run-rrdma-client-4" description="Runs Java client">
 
         <java classname="org.perfsonar.client.testHarness.SOAPClient"
                 classpathref="classpath" fork="true">
             <arg value="${ma.local}"/>
             <arg 
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-2.xml"/>
-            <arg 
value="${basedir}/schema/example-instances/sonar/response-2.xml"/>
+            <arg 
value="${basedir}/schema/example-instances/sonar/response-4.xml"/>
 
             <classpath>
                 <pathelement location="build/perfSONAR-generic.jar"/>
@@ -59,7 +95,7 @@
     </target>
 
 
-    <target name="run-rrdma-client-3" description="Runs Java client2">
+    <target name="run-rrdma-client-5" description="Runs Java client">
 
         <replace 
file="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-3.xml"
 token="__BASEPATH__" value="${basedir}"/>
 
@@ -67,7 +103,7 @@
             classpathref="classpath" fork="true">
             <arg value="${ma.local}"/>
             <arg 
value="${basedir}/schema/example-instances/sonar/SetupDataRequest-FilterRRDSelect-3.xml"/>
-            <arg 
value="${basedir}/schema/example-instances/sonar/response-3.xml"/>
+            <arg 
value="${basedir}/schema/example-instances/sonar/response-5.xml"/>
 
             <classpath>
                 <pathelement location="build/perfSONAR-generic.jar"/>
@@ -78,7 +114,7 @@
     </target>
 
 
-    <target name="run-rrdma-client-4" description="Runs Java client2">
+    <target name="run-rrdma-client-6" description="Runs Java client">
 
         <java classname="org.perfsonar.client.testHarness.SOAPClient"
             classpathref="classpath" fork="true">
@@ -95,7 +131,7 @@
     </target>
 
 
-    <target name="run-rrdma-client-5" description="Runs Java client2">
+    <target name="run-rrdma-client-7" description="Runs Java client">
 
         <java classname="org.perfsonar.client.testHarness.SOAPClient"
             classpathref="classpath" fork="true">

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml 
  2006-12-06 10:20:11 UTC (rev 1801)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml 
  2006-12-06 10:27:39 UTC (rev 1802)
@@ -18,85 +18,59 @@
 
 
 
-    <property name="service.name" value="perfSONAR-RRDMA-1.1-beta" />
+    <property name="service.name" 
value="perfSONAR-RRDMA-1.1-beta-20061206-1" />
 
     <property name="exist.war.file" value="exist-1.0.1.war" />
 
     <property file="ant/const.properties" />
 
 
-    <!-- getting the path of RRDTool application -->
+    <!-- building rrdjtool library -->
 
-    <!--
-    <target name="_get-rrdtool-path">
 
-        <exec executable="which"
-            os="Linux"
-            errorproperty="rrdtool.path.error"
-            outputproperty="full.rrdtool.path">
-            <arg line="rrdtool"/>
-        </exec>
+    <target name="get-rrdjtool-home">
 
-    </target>
+        <input message="Enter the home directory where the rrdtool is 
installed (I need the home directory and not the directory where the 
executable binary is present) [/usr/local/rrdtool]: "
+            addproperty="_rrdtool_path"
+            defaultvalue="/usr/local/rrdtool" />
 
+        <propertyfile file="ant/const.properties" 
+            comment="This file was created by the Ant configuration script.">
 
-    <target name="get-rrdtool-path"
-        depends="_get-rrdtool-path"
-        if="full.rrdtool.path">
+            <entry  key="rrdjdir" value="${basedir}/contrib/rrdjtool"/>
+            <entry  key="rrdtool_path" value="${_rrdtool_path}"/>
 
-        <dirname property="__rrdtool.path" file="${full.rrdtool.path}"/>
-        <dirname property="rrdtool.path" file="${__rrdtool.path}"/>
+        </propertyfile>
 
     </target>
-    -->
 
 
-    <!-- building rrdjtool library -->
+    <target name="get-java-path-for-rrdjtool"
+        depends="get-java-path">
 
+        <propertyfile file="ant/const.properties" 
+            comment="This file was created by the Ant configuration script.">
 
-    <!--
-    <target name="rrdjtool-question"
-        depends="get-rrdtool-path">
+            <entry  key="jdk_path" value="${java.path}"/>
 
-        <input message="Which OS platform do you use: "
-            addproperty="_os.platform"
-            validargs="linux,linux-64bit,freebsd,solaris"
-            defaultvalue="linux" />
+        </propertyfile>
 
-        <input message="Enter the home directory where the rrdtool is 
installed (I need the home directory and not the directory where the 
executable binary is present) [${rrdtool.path}]: "
-            addproperty="_rrdtool_path"
-            defaultvalue="${rrdtool.path}" />
-
     </target>
-    -->
 
 
     <target name="rrdjtool-question">
 
         <input message="Which OS platform do you use: "
             addproperty="_os.platform"
-            validargs="linux,linux-64bit,freebsd,solaris"
+            validargs="linux,linux-64bit,freebsd,solaris,other"
             defaultvalue="linux" />
 
-        <input message="Enter the home directory where the rrdtool is 
installed (I need the home directory and not the directory where the 
executable binary is present) [/usr/local/rrdtool]: "
-            addproperty="_rrdtool_path"
-            defaultvalue="/usr/local/rrdtool" />
-
     </target>
 
 
     <target name="rrdjtool-call"
-        depends="rrdjtool-question, get-java-path">
+        depends="rrdjtool-question">
 
-        <propertyfile file="ant/const.properties" 
-            comment="This file was created by the Ant configuration script.">
-
-            <entry  key="rrdjdir" value="${basedir}/contrib/rrdjtool"/>
-            <entry  key="rrdtool_path" value="${_rrdtool_path}"/>
-            <entry  key="jdk_path" value="${java.path}"/>
-
-        </propertyfile>
-
         <condition property="linux.os.platform">
             <equals arg1="linux" arg2="${_os.platform}"/>
         </condition>
@@ -113,6 +87,10 @@
             <equals arg1="solaris" arg2="${_os.platform}"/>
         </condition>
 
+        <condition property="other.os.platform">
+            <equals arg1="other" arg2="${_os.platform}"/>
+        </condition>
+
     </target>
 
 
@@ -120,6 +98,9 @@
         depends="rrdjtool-call"
         if="linux.os.platform">
 
+        <antcall target="get-rrdjtool-home" />
+        <antcall target="get-java-path-for-rrdjtool" />
+
         <antcall target="build-rrdjtool" />
 
     </target>
@@ -129,6 +110,9 @@
         depends="rrdjtool-call"
         if="linux64.os.platform">
  
+        <antcall target="get-rrdjtool-home" />
+        <antcall target="get-java-path-for-rrdjtool" />
+
         <antcall target="build-rrdjtool-64bit" />
 
     </target>
@@ -138,6 +122,9 @@
         depends="rrdjtool-call"
         if="freebsd.os.platform">
 
+        <antcall target="get-rrdjtool-home" />
+        <antcall target="get-java-path-for-rrdjtool" />
+
         <antcall target="build-rrdjtool-freebsd" />
 
     </target>
@@ -147,16 +134,38 @@
         depends="rrdjtool-call"
         if="solaris.os.platform">
 
+        <antcall target="get-rrdjtool-home" />
+        <antcall target="get-java-path-for-rrdjtool" />
+
         <antcall target="build-rrdjtool-solaris" />
 
     </target>
 
 
+    <target name="rrdjtool-call-for-other"
+        depends="rrdjtool-call"
+        if="other.os.platform">
+
+        <echo></echo>
+        <echo>You have to build the rrdjtool library and set LD_LIBRARY_PATH 
variable manually.</echo>
+        <echo>To get the information how to do it visit 
${basedir}/contrib/rrdjtool directory.</echo>
+        <echo>Important: LD_LIBRARY_PATH variable with rrdjtool element 
should be visible by Tomcat instance</echo>
+        <echo>that you will start later on in deploy action (Tomcat will 
have to be started manually,</echo>
+        <echo>not by the installtion script)</echo>
+        <echo></echo>
+        <echo>Please, do it now. I will wait for you.</echo>
+        <input message="Press Return key ..."/>
+        <echo></echo>
+
+    </target>
+
+
     <target name="rrdjtool"
             depends="rrdjtool-call-for-linux,
                      rrdjtool-call-for-linux64,
                      rrdjtool-call-for-freebsd,
-                     rrdjtool-call-for-solaris">
+                     rrdjtool-call-for-solaris,
+                     rrdjtool-call-for-other">
     </target>
 
 

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-test-run-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-test-run-targets.xml    
  2006-12-06 10:20:11 UTC (rev 1801)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-test-run-targets.xml    
  2006-12-06 10:27:39 UTC (rev 1802)
@@ -24,6 +24,8 @@
         <antcall target="run-rrdma-client-3"/>
         <antcall target="run-rrdma-client-4"/>
         <antcall target="run-rrdma-client-5"/>
+        <antcall target="run-rrdma-client-6"/>
+        <antcall target="run-rrdma-client-7"/>
 
     </target>