Zorba

Merge lp:~zorba-coders/zorba/bug-1189797-node-module into lp:zorba

  1. bug-1189797-node-module
  2. Merge into trunk
Proposed by Chris Hillery
Status: Merged
Merged at revision: 11611
Proposed branch: lp:~zorba-coders/zorba/bug-1189797-node-module
Merge into: lp:zorba
Diff against target: 241 lines (+23/-23)
12 files modified
modules/com/zorba-xquery/www/modules/CMakeLists.txt (+0/-2)
modules/structured-items/CMakeLists.txt (+2/-0)
modules/structured-items/node.xq (+2/-2)
src/context/static_context.cpp (+1/-1)
src/functions/pregenerated/func_nodes.cpp (+11/-11)
src/runtime/spec/mappings.xml (+1/-1)
test/rbkt/Queries/zorba/no-copy/node-copy-01.xq (+1/-1)
test/rbkt/Queries/zorba/no-copy/node-copy-02.xq (+1/-1)
test/rbkt/Queries/zorba/no-copy/node-copy-03.xq (+1/-1)
test/rbkt/Queries/zorba/nodes/copy01.xq (+1/-1)
test/rbkt/Queries/zorba/nodes/rel_and_props1.xq (+1/-1)
test/rbkt/Queries/zorba/nodes/rel_and_props2.xq (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1189797-node-module
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Chris Hillery Approve
Review via email: mp+178910@code.launchpad.net

Commit message

Updated core module "node" 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
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189797-node-module/+merge/178910

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

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-1189797-node-module/+merge/178910 :
Votes: {'Approve': 1}

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

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189797-node-module/+merge/178910

Stage "CommitZorba" failed.

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

Revision history for this message
Matthias Brantner (matthias-brantner) :
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-1189797-node-module/+merge/178910

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-1189797-node-module/+merge/178910

Stage "ZorbaVQ" failed.

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

lp:~zorba-coders/zorba/bug-1189797-node-module updated
11590. By Matthias Brantner

merge with 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/bug-1189797-node-module/+merge/178910

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

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-1189797-node-module/+merge/178910

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-1189797-node-module/+merge/178910

Stage "ZorbaVQ" failed.

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

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

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189797-node-module/+merge/178910

Stage "CommitZorba" failed.

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

lp:~zorba-coders/zorba/bug-1189797-node-module updated
11591. By Matthias Brantner

merge with 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/bug-1189797-node-module/+merge/178910

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 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
2--- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-08-30 17:32:32 +0000
3+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2013-08-30 17:46:24 +0000
4@@ -17,8 +17,6 @@
5 URI "http://www.zorba-xquery.com/modules/datetime")
6 DECLARE_ZORBA_MODULE(FILE fetch.xq VERSION 2.0
7 URI "http://www.zorba-xquery.com/modules/fetch")
8-DECLARE_ZORBA_MODULE(FILE node.xq VERSION 2.0
9- URI "http://www.zorba-xquery.com/modules/node")
10 DECLARE_ZORBA_MODULE(FILE reflection.xq VERSION 2.0
11 URI "http://www.zorba-xquery.com/modules/reflection")
12 DECLARE_ZORBA_MODULE(FILE schema.xq VERSION 2.0
13
14=== modified file 'modules/structured-items/CMakeLists.txt'
15--- modules/structured-items/CMakeLists.txt 2013-07-24 07:29:14 +0000
16+++ modules/structured-items/CMakeLists.txt 2013-08-30 17:46:24 +0000
17@@ -16,3 +16,5 @@
18 URI "http://zorba.io/modules/node-position")
19 DECLARE_ZORBA_MODULE(FILE reference.xq VERSION 1.0
20 URI "http://zorba.io/modules/reference")
21+DECLARE_ZORBA_MODULE(FILE node.xq VERSION 2.0
22+ URI "http://zorba.io/modules/node")
23
24=== renamed file 'modules/com/zorba-xquery/www/modules/node.xq' => 'modules/structured-items/node.xq'
25--- modules/com/zorba-xquery/www/modules/node.xq 2013-08-09 08:27:30 +0000
26+++ modules/structured-items/node.xq 2013-08-30 17:46:24 +0000
27@@ -29,7 +29,7 @@
28 : @author Matthias Brantner
29 : @project Zorba/XQuery Data Model/Node/Node
30 :)
31-module namespace node = "http://www.zorba-xquery.com/modules/node";
32+module namespace node = "http://zorba.io/modules/node";
33
34 declare namespace ver = "http://zorba.io/options/versioning";
35 declare option ver:module-version "2.0";
36@@ -167,7 +167,7 @@
37
38 (:~
39 : Return a deep copy of every given node according to the properties
40- : specified in the static context of the invoking module.
41+ : specified in the static context of the invoking module.<p/>
42 :
43 : Please note that a copy of a node is parentless.
44 :
45
46=== modified file 'src/context/static_context.cpp'
47--- src/context/static_context.cpp 2013-08-30 17:32:32 +0000
48+++ src/context/static_context.cpp 2013-08-30 17:46:24 +0000
49@@ -460,7 +460,7 @@
50
51 const char*
52 static_context::ZORBA_NODE_FN_NS =
53-"http://www.zorba-xquery.com/modules/node";
54+"http://zorba.io/modules/node";
55
56 const char*
57 static_context::ZORBA_ITEM_FN_NS =
58
59=== modified file 'src/functions/pregenerated/func_nodes.cpp'
60--- src/functions/pregenerated/func_nodes.cpp 2013-07-24 08:12:12 +0000
61+++ src/functions/pregenerated/func_nodes.cpp 2013-08-30 17:46:24 +0000
62@@ -401,7 +401,7 @@
63
64 {
65 DECL_WITH_KIND(sctx, fn_zorba_node_ancestor_of,
66- (createQName("http://www.zorba-xquery.com/modules/node","","ancestor-of"),
67+ (createQName("http://zorba.io/modules/node","","ancestor-of"),
68 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
69 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
70 GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
71@@ -414,7 +414,7 @@
72
73 {
74 DECL_WITH_KIND(sctx, fn_zorba_node_descendant_of,
75- (createQName("http://www.zorba-xquery.com/modules/node","","descendant-of"),
76+ (createQName("http://zorba.io/modules/node","","descendant-of"),
77 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
78 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
79 GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
80@@ -427,7 +427,7 @@
81
82 {
83 DECL_WITH_KIND(sctx, fn_zorba_node_parent_of,
84- (createQName("http://www.zorba-xquery.com/modules/node","","parent-of"),
85+ (createQName("http://zorba.io/modules/node","","parent-of"),
86 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
87 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
88 GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
89@@ -440,7 +440,7 @@
90
91 {
92 DECL_WITH_KIND(sctx, fn_zorba_node_child_of,
93- (createQName("http://www.zorba-xquery.com/modules/node","","child-of"),
94+ (createQName("http://zorba.io/modules/node","","child-of"),
95 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
96 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
97 GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
98@@ -453,7 +453,7 @@
99
100 {
101 DECL_WITH_KIND(sctx, fn_zorba_node_following_of,
102- (createQName("http://www.zorba-xquery.com/modules/node","","following-of"),
103+ (createQName("http://zorba.io/modules/node","","following-of"),
104 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
105 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
106 GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
107@@ -466,7 +466,7 @@
108
109 {
110 DECL_WITH_KIND(sctx, fn_zorba_node_preceding_of,
111- (createQName("http://www.zorba-xquery.com/modules/node","","preceding-of"),
112+ (createQName("http://zorba.io/modules/node","","preceding-of"),
113 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
114 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
115 GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
116@@ -479,7 +479,7 @@
117
118 {
119 DECL_WITH_KIND(sctx, fn_zorba_node_following_sibling_of,
120- (createQName("http://www.zorba-xquery.com/modules/node","","following-sibling-of"),
121+ (createQName("http://zorba.io/modules/node","","following-sibling-of"),
122 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
123 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
124 GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
125@@ -492,7 +492,7 @@
126
127 {
128 DECL_WITH_KIND(sctx, fn_zorba_node_preceding_sibling_of,
129- (createQName("http://www.zorba-xquery.com/modules/node","","preceding-sibling-of"),
130+ (createQName("http://zorba.io/modules/node","","preceding-sibling-of"),
131 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
132 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
133 GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
134@@ -505,7 +505,7 @@
135
136 {
137 DECL_WITH_KIND(sctx, fn_zorba_node_level,
138- (createQName("http://www.zorba-xquery.com/modules/node","","level"),
139+ (createQName("http://zorba.io/modules/node","","level"),
140 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
141 GENV_TYPESYSTEM.INTEGER_TYPE_ONE),
142 FunctionConsts::FN_ZORBA_NODE_LEVEL_1);
143@@ -517,7 +517,7 @@
144
145 {
146 DECL_WITH_KIND(sctx, fn_zorba_node_least_common_ancestor,
147- (createQName("http://www.zorba-xquery.com/modules/node","","least-common-ancestor"),
148+ (createQName("http://zorba.io/modules/node","","least-common-ancestor"),
149 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
150 GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
151 GENV_TYPESYSTEM.ANY_NODE_TYPE_QUESTION),
152@@ -553,7 +553,7 @@
153
154 {
155 DECL_WITH_KIND(sctx, fn_zorba_node_copy,
156- (createQName("http://www.zorba-xquery.com/modules/node","","copy"),
157+ (createQName("http://zorba.io/modules/node","","copy"),
158 GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR,
159 GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR),
160 FunctionConsts::FN_ZORBA_NODE_COPY_1);
161
162=== modified file 'src/runtime/spec/mappings.xml'
163--- src/runtime/spec/mappings.xml 2013-08-30 17:32:32 +0000
164+++ src/runtime/spec/mappings.xml 2013-08-30 17:46:24 +0000
165@@ -122,7 +122,7 @@
166 define="ZORBA_FETCH_FN_NS"
167 prefix="fn-zorba-fetch"/>
168
169- <zorba:namespace uri="http://www.zorba-xquery.com/modules/node"
170+ <zorba:namespace uri="http://zorba.io/modules/node"
171 define="ZORBA_NODE_FN_NS"
172 prefix="fn-zorba-node"/>
173
174
175=== modified file 'test/rbkt/Queries/zorba/no-copy/node-copy-01.xq'
176--- test/rbkt/Queries/zorba/no-copy/node-copy-01.xq 2013-08-09 08:27:30 +0000
177+++ test/rbkt/Queries/zorba/no-copy/node-copy-01.xq 2013-08-30 17:46:24 +0000
178@@ -2,7 +2,7 @@
179
180 declare namespace opt = "http://zorba.io/options/optimizer";
181
182-import module namespace node = "http://www.zorba-xquery.com/modules/node";
183+import module namespace node = "http://zorba.io/modules/node";
184
185 declare option opt:enable "for-serialization-only";
186
187
188=== modified file 'test/rbkt/Queries/zorba/no-copy/node-copy-02.xq'
189--- test/rbkt/Queries/zorba/no-copy/node-copy-02.xq 2013-08-09 08:27:30 +0000
190+++ test/rbkt/Queries/zorba/no-copy/node-copy-02.xq 2013-08-30 17:46:24 +0000
191@@ -2,7 +2,7 @@
192
193 declare namespace opt = "http://zorba.io/options/optimizer";
194
195-import module namespace node = "http://www.zorba-xquery.com/modules/node";
196+import module namespace node = "http://zorba.io/modules/node";
197
198 declare copy-namespaces no-preserve, inherit;
199
200
201=== modified file 'test/rbkt/Queries/zorba/no-copy/node-copy-03.xq'
202--- test/rbkt/Queries/zorba/no-copy/node-copy-03.xq 2013-08-09 08:27:30 +0000
203+++ test/rbkt/Queries/zorba/no-copy/node-copy-03.xq 2013-08-30 17:46:24 +0000
204@@ -1,6 +1,6 @@
205 declare namespace opt = "http://zorba.io/options/optimizer";
206
207-import module namespace node = "http://www.zorba-xquery.com/modules/node";
208+import module namespace node = "http://zorba.io/modules/node";
209
210 declare copy-namespaces preserve, no-inherit;
211
212
213=== modified file 'test/rbkt/Queries/zorba/nodes/copy01.xq'
214--- test/rbkt/Queries/zorba/nodes/copy01.xq 2012-03-15 02:55:49 +0000
215+++ test/rbkt/Queries/zorba/nodes/copy01.xq 2013-08-30 17:46:24 +0000
216@@ -1,4 +1,4 @@
217-import module namespace node = "http://www.zorba-xquery.com/modules/node";
218+import module namespace node = "http://zorba.io/modules/node";
219
220 let $node :=
221 <a>
222
223=== modified file 'test/rbkt/Queries/zorba/nodes/rel_and_props1.xq'
224--- test/rbkt/Queries/zorba/nodes/rel_and_props1.xq 2013-02-07 17:24:36 +0000
225+++ test/rbkt/Queries/zorba/nodes/rel_and_props1.xq 2013-08-30 17:46:24 +0000
226@@ -1,4 +1,4 @@
227-import module namespace node = "http://www.zorba-xquery.com/modules/node";
228+import module namespace node = "http://zorba.io/modules/node";
229
230 let $x := <a>
231 <b/>
232
233=== modified file 'test/rbkt/Queries/zorba/nodes/rel_and_props2.xq'
234--- test/rbkt/Queries/zorba/nodes/rel_and_props2.xq 2013-02-07 17:24:36 +0000
235+++ test/rbkt/Queries/zorba/nodes/rel_and_props2.xq 2013-08-30 17:46:24 +0000
236@@ -1,4 +1,4 @@
237-import module namespace node = "http://www.zorba-xquery.com/modules/node";
238+import module namespace node = "http://zorba.io/modules/node";
239
240 let $x := document {
241 <a>

Subscribers

People subscribed via source and target branches