Commit 9349553f authored by Jonathon Duerig's avatar Jonathon Duerig

Fix accidental double use of any-extension.

parent a78357c4
......@@ -78,7 +78,6 @@
<xs:element ref="rspec:login"/>
</xs:choice>
<xs:choice>
<xs:group ref="rspec:AnyExtension"/>
<xs:element ref="rspec:install"/>
<xs:element ref="rspec:execute"/>
</xs:choice>
......
......@@ -77,7 +77,6 @@
<xs:element ref="rspec:login"/>
</xs:choice>
<xs:choice>
<xs:group ref="rspec:AnyExtension"/>
<xs:element ref="rspec:install"/>
<xs:element ref="rspec:execute"/>
</xs:choice>
......
......@@ -39,7 +39,6 @@ NodeContents &=
}
ServiceContents &=
AnyExtension &
element install { InstallServiceContents }* &
element execute { ExecuteServiceContents }*
......
......@@ -51,6 +51,16 @@ for path in ext/gre-tunnel/1; do
done
done
# Compile extensions
for path in ext/emulab/1/; do
for schema in top_extension ptop_extension vtop_extension; do
if [ -e ${path}/${schema}.rnc ]; then
$TRANGCMD ${path}/${schema}.rnc ${path}/${schema}.xsd
sudo scp ${path}/${schema}.xsd ${path}/${schema}.rnc ops.emulab.net:/usr/local/www.geni/data/trac/resources/rspec/${path}/
fi
done
done
cd ../security
for path in ext/policy/1; do
......@@ -59,3 +69,5 @@ for path in ext/policy/1; do
sudo scp ${path}/policy.xsd ${path}/policy.rnc ops.emulab.net:/usr/local/www.geni/data/trac/resources/credential/${path}/
fi
done
sudo scp credential.xsd protogeni-rspec-common.xsd top.xsd sig.xsd xml.xsd ops.emulab.net:/usr/local/www.geni/data/trac/resources/credential/
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment