Update of /cvsroot/monetdb/pathfinder/tests/XRpc/Tests
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9407/tests/XRpc/Tests
Modified Files:
Tag: XQuery_0-16
add_dbl.xq.in add_int.xq.in concatStr.xq.in echoAll.xq.in
echoVoid.xq.in emptySeq1.xq.in emptySeq2.xq.in emptySeq3.xq.in
emptySeq4.xq.in insertNode.xq.in multi_clnt_s00.xq.in
multi_clnt_s01.xq.in multi_clnt_s02.xq.in returnAncestor.xq.in
returnAncestorOrSelf.xq.in returnChild.xq.in
returnDescendant.xq.in returnDescendantOrSelf.xq.in
returnFollowing.xq.in returnFollowingSibling.xq.in
returnParent.xq.in returnPreceding.xq.in
returnPrecedingSibling.xq.in returnSelf.xq.in
xrpcConvert.xq.in xrpcConvert2.xq.in
xrpcConvert2.xrpcfun2.xq.in xrpcfun.xq
Removed Files:
Tag: XQuery_0-16
add_dbl.prologue.src add_int.prologue.src
concatStr.prologue.src echoAll.prologue.src
echoVoid.prologue.src emptySeq1.prologue.src
emptySeq2.prologue.src emptySeq3.prologue.src
emptySeq4.prologue.src insertNode.prologue.src
multi_clnt.prologue.src returnAncestor.prologue.src
returnAncestorOrSelf.prologue.src returnChild.prologue.src
returnDescendant.prologue.src
returnDescendantOrSelf.prologue.src
returnFollowing.prologue.src
returnFollowingSibling.prologue.src returnParent.prologue.src
returnPreceding.prologue.src
returnPrecedingSibling.prologue.src returnSelf.prologue.src
rpcd_start.mil xrpcConvert.prologue.src
xrpcConvert2.prologue.src
Log Message:
made XRpc tests work, again:
Not only has "xquery_httpd_port" been renamed into "xrpc_port",
but also the defaults have changed:
While the former used to default to 48080 on the server side (via MonetDB.conf)
and on the client side (hard-wired in the code),
the latter now defaults to "" (not set) in MonetDB.conf, and hence to
mapi_port+1 in the server code; in the client code, the default is still
hard-wired to 48080.
Hence, to make the XRPC tests work, again, in the Mtest enviroment
(which dynamically sets mapi_port randomly to avoid conflict between
concurrent Mtest runs and/or with other programs that happen to use
the default port(s)), we need to also set xrpc_port dynamically (now
done by Mtest), and use the dynamically set xrpc_port (via $XRPCPORT)
in the respective tests.
Moreover, when module pathfinder is loaded, it now autimatically starts
an xrpc-server; hence, we must not try to start a second xrpc-server in
the XRPC tests.
Index: returnAncestorOrSelf.xq.in
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/XRpc/Tests/returnAncestorOrSelf.xq.in,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- returnAncestorOrSelf.xq.in 3 Dec 2006 22:07:37 -0000 1.3
+++ returnAncestorOrSelf.xq.in 13 Feb 2007 20:03:26 -0000 1.3.2.1
@@ -1,5 +1,5 @@
import module namespace xrpc = "xrpc-fun" at "$TSTSRCDIR/xrpcfun.xq";
for $i in (1, 2)
- return execute at {"localhost"}
+ return execute at {"localhost:$XRPCPORT"}
{xrpc:returnAncestorOrSelf(doc("hello.xml"))}
--- returnDescendant.prologue.src DELETED ---
Index: multi_clnt_s02.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/multi_clnt_s02.xq.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- multi_clnt_s02.xq.in 12 Nov 2006 01:06:25 -0000 1.2
+++ multi_clnt_s02.xq.in 13 Feb 2007 20:03:24 -0000 1.2.2.1
@@ -1,4 +1,4 @@
import module namespace xrpc = "xrpc-fun" at "$TSTSRCDIR/xrpcfun.xq";
for $i in (40.5, 50.5)
- return execute at {"localhost"} {xrpc:add($i, (10.5, 30.5))}
+ return execute at {"localhost:$XRPCPORT"} {xrpc:add($i, (10.5, 30.5))}
--- returnPrecedingSibling.prologue.src DELETED ---
Index: multi_clnt_s00.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/multi_clnt_s00.xq.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- multi_clnt_s00.xq.in 12 Nov 2006 01:06:24 -0000 1.2
+++ multi_clnt_s00.xq.in 13 Feb 2007 20:03:23 -0000 1.2.2.1
@@ -1,4 +1,4 @@
import module namespace xrpc = "xrpc-fun" at "$TSTSRCDIR/xrpcfun.xq";
for $i in (40.5, 50.5)
- return execute at {"localhost"} {xrpc:add($i, (10.5, 30.5))}
+ return execute at {"localhost:$XRPCPORT"} {xrpc:add($i, (10.5, 30.5))}
--- emptySeq4.prologue.src DELETED ---
Index: returnFollowing.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/returnFollowing.xq.in,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- returnFollowing.xq.in 3 Dec 2006 22:07:37 -0000 1.3
+++ returnFollowing.xq.in 13 Feb 2007 20:03:34 -0000 1.3.2.1
@@ -1,5 +1,5 @@
import module namespace xrpc = "xrpc-fun" at "$TSTSRCDIR/xrpcfun.xq";
for $i in (1, 2)
- return execute at {"localhost"}
+ return execute at {"localhost:$XRPCPORT"}
{xrpc:returnFollowing(doc("hello.xml"))}
--- emptySeq2.prologue.src DELETED ---
Index: emptySeq2.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/emptySeq2.xq.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- emptySeq2.xq.in 12 Nov 2006 01:06:19 -0000 1.2
+++ emptySeq2.xq.in 13 Feb 2007 20:03:19 -0000 1.2.2.1
@@ -2,5 +2,5 @@
(: the middle parameter is sometimes empty :)
for $i in (<a/>, (), <b/>)
- return execute at {"localhost"}
+ return execute at {"localhost:$XRPCPORT"}
{xrpc:echoVoidWithParams(("abc", (), "xyz"), $i, 100)}
Index: xrpcConvert2.xrpcfun2.xq.in
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/XRpc/Tests/xrpcConvert2.xrpcfun2.xq.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- xrpcConvert2.xrpcfun2.xq.in 5 Feb 2007 10:46:50 -0000 1.1.2.1
+++ xrpcConvert2.xrpcfun2.xq.in 13 Feb 2007 20:03:46 -0000 1.1.2.2
@@ -6,7 +6,7 @@
declare function bar:xrpcConvert($v as xs:decimal?) as xs:decimal?
{
- execute at {"localhost"}{foo:convert($v)}
+ execute at {"localhost:$XRPCPORT"}{foo:convert($v)}
};
Index: returnSelf.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/returnSelf.xq.in,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- returnSelf.xq.in 3 Dec 2006 22:07:37 -0000 1.3
+++ returnSelf.xq.in 13 Feb 2007 20:03:40 -0000 1.3.2.1
@@ -1,5 +1,5 @@
import module namespace xrpc = "xrpc-fun" at "$TSTSRCDIR/xrpcfun.xq";
for $i in (1, 2)
- return execute at {"localhost"}
+ return execute at {"localhost:$XRPCPORT"}
{xrpc:returnSelf(doc("hello.xml"))}
--- rpcd_start.mil DELETED ---
Index: concatStr.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/concatStr.xq.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- concatStr.xq.in 12 Nov 2006 01:06:16 -0000 1.2
+++ concatStr.xq.in 13 Feb 2007 20:03:14 -0000 1.2.2.1
@@ -1,4 +1,4 @@
import module namespace xrpc = "xrpc-fun" at "$TSTSRCDIR/xrpcfun.xq";
for $i in ("First", "Second")
- return execute at {"localhost"} {xrpc:concatStr($i, " string.")}
+ return execute at {"localhost:$XRPCPORT"} {xrpc:concatStr($i, " string.")}
Index: xrpcfun.xq
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/xrpcfun.xq,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- xrpcfun.xq 29 Jan 2007 15:43:30 -0000 1.4.2.1
+++ xrpcfun.xq 13 Feb 2007 20:03:47 -0000 1.4.2.2
@@ -6,9 +6,9 @@
2.20371 * $v
};
-declare function xrpcfun:xrpcConvert($v as xs:decimal?) as xs:decimal?
+declare function xrpcfun:xrpcConvert($u as xs:string, $v as xs:decimal?) as
xs:decimal?
{
- execute at {"localhost"}{xrpcfun:convert($v)}
+ execute at {$u}{xrpcfun:convert($v)}
};
declare function xrpcfun:add($v1 as xs:decimal,
Index: xrpcConvert2.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/xrpcConvert2.xq.in,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- xrpcConvert2.xq.in 5 Feb 2007 10:46:50 -0000 1.1.2.2
+++ xrpcConvert2.xq.in 13 Feb 2007 20:03:43 -0000 1.1.2.3
@@ -1,4 +1,4 @@
import module namespace xrpc = "bar" at
"$TSTTRGDIR/xrpcConvert2.xrpcfun2.xq";
-execute at {"localhost"} {xrpc:xrpcConvert(100)}
+execute at {"localhost:$XRPCPORT"} {xrpc:xrpcConvert(100)}
--- add_dbl.prologue.src DELETED ---
Index: returnParent.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/returnParent.xq.in,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- returnParent.xq.in 3 Dec 2006 22:07:37 -0000 1.3
+++ returnParent.xq.in 13 Feb 2007 20:03:36 -0000 1.3.2.1
@@ -1,5 +1,5 @@
import module namespace xrpc = "xrpc-fun" at "$TSTSRCDIR/xrpcfun.xq";
for $i in (1, 2)
- return execute at {"localhost"}
+ return execute at {"localhost:$XRPCPORT"}
{xrpc:returnParent(doc("hello.xml"))}
--- returnChild.prologue.src DELETED ---
Index: insertNode.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/insertNode.xq.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- insertNode.xq.in 3 Dec 2006 22:07:37 -0000 1.2
+++ insertNode.xq.in 13 Feb 2007 20:03:22 -0000 1.2.2.1
@@ -1,3 +1,3 @@
import module namespace tf = "xrpc-fun" at "$TSTSRCDIR/xrpcfun.xq";
-execute at { "localhost" } { tf:insertNode(<a/>) }
+execute at { "localhost:$XRPCPORT" } { tf:insertNode(<a/>) }
--- add_int.prologue.src DELETED ---
Index: returnDescendant.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/returnDescendant.xq.in,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- returnDescendant.xq.in 3 Dec 2006 22:07:37 -0000 1.3
+++ returnDescendant.xq.in 13 Feb 2007 20:03:30 -0000 1.3.2.1
@@ -1,5 +1,5 @@
import module namespace xrpc = "xrpc-fun" at "$TSTSRCDIR/xrpcfun.xq";
for $i in (1, 2)
- return execute at {"localhost"}
+ return execute at {"localhost:$XRPCPORT"}
{xrpc:returnDescendant(doc("hello.xml"))}
--- returnParent.prologue.src DELETED ---
Index: returnAncestor.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/returnAncestor.xq.in,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- returnAncestor.xq.in 3 Dec 2006 22:07:37 -0000 1.3
+++ returnAncestor.xq.in 13 Feb 2007 20:03:25 -0000 1.3.2.1
@@ -1,5 +1,5 @@
import module namespace xrpc = "xrpc-fun" at "$TSTSRCDIR/xrpcfun.xq";
for $i in (1, 2)
- return execute at {"localhost"}
+ return execute at {"localhost:$XRPCPORT"}
{xrpc:returnAncestor(doc("hello.xml"))}
--- xrpcConvert2.prologue.src DELETED ---
--- returnPreceding.prologue.src DELETED ---
--- insertNode.prologue.src DELETED ---
Index: multi_clnt_s01.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/multi_clnt_s01.xq.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- multi_clnt_s01.xq.in 12 Nov 2006 01:06:24 -0000 1.2
+++ multi_clnt_s01.xq.in 13 Feb 2007 20:03:23 -0000 1.2.2.1
@@ -1,4 +1,4 @@
import module namespace xrpc = "xrpc-fun" at "$TSTSRCDIR/xrpcfun.xq";
for $i in (40.5, 50.5)
- return execute at {"localhost"} {xrpc:add($i, (10.5, 30.5))}
+ return execute at {"localhost:$XRPCPORT"} {xrpc:add($i, (10.5, 30.5))}
Index: echoVoid.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/echoVoid.xq.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- echoVoid.xq.in 12 Nov 2006 01:06:17 -0000 1.2
+++ echoVoid.xq.in 13 Feb 2007 20:03:17 -0000 1.2.2.1
@@ -1,4 +1,4 @@
import module namespace xrpc = "xrpc-fun" at "$TSTSRCDIR/xrpcfun.xq";
for $i in (1, 2, 3)
- return execute at {"localhost"} {xrpc:echoVoid()}
+ return execute at {"localhost:$XRPCPORT"} {xrpc:echoVoid()}
Index: returnPreceding.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/returnPreceding.xq.in,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- returnPreceding.xq.in 3 Dec 2006 22:07:37 -0000 1.3
+++ returnPreceding.xq.in 13 Feb 2007 20:03:38 -0000 1.3.2.1
@@ -1,5 +1,5 @@
import module namespace xrpc = "xrpc-fun" at "$TSTSRCDIR/xrpcfun.xq";
for $i in (1, 2)
- return execute at {"localhost"}
+ return execute at {"localhost:$XRPCPORT"}
{xrpc:returnPreceding(doc("hello.xml"))}
--- emptySeq1.prologue.src DELETED ---
--- returnSelf.prologue.src DELETED ---
Index: add_int.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/add_int.xq.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- add_int.xq.in 12 Nov 2006 01:06:16 -0000 1.2
+++ add_int.xq.in 13 Feb 2007 20:03:12 -0000 1.2.2.1
@@ -2,4 +2,4 @@
for $i in (40, 50)
for $j in (100, 200)
- return execute at {"localhost"} {xrpc:add($i, ($j, 30))}
+ return execute at {"localhost:$XRPCPORT"} {xrpc:add($i, ($j, 30))}
--- returnFollowingSibling.prologue.src DELETED ---
Index: echoAll.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/echoAll.xq.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- echoAll.xq.in 15 Dec 2006 20:15:36 -0000 1.2
+++ echoAll.xq.in 13 Feb 2007 20:03:16 -0000 1.2.2.1
@@ -8,4 +8,4 @@
$doc1/*/processing-instruction(),
$doc1/*/attribute::*,
$doc2)
-return execute at {"localhost"} { xrpc:echoAll($plist)}
+return execute at {"localhost:$XRPCPORT"} { xrpc:echoAll($plist)}
--- xrpcConvert.prologue.src DELETED ---
--- returnDescendantOrSelf.prologue.src DELETED ---
--- returnAncestor.prologue.src DELETED ---
Index: emptySeq3.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/emptySeq3.xq.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- emptySeq3.xq.in 12 Nov 2006 01:06:20 -0000 1.2
+++ emptySeq3.xq.in 13 Feb 2007 20:03:20 -0000 1.2.2.1
@@ -3,5 +3,5 @@
(: last parameter is always empty :)
for $str in ("hello", "world")
for $i in (<a/>, (), <b/>)
- return execute at {"localhost"}
+ return execute at {"localhost:$XRPCPORT"}
{xrpc:echoVoidWithParams($str, $i, ())}
--- returnFollowing.prologue.src DELETED ---
Index: emptySeq4.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/emptySeq4.xq.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- emptySeq4.xq.in 12 Nov 2006 01:06:21 -0000 1.2
+++ emptySeq4.xq.in 13 Feb 2007 20:03:21 -0000 1.2.2.1
@@ -2,5 +2,5 @@
(: the last parameter is sometimes empty :)
for $i in (10, (), 30)
- return execute at {"localhost"}
+ return execute at {"localhost:$XRPCPORT"}
{xrpc:echoVoidWithParams(("abc", "xyz"), <a/>, $i)}
Index: xrpcConvert.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/xrpcConvert.xq.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- xrpcConvert.xq.in 29 Jan 2007 15:43:27 -0000 1.1.2.1
+++ xrpcConvert.xq.in 13 Feb 2007 20:03:42 -0000 1.1.2.2
@@ -1,4 +1,4 @@
import module namespace xrpc = "xrpc-fun" at
"$TSTSRCDIR/xrpcfun.xq";
-execute at {"localhost"} {xrpc:xrpcConvert(100)}
+execute at {"localhost:$XRPCPORT"} {xrpc:xrpcConvert("localhost:$XRPCPORT",
100)}
Index: returnChild.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/returnChild.xq.in,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- returnChild.xq.in 3 Dec 2006 22:07:37 -0000 1.3
+++ returnChild.xq.in 13 Feb 2007 20:03:27 -0000 1.3.2.1
@@ -1,5 +1,5 @@
import module namespace xrpc = "xrpc-fun" at "$TSTSRCDIR/xrpcfun.xq";
for $i in (1, 2)
- return execute at { "localhost" }
+ return execute at { "localhost:$XRPCPORT" }
{ xrpc:returnChild(doc("hello.xml")) }
Index: add_dbl.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/add_dbl.xq.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- add_dbl.xq.in 12 Nov 2006 01:06:14 -0000 1.2
+++ add_dbl.xq.in 13 Feb 2007 20:03:09 -0000 1.2.2.1
@@ -1,4 +1,4 @@
import module namespace xrpc = "xrpc-fun" at "$TSTSRCDIR/xrpcfun.xq";
for $i in (40.5, 50.5)
- return execute at {"localhost"} {xrpc:add($i, (10.5, 30.5))}
+ return execute at {"localhost:$XRPCPORT"} {xrpc:add($i, (10.5, 30.5))}
--- returnAncestorOrSelf.prologue.src DELETED ---
--- echoAll.prologue.src DELETED ---
--- echoVoid.prologue.src DELETED ---
Index: emptySeq1.xq.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/tests/XRpc/Tests/emptySeq1.xq.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- emptySeq1.xq.in 12 Nov 2006 01:06:18 -0000 1.2
+++ emptySeq1.xq.in 13 Feb 2007 20:03:18 -0000 1.2.2.1
@@ -2,5 +2,5 @@
(: the middle parameter is always empty :)
for $i in (1, 2)
- return execute at {"localhost"}
+ return execute at {"localhost:$XRPCPORT"}
{xrpc:echoVoidWithParams(("abc", "xyz"), (), $i)}
Index: returnFollowingSibling.xq.in
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/XRpc/Tests/returnFollowingSibling.xq.in,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- returnFollowingSibling.xq.in 3 Dec 2006 22:07:37 -0000 1.3
+++ returnFollowingSibling.xq.in 13 Feb 2007 20:03:36 -0000 1.3.2.1
@@ -1,5 +1,5 @@
import module namespace xrpc = "xrpc-fun" at "$TSTSRCDIR/xrpcfun.xq";
for $i in (1, 2)
- return execute at {"localhost"}
+ return execute at {"localhost:$XRPCPORT"}
{xrpc:returnFollowingSibling(doc("hello.xml"))}
Index: returnPrecedingSibling.xq.in
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/XRpc/Tests/returnPrecedingSibling.xq.in,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- returnPrecedingSibling.xq.in 3 Dec 2006 22:07:37 -0000 1.3
+++ returnPrecedingSibling.xq.in 13 Feb 2007 20:03:39 -0000 1.3.2.1
@@ -1,5 +1,5 @@
import module namespace xrpc = "xrpc-fun" at "$TSTSRCDIR/xrpcfun.xq";
for $i in (1, 2)
- return execute at {"localhost"}
+ return execute at {"localhost:$XRPCPORT"}
{xrpc:returnPrecedingSibling(doc("hello.xml"))}
Index: returnDescendantOrSelf.xq.in
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/tests/XRpc/Tests/returnDescendantOrSelf.xq.in,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- returnDescendantOrSelf.xq.in 3 Dec 2006 22:07:37 -0000 1.3
+++ returnDescendantOrSelf.xq.in 13 Feb 2007 20:03:33 -0000 1.3.2.1
@@ -1,5 +1,5 @@
import module namespace xrpc = "xrpc-fun" at "$TSTSRCDIR/xrpcfun.xq";
for $i in (1, 2)
- return execute at {"localhost"}
+ return execute at {"localhost:$XRPCPORT"}
{xrpc:returnDescendantOrSelf(doc("hello.xml"))}
--- multi_clnt.prologue.src DELETED ---
--- concatStr.prologue.src DELETED ---
--- emptySeq3.prologue.src DELETED ---
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
