Merge lp:~zorba-coders/zorba/update3.0-xqdoc into lp:zorba

Proposed by Juan Zacarias
Status: Merged
Merged at revision: 11663
Proposed branch: lp:~zorba-coders/zorba/update3.0-xqdoc
Merge into: lp:zorba
Diff against target: 466 lines (+48/-48)
32 files modified
doc/zorba/xqdoc/src/xqdoc-html.xq (+1/-1)
doc/zorba/xqdoc/src/xqdoc-html.xqy (+1/-1)
doc/zorba/xqdoc/src/zorba_module_dependencies.xqy (+1/-1)
modules/CMakeLists.txt (+2/-2)
modules/com/zorba-xquery/www/modules/CMakeLists.txt (+0/-5)
modules/com/zorba-xquery/www/modules/xqdoc/batch.xq (+1/-1)
modules/xqdoc/CMakeLists.txt (+5/-0)
modules/xqdoc/xqdoc-options.xsd (+2/-2)
modules/xqdoc/xqdoc.xq (+8/-8)
src/context/static_context.cpp (+1/-1)
src/functions/pregenerated/func_xqdoc.cpp (+2/-2)
src/runtime/seq/seq_impl.cpp (+1/-1)
src/runtime/spec/mappings.xml (+1/-1)
test/rbkt/ExpQueryResults/zorba/xqdoc/indentation.xml.res (+2/-2)
test/rbkt/ExpQueryResults/zorba/xqdoc/local.xml.res (+1/-1)
test/rbkt/Queries/zorba/schemas/validate_xqdoc_01.xq (+1/-1)
test/rbkt/Queries/zorba/schemas/validate_xqdoc_02.xq (+1/-1)
test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm (+1/-1)
test/rbkt/Queries/zorba/xqdoc/basic.xq (+1/-1)
test/rbkt/Queries/zorba/xqdoc/basic_options.xq (+2/-2)
test/rbkt/Queries/zorba/xqdoc/basic_with_error.xq (+1/-1)
test/rbkt/Queries/zorba/xqdoc/collindex.xq (+1/-1)
test/rbkt/Queries/zorba/xqdoc/content.xq (+1/-1)
test/rbkt/Queries/zorba/xqdoc/content_options.xq (+2/-2)
test/rbkt/Queries/zorba/xqdoc/content_with_error.xq (+1/-1)
test/rbkt/Queries/zorba/xqdoc/indentation.xq (+1/-1)
test/rbkt/Queries/zorba/xqdoc/local.xq (+1/-1)
test/rbkt/Queries/zorba/xqdoc/local.xqlib (+1/-1)
test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq (+1/-1)
test/rbkt/Queries/zorba/xqdoc/no_global_var.xq (+1/-1)
test/rbkt/Queries/zorba/xqdoc/testSchemaTypes.xq (+1/-1)
test/rbkt/Queries/zorba/xqdoc/unorderedAnnotations.xq (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/update3.0-xqdoc
Reviewer Review Type Date Requested Status
Juan Zacarias Approve
Chris Hillery Approve
Review via email: mp+189738@code.launchpad.net

Commit message

Update xqdoc module to zorba 3.0

Description of the change

Update xqdoc module to zorba 3.0

To post a comment you must log in.
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/update3.0-xqdoc/+merge/189738

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/update3.0-xqdoc/+merge/189738

Stage "ZorbaVQ" failed.

Check console output at http://jenkins.lambda.nu/job/ZorbaVQ/461/console to view the results.

11653. By Chris Hillery

Merge from trunk.

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/update3.0-xqdoc/+merge/189738

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/update3.0-xqdoc/+merge/189738

Stage "TestZorbaUbuntu" failed.
2 tests failed (8573 total tests run).

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

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

Juan: Two xqdoc test failures; looks like they just need updated expected results. Also you need to vote Approve on this proposal.

11654. By Juan Zacarias

Fixed expected result for tests for xqdoc.

Revision history for this message
Juan Zacarias (juan457) :
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/update3.0-xqdoc/+merge/189738

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/update3.0-xqdoc/+merge/189738

Stage "ZorbaVQ" failed.

Check console output at http://jenkins.lambda.nu/job/ZorbaVQ/479/console to view the results.

11655. By Chris Hillery

Merge from trunk.

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/update3.0-xqdoc/+merge/189738

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/xqdoc/src/xqdoc-html.xq'
2--- doc/zorba/xqdoc/src/xqdoc-html.xq 2013-10-05 00:21:53 +0000
3+++ doc/zorba/xqdoc/src/xqdoc-html.xq 2013-10-16 18:25:36 +0000
4@@ -15,7 +15,7 @@
5 :)
6 import module namespace file = "http://expath.org/ns/file";
7
8-import module namespace xqdoc = "http://www.zorba-xquery.com/modules/xqdoc";
9+import module namespace xqdoc = "http://zorba.io/modules/xqdoc";
10 import module namespace batch = "http://www.zorba-xquery.com/modules/xqdoc/batch";
11 import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
12 import module namespace xqdoc-html = "http://www.zorba-xquery.com/xqdoc-html" at "xqdoc-html.xqy";
13
14=== modified file 'doc/zorba/xqdoc/src/xqdoc-html.xqy'
15--- doc/zorba/xqdoc/src/xqdoc-html.xqy 2013-08-09 09:04:36 +0000
16+++ doc/zorba/xqdoc/src/xqdoc-html.xqy 2013-10-16 18:25:36 +0000
17@@ -18,7 +18,7 @@
18
19 import module namespace file = "http://expath.org/ns/file";
20
21-import module namespace xqdoc = "http://www.zorba-xquery.com/modules/xqdoc";
22+import module namespace xqdoc = "http://zorba.io/modules/xqdoc";
23 import module namespace batch = "http://www.zorba-xquery.com/modules/xqdoc/batch";
24
25 declare namespace xqd = "http://www.xqdoc.org/1.0";
26
27=== modified file 'doc/zorba/xqdoc/src/zorba_module_dependencies.xqy'
28--- doc/zorba/xqdoc/src/zorba_module_dependencies.xqy 2013-09-17 00:26:50 +0000
29+++ doc/zorba/xqdoc/src/zorba_module_dependencies.xqy 2013-10-16 18:25:36 +0000
30@@ -27,7 +27,7 @@
31 import module namespace functx = "http://www.functx.com";
32
33 import module namespace dot = "http://www.zorba-xquery.com/modules/image/graphviz";
34-import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";
35+import module namespace xqd = "http://zorba.io/modules/xqdoc";
36 import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
37 import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
38 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";
39
40=== modified file 'modules/CMakeLists.txt'
41--- modules/CMakeLists.txt 2013-10-15 23:50:01 +0000
42+++ modules/CMakeLists.txt 2013-10-16 18:25:36 +0000
43@@ -29,14 +29,14 @@
44 ADD_SUBDIRECTORY(structured-items)
45 ADD_SUBDIRECTORY(uri)
46 ADD_SUBDIRECTORY(w3c)
47-ADD_SUBDIRECTORY(xml)
48+ADD_SUBDIRECTORY(xml)
49+ADD_SUBDIRECTORY(xqdoc)
50 ADD_SUBDIRECTORY(zorba-query)
51
52 IF (ZORBA_WITH_DEBUGGER)
53 ADD_SUBDIRECTORY(debugger)
54 ENDIF (ZORBA_WITH_DEBUGGER)
55
56-
57 # Add external module projects - any subdirectories of a directory
58 # named "zorba_modules" as a sibling to the main Zorba source
59 # directory.
60
61=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
62--- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-15 23:50:01 +0000
63+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-10-16 18:25:36 +0000
64@@ -12,15 +12,10 @@
65 # See the License for the specific language governing permissions and
66 # limitations under the License.
67
68-DECLARE_ZORBA_SCHEMA(FILE xqdoc.xsd URI "http://www.xqdoc.org/1.0")
69 DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.0
70 URI "http://www.zorba-xquery.com/modules/fetch")
71 DECLARE_ZORBA_MODULE(FILE reflection.xq VERSION 2.0
72 URI "http://www.zorba-xquery.com/modules/reflection")
73-DECLARE_ZORBA_MODULE(FILE xqdoc.xq VERSION 2.0
74- URI "http://www.zorba-xquery.com/modules/xqdoc")
75-DECLARE_ZORBA_SCHEMA(FILE xqdoc-options.xsd
76- URI "http://www.zorba-xquery.com/modules/xqdoc-options")
77
78 # Subdirectories
79
80
81=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc/batch.xq'
82--- modules/com/zorba-xquery/www/modules/xqdoc/batch.xq 2013-08-09 08:27:30 +0000
83+++ modules/com/zorba-xquery/www/modules/xqdoc/batch.xq 2013-10-16 18:25:36 +0000
84@@ -30,7 +30,7 @@
85
86 import module namespace file = "http://expath.org/ns/file";
87
88-import module namespace xqdoc = "http://www.zorba-xquery.com/modules/xqdoc";
89+import module namespace xqdoc = "http://zorba.io/modules/xqdoc";
90 import module namespace menu = "http://www.zorba-xquery.com/modules/xqdoc/menu";
91 import module namespace html = "http://www.zorba-xquery.com/modules/xqdoc/html";
92
93
94=== added directory 'modules/xqdoc'
95=== added file 'modules/xqdoc/CMakeLists.txt'
96--- modules/xqdoc/CMakeLists.txt 1970-01-01 00:00:00 +0000
97+++ modules/xqdoc/CMakeLists.txt 2013-10-16 18:25:36 +0000
98@@ -0,0 +1,5 @@
99+DECLARE_ZORBA_SCHEMA(FILE xqdoc.xsd URI "http://www.xqdoc.org/1.0")
100+DECLARE_ZORBA_MODULE(FILE xqdoc.xq VERSION 2.0
101+ URI "http://zorba.io/modules/xqdoc")
102+DECLARE_ZORBA_SCHEMA(FILE xqdoc-options.xsd
103+ URI "http://zorba.io/modules/xqdoc-options")
104
105=== renamed file 'modules/com/zorba-xquery/www/modules/xqdoc-options.xsd' => 'modules/xqdoc/xqdoc-options.xsd'
106--- modules/com/zorba-xquery/www/modules/xqdoc-options.xsd 2012-09-26 17:39:48 +0000
107+++ modules/xqdoc/xqdoc-options.xsd 2013-10-16 18:25:36 +0000
108@@ -16,8 +16,8 @@
109 -->
110
111 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
112- targetNamespace="http://www.zorba-xquery.com/modules/xqdoc-options"
113- xmlns="http://www.zorba-xquery.com/modules/xqdoc-options"
114+ targetNamespace="http://zorba.io/modules/xqdoc-options"
115+ xmlns="http://zorba.io/modules/xqdoc-options"
116 elementFormDefault="qualified"
117 attributeFormDefault="unqualified">
118
119
120=== renamed file 'modules/com/zorba-xquery/www/modules/xqdoc.xq' => 'modules/xqdoc/xqdoc.xq'
121--- modules/com/zorba-xquery/www/modules/xqdoc.xq 2013-09-19 01:09:27 +0000
122+++ modules/xqdoc/xqdoc.xq 2013-10-16 18:25:36 +0000
123@@ -59,13 +59,13 @@
124 : @project Zorba/XQDoc/XQDoc Core
125 :
126 :)
127-module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";
128+module namespace xqd = "http://zorba.io/modules/xqdoc";
129
130 import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
131 import module namespace schema = "http://zorba.io/modules/schema";
132
133 import schema namespace opt =
134- "http://www.zorba-xquery.com/modules/xqdoc-options";
135+ "http://zorba.io/modules/xqdoc-options";
136
137 declare namespace an = "http://zorba.io/annotations";
138 declare namespace ver = "http://zorba.io/options/versioning";
139@@ -82,7 +82,7 @@
140 : @param $module-uri The URL of the module for which to
141 : generate XQDoc.
142 : @return An element according to the xqdoc schema
143- : (<tt>http://www.zorba-xquery.com/modules/xqdoc.xsd</tt>).
144+ : (<tt>http://zorba.io/modules/xqdoc.xsd</tt>).
145 : @error zerr::ZXQD0002 if the xqdoc comments in the
146 : module contain invalid XML
147 : @deprecated please use the fetch:content#1 and xqd:xqdoc-content#1 function
148@@ -109,14 +109,14 @@
149 : generate XQDoc.
150 : @param $options XQDoc generation options, e.g.:
151 : <pre>
152- : &lt;enable xmlns="http://www.zorba-xquery.com/modules/xqdoc-options"
153+ : &lt;enable xmlns="http://zorba.io/modules/xqdoc-options"
154 : comments="true"
155 : functions="true"
156 : indexes="true"
157 : /&gt;
158 : </pre>
159 : @return An element according to the xqdoc schema
160- : (<tt>http://www.zorba-xquery.com/modules/xqdoc.xsd</tt>).
161+ : (<tt>http://zorba.io/modules/xqdoc.xsd</tt>).
162 : @error zerr::ZXQD0002 if the xqdoc comments in the
163 : module contain invalid XML
164 : @deprecated please use the fetch:content#1 and xqd:xqdoc-content#2 function
165@@ -147,7 +147,7 @@
166 : @param $module The module (as string) for which to generate
167 : the XQDoc documentation.
168 : @return An element according to the xqdoc schema
169- : (<tt>http://www.zorba-xquery.com/modules/xqdoc.xsd</tt>).
170+ : (<tt>http://zorba.io/modules/xqdoc.xsd</tt>).
171 : @error zerr::ZXQD0002 if the xqdoc comments in the
172 : module contain invalid XML
173 :)
174@@ -173,14 +173,14 @@
175 : the XQDoc documentation.
176 : @param $options XQDoc generation options, e.g.:
177 : <pre>
178- : &lt;enable xmlns="http://www.zorba-xquery.com/modules/xqdoc-options"
179+ : &lt;enable xmlns="http://zorba.io/modules/xqdoc-options"
180 : comments="true"
181 : functions="true"
182 : indexes="true"
183 : &gt;
184 : </pre>
185 : @return An element according to the xqdoc schema
186- : (<tt>http://www.zorba-xquery.com/modules/xqdoc.xsd</tt>).
187+ : (<tt>http://zorba.io/modules/xqdoc.xsd</tt>).
188 : @error zerr::ZXQD0002 if the xqdoc comments in the
189 : module contain invalid XML
190 :)
191
192=== renamed file 'modules/com/zorba-xquery/www/modules/xqdoc.xsd' => 'modules/xqdoc/xqdoc.xsd'
193=== modified file 'src/context/static_context.cpp'
194--- src/context/static_context.cpp 2013-10-15 23:27:57 +0000
195+++ src/context/static_context.cpp 2013-10-16 18:25:36 +0000
196@@ -428,7 +428,7 @@
197
198 const char*
199 static_context::ZORBA_XQDOC_FN_NS =
200-"http://www.zorba-xquery.com/modules/xqdoc";
201+"http://zorba.io/modules/xqdoc";
202
203 const char*
204 static_context::ZORBA_RANDOM_FN_NS =
205
206=== modified file 'src/functions/pregenerated/func_xqdoc.cpp'
207--- src/functions/pregenerated/func_xqdoc.cpp 2013-03-05 23:11:50 +0000
208+++ src/functions/pregenerated/func_xqdoc.cpp 2013-10-16 18:25:36 +0000
209@@ -57,7 +57,7 @@
210
211 {
212 DECL_WITH_KIND(sctx, fn_zorba_xqdoc_xqdoc_content_impl,
213- (createQName("http://www.zorba-xquery.com/modules/xqdoc","","xqdoc-content-impl"),
214+ (createQName("http://zorba.io/modules/xqdoc","","xqdoc-content-impl"),
215 GENV_TYPESYSTEM.STRING_TYPE_ONE,
216 GENV_TYPESYSTEM.STRING_TYPE_ONE,
217 GENV_TYPESYSTEM.ELEMENT_TYPE_ONE),
218@@ -70,7 +70,7 @@
219
220 {
221 DECL_WITH_KIND(sctx, fn_zorba_xqdoc_xqdoc_content_options_impl,
222- (createQName("http://www.zorba-xquery.com/modules/xqdoc","","xqdoc-content-options-impl"),
223+ (createQName("http://zorba.io/modules/xqdoc","","xqdoc-content-options-impl"),
224 GENV_TYPESYSTEM.STRING_TYPE_ONE,
225 GENV_TYPESYSTEM.STRING_TYPE_ONE,
226 GENV_TYPESYSTEM.ELEMENT_TYPE_ONE,
227
228=== modified file 'src/runtime/seq/seq_impl.cpp'
229--- src/runtime/seq/seq_impl.cpp 2013-10-03 22:47:09 +0000
230+++ src/runtime/seq/seq_impl.cpp 2013-10-16 18:25:36 +0000
231@@ -43,7 +43,7 @@
232 ;
233
234 return new Item_set_type(
235- lBucketCount,
236+ lBucketCount,
237 Item_set_type::hasher(),
238 Item_value_equal( tm, tz, coll, loc )
239 );
240
241=== modified file 'src/runtime/spec/mappings.xml'
242--- src/runtime/spec/mappings.xml 2013-10-15 23:27:57 +0000
243+++ src/runtime/spec/mappings.xml 2013-10-16 18:25:36 +0000
244@@ -86,7 +86,7 @@
245 define="ZORBA_DATETIME_FN_NS"
246 prefix="fn-zorba-dateTime"/>
247
248- <zorba:namespace uri="http://www.zorba-xquery.com/modules/xqdoc"
249+ <zorba:namespace uri="http://zorba.io/modules/xqdoc"
250 define="ZORBA_XQDOC_FN_NS"
251 prefix="fn-zorba-xqdoc"/>
252
253
254=== modified file 'test/rbkt/ExpQueryResults/zorba/xqdoc/indentation.xml.res'
255--- test/rbkt/ExpQueryResults/zorba/xqdoc/indentation.xml.res 2013-02-07 17:24:36 +0000
256+++ test/rbkt/ExpQueryResults/zorba/xqdoc/indentation.xml.res 2013-10-16 18:25:36 +0000
257@@ -6,12 +6,12 @@
258 <xqdoc:module type="main">
259 <xqdoc:uri>indentation.xq</xqdoc:uri>
260 <xqdoc:custom tag="namespaces">
261- <xqdoc:namespace prefix="xqd" uri="http://www.zorba-xquery.com/modules/xqdoc" isSchema="false"/>
262+ <xqdoc:namespace prefix="xqd" uri="http://zorba.io/modules/xqdoc" isSchema="false"/>
263 </xqdoc:custom>
264 </xqdoc:module>
265 <xqdoc:imports>
266 <xqdoc:import type="library">
267- <xqdoc:uri>http://www.zorba-xquery.com/modules/xqdoc</xqdoc:uri>
268+ <xqdoc:uri>http://zorba.io/modules/xqdoc</xqdoc:uri>
269 </xqdoc:import>
270 </xqdoc:imports>
271 <xqdoc:variables>
272
273=== modified file 'test/rbkt/ExpQueryResults/zorba/xqdoc/local.xml.res'
274--- test/rbkt/ExpQueryResults/zorba/xqdoc/local.xml.res 2013-08-09 08:27:30 +0000
275+++ test/rbkt/ExpQueryResults/zorba/xqdoc/local.xml.res 2013-10-16 18:25:36 +0000
276@@ -1,1 +1,1 @@
277-<xqdoc:xqdoc xmlns:xqdoc="http://www.xqdoc.org/1.0"><xqdoc:control><xqdoc:date/><xqdoc:version>1.0</xqdoc:version></xqdoc:control><xqdoc:module type="main"><xqdoc:uri>local.xqlib</xqdoc:uri><xqdoc:custom tag="namespaces"><xqdoc:namespace prefix="ann" uri="http://zorba.io/annotations" isSchema="false"/><xqdoc:namespace prefix="xqd" uri="http://www.zorba-xquery.com/modules/xqdoc" isSchema="false"/><xqdoc:namespace prefix="xqds" uri="http://www.xqdoc.org/1.0" isSchema="true"/></xqdoc:custom></xqdoc:module><xqdoc:imports><xqdoc:import type="schema"><xqdoc:uri>http://www.xqdoc.org/1.0</xqdoc:uri></xqdoc:import><xqdoc:import type="library"><xqdoc:uri>http://www.zorba-xquery.com/modules/xqdoc</xqdoc:uri></xqdoc:import></xqdoc:imports><xqdoc:variables/><xqdoc:collections/><xqdoc:indexes/><xqdoc:functions><xqdoc:function arity="1"><xqdoc:name>local:remove-date</xqdoc:name><xqdoc:annotations><xqdoc:annotation namespace="http://zorba.io/annotations" localname="sequential" prefix="ann" value=""/></xqdoc:annotations><xqdoc:signature>declare %ann:sequential function local:remove-date($xqdoc)</xqdoc:signature><xqdoc:parameters><xqdoc:parameter><xqdoc:name>xqdoc</xqdoc:name></xqdoc:parameter></xqdoc:parameters></xqdoc:function></xqdoc:functions></xqdoc:xqdoc>
278+<xqdoc:xqdoc xmlns:xqdoc="http://www.xqdoc.org/1.0"><xqdoc:control><xqdoc:date/><xqdoc:version>1.0</xqdoc:version></xqdoc:control><xqdoc:module type="main"><xqdoc:uri>local.xqlib</xqdoc:uri><xqdoc:custom tag="namespaces"><xqdoc:namespace prefix="ann" uri="http://zorba.io/annotations" isSchema="false"/><xqdoc:namespace prefix="xqd" uri="http://zorba.io/modules/xqdoc" isSchema="false"/><xqdoc:namespace prefix="xqds" uri="http://www.xqdoc.org/1.0" isSchema="true"/></xqdoc:custom></xqdoc:module><xqdoc:imports><xqdoc:import type="schema"><xqdoc:uri>http://www.xqdoc.org/1.0</xqdoc:uri></xqdoc:import><xqdoc:import type="library"><xqdoc:uri>http://zorba.io/modules/xqdoc</xqdoc:uri></xqdoc:import></xqdoc:imports><xqdoc:variables/><xqdoc:collections/><xqdoc:indexes/><xqdoc:functions><xqdoc:function arity="1"><xqdoc:name>local:remove-date</xqdoc:name><xqdoc:annotations><xqdoc:annotation namespace="http://zorba.io/annotations" localname="sequential" prefix="ann" value=""/></xqdoc:annotations><xqdoc:signature>declare %ann:sequential function local:remove-date($xqdoc)</xqdoc:signature><xqdoc:parameters><xqdoc:parameter><xqdoc:name>xqdoc</xqdoc:name></xqdoc:parameter></xqdoc:parameters></xqdoc:function></xqdoc:functions></xqdoc:xqdoc>
279
280=== modified file 'test/rbkt/Queries/zorba/schemas/validate_xqdoc_01.xq'
281--- test/rbkt/Queries/zorba/schemas/validate_xqdoc_01.xq 2013-02-07 17:24:36 +0000
282+++ test/rbkt/Queries/zorba/schemas/validate_xqdoc_01.xq 2013-10-16 18:25:36 +0000
283@@ -1,4 +1,4 @@
284-import module namespace x = "http://www.zorba-xquery.com/modules/xqdoc";
285+import module namespace x = "http://zorba.io/modules/xqdoc";
286 import schema namespace xqds = "http://www.xqdoc.org/1.0";
287
288 exists(validate lax { x:xqdoc("http://www.zorba-xquery.com/modules/http-client") })
289
290=== modified file 'test/rbkt/Queries/zorba/schemas/validate_xqdoc_02.xq'
291--- test/rbkt/Queries/zorba/schemas/validate_xqdoc_02.xq 2013-02-07 17:24:36 +0000
292+++ test/rbkt/Queries/zorba/schemas/validate_xqdoc_02.xq 2013-10-16 18:25:36 +0000
293@@ -1,4 +1,4 @@
294-import module namespace x = "http://www.zorba-xquery.com/modules/xqdoc";
295+import module namespace x = "http://zorba.io/modules/xqdoc";
296 import schema namespace xqds = "http://www.xqdoc.org/1.0";
297
298 exists(validate { x:xqdoc("http://www.zorba-xquery.com/modules/http-client") })
299
300=== modified file 'test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm'
301--- test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm 2013-10-09 02:52:32 +0000
302+++ test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm 2013-10-16 18:25:36 +0000
303@@ -426,7 +426,7 @@
304 <span>xqdoc</span>
305 <ul>
306 <li>
307- <a href="www.zorba-xquery.com_modules_xqdoc.html" title="http://www.zorba-xquery.com/modules/xqdoc">xqdoc</a>
308+ <a href="www.zorba-xquery.com_modules_xqdoc.html" title="http://zorba.io/modules/xqdoc">xqdoc</a>
309 <sup>
310 <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>
311 </sup>
312
313=== modified file 'test/rbkt/Queries/zorba/xqdoc/basic.xq'
314--- test/rbkt/Queries/zorba/xqdoc/basic.xq 2013-08-09 08:27:30 +0000
315+++ test/rbkt/Queries/zorba/xqdoc/basic.xq 2013-10-16 18:25:36 +0000
316@@ -1,4 +1,4 @@
317-import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";
318+import module namespace xqd = "http://zorba.io/modules/xqdoc";
319 import schema namespace xqds = "http://www.xqdoc.org/1.0";
320
321 declare namespace ann = "http://zorba.io/annotations";
322
323=== modified file 'test/rbkt/Queries/zorba/xqdoc/basic_options.xq'
324--- test/rbkt/Queries/zorba/xqdoc/basic_options.xq 2013-08-09 08:27:30 +0000
325+++ test/rbkt/Queries/zorba/xqdoc/basic_options.xq 2013-10-16 18:25:36 +0000
326@@ -1,8 +1,8 @@
327-import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";
328+import module namespace xqd = "http://zorba.io/modules/xqdoc";
329 import schema namespace xqds = "http://www.xqdoc.org/1.0";
330
331 declare namespace ann = "http://zorba.io/annotations";
332-declare namespace opt = "http://www.zorba-xquery.com/modules/xqdoc-options";
333+declare namespace opt = "http://zorba.io/modules/xqdoc-options";
334
335 declare variable $local:dir :=
336 let $base-uri := fn:static-base-uri()
337
338=== modified file 'test/rbkt/Queries/zorba/xqdoc/basic_with_error.xq'
339--- test/rbkt/Queries/zorba/xqdoc/basic_with_error.xq 2013-02-07 17:24:36 +0000
340+++ test/rbkt/Queries/zorba/xqdoc/basic_with_error.xq 2013-10-16 18:25:36 +0000
341@@ -1,4 +1,4 @@
342-import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";
343+import module namespace xqd = "http://zorba.io/modules/xqdoc";
344 import schema namespace xqds = "http://www.xqdoc.org/1.0";
345
346 declare namespace err = "http://www.w3.org/2005/xqt-errors";
347
348=== modified file 'test/rbkt/Queries/zorba/xqdoc/collindex.xq'
349--- test/rbkt/Queries/zorba/xqdoc/collindex.xq 2013-08-09 08:27:30 +0000
350+++ test/rbkt/Queries/zorba/xqdoc/collindex.xq 2013-10-16 18:25:36 +0000
351@@ -1,4 +1,4 @@
352-import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";
353+import module namespace xqd = "http://zorba.io/modules/xqdoc";
354 import schema namespace xqds = "http://www.xqdoc.org/1.0";
355
356 declare namespace ann = "http://zorba.io/annotations";
357
358=== modified file 'test/rbkt/Queries/zorba/xqdoc/content.xq'
359--- test/rbkt/Queries/zorba/xqdoc/content.xq 2013-08-09 08:27:30 +0000
360+++ test/rbkt/Queries/zorba/xqdoc/content.xq 2013-10-16 18:25:36 +0000
361@@ -1,4 +1,4 @@
362-import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";
363+import module namespace xqd = "http://zorba.io/modules/xqdoc";
364 import module namespace file = "http://expath.org/ns/file";
365 import schema namespace xqds = "http://www.xqdoc.org/1.0";
366
367
368=== modified file 'test/rbkt/Queries/zorba/xqdoc/content_options.xq'
369--- test/rbkt/Queries/zorba/xqdoc/content_options.xq 2013-08-09 08:27:30 +0000
370+++ test/rbkt/Queries/zorba/xqdoc/content_options.xq 2013-10-16 18:25:36 +0000
371@@ -1,9 +1,9 @@
372-import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";
373+import module namespace xqd = "http://zorba.io/modules/xqdoc";
374 import module namespace file = "http://expath.org/ns/file";
375 import schema namespace xqds = "http://www.xqdoc.org/1.0";
376
377 declare namespace ann = "http://zorba.io/annotations";
378-declare namespace opt = "http://www.zorba-xquery.com/modules/xqdoc-options";
379+declare namespace opt = "http://zorba.io/modules/xqdoc-options";
380
381 declare %ann:sequential function local:remove-date($xqdoc)
382 {
383
384=== modified file 'test/rbkt/Queries/zorba/xqdoc/content_with_error.xq'
385--- test/rbkt/Queries/zorba/xqdoc/content_with_error.xq 2013-08-09 08:27:30 +0000
386+++ test/rbkt/Queries/zorba/xqdoc/content_with_error.xq 2013-10-16 18:25:36 +0000
387@@ -1,4 +1,4 @@
388-import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";
389+import module namespace xqd = "http://zorba.io/modules/xqdoc";
390 import schema namespace xqds = "http://www.xqdoc.org/1.0";
391
392 declare namespace ann = "http://zorba.io/annotations";
393
394=== modified file 'test/rbkt/Queries/zorba/xqdoc/indentation.xq'
395--- test/rbkt/Queries/zorba/xqdoc/indentation.xq 2013-02-07 17:24:36 +0000
396+++ test/rbkt/Queries/zorba/xqdoc/indentation.xq 2013-10-16 18:25:36 +0000
397@@ -1,4 +1,4 @@
398-import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";
399+import module namespace xqd = "http://zorba.io/modules/xqdoc";
400
401 declare variable $local:dir :=
402 let $base-uri := fn:static-base-uri()
403
404=== modified file 'test/rbkt/Queries/zorba/xqdoc/local.xq'
405--- test/rbkt/Queries/zorba/xqdoc/local.xq 2013-08-09 08:27:30 +0000
406+++ test/rbkt/Queries/zorba/xqdoc/local.xq 2013-10-16 18:25:36 +0000
407@@ -1,4 +1,4 @@
408-import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";
409+import module namespace xqd = "http://zorba.io/modules/xqdoc";
410 import schema namespace xqds = "http://www.xqdoc.org/1.0" at "xqdoc-1.0.xsd";
411
412 declare namespace ann = "http://zorba.io/annotations";
413
414=== modified file 'test/rbkt/Queries/zorba/xqdoc/local.xqlib'
415--- test/rbkt/Queries/zorba/xqdoc/local.xqlib 2013-08-09 08:27:30 +0000
416+++ test/rbkt/Queries/zorba/xqdoc/local.xqlib 2013-10-16 18:25:36 +0000
417@@ -1,4 +1,4 @@
418-import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";
419+import module namespace xqd = "http://zorba.io/modules/xqdoc";
420 import schema namespace xqds = "http://www.xqdoc.org/1.0" at "xqdoc-1.0.xsd";
421
422 declare namespace ann = "http://zorba.io/annotations";
423
424=== modified file 'test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq'
425--- test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq 2013-09-30 21:52:11 +0000
426+++ test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq 2013-10-16 18:25:36 +0000
427@@ -1,7 +1,7 @@
428 xquery version "3.0";
429
430 import module namespace file = "http://expath.org/ns/file";
431-import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";
432+import module namespace xqd = "http://zorba.io/modules/xqdoc";
433 import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
434
435 import schema namespace xqdoc = "http://www.xqdoc.org/1.0";
436
437=== modified file 'test/rbkt/Queries/zorba/xqdoc/no_global_var.xq'
438--- test/rbkt/Queries/zorba/xqdoc/no_global_var.xq 2013-08-09 08:27:30 +0000
439+++ test/rbkt/Queries/zorba/xqdoc/no_global_var.xq 2013-10-16 18:25:36 +0000
440@@ -1,4 +1,4 @@
441-import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";
442+import module namespace xqd = "http://zorba.io/modules/xqdoc";
443 import schema namespace xqds = "http://www.xqdoc.org/1.0";
444
445 declare namespace ann = "http://zorba.io/annotations";
446
447=== modified file 'test/rbkt/Queries/zorba/xqdoc/testSchemaTypes.xq'
448--- test/rbkt/Queries/zorba/xqdoc/testSchemaTypes.xq 2013-08-09 08:27:30 +0000
449+++ test/rbkt/Queries/zorba/xqdoc/testSchemaTypes.xq 2013-10-16 18:25:36 +0000
450@@ -1,5 +1,5 @@
451 (: test if prefixes declared by schema imports can be used in type constructors :)
452-import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";
453+import module namespace xqd = "http://zorba.io/modules/xqdoc";
454
455 declare namespace ann = "http://zorba.io/annotations";
456
457
458=== modified file 'test/rbkt/Queries/zorba/xqdoc/unorderedAnnotations.xq'
459--- test/rbkt/Queries/zorba/xqdoc/unorderedAnnotations.xq 2013-08-09 08:27:30 +0000
460+++ test/rbkt/Queries/zorba/xqdoc/unorderedAnnotations.xq 2013-10-16 18:25:36 +0000
461@@ -1,4 +1,4 @@
462-import module namespace xqd = "http://www.zorba-xquery.com/modules/xqdoc";
463+import module namespace xqd = "http://zorba.io/modules/xqdoc";
464 import schema namespace xqds = "http://www.xqdoc.org/1.0";
465
466 declare namespace ann = "http://zorba.io/annotations";

Subscribers

People subscribed via source and target branches