Zorba

Merge lp:~zorba-coders/zorba/bug-1192043-jqfiles into lp:zorba

  1. bug-1192043-jqfiles
  2. Merge into trunk
Proposed by Chris Hillery
Status: Merged
Merged at revision: 11659
Proposed branch: lp:~zorba-coders/zorba/bug-1192043-jqfiles
Merge into: lp:zorba
Diff against target: 448 lines (+82/-31)
27 files modified
cmake_modules/ZorbaModule.cmake (+24/-5)
modules/com/zorba-xquery/www/modules/xqdoc/menu.xq (+2/-0)
modules/functx/CMakeLists.txt (+1/-1)
modules/pregenerated/jsoniq-errors.xq (+2/-2)
modules/pregenerated/zorba-errors.xq (+2/-2)
modules/pregenerated/zorba-warnings.xq (+2/-2)
modules/w3c/pregenerated/xqt-errors.xq (+2/-2)
modules/w3c/xpath_functions.xq (+2/-0)
modules/w3c/xpath_functions_math.xq (+2/-0)
schemas/CMakeLists.txt (+2/-2)
schemas/pul.xsd (+2/-2)
src/context/default_uri_mappers.cpp (+7/-7)
src/context/dynamic_loader.cpp (+4/-4)
src/diagnostics/diagnostic_list_xq.xq (+2/-2)
test/rbkt/ExpQueryResults/zorba/fetch/fetch_module1.xml.res (+2/-0)
test/rbkt/ExpQueryResults/zorba/fetch/fetch_module2.xml.res (+2/-0)
test/rbkt/modules/bad-ver.xq (+2/-0)
test/rbkt/modules/ext.xq (+2/-0)
test/rbkt/modules/ext2.xq (+2/-0)
test/rbkt/modules/link.xq (+2/-0)
test/rbkt/modules/module-A.xq (+2/-0)
test/rbkt/modules/module-B.xq (+2/-0)
test/rbkt/modules/schema.xq (+2/-0)
test/rbkt/modules/ver.xq (+2/-0)
test/rbkt/modules/ver2.xq (+2/-0)
test/unit/testGetExtVarA.xq (+2/-0)
test/unit/testGetExtVarB.xq (+2/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1192043-jqfiles
Reviewer Review Type Date Requested Status
Juan Zacarias Approve
Chris Hillery Approve
Review via email: mp+190751@code.launchpad.net

Commit message

Use .module/.schema extension for installing URIs. Ensure all modules have valid version declaration.

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/bug-1192043-jqfiles/+merge/190751

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-1192043-jqfiles/+merge/190751

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

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

lp:~zorba-coders/zorba/bug-1192043-jqfiles updated
11657. By Chris Hillery

Fix schemaLocations to account for new naming convention.

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-1192043-jqfiles/+merge/190751

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-1192043-jqfiles/+merge/190751

Stage "CommitZorba" failed.

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

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

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/bug-1192043-jqfiles/+merge/190751 :
Votes: {'Approve': 1}

lp:~zorba-coders/zorba/bug-1192043-jqfiles updated
11658. By Chris Hillery

Add check to DECLARE_ZORBA_MODULE() to verify module has valid version
declaration at head of file. Updated modules as necessary to comply.

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-1192043-jqfiles/+merge/190751
https://code.launchpad.net/~zorba-coders/zorba/bug-1192043-image/+merge/190777

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-1192043-jqfiles/+merge/190751

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

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

lp:~zorba-coders/zorba/bug-1192043-jqfiles updated
11659. By Chris Hillery

Update expected results for failing tests.

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-1192043-jqfiles/+merge/190751
https://code.launchpad.net/~zorba-coders/zorba/bug-1192043-image/+merge/190777

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

lp:~zorba-coders/zorba/bug-1192043-jqfiles updated
11660. By Chris Hillery

Fix path offset.

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

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1192043-jqfiles/+merge/190751

Stage "CommitZorba" failed.

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

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

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/bug-1192043-jqfiles/+merge/190751 :
Votes: {'Approve': 1}

https://code.launchpad.net/~zorba-coders/zorba/bug-1192043-image/+merge/190777 :
Votes: {'Approve': 1}

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/bug-1192043-jqfiles/+merge/190751
https://code.launchpad.net/~zorba-coders/zorba/bug-1192043-image/+merge/190777

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 'cmake_modules/ZorbaModule.cmake'
2--- cmake_modules/ZorbaModule.cmake 2013-08-16 00:53:45 +0000
3+++ cmake_modules/ZorbaModule.cmake 2013-10-14 07:05:22 +0000
4@@ -110,7 +110,7 @@
5 #
6 # Args: URI - the namespace URI of the module
7 # VERSION - (optional) the version of the module, major.minor[.patch]
8-# FILE - path to .xq file (if not absolute, will be resolved
9+# FILE - path to module file (if not absolute, will be resolved
10 # relative to CMAKE_CURRENT_SOURCE_DIR)
11 # LINK_LIBRARIES - (optional) List of libraries to link external
12 # function library against
13@@ -121,6 +121,10 @@
14 # LIBRARY_DEPENDS - (optional) List of targets that the external
15 # function library will depend on (only works if the module
16 # contains C++ external functions)
17+# NO_DECL_CHECK - (optional) Skip the check which ensures the module
18+# starts with a valid version declaration. This should ONLY
19+# be used on external modules that cannot be modified, as it
20+# risks the module not being parsed correctly in some cases.
21 #
22 # CONFIG_FILES - any files specific here will be copied to
23 # CMAKE_CURRENT_BINARY_DIR using CONFIGURE_FILE(). They may contain
24@@ -140,7 +144,7 @@
25 MACRO (DECLARE_ZORBA_MODULE)
26 # Parse and validate arguments
27 PARSE_ARGUMENTS(MODULE "LINK_LIBRARIES;EXTRA_SOURCES;CONFIG_FILES;LIBRARY_DEPENDS"
28- "URI;FILE;VERSION" "TEST_ONLY" ${ARGN})
29+ "URI;FILE;VERSION" "TEST_ONLY;NO_DECL_CHECK" ${ARGN})
30 IF (NOT MODULE_FILE)
31 MESSAGE (FATAL_ERROR "'FILE' argument is required for ZORBA_DECLARE_MODULE()")
32 ENDIF (NOT MODULE_FILE)
33@@ -154,7 +158,22 @@
34 ENDIF (NOT IS_ABSOLUTE "${MODULE_FILE}")
35 GET_FILENAME_COMPONENT (module_name "${MODULE_FILE}" NAME)
36
37- MANGLE_URI (${MODULE_URI} ".xq" module_path module_filename)
38+ # Ensure specified file starts with a valid version declaration
39+ # (either XQuery or JSONiq, or whatever future languages we
40+ # support). Currently, just check for "xquery version" or "jsoniq
41+ # version" in the first bytes of the file. (It is invalid by the
42+ # spec for a version declaration to anywhere else.)
43+ IF (NOT MODULE_NO_DECL_CHECK)
44+ FILE (READ ${SOURCE_FILE} _version_decl LIMIT 20)
45+ STRING (REGEX MATCH "^(xquery|jsoniq) version" _decl_found ${_version_decl})
46+ IF (NOT _decl_found)
47+ MESSAGE (FATAL_ERROR "File ${SOURCE_FILE} does not start with a "
48+ "valid XQuery or JSONiq version declaration. This is required to "
49+ "ensure correct parsing.")
50+ ENDIF (NOT _decl_found)
51+ ENDIF (NOT MODULE_NO_DECL_CHECK)
52+
53+ MANGLE_URI (${MODULE_URI} ".module" module_path module_filename)
54
55 # Determine which module this is, numerically. This number will be
56 # used to generate unique names, for instance for the target name
57@@ -418,7 +437,7 @@
58 # schema into the URI_PATH folder so it will be found at runtime.
59 #
60 # Args: URI - the namespace URI of the schema
61-# FILE - path to .xsd file (if not absolute, will be resolved
62+# FILE - path to schema file (if not absolute, will be resolved
63 # relative to CMAKE_CURRENT_SOURCE_DIR)
64 # TEST_ONLY - (optional) Schema is for testcases only and should not
65 # be installed
66@@ -436,7 +455,7 @@
67 SET (SOURCE_FILE "${SCHEMA_FILE}")
68 ENDIF (NOT IS_ABSOLUTE "${SCHEMA_FILE}")
69 GET_FILENAME_COMPONENT (schema_name "${SCHEMA_FILE}" NAME)
70- MANGLE_URI (${SCHEMA_URI} ".xsd" schema_path schema_filename)
71+ MANGLE_URI (${SCHEMA_URI} ".schema" schema_path schema_filename)
72
73 # Add to schema manifest (except test schema).
74 IF (NOT SCHEMA_TEST_ONLY)
75
76=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc/menu.xq'
77--- modules/com/zorba-xquery/www/modules/xqdoc/menu.xq 2013-08-09 08:27:30 +0000
78+++ modules/com/zorba-xquery/www/modules/xqdoc/menu.xq 2013-10-14 07:05:22 +0000
79@@ -1,3 +1,5 @@
80+xquery version "3.0";
81+
82 (:~
83 : Generate navigation for XQDoc batches.
84 :
85
86=== modified file 'modules/functx/CMakeLists.txt'
87--- modules/functx/CMakeLists.txt 2013-08-09 07:33:21 +0000
88+++ modules/functx/CMakeLists.txt 2013-10-14 07:05:22 +0000
89@@ -12,4 +12,4 @@
90 # See the License for the specific language governing permissions and
91 # limitations under the License.
92
93-DECLARE_ZORBA_MODULE(FILE functx.xq URI "http://www.functx.com")
94+DECLARE_ZORBA_MODULE(FILE functx.xq URI "http://www.functx.com" NO_DECL_CHECK)
95
96=== modified file 'modules/pregenerated/jsoniq-errors.xq'
97--- modules/pregenerated/jsoniq-errors.xq 2013-09-18 08:12:21 +0000
98+++ modules/pregenerated/jsoniq-errors.xq 2013-10-14 07:05:22 +0000
99@@ -1,3 +1,5 @@
100+xquery version '1.0';
101+
102 (:
103 : Copyright 2006-2013 The FLWOR Foundation.
104 :
105@@ -32,8 +34,6 @@
106 :
107 :)
108
109-xquery version '1.0';
110-
111 module namespace jerr = 'http://jsoniq.org/errors';
112
113 declare variable $jerr:NS := 'http://jsoniq.org/errors';
114
115=== modified file 'modules/pregenerated/zorba-errors.xq'
116--- modules/pregenerated/zorba-errors.xq 2013-10-09 02:52:32 +0000
117+++ modules/pregenerated/zorba-errors.xq 2013-10-14 07:05:22 +0000
118@@ -1,3 +1,5 @@
119+xquery version '1.0';
120+
121 (:
122 : Copyright 2006-2013 The FLWOR Foundation.
123 :
124@@ -32,8 +34,6 @@
125 :
126 :)
127
128-xquery version '1.0';
129-
130 module namespace zerr = 'http://zorba.io/errors';
131
132 declare variable $zerr:NS := 'http://zorba.io/errors';
133
134=== modified file 'modules/pregenerated/zorba-warnings.xq'
135--- modules/pregenerated/zorba-warnings.xq 2013-09-18 08:12:21 +0000
136+++ modules/pregenerated/zorba-warnings.xq 2013-10-14 07:05:22 +0000
137@@ -1,3 +1,5 @@
138+xquery version '1.0';
139+
140 (:
141 : Copyright 2006-2013 The FLWOR Foundation.
142 :
143@@ -32,8 +34,6 @@
144 :
145 :)
146
147-xquery version '1.0';
148-
149 module namespace zwarn = 'http://zorba.io/warnings';
150
151 declare variable $zwarn:NS := 'http://zorba.io/warnings';
152
153=== modified file 'modules/w3c/pregenerated/xqt-errors.xq'
154--- modules/w3c/pregenerated/xqt-errors.xq 2013-09-18 08:12:21 +0000
155+++ modules/w3c/pregenerated/xqt-errors.xq 2013-10-14 07:05:22 +0000
156@@ -1,3 +1,5 @@
157+xquery version '1.0';
158+
159 (:
160 : Copyright 2006-2013 The FLWOR Foundation.
161 :
162@@ -32,8 +34,6 @@
163 :
164 :)
165
166-xquery version '1.0';
167-
168 module namespace err = 'http://www.w3.org/2005/xqt-errors';
169
170 declare variable $err:NS := 'http://www.w3.org/2005/xqt-errors';
171
172=== modified file 'modules/w3c/xpath_functions.xq'
173--- modules/w3c/xpath_functions.xq 2013-06-15 20:57:44 +0000
174+++ modules/w3c/xpath_functions.xq 2013-10-14 07:05:22 +0000
175@@ -1,3 +1,5 @@
176+xquery version "1.0";
177+
178 (:
179 : Copyright 2006-2009 The FLWOR Foundation.
180 :
181
182=== modified file 'modules/w3c/xpath_functions_math.xq'
183--- modules/w3c/xpath_functions_math.xq 2013-06-15 20:57:44 +0000
184+++ modules/w3c/xpath_functions_math.xq 2013-10-14 07:05:22 +0000
185@@ -1,3 +1,5 @@
186+xquery version "1.0";
187+
188 (:
189 : Copyright 2006-2009 The FLWOR Foundation.
190 :
191
192=== modified file 'schemas/CMakeLists.txt'
193--- schemas/CMakeLists.txt 2013-02-07 17:24:36 +0000
194+++ schemas/CMakeLists.txt 2013-10-14 07:05:22 +0000
195@@ -29,12 +29,12 @@
196
197 # XQueryX
198 DECLARE_ZORBA_SCHEMA(URI "http://www.w3.org/2005/XQueryX"
199-FILE XQueryX.xsd)
200+ FILE XQueryX.xsd)
201
202 # The following are DTDs, not schemas, but (currently at least) we
203 # only ever load them when an imported schema file references them
204 # (which, in turn, only happens in error cases - see bug 921624). So,
205-# we install them as schemas. Yes, this means they'll have an ".xsd"
206+# we install them as schemas. Yes, this means they'll have an ".schema"
207 # extension in the uri directory, but that's OK because Zorba will
208 # look for them with that extension.
209 DECLARE_ZORBA_SCHEMA(
210
211=== modified file 'schemas/pul.xsd'
212--- schemas/pul.xsd 2012-03-01 12:57:07 +0000
213+++ schemas/pul.xsd 2013-10-14 07:05:22 +0000
214@@ -12,8 +12,8 @@
215 xmlns:xqx="http://www.w3.org/2005/XQueryX"
216 elementFormDefault="qualified">
217
218- <xs:import namespace="http://www.zorba-xquery.com/schemas/xdm" schemaLocation="xdm.xsd"/>
219- <xs:import namespace="http://www.w3.org/2005/XQueryX" schemaLocation="../../../../org/w3/www/2005/XQueryX.xsd"/>
220+ <xs:import namespace="http://www.zorba-xquery.com/schemas/xdm" schemaLocation="xdm.schema"/>
221+ <xs:import namespace="http://www.w3.org/2005/XQueryX" schemaLocation="../../../../org/w3/www/2005/XQueryX.schema"/>
222
223 <!--
224 ****************
225
226=== modified file 'src/context/default_uri_mappers.cpp'
227--- src/context/default_uri_mappers.cpp 2013-08-09 10:59:01 +0000
228+++ src/context/default_uri_mappers.cpp 2013-10-14 07:05:22 +0000
229@@ -57,10 +57,10 @@
230 switch (lKind)
231 {
232 case EntityData::SCHEMA:
233- lExtension = ".xsd";
234+ lExtension = ".schema";
235 break;
236 case EntityData::MODULE:
237- lExtension = ".xq";
238+ lExtension = ".module";
239 break;
240 default:
241 break;
242@@ -81,7 +81,7 @@
243 lChanged = true;
244 }
245 else {
246- // If not, append ".xsd" or ".xq" if it's not already there.
247+ // If not, append ".schema" or ".module" if it's not already there.
248 if (!ascii::ends_with(lPath, lExtension)) {
249 lPath.append(lExtension);
250 lChanged = true;
251@@ -116,12 +116,12 @@
252 return;
253 }
254
255- // Ensure that the namespace URI ends in ".xq", and then strip it.
256+ // Ensure that the namespace URI ends in ".module", and then strip it.
257 zstring const lBaseUri = lModVer.namespace_uri();
258- if ( ! ascii::ends_with(lBaseUri, ".xq")) {
259+ if ( ! ascii::ends_with(lBaseUri, ".module")) {
260 return;
261 }
262- zstring const lRootUri = lBaseUri.substr(0, lBaseUri.size() -3);
263+ zstring const lRootUri = lBaseUri.substr(0, lBaseUri.size() - 7);
264
265 // Ok, we've successfully parsed a version-request fragment. Form up a set of
266 // new URIs based on the original minus the fragment.
267@@ -135,7 +135,7 @@
268 // it's OK to check here even though we're looping.
269 lFormat << "." << lModVer.min_minor();
270 }
271- lFormat << ".xq";
272+ lFormat << ".module";
273 oUris.push_back(zstring(lFormat.str()));
274 }
275
276
277=== modified file 'src/context/dynamic_loader.cpp'
278--- src/context/dynamic_loader.cpp 2013-09-30 22:53:42 +0000
279+++ src/context/dynamic_loader.cpp 2013-10-14 07:05:22 +0000
280@@ -84,12 +84,12 @@
281 lBranchPath = lPathNotation.substr(0, lIndexOfLastSlash + 1);
282 }
283
284- // remove .xq from the end of the file if present
285+ // remove .module from the end of the file if present
286 // bugfix: find_last_of didn't do the right thing
287- size_t lIndexOfXQ = lFileName.find(".xq");
288- if (lIndexOfXQ != std::string::npos && lIndexOfXQ == lFileName.size() - 3)
289+ size_t lIndexOfModule = lFileName.find(".module");
290+ if (lIndexOfModule != std::string::npos && lIndexOfModule == lFileName.size() - 7)
291 {
292- lFileName.erase(lIndexOfXQ);
293+ lFileName.erase(lIndexOfModule);
294 }
295 }
296
297
298=== modified file 'src/diagnostics/diagnostic_list_xq.xq'
299--- src/diagnostics/diagnostic_list_xq.xq 2013-09-18 08:12:21 +0000
300+++ src/diagnostics/diagnostic_list_xq.xq 2013-10-14 07:05:22 +0000
301@@ -104,6 +104,8 @@
302 {
303 let $uri := local:getNSURI($namespace)
304 return concat(
305+ "xquery version '1.0';",
306+ $util:newline, $util:newline,
307 fn:replace( fn:replace( fn:replace( util:copyright(),
308 "/\*\*?", "(:" ),
309 "\*/", ":)" ),
310@@ -127,8 +129,6 @@
311 $util:newline,
312 " :", $util:newline,
313 " :)", $util:newline, $util:newline,
314- "xquery version '1.0';",
315- $util:newline, $util:newline,
316 "module namespace ", $namespace, " = '", $uri, "';",
317 $util:newline, $util:newline,
318 "declare variable $", $namespace, ":NS := '", $uri, "';"
319
320=== modified file 'test/rbkt/ExpQueryResults/zorba/fetch/fetch_module1.xml.res'
321--- test/rbkt/ExpQueryResults/zorba/fetch/fetch_module1.xml.res 2013-08-09 08:27:30 +0000
322+++ test/rbkt/ExpQueryResults/zorba/fetch/fetch_module1.xml.res 2013-10-14 07:05:22 +0000
323@@ -1,3 +1,5 @@
324+xquery version "3.0";
325+
326 (: Test module with external functions implemented in C++ :)
327 module namespace ext = "http://zorba-tests.28msec.us/modules/ext";
328
329
330=== modified file 'test/rbkt/ExpQueryResults/zorba/fetch/fetch_module2.xml.res'
331--- test/rbkt/ExpQueryResults/zorba/fetch/fetch_module2.xml.res 2013-08-09 08:27:30 +0000
332+++ test/rbkt/ExpQueryResults/zorba/fetch/fetch_module2.xml.res 2013-10-14 07:05:22 +0000
333@@ -1,3 +1,5 @@
334+xquery version "3.0";
335+
336 (: Test module with external functions implemented in C++ :)
337 module namespace ext = "http://zorba-tests.28msec.us/modules/ext";
338
339
340=== modified file 'test/rbkt/modules/bad-ver.xq'
341--- test/rbkt/modules/bad-ver.xq 2013-08-09 08:27:30 +0000
342+++ test/rbkt/modules/bad-ver.xq 2013-10-14 07:05:22 +0000
343@@ -1,3 +1,5 @@
344+xquery version "3.0";
345+
346 (: This module has an illegal version specification :)
347
348 module namespace vm = "http://zorba-tests.28msec.us/modules/bad-ver";
349
350=== modified file 'test/rbkt/modules/ext.xq'
351--- test/rbkt/modules/ext.xq 2013-08-09 08:27:30 +0000
352+++ test/rbkt/modules/ext.xq 2013-10-14 07:05:22 +0000
353@@ -1,3 +1,5 @@
354+xquery version "3.0";
355+
356 (: Test module with external functions implemented in C++ :)
357 module namespace ext = "http://zorba-tests.28msec.us/modules/ext";
358
359
360=== modified file 'test/rbkt/modules/ext2.xq'
361--- test/rbkt/modules/ext2.xq 2013-08-09 08:27:30 +0000
362+++ test/rbkt/modules/ext2.xq 2013-10-14 07:05:22 +0000
363@@ -1,3 +1,5 @@
364+xquery version "3.0";
365+
366 (: Test module with external functions implemented in C++ :)
367 module namespace ext = "http://zorba-tests.28msec.us/modules/ext";
368
369
370=== modified file 'test/rbkt/modules/link.xq'
371--- test/rbkt/modules/link.xq 2013-08-09 08:27:30 +0000
372+++ test/rbkt/modules/link.xq 2013-10-14 07:05:22 +0000
373@@ -1,3 +1,5 @@
374+xquery version "3.0";
375+
376 (: Test module with external functions implemented in C++, with link libs :)
377 module namespace link = "http://zorba-tests.28msec.us/modules/link";
378
379
380=== modified file 'test/rbkt/modules/module-A.xq'
381--- test/rbkt/modules/module-A.xq 2013-08-09 08:27:30 +0000
382+++ test/rbkt/modules/module-A.xq 2013-10-14 07:05:22 +0000
383@@ -1,3 +1,5 @@
384+xquery version "3.0";
385+
386 module namespace modA = "http://zorba-tests.28msec.us/modules/A";
387
388 (: This module exists only to import a specific version of the "ver" module. :)
389
390=== modified file 'test/rbkt/modules/module-B.xq'
391--- test/rbkt/modules/module-B.xq 2013-08-09 08:27:30 +0000
392+++ test/rbkt/modules/module-B.xq 2013-10-14 07:05:22 +0000
393@@ -1,3 +1,5 @@
394+xquery version "3.0";
395+
396 module namespace modB = "http://zorba-tests.28msec.us/modules/B";
397
398 (: This module exists only to import a specific version of the "ver" module. :)
399
400=== modified file 'test/rbkt/modules/schema.xq'
401--- test/rbkt/modules/schema.xq 2013-08-09 08:27:30 +0000
402+++ test/rbkt/modules/schema.xq 2013-10-14 07:05:22 +0000
403@@ -1,3 +1,5 @@
404+xquery version "3.0";
405+
406 (: Test module with a schema :)
407 module namespace schema = "http://zorba-tests.28msec.us/modules/myschema";
408
409
410=== modified file 'test/rbkt/modules/ver.xq'
411--- test/rbkt/modules/ver.xq 2013-08-09 08:27:30 +0000
412+++ test/rbkt/modules/ver.xq 2013-10-14 07:05:22 +0000
413@@ -1,3 +1,5 @@
414+xquery version "3.0";
415+
416 module namespace vm = "http://zorba-tests.28msec.us/modules/ver";
417
418 declare namespace ver = "http://zorba.io/options/versioning";
419
420=== modified file 'test/rbkt/modules/ver2.xq'
421--- test/rbkt/modules/ver2.xq 2013-08-09 08:27:30 +0000
422+++ test/rbkt/modules/ver2.xq 2013-10-14 07:05:22 +0000
423@@ -1,3 +1,5 @@
424+xquery version "3.0";
425+
426 module namespace vm = "http://zorba-tests.28msec.us/modules/ver";
427
428 declare namespace ver = "http://zorba.io/options/versioning";
429
430=== modified file 'test/unit/testGetExtVarA.xq'
431--- test/unit/testGetExtVarA.xq 2013-02-07 17:24:36 +0000
432+++ test/unit/testGetExtVarA.xq 2013-10-14 07:05:22 +0000
433@@ -1,3 +1,5 @@
434+xquery version "3.0";
435+
436 module namespace testGetExtVarA = "http://www.zorba-xquery.com/modules/testGetExtVarA";
437 import module namespace testGetExtVarB = "http://www.zorba-xquery.com/modules/testGetExtVarB";
438
439
440=== modified file 'test/unit/testGetExtVarB.xq'
441--- test/unit/testGetExtVarB.xq 2013-02-07 17:24:36 +0000
442+++ test/unit/testGetExtVarB.xq 2013-10-14 07:05:22 +0000
443@@ -1,3 +1,5 @@
444+xquery version "3.0";
445+
446 module namespace testGetExtVarB = "http://www.zorba-xquery.com/modules/testGetExtVarB";
447
448 declare variable $testGetExtVarB:ext external;

Subscribers

People subscribed via source and target branches