Added version tag to the top of schema files. Added a GNUmakefile in the 0.1...

Added version tag to the top of schema files. Added a GNUmakefile in the 0.1 subdir so that it installs its files to lib/assign. Removed that functionality from rspec GNUmakefile and made it properly recursive. Changed xsdgen to automatically upload schema files to their proper web location on ops.

configure

@@ -2710,6 +2710,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
         protogeni/xmlrpc/GNUmakefile protogeni/lib/GNUmakefile \
         protogeni/scripts/GNUmakefile protogeni/etc/GNUmakefile \
         protogeni/test/GNUmakefile protogeni/rspec/GNUmakefile \
+        protogeni/rspec/0.1/GNUmakefile \
         collab/GNUmakefile \
         collab/trac/GNUmakefile \
         collab/jabber/GNUmakefile \

configure.in

@@ -992,6 +992,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
         protogeni/xmlrpc/GNUmakefile protogeni/lib/GNUmakefile \
         protogeni/scripts/GNUmakefile protogeni/etc/GNUmakefile \
         protogeni/test/GNUmakefile protogeni/rspec/GNUmakefile \
+        protogeni/rspec/0.1/GNUmakefile \
         collab/GNUmakefile \
         collab/trac/GNUmakefile \
         collab/jabber/GNUmakefile \

protogeni/rspec/0.1/ad-common.xsd

@@ -11,6 +11,7 @@
   <!--
     
     Common definitions for advertisements, requests, and tickets
+    Version 0.1
     
   -->
   <xs:element name="node" type="rspec:NodeContents"/>

protogeni/rspec/0.1/ad-top.xsd

@@ -12,6 +12,7 @@
     Definition of common data structures used for representing topologies -
     shared between vtop (virtual topology) and ptop (physical topology)
     formats.
+    Version 0.1
     
   -->
   <xs:element name="node_type">

protogeni/rspec/0.1/ad.rnc

@@ -6,6 +6,7 @@
 
 #
 # Prototype of an advertisement RSpec, to be used by ProtoGENI
+# Version 0.1
 #
 
 default namespace = "http://www.protogeni.net/resources/rspec/0.1"

protogeni/rspec/0.1/ad.xsd

@@ -9,6 +9,7 @@
 <!--
   
   Prototype of an advertisement RSpec, to be used by ProtoGENI
+  Version 0.1
   
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.protogeni.net/resources/rspec/0.1" xmlns:rspec="http://www.protogeni.net/resources/rspec/0.1">

protogeni/rspec/0.1/common.rnc

@@ -6,6 +6,7 @@
 
 #
 # Common definitions for advertisements, requests, and tickets
+# Version 0.1
 #
 
 include "top.rnc" 

protogeni/rspec/0.1/manifest-common.xsd

@@ -11,6 +11,7 @@
   <!--
     
     Common definitions for advertisements, requests, and tickets
+    Version 0.1
     
   -->
   <xs:element name="node" type="rspec:NodeContents"/>

protogeni/rspec/0.1/manifest-request.xsd

@@ -9,6 +9,7 @@
 <!--
   
   Prototype of a request RSpec, to be used by ProtoGENI
+  Version 0.1
   
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.protogeni.net/resources/rspec/0.1" xmlns:rspec="http://www.protogeni.net/resources/rspec/0.1">

protogeni/rspec/0.1/manifest-top.xsd

@@ -12,6 +12,7 @@
     Definition of common data structures used for representing topologies -
     shared between vtop (virtual topology) and ptop (physical topology)
     formats.
+    Version 0.1
     
   -->
   <xs:element name="node_type">

protogeni/rspec/0.1/manifest.rnc

@@ -6,6 +6,7 @@
 
 #
 # Schema for a manifest RSpec, to be used by ProtoGENI
+# Version 0.1
 #
 
 include "request.rnc"

protogeni/rspec/0.1/manifest.xsd

@@ -11,6 +11,7 @@
   <!--
     
     Schema for a manifest RSpec, to be used by ProtoGENI
+    Version 0.1
     
   -->
 </xs:schema>

protogeni/rspec/0.1/request-common.xsd

@@ -11,6 +11,7 @@
   <!--
     
     Common definitions for advertisements, requests, and tickets
+    Version 0.1
     
   -->
   <xs:element name="node" type="rspec:NodeContents"/>

protogeni/rspec/0.1/request-top.xsd

@@ -12,6 +12,7 @@
     Definition of common data structures used for representing topologies -
     shared between vtop (virtual topology) and ptop (physical topology)
     formats.
+    Version 0.1
     
   -->
   <xs:element name="node_type">

protogeni/rspec/0.1/request.rnc

@@ -6,6 +6,7 @@
 
 #
 # Prototype of a request RSpec, to be used by ProtoGENI
+# Version 0.1
 #
 
 default namespace = "http://www.protogeni.net/resources/rspec/0.1"

protogeni/rspec/0.1/request.xsd

@@ -9,6 +9,7 @@
 <!--
   
   Prototype of a request RSpec, to be used by ProtoGENI
+  Version 0.1
   
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.protogeni.net/resources/rspec/0.1" xmlns:rspec="http://www.protogeni.net/resources/rspec/0.1">

protogeni/rspec/0.1/top.rnc

@@ -8,6 +8,7 @@
 # Definition of common data structures used for representing topologies -
 # shared between vtop (virtual topology) and ptop (physical topology)
 # formats.
+# Version 0.1
 #
 
 ## Representation of a single node type

protogeni/rspec/GNUmakefile.in

@@ -11,23 +11,24 @@ SUBDIR		= protogeni/rspec
 
 include $(OBJDIR)/Makeconf
 
-SCHEMATA	= rspec-ad-common.xsd rspec-ad-top.xsd rspec-ad.xsd \
-		  rspec-request-common.xsd rspec-request-top.xsd \
-		  rspec-request.xsd
+SUBDIRS	= 0.1
 
-# No explicit dependencies here.  xsdgen must be run manually if necessary.
-all:
+# xsdgen must be run manually if necessary.
+all: all-subdirs
 
 include $(TESTBED_SRCDIR)/GNUmakerules
 
-install: $(addprefix $(INSTALL_LIBDIR)/assign/, $(SCHEMATA))
+install: 
+	@$(MAKE) -C 0.1 install
 
 control-install:
 
-clean:
-	rm -f *.o core
+clean:		clean-subdirs
 
-$(INSTALL_LIBDIR)/assign/%: %
-	@echo "Installing $<"
-	-mkdir -p $(INSTALL_LIBDIR)/assign
-	$(INSTALL) $< $@
+# How to recursively descend into subdirectories to make general
+# targets such as `all'.
+%.MAKE:
+	@$(MAKE) -C $(dir $@) $(basename $(notdir $@))
+%-subdirs: $(addsuffix /%.MAKE,$(SUBDIRS)) ;
+
+.PHONY:	$(SUBDIRS) install

protogeni/rspec/xsdgen

@@ -40,4 +40,6 @@ for path in 0.1; do
     sed "s/common.xsd/${schema}-common.xsd/" ${path}/${schema}.xsd > ${path}/${schema}.tmp
     mv ${path}/${schema}.tmp ${path}/${schema}.xsd
   done
+
+  sudo scp ${path}/*.xsd ${path}/*.rnc ops.emulab.net:/usr/local/www.geni/data/trac/resources/rspec/${path}/
 done