perfsonar development work

Author: boote
Date: 2006-08-04 03:31:25 -0400 (Fri, 04 Aug 2006)
New Revision: 1509

Added:
   trunk/perfsonar/ant/build-clmp.xml
Modified:
   trunk/perfsonar/ant/clmp/commandLineMP-axis-deploy-targets.xml
   trunk/perfsonar/ant/clmp/commandLineMP-client-run-targets.xml
   trunk/perfsonar/ant/clmp/commandLineMP-configure-targets.xml
   trunk/perfsonar/ant/clmp/commandLineMP-doc-targets.xml
   trunk/perfsonar/ant/clmp/commandLineMP-java-compile-targets.xml
   trunk/perfsonar/ant/clmp/commandLineMP-release-targets.xml
Log:
Adding build-clmp.xml so the commandLineMP is build-able again.

The configure-targets still need more work, but at least the service can be
compiled now.

jeff


Added: trunk/perfsonar/ant/build-clmp.xml

Modified: trunk/perfsonar/ant/clmp/commandLineMP-axis-deploy-targets.xml
===================================================================
--- trunk/perfsonar/ant/clmp/commandLineMP-axis-deploy-targets.xml      
2006-08-03 13:21:24 UTC (rev 1508)
+++ trunk/perfsonar/ant/clmp/commandLineMP-axis-deploy-targets.xml      
2006-08-04 07:31:25 UTC (rev 1509)
@@ -16,33 +16,33 @@
 ==================================================================== -->
 
 
-<project name="commandLineMP-axis-deploy-targets">
+<project name="clmp-axis-deploy-targets">
 
 
 
-    <target name="copy-jars-for-commandLineMP" 
depends="copy-jars-for-service"/>
+    <target name="copy-jars-for-clmp" depends="copy-jars-for-service"/>
 
 
-    <target name="delete-jars-for-commandLineMP" 
depends="delete-jars-for-service"/>
+    <target name="delete-jars-for-clmp" depends="delete-jars-for-service"/>
 
 
 
     <!-- commandLineMP -->
 
-    <available file="${build}/perfSONAR-commandLineMP.jar"   
property="jar.perfsonar.commandLineMP.present"/>
+    <available file="${build}/perfSONAR-commandLineMP.jar"   
property="jar.perfsonar.clmp.present"/>
 
 
-    <target name="does-jar-commandLineMP" 
unless="jar.perfsonar.commandLineMP.present">
+    <target name="does-jar-clmp" unless="jar.perfsonar.clmp.present">
         <echo>------------------------------ WARNING 
---------------------------</echo>
         <echo/>
-        <echo>You don't have perfSONAR-commandLineMP.jar file in ${build} 
directory. You have to first build the service by using the target ant 
build-commandLineMP!!!</echo>
+        <echo>You don't have perfSONAR-commandLineMP.jar file in ${build} 
directory. You have to first build the service by using the target ant 
build-clmp!!!</echo>
         <echo/>
         
<echo>------------------------------------------------------------------</echo>
     </target>
 
 
-    <target name="copy-commandLineMP-jar" depends="copy-generic-jar, 
copy-jars-for-commandLineMP, does-jar-commandLineMP"
-            if="jar.perfsonar.commandLineMP.present"
+    <target name="copy-clmp-jar" depends="copy-generic-jar, 
copy-jars-for-clmp, does-jar-clmp"
+            if="jar.perfsonar.clmp.present"
             description="Copy commandLineMP service jar to Tomcat">
 
         <copy file="${build}/perfSONAR-commandLineMP.jar" 
todir="${axis.home}/WEB-INF/lib"/>
@@ -58,7 +58,7 @@
     </target>
 
 
-    <target name="deploy-commandLineMP" depends="copy-commandLineMP-jar"
+    <target name="deploy-clmp" depends="copy-clmp-jar"
                 description="Deploys Command Line MP service">
         <java classname="org.apache.axis.client.AdminClient">
             <arg line="-l ${adminService} ${deployFile}"/>
