Zorba

Merge lp:~zorba-coders/zorba/bug-1189803 into lp:zorba

  1. bug-1189803
  2. Merge into trunk
Proposed by Luis Rodriguez Gonzalez
Status: Merged
Merged at revision: 11643
Proposed branch: lp:~zorba-coders/zorba/bug-1189803
Merge into: lp:zorba
Diff against target: 811 lines (+92/-77)
48 files modified
doc/zorba/schema_lifecycle.dox (+1/-1)
doc/zorba/xqdoc/images/modules.svg (+13/-13)
doc/zorba/xqdoc/images/modules_new.svg (+13/-13)
modules/CMakeLists.txt (+1/-0)
modules/com/zorba-xquery/www/modules/CMakeLists.txt (+0/-2)
modules/com/zorba-xquery/www/modules/xqdoc.xq (+1/-1)
modules/org/jsoniq/www/functions.xq (+1/-1)
modules/schema/CMakeLists.txt (+16/-0)
modules/schema/schema.xq (+4/-4)
modules/xml/xml.xq (+1/-1)
src/context/static_context.cpp (+1/-1)
src/functions/pregenerated/func_schema.cpp (+3/-3)
src/runtime/spec/mappings.xml (+1/-1)
src/runtime/spec/schema/schema.xml (+1/-1)
src/store/naive/pul_primitives.h (+1/-1)
test/fots_driver/evaluate.xq (+1/-1)
test/rbkt/Queries/zorba/aleXis/q1.xq (+1/-1)
test/rbkt/Queries/zorba/aleXis/q2.xq (+1/-1)
test/rbkt/Queries/zorba/aleXis/q3.xq (+1/-1)
test/rbkt/Queries/zorba/aleXis/q4.xq (+1/-1)
test/rbkt/Queries/zorba/eval/eval_schema2.xq (+2/-2)
test/rbkt/Queries/zorba/index/numbers2.xq (+1/-1)
test/rbkt/Queries/zorba/modules/schema.xq (+1/-1)
test/rbkt/Queries/zorba/schemas/atomic1.xq (+1/-1)
test/rbkt/Queries/zorba/schemas/atomic2.xq (+1/-1)
test/rbkt/Queries/zorba/schemas/is-validated.xq (+1/-1)
test/rbkt/Queries/zorba/schemas/q2.xq (+1/-1)
test/rbkt/Queries/zorba/schemas/val-attInSimpleContent-err.xq (+1/-1)
test/rbkt/Queries/zorba/schemas/val-elmInSimpleContent-err2.xq (+1/-1)
test/rbkt/Queries/zorba/schemas/val-elmInSimpleContent-err3.xq (+1/-1)
test/rbkt/Queries/zorba/schemas/val-inplace-err1.xq (+1/-1)
test/rbkt/Queries/zorba/schemas/val-inplace-err2.xq (+1/-1)
test/rbkt/Queries/zorba/schemas/val-inplace-err3.xq (+1/-1)
test/rbkt/Queries/zorba/schemas/val-inplace-err4.xq (+1/-1)
test/rbkt/Queries/zorba/schemas/val-inplace1.xq (+1/-1)
test/rbkt/Queries/zorba/schemas/val-inplace2.xq (+1/-1)
test/rbkt/Queries/zorba/schemas/val-inplace3.xq (+1/-1)
test/rbkt/Queries/zorba/schemas/val-inplace4.xq (+1/-1)
test/rbkt/Queries/zorba/schemas/val-laxXsiType.xq (+1/-1)
test/rbkt/Queries/zorba/schemas/val-type.xq (+1/-1)
test/rbkt/Queries/zorba/schemas/val-xsiType-noSchemaImport.xq (+1/-1)
test/rbkt/Queries/zorba/string/AnalyzeString/analyze_string10.xq (+1/-1)
test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm (+1/-1)
test/rbkt/Queries/zorba/updates/undo10.xq (+1/-1)
test/rbkt/Queries/zorba/updates/undo11.xq (+1/-1)
test/rbkt/Queries/zorba/updates/undo8.xq (+1/-1)
test/rbkt/Queries/zorba/updates/undo9.xq (+1/-1)
test/rbkt/Queries/zorba/updates/utils.xqlib (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1189803
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Luis Rodriguez Gonzalez Approve
Review via email: mp+184872@code.launchpad.net

Commit message

Updated core "schema" module to Zorba 3.0 standards.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Luis Rodriguez Gonzalez (kuraru) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872

Stage "TestZorbaUbuntu" failed.
1 tests failed (8535 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/309/testReport/ to view the results.

Revision history for this message
Chris Hillery (ceejatec) wrote :

Actually there's a lot more work to be done here - updating test cases, documentation, static_context...

review: Needs Fixing
lp:~zorba-coders/zorba/bug-1189803 updated
11614. By Luis Rodriguez Gonzalez

Extra references to www.zorba-xquery.com/module/schema changed

11615. By Luis Rodriguez Gonzalez

Merged from trunk

11616. By Luis Rodriguez Gonzalez

Merged with main branch

Revision history for this message
Luis Rodriguez Gonzalez (kuraru) wrote :

> Actually there's a lot more work to be done here - updating test cases,
> documentation, static_context...
I changed all ocurrences of the uri except for the ones in Changelog.

Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872

Stage "TestZorbaUbuntu" failed.
98 tests failed (8536 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/325/testReport/ to view the results.

Revision history for this message
Chris Hillery (ceejatec) wrote :

Need to have dependent merge proposals for a number of non-core modules.

review: Needs Fixing
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189803/+merge/184872
https://code.launchpad.net/~zorba-coders/zorba/1189803-html/+merge/187932
https://code.launchpad.net/~zorba-coders/zorba/1189803-geoproj-module/+merge/187939
https://code.launchpad.net/~zorba-coders/zorba/1189803-read-pdf/+merge/187947
https://code.launchpad.net/~zorba-coders/zorba/1189803-csv/+merge/187949
https://code.launchpad.net/~zorba-coders/zorba/1189803-schema-tools/+merge/188235

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/zorba/schema_lifecycle.dox'
2--- doc/zorba/schema_lifecycle.dox 2013-06-19 16:20:47 +0000
3+++ doc/zorba/schema_lifecycle.dox 2013-09-19 14:09:57 +0000
4@@ -98,7 +98,7 @@
5 import schema namespace r = "http://example" at "example.xsd";
6
7 import module namespace file = "http://expath.org/ns/file";
8-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
9+import module namespace schema = "http://zorba.io/modules/schema";
10
11
12 let $untypeDoc := fn:parse-xml(file:read-text("example.xml"))
13
14=== modified file 'doc/zorba/xqdoc/images/modules.svg'
15--- doc/zorba/xqdoc/images/modules.svg 2013-08-13 19:19:44 +0000
16+++ doc/zorba/xqdoc/images/modules.svg 2013-09-19 14:09:57 +0000
17@@ -780,14 +780,14 @@
18 </g>
19 <!-- 13 -->
20 <g id="node208" class="node"><title>13</title>
21-<a xlink:href="../modules_zorba_xquery_data_model_item_Schema.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/schema">
22+<a xlink:href="../modules_zorba_xquery_data_model_item_Schema.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/schema">
23 <ellipse fill="white" stroke="white" cx="1980" cy="-172" rx="37.5442" ry="18"/>
24 <text text-anchor="middle" x="1980" y="-168.3" font-family="Times,serif" font-size="14.00" fill="red">schema</text>
25 </a>
26 </g>
27 <!-- 41&#45;&gt;13 -->
28 <g id="edge194" class="edge"><title>41-&gt;13</title>
29-<a xlink:title="FROM: http://jsoniq.org/functions, TO: http://www.zorba-xquery.com/modules/schema">
30+<a xlink:title="FROM: http://jsoniq.org/functions, TO: http://zorba.io/modules/schema">
31 <path fill="none" stroke="black" d="M185.549,-319.627C259.524,-312.071 418.981,-296.823 554,-291 572.872,-290.186 1897.59,-292.355 1914,-283 1945.09,-265.278 1963.15,-226.471 1972.29,-200.027"/>
32 <polygon fill="black" stroke="black" points="1975.71,-200.82 1975.47,-190.228 1969.06,-198.66 1975.71,-200.82"/>
33 </a>
34@@ -1170,14 +1170,14 @@
35 </g>
36 <!-- 98&#45;&gt;13 -->
37 <g id="edge276" class="edge"><title>98-&gt;13</title>
38-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/converters/csv, TO: http://www.zorba-xquery.com/modules/schema">
39+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/converters/csv, TO: http://zorba.io/modules/schema">
40 <path fill="none" stroke="black" d="M2082.91,-309.533C2075.94,-303.074 2067.08,-295.845 2058,-291 2046.58,-284.906 2039.8,-291.448 2030,-283 2005.11,-261.553 1991.96,-225.174 1985.5,-200.162"/>
41 <polygon fill="black" stroke="black" points="1988.85,-199.131 1983.13,-190.216 1982.04,-200.755 1988.85,-199.131"/>
42 </a>
43 </g>
44 <!-- 49&#45;&gt;13 -->
45 <g id="edge198" class="edge"><title>49-&gt;13</title>
46-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/converters/html, TO: http://www.zorba-xquery.com/modules/schema">
47+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/converters/html, TO: http://zorba.io/modules/schema">
48 <path fill="none" stroke="black" d="M2161.66,-309.029C2154.73,-302.289 2145.68,-294.967 2136,-291 2114.14,-282.045 2049.37,-296.528 2030,-283 2002.64,-263.889 1989.98,-226.053 1984.31,-200.143"/>
49 <polygon fill="black" stroke="black" points="1987.72,-199.326 1982.35,-190.193 1980.85,-200.682 1987.72,-199.326"/>
50 </a>
51@@ -1208,7 +1208,7 @@
52 </g>
53 <!-- 20&#45;&gt;13 -->
54 <g id="edge174" class="edge"><title>20-&gt;13</title>
55-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/converters/json, TO: http://www.zorba-xquery.com/modules/schema">
56+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/converters/json, TO: http://zorba.io/modules/schema">
57 <path fill="none" stroke="black" d="M1945.4,-306.972C1952.13,-280.917 1965.04,-230.922 1973.05,-199.921"/>
58 <polygon fill="black" stroke="black" points="1976.45,-200.755 1975.56,-190.198 1969.67,-199.005 1976.45,-200.755"/>
59 </a>
60@@ -1222,7 +1222,7 @@
61 </g>
62 <!-- 16&#45;&gt;13 -->
63 <g id="edge168" class="edge"><title>16-&gt;13</title>
64-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/xml, TO: http://www.zorba-xquery.com/modules/schema">
65+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/xml, TO: http://zorba.io/modules/schema">
66 <path fill="none" stroke="black" d="M2014.6,-306.972C2007.87,-280.917 1994.96,-230.922 1986.95,-199.921"/>
67 <polygon fill="black" stroke="black" points="1990.33,-199.005 1984.44,-190.198 1983.55,-200.755 1990.33,-199.005"/>
68 </a>
69@@ -1274,7 +1274,7 @@
70 </g>
71 <!-- 70&#45;&gt;13 -->
72 <g id="edge226" class="edge"><title>70-&gt;13</title>
73-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/read-pdf, TO: http://www.zorba-xquery.com/modules/schema">
74+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/read-pdf, TO: http://zorba.io/modules/schema">
75 <path fill="none" stroke="black" d="M5689,-320.454C5607.05,-313.198 5410.92,-296.844 5246,-291 5234.84,-290.605 2039.38,-289.057 2030,-283 2001.81,-264.798 1989.33,-226.395 1983.93,-200.143"/>
76 <polygon fill="black" stroke="black" points="1987.33,-199.272 1982.08,-190.069 1980.44,-200.537 1987.33,-199.272"/>
77 </a>
78@@ -1305,28 +1305,28 @@
79 </g>
80 <!-- 66 -->
81 <g id="node80" class="node"><title>66</title>
82-<a xlink:href="../modules_zorba_data_processing_Schema Tools.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/schema-tools">
83+<a xlink:href="../modules_zorba_data_processing_Schema Tools.html" xlink:title="(External module) module uri=http://zorba.io/modules/schema-tools">
84 <ellipse fill="white" stroke="white" cx="5850" cy="-325" rx="57.2688" ry="18"/>
85 <text text-anchor="middle" x="5850" y="-321.3" font-family="Times,serif" font-size="14.00" fill="green">schema-tools</text>
86 </a>
87 </g>
88 <!-- 66&#45;&gt;13 -->
89 <g id="edge222" class="edge"><title>66-&gt;13</title>
90-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/schema-tools, TO: http://www.zorba-xquery.com/modules/schema">
91+<a xlink:title="FROM: http://zorba.io/modules/schema-tools, TO: http://zorba.io/modules/schema">
92 <path fill="none" stroke="black" d="M5824.72,-308.778C5811.82,-301.887 5795.6,-294.51 5780,-291 5754.59,-285.283 2051.88,-297.122 2030,-283 2001.81,-264.803 1989.32,-226.399 1983.93,-200.145"/>
93 <polygon fill="black" stroke="black" points="1987.33,-199.274 1982.08,-190.07 1980.44,-200.538 1987.33,-199.274"/>
94 </a>
95 </g>
96 <!-- 66&#45;&gt;Apache -->
97 <g id="edge142" class="edge"><title>66-&gt;Apache</title>
98-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/schema-tools, TO: Apache">
99+<a xlink:title="FROM: http://zorba.io/modules/schema-tools, TO: Apache">
100 <path fill="none" stroke="red" d="M5878.08,-309.264C5892.58,-302.404 5910.79,-294.908 5928,-291 5946.66,-286.762 6083.72,-293.042 6100,-283 6166.4,-242.055 6144.55,-196.083 6186,-130 6192.36,-119.857 6199.78,-108.995 6206.43,-99.562"/>
101 <polygon fill="red" stroke="red" points="6209.32,-101.54 6212.26,-91.3629 6203.61,-97.4802 6209.32,-101.54"/>
102 </a>
103 </g>
104 <!-- 66&#45;&gt;JDK -->
105 <g id="edge140" class="edge"><title>66-&gt;JDK</title>
106-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/schema-tools, TO: JDK">
107+<a xlink:title="FROM: http://zorba.io/modules/schema-tools, TO: JDK">
108 <path fill="none" stroke="red" d="M5878.06,-309.18C5892.56,-302.298 5910.77,-294.809 5928,-291 5952.86,-285.504 6136.35,-297.887 6157,-283 6215.87,-240.569 6157.94,-176.079 6214,-130 6231.05,-115.988 6244.13,-133.431 6263,-122 6271.86,-116.633 6279.27,-108.192 6285.02,-99.875"/>
109 <polygon fill="red" stroke="red" points="6288,-101.707 6290.4,-91.3869 6282.09,-97.9593 6288,-101.707"/>
110 </a>
111@@ -1648,7 +1648,7 @@
112 </g>
113 <!-- 57&#45;&gt;13 -->
114 <g id="edge208" class="edge"><title>57-&gt;13</title>
115-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/geoproj, TO: http://www.zorba-xquery.com/modules/schema">
116+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/geoproj, TO: http://zorba.io/modules/schema">
117 <path fill="none" stroke="black" d="M910.556,-309.531C921.313,-302.464 935.239,-294.702 949,-291 974.886,-284.036 1890.73,-296.304 1914,-283 1945.07,-265.241 1963.13,-226.443 1972.28,-200.012"/>
118 <polygon fill="black" stroke="black" points="1975.7,-200.81 1975.46,-190.217 1969.05,-198.647 1975.7,-200.81"/>
119 </a>
120@@ -1996,7 +1996,7 @@
121 </g>
122 <!-- 17&#45;&gt;13 -->
123 <g id="edge172" class="edge"><title>17-&gt;13</title>
124-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/xqdoc, TO: http://www.zorba-xquery.com/modules/schema">
125+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/xqdoc, TO: http://zorba.io/modules/schema">
126 <path fill="none" stroke="black" d="M1198.35,-323.996C1333.91,-323.74 1852.12,-320.312 1914,-283 1944.64,-264.524 1962.82,-225.909 1972.11,-199.713"/>
127 <polygon fill="black" stroke="black" points="1975.5,-200.608 1975.35,-190.014 1968.86,-198.392 1975.5,-200.608"/>
128 </a>
129
130=== modified file 'doc/zorba/xqdoc/images/modules_new.svg'
131--- doc/zorba/xqdoc/images/modules_new.svg 2013-08-14 01:59:33 +0000
132+++ doc/zorba/xqdoc/images/modules_new.svg 2013-09-19 14:09:57 +0000
133@@ -780,14 +780,14 @@
134 </g>
135 <!-- 13 -->
136 <g id="node208" class="node"><title>13</title>
137-<a xlink:href="../modules_zorba_xquery_data_model_item_Schema.html" xlink:title="(Zorba-core) module uri=http://www.zorba-xquery.com/modules/schema">
138+<a xlink:href="../modules_zorba_xquery_data_model_item_Schema.html" xlink:title="(Zorba-core) module uri=http://zorba.io/modules/schema">
139 <ellipse fill="white" stroke="white" cx="1980" cy="-172" rx="37.5442" ry="18"/>
140 <text text-anchor="middle" x="1980" y="-168.3" font-family="Times,serif" font-size="14.00" fill="red">schema</text>
141 </a>
142 </g>
143 <!-- 41&#45;&gt;13 -->
144 <g id="edge194" class="edge"><title>41-&gt;13</title>
145-<a xlink:title="FROM: http://jsoniq.org/functions, TO: http://www.zorba-xquery.com/modules/schema">
146+<a xlink:title="FROM: http://jsoniq.org/functions, TO: http://zorba.io/modules/schema">
147 <path fill="none" stroke="black" d="M185.549,-319.627C259.524,-312.071 418.981,-296.823 554,-291 572.872,-290.186 1897.59,-292.355 1914,-283 1945.09,-265.278 1963.15,-226.471 1972.29,-200.027"/>
148 <polygon fill="black" stroke="black" points="1975.71,-200.82 1975.47,-190.228 1969.06,-198.66 1975.71,-200.82"/>
149 </a>
150@@ -1170,14 +1170,14 @@
151 </g>
152 <!-- 98&#45;&gt;13 -->
153 <g id="edge276" class="edge"><title>98-&gt;13</title>
154-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/converters/csv, TO: http://www.zorba-xquery.com/modules/schema">
155+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/converters/csv, TO: http://zorba.io/modules/schema">
156 <path fill="none" stroke="black" d="M2082.91,-309.533C2075.94,-303.074 2067.08,-295.845 2058,-291 2046.58,-284.906 2039.8,-291.448 2030,-283 2005.11,-261.553 1991.96,-225.174 1985.5,-200.162"/>
157 <polygon fill="black" stroke="black" points="1988.85,-199.131 1983.13,-190.216 1982.04,-200.755 1988.85,-199.131"/>
158 </a>
159 </g>
160 <!-- 49&#45;&gt;13 -->
161 <g id="edge198" class="edge"><title>49-&gt;13</title>
162-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/converters/html, TO: http://www.zorba-xquery.com/modules/schema">
163+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/converters/html, TO: http://zorba.io/modules/schema">
164 <path fill="none" stroke="black" d="M2161.66,-309.029C2154.73,-302.289 2145.68,-294.967 2136,-291 2114.14,-282.045 2049.37,-296.528 2030,-283 2002.64,-263.889 1989.98,-226.053 1984.31,-200.143"/>
165 <polygon fill="black" stroke="black" points="1987.72,-199.326 1982.35,-190.193 1980.85,-200.682 1987.72,-199.326"/>
166 </a>
167@@ -1208,7 +1208,7 @@
168 </g>
169 <!-- 20&#45;&gt;13 -->
170 <g id="edge174" class="edge"><title>20-&gt;13</title>
171-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/converters/json, TO: http://www.zorba-xquery.com/modules/schema">
172+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/converters/json, TO: http://zorba.io/modules/schema">
173 <path fill="none" stroke="black" d="M1945.4,-306.972C1952.13,-280.917 1965.04,-230.922 1973.05,-199.921"/>
174 <polygon fill="black" stroke="black" points="1976.45,-200.755 1975.56,-190.198 1969.67,-199.005 1976.45,-200.755"/>
175 </a>
176@@ -1222,7 +1222,7 @@
177 </g>
178 <!-- 16&#45;&gt;13 -->
179 <g id="edge168" class="edge"><title>16-&gt;13</title>
180-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/xml, TO: http://www.zorba-xquery.com/modules/schema">
181+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/xml, TO: http://zorba.io/modules/schema">
182 <path fill="none" stroke="black" d="M2014.6,-306.972C2007.87,-280.917 1994.96,-230.922 1986.95,-199.921"/>
183 <polygon fill="black" stroke="black" points="1990.33,-199.005 1984.44,-190.198 1983.55,-200.755 1990.33,-199.005"/>
184 </a>
185@@ -1274,7 +1274,7 @@
186 </g>
187 <!-- 70&#45;&gt;13 -->
188 <g id="edge226" class="edge"><title>70-&gt;13</title>
189-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/read-pdf, TO: http://www.zorba-xquery.com/modules/schema">
190+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/read-pdf, TO: http://zorba.io/modules/schema">
191 <path fill="none" stroke="black" d="M5689,-320.454C5607.05,-313.198 5410.92,-296.844 5246,-291 5234.84,-290.605 2039.38,-289.057 2030,-283 2001.81,-264.798 1989.33,-226.395 1983.93,-200.143"/>
192 <polygon fill="black" stroke="black" points="1987.33,-199.272 1982.08,-190.069 1980.44,-200.537 1987.33,-199.272"/>
193 </a>
194@@ -1305,28 +1305,28 @@
195 </g>
196 <!-- 66 -->
197 <g id="node80" class="node"><title>66</title>
198-<a xlink:href="../modules_zorba_data_processing_Schema Tools.html" xlink:title="(External module) module uri=http://www.zorba-xquery.com/modules/schema-tools">
199+<a xlink:href="../modules_zorba_data_processing_Schema Tools.html" xlink:title="(External module) module uri=http://zorba.io/modules/schema-tools">
200 <ellipse fill="white" stroke="white" cx="5850" cy="-325" rx="57.2688" ry="18"/>
201 <text text-anchor="middle" x="5850" y="-321.3" font-family="Times,serif" font-size="14.00" fill="green">schema-tools</text>
202 </a>
203 </g>
204 <!-- 66&#45;&gt;13 -->
205 <g id="edge222" class="edge"><title>66-&gt;13</title>
206-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/schema-tools, TO: http://www.zorba-xquery.com/modules/schema">
207+<a xlink:title="FROM: http://zorba.io/modules/schema-tools, TO: http://zorba.io/modules/schema">
208 <path fill="none" stroke="black" d="M5824.72,-308.778C5811.82,-301.887 5795.6,-294.51 5780,-291 5754.59,-285.283 2051.88,-297.122 2030,-283 2001.81,-264.803 1989.32,-226.399 1983.93,-200.145"/>
209 <polygon fill="black" stroke="black" points="1987.33,-199.274 1982.08,-190.07 1980.44,-200.538 1987.33,-199.274"/>
210 </a>
211 </g>
212 <!-- 66&#45;&gt;Apache -->
213 <g id="edge142" class="edge"><title>66-&gt;Apache</title>
214-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/schema-tools, TO: Apache">
215+<a xlink:title="FROM: http://zorba.io/modules/schema-tools, TO: Apache">
216 <path fill="none" stroke="red" d="M5878.08,-309.264C5892.58,-302.404 5910.79,-294.908 5928,-291 5946.66,-286.762 6083.72,-293.042 6100,-283 6166.4,-242.055 6144.55,-196.083 6186,-130 6192.36,-119.857 6199.78,-108.995 6206.43,-99.562"/>
217 <polygon fill="red" stroke="red" points="6209.32,-101.54 6212.26,-91.3629 6203.61,-97.4802 6209.32,-101.54"/>
218 </a>
219 </g>
220 <!-- 66&#45;&gt;JDK -->
221 <g id="edge140" class="edge"><title>66-&gt;JDK</title>
222-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/schema-tools, TO: JDK">
223+<a xlink:title="FROM: http://zorba.io/modules/schema-tools, TO: JDK">
224 <path fill="none" stroke="red" d="M5878.06,-309.18C5892.56,-302.298 5910.77,-294.809 5928,-291 5952.86,-285.504 6136.35,-297.887 6157,-283 6215.87,-240.569 6157.94,-176.079 6214,-130 6231.05,-115.988 6244.13,-133.431 6263,-122 6271.86,-116.633 6279.27,-108.192 6285.02,-99.875"/>
225 <polygon fill="red" stroke="red" points="6288,-101.707 6290.4,-91.3869 6282.09,-97.9593 6288,-101.707"/>
226 </a>
227@@ -1648,7 +1648,7 @@
228 </g>
229 <!-- 57&#45;&gt;13 -->
230 <g id="edge208" class="edge"><title>57-&gt;13</title>
231-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/geoproj, TO: http://www.zorba-xquery.com/modules/schema">
232+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/geoproj, TO: http://zorba.io/modules/schema">
233 <path fill="none" stroke="black" d="M910.556,-309.531C921.313,-302.464 935.239,-294.702 949,-291 974.886,-284.036 1890.73,-296.304 1914,-283 1945.07,-265.241 1963.13,-226.443 1972.28,-200.012"/>
234 <polygon fill="black" stroke="black" points="1975.7,-200.81 1975.46,-190.217 1969.05,-198.647 1975.7,-200.81"/>
235 </a>
236@@ -1996,7 +1996,7 @@
237 </g>
238 <!-- 17&#45;&gt;13 -->
239 <g id="edge172" class="edge"><title>17-&gt;13</title>
240-<a xlink:title="FROM: http://www.zorba-xquery.com/modules/xqdoc, TO: http://www.zorba-xquery.com/modules/schema">
241+<a xlink:title="FROM: http://www.zorba-xquery.com/modules/xqdoc, TO: http://zorba.io/modules/schema">
242 <path fill="none" stroke="black" d="M1198.35,-323.996C1333.91,-323.74 1852.12,-320.312 1914,-283 1944.64,-264.524 1962.82,-225.909 1972.11,-199.713"/>
243 <polygon fill="black" stroke="black" points="1975.5,-200.608 1975.35,-190.014 1968.86,-198.392 1975.5,-200.608"/>
244 </a>
245
246=== modified file 'modules/CMakeLists.txt'
247--- modules/CMakeLists.txt 2013-09-09 23:47:17 +0000
248+++ modules/CMakeLists.txt 2013-09-19 14:09:57 +0000
249@@ -25,6 +25,7 @@
250 ADD_SUBDIRECTORY(json)
251 ADD_SUBDIRECTORY(structured-items)
252 ADD_SUBDIRECTORY(item)
253+ADD_SUBDIRECTORY(schema)
254
255
256 # Add external module projects - any subdirectories of a directory
257
258=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
259--- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-09-02 20:43:22 +0000
260+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-09-19 14:09:57 +0000
261@@ -19,8 +19,6 @@
262 URI "http://www.zorba-xquery.com/modules/fetch")
263 DECLARE_ZORBA_MODULE(FILE reflection.xq VERSION 2.0
264 URI "http://www.zorba-xquery.com/modules/reflection")
265-DECLARE_ZORBA_MODULE(FILE schema.xq VERSION 2.0
266- URI "http://www.zorba-xquery.com/modules/schema")
267 DECLARE_ZORBA_MODULE(FILE uri.xq VERSION 1.0
268 URI "http://www.zorba-xquery.com/modules/uri")
269 DECLARE_ZORBA_MODULE(FILE xqdoc.xq VERSION 2.0
270
271=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc.xq'
272--- modules/com/zorba-xquery/www/modules/xqdoc.xq 2013-08-09 08:27:30 +0000
273+++ modules/com/zorba-xquery/www/modules/xqdoc.xq 2013-09-19 14:09:57 +0000
274@@ -62,7 +62,7 @@
275 module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";
276
277 import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
278-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
279+import module namespace schema = "http://zorba.io/modules/schema";
280
281 import schema namespace opt =
282 "http://www.zorba-xquery.com/modules/xqdoc-options";
283
284=== modified file 'modules/org/jsoniq/www/functions.xq'
285--- modules/org/jsoniq/www/functions.xq 2013-08-16 13:00:06 +0000
286+++ modules/org/jsoniq/www/functions.xq 2013-09-19 14:09:57 +0000
287@@ -31,7 +31,7 @@
288 :)
289 module namespace jn = "http://jsoniq.org/functions";
290
291-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
292+import module namespace schema = "http://zorba.io/modules/schema";
293
294 declare namespace err = "http://www.w3.org/2005/xqt-errors";
295 declare namespace jerr = "http://jsoniq.org/errors";
296
297=== added directory 'modules/schema'
298=== added file 'modules/schema/CMakeLists.txt'
299--- modules/schema/CMakeLists.txt 1970-01-01 00:00:00 +0000
300+++ modules/schema/CMakeLists.txt 2013-09-19 14:09:57 +0000
301@@ -0,0 +1,16 @@
302+# Copyright 2013 The FLWOR Foundation.
303+#
304+# Licensed under the Apache License, Version 2.0 (the "License");
305+# you may not use this file except in compliance with the License.
306+# You may obtain a copy of the License at
307+#
308+# http://www.apache.org/licenses/LICENSE-2.0
309+#
310+# Unless required by applicable law or agreed to in writing, software
311+# distributed under the License is distributed on an "AS IS" BASIS,
312+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
313+# See the License for the specific language governing permissions and
314+# limitations under the License.
315+
316+DECLARE_ZORBA_MODULE(FILE schema.xq VERSION 1.0
317+ URI "http://zorba.io/modules/schema")
318
319=== renamed file 'modules/com/zorba-xquery/www/modules/schema.xq' => 'modules/schema/schema.xq'
320--- modules/com/zorba-xquery/www/modules/schema.xq 2013-08-09 08:27:30 +0000
321+++ modules/schema/schema.xq 2013-09-19 14:09:57 +0000
322@@ -1,4 +1,4 @@
323-xquery version "1.0";
324+xquery version "3.0";
325
326 (:
327 : Copyright 2006-2009 The FLWOR Foundation.
328@@ -24,9 +24,9 @@
329 : @project Zorba/XQuery Data Model/Item/Schema
330 :
331 :)
332-module namespace schema = "http://www.zorba-xquery.com/modules/schema";
333+module namespace schema = "http://zorba.io/modules/schema";
334 declare namespace ver = "http://zorba.io/options/versioning";
335-declare option ver:module-version "2.0";
336+declare option ver:module-version "1.0";
337
338 (:~
339 : This function returns the name of the type of the item passed
340@@ -40,7 +40,7 @@
341 ) as xs:QName? external;
342
343 (:~
344- : This function returns true if the given node has need validated,
345+ : This function returns true if the given node has been validated,
346 : and false otherwise.
347 :
348 : @param $node the node item that should be checked for validation
349
350=== modified file 'modules/xml/xml.xq'
351--- modules/xml/xml.xq 2013-08-09 08:27:30 +0000
352+++ modules/xml/xml.xq 2013-09-19 14:09:57 +0000
353@@ -69,7 +69,7 @@
354 :
355 :)
356 module namespace x = "http://zorba.io/modules/xml";
357-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
358+import module namespace schema = "http://zorba.io/modules/schema";
359
360 import schema namespace opt = "http://zorba.io/modules/xml-options";
361
362
363=== modified file 'src/context/static_context.cpp'
364--- src/context/static_context.cpp 2013-09-17 23:05:29 +0000
365+++ src/context/static_context.cpp 2013-09-19 14:09:57 +0000
366@@ -423,7 +423,7 @@
367
368 const char*
369 static_context::ZORBA_SCHEMA_FN_NS =
370-"http://www.zorba-xquery.com/modules/schema";
371+"http://zorba.io/modules/schema";
372
373 const char*
374 static_context::ZORBA_XQDOC_FN_NS =
375
376=== modified file 'src/functions/pregenerated/func_schema.cpp'
377--- src/functions/pregenerated/func_schema.cpp 2013-03-05 23:11:50 +0000
378+++ src/functions/pregenerated/func_schema.cpp 2013-09-19 14:09:57 +0000
379@@ -67,7 +67,7 @@
380
381 {
382 DECL_WITH_KIND(sctx, fn_zorba_schema_validate_in_place,
383- (createQName("http://www.zorba-xquery.com/modules/schema","","validate-in-place"),
384+ (createQName("http://zorba.io/modules/schema","","validate-in-place"),
385 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
386 GENV_TYPESYSTEM.EMPTY_TYPE),
387 FunctionConsts::FN_ZORBA_SCHEMA_VALIDATE_IN_PLACE_1);
388@@ -79,7 +79,7 @@
389
390 {
391 DECL_WITH_KIND(sctx, fn_zorba_schema_schema_type,
392- (createQName("http://www.zorba-xquery.com/modules/schema","","schema-type"),
393+ (createQName("http://zorba.io/modules/schema","","schema-type"),
394 GENV_TYPESYSTEM.ITEM_TYPE_ONE,
395 GENV_TYPESYSTEM.QNAME_TYPE_QUESTION),
396 FunctionConsts::FN_ZORBA_SCHEMA_SCHEMA_TYPE_1);
397@@ -91,7 +91,7 @@
398
399 {
400 DECL_WITH_KIND(sctx, fn_zorba_schema_is_validated,
401- (createQName("http://www.zorba-xquery.com/modules/schema","","is-validated"),
402+ (createQName("http://zorba.io/modules/schema","","is-validated"),
403 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
404 GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
405 FunctionConsts::FN_ZORBA_SCHEMA_IS_VALIDATED_1);
406
407=== modified file 'src/runtime/spec/mappings.xml'
408--- src/runtime/spec/mappings.xml 2013-09-09 23:47:17 +0000
409+++ src/runtime/spec/mappings.xml 2013-09-19 14:09:57 +0000
410@@ -28,7 +28,7 @@
411 define="ZORBA_NODEPOS_FN_NS"
412 prefix="fn-zorba-pos"/>
413
414- <zorba:namespace uri="http://www.zorba-xquery.com/modules/schema"
415+ <zorba:namespace uri="http://zorba.io/modules/schema"
416 define="ZORBA_SCHEMA_FN_NS"
417 prefix="fn-zorba-schema"/>
418
419
420=== modified file 'src/runtime/spec/schema/schema.xml'
421--- src/runtime/spec/schema/schema.xml 2013-02-07 17:24:36 +0000
422+++ src/runtime/spec/schema/schema.xml 2013-09-19 14:09:57 +0000
423@@ -17,7 +17,7 @@
424 <!--
425 /*******************************************************************************
426 This file describes the implementation of module:
427- module namespace schema = "http://www.zorba-xquery.com/modules/schema";
428+ module namespace schema = "http://zorba.io/modules/schema";
429 modules/com/zorba-xquery/www/modules/schema.xq
430 ********************************************************************************/
431 -->
432
433=== modified file 'src/store/naive/pul_primitives.h'
434--- src/store/naive/pul_primitives.h 2013-08-01 12:34:23 +0000
435+++ src/store/naive/pul_primitives.h 2013-09-19 14:09:57 +0000
436@@ -813,7 +813,7 @@
437
438 /*******************************************************************************
439 This primitive is generated by the validate-in-place function (in module
440- http://www.zorba-xquery.com/modules/schema)
441+ http://zorba.io/modules/schema)
442 ********************************************************************************/
443 class UpdRevalidate : public UpdatePrimitive
444 {
445
446=== modified file 'test/fots_driver/evaluate.xq'
447--- test/fots_driver/evaluate.xq 2013-08-13 19:19:44 +0000
448+++ test/fots_driver/evaluate.xq 2013-09-19 14:09:57 +0000
449@@ -29,7 +29,7 @@
450 "http://zorba.io/modules/zorba-query";
451
452 import module namespace schema =
453- "http://www.zorba-xquery.com/modules/schema";
454+ "http://zorba.io/modules/schema";
455
456 import module namespace fots-err =
457 "http://www.zorba-xquery.com/fots-driver/errors" at "errors.xq";
458
459=== modified file 'test/rbkt/Queries/zorba/aleXis/q1.xq'
460--- test/rbkt/Queries/zorba/aleXis/q1.xq 2013-02-07 17:24:36 +0000
461+++ test/rbkt/Queries/zorba/aleXis/q1.xq 2013-09-19 14:09:57 +0000
462@@ -1,2 +1,2 @@
463-import module namespace schema ="http://www.zorba-xquery.com/modules/schema";
464+import module namespace schema ="http://zorba.io/modules/schema";
465 schema:schema-type(1)
466
467=== modified file 'test/rbkt/Queries/zorba/aleXis/q2.xq'
468--- test/rbkt/Queries/zorba/aleXis/q2.xq 2013-02-07 17:24:36 +0000
469+++ test/rbkt/Queries/zorba/aleXis/q2.xq 2013-09-19 14:09:57 +0000
470@@ -1,2 +1,2 @@
471-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
472+import module namespace schema = "http://zorba.io/modules/schema";
473 schema:schema-type("test")
474
475=== modified file 'test/rbkt/Queries/zorba/aleXis/q3.xq'
476--- test/rbkt/Queries/zorba/aleXis/q3.xq 2013-02-07 17:24:36 +0000
477+++ test/rbkt/Queries/zorba/aleXis/q3.xq 2013-09-19 14:09:57 +0000
478@@ -1,2 +1,2 @@
479-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
480+import module namespace schema = "http://zorba.io/modules/schema";
481 fn:local-name-from-QName(schema:schema-type("test"))
482
483=== modified file 'test/rbkt/Queries/zorba/aleXis/q4.xq'
484--- test/rbkt/Queries/zorba/aleXis/q4.xq 2013-02-07 17:24:36 +0000
485+++ test/rbkt/Queries/zorba/aleXis/q4.xq 2013-09-19 14:09:57 +0000
486@@ -1,2 +1,2 @@
487-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
488+import module namespace schema = "http://zorba.io/modules/schema";
489 fn:prefix-from-QName(schema:schema-type("test"))
490
491=== modified file 'test/rbkt/Queries/zorba/eval/eval_schema2.xq'
492--- test/rbkt/Queries/zorba/eval/eval_schema2.xq 2013-02-07 17:24:36 +0000
493+++ test/rbkt/Queries/zorba/eval/eval_schema2.xq 2013-09-19 14:09:57 +0000
494@@ -1,4 +1,4 @@
495-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
496+import module namespace schema = "http://zorba.io/modules/schema";
497
498 import module namespace refl = "http://www.zorba-xquery.com/modules/reflection";
499
500@@ -10,7 +10,7 @@
501 refl:eval
502 (
503 '
504-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
505+import module namespace schema = "http://zorba.io/modules/schema";
506
507 import schema namespace a ="http://www.w3.org/XQueryTest" at "../schemas/atomic.xsd";
508
509
510=== modified file 'test/rbkt/Queries/zorba/index/numbers2.xq'
511--- test/rbkt/Queries/zorba/index/numbers2.xq 2012-07-12 16:34:26 +0000
512+++ test/rbkt/Queries/zorba/index/numbers2.xq 2013-09-19 14:09:57 +0000
513@@ -7,7 +7,7 @@
514
515 declare namespace err = "http://www.w3.org/2005/xqt-errors";
516
517-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
518+import module namespace schema = "http://zorba.io/modules/schema";
519
520 import schema namespace s = "http://www.zorba-xquery.com/numbers.xsd" at "numbers.xsd";
521
522
523=== modified file 'test/rbkt/Queries/zorba/modules/schema.xq'
524--- test/rbkt/Queries/zorba/modules/schema.xq 2013-02-07 17:24:36 +0000
525+++ test/rbkt/Queries/zorba/modules/schema.xq 2013-09-19 14:09:57 +0000
526@@ -1,6 +1,6 @@
527 (: test schema-type function with every node type :)
528
529-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
530+import module namespace schema = "http://zorba.io/modules/schema";
531
532 import schema namespace data = "http://www.zorba-xquery.com/schema/test/data" at "schema.xsd";
533
534
535=== modified file 'test/rbkt/Queries/zorba/schemas/atomic1.xq'
536--- test/rbkt/Queries/zorba/schemas/atomic1.xq 2013-02-07 17:24:36 +0000
537+++ test/rbkt/Queries/zorba/schemas/atomic1.xq 2013-09-19 14:09:57 +0000
538@@ -1,5 +1,5 @@
539
540-import module namespace fn-zorba-util = "http://www.zorba-xquery.com/modules/schema";
541+import module namespace fn-zorba-util = "http://zorba.io/modules/schema";
542 import schema default element namespace "http://www.w3.org/XQueryTest" at "atomic.xsd";
543
544 declare variable $doc as document-node(element(root)) external;
545
546=== modified file 'test/rbkt/Queries/zorba/schemas/atomic2.xq'
547--- test/rbkt/Queries/zorba/schemas/atomic2.xq 2013-02-07 17:24:36 +0000
548+++ test/rbkt/Queries/zorba/schemas/atomic2.xq 2013-09-19 14:09:57 +0000
549@@ -1,5 +1,5 @@
550
551-import module namespace fn-zorba-util = "http://www.zorba-xquery.com/modules/schema";
552+import module namespace fn-zorba-util = "http://zorba.io/modules/schema";
553 import schema default element namespace "http://www.w3.org/XQueryTest" at "atomic.xsd";
554
555 declare variable $doc as document-node(element(root)) external;
556
557=== modified file 'test/rbkt/Queries/zorba/schemas/is-validated.xq'
558--- test/rbkt/Queries/zorba/schemas/is-validated.xq 2013-08-09 08:27:30 +0000
559+++ test/rbkt/Queries/zorba/schemas/is-validated.xq 2013-09-19 14:09:57 +0000
560@@ -1,6 +1,6 @@
561 import schema namespace s = "http://www.zorba-xquery.org/schema" at "simple2.xsd";
562
563-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
564+import module namespace schema = "http://zorba.io/modules/schema";
565
566 declare namespace ann = "http://zorba.io/annotations";
567
568
569=== modified file 'test/rbkt/Queries/zorba/schemas/q2.xq'
570--- test/rbkt/Queries/zorba/schemas/q2.xq 2013-02-07 17:24:36 +0000
571+++ test/rbkt/Queries/zorba/schemas/q2.xq 2013-09-19 14:09:57 +0000
572@@ -1,5 +1,5 @@
573
574-import module namespace fn-zorba-util = "http://www.zorba-xquery.com/modules/schema";
575+import module namespace fn-zorba-util = "http://zorba.io/modules/schema";
576 import schema default element namespace "http://ns.example.com/books" at "books.xsd";
577
578 declare variable $books as document-node(element(BOOKLIST)) external;
579
580=== modified file 'test/rbkt/Queries/zorba/schemas/val-attInSimpleContent-err.xq'
581--- test/rbkt/Queries/zorba/schemas/val-attInSimpleContent-err.xq 2012-01-06 13:27:06 +0000
582+++ test/rbkt/Queries/zorba/schemas/val-attInSimpleContent-err.xq 2013-09-19 14:09:57 +0000
583@@ -1,5 +1,5 @@
584 import schema namespace d="http://www.zorba-xquery.org/schema" at "extracontent.xsd";
585-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
586+import module namespace schema = "http://zorba.io/modules/schema";
587
588 declare revalidation lax;
589
590
591=== modified file 'test/rbkt/Queries/zorba/schemas/val-elmInSimpleContent-err2.xq'
592--- test/rbkt/Queries/zorba/schemas/val-elmInSimpleContent-err2.xq 2012-01-06 13:27:06 +0000
593+++ test/rbkt/Queries/zorba/schemas/val-elmInSimpleContent-err2.xq 2013-09-19 14:09:57 +0000
594@@ -1,5 +1,5 @@
595 import schema namespace d="http://www.zorba-xquery.org/schema" at "extracontent.xsd";
596-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
597+import module namespace schema = "http://zorba.io/modules/schema";
598
599 declare revalidation lax;
600
601
602=== modified file 'test/rbkt/Queries/zorba/schemas/val-elmInSimpleContent-err3.xq'
603--- test/rbkt/Queries/zorba/schemas/val-elmInSimpleContent-err3.xq 2012-01-06 13:27:06 +0000
604+++ test/rbkt/Queries/zorba/schemas/val-elmInSimpleContent-err3.xq 2013-09-19 14:09:57 +0000
605@@ -1,5 +1,5 @@
606 import schema namespace d="http://www.zorba-xquery.org/schema" at "extracontent.xsd";
607-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
608+import module namespace schema = "http://zorba.io/modules/schema";
609
610 declare revalidation lax;
611
612
613=== modified file 'test/rbkt/Queries/zorba/schemas/val-inplace-err1.xq'
614--- test/rbkt/Queries/zorba/schemas/val-inplace-err1.xq 2013-02-07 17:24:36 +0000
615+++ test/rbkt/Queries/zorba/schemas/val-inplace-err1.xq 2013-09-19 14:09:57 +0000
616@@ -1,4 +1,4 @@
617-import module namespace v = "http://www.zorba-xquery.com/modules/schema";
618+import module namespace v = "http://zorba.io/modules/schema";
619
620 import schema namespace s = "http://www.w3.org/XQueryTest/val-inplace"
621 at "val-inplace.xsd";
622
623=== modified file 'test/rbkt/Queries/zorba/schemas/val-inplace-err2.xq'
624--- test/rbkt/Queries/zorba/schemas/val-inplace-err2.xq 2012-01-06 00:13:42 +0000
625+++ test/rbkt/Queries/zorba/schemas/val-inplace-err2.xq 2013-09-19 14:09:57 +0000
626@@ -1,4 +1,4 @@
627-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
628+import module namespace schema = "http://zorba.io/modules/schema";
629 import module namespace doc = "http://www.zorba-xquery.com/modules/store/dynamic/documents";
630 import schema namespace d="http://www.zorba-xquery.org/schema" at "val-inplace-err2.xsd";
631
632
633=== modified file 'test/rbkt/Queries/zorba/schemas/val-inplace-err3.xq'
634--- test/rbkt/Queries/zorba/schemas/val-inplace-err3.xq 2012-01-06 13:27:06 +0000
635+++ test/rbkt/Queries/zorba/schemas/val-inplace-err3.xq 2013-09-19 14:09:57 +0000
636@@ -1,5 +1,5 @@
637 import schema namespace d="http://www.zorba-xquery.org/schema" at "extracontent.xsd";
638-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
639+import module namespace schema = "http://zorba.io/modules/schema";
640
641 declare revalidation lax;
642
643
644=== modified file 'test/rbkt/Queries/zorba/schemas/val-inplace-err4.xq'
645--- test/rbkt/Queries/zorba/schemas/val-inplace-err4.xq 2012-01-06 13:27:06 +0000
646+++ test/rbkt/Queries/zorba/schemas/val-inplace-err4.xq 2013-09-19 14:09:57 +0000
647@@ -1,5 +1,5 @@
648 import schema namespace d="http://www.zorba-xquery.org/schema" at "extracontent.xsd";
649-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
650+import module namespace schema = "http://zorba.io/modules/schema";
651
652 declare revalidation lax;
653
654
655=== modified file 'test/rbkt/Queries/zorba/schemas/val-inplace1.xq'
656--- test/rbkt/Queries/zorba/schemas/val-inplace1.xq 2013-02-07 17:24:36 +0000
657+++ test/rbkt/Queries/zorba/schemas/val-inplace1.xq 2013-09-19 14:09:57 +0000
658@@ -1,4 +1,4 @@
659-import module namespace v = "http://www.zorba-xquery.com/modules/schema";
660+import module namespace v = "http://zorba.io/modules/schema";
661
662 import schema namespace s = "http://www.w3.org/XQueryTest/val-inplace"
663 at "val-inplace.xsd";
664
665=== modified file 'test/rbkt/Queries/zorba/schemas/val-inplace2.xq'
666--- test/rbkt/Queries/zorba/schemas/val-inplace2.xq 2013-02-07 17:24:36 +0000
667+++ test/rbkt/Queries/zorba/schemas/val-inplace2.xq 2013-09-19 14:09:57 +0000
668@@ -1,4 +1,4 @@
669-import module namespace v = "http://www.zorba-xquery.com/modules/schema";
670+import module namespace v = "http://zorba.io/modules/schema";
671
672 import schema namespace s = "http://www.w3.org/XQueryTest/val-inplace"
673 at "val-inplace.xsd";
674
675=== modified file 'test/rbkt/Queries/zorba/schemas/val-inplace3.xq'
676--- test/rbkt/Queries/zorba/schemas/val-inplace3.xq 2013-02-07 17:24:36 +0000
677+++ test/rbkt/Queries/zorba/schemas/val-inplace3.xq 2013-09-19 14:09:57 +0000
678@@ -1,4 +1,4 @@
679-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
680+import module namespace schema = "http://zorba.io/modules/schema";
681 import schema namespace d="http://www.example.com/doc" at "val-inplace3.xsd";
682 import module namespace file = "http://expath.org/ns/file";
683 declare revalidation lax;
684
685=== modified file 'test/rbkt/Queries/zorba/schemas/val-inplace4.xq'
686--- test/rbkt/Queries/zorba/schemas/val-inplace4.xq 2013-02-07 17:24:36 +0000
687+++ test/rbkt/Queries/zorba/schemas/val-inplace4.xq 2013-09-19 14:09:57 +0000
688@@ -1,4 +1,4 @@
689-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
690+import module namespace schema = "http://zorba.io/modules/schema";
691 import schema namespace d="http://www.example.com/doc" at "val-inplace4.xsd";
692 import module namespace file = "http://expath.org/ns/file";
693 declare revalidation lax;
694
695=== modified file 'test/rbkt/Queries/zorba/schemas/val-laxXsiType.xq'
696--- test/rbkt/Queries/zorba/schemas/val-laxXsiType.xq 2013-02-01 20:50:07 +0000
697+++ test/rbkt/Queries/zorba/schemas/val-laxXsiType.xq 2013-09-19 14:09:57 +0000
698@@ -1,4 +1,4 @@
699-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
700+import module namespace schema = "http://zorba.io/modules/schema";
701
702 declare variable $doc :=
703 <numbers xmlns:xs="http://www.w3.org/2001/XMLSchema"
704
705=== modified file 'test/rbkt/Queries/zorba/schemas/val-type.xq'
706--- test/rbkt/Queries/zorba/schemas/val-type.xq 2013-02-07 17:24:36 +0000
707+++ test/rbkt/Queries/zorba/schemas/val-type.xq 2013-09-19 14:09:57 +0000
708@@ -1,5 +1,5 @@
709 import module namespace
710- fn-zorba-util="http://www.zorba-xquery.com/modules/schema";
711+ fn-zorba-util="http://zorba.io/modules/schema";
712
713 import schema namespace
714 s = "http://www.zorba-xquery.com/simple.xsd"
715
716=== modified file 'test/rbkt/Queries/zorba/schemas/val-xsiType-noSchemaImport.xq'
717--- test/rbkt/Queries/zorba/schemas/val-xsiType-noSchemaImport.xq 2013-02-07 17:24:36 +0000
718+++ test/rbkt/Queries/zorba/schemas/val-xsiType-noSchemaImport.xq 2013-09-19 14:09:57 +0000
719@@ -1,4 +1,4 @@
720-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
721+import module namespace schema = "http://zorba.io/modules/schema";
722
723 schema:schema-type(
724 data(
725
726=== modified file 'test/rbkt/Queries/zorba/string/AnalyzeString/analyze_string10.xq'
727--- test/rbkt/Queries/zorba/string/AnalyzeString/analyze_string10.xq 2013-02-07 17:24:36 +0000
728+++ test/rbkt/Queries/zorba/string/AnalyzeString/analyze_string10.xq 2013-09-19 14:09:57 +0000
729@@ -1,5 +1,5 @@
730
731-import module namespace zorba-schema = "http://www.zorba-xquery.com/modules/schema";
732+import module namespace zorba-schema = "http://zorba.io/modules/schema";
733 import schema namespace xp = "http://www.w3.org/2005/xpath-functions";
734
735 let $result := fn:analyze-string(
736
737=== modified file 'test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm'
738--- test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm 2013-08-09 08:27:30 +0000
739+++ test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm 2013-09-19 14:09:57 +0000
740@@ -158,7 +158,7 @@
741 <span>item</span>
742 <ul>
743 <li>
744- <a href="www.zorba-xquery.com_modules_schema.html" title="http://www.zorba-xquery.com/modules/schema">schema</a>
745+ <a href="www.zorba-xquery.com_modules_schema.html" title="http://zorba.io/modules/schema">schema</a>
746 <sup>
747 <a href="http://www.w3.org/TR/xquery-30/#dt-external-function" target="_blank" title="There are external functions (either private or public) declared in this module.">(E)</a>
748 </sup>
749
750=== modified file 'test/rbkt/Queries/zorba/updates/undo10.xq'
751--- test/rbkt/Queries/zorba/updates/undo10.xq 2013-02-07 17:24:36 +0000
752+++ test/rbkt/Queries/zorba/updates/undo10.xq 2013-09-19 14:09:57 +0000
753@@ -2,7 +2,7 @@
754 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";
755 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
756 import module namespace ic_ddl = "http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl";
757-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
758+import module namespace schema = "http://zorba.io/modules/schema";
759 import module namespace u = "http://www.zorba-xquery.com/test/undo/utils" at "utils.xqlib";
760 import schema namespace s="http://www.zorba-xquery.org/schema" at "subst.xsd";
761
762
763=== modified file 'test/rbkt/Queries/zorba/updates/undo11.xq'
764--- test/rbkt/Queries/zorba/updates/undo11.xq 2013-02-07 17:24:36 +0000
765+++ test/rbkt/Queries/zorba/updates/undo11.xq 2013-09-19 14:09:57 +0000
766@@ -2,7 +2,7 @@
767 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";
768 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
769 import module namespace ic_ddl = "http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl";
770-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
771+import module namespace schema = "http://zorba.io/modules/schema";
772 import module namespace u = "http://www.zorba-xquery.com/test/undo/utils" at "utils.xqlib";
773 import schema namespace s="http://www.zorba-xquery.org/schema" at "shiporder.xsd";
774
775
776=== modified file 'test/rbkt/Queries/zorba/updates/undo8.xq'
777--- test/rbkt/Queries/zorba/updates/undo8.xq 2013-02-07 17:24:36 +0000
778+++ test/rbkt/Queries/zorba/updates/undo8.xq 2013-09-19 14:09:57 +0000
779@@ -2,7 +2,7 @@
780 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";
781 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
782 import module namespace ic_ddl = "http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl";
783-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
784+import module namespace schema = "http://zorba.io/modules/schema";
785 import module namespace u = "http://www.zorba-xquery.com/test/undo/utils" at "utils.xqlib";
786 import schema namespace s="http://www.zorba-xquery.org/schema" at "shiporder.xsd";
787
788
789=== modified file 'test/rbkt/Queries/zorba/updates/undo9.xq'
790--- test/rbkt/Queries/zorba/updates/undo9.xq 2013-02-07 17:24:36 +0000
791+++ test/rbkt/Queries/zorba/updates/undo9.xq 2013-09-19 14:09:57 +0000
792@@ -2,7 +2,7 @@
793 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";
794 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
795 import module namespace ic_ddl = "http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl";
796-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
797+import module namespace schema = "http://zorba.io/modules/schema";
798 import module namespace u = "http://www.zorba-xquery.com/test/undo/utils" at "utils.xqlib";
799 import schema namespace s="http://www.zorba-xquery.org/schema" at "shiporder.xsd";
800
801
802=== modified file 'test/rbkt/Queries/zorba/updates/utils.xqlib'
803--- test/rbkt/Queries/zorba/updates/utils.xqlib 2013-02-07 17:24:36 +0000
804+++ test/rbkt/Queries/zorba/updates/utils.xqlib 2013-09-19 14:09:57 +0000
805@@ -1,5 +1,5 @@
806 module namespace u = "http://www.zorba-xquery.com/test/undo/utils";
807-import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
808+import module namespace schema = "http://zorba.io/modules/schema";
809
810 declare function u:dump-types($nodes as node()*) as element()*
811 {

Subscribers

People subscribed via source and target branches