perfsonar development work

Author: roman
Date: 2007-02-22 08:04:38 -0500 (Thu, 22 Feb 2007)
New Revision: 2124

Added:
   
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config/
   
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml
   
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config/
   
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml
   branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-utilization-jdbc-config/
   
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml
   branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-ibatis-jdbc-config-targets.xml
   
branches/JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-L2-status-domain.template.xml
   
branches/JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-L2-status-interdomain.template.xml
   
branches/JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-utilization.template.xml
Removed:
   
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml
   
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml
   
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml
Modified:
   branches/JAVA-SQL-MA-STABLE/ant/build-sqlma.xml
   branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-configure-targets.xml
   branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/Interface_Specification.doc
   
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/Metadata_Configuration_File_Specification.doc
   
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
Log:

Recent changes (dealing with jdbc parameters) in the trunk copied to the 
stable.

  svn merge -r 2105:2123 
https://svn.perfsonar.net/svn/perfsonar/trunk/perfsonar





Modified: branches/JAVA-SQL-MA-STABLE/ant/build-sqlma.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/build-sqlma.xml     2007-02-22 12:42:30 
UTC (rev 2123)
+++ branches/JAVA-SQL-MA-STABLE/ant/build-sqlma.xml     2007-02-22 13:04:38 
UTC (rev 2124)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-
 <!-- ===================================================================
     <description>
     perfSONAR generic service

Copied: 
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config 
(from rev 2123, 
trunk/perfsonar/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config)

Deleted: 
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml

Copied: 
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml
 (from rev 2123, 
trunk/perfsonar/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml)

Copied: 
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config
 (from rev 2123, 
trunk/perfsonar/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config)

Deleted: 
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml

Copied: 
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml
 (from rev 2123, 
trunk/perfsonar/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml)

Copied: branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-utilization-jdbc-config 
(from rev 2123, trunk/perfsonar/ant/sqlma/ibatis-utilization-jdbc-config)

Deleted: 
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml

Copied: 
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml
 (from rev 2123, 
trunk/perfsonar/ant/sqlma/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml)

Modified: branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-configure-targets.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-configure-targets.xml   
2007-02-22 12:42:30 UTC (rev 2123)
+++ branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-configure-targets.xml   
2007-02-22 13:04:38 UTC (rev 2124)
@@ -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>
 
 

Copied: 
branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-ibatis-jdbc-config-targets.xml 
(from rev 2123, 
trunk/perfsonar/ant/sqlma/sqlma-ibatis-jdbc-config-targets.xml)

Copied: 
branches/JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-L2-status-domain.template.xml
 (from rev 2123, 
trunk/perfsonar/conf/ibatis-SqlMapConfig-L2-status-domain.template.xml)

Copied: 
branches/JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-L2-status-interdomain.template.xml
 (from rev 2123, 
trunk/perfsonar/conf/ibatis-SqlMapConfig-L2-status-interdomain.template.xml)

Copied: 
branches/JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-utilization.template.xml 
(from rev 2123, 
trunk/perfsonar/conf/ibatis-SqlMapConfig-utilization.template.xml)

Modified: 
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/Interface_Specification.doc
===================================================================
(Binary files differ)

Modified: 
branches/JAVA-SQL-MA-STABLE/doc/ma/sqlTypeMA/Metadata_Configuration_File_Specification.doc
===================================================================
(Binary files differ)

Modified: 
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
===================================================================
--- 
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
      2007-02-22 12:42:30 UTC (rev 2123)
+++ 
branches/JAVA-SQL-MA-STABLE/schema/example-instances/perfSONAR/LS/test/EchoRequest.xml
      2007-02-22 13:04:38 UTC (rev 2124)
@@ -4,13 +4,21 @@
 <!-- Version:   $Id$ -->
 
 <nmwg:message type="EchoRequest"
-             id="msg1"
-              xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+                  id="msg1"
+                   xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
                             
-  <nmwg:metadata id="meta">
-    <nmwg:eventType>echo</nmwg:eventType>
-  </nmwg:metadata>
+    <nmwg:metadata id="meta">
+         <nmwg:eventType>echo.ls</nmwg:eventType>
+        <nmwg:parameters>
+        
+             <nmwg:parameter name="testDBConnection" value="yes"/>
+             <nmwg:parameter name="testDBSchema" value="yes"/>
+            
+        </nmwg:parameters>
+    </nmwg:metadata>
                                     
-  <nmwg:data id="data" metadataIdRef="meta"/>
+    <nmwg:data id="data" metadataIdRef="meta"/>
                                         
+                                                
+
 </nmwg:message>