[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-tutorial-schema into lp:zorba
Chris Hillery has proposed merging lp:~zorba-coders/zorba/fix-tutorial-schema
into lp:zorba.
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix-tutorial-schema/+merge/170582
This fixes tests on the RQ broken by the http://www.zorba-xquery.com/ upgrade.
--
https://code.launchpad.net/~zorba-coders/zorba/fix-tutorial-schema/+merge/170582
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'doc/cxx/examples/uri_resolvers.cpp'
--- doc/cxx/examples/uri_resolvers.cpp 2013-05-28 00:58:27 +
+++ doc/cxx/examples/uri_resolvers.cpp 2013-06-20 11:07:28 +
@@ -41,7 +41,7 @@
return;
}
if(aUri == http://www.zorba-xquery.com/helloworld;) {
- oUris.push_back(http://www.zorba-xquery.com/tutorials/helloworld.xsd;);
+ oUris.push_back(http://zorbatest.lambda.nu:8080/tutorial/helloworld.xsd;);
}
}
};
=== modified file 'doc/zorba/uriresolvers.dox'
--- doc/zorba/uriresolvers.dox 2013-02-07 17:24:36 +
+++ doc/zorba/uriresolvers.dox 2013-06-20 11:07:28 +
@@ -377,7 +377,7 @@
return;
}
if(aUri == http://www.example.com/helloworld;) {
- oUris.push_back(http://examples.com/schemas/helloworld.xsd;);
+ oUris.push_back(http://example.com/schemas/helloworld.xsd;);
}
}
};
=== modified file 'test/api/import-hello.xsd'
--- test/api/import-hello.xsd 2012-04-24 10:17:48 +
+++ test/api/import-hello.xsd 2013-06-20 11:07:28 +
@@ -2,6 +2,6 @@
xmlns=http://www.zorba-xquery.com/import-hello;
targetNamespace=http://www.zorba-xquery.com/import-hello;
elementFormDefault=qualified
- xs:import schemaLocation=http://www.zorba-xquery.com/tutorials/helloworld.xsd/
+ xs:import schemaLocation=http://zorbatest.lambda.nu:8080/tutorial/helloworld.xsd/
/xs:schema
=== modified file 'test/api/userdefined_uri_resolution.cpp'
--- test/api/userdefined_uri_resolution.cpp 2013-02-07 17:24:36 +
+++ test/api/userdefined_uri_resolution.cpp 2013-06-20 11:07:28 +
@@ -46,7 +46,7 @@
return;
}
if(aUri == http://www.zorba-xquery.com/helloworld;) {
- oUris.push_back(http://www.zorba-xquery.com/tutorials/helloworld.xsd;);
+ oUris.push_back(http://zorbatest.lambda.nu:8080/tutorial/helloworld.xsd;);
}
}
};
@@ -84,7 +84,7 @@
std::vectorzorba::String oUris) throw ()
{
// Deny access to an URI that would otherwise work
-if(aUri == http://www.zorba-xquery.com/tutorials/helloworld.xsd; ||
+if(aUri == http://zorbatest.lambda.nu:8080/tutorial/helloworld.xsd; ||
aUri == http://www.zorba-xquery.com/modules/fetch; ||
aUri == http://expath.org/ns/file;) {
oUris.push_back(URIMapper::DENY_ACCESS);
@@ -324,7 +324,7 @@
try {
XQuery_t lQuery = aZorba-compileQuery
(import schema namespace lm=
-'http://www.zorba-xquery.com/tutorials/helloworld.xsd';
+'http://zorbatest.lambda.nu:8080/tutorial/helloworld.xsd';
validate{ pHello World!/p }, lContext);
std::cout lQuery std::endl;
} catch (ZorbaException e) {
=== modified file 'test/api/validate.cpp'
--- test/api/validate.cpp 2013-02-07 17:24:36 +
+++ test/api/validate.cpp 2013-06-20 11:07:28 +
@@ -41,7 +41,7 @@
return;
}
if(aUri == http://www.zorba-xquery.com/helloworld;) {
- oUris.push_back(http://www.zorba-xquery.com/tutorials/helloworld.xsd;);
+ oUris.push_back(http://zorbatest.lambda.nu:8080/tutorial/helloworld.xsd;);
}
}
};
=== added directory 'test/http-test-data/docroot/tutorial'
=== added file 'test/http-test-data/docroot/tutorial/helloworld.xsd'
--- test/http-test-data/docroot/tutorial/helloworld.xsd 1970-01-01 00:00:00 +
+++ test/http-test-data/docroot/tutorial/helloworld.xsd 2013-06-20 11:07:28 +
@@ -0,0 +1,1 @@
+?xml version='1.0'?xsd:schema xmlns:xsd='http://www.w3.org/2001/XMLSchema'xsd:element name='p' type='xsd:string'//xsd:schema
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-tutorial-schema into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix-tutorial-schema/+merge/170582 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-tutorial-schema into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-tutorial-schema into lp:zorba has been updated. Commit Message changed to: Moved tutorial schema into same pool as http-test-data; updated URIs. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-tutorial-schema/+merge/170582 -- https://code.launchpad.net/~zorba-coders/zorba/fix-tutorial-schema/+merge/170582 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-tutorial-schema into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix-tutorial-schema/+merge/170582 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-tutorial-schema into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-tutorial-schema into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-tutorial-schema/+merge/170582 -- https://code.launchpad.net/~zorba-coders/zorba/fix-tutorial-schema/+merge/170582 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-tutorial-schema into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix-tutorial-schema-2013-06-20T11-10-47.267Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fix-tutorial-schema/+merge/170582 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-tutorial-schema into lp:zorba
Validation queue job fix-tutorial-schema-2013-06-20T11-10-47.267Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fix-tutorial-schema/+merge/170582 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-tutorial-schema into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-tutorial-schema into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-tutorial-schema/+merge/170582 -- https://code.launchpad.net/~zorba-coders/zorba/fix-tutorial-schema/+merge/170582 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
