perfsonar development work

Author: roman
Date: 2007-02-22 08:52:54 -0500 (Thu, 22 Feb 2007)
New Revision: 2126

Modified:
   
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
   branches/JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-L2-status-domain.xml
   
branches/JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-L2-status-interdomain.xml
   branches/JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-utilization.xml
   branches/JAVA-SQL-MA-STABLE/conf/log4j.properties
Log:
Recent changes copied from the trunk into the stable

  svn merge -r 2124:2125 
https://svn.perfsonar.net/svn/perfsonar/trunk/perfsonar



Modified: 
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-domain-jdbc-config/ibatis-jdbc-config-targets.xml
 2007-02-22 13:48:37 UTC (rev 2125)
+++ 
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-l2pathstatus-domain-jdbc-config/ibatis-jdbc-config-targets.xml
 2007-02-22 13:52:54 UTC (rev 2126)
@@ -21,21 +21,47 @@
        <import file="../sqlma-ibatis-jdbc-config-targets.xml"/>
 
 
+       <target name="metric-question">
+
+               <echo></echo>
+           <input message="Do you want to use data of L2 path status metric 
in domain scope which are or will be stored in your relational database? "
+               addproperty="_metric.decision"
+               validargs="y,n"
+           defaultvalue="y"/>
+
+           <condition property="metric.decision">
+           <equals arg1="y" arg2="${_metric.decision}"/>
+           </condition>
+
+       </target>
+
+
        <target name="jdbc-config-message">
 
                <echo></echo>
                <echo>Provide correct jdbc connection parameters</echo>
-               <echo>for relational database where data of L2 path status 
(domain) metric</echo>
+               <echo>for relational database where data of L2 path status 
metric - domain scope</echo>
                <echo>are stored.</echo>
                <echo></echo>
 
        </target>
 
 
-       <target name="ibatis-jdbc-config" depends="jdbc-config-message, 
get-ibatis-jdbc-config">
+       <target name="ibatis-jdbc-config"
+               depends="metric-question"
+               if="metric.decision">
 
+               <antcall target="_ibatis-jdbc-config"/>
+
+       </target>
+
+
+       <target name="_ibatis-jdbc-config"
+               depends="jdbc-config-message, get-ibatis-jdbc-config">
+
        <delete 
file="../../../conf/ibatis-SqlMapConfig-L2-status-domain.xml"/>
            <copy 
file="../../../conf/ibatis-SqlMapConfig-L2-status-domain.template.xml"     
tofile="../../../conf/ibatis-SqlMapConfig-L2-status-domain.xml"/>
+
        <replace 
file="../../../conf/ibatis-SqlMapConfig-L2-status-domain.xml"           
token="_DRIVER_"               value="${rel.db.name}"/>
                <replace 
file="../../../conf/ibatis-SqlMapConfig-L2-status-domain.xml"           
token="_URL_"          value="${rel.db.url}"/>
                <replace 
file="../../../conf/ibatis-SqlMapConfig-L2-status-domain.xml"           
token="_USERNAME_"     value="${rel.db.username}"/>

Modified: 
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-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml
    2007-02-22 13:48:37 UTC (rev 2125)
+++ 
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-l2pathstatus-interdomain-jdbc-config/ibatis-jdbc-config-targets.xml
    2007-02-22 13:52:54 UTC (rev 2126)
@@ -21,19 +21,44 @@
        <import file="../sqlma-ibatis-jdbc-config-targets.xml"/>
 
 
+       <target name="metric-question">
+
+               <echo></echo>
+           <input message="Do you want to use data of L2 path status metric 
in interdomain scope which are or will be stored in your relational database? 
"
+               addproperty="_metric.decision"
+               validargs="y,n"
+           defaultvalue="y"/>
+
+           <condition property="metric.decision">
+           <equals arg1="y" arg2="${_metric.decision}"/>
+           </condition>
+
+       </target>
+
+
        <target name="jdbc-config-message">
 
                <echo></echo>
                <echo>Provide correct jdbc connection parameters</echo>
-               <echo>for relational database where data of L2 path status 
(interdomain) metric</echo>
+               <echo>for relational database where data of L2 path status 
metric - interdomain scope</echo>
                <echo>are stored.</echo>
                <echo></echo>
 
        </target>
 
 
-       <target name="ibatis-jdbc-config" depends="jdbc-config-message, 
get-ibatis-jdbc-config">
+       <target name="ibatis-jdbc-config"
+               depends="metric-question"
+               if="metric.decision">
 
+               <antcall target="_ibatis-jdbc-config"/>
+
+       </target>
+
+
+       <target name="_ibatis-jdbc-config"
+               depends="jdbc-config-message, get-ibatis-jdbc-config">
+
        <delete 
file="../../../conf/ibatis-SqlMapConfig-L2-status-interdomain.xml"/>
            <copy 
