perfsonar development work

Author: roman
Date: 2007-05-22 09:16:29 -0400 (Tue, 22 May 2007)
New Revision: 2414

Modified:
   branches/JAVA-RRD-MA-RELEASE-2.2/ant/rrdma/rrdma-pre-install-targets.xml
   branches/JAVA-RRD-MA-RELEASE-2.2/doc/ma/rrdTypeMA/ChangeLog.txt
   
branches/JAVA-RRD-MA-RELEASE-2.2/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
Log:

- small bug of wrong Context of exist war file has been fixed
- small bug of wrong data source name when writing data into new rrd file has 
been fixed






Modified: 
branches/JAVA-RRD-MA-RELEASE-2.2/ant/rrdma/rrdma-pre-install-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-RELEASE-2.2/ant/rrdma/rrdma-pre-install-targets.xml  
  2007-05-22 12:45:53 UTC (rev 2413)
+++ branches/JAVA-RRD-MA-RELEASE-2.2/ant/rrdma/rrdma-pre-install-targets.xml  
  2007-05-22 13:16:29 UTC (rev 2414)
@@ -21,7 +21,7 @@
        <!-- properties -->
 
 
-    <property name="service.name" value="perfSONAR-RRD-MA-2.1" />
+    <property name="service.name" value="perfSONAR-RRD-MA-2.2" />
 
 
     <property name="_exist.war.download.url"
@@ -218,7 +218,7 @@
             <entry  key="component.ma.xmldb.db_username"   
value="rrdmaservice"/>
             <entry  key="component.ma.xmldb.db_password"   
value="rrdmaservice"/>
 
-        </propertyfile>            
+        </propertyfile>
 
     </target>
 
@@ -258,7 +258,7 @@
     <target name="exist-war-question"
         depends="_exist-war-question"
         if="exist.war.install.decision">
-        
+
         <input message="Do you want me to download eXist web application 
package (if not you have to do it manually)? "
             addproperty="exist.war.install.type.decision"
             validargs="y,n"
@@ -358,6 +358,8 @@
 
     <target name="exist-war-rrdma" depends="exist-use">
 
+        <property file="ant/const.properties" />
+
         <echo>Please, insert now the following xml tag 'Context'</echo>
         <echo>into Tomcat configuration file server.xml</echo>
         <echo>(${tomcat.home}/conf/server.xml)</echo>

Modified: branches/JAVA-RRD-MA-RELEASE-2.2/doc/ma/rrdTypeMA/ChangeLog.txt
===================================================================
--- branches/JAVA-RRD-MA-RELEASE-2.2/doc/ma/rrdTypeMA/ChangeLog.txt     
2007-05-22 12:45:53 UTC (rev 2413)
+++ branches/JAVA-RRD-MA-RELEASE-2.2/doc/ma/rrdTypeMA/ChangeLog.txt     
2007-05-22 13:16:29 UTC (rev 2414)
@@ -18,3 +18,9 @@
 2007-05-15 Version 2.1
 
 - Change: default log4j parameters updated; log files (archives and current) 
for one log level is limited up to 6MB
+
+
+2007-05-22 Version 2.2
+
+- Change: small bug of wrong Context of exist war file has been fixed
+- Change: small bug of wrong data source name when writing data into new rrd 
file has been fixed

Modified: 
branches/JAVA-RRD-MA-RELEASE-2.2/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
===================================================================
--- 
branches/JAVA-RRD-MA-RELEASE-2.2/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
   2007-05-22 12:45:53 UTC (rev 2413)
+++ 
branches/JAVA-RRD-MA-RELEASE-2.2/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
   2007-05-22 13:16:29 UTC (rev 2414)
@@ -766,10 +766,7 @@
 
                     if (metadata.getEventType() != null) {
 
-                        if (metadata.getEventType().getEventType().trim() != 
"")
-                            
ds.setParameterValue(metadata.getEventType().getEventType().trim());
-                        else
-                            ds.setParameterValue("ds");
+                        ds.setParameterValue("ds");
 
                         Parameters params = new Parameters();
                         params.addParameter(