@@ -67,7 +67,7 @@
     </target>
 
 
-    <target name="undeploy-commandLineMP"
+    <target name="undeploy-clmp"
                 description="Undeploys Command Line MP service">
 
         <java classname="org.apache.axis.client.AdminClient">
@@ -75,7 +75,7 @@
             <classpath refid="classpath"/>
         </java>
 
-        <antcall target="delete-jars-for-commandLineMP"/>
+        <antcall target="delete-jars-for-clmp"/>
 
         <delete file="${axis.home}/WEB-INF/lib/perfSONAR-generic.jar"/>
         <delete file="${axis.home}/WEB-INF/lib/perfSONAR-commandLineMP.jar"/>

Modified: trunk/perfsonar/ant/clmp/commandLineMP-client-run-targets.xml
===================================================================
--- trunk/perfsonar/ant/clmp/commandLineMP-client-run-targets.xml       
2006-08-03 13:21:24 UTC (rev 1508)
+++ trunk/perfsonar/ant/clmp/commandLineMP-client-run-targets.xml       
2006-08-04 07:31:25 UTC (rev 1509)
@@ -13,7 +13,7 @@
 ==================================================================== -->
 
 
-<project name="commandLineMP-client-run-targets">
+<project name="clmp-client-run-targets">
 
 
     <property name="ma.local" 
value="http://${target.server}:${target.port}/axis/services/CLMPService"/>

Modified: trunk/perfsonar/ant/clmp/commandLineMP-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/clmp/commandLineMP-configure-targets.xml        
2006-08-03 13:21:24 UTC (rev 1508)
+++ trunk/perfsonar/ant/clmp/commandLineMP-configure-targets.xml        
2006-08-04 07:31:25 UTC (rev 1509)
@@ -12,14 +12,21 @@
 ==================================================================== -->
 
 
-<project name="commandLineMP-configure-targets">
+<project name="clmp-configure-targets">
 
-    <target name="copy-initconfig-for-commandLineMP">
-      <copy file="ant/const.properties.cl" tofile="ant/const.properties" 
overwrite="true" failonerror="false"/>
-      <copy file="conf/components.properties.cl" 
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
+    <target name="copy-initconfig-for-clmp">
+      <copy file="ant/const.properties.mp" tofile="ant/const.properties" 
overwrite="true" failonerror="false"/>
+      <copy file="conf/components.properties.mp" 
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
        
-      <copy file="conf/service.properties.cl" 
tofile="conf/service.properties" overwrite="true" failonerror="false" />
+      <copy file="conf/service.properties.mp" 
tofile="conf/service.properties" overwrite="true" failonerror="false" />
 
     </target>
 
+    <target name="configure-clmp">
+        <antcall target="copy-initconfig-for-clmp"/>
+        <antcall target="copy-properties"/>
+        <antcall target="set-log4j-properties"/>
+        <antcall target="set-tomcat-properties"/>
+    </target>
+
 </project>

Modified: trunk/perfsonar/ant/clmp/commandLineMP-doc-targets.xml
===================================================================
--- trunk/perfsonar/ant/clmp/commandLineMP-doc-targets.xml      2006-08-03 
13:21:24 UTC (rev 1508)
+++ trunk/perfsonar/ant/clmp/commandLineMP-doc-targets.xml      2006-08-04 
07:31:25 UTC (rev 1509)
@@ -13,14 +13,14 @@
 ==================================================================== -->
 
 
-<project name="commandLineMP-doc-targets">
+<project name="clmp-doc-targets">
 
-    <target name="copy-installdoc-commandLineMP">
+    <target name="copy-installdoc-clmp">
       <copy todir="doc/install-notes">
         <fileset dir="doc/mp/commandLineMP/install-notes"/>
       </copy>
     </target>
        
-    <target name="copy-javadoc-commandLineMP" depends="javadoc"/>
+    <target name="copy-javadoc-clmp" depends="javadoc"/>
 
 </project>