file="../../../conf/ibatis-SqlMapConfig-L2-status-interdomain.template.xml"   
  tofile="../../../conf/ibatis-SqlMapConfig-L2-status-interdomain.xml"/>
 

Modified: 
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml
===================================================================
--- 
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml
 2007-02-22 13:48:37 UTC (rev 2125)
+++ 
branches/JAVA-SQL-MA-STABLE/ant/sqlma/ibatis-utilization-jdbc-config/ibatis-jdbc-config-targets.xml
 2007-02-22 13:52:54 UTC (rev 2126)
@@ -21,6 +21,21 @@
        <import file="../sqlma-ibatis-jdbc-config-targets.xml"/>
 
 
+       <target name="metric-question">
+
+               <echo></echo>
+           <input message="Do you want to use data of utilization metric 
which are or will be stored in your relational database? "
+               addproperty="_metric.decision"
+               validargs="y,n"
+           defaultvalue="y"/>
+
+           <condition property="metric.decision">
+           <equals arg1="y" arg2="${_metric.decision}"/>
+           </condition>
+
+       </target>
+
+
        <target name="jdbc-config-message">
 
                <echo></echo>
@@ -32,8 +47,18 @@
        </target>
 
 
-       <target name="ibatis-jdbc-config" depends="jdbc-config-message, 
get-ibatis-jdbc-config">
+       <target name="ibatis-jdbc-config"
+               depends="metric-question"
+               if="metric.decision">
 
+               <antcall target="_ibatis-jdbc-config"/>
+
+       </target>
+
+
+       <target name="_ibatis-jdbc-config"
+               depends="jdbc-config-message, get-ibatis-jdbc-config">
+
        <delete file="../../../conf/ibatis-SqlMapConfig-utilization.xml"/>
            <copy 
file="../../../conf/ibatis-SqlMapConfig-utilization.template.xml"     
tofile="../../../conf/ibatis-SqlMapConfig-utilization.xml"/>
 

Modified: 
branches/JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-L2-status-domain.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-L2-status-domain.xml 
  2007-02-22 13:48:37 UTC (rev 2125)
+++ branches/JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-L2-status-domain.xml 
  2007-02-22 13:52:54 UTC (rev 2126)
@@ -14,7 +14,6 @@
 
     <transactionManager type="JDBC">
         <dataSource type="SIMPLE" >
-            <!--<property name="JDBC.Driver"        
value="org.postgresql.Driver"/>-->
             <property name="JDBC.Driver"        
value="com.mysql.jdbc.Driver"/>
             <property name="JDBC.ConnectionURL" 
value="jdbc:mysql://127.0.0.1/perfsonar_ma"/>
             <property name="JDBC.Username"      value="perfsonar_ma"/>

Modified: 
branches/JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-L2-status-interdomain.xml
===================================================================
--- 
branches/JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-L2-status-interdomain.xml
      2007-02-22 13:48:37 UTC (rev 2125)
+++ 
branches/JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-L2-status-interdomain.xml
      2007-02-22 13:52:54 UTC (rev 2126)
@@ -14,7 +14,6 @@
 
     <transactionManager type="JDBC">
         <dataSource type="SIMPLE" >
-            <!--<property name="JDBC.Driver"        
value="org.postgresql.Driver"/>-->
             <property name="JDBC.Driver"        
value="com.mysql.jdbc.Driver"/>
             <property name="JDBC.ConnectionURL" 
value="jdbc:mysql://127.0.0.1/perfsonar_ma"/>
             <property name="JDBC.Username"      value="perfsonar_ma"/>

Modified: branches/JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-utilization.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-utilization.xml      
  2007-02-22 13:48:37 UTC (rev 2125)
+++ branches/JAVA-SQL-MA-STABLE/conf/ibatis-SqlMapConfig-utilization.xml      
  2007-02-22 13:52:54 UTC (rev 2126)
@@ -14,7 +14,6 @@
 
     <transactionManager type="JDBC">
         <dataSource type="SIMPLE" >
-            <!--<property name="JDBC.Driver"        
value="org.postgresql.Driver"/>-->
             <property name="JDBC.Driver"        
value="com.mysql.jdbc.Driver"/>
             <property name="JDBC.ConnectionURL" 
value="jdbc:mysql://127.0.0.1/perfsonar_ma"/>
             <property name="JDBC.Username"      value="perfsonar_ma"/>

