perfsonar development work

Author: zurawski
Date: 2007-02-13 13:58:37 -0500 (Tue, 13 Feb 2007)
New Revision: 207

Added:
   trunk/nmwg/schema/rnc/sonar.rnc
Modified:
   trunk/nmwg/schema/rnc/netflow.rnc
   trunk/nmwg/schema/rnc/service.rnc
   trunk/nmwg/schema/test-instances.sh
Log:
Adding the main perfsonar schema (sonar.rnc) and fixing various 
references.

-jason



Modified: trunk/nmwg/schema/rnc/netflow.rnc
===================================================================
--- trunk/nmwg/schema/rnc/netflow.rnc   2007-02-13 16:49:02 UTC (rev 206)
+++ trunk/nmwg/schema/rnc/netflow.rnc   2007-02-13 18:58:37 UTC (rev 207)
@@ -26,6 +26,7 @@
 include "nmtopo_ver3.rnc"
 include "nmtopo.rnc"
 include "service.rnc"
+include "result.rnc"
 include "nmbase.rnc" {
         Metadata |= NetflowMetadata
 } 

Modified: trunk/nmwg/schema/rnc/service.rnc
===================================================================
--- trunk/nmwg/schema/rnc/service.rnc   2007-02-13 16:49:02 UTC (rev 206)
+++ trunk/nmwg/schema/rnc/service.rnc   2007-02-13 18:58:37 UTC (rev 207)
@@ -22,12 +22,6 @@
 
 
 # ##############################################################
-# Include additional functionality from other files
-# ############################################################## 
-include "result.rnc"
-
-
-# ##############################################################
 # The service description describes something running at the
 # application layer in most instances.  
 #

Added: trunk/nmwg/schema/rnc/sonar.rnc


Property changes on: trunk/nmwg/schema/rnc/sonar.rnc
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/nmwg/schema/test-instances.sh
===================================================================
--- trunk/nmwg/schema/test-instances.sh 2007-02-13 16:49:02 UTC (rev 206)
+++ trunk/nmwg/schema/test-instances.sh 2007-02-13 18:58:37 UTC (rev 207)
@@ -124,5 +124,13 @@
 $JAVA -jar $MSV -warning $SCHEMA_DIR/snmp.rng $INSTANCE_DIR/snmp.xml
 $JAVA -jar $JING $SCHEMA_DIR/snmp.rng $INSTANCE_DIR/snmp.xml
 
+# test sonar instance
 rm -f rnc/*rng rnc/*xsd
 
+$JAVA -jar $TRANG -I rnc -O rng $SCHEMA_DIR/sonar.rnc $SCHEMA_DIR/sonar.rng
+$JAVA -jar $TRANG -I rng -O xsd $SCHEMA_DIR/sonar.rng $SCHEMA_DIR/sonar.xsd
+#$JAVA -jar $MSV -warning $SCHEMA_DIR/ping.rng $INSTANCE_DIR/ping.xml
+#$JAVA -jar $JING $SCHEMA_DIR/ping.rng $INSTANCE_DIR/ping.xml
+
+rm -f rnc/*rng rnc/*xsd
+