Merge branch 'master' of ssh://git.onelab.eu/git/sfa

diff --git a/sfa/rspecs/extensions/ext/sfa/1/planetlab.rnc b/sfa/rspecs/extensions/ext/sfa/1/planetlab.rnc
index f1ff971..f9d7d17 100644 (file)
--- a/sfa/rspecs/extensions/ext/sfa/1/planetlab.rnc
+++ b/sfa/rspecs/extensions/ext/sfa/1/planetlab.rnc
@@ -1,13 +1,18 @@
 #
-## Extension for the "initscript" type for RSpecV2 on PlanetLab
-## Version 1
-##
+# Extensions for PlanetLab Resources
+# Version 1
+#
+
+namespace planetlab = "http://www.planet-lab.org/resources/ext/planetlab/1"
 
-default namespace = "http://www.planet-lab.org/resources/ext/initscript/1"
+InitscriptSpec = element planetlab:initscript {
+    attribute name { text }
+}
 
-Node = element initscript {
-   attribute name { text }
+AttributeSpec = element planetlab:attribute {
+    attribute name { text }, 
+    attribute value { text }
 }
 
-start = Node
+start = InitscriptSpec | AttributeSpec
 

diff --git a/sfa/rspecs/extensions/ext/sfa/1/planetlab.xsd b/sfa/rspecs/extensions/ext/sfa/1/planetlab.xsd
index e862877..f6b2082 100644 (file)
--- a/sfa/rspecs/extensions/ext/sfa/1/planetlab.xsd
+++ b/sfa/rspecs/extensions/ext/sfa/1/planetlab.xsd
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
-   Extension for the "initscript" type for RSpecV2 on PlanetLab
-   Version 1
-
+  
+  Extensions for PlanetLab Resources
+  Version 1
+  
 -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-elementFormDefault="qualified" 
-targetNamespace="http://www.planet-lab.org/resources/sfa/ext/planetlab/1" 
-xmlns:planetlab="http://www.planet-lab.org/resources/sfa/ext/planetlab/1">
-   <xs:element name="initscript">
-     <xs:complexType>
-       <xs:attribute name="name" use="required"/>
-     </xs:complexType>
-   </xs:element>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.planet-lab.org/resources/ext/planetlab/1" xmlns:planetlab="http://www.planet-lab.org/resources/ext/planetlab/1">
+  <xs:element name="initscript">
+    <xs:complexType>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="attribute">
+    <xs:complexType>
+      <xs:attribute name="name" use="required"/>
+      <xs:attribute name="value" use="required"/>
+    </xs:complexType>
+  </xs:element>
 </xs:schema>