perfsonar development work

Author: roman
Date: 2007-10-24 09:47:36 -0400 (Wed, 24 Oct 2007)
New Revision: 2990

Modified:
   branches/geant2_java-rrd-ma-extra/ant/const.properties.template
   branches/geant2_java-rrd-ma-extra/ant/libs-download-targets.xml
   branches/geant2_java-rrd-ma-extra/conf/rrd-database_TEST.xml.template
   branches/geant2_java-rrd-ma-extra/doc/Interface_Specification.doc
   
branches/geant2_java-rrd-ma-extra/doc/Metadata_Configuration_Specification.doc
Log:

updated to be in sync with current trunk and the tag of release 2.3



Modified: branches/geant2_java-rrd-ma-extra/ant/const.properties.template
===================================================================
--- branches/geant2_java-rrd-ma-extra/ant/const.properties.template     
2007-10-24 12:26:42 UTC (rev 2989)
+++ branches/geant2_java-rrd-ma-extra/ant/const.properties.template     
2007-10-24 13:47:36 UTC (rev 2990)
@@ -13,7 +13,7 @@
 
 
 jarfilename=perfsonar-rrd-ma
-version=2.3-20071005-extra
+version=2.3-extra
 
 wsdd.file.deploy=service-deploy.wsdd
 wsdd.file.undeploy=service-undeploy.wsdd

Modified: branches/geant2_java-rrd-ma-extra/ant/libs-download-targets.xml
===================================================================
--- branches/geant2_java-rrd-ma-extra/ant/libs-download-targets.xml     
2007-10-24 12:26:42 UTC (rev 2989)
+++ branches/geant2_java-rrd-ma-extra/ant/libs-download-targets.xml     
2007-10-24 13:47:36 UTC (rev 2990)
@@ -55,8 +55,8 @@
     <artifact:dependencies>
 
       <dependency groupId="rrdjtool"  artifactId="rrdjtool"       
version="1.0"/>
-      <dependency groupId="perfsonar" artifactId="perfsonar-base" 
version="1.0.20070928"/>
-      <dependency groupId="nmwg"      artifactId="nmwg"           
version="1.0.20070814"/>
+      <dependency groupId="perfsonar" artifactId="perfsonar-base" 
version="1.0.20071016"/>
+      <dependency groupId="nmwg"      artifactId="nmwg"           
version="1.0.20071008"/>
 
       <localRepository  refid="local.repository"/>
       <remoteRepository refid="remote.repository"/>

Modified: 
branches/geant2_java-rrd-ma-extra/conf/rrd-database_TEST.xml.template
===================================================================
--- branches/geant2_java-rrd-ma-extra/conf/rrd-database_TEST.xml.template     
  2007-10-24 12:26:42 UTC (rev 2989)
+++ branches/geant2_java-rrd-ma-extra/conf/rrd-database_TEST.xml.template     
  2007-10-24 13:47:36 UTC (rev 2990)
@@ -34,6 +34,8 @@
                 <nmwg:parameter name="dataSource">inoctets</nmwg:parameter>
                 <nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
 
+                <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
+
                 <!-- those below are optional parameters describing rrd 
file-->
                 <nmwg:parameter name="dataSourceStep">300</nmwg:parameter>
                 <nmwg:parameter 
name="dataSourceType">ABSOLUTE</nmwg:parameter>
@@ -69,6 +71,8 @@
                 <nmwg:parameter name="dataSource">outoctets</nmwg:parameter>
                 <nmwg:parameter name="valueUnits">Bps</nmwg:parameter>
 
+                <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/characteristic/utilization/2.0</nmwg:parameter>
+
                 <!-- those below are optional parameters describing rrd 
file-->
                 <nmwg:parameter name="dataSourceStep">300</nmwg:parameter>
                 <nmwg:parameter 
name="dataSourceType">ABSOLUTE</nmwg:parameter>
@@ -106,6 +110,8 @@
                 <nmwg:parameter name="dataSource">inerrors</nmwg:parameter>
                 <nmwg:parameter name="valueUnits">Eps</nmwg:parameter>
 
+                <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/characteristic/errors/2.0</nmwg:parameter>
+
                 <!-- those below are optional parameters describing rrd 
file-->
                 <nmwg:parameter name="dataSourceStep">300</nmwg:parameter>
                 <nmwg:parameter 
name="dataSourceType">ABSOLUTE</nmwg:parameter>
@@ -143,6 +149,8 @@
                 <nmwg:parameter name="dataSource">indiscards</nmwg:parameter>
                 <nmwg:parameter name="valueUnits">Dps</nmwg:parameter>
 
+                <nmwg:parameter 
name="eventType">http://ggf.org/ns/nmwg/characteristic/discards/2.0</nmwg:parameter>
+
                 <!-- those below are optional parameters describing rrd 
file-->
                 <nmwg:parameter name="dataSourceStep">300</nmwg:parameter>
                 <nmwg:parameter 
name="dataSourceType">ABSOLUTE</nmwg:parameter>

Modified: branches/geant2_java-rrd-ma-extra/doc/Interface_Specification.doc
===================================================================
(Binary files differ)

Modified: 
branches/geant2_java-rrd-ma-extra/doc/Metadata_Configuration_Specification.doc
===================================================================
(Binary files differ)