Modified: trunk/perfsonar/ant/clmp/commandLineMP-java-compile-targets.xml
===================================================================
--- trunk/perfsonar/ant/clmp/commandLineMP-java-compile-targets.xml     
2006-08-03 13:21:24 UTC (rev 1508)
+++ trunk/perfsonar/ant/clmp/commandLineMP-java-compile-targets.xml     
2006-08-04 07:31:25 UTC (rev 1509)
@@ -15,17 +15,17 @@
 ==================================================================== -->
 
 
-<project name="commandLineMP-java-compile-targets">
+<project name="clmp-java-compile-targets">
 
     <!-- Command Line MP -->
 
 
-    <target name="clean-jar-commandLineMP">
+    <target name="clean-jar-clmp">
         <delete file="${build}/perfSONAR-commandLineMP.jar" 
failonerror="false"/>
     </target>
 
 
-    <target name="compile-commandLineMP"
+    <target name="compile-clmp"
                 description="Compiles Java files of Command Line">
         <javac srcdir="src" destdir="${build}" deprecation="yes">
             <include 
name="org/perfsonar/service/measurementPoint/commandLine/**" />
@@ -47,7 +47,7 @@
     </target>
 
 
-    <target name="jar-commandLineMP" depends="clean-jar-commandLineMP, 
compile-commandLineMP"
+    <target name="jar-clmp" depends="clean-jar-clmp, compile-clmp"
                 description="Creates JAR file for Command Line MP">
         <jar destfile="${build}/perfSONAR-commandLineMP.jar">
             <fileset dir="${build}">
@@ -63,11 +63,11 @@
         </jar>
     </target>
 
-    <target name="build-commandLineMP"
+    <target name="build-clmp"
                 description="Builds Command Line MP">
         <antcall target="clean-all"/>
         <antcall target="jar-generic"/>
-        <antcall target="jar-commandLineMP"/>
+        <antcall target="jar-clmp"/>
     </target>
 
 </project>

Modified: trunk/perfsonar/ant/clmp/commandLineMP-release-targets.xml
===================================================================
--- trunk/perfsonar/ant/clmp/commandLineMP-release-targets.xml  2006-08-03 
13:21:24 UTC (rev 1508)
+++ trunk/perfsonar/ant/clmp/commandLineMP-release-targets.xml  2006-08-04 
07:31:25 UTC (rev 1509)
@@ -15,14 +15,14 @@
 ==================================================================== -->
 
 
-<project name="commandLineMP-release-targets">
+<project name="clmp-release-targets">
 
 
 
     <!-- source release of Command Line MP -->
 
-    <target name="release-commandLineMP-src"
-            depends="copy-initconfig-for-commandLineMP, 
copy-installdoc-commandLineMP, copy-javadoc-commandLineMP"
+    <target name="release-clmp-src"
+            depends="copy-initconfig-for-clmp, copy-installdoc-clmp, 
copy-javadoc-clmp"
             description="Build src release.">
 
         <property file="ant/const.properties" />
@@ -48,7 +48,7 @@
        </copy>
 
        <copy 
todir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/doc/install-notes">
-               <fileset dir="doc/mp/commandLineMP/install-notes"/>
+               <fileset dir="doc/mp/clmp/install-notes"/>
        </copy>
 
        <copy 
todir="tmp/${release.basename}-${release.servicename}-src-${release.version}/sonar/perfsonar/lib">
@@ -133,8 +133,8 @@
 
     <!-- binary release of Command Line MP -->
 
-    <target name="release-commandLineMP-bin"
-            depends="copy-initconfig-for-commandLineMP, 
copy-installdoc-commandLineMP, build-commandLineMP"
+    <target name="release-clmp-bin"
+            depends="copy-initconfig-for-clmp, copy-installdoc-clmp, 
build-clmp"
             description="Build bin release.">
 
         <property file="ant/const.properties" />