Commit 5bf2b449 authored by Jonathon Duerig's avatar Jonathon Duerig

Replace stitching placeholder URN on discover resources. Fix rspecv3 manifestS

parent b25a5c48
......@@ -2510,9 +2510,12 @@ sub SliverWorkAux($$$$$$$)
$GeniXML::XSI_NS)->pop();
if (defined($schemaLocation) &&
$schemaLocation->nodeType() == XML_ATTRIBUTE_NODE) {
my $requestUrl = $GeniXML::REQUEST_URL;
my $manifestUrl = $GeniXML::MANIFEST_URL;
my $value = $schemaLocation->getValue();
my $requestUrl = $GeniXML::REQUEST_2_URL;
my $manifestUrl = $GeniXML::MANIFEST_2_URL;
$value =~ s/$requestUrl/$manifestUrl/;
$requestUrl = $GeniXML::REQUEST_3_URL;
$manifestUrl = $GeniXML::MANIFEST_3_URL;
$value =~ s/$requestUrl/$manifestUrl/;
$schemaLocation->setValue($value);
}
......
......@@ -32,7 +32,8 @@ use Carp qw(cluck carp);
use vars qw($RSPEC_0_1 $RSPEC_0_2 $RSPEC_2 $RSPEC_3
$RSPEC_0_1_NS $RSPEC_0_2_NS $RSPEC_2_NS
$EMULAB_NS $XSI_NS $STITCH_NS
$REQUEST_URL $MANIFEST_URL);
$REQUEST_2_URL $MANIFEST_2_URL
$REQUEST_3_URL $MANIFEST_3_URL);
$RSPEC_0_1 = "0.1";
$RSPEC_0_2 = "0.2";
$RSPEC_2 = "2";
......@@ -46,8 +47,10 @@ our $EMULAB_NS = "http://www.protogeni.net/resources/rspec/ext/emulab/1";
our $XSI_NS = "http://www.w3.org/2001/XMLSchema-instance";
our $STITCH_NS = "http://hpn.east.isi.edu/rspec/ext/stitch/0.1/";
$REQUEST_URL = "http://www.protogeni.net/resources/rspec/2/request.xsd";
$MANIFEST_URL = "http://www.protogeni.net/resources/rspec/2/manifest.xsd";
$REQUEST_2_URL = "http://www.protogeni.net/resources/rspec/2/request.xsd";
$MANIFEST_2_URL = "http://www.protogeni.net/resources/rspec/2/manifest.xsd";
$REQUEST_3_URL = "http://www.geni.net/resources/rspec/3/request.xsd";
$MANIFEST_3_URL = "http://www.geni.net/resources/rspec/3/manifest.xsd";
# Configure variables
my $TB = "@prefix@";
......
......@@ -32,11 +32,11 @@ $V_3 = "3";
$emulabns = "http://www.protogeni.net/resources/rspec/ext/emulab/1";
# XXX: This needs to be changed
$emulaburl = "http://www.protogeni.net/resources/rspec/ext/emulab/1/ptop_extension.xsd";
$stitchns = "http://company.com/rspec/ext/stitch/1";
$stitchurl = "http://company.com/rspec/ext/stitch/1/ad.xsd";
$stitchns = "http://hpn.east.isi.edu/rspec/ext/stitch/0.1/";
$stitchurl = "http://hpn.east.isi.edu/rspec/ext/stitch/0.1/stitch-schema.xsd";
$stitchxml = <<'STITCH_END';
<stitching xmlns="http://company.com/rspec/ext/stitch/1" lastUpdateTime="20110220:09:30:21">
<stitching xmlns="http://hpn.east.isi.edu/rspec/ext/stitch/0.1/" lastUpdateTime="20110220:09:30:21">
<aggregate id="urn:publicid:IDN+emulab.net+authority+cm" url="https://www.emulab.net/protogeni/xmlrpc/cm">
<aggregatetype>protogeni</aggregatetype>
......
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