Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
9349553f
Commit
9349553f
authored
Aug 13, 2010
by
Jonathon Duerig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix accidental double use of any-extension.
parent
a78357c4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
3 deletions
+12
-3
protogeni/rspec/2/manifest-common.xsd
protogeni/rspec/2/manifest-common.xsd
+0
-1
protogeni/rspec/2/request-common.xsd
protogeni/rspec/2/request-common.xsd
+0
-1
protogeni/rspec/2/request.rnc
protogeni/rspec/2/request.rnc
+0
-1
protogeni/rspec/xsdgen
protogeni/rspec/xsdgen
+12
-0
No files found.
protogeni/rspec/2/manifest-common.xsd
View file @
9349553f
...
...
@@ -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>
...
...
protogeni/rspec/2/request-common.xsd
View file @
9349553f
...
...
@@ -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>
...
...
protogeni/rspec/2/request.rnc
View file @
9349553f
...
...
@@ -39,7 +39,6 @@ NodeContents &=
}
ServiceContents &=
AnyExtension &
element install { InstallServiceContents }* &
element execute { ExecuteServiceContents }*
...
...
protogeni/rspec/xsdgen
View file @
9349553f
...
...
@@ -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/
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment