Merge lp:~zorba-coders/zorba/fix-tutorial-schema into lp:zorba

[Chris Hillery]

Moved "tutorial" schema into same pool as http-test-data; updated URIs.

This fixes tests on the RQ broken by the http://www.zorba-xquery.com/ upgrade.

[Chris Hillery (ceejatec)]

review: Approve

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue job fix-tutorial-schema-2013-06-20T11-10-47.267Z is finished. The final status was:

All tests succeeded!

=== modified file 'doc/cxx/examples/uri_resolvers.cpp'
--- doc/cxx/examples/uri_resolvers.cpp	2013-05-28 00:58:27 +0000
+++ doc/cxx/examples/uri_resolvers.cpp	2013-06-20 11:10:32 +0000
@@ -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 +0000
+++ doc/zorba/uriresolvers.dox	2013-06-20 11:10:32 +0000
@@ -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 +0000
+++ test/api/import-hello.xsd	2013-06-20 11:10:32 +0000
@@ -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 +0000
+++ test/api/userdefined_uri_resolution.cpp	2013-06-20 11:10:32 +0000
@@ -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::vector<zorba::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{ <p>Hello 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 +0000
+++ test/api/validate.cpp	2013-06-20 11:10:32 +0000
@@ -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 +0000
+++ test/http-test-data/docroot/tutorial/helloworld.xsd	2013-06-20 11:10:32 +0000
@@ -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>