perfsonar development work

Author: roman
Date: 2007-01-16 08:47:46 -0500 (Tue, 16 Jan 2007)
New Revision: 1918

Modified:
   trunk/perfsonar/ant/build-sqlma.xml
   trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml
   trunk/perfsonar/ant/sqlma/sqlma-pre-install-targets.xml
   trunk/perfsonar/ant/sqlma/sqlma-release-targets.xml
Log:
Additional updates to follow the installation procedure rules for the release.

Modified: trunk/perfsonar/ant/build-sqlma.xml
===================================================================
--- trunk/perfsonar/ant/build-sqlma.xml 2007-01-16 13:45:12 UTC (rev 1917)
+++ trunk/perfsonar/ant/build-sqlma.xml 2007-01-16 13:47:46 UTC (rev 1918)
@@ -20,9 +20,7 @@
 <project basedir="../" name="perfsonar-sqlma">
 
 
-    <property file="ant/const.properties" />
 
-
     <path id="classpath">
         <fileset dir="./lib/repository">
             <include name="**/*.jar"/>
@@ -62,7 +60,7 @@
     <import file="sqlma/sqlma-exist-xmldb-targets.xml"/>
     <import file="sqlma/sqlma-test-run-targets.xml"/>
     <import file="sqlma/sqlma-configure-targets.xml"/>
-    <!--<import file="sqlma/sqlma-release-targets.xml"/> -->
+    <import file="sqlma/sqlma-release-targets.xml"/>
     <import file="sqlma/sqlma-libs-download-targets.xml"/>
 
 

Modified: trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml       2007-01-16 
13:45:12 UTC (rev 1917)
+++ trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml       2007-01-16 
13:47:46 UTC (rev 1918)
@@ -39,7 +39,7 @@
         depends="__get-sql-config-file"
         if="sql.config.file.present">
 
-        <echo message="Accepted sql metadata config file: 
${sql.config.file}"/>
+        <!--<echo message="Accepted sql metadata config file: 
${sql.config.file}"/> -->
 
     </target>
 
@@ -223,6 +223,36 @@
     </target>
 
 
+    <!-- presenting some information about configuring the relational 
database -->
+
+
+    <target name="accessing-relational-database-setup">
+
+        <echo>You must provide correct database connection 
information.</echo>
+
+        <echo></echo>
+        <echo>If you want the service to support data of utilization 
metric</echo>
+        <echo>update connection parameters in 
ibatis-SqlMapConfig-utilization.xml file</echo>
+        <echo>that you can find in conf directory of perfSONAR SQL MA 
package.</echo>
+
+        <echo></echo>
+        <echo>If you want the service to support data of L2 path status 
metric</echo>
+        <echo>update connection parameters in 
ibatis-SqlMapConfig-L2-status-domain.xml</echo>
+        <echo>and ibatis-SqlMapConfig-L2-status-interdomain.xml files</echo>
+        <echo>that you can find in conf directory of perfSONAR SQL MA 
package.</echo>
+
+        <echo></echo>
+        <echo>Each parameter in these files is represented by property 
element.</echo>
+        <echo>Check value attribute of each property and if it is needed 
alter it</echo>
+        <echo>to have correct connection with the database.</echo>
+        
+        <echo></echo>
+        <echo>Please, do it now. I will wait for you.</echo>
+        <input message="Press Return key ..."/>
+
+    </target>        
+
+
     <!-- the main target -->
 
 
@@ -233,6 +263,7 @@
         <antcall target="set-service-properties-for-sqlma"/>
         <antcall target="set-log4j-properties"/>
         <antcall target="exist-init"/>
+        <antcall target="accessing-relational-database-setup"/>
         <antcall target="store-fuctionality-for-sqlma"/>
         <antcall target="register-fuctionality-for-sqlma"/>
 

Modified: trunk/perfsonar/ant/sqlma/sqlma-pre-install-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-pre-install-targets.xml     2007-01-16 
13:45:12 UTC (rev 1917)
+++ trunk/perfsonar/ant/sqlma/sqlma-pre-install-targets.xml     2007-01-16 
13:47:46 UTC (rev 1918)
@@ -405,6 +405,31 @@
     </target>
 
 
+    <!-- presenting some information about configuring the relational 
database -->
+
+
+    <target name="relational-database-setup-info">
+
+        <echo>This service requires access to the relational database</echo>
+        <echo>(mySQL or postgeSQL but others can be used as well).</echo>
+        <echo>Make sure that you have one or install it from scratch.</echo>
+        <echo></echo>
+        <echo>Please, do it now. I will wait for you.</echo>
+        <input message="Press Return key ..."/>
+
+        <echo>In order to maintain data of utilization metric and/or L2 path 
status metric,</echo>
+        <echo>please, prepare your relational database.</echo>
+        <echo>In case of mySQL use simple script file 
mysql-sqlma-dbsetup.sql</echo>
+        <echo>that you can find in conf directory of perfSONAR SQL MA 
package.</echo>
+        <echo>In case of postgreSQL use psql-sqlma-dbsetup.sql. </echo>
+        <echo>(Warning: remember to change the password for perfsonar_ma 
user!)</echo>
+        <echo></echo>
+        <echo>Please, do it now. I will wait for you.</echo>
+        <input message="Press Return key ..."/>
+
+    </target>
+
+
     <!-- the main target -->
 
 
@@ -427,6 +452,8 @@
 
         <antcall target="exist"/>
 
+        <antcall target="relational-database-setup-info"/>
+
     </target>
 
 

Modified: trunk/perfsonar/ant/sqlma/sqlma-release-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-release-targets.xml 2007-01-16 13:45:12 
UTC (rev 1917)
+++ trunk/perfsonar/ant/sqlma/sqlma-release-targets.xml 2007-01-16 13:47:46 
UTC (rev 1918)
@@ -14,108 +14,109 @@
     ==================================================================== -->
 
 
-    <project name="sqlma-release-targets">
+<project name="sqlma-release-targets">
 
 
 
-        <!-- source release of SQL MA -->
+    <target name="init-release">
 
-        <target name="sqlma-release-src"
-            depends="copy-initconfig-for-sqlma"
-            description="Build src release.">
+        <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>
 
-            <property file="ant/const.properties" />
+    </target>
 
-            <delete dir="tmp"/>
-            <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}/perfsonar/tmp"/>
 
+    <target name="release"
+        depends="init-release, build"
+        description="Build the release.">
 
-            <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}/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/conf"
 includes="**/*.ls"/>
-                <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="**/*.cl"/>
-                <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.rrdma"/>
-                <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"/>
-                <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.tops"/>
-            </delete>
+        <property file="ant/const.properties" />
 
-            <tar 
destfile="${release.basename}-${release.servicename}-src-${release.version}.tar"
-                basedir="tmp/"
-                longfile="gnu"
-                excludes=".svn/**"
-            />
+        <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"/>
 
-            <delete dir="tmp"/>
+        <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"/>
 
-            <gzip 
zipfile="${release.basename}-${release.servicename}-src-${release.version}.tar.gz"
-                
src="${release.basename}-${release.servicename}-src-${release.version}.tar"
-            />
+        <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="${release.basename}-${release.servicename}-src-${release.version}.tar"/>
+        <delete file="tmp/${service.name}/perfsonar/ant/changes-rrdma"/>
 
-        </target>
+        <delete dir="tmp/${service.name}/perfsonar/ant/clmp"/>
+        <delete dir="tmp/${service.name}/perfsonar/ant/flowmp"/>
+        <delete dir="tmp/${service.name}/perfsonar/ant/nmsmp"/>
+        <delete dir="tmp/${service.name}/perfsonar/ant/snmpmp"/>
+        <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"/>
 
+        <move file="tmp/${service.name}/perfsonar/ant/build-sqlma.xml"
+            tofile="tmp/${service.name}/perfsonar/ant/build.xml"/>
 
-        <!-- binary release of SQL MA -->
+        <delete>
 
-        <target name="sqlma-release-bin"
-            depends="copy-initconfig-for-sqlma, build-sqlma"
-            description="Build bin release.">
+            <fileset dir="tmp/${service.name}/perfsonar/log" 
includes="**/*.log"/>
 
-            <property file="ant/const.properties" />
+            <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="**/*.rrdma"/>
+            <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.tops"/>
+            <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.tcmp"/>
+            <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.flowmp"/>
 
-            <delete dir="tmp"/>
-            <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}/perfsonar/tmp"/>
+            <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="**/*.rrdma"/>
+            <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.tops"/>
+            <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.tcmp"/>
+            <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.flowmp"/>
 
+            <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/build-*.xml"/>
 
-            <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}/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="**/*.rrdma"/>
-                <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"/>
-                <fileset 
dir="tmp/${release.basename}-${release.servicename}-src-${release.version}/perfsonar/conf"
 includes="**/*.tops"/>
-            </delete>
+            <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*-old.*"/>
+            <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*-old.*"/>
 
-            <tar 
destfile="${release.basename}-${release.servicename}-bin-${release.version}.tar"
-                basedir="tmp/"
-                longfile="gnu"
-                excludes=".svn/**"
-            />
+            <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="**/tcmp-*.wsdd"/>
+            <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd" 
includes="**/tops-*.wsdd"/>
 
-            <delete dir="tmp"/>
+            <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/tcmp-*.*"/>
+            <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/rrd-*.*"/>
 
-            <gzip 
zipfile="${release.basename}-${release.servicename}-bin-${release.version}.tar.gz"
-                
src="${release.basename}-${release.servicename}-bin-${release.version}.tar"
-            />
+        </delete>
 
-            <delete 
file="${release.basename}-${release.servicename}-bin-${release.version}.tar"/>
+        <tar destfile="${service.name}.tar"
+            basedir="tmp/"
+            longfile="gnu"
+            excludes=".svn/**"
+        />
 
+        <delete dir="tmp"/>
 
-        </target>
+        <gzip zipfile="${service.name}.tar.gz"
+            src="${service.name}.tar"
+        />
 
+        <delete file="${service.name}.tar"/>
 
+    </target>
 
-    </project>
+
+
+</project>
\ No newline at end of file