perfsonar development work

Author: roman
Date: 2007-02-22 07:39:42 -0500 (Thu, 22 Feb 2007)
New Revision: 2122

Added:
   trunk/perfsonar/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config/
   
trunk/perfsonar/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml
   trunk/perfsonar/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config/
   
trunk/perfsonar/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml
   trunk/perfsonar/ant/sqlma/ibatis-utilization-jdbc-config/
   
trunk/perfsonar/ant/sqlma/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml
   trunk/perfsonar/ant/sqlma/sqlma-ibatis-jdbc-config-targets.xml
Modified:
   trunk/perfsonar/ant/build-sqlma.xml
   trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml
Log:

Now in the configure step of the installation procedure the script askes for 
jdbc parameters and store them in ibatis 
configuration files.






Modified: trunk/perfsonar/ant/build-sqlma.xml
===================================================================
--- trunk/perfsonar/ant/build-sqlma.xml 2007-02-21 15:15:37 UTC (rev 2121)
+++ trunk/perfsonar/ant/build-sqlma.xml 2007-02-22 12:39:42 UTC (rev 2122)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-
 <!-- ===================================================================
     <description>
     perfSONAR generic service

Added: 
trunk/perfsonar/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml


Property changes on: 
trunk/perfsonar/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/perfsonar/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml


Property changes on: 
trunk/perfsonar/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/perfsonar/ant/sqlma/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml


Property changes on: 
trunk/perfsonar/ant/sqlma/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml       2007-02-21 
15:15:37 UTC (rev 2121)
+++ trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml       2007-02-22 
12:39:42 UTC (rev 2122)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- ===================================================================
 <description>
@@ -227,31 +228,29 @@
     <!-- presenting some information about configuring the relational 
database -->
 
 
-    <target name="accessing-relational-database-setup">
+    <target name="accessing-relational-database-setup-dynamic">
 
-        <echo>You must provide correct database connection 
information.</echo>
+       <subant target="ibatis-jdbc-config">
+               <fileset dir="ant/sqlma" 
includes="*/ibatis-jdbc-config-targets.xml"/>
+               </subant>
 
-        <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 (${basedir}/conf)</echo>
-        <echo>of perfSONAR SQL MA installation package.</echo>
+       </target>
 
-        <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 (${basedir}/conf)</echo>
-        <echo>of perfSONAR SQL MA installation 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>
+    <target name="accessing-relational-database-setup"
+       depends="accessing-relational-database-setup-dynamic">
 
+       <echo></echo>
+        <echo>If you want to change provided jdbc connection parameters 
manually,</echo>
+       <echo>because of some reasons,</echo>
+       <echo>you can do this in configuration files 
(ibatis-SqlMapConfig-*.xml)</echo>
+       <echo>in ${basedir}/conf directory.</echo>
+       <echo>After such change, when the service is already deployed, you 
must</echo>
+       <echo>redeploy the service (undeploy and deploy again).</echo>
         <echo></echo>
-        <input message="Please do it now and press Enter when finished"/>
 
+        <input message="Press Enter to continue"/>
+
     </target>
 
 

Added: trunk/perfsonar/ant/sqlma/sqlma-ibatis-jdbc-config-targets.xml


Property changes on: 
trunk/perfsonar/ant/sqlma/sqlma-ibatis-jdbc-config-targets.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native