Modified: branches/JAVA-SQL-MA-STABLE/conf/log4j.properties
===================================================================
--- branches/JAVA-SQL-MA-STABLE/conf/log4j.properties   2007-02-22 13:48:37 
UTC (rev 2125)
+++ branches/JAVA-SQL-MA-STABLE/conf/log4j.properties   2007-02-22 13:52:54 
UTC (rev 2126)
@@ -1,50 +1,62 @@
-#This file was created by the ant script.
-#Wed Dec 06 19:54:26 CET 2006
+
+## $Id$
+## project : perfSONAR
+## author: romradz
+
+
+logDir=/home/romradz/Dev/perfsonar/webapps/perfSONAR-SQL-MA-1.0-beta/WEB-INF/logs
+
+
+#ROOT
+#log4j.appender.rootAppender.MaxBackupIndex=1000
+#log4j.appender.rootAppender.File=/home/romradz/Dev/perfsonar/webapps/perfSONAR-SQL-MA-1.0-beta/WEB-INF/logs/perfsonar.log
+#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
+#log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
+#log4j.rootLogger=DEBUG, rootAppender
+#log4j.appender.rootAppender.MaxFileSize=500KB
+#log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
+
+#DEBUG
+log4j.appender.debugAppender.MaxBackupIndex=1000
+log4j.appender.debugAppender.File=/home/romradz/Dev/perfsonar/webapps/perfSONAR-SQL-MA-1.0-beta/WEB-INF/logs/perfsonar_debug.log
 log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
-log4j.appender.debugAppender.MaxBackupIndex=1000
+log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.logger.sonar-debug=DEBUG, debugAppender
+log4j.appender.debugAppender.MaxFileSize=500KB
+log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender
+
+#INFO
 log4j.appender.infoAppender.MaxBackupIndex=1000
-log4j.appender.warnAppender.File=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log/perfsonar_warn.log
+log4j.appender.infoAppender.File=/home/romradz/Dev/perfsonar/webapps/perfSONAR-SQL-MA-1.0-beta/WEB-INF/logs/perfsonar_info.log
+log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.logger.sonar-info=INFO, infoAppender
+log4j.appender.infoAppender.MaxFileSize=500KB
+log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender
+
+#WARN
 log4j.appender.warnAppender.MaxBackupIndex=1000
-log4j.appender.debugAppender.File=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log/perfsonar_debug.log
-log4j.appender.rootAppender.MaxBackupIndex=1000
-log4j.appender.rootAppender.File=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log/perfsonar.log
-log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.debugAppender.MaxFileSize=500KB
-log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.warnAppender.File=/home/romradz/Dev/perfsonar/webapps/perfSONAR-SQL-MA-1.0-beta/WEB-INF/logs/perfsonar_warn.log
+log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
 log4j.logger.sonar-warn=WARN, warnAppender
+log4j.appender.warnAppender.MaxFileSize=500KB
+log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
+
+#ERROR
+log4j.appender.errorAppender.MaxBackupIndex=1000
+log4j.appender.errorAppender.File=/home/romradz/Dev/perfsonar/webapps/perfSONAR-SQL-MA-1.0-beta/WEB-INF/logs/perfsonar_error.log
 log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
-logDir=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log
-log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.errorAppender.MaxBackupIndex=1000
+log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.logger.sonar-error=ERROR, errorAppender
+log4j.appender.errorAppender.MaxFileSize=500KB
 log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
-log4j.appender.warnAppender.MaxFileSize=500KB
-log4j.rootLogger=INFO, rootAppender
-log4j.appender.rootAppender.MaxFileSize=500KB
+
+#FATAL
+log4j.appender.fatalAppender.MaxBackupIndex=1000
+log4j.appender.fatalAppender.File=/home/romradz/Dev/perfsonar/webapps/perfSONAR-SQL-MA-1.0-beta/WEB-INF/logs/perfsonar_fatal.log
 log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.fatalAppender.MaxBackupIndex=1000
-log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.errorAppender.File=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log/perfsonar_error.log
-log4j.appender.errorAppender.MaxFileSize=500KB
 log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n
-log4j.logger.perfsonar-info=INFO, infoAppender
-log4j.appender.fatalAppender.File=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log/perfsonar_fatal.log
-log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
-log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
+log4j.logger.sonar-fatal=FATAL, fatalAppender
 log4j.appender.fatalAppender.MaxFileSize=500KB
-log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
-log4j.logger.sonar-debug=DEBUG, debugAppender
-log4j.logger.perfsonar-debug=DEBUG, debugAppender
-log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
-log4j.logger.sonar-error=ERROR, errorAppender
-log4j.logger.perfsonar-error=ERROR, errorAppender
-log4j.logger.perfsonar-warn=WARN, warnAppender
-log4j.logger.sonar-info=INFO, infoAppender
-log4j.appender.infoAppender.MaxFileSize=500KB
-log4j.appender.infoAppender.File=/root/Download/dev/sonar-trunk-20061206/perfsonar-20061206/log/perfsonar_info.log
-log4j.logger.sonar-fatal=FATAL, fatalAppender
-log4j.logger.perfsonar-fatal=FATAL, fatalAppender
+log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender