Menu
▾
▴
mxquery-commit — Commit Notifications
You can subscribe to this list here.
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(71) |
Jun
(43) |
Jul
(9) |
Aug
(10) |
Sep
(21) |
Oct
(38) |
Nov
|
Dec
(11) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
|
Feb
(21) |
Mar
(9) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <et...@us...> - 2011-10-17 22:18:44
|
Revision: 4489
http://mxquery.svn.sourceforge.net/mxquery/?rev=4489&view=rev
Author: etterth
Date: 2011-10-17 22:18:38 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
- added test for b:setHash
Modified Paths:
--------------
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/UrlManipulation.java
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/UrlManipulation.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/UrlManipulation.java 2011-10-17 22:13:36 UTC (rev 4488)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/UrlManipulation.java 2011-10-17 22:18:38 UTC (rev 4489)
@@ -33,9 +33,24 @@
String value = executeNewScript("b:setHref('" + newurl + "')");
Assert.assertEquals(newurl, driver.getCurrentUrl());
}
+
@Test
/**
+ * test the b:setHash function
+ */
+ public void url_setHash() throws Exception {
+ driver.get(executionpath + "/test/test.html");
+ driver.executeScript("window.stateHasToStay = 'state stays'", new Object[0]);
+ String newurl = executionpath + "/test/test.html#some_stuff";
+ String value = executeNewScript("b:setHash('" + "#some_stuff" + "')");
+ Assert.assertEquals(newurl, driver.getCurrentUrl());
+ String state = (String) driver.executeScript("return window.stateHasToStay;", new Object[0]);
+ Assert.assertEquals("state stays", state);
+ }
+
+ @Test
+ /**
* tests if the b:getLocation function returns the hash correctly
*/
public void url_getLocation() throws Exception {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-17 22:13:42
|
Revision: 4488
http://mxquery.svn.sourceforge.net/mxquery/?rev=4488&view=rev
Author: etterth
Date: 2011-10-17 22:13:36 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
- added b:setHash to functiongallery
Modified Paths:
--------------
trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/FG.xml
trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/FGPopulator.java
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/FG.xml
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/FG.xml 2011-10-17 20:51:05 UTC (rev 4487)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/FG.xml 2011-10-17 22:13:36 UTC (rev 4488)
@@ -67,6 +67,7 @@
<className>JsEval</className>
</functionDescription>
<functionDescription>
+<!-- timer -->
<functionName>timer</functionName>
<parameters>
<paramType>xs:integer</paramType>
@@ -74,6 +75,7 @@
</parameters>
<className>Timer</className>
</functionDescription>
+<!-- cookies -->
<functionDescription>
<functionName>getCookieNames</functionName>
<className>GetCookieNames</className>
@@ -110,7 +112,7 @@
<className>SetCookie</className>
</functionDescription>
<!-- TODO: setcookie and removeCookie with more arguments -->
-
+<!-- pageURI -->
<functionDescription>
<functionName>pageURI</functionName>
<className>LocUri</className>
@@ -123,9 +125,17 @@
<className>SetHref</className>
</functionDescription>/
<functionDescription>
+ <functionName>setHash</functionName>
+ <parameters>
+ <paramType>xs:string</paramType>
+ </parameters>
+ <className>SetHash</className>
+ </functionDescription>/
+ <functionDescription>
<functionName>getLocation</functionName>
<className>GetLocation</className>
- </functionDescription>
+ </functionDescription>
+<!-- alert -->
<functionDescription>
<functionName>alert</functionName>
<parameters>
@@ -133,6 +143,7 @@
</parameters>
<className>Alert</className>
</functionDescription>
+<!-- classes -->
<functionDescription>
<functionName>removeClass</functionName>
<parameters>
@@ -163,7 +174,26 @@
</parameters>
<className>ToggleClassName</className>
</functionDescription>
+<!-- styles -->
<functionDescription>
+ <functionName>getStyle</functionName>
+ <parameters>
+ <paramType>node()</paramType>
+ <paramType>xs:string</paramType>
+ </parameters>
+ <className>GetStyle</className>
+ </functionDescription>
+ <functionDescription>
+ <functionName>setStyle</functionName>
+ <parameters>
+ <paramType>node()</paramType>
+ <paramType>xs:string</paramType>
+ <paramType>xs:string</paramType>
+ </parameters>
+ <className>SetStyle</className>
+ </functionDescription>
+<!-- events -->
+ <functionDescription>
<functionName>addWindowListener</functionName>
<parameters>
@@ -215,23 +245,6 @@
<functionName>windowInfo</functionName>
<className>WindowInfo</className>
</functionDescription>
- <functionDescription>
- <functionName>getStyle</functionName>
- <parameters>
- <paramType>node()</paramType>
- <paramType>xs:string</paramType>
- </parameters>
- <className>GetStyle</className>
- </functionDescription>
- <functionDescription>
- <functionName>setStyle</functionName>
- <parameters>
- <paramType>node()</paramType>
- <paramType>xs:string</paramType>
- <paramType>xs:string</paramType>
- </parameters>
- <className>SetStyle</className>
- </functionDescription>
</functionGroup>
<functionGroup prefix="fn" namespace="http://www.w3.org/2005/xpath-functions">
<functionDescription>
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/FGPopulator.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/FGPopulator.java 2011-10-17 20:51:05 UTC (rev 4487)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/FGPopulator.java 2011-10-17 22:13:36 UTC (rev 4488)
@@ -433,6 +433,27 @@
qn = new QName(
"http://xqib.org",
"b",
+ "setHash");
+ paramTypes = new TypeInfo[1];
+
+ paramTypes[0] = xs_string;
+ signature = new FunctionSignature(qn, paramTypes, FunctionSignature.SYSTEM_FUNCTION, new Hashtable());
+
+ {
+ ch.ethz.mxquery.functions.b.SetHash iter = new ch.ethz.mxquery.functions.b.SetHash();
+ iter.setContext(context, false);
+
+ type = null;
+
+ function = new Function(
+ null,signature,
+ iter, null, type );
+ fg.add(function);
+ }
+
+ qn = new QName(
+ "http://xqib.org",
+ "b",
"getLocation");
paramTypes = new TypeInfo[0];
@@ -561,15 +582,15 @@
qn = new QName(
"http://xqib.org",
"b",
- "addWindowListener");
+ "getStyle");
paramTypes = new TypeInfo[2];
- paramTypes[0] = xs_string;
- paramTypes[1] = function__;
+ paramTypes[0] = node__;
+ paramTypes[1] = xs_string;
signature = new FunctionSignature(qn, paramTypes, FunctionSignature.SYSTEM_FUNCTION, new Hashtable());
{
- ch.ethz.mxquery.functions.b.AddWindowListener iter = new ch.ethz.mxquery.functions.b.AddWindowListener();
+ ch.ethz.mxquery.functions.b.GetStyle iter = new ch.ethz.mxquery.functions.b.GetStyle();
iter.setContext(context, false);
type = null;
@@ -583,15 +604,16 @@
qn = new QName(
"http://xqib.org",
"b",
- "removeWindowListener");
- paramTypes = new TypeInfo[2];
+ "setStyle");
+ paramTypes = new TypeInfo[3];
- paramTypes[0] = xs_string;
- paramTypes[1] = function__;
+ paramTypes[0] = node__;
+ paramTypes[1] = xs_string;
+ paramTypes[2] = xs_string;
signature = new FunctionSignature(qn, paramTypes, FunctionSignature.SYSTEM_FUNCTION, new Hashtable());
{
- ch.ethz.mxquery.functions.b.RemoveWindowListener iter = new ch.ethz.mxquery.functions.b.RemoveWindowListener();
+ ch.ethz.mxquery.functions.b.SetStyle iter = new ch.ethz.mxquery.functions.b.SetStyle();
iter.setContext(context, false);
type = null;
@@ -605,16 +627,15 @@
qn = new QName(
"http://xqib.org",
"b",
- "addEventListener");
- paramTypes = new TypeInfo[3];
+ "addWindowListener");
+ paramTypes = new TypeInfo[2];
- paramTypes[0] = node___plus;
- paramTypes[1] = xs_string;
- paramTypes[2] = function__;
+ paramTypes[0] = xs_string;
+ paramTypes[1] = function__;
signature = new FunctionSignature(qn, paramTypes, FunctionSignature.SYSTEM_FUNCTION, new Hashtable());
{
- ch.ethz.mxquery.functions.b.AddEventListener iter = new ch.ethz.mxquery.functions.b.AddEventListener();
+ ch.ethz.mxquery.functions.b.AddWindowListener iter = new ch.ethz.mxquery.functions.b.AddWindowListener();
iter.setContext(context, false);
type = null;
@@ -628,16 +649,15 @@
qn = new QName(
"http://xqib.org",
"b",
- "removeEventListener");
- paramTypes = new TypeInfo[3];
+ "removeWindowListener");
+ paramTypes = new TypeInfo[2];
- paramTypes[0] = node__;
- paramTypes[1] = xs_string;
- paramTypes[2] = function__;
+ paramTypes[0] = xs_string;
+ paramTypes[1] = function__;
signature = new FunctionSignature(qn, paramTypes, FunctionSignature.SYSTEM_FUNCTION, new Hashtable());
{
- ch.ethz.mxquery.functions.b.RemoveEventListener iter = new ch.ethz.mxquery.functions.b.RemoveEventListener();
+ ch.ethz.mxquery.functions.b.RemoveWindowListener iter = new ch.ethz.mxquery.functions.b.RemoveWindowListener();
iter.setContext(context, false);
type = null;
@@ -651,15 +671,16 @@
qn = new QName(
"http://xqib.org",
"b",
- "removeAnonymousEventListeners");
- paramTypes = new TypeInfo[2];
+ "addEventListener");
+ paramTypes = new TypeInfo[3];
- paramTypes[0] = node__;
+ paramTypes[0] = node___plus;
paramTypes[1] = xs_string;
+ paramTypes[2] = function__;
signature = new FunctionSignature(qn, paramTypes, FunctionSignature.SYSTEM_FUNCTION, new Hashtable());
{
- ch.ethz.mxquery.functions.b.RemoveAnonymousEventListener iter = new ch.ethz.mxquery.functions.b.RemoveAnonymousEventListener();
+ ch.ethz.mxquery.functions.b.AddEventListener iter = new ch.ethz.mxquery.functions.b.AddEventListener();
iter.setContext(context, false);
type = null;
@@ -673,13 +694,16 @@
qn = new QName(
"http://xqib.org",
"b",
- "dom");
- paramTypes = new TypeInfo[0];
+ "removeEventListener");
+ paramTypes = new TypeInfo[3];
+ paramTypes[0] = node__;
+ paramTypes[1] = xs_string;
+ paramTypes[2] = function__;
signature = new FunctionSignature(qn, paramTypes, FunctionSignature.SYSTEM_FUNCTION, new Hashtable());
{
- ch.ethz.mxquery.functions.b.Dom iter = new ch.ethz.mxquery.functions.b.Dom();
+ ch.ethz.mxquery.functions.b.RemoveEventListener iter = new ch.ethz.mxquery.functions.b.RemoveEventListener();
iter.setContext(context, false);
type = null;
@@ -693,13 +717,15 @@
qn = new QName(
"http://xqib.org",
"b",
- "windowInfo");
- paramTypes = new TypeInfo[0];
+ "removeAnonymousEventListeners");
+ paramTypes = new TypeInfo[2];
+ paramTypes[0] = node__;
+ paramTypes[1] = xs_string;
signature = new FunctionSignature(qn, paramTypes, FunctionSignature.SYSTEM_FUNCTION, new Hashtable());
{
- ch.ethz.mxquery.functions.b.WindowInfo iter = new ch.ethz.mxquery.functions.b.WindowInfo();
+ ch.ethz.mxquery.functions.b.RemoveAnonymousEventListener iter = new ch.ethz.mxquery.functions.b.RemoveAnonymousEventListener();
iter.setContext(context, false);
type = null;
@@ -713,15 +739,13 @@
qn = new QName(
"http://xqib.org",
"b",
- "getStyle");
- paramTypes = new TypeInfo[2];
+ "dom");
+ paramTypes = new TypeInfo[0];
- paramTypes[0] = node__;
- paramTypes[1] = xs_string;
signature = new FunctionSignature(qn, paramTypes, FunctionSignature.SYSTEM_FUNCTION, new Hashtable());
{
- ch.ethz.mxquery.functions.b.GetStyle iter = new ch.ethz.mxquery.functions.b.GetStyle();
+ ch.ethz.mxquery.functions.b.Dom iter = new ch.ethz.mxquery.functions.b.Dom();
iter.setContext(context, false);
type = null;
@@ -735,16 +759,13 @@
qn = new QName(
"http://xqib.org",
"b",
- "setStyle");
- paramTypes = new TypeInfo[3];
+ "windowInfo");
+ paramTypes = new TypeInfo[0];
- paramTypes[0] = node__;
- paramTypes[1] = xs_string;
- paramTypes[2] = xs_string;
signature = new FunctionSignature(qn, paramTypes, FunctionSignature.SYSTEM_FUNCTION, new Hashtable());
{
- ch.ethz.mxquery.functions.b.SetStyle iter = new ch.ethz.mxquery.functions.b.SetStyle();
+ ch.ethz.mxquery.functions.b.WindowInfo iter = new ch.ethz.mxquery.functions.b.WindowInfo();
iter.setContext(context, false);
type = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-17 20:51:12
|
Revision: 4487
http://mxquery.svn.sourceforge.net/mxquery/?rev=4487&view=rev
Author: etterth
Date: 2011-10-17 20:51:05 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
- added test for b:toggleClass
Modified Paths:
--------------
trunk/XQIB_Testing/build.xml
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/context.xml
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Classes.java
Modified: trunk/XQIB_Testing/build.xml
===================================================================
--- trunk/XQIB_Testing/build.xml 2011-10-17 13:57:24 UTC (rev 4486)
+++ trunk/XQIB_Testing/build.xml 2011-10-17 20:51:05 UTC (rev 4487)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="MXQuery_Testing" default="test" basedir=".">
- <property name="buildhost" value="http://fifthelement.inf.ethz.ch:8081/job" />
+ <property name="buildhost" value="http://sgv-jenkins-01.ethz.ch/job" />
<property name="tomcat.home" value="./lib/apache-tomcat-6.0.32" />
<property name="test.home" value="webapps/test/" />
Modified: trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/context.xml
===================================================================
--- trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/context.xml 2011-10-17 13:57:24 UTC (rev 4486)
+++ trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/context.xml 2011-10-17 20:51:05 UTC (rev 4487)
@@ -16,7 +16,7 @@
limitations under the License.
-->
<!-- The contents of this file will be loaded for each web application -->
-<Context>
+<Context allowLinking="true">
<!-- Default set of monitored resources -->
<WatchedResource>WEB-INF/web.xml</WatchedResource>
@@ -32,4 +32,4 @@
<Valve className="org.apache.catalina.valves.CometConnectionManagerValve" />
-->
-</Context>
\ No newline at end of file
+</Context>
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Classes.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Classes.java 2011-10-17 13:57:24 UTC (rev 4486)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Classes.java 2011-10-17 20:51:05 UTC (rev 4487)
@@ -38,9 +38,26 @@
String value = executeNewScript("b:getClasses(b:dom()//p)");
Assert.assertEquals("class2", value);
}
+
+ @Test
+ /**
+ * test the b:toggleClass function
+ */
+ public void class_toggleclass() throws Exception {
+ driver.get(executionpath + "/test/test.html");
+ executeNewScript("insert node <p/> as first into b:dom()//body");
+ executeNewScript("b:addClass(b:dom()//p,'class2')");
+ executeNewScript("b:toggleClass(b:dom()//p,'class1')");
+ String value = executeNewScript("b:getClasses(b:dom()//p)");
+ Assert.assertTrue(value.contains("class2"));
+ executeNewScript("b:toggleClass(b:dom()//p,'class1')");
+ value = executeNewScript("b:getClasses(b:dom()//p)");
+ Assert.assertEquals("class2", value);
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-17 13:57:30
|
Revision: 4486
http://mxquery.svn.sourceforge.net/mxquery/?rev=4486&view=rev
Author: etterth
Date: 2011-10-17 13:57:24 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
- Added parent axis, fixed ancestor-or-self
Modified Paths:
--------------
trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeStore.java
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeStore.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeStore.java 2011-10-17 13:27:30 UTC (rev 4485)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeStore.java 2011-10-17 13:57:24 UTC (rev 4486)
@@ -19,6 +19,7 @@
import ch.ethz.mxquery.exceptions.MXQueryException;
import ch.ethz.mxquery.iterators.browser.NodeStoreIterator;
import ch.ethz.mxquery.iterators.browser.SingleNodeIterator;
+import ch.ethz.mxquery.model.EmptySequenceIterator;
import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.model.XDMIterator;
import ch.ethz.mxquery.model.updatePrimitives.UpdateableStore;
@@ -85,8 +86,12 @@
@Override
public XDMIterator getParentIterator(Identifier id) throws MXQueryException {
- // TODO Auto-generated method stub
- return null;
+ NodeToken tok = (NodeToken) id;
+ Node parentNode = tok.getNode().getParentNode();
+ if (parentNode == null){
+ return new EmptySequenceIterator(null, null);
+ }
+ return new SingleNodeIterator(parentNode);
}
@Override
@@ -94,6 +99,8 @@
throws MXQueryException {
NodeToken tok = (NodeToken) id;
Vector<XDMIterator> ancestors = new Vector<XDMIterator>();
+ if (includeSelf)
+ ancestors.add(new SingleNodeIterator(tok.node));
Node ancestor = tok.getNode().getParentNode();
while (ancestor != null){
ancestors.add(new SingleNodeIterator(ancestor));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-17 13:27:41
|
Revision: 4485
http://mxquery.svn.sourceforge.net/mxquery/?rev=4485&view=rev
Author: etterth
Date: 2011-10-17 13:27:30 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
- Fixed some number printing
Modified Paths:
--------------
trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryBigDecimal.java
trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryDouble.java
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryBigDecimal.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryBigDecimal.java 2011-10-17 08:44:52 UTC (rev 4484)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryBigDecimal.java 2011-10-17 13:27:30 UTC (rev 4485)
@@ -246,17 +246,17 @@
for (int i=0; i < scale; i++) {
if ( this.val.setScale(i, BigDecimal.ROUND_DOWN).setScale(scale).compareTo(this.val) == 0){
// for 1.5, 1.6 use
- //return this.val.setScale(i).toPlainString();
+ return this.val.setScale(i).toPlainString();
// for 1.4 use
- return this.val.setScale(i).toString();
+// return this.val.setScale(i).toString();
}
}
}
// for 1.5, 1.6 use
-// return this.val.toPlainString();
+ return this.val.toPlainString();
// for 1.4 use
- return this.val.toString();
+// return this.val.toString();
}
public String toDecimalString() {
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryDouble.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryDouble.java 2011-10-17 08:44:52 UTC (rev 4484)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/datamodel/MXQueryDouble.java 2011-10-17 13:27:30 UTC (rev 4485)
@@ -295,6 +295,7 @@
protected static String toString(double value, String javaStrValue, boolean isNegativeZero) {
javaStrValue = javaStrValue.replace("e+", "E");
+ javaStrValue = javaStrValue.replace("e-", "E-");
if (value==0.0) {
if (javaStrValue.charAt(0) == '-' || isNegativeZero) {
return "-0";
@@ -328,6 +329,9 @@
s = s.substring(0, s.length()-1);
}
return sign + firstchar + "." + s + "E" + e;
+ } else if (s.indexOf(".")<0) {
+ int epos = s.indexOf("E");
+ return s.substring(0,epos) + ".0" + s.substring(epos);
} else {
return s;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-17 08:44:58
|
Revision: 4484
http://mxquery.svn.sourceforge.net/mxquery/?rev=4484&view=rev
Author: etterth
Date: 2011-10-17 08:44:52 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
- Ancestor axis also supported now
Modified Paths:
--------------
trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeStore.java
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeStore.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeStore.java 2011-10-17 08:33:58 UTC (rev 4483)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeStore.java 2011-10-17 08:44:52 UTC (rev 4484)
@@ -92,8 +92,16 @@
@Override
public XDMIterator[] getAncestors(Identifier id, boolean includeSelf)
throws MXQueryException {
- // TODO Auto-generated method stub
- return null;
+ NodeToken tok = (NodeToken) id;
+ Vector<XDMIterator> ancestors = new Vector<XDMIterator>();
+ Node ancestor = tok.getNode().getParentNode();
+ while (ancestor != null){
+ ancestors.add(new SingleNodeIterator(ancestor));
+ ancestor = ancestor.getParentNode();
+ }
+ XDMIterator [] ret = new XDMIterator[ancestors.size()];
+ ancestors.copyInto(ret);
+ return ret;
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-17 08:34:05
|
Revision: 4483
http://mxquery.svn.sourceforge.net/mxquery/?rev=4483&view=rev
Author: etterth
Date: 2011-10-17 08:33:58 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
- Cleaned up unnecessary classes
- following- and preceding-sibling working
Modified Paths:
--------------
trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeStore.java
Removed Paths:
-------------
trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/FollowingIterator.java
trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/FollowingSiblingIterator.java
Deleted: trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/FollowingIterator.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/FollowingIterator.java 2011-10-17 08:19:46 UTC (rev 4482)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/FollowingIterator.java 2011-10-17 08:33:58 UTC (rev 4483)
@@ -1,42 +0,0 @@
-package ch.ethz.mxquery.update.store.domImpl;
-
-import ch.ethz.mxquery.util.browser.dom.Node;
-
-import ch.ethz.mxquery.contextConfig.Context;
-import ch.ethz.mxquery.datamodel.xdm.Token;
-import ch.ethz.mxquery.datamodel.xdm.TokenInterface;
-import ch.ethz.mxquery.exceptions.MXQueryException;
-import ch.ethz.mxquery.iterators.browser.NodeStoreIterator;
-
-public class FollowingIterator extends NodeStoreIterator {
-
- protected NodeToken start;
-
- public FollowingIterator(Node store, NodeToken start) {
- super(store);
- current = start;
- this.start = start;
- }
-
- @Override
- public TokenInterface next() throws MXQueryException {
- if (called == 0){
- init();
- called++;
- return current;
- }
- TokenInterface tmp = super.next();
- return tmp;
- }
-
- @Override
- protected void init() {
- current = start;
- }
-
- @Override
- protected void resetImpl() throws MXQueryException {
- super.resetImpl();
- }
-
-}
Deleted: trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/FollowingSiblingIterator.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/FollowingSiblingIterator.java 2011-10-17 08:19:46 UTC (rev 4482)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/FollowingSiblingIterator.java 2011-10-17 08:33:58 UTC (rev 4483)
@@ -1,57 +0,0 @@
-package ch.ethz.mxquery.update.store.domImpl;
-
-
-import ch.ethz.mxquery.contextConfig.Context;
-import ch.ethz.mxquery.datamodel.xdm.Token;
-import ch.ethz.mxquery.datamodel.xdm.TokenInterface;
-import ch.ethz.mxquery.exceptions.MXQueryException;
-import ch.ethz.mxquery.iterators.browser.NodeStoreIterator;
-import ch.ethz.mxquery.util.browser.dom.Node;
-
-public class FollowingSiblingIterator extends NodeStoreIterator{
-
- protected NodeToken start;
- protected Node end;
- boolean endreached = false;
- public FollowingSiblingIterator(Node store,
- NodeToken start) {
- super(store);
- this.start = start;
- end = start.getNode().getParentNode();
-
- }
-
- @Override
- public TokenInterface next() throws MXQueryException {
- if (called == 0){
- init();
- called++;
- return current;
- }
- TokenInterface tmp = super.next();
- if (tmp == Token.END_SEQUENCE_TOKEN || endreached){
- return Token.END_SEQUENCE_TOKEN;
- }
- NodeToken tok = (NodeToken) tmp;
- if (tok.getNode() == start.getNode()){
- endreached = true;
- return tmp;
- }
- if (tok.getNode() == end){
- endreached = true;
- return Token.END_SEQUENCE_TOKEN;
- }
- return tmp;
- }
-
- @Override
- protected void init() {
- current = start;
- }
-
- @Override
- protected void resetImpl() throws MXQueryException {
- endreached = false;
- super.resetImpl();
- }
-}
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeStore.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeStore.java 2011-10-17 08:19:46 UTC (rev 4482)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/update/store/domImpl/NodeStore.java 2011-10-17 08:33:58 UTC (rev 4483)
@@ -18,6 +18,7 @@
import ch.ethz.mxquery.datamodel.xdm.TokenInterface;
import ch.ethz.mxquery.exceptions.MXQueryException;
import ch.ethz.mxquery.iterators.browser.NodeStoreIterator;
+import ch.ethz.mxquery.iterators.browser.SingleNodeIterator;
import ch.ethz.mxquery.model.Window;
import ch.ethz.mxquery.model.XDMIterator;
import ch.ethz.mxquery.model.updatePrimitives.UpdateableStore;
@@ -99,22 +100,30 @@
public XDMIterator[] getFollowingSiblings(Identifier id)
throws MXQueryException {
NodeToken tok = (NodeToken) id;
- Vector<XDMIterator> ancs = new Vector<XDMIterator>();
+ Vector<XDMIterator> siblings = new Vector<XDMIterator>();
Node followingsibling = tok.getNode().getNextSibling();
while (followingsibling != null){
- ancs.add(new FollowingSiblingIterator(doc, NodeToken.createToken(followingsibling)));
+ siblings.add(new SingleNodeIterator(followingsibling));
followingsibling = followingsibling.getNextSibling();
}
- XDMIterator [] ret = new XDMIterator[ancs.size()];
- ancs.copyInto(ret);
+ XDMIterator [] ret = new XDMIterator[siblings.size()];
+ siblings.copyInto(ret);
return ret;
}
@Override
public XDMIterator[] getPrecedingSiblings(Identifier id)
throws MXQueryException {
- // TODO Auto-generated method stub
- return null;
+ NodeToken tok = (NodeToken) id;
+ Vector<XDMIterator> siblings = new Vector<XDMIterator>();
+ Node precedingingsibling = tok.getNode().getPreviousSibling();
+ while (precedingingsibling != null){
+ siblings.add(new SingleNodeIterator(precedingingsibling));
+ precedingingsibling = precedingingsibling.getPreviousSibling();
+ }
+ XDMIterator [] ret = new XDMIterator[siblings.size()];
+ siblings.copyInto(ret);
+ return ret;
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-17 08:19:55
|
Revision: 4482
http://mxquery.svn.sourceforge.net/mxquery/?rev=4482&view=rev
Author: etterth
Date: 2011-10-17 08:19:46 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
- updated the fifthelement path in MXQuery_Testing
Modified Paths:
--------------
trunk/MXQuery_Testing/build.xml
Modified: trunk/MXQuery_Testing/build.xml
===================================================================
--- trunk/MXQuery_Testing/build.xml 2011-10-17 07:42:21 UTC (rev 4481)
+++ trunk/MXQuery_Testing/build.xml 2011-10-17 08:19:46 UTC (rev 4482)
@@ -9,7 +9,7 @@
<property name="resources.dir" value="${root.dir}/lib"/>
<property name="build.dir" value="${root.dir}/build"/>
<property name="dist.dir" value="${root.dir}/../MXQuery/dist"/>
- <property name="buildhost" value="http://http://sgv-jenkins-01.ethz.ch/job"/>
+ <property name="buildhost" value="http://sgv-jenkins-01.ethz.ch/job"/>
<property name="androidtmp.dir" value="${root.dir}/androidtmp"/>
<property name="midpsrc.dir" value="${root.dir}/midp_src"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-17 07:42:27
|
Revision: 4481
http://mxquery.svn.sourceforge.net/mxquery/?rev=4481&view=rev
Author: etterth
Date: 2011-10-17 07:42:21 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
- updated the fifthelement path in MXQuery_Testing
Modified Paths:
--------------
trunk/MXQuery_Testing/build.xml
Modified: trunk/MXQuery_Testing/build.xml
===================================================================
--- trunk/MXQuery_Testing/build.xml 2011-10-17 07:34:38 UTC (rev 4480)
+++ trunk/MXQuery_Testing/build.xml 2011-10-17 07:42:21 UTC (rev 4481)
@@ -9,7 +9,7 @@
<property name="resources.dir" value="${root.dir}/lib"/>
<property name="build.dir" value="${root.dir}/build"/>
<property name="dist.dir" value="${root.dir}/../MXQuery/dist"/>
- <property name="buildhost" value="http://fifthelement.inf.ethz.ch:8081/job"/>
+ <property name="buildhost" value="http://http://sgv-jenkins-01.ethz.ch/job"/>
<property name="androidtmp.dir" value="${root.dir}/androidtmp"/>
<property name="midpsrc.dir" value="${root.dir}/midp_src"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-17 07:34:44
|
Revision: 4480
http://mxquery.svn.sourceforge.net/mxquery/?rev=4480&view=rev
Author: etterth
Date: 2011-10-17 07:34:38 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
- Reverted last commit (made a mistake grepping)
Added Paths:
-----------
trunk/MXQuery/src/ch/ethz/mxquery/iterators/NodeIterator.java
Copied: trunk/MXQuery/src/ch/ethz/mxquery/iterators/NodeIterator.java (from rev 4478, trunk/MXQuery/src/ch/ethz/mxquery/iterators/NodeIterator.java)
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/iterators/NodeIterator.java (rev 0)
+++ trunk/MXQuery/src/ch/ethz/mxquery/iterators/NodeIterator.java 2011-10-17 07:34:38 UTC (rev 4480)
@@ -0,0 +1,62 @@
+/* Copyright 2006 - 2009 ETH Zurich
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ch.ethz.mxquery.iterators;
+
+import java.util.Vector;
+
+import ch.ethz.mxquery.contextConfig.Context;
+import ch.ethz.mxquery.datamodel.types.Type;
+import ch.ethz.mxquery.datamodel.xdm.Token;
+import ch.ethz.mxquery.datamodel.xdm.TokenInterface;
+import ch.ethz.mxquery.exceptions.MXQueryException;
+import ch.ethz.mxquery.exceptions.QueryLocation;
+import ch.ethz.mxquery.model.CurrentBasedIterator;
+import ch.ethz.mxquery.model.XDMIterator;
+
+/**
+ * Gets all children from the passed iterator (incl. atomic values).
+ *
+ * @author dagraf
+ *
+ */
+public class NodeIterator extends CurrentBasedIterator {
+ //private int depth = 0;
+
+ public NodeIterator(Context ctx, XDMIterator root, QueryLocation location) {
+ super(ctx, new XDMIterator[] { root }, location);
+ this.current = root;
+ }
+
+ public TokenInterface next() throws MXQueryException {
+ if (this.endOfSeq) {
+ return Token.END_SEQUENCE_TOKEN;
+ }
+ int pre;
+ TokenInterface tok;
+ do {
+ pre = this.depth;
+ tok = this.getNext();
+ } while (tok.getEventType() != Type.END_SEQUENCE
+ && (pre == 0 || this.depth == 0 || (Type.isAttribute(tok.getEventType()) && this.depth == 1)));
+ if (tok.getEventType() == Type.END_SEQUENCE) {
+ this.endOfSeq = true;
+ }
+ return tok;
+ }
+
+ protected XDMIterator copy(Context context, XDMIterator[] subIters, Vector nestedPredCtxStack) throws MXQueryException {
+ return new NodeIterator(context, subIters[0],loc);
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-17 07:28:49
|
Revision: 4479
http://mxquery.svn.sourceforge.net/mxquery/?rev=4479&view=rev
Author: etterth
Date: 2011-10-17 07:28:42 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
- Removed unused iterator
Removed Paths:
-------------
trunk/MXQuery/src/ch/ethz/mxquery/iterators/NodeIterator.java
Deleted: trunk/MXQuery/src/ch/ethz/mxquery/iterators/NodeIterator.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/iterators/NodeIterator.java 2011-10-16 23:44:22 UTC (rev 4478)
+++ trunk/MXQuery/src/ch/ethz/mxquery/iterators/NodeIterator.java 2011-10-17 07:28:42 UTC (rev 4479)
@@ -1,62 +0,0 @@
-/* Copyright 2006 - 2009 ETH Zurich
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package ch.ethz.mxquery.iterators;
-
-import java.util.Vector;
-
-import ch.ethz.mxquery.contextConfig.Context;
-import ch.ethz.mxquery.datamodel.types.Type;
-import ch.ethz.mxquery.datamodel.xdm.Token;
-import ch.ethz.mxquery.datamodel.xdm.TokenInterface;
-import ch.ethz.mxquery.exceptions.MXQueryException;
-import ch.ethz.mxquery.exceptions.QueryLocation;
-import ch.ethz.mxquery.model.CurrentBasedIterator;
-import ch.ethz.mxquery.model.XDMIterator;
-
-/**
- * Gets all children from the passed iterator (incl. atomic values).
- *
- * @author dagraf
- *
- */
-public class NodeIterator extends CurrentBasedIterator {
- //private int depth = 0;
-
- public NodeIterator(Context ctx, XDMIterator root, QueryLocation location) {
- super(ctx, new XDMIterator[] { root }, location);
- this.current = root;
- }
-
- public TokenInterface next() throws MXQueryException {
- if (this.endOfSeq) {
- return Token.END_SEQUENCE_TOKEN;
- }
- int pre;
- TokenInterface tok;
- do {
- pre = this.depth;
- tok = this.getNext();
- } while (tok.getEventType() != Type.END_SEQUENCE
- && (pre == 0 || this.depth == 0 || (Type.isAttribute(tok.getEventType()) && this.depth == 1)));
- if (tok.getEventType() == Type.END_SEQUENCE) {
- this.endOfSeq = true;
- }
- return tok;
- }
-
- protected XDMIterator copy(Context context, XDMIterator[] subIters, Vector nestedPredCtxStack) throws MXQueryException {
- return new NodeIterator(context, subIters[0],loc);
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-16 23:44:29
|
Revision: 4478
http://mxquery.svn.sourceforge.net/mxquery/?rev=4478&view=rev
Author: etterth
Date: 2011-10-16 23:44:22 +0000 (Sun, 16 Oct 2011)
Log Message:
-----------
- added config file for firefox tomcat server
Added Paths:
-----------
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/firefox-server.xml
Added: trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/firefox-server.xml
===================================================================
--- trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/firefox-server.xml (rev 0)
+++ trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/firefox-server.xml 2011-10-16 23:44:22 UTC (rev 4478)
@@ -0,0 +1,148 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- Note: A "Server" is not itself a "Container", so you may not
+ define subcomponents such as "Valves" at this level.
+ Documentation at /docs/config/server.html
+ -->
+<Server port="8007" shutdown="SHUTDOWN">
+
+ <!--APR library loader. Documentation at /docs/apr.html -->
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+ <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
+ <Listener className="org.apache.catalina.core.JasperListener" />
+ <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+ <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+ <!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html -->
+ <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
+ <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+
+ <!-- Global JNDI resources
+ Documentation at /docs/jndi-resources-howto.html
+ -->
+ <GlobalNamingResources>
+ <!-- Editable user database that can also be used by
+ UserDatabaseRealm to authenticate users
+ -->
+ <Resource name="UserDatabase" auth="Container"
+ type="org.apache.catalina.UserDatabase"
+ description="User database that can be updated and saved"
+ factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+ pathname="conf/tomcat-users.xml" />
+ </GlobalNamingResources>
+
+ <!-- A "Service" is a collection of one or more "Connectors" that share
+ a single "Container" Note: A "Service" is not itself a "Container",
+ so you may not define subcomponents such as "Valves" at this level.
+ Documentation at /docs/config/service.html
+ -->
+ <Service name="Catalina">
+
+ <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+ <!--
+ <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+ maxThreads="150" minSpareThreads="4"/>
+ -->
+
+
+ <!-- A "Connector" represents an endpoint by which requests are received
+ and responses are returned. Documentation at :
+ Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+ Java AJP Connector: /docs/config/ajp.html
+ APR (HTTP/AJP) Connector: /docs/apr.html
+ Define a non-SSL HTTP/1.1 Connector on port 8080
+ -->
+ <Connector port="8092" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8443" />
+ <!-- A "Connector" using the shared thread pool-->
+ <!--
+ <Connector executor="tomcatThreadPool"
+ port="8080" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8443" />
+ -->
+ <!-- Define a SSL HTTP/1.1 Connector on port 8443
+ This connector uses the JSSE configuration, when using APR, the
+ connector should be using the OpenSSL style configuration
+ described in the APR documentation -->
+ <!--
+ <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+ maxThreads="150" scheme="https" secure="true"
+ clientAuth="false" sslProtocol="TLS" />
+ -->
+
+ <!-- Define an AJP 1.3 Connector on port 8009 -->
+ <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+
+
+ <!-- An Engine represents the entry point (within Catalina) that processes
+ every request. The Engine implementation for Tomcat stand alone
+ analyzes the HTTP headers included with the request, and passes them
+ on to the appropriate Host (virtual host).
+ Documentation at /docs/config/engine.html -->
+
+ <!-- You should set jvmRoute to support load-balancing via AJP ie :
+ <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+ -->
+ <Engine name="Catalina" defaultHost="localhost">
+
+ <!--For clustering, please take a look at documentation at:
+ /docs/cluster-howto.html (simple how to)
+ /docs/config/cluster.html (reference documentation) -->
+ <!--
+ <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+ -->
+
+ <!-- The request dumper valve dumps useful debugging information about
+ the request and response data received and sent by Tomcat.
+ Documentation at: /docs/config/valve.html -->
+ <!--
+ <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
+ -->
+
+ <!-- This Realm uses the UserDatabase configured in the global JNDI
+ resources under the key "UserDatabase". Any edits
+ that are performed against this UserDatabase are immediately
+ available for use by the Realm. -->
+ <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+ resourceName="UserDatabase"/>
+
+ <!-- Define the default virtual host
+ Note: XML Schema validation will not work with Xerces 2.2.
+ -->
+ <Host name="localhost" appBase="../../webapps"
+ unpackWARs="true" autoDeploy="true"
+ xmlValidation="false" xmlNamespaceAware="false">
+
+ <!-- SingleSignOn valve, share authentication between web applications
+ Documentation at: /docs/config/valve.html -->
+ <!--
+ <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+ -->
+
+ <!-- Access log processes all example.
+ Documentation at: /docs/config/valve.html -->
+ <!--
+ <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+ prefix="localhost_access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
+ -->
+
+ </Host>
+ </Engine>
+ </Service>
+</Server>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-16 23:41:35
|
Revision: 4477
http://mxquery.svn.sourceforge.net/mxquery/?rev=4477&view=rev
Author: etterth
Date: 2011-10-16 23:41:27 +0000 (Sun, 16 Oct 2011)
Log Message:
-----------
- reverted changes in 4466 to build.xml (the test folder no longer needs to be added to gwt_war
Modified Paths:
--------------
trunk/MXQuery/build.xml
Modified: trunk/MXQuery/build.xml
===================================================================
--- trunk/MXQuery/build.xml 2011-10-16 23:32:38 UTC (rev 4476)
+++ trunk/MXQuery/build.xml 2011-10-16 23:41:27 UTC (rev 4477)
@@ -17,22 +17,18 @@
<project name="MXQuery" default="jar" basedir=".">
-
- <property name="officialName" value="MXQuery">
- </property>
- <property name="version" value="0.6.1">
- </property>
- <property name="year" value="2006-2009">
- </property>
- <property name="copyright" value="ETH Zurich">
- </property>
-
- <property name="debug" value="on"/>
- <property name="optimize" value="on"/>
+
+ <property name="officialName" value="MXQuery"></property>
+ <property name="version" value="0.6.1"></property>
+ <property name="year" value="2006-2009"></property>
+ <property name="copyright" value="ETH Zurich"></property>
+
+ <property name="debug" value="on"/>
+ <property name="optimize" value="on"/>
<property name="src.version" value="1.3"/>
-
+
<property name="root.dir" value="."/>
- <property name="src.dir" value="${root.dir}/src"/>
+ <property name="src.dir" value="${root.dir}/src"/>
<property name="resources.dir" value="${root.dir}/lib"/>
<property name="build.dir" value="${root.dir}/build"/>
<property name="dist.dir" value="${root.dir}/dist"/>
@@ -40,19 +36,19 @@
<property name="customtmp.dir" value="${root.dir}/customtmp"/>
<property name="midptmp.dir" value="${customtmp.dir}"/>
<property name="xqibtmp.dir" value="${customtmp.dir}"/>
-
+
<property name="tmpfunc.dir" value="${customtmp.dir}/ch/ethz/mxquery/functions"/>
<property name="srcfunc.dir" value="${src.dir}/ch/ethz/mxquery/functions"/>
-
+
<property name="noparsertmp.dir" value="${root.dir}/noparsertmp"/>
-
+
<property name="modules.dir" value="${root.dir}/mod2export"/>
<property name="war.dir" value ="${build.dir}/war"/>
<property name="gwt_war.dir" value ="${build.dir}/gwt_war"/>
<property name="gwt_webinf.dir" value ="${gwt_war.dir}/WEB-INF"/>
<property name="gwt_webclasses.dir" value ="${gwt_webinf.dir}/classes"/>
<property name="xqib_samples.dir" value ="${root.dir}/xqib_samples"/>
-
+
<property name="webinf.dir" value="${war.dir}/WEB-INF"/>
<property name="weblib.dir" value="${webinf.dir}/lib"/>
<property name="webclasses.dir" value="${webinf.dir}/classes"/>
@@ -60,9 +56,9 @@
<property name="utilservlet.dir" value="${webclasses.dir}/ch/ethz/mxquery/util"/>
<property name="xspcontent.dir" value="${root.dir}/XSP"/>
-
+
<import file="generate_funcgallery.xml"/>
-
+
<condition property="wtk.home" value="C:\\WTK2.5.2_01">
<os family="windows"/>
</condition>
@@ -78,52 +74,52 @@
<property name="altsrc.dir" value="${root.dir}/altsrc"/>
<path id="project.class.path">
- <pathelement location="${resources.dir}/xml-apis.jar" />
- <fileset dir="${resources.dir}">
- <include name="*.jar"/>
- </fileset>
- <pathelement path="${java.class.path}"/>
+ <pathelement location="${resources.dir}/xml-apis.jar" />
+ <fileset dir="${resources.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement path="${java.class.path}"/>
</path>
-
+
<path id="midlet.class.path">
- <pathelement location="${build.dir}"/>
- <fileset dir="${resources.dir}">
- <include name="kxml2-min-2.3.0.jar"/>
- <include name="xmlpull_1_1_3_4c.jar"/>
- <include name="microlog-logger-core-2.3.5.jar"/>
+ <pathelement location="${build.dir}"/>
+ <fileset dir="${resources.dir}">
+ <include name="kxml2-min-2.3.0.jar"/>
+ <include name="xmlpull_1_1_3_4c.jar"/>
+ <include name="microlog-logger-core-2.3.5.jar"/>
- </fileset>
+ </fileset>
</path>
-
+
<taskdef resource="antenna.properties" classpath="${resources.dir}/antenna-bin-0.9.14.jar"/>
-
- <target name="clean">
- <echo message="Cleaning directories..."/>
- <delete>
- <fileset dir="${build.dir}/">
- <exclude name="gwt_war/mxqueryjs/**/*"/>
- <include name="**/*"/>
- </fileset>
- <fileset dir="${customtmp.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
-
+
+ <target name="clean">
+ <echo message="Cleaning directories..."/>
+ <delete>
+ <fileset dir="${build.dir}/">
+ <exclude name="gwt_war/mxqueryjs/**/*"/>
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="${customtmp.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+
<mkdir dir="${build.dir}"/>
- <mkdir dir="${dist.dir}"/>
- <mkdir dir="${customtmp.dir}"/>
- </target>
-
- <target name="compile" depends="clean">
+ <mkdir dir="${dist.dir}"/>
+ <mkdir dir="${customtmp.dir}"/>
+ </target>
+
+ <target name="compile" depends="clean">
<echo message="Compiling..."/>
-
+
<depend srcdir="${src.dir}"
destdir="${build.dir}"
cache="depcache"
closure="yes"
/>
- <javac source="${src.version}"
+ <javac source="${src.version}"
srcdir="${src.dir}"
destdir="${build.dir}"
target="1.4"
@@ -132,21 +128,19 @@
optimize="${optimize}"
extdirs=""
/>
- </target>
+ </target>
- <target name="compile-15" depends="clean">
- <echo message="Merging source trees"/>
- <delete>
- <fileset dir="${customtmp.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
- <copy todir="${customtmp.dir}">
- <fileset dir="${src.dir}"/>
- </copy>
+ <target name="compile-15" depends="clean">
+ <echo message="Merging source trees"/>
+ <delete>
+ <fileset dir="${customtmp.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+ <copy todir="${customtmp.dir}"><fileset dir="${src.dir}"/></copy>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java" />
<depend srcdir="${customtmp.dir}"
destdir="${build.dir}"
@@ -154,7 +148,7 @@
closure="yes"
/>
- <javac source="${src.version}"
+ <javac source="${src.version}"
srcdir="${customtmp.dir}"
destdir="${build.dir}"
target="1.4"
@@ -163,69 +157,67 @@
optimize="${optimize}"
extdirs=""
/>
- </target>
+ </target>
- <target name="compile-14" depends="clean">
- <echo message="Merging source trees"/>
- <delete>
- <fileset dir="${customtmp.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
- <copy todir="${customtmp.dir}">
- <fileset dir="${src.dir}"/>
- </copy>
+ <target name="compile-14" depends="clean">
+ <echo message="Merging source trees"/>
+ <delete>
+ <fileset dir="${customtmp.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+ <copy todir="${customtmp.dir}"><fileset dir="${src.dir}"/></copy>
- <delete>
- <fileset dir="${customtmp.dir}/ch/ethz/mxquery/sms/MMimpl/" id="id">
- <include name="*.java"/>
- <exclude name="TokenBufferStore.java"/>
+ <delete>
+ <fileset dir="${customtmp.dir}/ch/ethz/mxquery/sms/MMimpl/" id="id">
+ <include name="*.java"/>
+ <exclude name="TokenBufferStore.java"/>
<exclude name="MaterializingTokenBufferStore.java"/>
- </fileset>
- <fileset dir="${customtmp.dir}/ch/ethz/mxquery/parallel" id="id">
- <include name="*.java"/>
- </fileset>
- </delete>
+ </fileset>
+ <fileset dir="${customtmp.dir}/ch/ethz/mxquery/parallel" id="id">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/AvailEnvVars.java"/>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PFFLWORIterator.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PGFLWORIterator.java"/>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PGroupBy.java"/>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBinding.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBindingParallel.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/XSPMain.java"/>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/query/parser/J56Parser.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/extensionsModules/util/Uuid.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/AvailEnvVars.java"/>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PFFLWORIterator.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PGFLWORIterator.java"/>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PGroupBy.java"/>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBinding.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBindingParallel.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/XSPMain.java"/>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/query/parser/J56Parser.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/extensionsModules/util/Uuid.java" />
- <delete file="${customtmp.dir}/examples/StreamExample.java" />
- <delete file="${customtmp.dir}/examples/StreamStatsDemo.java" />
- <delete file="${customtmp.dir}/examples/StreamLifecycleExample.java" />
- <delete>
- <fileset dir="${customtmp.dir}/ch/ethz/mxquery/dmcq/">
- <include name="*.java"/>
- </fileset>
- </delete>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/util/PerfTools.java" />
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/String_Length.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/SubString.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/StringToCodepoints.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/Translate.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes" />
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/sms/MMimpl/TokenBufferStore.java" todir="${customtmp.dir}/ch/ethz/mxquery/sms/MMimpl/" overwrite="yes" />
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/sms/StoreFactory.java" todir="${customtmp.dir}/ch/ethz/mxquery/sms/" overwrite="yes" />
+ <delete file="${customtmp.dir}/examples/StreamExample.java" />
+ <delete file="${customtmp.dir}/examples/StreamStatsDemo.java" />
+ <delete file="${customtmp.dir}/examples/StreamLifecycleExample.java" />
+ <delete>
+ <fileset dir="${customtmp.dir}/ch/ethz/mxquery/dmcq/">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/util/PerfTools.java" />
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/String_Length.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/SubString.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/StringToCodepoints.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/Translate.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes" />
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/sms/MMimpl/TokenBufferStore.java" todir="${customtmp.dir}/ch/ethz/mxquery/sms/MMimpl/" overwrite="yes" />
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/sms/StoreFactory.java" todir="${customtmp.dir}/ch/ethz/mxquery/sms/" overwrite="yes" />
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/bindings/WindowBuffer.java" todir="${customtmp.dir}/ch/ethz/mxquery/bindings/" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/util/PlatformDependentUtils.java" todir="${customtmp.dir}/ch/ethz/mxquery/util" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/datamodel/MXQueryFloat.java" todir="${customtmp.dir}/ch/ethz/mxquery/datamodel" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/datamodel/MXQueryBigDecimal.java" todir="${customtmp.dir}/ch/ethz/mxquery/datamodel" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/query/impl/CompilerImpl.java" todir="${customtmp.dir}/ch/ethz/mxquery/query/impl" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingDOMAdapter.java" todir="${customtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/functions/math/TransMath.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/math" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/functions/fn/Matches.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes" />
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/bindings/WindowBuffer.java" todir="${customtmp.dir}/ch/ethz/mxquery/bindings/" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/util/PlatformDependentUtils.java" todir="${customtmp.dir}/ch/ethz/mxquery/util" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/datamodel/MXQueryFloat.java" todir="${customtmp.dir}/ch/ethz/mxquery/datamodel" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/datamodel/MXQueryBigDecimal.java" todir="${customtmp.dir}/ch/ethz/mxquery/datamodel" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/query/impl/CompilerImpl.java" todir="${customtmp.dir}/ch/ethz/mxquery/query/impl" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingDOMAdapter.java" todir="${customtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/functions/math/TransMath.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/math" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/functions/fn/Matches.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes" />
<depend srcdir="${customtmp.dir}"
@@ -234,7 +226,7 @@
closure="yes"
/>
- <javac source="${src.version}"
+ <javac source="${src.version}"
srcdir="${customtmp.dir}"
destdir="${build.dir}"
target="1.4"
@@ -244,115 +236,92 @@
includeAntRuntime="false"
extdirs=""
/>
- </target>
-
+ </target>
+
<target name="jar" depends="compile">
<echo message="Creating jar archive..."/>
- <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}">
- </unjar>
+ <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}"></unjar>
<jar jarfile="${dist.dir}/mxquery.jar">
<fileset dir="${build.dir}" excludes="examples/**/*.*"/>
<fileset dir="${src.dir}" includes="ch/**/*.xq"/>
- <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
+ <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
<fileset dir="${src.dir}" includes="ch/**/*.txt"/>
<fileset dir="${src.dir}" includes="**/*.servlet"/>
<fileset dir="${src.dir}" includes="ch/**/*.txt"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
- </manifest>
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
+ </manifest>
</jar>
</target>
<target name="jar-15" depends="compile-15">
<echo message="Creating jar archive..."/>
- <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/jax-1_1-fr-qname-class.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/jsr173_1.0_api.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}">
- </unjar>
+ <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/jax-1_1-fr-qname-class.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/jsr173_1.0_api.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}"></unjar>
<jar jarfile="${dist.dir}/mxquery-15.jar">
<fileset dir="${build.dir}" excludes="examples/**/*.*"/>
<fileset dir="${src.dir}" includes="ch/**/*.xq"/>
- <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
+ <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
<fileset dir="${src.dir}" includes="ch/**/*.txt"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
- </manifest>
-
-
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
+ </manifest>
+
+
</jar>
- </target>
+ </target>
<target name="jar-14" depends="compile-14">
<echo message="Creating jar archive..."/>
- <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xml-apis.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/jax-1_1-fr-qname-class.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/jsr173_1.0_api.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}">
- </unjar>
+ <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xml-apis.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/jax-1_1-fr-qname-class.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/jsr173_1.0_api.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}"></unjar>
<jar jarfile="${dist.dir}/mxquery-14.jar">
<fileset dir="${build.dir}" excludes="examples/**/*.*"/>
<fileset dir="${src.dir}" includes="ch/**/*.xq"/>
- <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
+ <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
<fileset dir="${src.dir}" includes="ch/**/*.txt"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
- </manifest>
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
+ </manifest>
</jar>
- </target>
-
+ </target>
+
<target name="war" depends="jar">
<echo message="Creating the SOAP Server war ... "/>
<mkdir dir="${war.dir}"/>
- <delete>
- <fileset dir="${war.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
+ <delete>
+ <fileset dir="${war.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
<mkdir dir="${webinf.dir}"/>
<mkdir dir="${weblib.dir}"/>
<mkdir dir="${webclasses.dir}"/>
<mkdir dir="${servlet.dir}}"/>
- <mkdir dir="${utilservlet.dir}}"/>
+ <mkdir dir="${utilservlet.dir}}"/>
<copy file="${build.dir}/ch/ethz/mxquery/query/webservice/MultipleXQueryServer.class" todir="${servlet.dir}"/>
<copy file="${build.dir}/ch/ethz/mxquery/query/webservice/SingleXQueryServer.class" todir="${servlet.dir}"/>
<copy file="${build.dir}/ch/ethz/mxquery/util/MultipleSchemaExposer.class" todir="${utilservlet.dir}"/>
@@ -360,169 +329,160 @@
<copy file="${src.dir}/ch/ethz/mxquery/query/webservice/web.xml" todir="${webinf.dir}"/>
<copy file="${src.dir}/ch/ethz/mxquery/query/webservice/index.html" todir="${war.dir}"/>
<copy file="${dist.dir}/mxquery.jar" todir="${weblib.dir}"/>
- <copy todir="${war.dir}">
- <fileset dir="${modules.dir}"/>
- </copy>
+ <copy todir="${war.dir}"><fileset dir="${modules.dir}"/></copy>
<jar jarfile="${dist.dir}/MXQuery.war">
- <fileset dir="${war.dir}" includes="**/*.*"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- </manifest>
- </jar>
+ <fileset dir="${war.dir}" includes="**/*.*"/>
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ </manifest>
+ </jar>
</target>
-
-
+
+
<target name="xsp" depends="war">
<echo message="Creating the XSP war ... "/>
<mkdir dir="${war.dir}"/>
- <delete>
- <fileset dir="${war.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
+ <delete>
+ <fileset dir="${war.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
<mkdir dir="${webinf.dir}"/>
<mkdir dir="${weblib.dir}"/>
<mkdir dir="${servlet.dir}}"/>
- <mkdir dir="${utilservlet.dir}}"/>
+ <mkdir dir="${utilservlet.dir}}"/>
<copy file="${build.dir}/ch/ethz/mxquery/query/webservice/XSPMain.class" todir="${utilservlet.dir}"/>
<copy file="${dist.dir}/mxquery.jar" todir="${weblib.dir}"/>
- <copy todir="${war.dir}">
- <fileset dir="${xspcontent.dir}"/>
- </copy>
+ <copy todir="${war.dir}"><fileset dir="${xspcontent.dir}"/></copy>
<jar jarfile="${dist.dir}/XSP.war">
- <fileset dir="${war.dir}" includes="**/*.*"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- </manifest>
- </jar>
+ <fileset dir="${war.dir}" includes="**/*.*"/>
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ </manifest>
+ </jar>
</target>
-
+
<target name="midp_prepare" depends="clean">
- <echo message="Merging source trees"/>
- <delete>
- <fileset dir="${midptmp.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
- <copy todir="${midptmp.dir}">
- <fileset dir="${src.dir}"/>
- </copy>
- <copy todir="${midptmp.dir}" overwrite="yes">
- <fileset dir="${midpsrc.dir}"/>
- </copy>
- <echo message="Removing unsupported classes"/>
-
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/parallel/"/>
+ <echo message="Merging source trees"/>
+ <delete>
+ <fileset dir="${midptmp.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+ <copy todir="${midptmp.dir}"><fileset dir="${src.dir}"/></copy>
+ <copy todir="${midptmp.dir}" overwrite="yes"><fileset dir="${midpsrc.dir}"/></copy>
+ <echo message="Removing unsupported classes"/>
+
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/parallel/"/>
<delete dir="${midptmp.dir}/javax/"/>
<delete dir="${midptmp.dir}/org/tartarus"/>
<delete dir="${midptmp.dir}/com/"/>
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/xqj/"/>
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/opt/expr"/>
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/opt/index"/>
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/query/optimizer"/>
-
- <delete>
- <fileset dir="${midptmp.dir}/ch/ethz/mxquery/sms/MMimpl/">
- <include name="*.java"/>
- <exclude name="TokenBufferStore.java"/>
- <exclude name="MaterializingTokenBufferStore.java"/>
- </fileset>
- </delete>
- <delete>
- <fileset dir="${midptmp.dir}/examples">
- <include name="*.java"/>
- </fileset>
- </delete>
- <delete>
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/xqj/"/>
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/opt/expr"/>
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/opt/index"/>
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/query/optimizer"/>
+
+ <delete>
+ <fileset dir="${midptmp.dir}/ch/ethz/mxquery/sms/MMimpl/">
+ <include name="*.java"/>
+ <exclude name="TokenBufferStore.java"/>
+ <exclude name="MaterializingTokenBufferStore.java"/>
+ </fileset>
+ </delete>
+ <delete>
+ <fileset dir="${midptmp.dir}/examples">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete>
<fileset dir="${midptmp.dir}/ch/ethz/mxquery/cmdline">
<include name="*.java"/>
</fileset>
- </delete>
+ </delete>
- <delete>
- <fileset dir="${midptmp.dir}/ch/ethz/mxquery/extensionsModules" id="id">
+ <delete>
+ <fileset dir="${midptmp.dir}/ch/ethz/mxquery/extensionsModules" id="id">
<include name="**/*.java"/>
- <exclude name="ExtensionModulesConfig.java"/>
- <exclude name="zorbaRest/HttpIO.java"/>
- </fileset>
- </delete>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexInterface.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexRead.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexUpdate.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/RandomUpdate.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/ftstore/SnowballBasedStemmer.java" />
- <delete>
+ <exclude name="ExtensionModulesConfig.java"/>
+ <exclude name="zorbaRest/HttpIO.java"/>
+ </fileset>
+ </delete>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexInterface.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexRead.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexUpdate.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/RandomUpdate.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/ftstore/SnowballBasedStemmer.java" />
+ <delete>
<fileset dir="${midptmp.dir}/ch/ethz/mxquery/dmcq/">
<include name="*.java"/>
</fileset>
- </delete>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/util/PerfTools.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/GroupByIndexIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/DirectXMLIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/PFFLWORIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/PGFLWORIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/PGroupBy.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/CommandLineInIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/NativeFuncCall.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowIndexIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBinding.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBindingParallel.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/util/UnicodeInputStream.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/util/UnicodeReader.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/DirectXMLWrapperIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/Collection.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/CommandLineInIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/SubFiles.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/SubFiles2.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/Eratosthenes.java">
- </delete>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Floor.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Ceiling.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Abs.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Round.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Put.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Matches.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/AvailEnvVars.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/EnvVar.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/IRItoURI.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/DocAvailable.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/math/Pow.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/math/Sqrt.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/math/TransMath.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/model/ws/MultiPartFormOutputStream.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/query/parser/SchemaParser.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/query/parser/SEParser.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/query/parser/J56Parser.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/ValidateIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/ValidatedSaxImportAdapter.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2StaxAdapter.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2SaxAdapter.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2DOMAdapter.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonSchemaValidatingSaxImportAdapter.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingDOMAdapter.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingStaxAdapter.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/MultipleXQueryServer.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/SingleXQueryServer.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/XSPMain.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/util/MultipleSchemaExposer.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/util/SingleSchemaExposer.java"/>
- <!--<delete file="${midptmp.dir}/ch/ethz/mxquery/util/BitSetjava"/>-->
- <!--<delete file="${midptmp.dir}/org/tartarus/snowball/TestApp.java" />-->
+ </delete>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/util/PerfTools.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/GroupByIndexIterator.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/DirectXMLIterator.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/PFFLWORIterator.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/PGFLWORIterator.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/PGroupBy.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/CommandLineInIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/NativeFuncCall.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowIndexIterator.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBinding.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBindingParallel.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/util/UnicodeInputStream.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/util/UnicodeReader.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/DirectXMLWrapperIterator.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/Collection.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/CommandLineInIterator.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/SubFiles.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/SubFiles2.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/Eratosthenes.java"></delete>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Floor.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Ceiling.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Abs.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Round.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Put.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Matches.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/AvailEnvVars.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/EnvVar.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/IRItoURI.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/DocAvailable.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/math/Pow.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/math/Sqrt.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/math/TransMath.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/model/ws/MultiPartFormOutputStream.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/query/parser/SchemaParser.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/query/parser/SEParser.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/query/parser/J56Parser.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/ValidateIterator.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/ValidatedSaxImportAdapter.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2StaxAdapter.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2SaxAdapter.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2DOMAdapter.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonSchemaValidatingSaxImportAdapter.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingDOMAdapter.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingStaxAdapter.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/MultipleXQueryServer.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/SingleXQueryServer.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/XSPMain.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/util/MultipleSchemaExposer.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/util/SingleSchemaExposer.java"/>
+ <!--<delete file="${midptmp.dir}/ch/ethz/mxquery/util/BitSetjava"/>-->
+ <!--<delete file="${midptmp.dir}/org/tartarus/snowball/TestApp.java" />-->
</target>
- <target name="midp_compile_wtk" depends="midp_prepare">
-
+ <target name="midp_compile_wtk" depends="midp_prepare">
+
<echo message="Compiling..."/>
-
+
<depend srcdir="${midptmp.dir}"
destdir="${build.dir}"
cache="depcache"
closure="yes"
/>
- <wtkbuild source="${src.version}"
+ <wtkbuild source="${src.version}"
srcdir="${midptmp.dir}"
destdir="${build.dir}"
classpathref="midlet.class.path"
@@ -530,145 +490,139 @@
optimize="${optimize}"
extdirs=""
preverify="false"
- />
- </target>
+ />
+ </target>
<target name="midp_wtk" depends="midp_compile_wtk">
<echo message="Creating midp jar archive..."/>
- <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}">
- </unjar>
- <unjar src="${resources.dir}/microlog-logger-core-2.3.5.jar" dest="${build.dir}">
- </unjar>
- <wtkjad jarfile="${dist.dir}/mxquery_midp.jar"
+ <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/microlog-logger-core-2.3.5.jar" dest="${build.dir}"></unjar>
+ <wtkjad jarfile="${dist.dir}/mxquery_midp.jar"
jadfile="${dist.dir}/mxquery_midp.jad"
name="MXQuery"
vendor="MXQuery Team at ETH Zurich"
version="${version}">
- <midlet name="MXQuery" class="ch.ethz.mxquery.mobile.MIDP"/>
- <attribute name="MIDlet-Permissions-Opt" value="javax.microedition.io.PushRegistry, javax.microedition.io.Connector.http, javax.microedition.io.Connector.socket, javax.microedition.io.Connector.https, javax.microedition.io.Connector.ssl, javax.microedition.io.Connector.datagram, javax.microedition.io.Connector.serversocket, javax.microedition.io.Connector.datagramreceiver, javax.microedition.io.Connector.comm"/>
- </wtkjad>
+ <midlet name="MXQuery" class="ch.ethz.mxquery.mobile.MIDP"/>
+ <attribute name="MIDlet-Permissions-Opt" value="javax.microedition.io.PushRegistry, javax.microedition.io.Connector.http, javax.microedition.io.Connector.socket, javax.microedition.io.Connector.https, javax.microedition.io.Connector.ssl, javax.microedition.io.Connector.datagram, javax.microedition.io.Connector.serversocket, javax.microedition.io.Connector.datagramreceiver, javax.microedition.io.Connector.comm"/>
+ </wtkjad>
<wtkpackage jarfile="${dist.dir}/mxquery_midp.jar"
jadfile="${dist.dir}/mxquery_midp.jad"
preverify="false">
<fileset dir="${build.dir}" includes="**/*.*"/>
<fileset dir="${midptmp.dir}" includes="**/*.xq"/>
- <fileset dir="${midptmp.dir}" includes="**/*.xml"/>
+ <fileset dir="${midptmp.dir}" includes="**/*.xml"/>
</wtkpackage>
<wtkpreverify jarfile="${dist.dir}/mxquery_midp.jar"
jadfile="${dist.dir}/mxquery_midp.jad"/>
</target>
+
+ <property name="junit.output.dir" value="junit-out"/>
- <property name="junit.output.dir" value="junit-out"/>
+ <path id="JUnit 4.libraryclasspath">
+ <pathelement location="lib/junit.jar"/>
+ <!--<pathelement location="${ECLIPSE_HOME}/plugins/org.hamcrest.core_1.1.0.v20090501071000.jar"/>-->
+ </path>
- <path id="JUnit 4.libraryclasspath">
- <pathelement location="lib/junit.jar"/>
- <!--<pathelement location="${ECLIPSE_HOME}/plugins/org.hamcrest.core_1.1.0.v20090501071000.jar"/>-->
- </path>
-
- <path id="GWT SDK.libraryclasspath">
- <pathelement location="gwt-2.3.0/gwt-user.jar"/>
- <pathelement location="gwt-2.3.0/gwt-dev.jar"/>
- </path>
- <path id="MXQueryJS.classpath">
- <pathelement location="${gwt_webclasses.dir}"/>
- <path refid="JUnit 4.libraryclasspath"/>
- <path refid="GWT SDK.libraryclasspath"/>
- </path>
- <path id="run.MXQueryJS.classpath">
- <pathelement location="${xqibtmp.dir}"/>
- <path refid="MXQueryJS.classpath"/>
- </path>
-
+ <path id="GWT SDK.libraryclasspath">
+ <pathelement location="gwt-2.3.0/gwt-user.jar"/>
+ <pathelement location="gwt-2.3.0/gwt-dev.jar"/>
+ </path>
+ <path id="MXQueryJS.classpath">
+ <pathelement location="${gwt_webclasses.dir}"/>
+ <path refid="JUnit 4.libraryclasspath"/>
+ <path refid="GWT SDK.libraryclasspath"/>
+ </path>
+ <path id="run.MXQueryJS.classpath">
+ <pathelement location="${xqibtmp.dir}"/>
+ <path refid="MXQueryJS.classpath"/>
+ </path>
+
<target name="xqib-js_prepare" depends="clean">
<mkdir dir="${gwt_war.dir}/WEB-INF"/>
<delete includeemptydirs="true">
<fileset dir="${gwt_war.dir}/WEB-INF">
- <include name="**/*"/>
+ <include name="**/*"/>
</fileset>
</delete>
- <echo message="Merging source trees"/>
-
- <delete>
- <fileset dir="${xqibtmp.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
- <copy todir="${xqibtmp.dir}">
- <fileset dir="${src.dir}"/>
- </copy>
- <echo message="Removing unsupported classes"/>
-
- <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/parallel/"/>
+ <echo message="Merging source trees"/>
+
+ <delete>
+ <fileset dir="${xqibtmp.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+ <copy todir="${xqibtmp.dir}"><fileset dir="${src.dir}"/></copy>
+ <echo message="Removing unsupported classes"/>
+
+ <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/parallel/"/>
<delete dir="${xqibtmp.dir}/javax/"/>
<delete dir="${xqibtmp.dir}/org/tartarus"/>
- <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/xqj/"/>
- <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/opt/expr"/>
- <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/opt/index"/>
- <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/query/optimizer"/>
-
- <delete>
- <fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/sms/MMimpl/">
- <include name="*.java"/>
- <exclude name="TokenBufferStore.java"/>
- <exclude name="MaterializingTokenBufferStore.java"/>
- </fileset>
- </delete>
- <delete>
- <fileset dir="${xqibtmp.dir}/examples">
- <include name="*.java"/>
- </fileset>
- </delete>
- <delete>
+ <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/xqj/"/>
+ <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/opt/expr"/>
+ <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/opt/index"/>
+ <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/query/optimizer"/>
+
+ <delete>
+ <fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/sms/MMimpl/">
+ <include name="*.java"/>
+ <exclude name="TokenBufferStore.java"/>
+ <exclude name="MaterializingTokenBufferStore.java"/>
+ </fileset>
+ </delete>
+ <delete>
+ <fileset dir="${xqibtmp.dir}/examples">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete>
<fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/cmdline">
<include name="*.java"/>
</fileset>
- </delete>
+ </delete>
- <delete>
- <fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/extensionsModules" id="id">
+ <delete>
+ <fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/extensionsModules" id="id">
<include name="**/*.java"/>
- <exclude name="ExtensionModulesConfig.java"/>
- <exclude name="expathhttp/HttpIO.java"/>
- </fileset>
- </delete>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexInterface.java" />
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexRead.java" />
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexUpdate.java" />
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/interfaces/RandomUpdate.java" />
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/ftstore/SnowballBasedStemmer.java" />
- <delete>
+ <exclude name="ExtensionModulesConfig.java"/>
+ <exclude name="expathhttp/HttpIO.java"/>
+ </fileset>
+ </delete>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexInterface.java" />
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexRead.java" />
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexUpdate.java" />
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/interfaces/RandomUpdate.java" />
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/ftstore/SnowballBasedStemmer.java" />
+ <delete>
<fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/dmcq/">
<include name="*.java"/>
</fileset>
- </delete>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/util/PerfTools.java" />
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/GroupByIndexIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/DirectXMLIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/PFFLWORIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/PGFLWORIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/PGroupBy.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/CommandLineInIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowIndexIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBinding.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBindingParallel.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/NativeFuncCall.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/util/UnicodeInputStream.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/util/UnicodeReader.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/DirectXMLWrapperIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/Collection.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/CommandLineInIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/SubFiles.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/SubFiles2.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/Eratosthenes.java">
- </delete>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/fn/DocAvailable.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java"/>
+ </delete>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/util/PerfTools.java" />
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/GroupByIndexIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/DirectXMLIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/PFFLWORIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/PGFLWORIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/PGroupBy.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/CommandLineInIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowIndexIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBinding.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBindingParallel.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/NativeFuncCall.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/util/UnicodeInputStream.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/util/UnicodeReader.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/DirectXMLWrapperIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/Collection.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/CommandLineInIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/SubFiles.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/SubFiles2.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/Eratosthenes.java"></delete>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/fn/DocAvailable.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java"/>
<!--<delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/fn/Floor.java"/>
<delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/fn/Ceiling.java"/>
<delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/fn/Abs.java"/>
@@ -679,103 +633,100 @@
<delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/math/Pow.java"/>-->
<!--<delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/math/Sqrt.java"/>
<delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/math/TransMath.java"/>-->
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/model/ws/MultiPartFormOutputStream.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/parser/SchemaParser.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/parser/SEParser.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/parser/J56Parser.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/ValidateIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/ValidatedSaxImportAdapter.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2StaxAdapter.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2SaxAdapter.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2DOMAdapter.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonSchemaValidatingSaxImportAdapter.java"/>
- <!--<delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingDOMAdapter.java"/>-->
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/model/ws/MultiPartFormOutputStream.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/parser/SchemaParser.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/parser/SEParser.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/parser/J56Parser.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/ValidateIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/ValidatedSaxImportAdapter.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2StaxAdapter.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2SaxAdapter.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2DOMAdapter.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonSchemaValidatingSaxImportAdapter.java"/>
+ <!--<delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingDOMAdapter.java"/>-->
<delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/XPPImportAdapter.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingStaxAdapter.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/webservice/MultipleXQueryServer.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/webservice/SingleXQueryServer.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/webservice/XSPMain.java"/>
-
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/util/MultipleSchemaExposer.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/util/SingleSchemaExposer.java"/>
-
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/cmdline/MXQuery.java"/>
- <delete file="${xqibtmp.dir}/org/tartarus/snowball/TestApp.java" />
-
- <delete file="${xqibtmp.dir}\ch\ethz\mxquery\query\parser\PlanLoader.java" />
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingStaxAdapter.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/webservice/MultipleXQueryServer.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/webservice/SingleXQueryServer.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/webservice/XSPMain.java"/>
+
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/util/MultipleSchemaExposer.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/util/SingleSchemaExposer.java"/>
+
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/cmdline/MXQuery.java"/>
+ <delete file="${xqibtmp.dir}/org/tartarus/snowball/TestApp.java" />
+
+ <delete file="${xqibtmp.dir}\ch\ethz\mxquery\query\parser\PlanLoader.java" />
<delete file="${xqibtmp.dir}\ch\ethz\mxquery\functions\fn\Parse.java" />
<delete file="${xqibtmp.dir}\ch\ethz\mxquery\functions\fn\Soap_call.java" />
<delete file="${xqibtmp.dir}\ch\ethz\mxquery\iterators\scripting\WSFunction.java" />
<delete file="${xqibtmp.dir}\ch\ethz\mxquery\sms\ftstore\WordNetRemoteThesaurus.java" />
<!--
<delete file="${xqibtmp.dir}" />-->
-
-
- <delete>
- <fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/query/webservice">
- </fileset>
- <fileset dir="${xqibtmp.dir}\ch\ethz\mxquery\functions\mxq">
- <!--<include name="include"/>
+
+
+ <delete>
+ <fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/query/webservice">
+ </fileset>
+ <fileset dir="${xqibtmp.dir}\ch\ethz\mxquery\functions\mxq">
+ <!--<include name="include"/>
<exclude name="exclude"/>-->
- </fileset>
- <fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/model/ws">
- <!--<include name="include"/>
+ </fileset>
+ <fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/model/ws">
+ <!--<include name="include"/>
<exclude name="exclude"/>-->
- </fileset>
- </delete>
+ </fileset>
+</delete>
- <copy todir="${xqibtmp.dir}" overwrite="yes">
- <fileset dir="${xqibsrc.dir}"/>
- </copy>
+ <copy todir="${xqibtmp.dir}" overwrite="yes"><fileset dir="${xqibsrc.dir}"/></copy>
<copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/NativeFunctionImporter.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/" overwrite="yes" />
<copy file="${midpsrc.dir}/ch/ethz/mxquery/sms/MMimpl/TokenBufferStore.java" todir="${customtmp.dir}/ch/ethz/mxquery/sms/MMimpl/" overwrite="yes" />
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/bindings/WindowBuffer.java" todir="${customtmp.dir}/ch/ethz/mxquery/bindings/" overwrite="yes" />
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/bindings/WindowBuffer.java" todir="${customtmp.dir}/ch/ethz/mxquery/bindings/" overwrite="yes" />
</target>
+
-
-
+
<target name="xqib-js_compile" depends="xqib-js_prepare">
-
- <antcall target="xqib-js_compile_only">
- </antcall>
- </target>
+
+ <antcall target="xqib-js_compile_only"></antcall>
+ </target>
<target name="xqib-js_compile_only" >
-
- <echo message="Compiling with java..."/>
- <echo message="${ant.project.name}: ${ant.file}"/>
- <mkdir dir="${gwt_webclasses.dir}"/>
- <javac debug="true" debuglevel="${debuglevel}" destdir="${gwt_webclasses.dir}" >
- <src path="${xqibtmp.dir}"/>
- <src path="xqib_junit"/>
- <exclude name="ch/ethz/mxquery/benchmark/"/>
- <exclude name="ch/ethz/mxquery/benchmark/ft/"/>
- <exclude name="ch/ethz/mxquery/test/CMDLineTests.java"/>
- <exclude name="ch/ethz/mxquery/test/CombineNodeTest.java"/>
- <exclude name="ch/ethz/mxquery/test/DOMSAXOutput.java"/>
- <exclude name="ch/ethz/mxquery/test/DateTimeTest.java"/>
- <exclude name="ch/ethz/mxquery/test/NamespaceTest.java"/>
- <exclude name="ch/ethz/mxquery/test/SchemaImportTest.java"/>
- <exclude name="ch/ethz/mxquery/test/TestStart.java"/>
- <exclude name="ch/ethz/mxquery/test/TypeTest.java"/>
- <exclude name="ch/ethz/mxquery/test/WebService/"/>
- <exclude name="ch/ethz/mxquery/test/WindowBufferTest.java"/>
- <exclude name="ch/ethz/mxquery/test/XQScriptingTest.java"/>
- <exclude name="ch/ethz/mxquery/test/XQSerializerTest.java"/>
- <exclude name="ch/ethz/mxquery/test/XQUpdateTest.java"/>
- <exclude name="ch/ethz/mxquery/test/XQUpdateTests.java"/>
- <exclude name="ch/ethz/mxquery/test/_NotImplemented.java"/>
- <exclude name="ch/ethz/mxquery/test/dmcq/"/>
- <exclude name="ch/ethz/mxquery/test/fulltext/"/>
- <exclude name="ch/ethz/mxquery/test/fulltext/FTDemoTests/"/>
- <exclude name="ch/ethz/mxquery/test/pattern/"/>
- <exclude name="ch/ethz/mxquery/test/scripting/"/>
- <exclude name="ch/ethz/mxquery/test/xq11streaming/"/>
- <exclude name="ch/ethz/mxquery/tester/"/>
- <exclude name="ch/ethz/mxquery/testsuite/internal/"/>
- <exclude name="ch/ethz/mxquery/unused/"/>
- <!--<exclude name="mxquery/test/WebService/"/>
+
+ <echo message="Compiling with java..."/>
+ <echo message="${ant.project.name}: ${ant.file}"/>
+ <mkdir dir="${gwt_webclasses.dir}"/>
+ <javac debug="true" debuglevel="${debuglevel}" destdir="${gwt_webclasses.dir}" >
+ <src path="${xqibtmp.dir}"/>
+ <src path="xqib_junit"/>
+ <exclude name="ch/ethz/mxquery/benchmark/"/>
+ <exclude name="ch/ethz/mxquery/benchmark/ft/"/>
+ <exclude name="ch/ethz/mxquery/test/CMDLineTests.java"/>
+ <exclude name="ch/ethz/mxquery/test/CombineNodeTest.java"/>
+ <exclude name="ch/ethz/mxquery/test/DOMSAXOutput.java"/>
+ <exclude name="ch/ethz/mxquery/test/DateTimeTest.java"/>
+ <exclude name="ch/ethz/mxquery/test/NamespaceTest.java"/>
+ <exclude name="ch/ethz/mxquery/test/SchemaImportTest.java"/>
+ <exclude name="ch/ethz/mxquery/test/TestStart.java"/>
+ <exclude name="ch/ethz/mxquery/test/TypeTest.java"/>
+ <exclude name="ch/ethz/mxquery/test/WebService/"/>
+ <exclude name="ch/ethz/mxquery/test/WindowBufferTest.java"/>
+ <exclude name="ch/ethz/mxquery/test/XQScriptingTest.java"/>
+ <exclude name="ch/ethz/mxquery/test/XQSerializerTest.java"/>
+ <exclude name="ch/ethz/mxquery/test/XQUpdateTest.java"/>
+ <exclude name="ch/ethz/mxquery/test/XQUpdateTests.java"/>
+ <exclude name="ch/ethz/mxquery/test/_NotImplemented.java"/>
+ <exclude name="ch/ethz/mxquery/test/d...
[truncated message content] |
|
From: <et...@us...> - 2011-10-16 23:32:45
|
Revision: 4476
http://mxquery.svn.sourceforge.net/mxquery/?rev=4476&view=rev
Author: etterth
Date: 2011-10-16 23:32:38 +0000 (Sun, 16 Oct 2011)
Log Message:
-----------
- fixed some urls in tests
Modified Paths:
--------------
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Expath.java
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/FnDoc.java
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/MultiplicationTable.java
Added Paths:
-----------
trunk/XQIB_Testing/webapps/test/MultiplicationTable.html
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Expath.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Expath.java 2011-10-16 18:02:58 UTC (rev 4475)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Expath.java 2011-10-16 23:32:38 UTC (rev 4476)
@@ -21,7 +21,7 @@
driver.get(executionpath + "/test/test.html");
String value = executeNewScript(" import module namespace http-client = \"http://expath.org/ns/http-client\";" +
"http-client:send-request(\n" +
- " <http-client:request href=\"../forecast2.xml\" method=\"get\"/>\n" +
+ " <http-client:request href=\"forecast2.xml\" method=\"get\"/>\n" +
" )[2]/*:forecast/*:city[1]/data(@*:name)");
Assert.assertEquals("Zurich", value);
@@ -34,7 +34,7 @@
public void async_send_request_success() throws Exception {
driver.get(executionpath + "/test/test.html");
String value = executeNewScript(" import module namespace http-client = \"http://expath.org/ns/http-client\";" +
- "http-client:async-request(<http-client:request href=\"../forecast2.xml\" method=\"get\"/>,\n" +
+ "http-client:async-request(<http-client:request href=\"forecast2.xml\" method=\"get\"/>,\n" +
" %updating function($result){insert node <div id=\"result\">{$result[2]/*:forecast/*:city[1]/data(@*:name)}</div> as last into b:dom()//body}\n" +
" )");
Thread.sleep(3000);
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/FnDoc.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/FnDoc.java 2011-10-16 18:02:58 UTC (rev 4475)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/FnDoc.java 2011-10-16 23:32:38 UTC (rev 4476)
@@ -19,7 +19,7 @@
*/
public void fn_doc_success() throws Exception {
driver.get(executionpath + "/test/test.html");
- String value = executeNewScript(" fn:doc(\"../forecast2.xml\" )" +
+ String value = executeNewScript(" fn:doc(\"forecast2.xml\" )" +
" /*:forecast/*:city[1]/data(@*:name)");
Assert.assertEquals("Zurich", value);
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/MultiplicationTable.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/MultiplicationTable.java 2011-10-16 18:02:58 UTC (rev 4475)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/MultiplicationTable.java 2011-10-16 23:32:38 UTC (rev 4476)
@@ -10,7 +10,7 @@
public class MultiplicationTable extends XQueryTestBase{
@Test
public void test_plus_generates_result() throws Exception{
- driver.get(executionpath + "/MultiplicationTable.html");
+ driver.get(executionpath + "/test/MultiplicationTable.html");
WebElement plus_button = driver.findElementById("buttonplus");
plus_button.click();
WebElement resulttable = driver.findElementById("result");
Added: trunk/XQIB_Testing/webapps/test/MultiplicationTable.html
===================================================================
--- trunk/XQIB_Testing/webapps/test/MultiplicationTable.html (rev 0)
+++ trunk/XQIB_Testing/webapps/test/MultiplicationTable.html 2011-10-16 23:32:38 UTC (rev 4476)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <link href="style.css" rel="stylesheet" type="text/css">
+ <script type="text/javascript" src="mxqueryjs/mxqueryjs.nocache.js"></script>
+ <script type="application/xquery">
+ declare updating function local:generateTable($loc, $event) {
+ replace node b:dom()//table[2] with <table border="1" id="result"><tbody>{
+ <tr>{
+ <td/>,for $j in 1 to xs:integer(b:dom()//input[@name="nbcolumns"]/data(@value)) return <td><b>{$j}</b></td>
+ }</tr>,
+ for $i in 1 to xs:integer(b:dom()//input[@name="nbrows"]/data(@value))
+ return <tr>{
+ <td><b>{$i}</b></td>,
+ for $j in 1 to xs:integer(b:dom()//input[@name="nbcolumns"]/data(@value))
+ return <td>{
+ if($loc/data(@value)="+")
+ then $i+$j
+ else if ($loc/data(@value)="-")
+ then ($i - $j)
+ else if($loc/data(@value)="*")
+ then ($i * $j)
+ else ($i div $j)
+ }</td>
+ }</tr>
+ }</tbody></table>
+ };
+
+ for $i in b:dom()//input[@type='button']
+ return
+ b:addEventListener($i, "onclick", local:generateTable#2);
+
+ </script>
+ </head>
+ <body>
+ <a href="index.html"><< Index</a>
+ <h1>XQuery Table Generator</h1>
+ <div><a href="MultiplicationTable.html">Page</a> | <a href="MultiplicationTable_source.html">Source</a>
+ <p/>
+ <table><tbody>
+ <tr>
+ <td>Number of rows:
+ <input type="textbox" name="nbrows" value="3"/>
+ </td>
+ </tr>
+ <tr>
+ <td>Number of columns:
+ <input type="textbox" name="nbcolumns" value="5"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <input type="button" id ="buttonplus" value="+"/>
+ <input type="button" id="buttonminus" value="-"/>
+ <input type="button" id="buttontimes" value="*"/>
+ <input type="button" id="buttondiv" value="/"/>
+ </td>
+ </tr></tbody>
+ </table>
+ <table>
+ <tbody>
+ <tr><td></td></tr>
+ </tbody>
+ </table>
+ </body>
+</html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-16 18:03:04
|
Revision: 4475
http://mxquery.svn.sourceforge.net/mxquery/?rev=4475&view=rev
Author: etterth
Date: 2011-10-16 18:02:58 +0000 (Sun, 16 Oct 2011)
Log Message:
-----------
- adjusted nightly test path
Modified Paths:
--------------
trunk/XQIB_Testing/build.xml
Modified: trunk/XQIB_Testing/build.xml
===================================================================
--- trunk/XQIB_Testing/build.xml 2011-10-16 18:00:46 UTC (rev 4474)
+++ trunk/XQIB_Testing/build.xml 2011-10-16 18:02:58 UTC (rev 4475)
@@ -69,7 +69,7 @@
</javac>
</target>
<target name="getlib">
- <get dest="${test.home}/xqib-js-nightly.zip" src="http://fifthelement.inf.ethz.ch:8081/job/MXQuery-XQIB/lastSuccessfulBuild/artifact/MXQuery/xqib-js-nightly.zip" />
+ <get dest="${test.home}/xqib-js-nightly.zip" src="http://sgv-jenkins-01.ethz.ch/job/MXQuery-XQIB/lastSuccessfulBuild/artifact/MXQuery/xqib-js-nightly.zip" />
<unzip dest="${test.home}">
<fileset dir="${test.home}" includes="xqib-js-nightly.zip">
</fileset>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-16 18:00:52
|
Revision: 4474
http://mxquery.svn.sourceforge.net/mxquery/?rev=4474&view=rev
Author: etterth
Date: 2011-10-16 18:00:46 +0000 (Sun, 16 Oct 2011)
Log Message:
-----------
- added tomcat configuration for chrome
Modified Paths:
--------------
trunk/XQIB_Testing/build.xml
Added Paths:
-----------
trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/chrome-server.xml
Modified: trunk/XQIB_Testing/build.xml
===================================================================
--- trunk/XQIB_Testing/build.xml 2011-10-05 21:13:05 UTC (rev 4473)
+++ trunk/XQIB_Testing/build.xml 2011-10-16 18:00:46 UTC (rev 4474)
@@ -75,9 +75,15 @@
</fileset>
</unzip>
</target>
+ <target name="copyconfig">
+ <copy tofile="${tomcat.home}/conf/server.xml"
+ file="${tomcat.home}/conf/${test.browser}-server.xml">
+ </copy>
+ </target>
<target name="test" depends="build">
<antcall target="getlib" />
+ <antcall target="copyconfig" />
<antcall target="tomcat-stop" />
<sleep seconds="2" />
<antcall target="tomcat-start" />
Added: trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/chrome-server.xml
===================================================================
--- trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/chrome-server.xml (rev 0)
+++ trunk/XQIB_Testing/lib/apache-tomcat-6.0.32/conf/chrome-server.xml 2011-10-16 18:00:46 UTC (rev 4474)
@@ -0,0 +1,148 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- Note: A "Server" is not itself a "Container", so you may not
+ define subcomponents such as "Valves" at this level.
+ Documentation at /docs/config/server.html
+ -->
+<Server port="8006" shutdown="SHUTDOWN">
+
+ <!--APR library loader. Documentation at /docs/apr.html -->
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+ <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
+ <Listener className="org.apache.catalina.core.JasperListener" />
+ <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+ <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+ <!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html -->
+ <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
+ <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+
+ <!-- Global JNDI resources
+ Documentation at /docs/jndi-resources-howto.html
+ -->
+ <GlobalNamingResources>
+ <!-- Editable user database that can also be used by
+ UserDatabaseRealm to authenticate users
+ -->
+ <Resource name="UserDatabase" auth="Container"
+ type="org.apache.catalina.UserDatabase"
+ description="User database that can be updated and saved"
+ factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+ pathname="conf/tomcat-users.xml" />
+ </GlobalNamingResources>
+
+ <!-- A "Service" is a collection of one or more "Connectors" that share
+ a single "Container" Note: A "Service" is not itself a "Container",
+ so you may not define subcomponents such as "Valves" at this level.
+ Documentation at /docs/config/service.html
+ -->
+ <Service name="Catalina">
+
+ <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+ <!--
+ <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+ maxThreads="150" minSpareThreads="4"/>
+ -->
+
+
+ <!-- A "Connector" represents an endpoint by which requests are received
+ and responses are returned. Documentation at :
+ Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+ Java AJP Connector: /docs/config/ajp.html
+ APR (HTTP/AJP) Connector: /docs/apr.html
+ Define a non-SSL HTTP/1.1 Connector on port 8080
+ -->
+ <Connector port="8091" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8443" />
+ <!-- A "Connector" using the shared thread pool-->
+ <!--
+ <Connector executor="tomcatThreadPool"
+ port="8080" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8443" />
+ -->
+ <!-- Define a SSL HTTP/1.1 Connector on port 8443
+ This connector uses the JSSE configuration, when using APR, the
+ connector should be using the OpenSSL style configuration
+ described in the APR documentation -->
+ <!--
+ <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+ maxThreads="150" scheme="https" secure="true"
+ clientAuth="false" sslProtocol="TLS" />
+ -->
+
+ <!-- Define an AJP 1.3 Connector on port 8009 -->
+ <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+
+
+ <!-- An Engine represents the entry point (within Catalina) that processes
+ every request. The Engine implementation for Tomcat stand alone
+ analyzes the HTTP headers included with the request, and passes them
+ on to the appropriate Host (virtual host).
+ Documentation at /docs/config/engine.html -->
+
+ <!-- You should set jvmRoute to support load-balancing via AJP ie :
+ <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+ -->
+ <Engine name="Catalina" defaultHost="localhost">
+
+ <!--For clustering, please take a look at documentation at:
+ /docs/cluster-howto.html (simple how to)
+ /docs/config/cluster.html (reference documentation) -->
+ <!--
+ <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+ -->
+
+ <!-- The request dumper valve dumps useful debugging information about
+ the request and response data received and sent by Tomcat.
+ Documentation at: /docs/config/valve.html -->
+ <!--
+ <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
+ -->
+
+ <!-- This Realm uses the UserDatabase configured in the global JNDI
+ resources under the key "UserDatabase". Any edits
+ that are performed against this UserDatabase are immediately
+ available for use by the Realm. -->
+ <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+ resourceName="UserDatabase"/>
+
+ <!-- Define the default virtual host
+ Note: XML Schema validation will not work with Xerces 2.2.
+ -->
+ <Host name="localhost" appBase="../../webapps"
+ unpackWARs="true" autoDeploy="true"
+ xmlValidation="false" xmlNamespaceAware="false">
+
+ <!-- SingleSignOn valve, share authentication between web applications
+ Documentation at: /docs/config/valve.html -->
+ <!--
+ <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+ -->
+
+ <!-- Access log processes all example.
+ Documentation at: /docs/config/valve.html -->
+ <!--
+ <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+ prefix="localhost_access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
+ -->
+
+ </Host>
+ </Engine>
+ </Service>
+</Server>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-05 21:13:11
|
Revision: 4473
http://mxquery.svn.sourceforge.net/mxquery/?rev=4473&view=rev
Author: etterth
Date: 2011-10-05 21:13:05 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------
- tests for fn:doc() added
Added Paths:
-----------
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/FnDoc.java
Added: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/FnDoc.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/FnDoc.java (rev 0)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/FnDoc.java 2011-10-05 21:13:05 UTC (rev 4473)
@@ -0,0 +1,45 @@
+package ch.ethz.mxquery.browsertests;
+
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+import ch.ethz.mxquery.testsuite.XQueryTestBase;
+
+public class FnDoc extends XQueryTestBase {
+
+
+ @Test
+ /**
+ * test the fn:doc() function
+ */
+ public void fn_doc_success() throws Exception {
+ driver.get(executionpath + "/test/test.html");
+ String value = executeNewScript(" fn:doc(\"../forecast2.xml\" )" +
+ " /*:forecast/*:city[1]/data(@*:name)");
+
+ Assert.assertEquals("Zurich", value);
+ }
+
+ @Test
+ /**
+ * test the fn:doc() function
+ */
+ public void fn_doc_failure() throws Exception {
+ driver.get(executionpath + "/test/test.html");
+// driver.get("http://127.0.0.1:8888/test/test.html?gwt.codesvr=127.0.0.1:9997");
+ String value = executeNewScript("try { fn:doc(\"some_nonexisting_url\" )" +
+ " /*:forecast/*:city[1]/data(@*:name)" +
+ "} catch * {'error'}");
+
+ Assert.assertEquals("error", value);;
+ }
+
+
+
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-05 20:58:08
|
Revision: 4472
http://mxquery.svn.sourceforge.net/mxquery/?rev=4472&view=rev
Author: etterth
Date: 2011-10-05 20:58:02 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------
- An error for fn:doc is now thrown for all requests where responseCode != 200
Modified Paths:
--------------
trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/fn/Doc.java
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/fn/Doc.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/fn/Doc.java 2011-10-05 20:26:17 UTC (rev 4471)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/fn/Doc.java 2011-10-05 20:58:02 UTC (rev 4472)
@@ -40,6 +40,7 @@
import ch.ethz.mxquery.util.URIUtils;
import ch.ethz.mxquery.util.browser.CachedDownloader;
import ch.ethz.mxquery.util.browser.SyncXmlHttpRequest;
+import ch.ethz.mxquery.util.browser.XmlHttpRequest;
import ch.ethz.mxquery.util.browser.XmlHttpRequestWrapper;
import ch.ethz.mxquery.util.browser.dom.Document;
import ch.ethz.mxquery.xdmio.XDMInputFactory;
@@ -116,7 +117,7 @@
// req.send();
XmlHttpRequestWrapper req = new CachedDownloader(uri).getRequest();
Document doc = req.responseAsXML();
- if (doc == null) {
+ if (doc == null || req.getResponseCode() != 200) {
throw new DynamicException(ErrorCodes.F0014_ERROR_RETRIEVING_RESOURCE, "Getting your resource at " + uri + " failed.", getLoc());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-05 20:26:24
|
Revision: 4471
http://mxquery.svn.sourceforge.net/mxquery/?rev=4471&view=rev
Author: etterth
Date: 2011-10-05 20:26:17 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------
- added b:toggleClassName
- fn:doc() should now throw an error if the document is not available
Modified Paths:
--------------
trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/FG.xml
trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/FGPopulator.java
trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/fn/Doc.java
Added Paths:
-----------
trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/b/ToggleClassName.java
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/FG.xml
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/FG.xml 2011-10-05 13:46:12 UTC (rev 4470)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/FG.xml 2011-10-05 20:26:17 UTC (rev 4471)
@@ -156,6 +156,14 @@
<className>AddClassName</className>
</functionDescription>
<functionDescription>
+ <functionName>toggleClass</functionName>
+ <parameters>
+ <paramType>node()+</paramType>
+ <paramType>xs:string</paramType>
+ </parameters>
+ <className>ToggleClassName</className>
+ </functionDescription>
+ <functionDescription>
<functionName>addWindowListener</functionName>
<parameters>
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/FGPopulator.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/FGPopulator.java 2011-10-05 13:46:12 UTC (rev 4470)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/FGPopulator.java 2011-10-05 20:26:17 UTC (rev 4471)
@@ -433,14 +433,13 @@
qn = new QName(
"http://xqib.org",
"b",
- "setHash");
- paramTypes = new TypeInfo[1];
+ "getLocation");
+ paramTypes = new TypeInfo[0];
- paramTypes[0] = xs_string;
signature = new FunctionSignature(qn, paramTypes, FunctionSignature.SYSTEM_FUNCTION, new Hashtable());
{
- ch.ethz.mxquery.functions.b.SetHash iter = new ch.ethz.mxquery.functions.b.SetHash();
+ ch.ethz.mxquery.functions.b.GetLocation iter = new ch.ethz.mxquery.functions.b.GetLocation();
iter.setContext(context, false);
type = null;
@@ -454,13 +453,14 @@
qn = new QName(
"http://xqib.org",
"b",
- "getLocation");
- paramTypes = new TypeInfo[0];
+ "alert");
+ paramTypes = new TypeInfo[1];
+ paramTypes[0] = xs_string;
signature = new FunctionSignature(qn, paramTypes, FunctionSignature.SYSTEM_FUNCTION, new Hashtable());
{
- ch.ethz.mxquery.functions.b.GetLocation iter = new ch.ethz.mxquery.functions.b.GetLocation();
+ ch.ethz.mxquery.functions.b.Alert iter = new ch.ethz.mxquery.functions.b.Alert();
iter.setContext(context, false);
type = null;
@@ -474,14 +474,15 @@
qn = new QName(
"http://xqib.org",
"b",
- "alert");
- paramTypes = new TypeInfo[1];
+ "removeClass");
+ paramTypes = new TypeInfo[2];
- paramTypes[0] = xs_string;
+ paramTypes[0] = node___plus;
+ paramTypes[1] = xs_string;
signature = new FunctionSignature(qn, paramTypes, FunctionSignature.SYSTEM_FUNCTION, new Hashtable());
{
- ch.ethz.mxquery.functions.b.Alert iter = new ch.ethz.mxquery.functions.b.Alert();
+ ch.ethz.mxquery.functions.b.RemoveClassName iter = new ch.ethz.mxquery.functions.b.RemoveClassName();
iter.setContext(context, false);
type = null;
@@ -495,15 +496,14 @@
qn = new QName(
"http://xqib.org",
"b",
- "removeClass");
- paramTypes = new TypeInfo[2];
+ "getClasses");
+ paramTypes = new TypeInfo[1];
paramTypes[0] = node___plus;
- paramTypes[1] = xs_string;
signature = new FunctionSignature(qn, paramTypes, FunctionSignature.SYSTEM_FUNCTION, new Hashtable());
{
- ch.ethz.mxquery.functions.b.RemoveClassName iter = new ch.ethz.mxquery.functions.b.RemoveClassName();
+ ch.ethz.mxquery.functions.b.GetClasses iter = new ch.ethz.mxquery.functions.b.GetClasses();
iter.setContext(context, false);
type = null;
@@ -517,14 +517,15 @@
qn = new QName(
"http://xqib.org",
"b",
- "getClasses");
- paramTypes = new TypeInfo[1];
+ "addClass");
+ paramTypes = new TypeInfo[2];
paramTypes[0] = node___plus;
+ paramTypes[1] = xs_string;
signature = new FunctionSignature(qn, paramTypes, FunctionSignature.SYSTEM_FUNCTION, new Hashtable());
{
- ch.ethz.mxquery.functions.b.GetClasses iter = new ch.ethz.mxquery.functions.b.GetClasses();
+ ch.ethz.mxquery.functions.b.AddClassName iter = new ch.ethz.mxquery.functions.b.AddClassName();
iter.setContext(context, false);
type = null;
@@ -538,7 +539,7 @@
qn = new QName(
"http://xqib.org",
"b",
- "addClass");
+ "toggleClass");
paramTypes = new TypeInfo[2];
paramTypes[0] = node___plus;
@@ -546,7 +547,7 @@
signature = new FunctionSignature(qn, paramTypes, FunctionSignature.SYSTEM_FUNCTION, new Hashtable());
{
- ch.ethz.mxquery.functions.b.AddClassName iter = new ch.ethz.mxquery.functions.b.AddClassName();
+ ch.ethz.mxquery.functions.b.ToggleClassName iter = new ch.ethz.mxquery.functions.b.ToggleClassName();
iter.setContext(context, false);
type = null;
Added: trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/b/ToggleClassName.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/b/ToggleClassName.java (rev 0)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/b/ToggleClassName.java 2011-10-05 20:26:17 UTC (rev 4471)
@@ -0,0 +1,114 @@
+package ch.ethz.mxquery.functions.b;
+
+import java.util.LinkedList;
+import java.util.Vector;
+
+import ch.ethz.mxquery.contextConfig.Context;
+import ch.ethz.mxquery.datamodel.types.Type;
+import ch.ethz.mxquery.datamodel.types.TypeInfo;
+import ch.ethz.mxquery.datamodel.xdm.TextToken;
+import ch.ethz.mxquery.datamodel.xdm.Token;
+import ch.ethz.mxquery.datamodel.xdm.TokenInterface;
+import ch.ethz.mxquery.exceptions.DynamicException;
+import ch.ethz.mxquery.exceptions.ErrorCodes;
+import ch.ethz.mxquery.exceptions.MXQueryException;
+import ch.ethz.mxquery.exceptions.TypeException;
+import ch.ethz.mxquery.model.TokenBasedIterator;
+import ch.ethz.mxquery.model.XDMIterator;
+import ch.ethz.mxquery.update.store.domImpl.ElementNodeToken;
+import ch.ethz.mxquery.util.browser.dom.Element;
+
+import com.google.gwt.dom.client.Node;
+
+public class ToggleClassName extends TokenBasedIterator {
+ //TODO test
+ @Override
+ protected void init() throws MXQueryException {
+ currentToken = Token.END_SEQUENCE_TOKEN;
+ if (subIters[0] == null) {
+ throw new IllegalArgumentException();
+ }
+ String classname;
+ XDMIterator nameiter = subIters[1];
+ TokenInterface nametoken = nameiter.next();
+ classname = nametoken.getValueAsString();
+ if (classname == null)
+ throw new MXQueryException("addClassName", "invalid arguments", loc);
+ XDMIterator iter = subIters[0];
+ //if (iter instanceof DataValuesIterator) ((DataValuesIterator)iter).setFnData(true);
+ TokenInterface tok;
+ int type;
+ int level = 0;
+ LinkedList<TokenInterface> tokens = new LinkedList<TokenInterface>();
+ do {
+ try {
+ tok = iter.next();
+ } catch (TypeException de) {
+ if (de.getErrorCode().equals(ErrorCodes.E0004_TYPE_INAPPROPRIATE_TYPE))
+ throw new DynamicException(ErrorCodes.F0023_INVALID_VALUE_FOR_CAST_CONSTRUCTOR,de.getMessage(), loc);
+ else throw de;
+ }
+
+ type = Type.getEventTypeSubstituted(tok.getEventType(), Context.getDictionary());
+
+ if ( Type.isAttribute(type) ){
+ type = Type.getAttributeValueType(type);
+ }
+
+ switch (type) {
+ case Type.END_SEQUENCE:
+ break;
+ case Type.START_TAG:
+ if (level++ == 0)
+ tokens.add(tok);
+ break;
+ case Type.END_TAG:
+ level--;
+ break;
+ default:
+
+
+ }
+ } while (type != Type.END_SEQUENCE);
+ for (TokenInterface token:tokens){
+ toggleClassName(token, classname);
+ }
+ }
+
+ private void toggleClassName(TokenInterface tok, String classname) {
+ if (!(tok instanceof ElementNodeToken)){
+ return;
+ }
+ ElementNodeToken nt = (ElementNodeToken) tok;
+ Element el = (Element)nt.getNode();
+ String currentclassname = el.getAsGwtElement().getClassName();
+ String[] classes = currentclassname.split(" ");
+ if (currentclassname != null) {
+ for (String singleclass:classes) {
+ if (singleclass.equals(classname)) {
+ el.removeClassName(classname);
+ return;
+ }
+ }
+ }
+ el.addClassName(classname);
+
+ // Environment.addEventListener(el, eventname, functionname);
+
+ }
+
+ @Override
+ public TypeInfo getStaticType() {
+ return new TypeInfo();
+ }
+
+
+ @Override
+ protected XDMIterator copy(Context context, XDMIterator[] subIters,
+ Vector nestedPredCtxStack) throws MXQueryException {
+ XDMIterator copy = new ToggleClassName();
+ copy.setContext(context, true);
+ copy.setSubIters(subIters);
+ return copy;
+ }
+}
Modified: trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/fn/Doc.java
===================================================================
--- trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/fn/Doc.java 2011-10-05 13:46:12 UTC (rev 4470)
+++ trunk/MXQuery/xqib_src/ch/ethz/mxquery/functions/fn/Doc.java 2011-10-05 20:26:17 UTC (rev 4471)
@@ -116,6 +116,9 @@
// req.send();
XmlHttpRequestWrapper req = new CachedDownloader(uri).getRequest();
Document doc = req.responseAsXML();
+ if (doc == null) {
+ throw new DynamicException(ErrorCodes.F0014_ERROR_RETRIEVING_RESOURCE, "Getting your resource at " + uri + " failed.", getLoc());
+ }
NodeStore ns = new NodeStore((ch.ethz.mxquery.util.browser.dom.Document)(Object)doc );
baseIterator = ns.getIterator(null);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-05 13:46:19
|
Revision: 4470
http://mxquery.svn.sourceforge.net/mxquery/?rev=4470&view=rev
Author: etterth
Date: 2011-10-05 13:46:12 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------
- Added tests for ExPath on success
Added Paths:
-----------
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Expath.java
Added: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Expath.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Expath.java (rev 0)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Expath.java 2011-10-05 13:46:12 UTC (rev 4470)
@@ -0,0 +1,48 @@
+package ch.ethz.mxquery.browsertests;
+
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+import ch.ethz.mxquery.testsuite.XQueryTestBase;
+
+public class Expath extends XQueryTestBase {
+
+
+ @Test
+ /**
+ * test the expath send-request() function
+ */
+ public void sync_send_request_success() throws Exception {
+ driver.get(executionpath + "/test/test.html");
+ String value = executeNewScript(" import module namespace http-client = \"http://expath.org/ns/http-client\";" +
+ "http-client:send-request(\n" +
+ " <http-client:request href=\"../forecast2.xml\" method=\"get\"/>\n" +
+ " )[2]/*:forecast/*:city[1]/data(@*:name)");
+
+ Assert.assertEquals("Zurich", value);
+ }
+
+ @Test
+ /**
+ * test the expath send-request() function
+ */
+ public void async_send_request_success() throws Exception {
+ driver.get(executionpath + "/test/test.html");
+ String value = executeNewScript(" import module namespace http-client = \"http://expath.org/ns/http-client\";" +
+ "http-client:async-request(<http-client:request href=\"../forecast2.xml\" method=\"get\"/>,\n" +
+ " %updating function($result){insert node <div id=\"result\">{$result[2]/*:forecast/*:city[1]/data(@*:name)}</div> as last into b:dom()//body}\n" +
+ " )");
+ Thread.sleep(3000);
+ value = driver.findElementById("result").getText();
+ Assert.assertEquals("Zurich", value);
+ }
+
+
+
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-04 08:25:58
|
Revision: 4469
http://mxquery.svn.sourceforge.net/mxquery/?rev=4469&view=rev
Author: etterth
Date: 2011-10-04 08:25:51 +0000 (Tue, 04 Oct 2011)
Log Message:
-----------
- Updated url for tests
Modified Paths:
--------------
trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java 2011-10-03 23:39:55 UTC (rev 4468)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java 2011-10-04 08:25:51 UTC (rev 4469)
@@ -19,7 +19,7 @@
static{
executionpath = System.getProperty("test.url");
if (executionpath == null) {
- executionpath= "http://127.0.0.1:8090/test";
+ executionpath= "http://127.0.0.1:8090/";
}
}
@@ -27,7 +27,7 @@
public static void setUp() {
try {
driver = createDriver();
- driver.get(executionpath +"/test.html");
+ driver.get(executionpath +"/test/test.html");
System.out.println("loaded page at " + driver.getCurrentUrl());
} catch (Throwable e) {
e.printStackTrace();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2011-10-03 23:40:07
|
Revision: 4468
http://mxquery.svn.sourceforge.net/mxquery/?rev=4468&view=rev
Author: etterth
Date: 2011-10-03 23:39:55 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
- Updated all tests to use new test.url format
Modified Paths:
--------------
trunk/MXQuery/xqib_samples/MultiplicationTable.html
trunk/XQIB_Testing/XQTStoJsUnit.xsl
trunk/XQIB_Testing/XQUTStoJsUnit.xsl
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/AsyncWeatherForecast.java
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Classes.java
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Cookies.java
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/EventListeners.java
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/JsApi.java
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/MultiplicationTable.java
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Style.java
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Timer.java
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/UrlManipulation.java
trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/WeatherForecast.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Appendices/Annex_Eclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Appendices/Appendix_A4class.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Catalogclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Basics/StaticContextclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Basics/Types/SequenceTypeSyntaxclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/CondExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConAttrclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConCommentclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConElemclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConPIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ConDocNodeclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ConTextclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ConInScopeNamespaceclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemAttrclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemContentclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemNamespaceclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemWhitespaceclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElemclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConOtherclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/ExtensionExpressionclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/ForExprPositionalVarclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/ForExprWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/ForExprWithoutclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/LetExpr/LetExprWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/LetExpr/LetExprWithoutclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/OrderbyExpr/OrderbyExprWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/OrderbyExpr/OrderbyExprWithoutclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ReturnExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/WhereExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/LogicExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationAddclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivideDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivideclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationMultiplyclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtractclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationAddclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivideYMDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivideclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiplyclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtractclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateAddDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateAddYMDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateSubtractDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateSubtractYMDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeAddDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeSubtractDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeSubtractYMDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DatesSubtractclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeAddDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtractDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtractclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/YearMonthDurationAddDTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/dateTimesSubtractclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericAddclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericDivideclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivideclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericModclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericMultiplyclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericSubtractclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericUnaryMinusclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericUnaryPlusclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompEqclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompNEclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/NodeComp/NodeAfterclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/NodeComp/NodeBeforeclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/NodeComp/NodeSameclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/AnyURIComp/AnyURIEqualclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BinaryOp/Base64BinaryEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BinaryOp/HexBinaryEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanEqualclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateTimeEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateTimeGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateTimeLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DayTimeDurationEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DayTimeDurationGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DayTimeDurationLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DurationEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/TimeEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/TimeGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/TimeLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/YearMonthDurationEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/YearMonthDurationGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/YearMonthDurationLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gDayEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gMonthDayEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gMonthEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gYearEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gYearMonthEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqualclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/NumericComp/NumericGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/NumericComp/NumericLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/QNameOp/PrefixFromQNameclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/QNameOp/QNameEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/StringComp/StringEqualclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/StringComp/StringGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/StringComp/StringLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/ValCompTypeCheckingclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/SeqOp/SeqExceptclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/SeqOp/SeqIntersectclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/SeqOp/SeqUnionclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/OrderExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/AbbrAxesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/PathExpressionsclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Predicatesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Steps/Axesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Steps/NodeTestSection/NameTestclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Steps/NodeTestSection/NodeTestclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/UnabbrAxesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/ContextExpr/ExternalContextExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/ContextExpr/InternalContextExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/FunctionCallExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/Literalsclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/ParenExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/BaseURIPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/BoundarySpacePrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/CollationPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/ConstructionPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/CopyNamespacesPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/DefaultNamespacePrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/DefaultOrderingPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/EmptyOrderPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/FunctionPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/NamespacePrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/OptionDeclarationPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/ExternalVariablesWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/ExternalVariablesWithoutclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/InternalVariablesWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/InternalVariablesWithoutclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VersionPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/QuantExpr/QuantExprWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/QuantExpr/QuantExprWithoutclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/CombNodeSeqclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/ConstructSeq/RangeExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/ConstructSeq/commaOpclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/FilterExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/XQueryCommentclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastToDerivedParentsclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastToDerivedclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastWithinBranchclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastableclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprInstanceOfclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprTreatclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/sequenceExprTypeswitchclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/BaseURIFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/DataFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/DocumentURIFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/NilledFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/NodeNameFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/StaticBaseURIFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/StringFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/CompStringFunc/CodepointEqualclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/CompStringFunc/compareFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/ConcatFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/EncodeURIfuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/EscapeHTMLURIFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/IRIToURIfuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/LowerCaseFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/NormalizeSpaceFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/NormalizeUnicodeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/StringJoinFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/StringLengthFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/SubstringFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/Surrogatesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/TranslateFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/UpperCaseFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/MatchStringFunc/MatchesFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/MatchStringFunc/ReplaceFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/MatchStringFunc/TokenizeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/ContainsFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/EndsWithFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/StartsWithFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/SubstringAfterFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/SubstringBeforeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/BooleanFunc/FalseFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/BooleanFunc/NotFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/BooleanFunc/TrueFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ConstructFunc/DateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextCurrentDateFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextCurrentDatetimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextCurrentTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextDefaultCollationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextImplicitTimezoneFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextLastFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextPositionFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/DayFromDateFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/DayFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/DaysFromDurationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/HoursFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/HoursFromDurationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/HoursFromTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MinutesFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MinutesFromDurationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MinutesFromTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MonthFromDateFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MonthFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MonthsFromDurationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/SecondsFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/SecondsFromDurationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/SecondsFromTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/TimezoneFromDateFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/TimezoneFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/TimezoneFromTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/YearFromDateFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/YearFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/YearsFromDurationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/TimezoneFunction/AdjDateTimeToTimezoneFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/TimezoneFunction/AdjDateToTimezoneFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/TimezoneFunction/AdjTimeToTimezoneFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ErrorFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NameFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeLangFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeLocalNameFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeNamespaceURIFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeNumberFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeRootFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/ABSFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/CeilingFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/FloorFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/RoundEvenFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/RoundFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/InScopePrefixesFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/LocalNameFromQNameFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/NamespaceURIForPrefixFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/NamespaceURIFromQNameFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/QNameConstructFunc/ExpandedQNameConstructFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/QNameConstructFunc/ResolveQNameConstructFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqAVGFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqCountFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqMAXFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqMINFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqSUMFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/CardinalitySeqFunc/SeqExactlyOneFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/CardinalitySeqFunc/SeqOneOrMoreFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/CardinalitySeqFunc/SeqZeroOrOneFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqBooleanFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqEmptyFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqExistsFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqIndexOfFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqInsertBeforeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqReverseFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqSubsequenceFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqUnorderedFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqCollectionFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqDocAvailableFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqDocFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqIDFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqIDREFFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/SeqDeepEqualFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/TraceFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/URIFunc/ResolveURIFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/OptionalFeatureErrors/CombinedErrorCodesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/ancestorAxisclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/ancestor_or_selfAxisclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/followingAxisclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/following_siblingAxisclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/precedingAxisclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/preceding_siblingAxisclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/Modules/ModuleImportclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/ConstructSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/FLWORExprSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/ForExprTypeSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/MiscFunctionsclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/NotationEQSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/NumericEqualSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/SchemaImportPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/SeqExprCastSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/UserDefinedSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/versionPrologSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaValidation/ValidateExpressionclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/StaticTyping/STFLWORExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/StaticTyping/STPathExpr/STSteps/STAxesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/TrivialEmbeddingclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseNSclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCasePARTSclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseRclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseSEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseSGMLclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseSTRINGclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseTREEclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseXMPclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/ExtensionExistingFunctions/CommaExpressionclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/ExtensionExistingFunctions/ConditionalExpressionclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/ExtensionExistingFunctions/FLWORExpressionclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/ExtensionExistingFunctions/FunctionCallclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/ExtensionExistingFunctions/OtherExpressionsclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/ExtensionExistingFunctions/ParenthesizedExpressionsclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/ExtensionExistingFunctions/TypeswitchExpressionclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/ExtensionFunctions/fnput/fnput_documentclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/ExtensionFunctions/fnput/put_elementclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/ExtensionstotheProlog/FunctionDeclarationclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/ExtensionstotheProlog/VariableDeclarationclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/MinOtherclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/NewExpressions/Compatibilityclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/NewExpressions/DeleteExpressionsclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/NewExpressions/InsertExpressionsclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/NewExpressions/RenameExpressionsclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/NewExpressions/ReplaceExpressions/ReplaceNodeclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/NewExpressions/ReplaceExpressions/ReplaceValueclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/NewExpressions/TransformExpressionsclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/UpdateOperations/UpdatePrimitives/AttrDataModelErrsclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/UpdateOperations/UpdatePrimitives/NSBindingConflictErrsclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/UpdateOperations/UpdateRoutines/applyUpdatesclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/UpdateOperations/UpdateRoutines/mergeUpdatesclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/MinimalConformance/UpdateOperations/UpdateRoutines/setToUntypedclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/Optional/FullAxisclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/Optional/Revalidation/RevalidationDeclarationLaxUnsupportedclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/Optional/Revalidation/RevalidationDeclarationLaxclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/Optional/Revalidation/RevalidationDeclarationSkipUnsupportedclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/Optional/Revalidation/RevalidationDeclarationSkipclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/Optional/Revalidation/RevalidationDeclarationStrictUnsupportedclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/Optional/Revalidation/RevalidationDeclarationStrictandSkipclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/Optional/Revalidation/RevalidationDeclarationStrictclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/Optional/StaticTypingclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/UseCases/AddressBookUpdatesclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/UseCases/NamespacesUpdatesclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/UseCases/NilUpdatesclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/UseCases/PartsUpdatesclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/UseCases/RelationalDataUpdatesclass.java
trunk/XQIB_Testing/upd-test/ch/ethz/xquts/UseCases/SoapUpdatesclass.java
Modified: trunk/MXQuery/xqib_samples/MultiplicationTable.html
===================================================================
--- trunk/MXQuery/xqib_samples/MultiplicationTable.html 2011-10-03 22:57:10 UTC (rev 4467)
+++ trunk/MXQuery/xqib_samples/MultiplicationTable.html 2011-10-03 23:39:55 UTC (rev 4468)
@@ -6,7 +6,7 @@
<script type="text/javascript" src="mxqueryjs/mxqueryjs.nocache.js"></script>
<script type="application/xquery">
declare updating function local:generateTable($loc, $event) {
- replace node b:dom()//table[2] with <table border="1"><tbody>{
+ replace node b:dom()//table[2] with <table border="1" id="result"><tbody>{
<tr>{
<td/>,for $j in 1 to xs:integer(b:dom()//input[@name="nbcolumns"]/data(@value)) return <td><b>{$j}</b></td>
}</tr>,
Modified: trunk/XQIB_Testing/XQTStoJsUnit.xsl
===================================================================
--- trunk/XQIB_Testing/XQTStoJsUnit.xsl 2011-10-03 22:57:10 UTC (rev 4467)
+++ trunk/XQIB_Testing/XQTStoJsUnit.xsl 2011-10-03 23:39:55 UTC (rev 4468)
@@ -14,7 +14,7 @@
<xsl:variable name="testsuitepath"
>../MXQuery_Testing/tests</xsl:variable>
<xsl:variable name="executionpath"
- >" + executionpath + "</xsl:variable>
+ >" + executionpath + "/test</xsl:variable>
<xsl:template match="/">
<xsl:for-each select="test-suite/test-group">
<xsl:call-template name="test-group">
Modified: trunk/XQIB_Testing/XQUTStoJsUnit.xsl
===================================================================
--- trunk/XQIB_Testing/XQUTStoJsUnit.xsl 2011-10-03 22:57:10 UTC (rev 4467)
+++ trunk/XQIB_Testing/XQUTStoJsUnit.xsl 2011-10-03 23:39:55 UTC (rev 4468)
@@ -14,7 +14,7 @@
<xsl:variable name="testsuitepath"
>xquts</xsl:variable>
<xsl:variable name="executionpath"
- >" + executionpath + "</xsl:variable>
+ >" + executionpath + "/test</xsl:variable>
<xsl:template match="/">
<xsl:for-each select="test-suite/test-group">
<xsl:call-template name="test-group">
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/AsyncWeatherForecast.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/AsyncWeatherForecast.java 2011-10-03 22:57:10 UTC (rev 4467)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/AsyncWeatherForecast.java 2011-10-03 23:39:55 UTC (rev 4468)
@@ -14,7 +14,7 @@
@BeforeClass
public static void page() {
- driver.get("http://127.0.0.1:8090/test/WeatherRESTasync.html");
+ driver.get(executionpath + "/test/WeatherRESTasync.html");
}
@Test
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Classes.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Classes.java 2011-10-03 22:57:10 UTC (rev 4467)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Classes.java 2011-10-03 23:39:55 UTC (rev 4468)
@@ -18,7 +18,7 @@
* test the b:addClass function
*/
public void class_addclass() throws Exception {
- driver.get("http://127.0.0.1:8090/test/test.html");
+ driver.get(executionpath + "/test/test.html");
executeNewScript("insert node <p/> as first into b:dom()//body");
executeNewScript("b:addClass(b:dom()//p,'class1')");
String value = executeNewScript("b:getClasses(b:dom()//p) = 'class1'");
@@ -30,7 +30,7 @@
* test the b:removeClass function
*/
public void class_removeclass() throws Exception {
- driver.get("http://127.0.0.1:8090/test/test.html");
+ driver.get(executionpath + "/test/test.html");
executeNewScript("insert node <p/> as first into b:dom()//body");
executeNewScript("b:addClass(b:dom()//p,'class1')");
executeNewScript("b:addClass(b:dom()//p,'class2')");
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Cookies.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Cookies.java 2011-10-03 22:57:10 UTC (rev 4467)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Cookies.java 2011-10-03 23:39:55 UTC (rev 4468)
@@ -19,7 +19,7 @@
*
*/
public void cookie_set_and_test() throws Exception {
- driver.get("http://127.0.0.1:8090/test/test.html");
+ driver.get(executionpath + "/test/test.html");
executeNewScript("b:setCookie('cookie-01','cookie-value-01')");
String value = executeNewScript("b:getCookie('cookie-01')");
Assert.assertEquals("cookie-value-01", value);
@@ -33,7 +33,7 @@
*
*/
public void cookie_with_time() throws Exception {
- driver.get("http://127.0.0.1:8090/test/test.html");
+ driver.get(executionpath + "/test/test.html");
executeNewScript("b:setCookie('cookie-02', 'cookie-value-02', fn:current-dateTime()+xs:dayTimeDuration('PT2S'))");
String value = executeNewScript("b:getCookie('cookie-02')");
Assert.assertEquals( "cookie-value-02",value);
@@ -53,7 +53,7 @@
*
*/
public void cookie_remove() throws Exception {
- driver.get("http://127.0.0.1:8090/test/test.html");
+ driver.get(executionpath + "/test/test.html");
executeNewScript("b:setCookie('cookie-01','cookie-value-01')");
String value = executeNewScript("b:getCookie('cookie-01')");
Assert.assertEquals("cookie-value-01", value);
@@ -71,7 +71,7 @@
*
*/
public void cookie_getCookies() throws Exception {
- driver.get("http://127.0.0.1:8090/test/test.html");
+ driver.get(executionpath + "/test/test.html");
executeNewScript("b:setCookie('cookie-01','cookie-value-01')");
String value = executeNewScript("b:getCookieNames() = 'cookie-01'");
Assert.assertEquals("true", value);
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/EventListeners.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/EventListeners.java 2011-10-03 22:57:10 UTC (rev 4467)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/EventListeners.java 2011-10-03 23:39:55 UTC (rev 4468)
@@ -18,7 +18,7 @@
* test the b:addEventListener function
*/
public void event_add_listener() throws Exception {
- driver.get("http://127.0.0.1:8090/test/test.html");
+ driver.get(executionpath + "/test/test.html");
executeNewScript("insert node <input type='button'/> as first into b:dom()//body");
executeNewScript("declare updating function local:onclick($loc, $evtObj) {\n" +
" insert node <p/> as last into b:dom()//body\n" +
@@ -39,7 +39,7 @@
* the click should only trigger an insert once
*/
public void event_remove_listener() throws Exception {
- driver.get("http://127.0.0.1:8090/test/test.html");
+ driver.get(executionpath + "/test/test.html");
executeNewScript("insert node <input type='button'/> as first into b:dom()//body");
executeNewScript("declare updating function local:onclick($loc, $evtObj) {\n" +
" b:removeEventListener(b:dom()//input, \"onclick\", local:onclick#2)," +
@@ -60,7 +60,7 @@
* test b:addEventListener with an anonymous function
*/
public void event_add_anonymous() throws Exception {
- driver.get("http://127.0.0.1:8090/test/test.html");
+ driver.get(executionpath + "/test/test.html");
executeNewScript("insert node <input type='button'/> as first into b:dom()//body");
executeNewScript(
"b:addEventListener(b:dom()//input, \"onclick\", "+
@@ -82,7 +82,7 @@
* the click should only trigger an insert once
*/
public void event_remove_anonymous() throws Exception {
- driver.get("http://127.0.0.1:8090/test/test.html");
+ driver.get(executionpath + "/test/test.html");
executeNewScript("insert node <input type='button'/> as first into b:dom()//body");
executeNewScript(
"b:addEventListener(b:dom()//input, \"onclick\", "+
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/JsApi.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/JsApi.java 2011-10-03 22:57:10 UTC (rev 4467)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/JsApi.java 2011-10-03 23:39:55 UTC (rev 4468)
@@ -18,7 +18,7 @@
* call js from xqib
*/
public void js_call() throws Exception {
- driver.get("http://127.0.0.1:8090/test/js-call1.html");
+ driver.get(executionpath + "/test/js-call1.html");
String resultstr = driver.findElementById("a").getText();
Assert.assertEquals("the text was \"XQIB\"", resultstr);
@@ -29,7 +29,7 @@
* call xqib from js
*/
public void js_api() throws Exception {
- driver.get("http://127.0.0.1:8090/test/jsapi1.html");
+ driver.get(executionpath + "/test/jsapi1.html");
WebElement button = driver.findElementById("button");
button.click();
@@ -47,7 +47,7 @@
* tests the js-eval function
*/
public void js_eval() throws Exception {
- driver.get("http://127.0.0.1:8090/test/test.html");
+ driver.get(executionpath + "/test/test.html");
executeNewScript("b:js-eval('document.title = \"js-eval\"')");
Assert.assertEquals("js-eval", driver.getTitle());
}
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/MultiplicationTable.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/MultiplicationTable.java 2011-10-03 22:57:10 UTC (rev 4467)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/MultiplicationTable.java 2011-10-03 23:39:55 UTC (rev 4468)
@@ -10,7 +10,7 @@
public class MultiplicationTable extends XQueryTestBase{
@Test
public void test_plus_generates_result() throws Exception{
- driver.get("http://127.0.0.1:8090/test/MultiplicationTable.html");
+ driver.get(executionpath + "/MultiplicationTable.html");
WebElement plus_button = driver.findElementById("buttonplus");
plus_button.click();
WebElement resulttable = driver.findElementById("result");
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Style.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Style.java 2011-10-03 22:57:10 UTC (rev 4467)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Style.java 2011-10-03 23:39:55 UTC (rev 4468)
@@ -18,7 +18,7 @@
* test the b:setStyle function
*/
public void class_addclass() throws Exception {
- driver.get("http://127.0.0.1:8090/test/test.html");
+ driver.get(executionpath + "/test/test.html");
executeNewScript("insert node <p>text</p> as first into b:dom()//body");
executeNewScript("b:setStyle(b:dom()//p,'color','red')");
@@ -34,7 +34,7 @@
* test the b:getStyle function
*/
public void class_removeclass() throws Exception {
- driver.get("http://127.0.0.1:8090/test/test.html");
+ driver.get(executionpath + "/test/test.html");
executeNewScript("insert node <p>text</p> as first into b:dom()//body");
executeNewScript("b:setStyle(b:dom()//p,'color','red')");
String value = executeNewScript("b:getStyle(b:dom()//p,'color')");
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Timer.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Timer.java 2011-10-03 22:57:10 UTC (rev 4467)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Timer.java 2011-10-03 23:39:55 UTC (rev 4468)
@@ -18,7 +18,7 @@
* test the b:timer function
*/
public void timer_test01() throws Exception {
- driver.get("http://127.0.0.1:8090/test/test.html");
+ driver.get(executionpath + "/test/test.html");
final String script = " declare sequential function local:listener($loc, $evtObj) {\n" +
" b:js-eval('document.title = \"timer-test01\"')\n" +
" };\n" +
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/UrlManipulation.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/UrlManipulation.java 2011-10-03 22:57:10 UTC (rev 4467)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/UrlManipulation.java 2011-10-03 23:39:55 UTC (rev 4468)
@@ -18,9 +18,9 @@
* test the b:pageURI function
*/
public void url_pageuri() throws Exception {
- driver.get("http://127.0.0.1:8090/test/test.html");
+ driver.get(executionpath + "/test/test.html");
String value = executeNewScript("b:pageURI()");
- Assert.assertEquals("http://127.0.0.1:8090/test/test.html", value);
+ Assert.assertEquals(executionpath + "/test/test.html", value);
}
@Test
@@ -28,8 +28,8 @@
* test the b:setHref function
*/
public void url_setHref() throws Exception {
- driver.get("http://127.0.0.1:8090/test/test.html");
- String newurl = "http://127.0.0.1:8090/test/test.html#some_stuff";
+ driver.get(executionpath + "/test/test.html");
+ String newurl = executionpath + "/test/test.html#some_stuff";
String value = executeNewScript("b:setHref('" + newurl + "')");
Assert.assertEquals(newurl, driver.getCurrentUrl());
}
@@ -39,8 +39,8 @@
* tests if the b:getLocation function returns the hash correctly
*/
public void url_getLocation() throws Exception {
- driver.get("http://127.0.0.1:8090/test/test.html");
- String newurl = "http://127.0.0.1:8090/test/test.html#some_stuff";
+ driver.get(executionpath + "/test/test.html");
+ String newurl = executionpath + "/test/test.html#some_stuff";
executeNewScript("b:setHref('" + newurl + "')");
String value = executeNewScript("b:getLocation()/b:hash/text()");
Assert.assertEquals("#some_stuff", value);
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/WeatherForecast.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/WeatherForecast.java 2011-10-03 22:57:10 UTC (rev 4467)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/WeatherForecast.java 2011-10-03 23:39:55 UTC (rev 4468)
@@ -12,7 +12,7 @@
public class WeatherForecast extends XQueryTestBase {
@BeforeClass
public static void page() {
- driver.get("http://127.0.0.1:8090/test/WeatherREST.html");
+ driver.get(executionpath + "/test/WeatherREST.html");
}
@Test
@@ -34,7 +34,7 @@
@Test
public void zurich_weather() throws Exception {
- // driver.get("http://127.0.0.1:8090/test/WeatherREST.html");
+ // driver.get(executionpath + "/test/WeatherREST.html");
WebElement weather_textfield = driver.findElementByName("city");
weather_textfield.clear();
weather_textfield.sendKeys("Zurich");
Modified: trunk/XQIB_Testing/test/ch/ethz/mxquery/Appendices/Annex_Eclass.java
===================================================================
--- trunk/XQIB_Testing/test/ch/ethz/mxquery/Appendices/Annex_Eclass.java 2011-10-03 22:57:10 UTC (rev 4467)
+++ trunk/XQIB_Testing/test/ch/ethz/mxquery/Appendices/Annex_Eclass.java 2011-10-03 23:39:55 UTC (rev 4468)
@@ -9,7 +9,7 @@
String query = "(: Name: annex-1 :)\n(: Description: User defined function # 1 from annex E of F& O Specs. :)\n\ndeclare namespace eg = \"http://example.org\";\n\ndeclare function eg:if-empty (\n $node as node()?,\n $value as xs:anyAtomicType) as xs:anyAtomicType* \n{\n if ($node and $node/child::node())\n then fn:data($node)\n else $value\n};\n\nlet $arg1 := <element1>some data</element1>\nlet $arg2 as xs:anyAtomicType := 1\nreturn\n eg:if-empty($arg1,$arg2)";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/test/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"some data"} ;
@@ -26,7 +26,7 @@
String query = "(: Name: annex-2 :)\n(: Description: User defined function # 2 from annex E of F& O Specs. :)\n\ndeclare namespace eg = \"http://example.org\";\n\ndeclare function eg:if-absent (\n $node as node()?,\n $value as xs:anyAtomicType) as xs:anyAtomicType* \n{\n if ($node)\n then fn:data($node)\n else $value\n};\n\nlet $arg1 := <element1>some data</element1>\nlet $arg2 as xs:anyAtomicType := 1\nreturn\n eg:if-absent($arg1,$arg2)";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/test/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"some data"} ;
@@ -43,7 +43,7 @@
String query = "(: Name: annex-3 :)\n(: Description: User defined function # 3 from annex E of F& O Specs. :)\n\ndeclare namespace eg = \"http://example.org\";\n\ndeclare function eg:value-union (\n $arg1 as xs:anyAtomicType*,\n $arg2 as xs:anyAtomicType*) as xs:anyAtomicType* \n{\n fn:distinct-values(($arg1, $arg2))\n};\n\nlet $arg1 as xs:anyAtomicType := 1\nlet $arg2 as xs:anyAtomicType := 2\nreturn\n eg:value-union($arg1,$arg2)";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/test/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"1 2"} ;
@@ -60,7 +60,7 @@
String query = "(: Name: annex-4 :)\n(: Description: User defined function # 4 from annex E of F& O Specs. :)\n\ndeclare namespace eg = \"http://example.org\";\n\ndeclare function eg:value-intersect (\n $arg1 as xs:anyAtomicType*,\n $arg2 as xs:anyAtomicType* ) as xs:anyAtomicType* \n{\n fn:distinct-values($arg1[.=$arg2])\n};\n\nlet $arg1 as xs:anyAtomicType := 1\nlet $arg2 as xs:anyAtomicType := 1\nreturn\n eg:value-intersect($arg1,$arg2)";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/test/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"1"} ;
@@ -77,7 +77,7 @@
String query = "(: Name: annex-5 :)\n(: Description: User defined function # 5 from annex E of F& O Specs. :)\n\ndeclare namespace eg = \"http://example.org\";\n\ndeclare function eg:value-except (\n $arg1 as xs:anyAtomicType*,\n $arg2 as xs:anyAtomicType*) as xs:anyAtomicType* \n{\n fn:distinct-values($arg1[not(.=$arg2)])\n};\n\nlet $arg1 as xs:anyAtomicType := 1\nlet $arg2 as xs:anyAtomicType := 2\nreturn\n eg:value-except($arg1,$arg2)";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/test/tests/TestSources/emptydoc.xml", false);
testcase...
[truncated message content] |
|
From: <et...@us...> - 2011-10-03 22:57:21
|
Revision: 4467
http://mxquery.svn.sourceforge.net/mxquery/?rev=4467&view=rev
Author: etterth
Date: 2011-10-03 22:57:10 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
- updated test generator and tests
Modified Paths:
--------------
trunk/XQIB_Testing/XQTStoJsUnit.xsl
trunk/XQIB_Testing/test/ch/ethz/mxquery/Appendices/Annex_Eclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Appendices/Appendix_A4class.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Catalogclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Basics/StaticContextclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Basics/Types/SequenceTypeSyntaxclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/CondExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConAttrclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConCommentclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConElemclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ComputeConPIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ConDocNodeclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ComputeCon/ConTextclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/ConInScopeNamespaceclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemAttrclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemContentclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemNamespaceclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElem/DirectConElemWhitespaceclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConElemclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Construct/DirectConOtherclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/ExtensionExpressionclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/ForExprPositionalVarclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/ForExprWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ForExpr/ForExprWithoutclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/LetExpr/LetExprWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/LetExpr/LetExprWithoutclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/OrderbyExpr/OrderbyExprWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/OrderbyExpr/OrderbyExprWithoutclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/ReturnExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/FLWOR/WhereExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/LogicExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationAddclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivideDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationDivideclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationMultiplyclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/DayTimeDurationSubtractclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationAddclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivideYMDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationDivideclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationMultiplyclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationArith/YearMonthDurationSubtractclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateAddDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateAddYMDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateSubtractDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateSubtractYMDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeAddDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeSubtractDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DateTimeSubtractYMDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/DatesSubtractclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeAddDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtractDTDclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/TimeSubtractclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/YearMonthDurationAddDTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/DurationDateTimeArith/dateTimesSubtractclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericAddclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericDivideclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericIntegerDivideclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericModclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericMultiplyclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericSubtractclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericUnaryMinusclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/ArithExpr/NumericOpr/NumericUnaryPlusclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompEqclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompGTEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompLTEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/GenComprsn/GenCompNEclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/NodeComp/NodeAfterclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/NodeComp/NodeBeforeclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/NodeComp/NodeSameclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/AnyURIComp/AnyURIEqualclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BinaryOp/Base64BinaryEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BinaryOp/HexBinaryEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanEqualclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateTimeEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateTimeGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DateTimeLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DayTimeDurationEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DayTimeDurationGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DayTimeDurationLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/DurationEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/TimeEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/TimeGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/TimeLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/YearMonthDurationEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/YearMonthDurationGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/YearMonthDurationLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gDayEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gMonthDayEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gMonthEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gYearEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/DurationDateTimeOp/gYearMonthEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/NumericComp/NumericEqualclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/NumericComp/NumericGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/NumericComp/NumericLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/QNameOp/PrefixFromQNameclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/QNameOp/QNameEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/StringComp/StringEqualclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/StringComp/StringGTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/StringComp/StringLTclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/CompExpr/ValComp/ValCompTypeCheckingclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/SeqOp/SeqExceptclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/SeqOp/SeqIntersectclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/Operators/SeqOp/SeqUnionclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/OrderExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/AbbrAxesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/PathExpressionsclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Predicatesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Steps/Axesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Steps/NodeTestSection/NameTestclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/Steps/NodeTestSection/NodeTestclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PathExpr/UnabbrAxesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/ContextExpr/ExternalContextExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/ContextExpr/InternalContextExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/FunctionCallExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/Literalsclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrimaryExpr/ParenExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/BaseURIPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/BoundarySpacePrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/CollationPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/ConstructionPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/CopyNamespacesPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/DefaultNamespacePrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/DefaultOrderingPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/EmptyOrderPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/FunctionPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/NamespacePrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/OptionDeclarationPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/ExternalVariablesWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/ExternalVariablesWithoutclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/InternalVariablesWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VariableProlog/InternalVariablesWithoutclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/PrologExpr/VersionPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/QuantExpr/QuantExprWithclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/QuantExpr/QuantExprWithoutclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/CombNodeSeqclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/ConstructSeq/RangeExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/ConstructSeq/commaOpclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/SeqExpr/FilterExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/XQueryCommentclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastToDerivedParentsclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastToDerivedclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastWithinBranchclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastableclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprCastclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprInstanceOfclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/SeqExprTreatclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Expressions/seqExprTypes/sequenceExprTypeswitchclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/BaseURIFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/DataFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/DocumentURIFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/NilledFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/NodeNameFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/StaticBaseURIFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AccessorFunc/StringFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/AssDisassStringFunc/CodepointToStringFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/AssDisassStringFunc/StringToCodepointFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/CompStringFunc/CodepointEqualclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/CompStringFunc/compareFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/ConcatFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/EncodeURIfuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/EscapeHTMLURIFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/IRIToURIfuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/LowerCaseFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/NormalizeSpaceFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/NormalizeUnicodeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/StringJoinFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/StringLengthFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/SubstringFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/Surrogatesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/TranslateFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/GeneralStringFunc/UpperCaseFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/MatchStringFunc/MatchesFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/MatchStringFunc/ReplaceFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/MatchStringFunc/TokenizeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/ContainsFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/EndsWithFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/StartsWithFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/SubstringAfterFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/AllStringFunc/SubstringStringFunc/SubstringBeforeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/BooleanFunc/FalseFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/BooleanFunc/NotFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/BooleanFunc/TrueFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ConstructFunc/DateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextCurrentDateFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextCurrentDatetimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextCurrentTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextDefaultCollationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextImplicitTimezoneFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextLastFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ContextFunc/ContextPositionFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/DayFromDateFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/DayFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/DaysFromDurationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/HoursFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/HoursFromDurationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/HoursFromTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MinutesFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MinutesFromDurationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MinutesFromTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MonthFromDateFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MonthFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/MonthsFromDurationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/SecondsFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/SecondsFromDurationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/SecondsFromTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/TimezoneFromDateFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/TimezoneFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/TimezoneFromTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/YearFromDateFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/YearFromDateTimeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/ComponentExtractionDDT/YearsFromDurationFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/TimezoneFunction/AdjDateTimeToTimezoneFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/TimezoneFunction/AdjDateToTimezoneFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/DurationDateTimeFunc/TimezoneFunction/AdjTimeToTimezoneFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/ErrorFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NameFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeLangFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeLocalNameFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeNamespaceURIFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeNumberFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NodeFunc/NodeRootFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/ABSFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/CeilingFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/FloorFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/RoundEvenFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/NumericFunc/RoundFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/InScopePrefixesFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/LocalNameFromQNameFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/NamespaceURIForPrefixFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/NamespaceURIFromQNameFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/QNameConstructFunc/ExpandedQNameConstructFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/QNameFunc/QNameConstructFunc/ResolveQNameConstructFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqAVGFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqCountFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqMAXFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqMINFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/AggregateSeqFunc/SeqSUMFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/CardinalitySeqFunc/SeqExactlyOneFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/CardinalitySeqFunc/SeqOneOrMoreFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/CardinalitySeqFunc/SeqZeroOrOneFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqBooleanFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqDistinctValuesFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqEmptyFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqExistsFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqIndexOfFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqInsertBeforeFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqRemoveFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqReverseFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqSubsequenceFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/GeneralSeqFunc/SeqUnorderedFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqCollectionFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqDocAvailableFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqDocFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqIDFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/NodeSeqFunc/SeqIDREFFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/SeqFunc/SeqDeepEqualFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/TraceFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Functions/URIFunc/ResolveURIFuncclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/OptionalFeatureErrors/CombinedErrorCodesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/ancestorAxisclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/ancestor_or_selfAxisclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/followingAxisclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/following_siblingAxisclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/precedingAxisclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/FullAxis/preceding_siblingAxisclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/Modules/ModuleImportclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/ConstructSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/FLWORExprSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/ForExprTypeSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/MiscFunctionsclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/NotationEQSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/NumericEqualSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/SchemaImportPrologclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/SeqExprCastSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/UserDefinedSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaImport/versionPrologSIclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/SchemaValidation/ValidateExpressionclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/StaticTyping/STFLWORExprclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/StaticTyping/STPathExpr/STSteps/STAxesclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/Optional/TrivialEmbeddingclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseNSclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCasePARTSclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseRclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseSEQclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseSGMLclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseSTRINGclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseTREEclass.java
trunk/XQIB_Testing/test/ch/ethz/mxquery/UseCase/UseCaseXMPclass.java
Modified: trunk/XQIB_Testing/XQTStoJsUnit.xsl
===================================================================
--- trunk/XQIB_Testing/XQTStoJsUnit.xsl 2011-10-03 22:05:41 UTC (rev 4466)
+++ trunk/XQIB_Testing/XQTStoJsUnit.xsl 2011-10-03 22:57:10 UTC (rev 4467)
@@ -14,8 +14,7 @@
<xsl:variable name="testsuitepath"
>../MXQuery_Testing/tests</xsl:variable>
<xsl:variable name="executionpath"
- >http://127.0.0.1:8090/test/tests</xsl:variable>
- <xsl:variable name="relativetestdir">http://127.0.0.1:8090/test/tests/</xsl:variable>
+ >" + executionpath + "</xsl:variable>
<xsl:template match="/">
<xsl:for-each select="test-suite/test-group">
<xsl:call-template name="test-group">
@@ -33,7 +32,7 @@
<xsl:choose>
<xsl:when test="./test-case">
<xsl:variable name="classname" select="concat($name, 'class')"></xsl:variable>
- <xsl:result-document href="crap/{$currentpath}/{$classname}.java" method="text">
+ <xsl:result-document href="{$currentpath}/{$classname}.java" method="text">
<xsl:call-template name="createJava">
<xsl:with-param name="name" select="$classname"/>
</xsl:call-template>
@@ -134,7 +133,7 @@
<!--<xsl:call-template name="getFileContentsAsString">
<xsl:with-param name="filepath">-->
<xsl:value-of
- select="concat($executionpath, '/',
+ select="concat($executionpath, '/tests/',
//source[@ID = $varname]/@FileName)"
/>
<!--</xsl:with-param>
@@ -170,7 +169,7 @@
select="module"><xsl:variable name="currentmodule" select="."/>
testcase.addModuleLocation("<xsl:value-of select="./@namespace"
/>", "<xsl:value-of
- select="concat($relativetestdir, root(.)//module[@ID = $currentmodule/text()]/@FileName, '.xq')"/>"); </xsl:for-each>
+ select="concat($executionpath, '/tests/', root(.)//module[@ID = $currentmodule/text()]/@FileName, '.xq')"/>"); </xsl:for-each>
<!-- input-file -->
<xsl:for-each select="input-file"><xsl:variable name="sourceid" select="text()"/>
<xsl:variable name="source" select="//source[@ID = $sourceid]"/>
@@ -178,7 +177,7 @@
<xsl:when test="$source/@schema">
testcase.addSchemaMapping("<xsl:value-of
select="//schema[@ID = $source/@schema]/@uri"/>", "<xsl:value-of
- select="concat($relativetestdir, //schema[@ID = $source/@schema]/@FileName)"
+ select="concat($executionpath, '/tests/', //schema[@ID = $source/@schema]/@FileName)"
/>");
testcase.addVariable("<xsl:value-of select="./@variable"/>",
"<xsl:call-template name="getVariable"/>", true);</xsl:when>
Modified: trunk/XQIB_Testing/test/ch/ethz/mxquery/Appendices/Annex_Eclass.java
===================================================================
--- trunk/XQIB_Testing/test/ch/ethz/mxquery/Appendices/Annex_Eclass.java 2011-10-03 22:05:41 UTC (rev 4466)
+++ trunk/XQIB_Testing/test/ch/ethz/mxquery/Appendices/Annex_Eclass.java 2011-10-03 22:57:10 UTC (rev 4467)
@@ -9,7 +9,7 @@
String query = "(: Name: annex-1 :)\n(: Description: User defined function # 1 from annex E of F& O Specs. :)\n\ndeclare namespace eg = \"http://example.org\";\n\ndeclare function eg:if-empty (\n $node as node()?,\n $value as xs:anyAtomicType) as xs:anyAtomicType* \n{\n if ($node and $node/child::node())\n then fn:data($node)\n else $value\n};\n\nlet $arg1 := <element1>some data</element1>\nlet $arg2 as xs:anyAtomicType := 1\nreturn\n eg:if-empty($arg1,$arg2)";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "http://127.0.0.1:8090/test/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"some data"} ;
@@ -26,7 +26,7 @@
String query = "(: Name: annex-2 :)\n(: Description: User defined function # 2 from annex E of F& O Specs. :)\n\ndeclare namespace eg = \"http://example.org\";\n\ndeclare function eg:if-absent (\n $node as node()?,\n $value as xs:anyAtomicType) as xs:anyAtomicType* \n{\n if ($node)\n then fn:data($node)\n else $value\n};\n\nlet $arg1 := <element1>some data</element1>\nlet $arg2 as xs:anyAtomicType := 1\nreturn\n eg:if-absent($arg1,$arg2)";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "http://127.0.0.1:8090/test/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"some data"} ;
@@ -43,7 +43,7 @@
String query = "(: Name: annex-3 :)\n(: Description: User defined function # 3 from annex E of F& O Specs. :)\n\ndeclare namespace eg = \"http://example.org\";\n\ndeclare function eg:value-union (\n $arg1 as xs:anyAtomicType*,\n $arg2 as xs:anyAtomicType*) as xs:anyAtomicType* \n{\n fn:distinct-values(($arg1, $arg2))\n};\n\nlet $arg1 as xs:anyAtomicType := 1\nlet $arg2 as xs:anyAtomicType := 2\nreturn\n eg:value-union($arg1,$arg2)";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "http://127.0.0.1:8090/test/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"1 2"} ;
@@ -60,7 +60,7 @@
String query = "(: Name: annex-4 :)\n(: Description: User defined function # 4 from annex E of F& O Specs. :)\n\ndeclare namespace eg = \"http://example.org\";\n\ndeclare function eg:value-intersect (\n $arg1 as xs:anyAtomicType*,\n $arg2 as xs:anyAtomicType* ) as xs:anyAtomicType* \n{\n fn:distinct-values($arg1[.=$arg2])\n};\n\nlet $arg1 as xs:anyAtomicType := 1\nlet $arg2 as xs:anyAtomicType := 1\nreturn\n eg:value-intersect($arg1,$arg2)";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "http://127.0.0.1:8090/test/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"1"} ;
@@ -77,7 +77,7 @@
String query = "(: Name: annex-5 :)\n(: Description: User defined function # 5 from annex E of F& O Specs. :)\n\ndeclare namespace eg = \"http://example.org\";\n\ndeclare function eg:value-except (\n $arg1 as xs:anyAtomicType*,\n $arg2 as xs:anyAtomicType*) as xs:anyAtomicType* \n{\n fn:distinct-values($arg1[not(.=$arg2)])\n};\n\nlet $arg1 as xs:anyAtomicType := 1\nlet $arg2 as xs:anyAtomicType := 2\nreturn\n eg:value-except($arg1,$arg2)";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "http://127.0.0.1:8090/test/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"1"} ;
@@ -94,7 +94,7 @@
String query = "(: Name: annex-6 :)\n(: Description: User defined function # 6 from annex E of F& O Specs. :)\n\ndeclare namespace eg = \"http://example.org\";\n\ndeclare function eg:index-of-node($sequence as node()*, $srch as node()) as xs:integer* \n{\n for $n at $i in $sequence where ($n is $srch) return $i\n};\n\nlet $arg1 := (<element1>some data 1</element1>,<element2>some data 2</element2>)\nlet $arg2 := $arg1[2]\nreturn\n eg:index-of-node($arg1,$arg2)";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "http://127.0.0.1:8090/test/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"2"} ;
@@ -111,7 +111,7 @@
String query = "(: Name: annex-7 :)\n(: Description: User defined function # 7 from annex E of F& O Specs. :)\n\ndeclare namespace eg = \"http://example.org\";\n\ndeclare function eg:string-pad (\n $padString as xs:string?,\n $padCount as xs:integer) as xs:string \n{\n fn:string-join((for $i in 1 to $padCount return $padString), \"\")\n};\n\nlet $arg1 as xs:string := \"A String\"\nlet $arg2 as xs:integer := 3\nreturn\n eg:string-pad($arg1,$arg2)";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "http://127.0.0.1:8090/test/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"A StringA StringA String"} ;
@@ -128,7 +128,7 @@
String query = "(: Name: annex-8 :)\n(: Description: User defined function # 8 from annex E of F& O Specs. :)\n\ndeclare namespace eg = \"http://example.org\";\n\ndeclare function eg:distinct-nodes-stable ($arg as node()*) as node()* \n{ \n for $a at $apos in $arg \n let $before_a := fn:subsequence($arg, 1, $apos - 1) \n where every $ba in $before_a satisfies not($ba is $a) \n return $a \n};\n\nlet $arg1 := (<element1>some data 1</element1>,<element2>some data 2</element2>)\nreturn\n eg:distinct-nodes-stable($arg1)";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "http://127.0.0.1:8090/test/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"<element1>some data 1</element1><element2>some data 2</element2>"} ;
Modified: trunk/XQIB_Testing/test/ch/ethz/mxquery/Appendices/Appendix_A4class.java
===================================================================
--- trunk/XQIB_Testing/test/ch/ethz/mxquery/Appendices/Appendix_A4class.java 2011-10-03 22:05:41 UTC (rev 4466)
+++ trunk/XQIB_Testing/test/ch/ethz/mxquery/Appendices/Appendix_A4class.java 2011-10-03 22:57:10 UTC (rev 4467)
@@ -9,7 +9,7 @@
String query = "(: Name: appendix-A4-1 :)\n(: Description: Precedence order for \"+\" and \"*\". :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n-3 + 5 * 3";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "http://127.0.0.1:8090/test/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"12"} ;
@@ -26,7 +26,7 @@
String query = "(: Name: appendix-A4-2 :)\n(: Description: Precedence order for \"-\" and \"*\". :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n3 - 5 * 3";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "http://127.0.0.1:8090/test/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"-12"} ;
@@ -43,7 +43,7 @@
String query = "(: Name: appendix-A4-3 :)\n(: Description: Precedence order for \"+\" and \"div\". :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n3 + 10 div 2";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "http://127.0.0.1:8090/test/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"8"} ;
@@ -60,7 +60,7 @@
String query = "(: Name: appendix-A4-4 :)\n(: Description: Precedence order for \"-\" and \"div\". :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n5 - 10 div 2";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "http://127.0.0.1:8090/test/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"0"} ;
@@ -77,7 +77,7 @@
String query = "(: Name: appendix-A4-5 :)\n(: Description: Precedence order for \"+\" and \"idiv\". :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n5 + 10 idiv 4";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "http://127.0.0.1:8090/test/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"7"} ;
@@ -94,7 +94,7 @@
String query = "(: Name: appendix-A4-6 :)\n(: Description: Precedence order for \"-\" and \"idiv\". :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n5 - 10 idiv 4";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "http://127.0.0.1:8090/test/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"3"} ;
@@ -111,7 +111,7 @@
String query = "(: Name: appendix-A4-7 :)\n(: Description: Precedence order for \"+\" and \"mod\". :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n5 + 10 mod 4";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "http://127.0.0.1:8090/test/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"7"} ;
@@ -128,7 +128,7 @@
String query = "(: Name: appendix-A4-8 :)\n(: Description: Precedence order for \"-\" and \"mod\". :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n5 - 10 mod 4";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "http://127.0.0.1:8090/test/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"3"} ;
@@ -145,7 +145,7 @@
String query = "(: Name: appendix-A4-9 :)\n(: Description: Precedence order for unary \"-\" and unary \"+\". :)\n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n-+7";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "http://127.0.0.1:8090/test/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String[] expectedoutput = new String[] {"-7"} ;
Modified: trunk/XQIB_Testing/test/ch/ethz/mxquery/Catalogclass.java
===================================================================
--- trunk/XQIB_Testing/test/ch/ethz/mxquery/Catalogclass.java 2011-10-03 22:05:41 UTC (rev 4466)
+++ trunk/XQIB_Testing/test/ch/ethz/mxquery/Catalogclass.java 2011-10-03 22:57:10 UTC (rev 4467)
@@ -8,9 +8,9 @@
public void test_Catalog001() throws Exception{
String query = "(: Name: Catalog001 :)\n(: Description: test that most input files have variable references :)\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\n\n<missing-variable>{for $x in $input-context//*:input-file[count(@variable) = 0 and\n./text() != \"emptydoc\"] return string($x/../@name)}</missing-variable>";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/2005/02/query-test-XQTSCatalog", "http://127.0.0.1:8090/test/tests/XQTSCatalog.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/2005/02/query-test-XQTSCatalog", "" + executionpath + "/tests/XQTSCatalog.xsd");
testcase.addVariable("input-context",
- "http://127.0.0.1:8090/test/tests/XQTSCatalog.xml", true);
+ "" + executionpath + "/tests/XQTSCatalog.xml", true);
testcase.execute();
String[] expectedoutput = new String[] {"<missing-variable></missing-variable>"} ;
@@ -26,9 +26,9 @@
public void test_Catalog002() throws Exception{
String query = "(: Name: Catalog002 :)\n(: Description: test all standard test cases have at least one output file :)\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\n<standard-no-outputfile>{$input-context//*:test-case[@scenario = \"standard\"][fn:count(*:output-file) = 0]/@name/string()}</standard-no-outputfile>\n";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/2005/02/query-test-XQTSCatalog", "http://127.0.0.1:8090/test/tests/XQTSCatalog.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/2005/02/query-test-XQTSCatalog", "" + executionpath + "/tests/XQTSCatalog.xsd");
testcase.addVariable("input-context",
- "http://127.0.0.1:8090/test/tests/XQTSCatalog.xml", true);
+ "" + executionpath + "/tests/XQTSCatalog.xml", true);
testcase.execute();
String[] expectedoutput = new String[] {"<standard-no-outputfile/>"} ;
@@ -44,9 +44,9 @@
public void test_Catalog003() throws Exception{
String query = "(: Name: Catalog003 :)\n(: Description: test all error test cases have at least one expected error :)\n\n(: insert-start :)\ndeclare variable $input-context external;\n(: insert-end :)\n\n<error-no-expected-error>{$input-context//*:test-case[@scenario = \"runtime-error\" or @scenario = \"parse-error\"][fn:count(*:expected-error) = 0 and fn:count(*:output-file[@compare = \"Inspect\"]) = 0]/@name/string()}</error-no-expected-error>";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
- testcase.addSchemaMapping("http://www.w3.org/2005/02/query-test-XQTSCatalog", "http://127.0.0.1:8090/test/tests/XQTSCatalog.xsd");
+ testcase.addSchemaMapping("http://www.w3.org/2005/02/query-test-XQTSCatalog", "" + executionpath + "/tests/XQTSCatalog.xsd");
testcase.addVariable("input-context",
- "http://127.0.0.1:8090/test/tests/XQTSCatalog.xml", true);
+ "" + executionpath + "/tests/XQTSCatalog.xml", true);
testcase.execute();
String[] expectedoutput = new String[] {"<error-no-expected-error/>"} ;
Modified: trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Basics/StaticContextclass.java
===================================================================
--- trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Basics/StaticContextclass.java 2011-10-03 22:05:41 UTC (rev 4466)
+++ trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Basics/StaticContextclass.java 2011-10-03 22:57:10 UTC (rev 4467)
@@ -9,7 +9,7 @@
String query = "(:*******************************************************:)\n(:Test: static-context-1 :)\n(:Written By: Carmelo Montanez :)\n(:Date: July 12, 2006 :)\n(:Purpose: Evaluate error condition XPST0001 :)\n(:*******************************************************:)\n\ndeclare namespace test = 'http://www.example.com'; \n\n(: insert-start :)\ndeclare variable $input-context1 external;\n(: insert-end :)\n\n<a/> instance of element(*, test:unknownType)";
XQueryTestCase testcase = new XQueryTestCase(driver,query);
testcase.addVariable("input-context1",
- "http://127.0.0.1:8090/test/tests/TestSources/emptydoc.xml", false);
+ "" + executionpath + "/tests/TestSources/emptydoc.xml", false);
testcase.execute();
String errorcode = testcase.getErrorCode();
Modified: trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Basics/Types/SequenceTypeSyntaxclass.java
===================================================================
--- trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Basics/Types/SequenceTypeSyntaxclass.java 2011-10-03 22:05:41 UTC (rev 4466)
+++ trunk/XQIB_Testing/test/ch/ethz/mxquery/MinimalConformance/Basics/Types/SequenceTypeSyntaxclass.java 2011-10-03 22:57:10 UTC (rev 4467)
@@ -9,7 +9,7 @@
String query = "(:*******************************************************:)\n(:Test: sequence-type-1 :)\n(:Written By: Carmelo Montanez :)\n(:Date: March 29, 2006 :)\n(:Purpose: Evaluate simple sequence type using instance of :)\n(: and integers. :)\n(:******************************************...
[truncated message content] |
|
From: <et...@us...> - 2011-10-03 22:05:49
|
Revision: 4466
http://mxquery.svn.sourceforge.net/mxquery/?rev=4466&view=rev
Author: etterth
Date: 2011-10-03 22:05:41 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
- added copying of tests to gwt_war
Modified Paths:
--------------
trunk/MXQuery/build.xml
Modified: trunk/MXQuery/build.xml
===================================================================
--- trunk/MXQuery/build.xml 2011-10-03 20:56:35 UTC (rev 4465)
+++ trunk/MXQuery/build.xml 2011-10-03 22:05:41 UTC (rev 4466)
@@ -17,18 +17,22 @@
<project name="MXQuery" default="jar" basedir=".">
-
- <property name="officialName" value="MXQuery"></property>
- <property name="version" value="0.6.1"></property>
- <property name="year" value="2006-2009"></property>
- <property name="copyright" value="ETH Zurich"></property>
-
- <property name="debug" value="on"/>
- <property name="optimize" value="on"/>
+
+ <property name="officialName" value="MXQuery">
+ </property>
+ <property name="version" value="0.6.1">
+ </property>
+ <property name="year" value="2006-2009">
+ </property>
+ <property name="copyright" value="ETH Zurich">
+ </property>
+
+ <property name="debug" value="on"/>
+ <property name="optimize" value="on"/>
<property name="src.version" value="1.3"/>
-
+
<property name="root.dir" value="."/>
- <property name="src.dir" value="${root.dir}/src"/>
+ <property name="src.dir" value="${root.dir}/src"/>
<property name="resources.dir" value="${root.dir}/lib"/>
<property name="build.dir" value="${root.dir}/build"/>
<property name="dist.dir" value="${root.dir}/dist"/>
@@ -36,19 +40,19 @@
<property name="customtmp.dir" value="${root.dir}/customtmp"/>
<property name="midptmp.dir" value="${customtmp.dir}"/>
<property name="xqibtmp.dir" value="${customtmp.dir}"/>
-
+
<property name="tmpfunc.dir" value="${customtmp.dir}/ch/ethz/mxquery/functions"/>
<property name="srcfunc.dir" value="${src.dir}/ch/ethz/mxquery/functions"/>
-
+
<property name="noparsertmp.dir" value="${root.dir}/noparsertmp"/>
-
+
<property name="modules.dir" value="${root.dir}/mod2export"/>
<property name="war.dir" value ="${build.dir}/war"/>
<property name="gwt_war.dir" value ="${build.dir}/gwt_war"/>
<property name="gwt_webinf.dir" value ="${gwt_war.dir}/WEB-INF"/>
<property name="gwt_webclasses.dir" value ="${gwt_webinf.dir}/classes"/>
<property name="xqib_samples.dir" value ="${root.dir}/xqib_samples"/>
-
+
<property name="webinf.dir" value="${war.dir}/WEB-INF"/>
<property name="weblib.dir" value="${webinf.dir}/lib"/>
<property name="webclasses.dir" value="${webinf.dir}/classes"/>
@@ -56,9 +60,9 @@
<property name="utilservlet.dir" value="${webclasses.dir}/ch/ethz/mxquery/util"/>
<property name="xspcontent.dir" value="${root.dir}/XSP"/>
-
+
<import file="generate_funcgallery.xml"/>
-
+
<condition property="wtk.home" value="C:\\WTK2.5.2_01">
<os family="windows"/>
</condition>
@@ -74,52 +78,52 @@
<property name="altsrc.dir" value="${root.dir}/altsrc"/>
<path id="project.class.path">
- <pathelement location="${resources.dir}/xml-apis.jar" />
- <fileset dir="${resources.dir}">
- <include name="*.jar"/>
- </fileset>
- <pathelement path="${java.class.path}"/>
+ <pathelement location="${resources.dir}/xml-apis.jar" />
+ <fileset dir="${resources.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement path="${java.class.path}"/>
</path>
-
+
<path id="midlet.class.path">
- <pathelement location="${build.dir}"/>
- <fileset dir="${resources.dir}">
- <include name="kxml2-min-2.3.0.jar"/>
- <include name="xmlpull_1_1_3_4c.jar"/>
- <include name="microlog-logger-core-2.3.5.jar"/>
+ <pathelement location="${build.dir}"/>
+ <fileset dir="${resources.dir}">
+ <include name="kxml2-min-2.3.0.jar"/>
+ <include name="xmlpull_1_1_3_4c.jar"/>
+ <include name="microlog-logger-core-2.3.5.jar"/>
- </fileset>
+ </fileset>
</path>
-
+
<taskdef resource="antenna.properties" classpath="${resources.dir}/antenna-bin-0.9.14.jar"/>
-
- <target name="clean">
- <echo message="Cleaning directories..."/>
- <delete>
- <fileset dir="${build.dir}/">
- <exclude name="gwt_war/mxqueryjs/**/*"/>
- <include name="**/*"/>
- </fileset>
- <fileset dir="${customtmp.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
-
+
+ <target name="clean">
+ <echo message="Cleaning directories..."/>
+ <delete>
+ <fileset dir="${build.dir}/">
+ <exclude name="gwt_war/mxqueryjs/**/*"/>
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="${customtmp.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+
<mkdir dir="${build.dir}"/>
- <mkdir dir="${dist.dir}"/>
- <mkdir dir="${customtmp.dir}"/>
- </target>
-
- <target name="compile" depends="clean">
+ <mkdir dir="${dist.dir}"/>
+ <mkdir dir="${customtmp.dir}"/>
+ </target>
+
+ <target name="compile" depends="clean">
<echo message="Compiling..."/>
-
+
<depend srcdir="${src.dir}"
destdir="${build.dir}"
cache="depcache"
closure="yes"
/>
- <javac source="${src.version}"
+ <javac source="${src.version}"
srcdir="${src.dir}"
destdir="${build.dir}"
target="1.4"
@@ -128,19 +132,21 @@
optimize="${optimize}"
extdirs=""
/>
- </target>
+ </target>
- <target name="compile-15" depends="clean">
- <echo message="Merging source trees"/>
- <delete>
- <fileset dir="${customtmp.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
- <copy todir="${customtmp.dir}"><fileset dir="${src.dir}"/></copy>
+ <target name="compile-15" depends="clean">
+ <echo message="Merging source trees"/>
+ <delete>
+ <fileset dir="${customtmp.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+ <copy todir="${customtmp.dir}">
+ <fileset dir="${src.dir}"/>
+ </copy>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java" />
<depend srcdir="${customtmp.dir}"
destdir="${build.dir}"
@@ -148,7 +154,7 @@
closure="yes"
/>
- <javac source="${src.version}"
+ <javac source="${src.version}"
srcdir="${customtmp.dir}"
destdir="${build.dir}"
target="1.4"
@@ -157,67 +163,69 @@
optimize="${optimize}"
extdirs=""
/>
- </target>
+ </target>
- <target name="compile-14" depends="clean">
- <echo message="Merging source trees"/>
- <delete>
- <fileset dir="${customtmp.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
- <copy todir="${customtmp.dir}"><fileset dir="${src.dir}"/></copy>
+ <target name="compile-14" depends="clean">
+ <echo message="Merging source trees"/>
+ <delete>
+ <fileset dir="${customtmp.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+ <copy todir="${customtmp.dir}">
+ <fileset dir="${src.dir}"/>
+ </copy>
- <delete>
- <fileset dir="${customtmp.dir}/ch/ethz/mxquery/sms/MMimpl/" id="id">
- <include name="*.java"/>
- <exclude name="TokenBufferStore.java"/>
+ <delete>
+ <fileset dir="${customtmp.dir}/ch/ethz/mxquery/sms/MMimpl/" id="id">
+ <include name="*.java"/>
+ <exclude name="TokenBufferStore.java"/>
<exclude name="MaterializingTokenBufferStore.java"/>
- </fileset>
- <fileset dir="${customtmp.dir}/ch/ethz/mxquery/parallel" id="id">
- <include name="*.java"/>
- </fileset>
- </delete>
+ </fileset>
+ <fileset dir="${customtmp.dir}/ch/ethz/mxquery/parallel" id="id">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/AvailEnvVars.java"/>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PFFLWORIterator.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PGFLWORIterator.java"/>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PGroupBy.java"/>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBinding.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBindingParallel.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/XSPMain.java"/>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/query/parser/J56Parser.java" />
- <delete file="${customtmp.dir}/ch/ethz/mxquery/extensionsModules/util/Uuid.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/functions/fn/AvailEnvVars.java"/>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PFFLWORIterator.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PGFLWORIterator.java"/>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/PGroupBy.java"/>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBinding.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBindingParallel.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/XSPMain.java"/>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/query/parser/J56Parser.java" />
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/extensionsModules/util/Uuid.java" />
- <delete file="${customtmp.dir}/examples/StreamExample.java" />
- <delete file="${customtmp.dir}/examples/StreamStatsDemo.java" />
- <delete file="${customtmp.dir}/examples/StreamLifecycleExample.java" />
- <delete>
- <fileset dir="${customtmp.dir}/ch/ethz/mxquery/dmcq/">
- <include name="*.java"/>
- </fileset>
- </delete>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/util/PerfTools.java" />
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/String_Length.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/SubString.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/StringToCodepoints.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/Translate.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes" />
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/sms/MMimpl/TokenBufferStore.java" todir="${customtmp.dir}/ch/ethz/mxquery/sms/MMimpl/" overwrite="yes" />
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/sms/StoreFactory.java" todir="${customtmp.dir}/ch/ethz/mxquery/sms/" overwrite="yes" />
+ <delete file="${customtmp.dir}/examples/StreamExample.java" />
+ <delete file="${customtmp.dir}/examples/StreamStatsDemo.java" />
+ <delete file="${customtmp.dir}/examples/StreamLifecycleExample.java" />
+ <delete>
+ <fileset dir="${customtmp.dir}/ch/ethz/mxquery/dmcq/">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/util/PerfTools.java" />
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/String_Length.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/SubString.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/StringToCodepoints.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes"/>
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/fn/Translate.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes" />
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/sms/MMimpl/TokenBufferStore.java" todir="${customtmp.dir}/ch/ethz/mxquery/sms/MMimpl/" overwrite="yes" />
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/sms/StoreFactory.java" todir="${customtmp.dir}/ch/ethz/mxquery/sms/" overwrite="yes" />
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/bindings/WindowBuffer.java" todir="${customtmp.dir}/ch/ethz/mxquery/bindings/" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/util/PlatformDependentUtils.java" todir="${customtmp.dir}/ch/ethz/mxquery/util" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/datamodel/MXQueryFloat.java" todir="${customtmp.dir}/ch/ethz/mxquery/datamodel" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/datamodel/MXQueryBigDecimal.java" todir="${customtmp.dir}/ch/ethz/mxquery/datamodel" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/query/impl/CompilerImpl.java" todir="${customtmp.dir}/ch/ethz/mxquery/query/impl" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingDOMAdapter.java" todir="${customtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/functions/math/TransMath.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/math" overwrite="yes" />
- <copy file="${altsrc.dir}/ch/ethz/mxquery/functions/fn/Matches.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes" />
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/bindings/WindowBuffer.java" todir="${customtmp.dir}/ch/ethz/mxquery/bindings/" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/util/PlatformDependentUtils.java" todir="${customtmp.dir}/ch/ethz/mxquery/util" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/datamodel/MXQueryFloat.java" todir="${customtmp.dir}/ch/ethz/mxquery/datamodel" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/datamodel/MXQueryBigDecimal.java" todir="${customtmp.dir}/ch/ethz/mxquery/datamodel" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/query/impl/CompilerImpl.java" todir="${customtmp.dir}/ch/ethz/mxquery/query/impl" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingDOMAdapter.java" todir="${customtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/functions/math/TransMath.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/math" overwrite="yes" />
+ <copy file="${altsrc.dir}/ch/ethz/mxquery/functions/fn/Matches.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/fn/" overwrite="yes" />
<depend srcdir="${customtmp.dir}"
@@ -226,7 +234,7 @@
closure="yes"
/>
- <javac source="${src.version}"
+ <javac source="${src.version}"
srcdir="${customtmp.dir}"
destdir="${build.dir}"
target="1.4"
@@ -236,92 +244,115 @@
includeAntRuntime="false"
extdirs=""
/>
- </target>
-
+ </target>
+
<target name="jar" depends="compile">
<echo message="Creating jar archive..."/>
- <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}">
+ </unjar>
<jar jarfile="${dist.dir}/mxquery.jar">
<fileset dir="${build.dir}" excludes="examples/**/*.*"/>
<fileset dir="${src.dir}" includes="ch/**/*.xq"/>
- <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
+ <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
<fileset dir="${src.dir}" includes="ch/**/*.txt"/>
<fileset dir="${src.dir}" includes="**/*.servlet"/>
<fileset dir="${src.dir}" includes="ch/**/*.txt"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
- </manifest>
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
+ </manifest>
</jar>
</target>
<target name="jar-15" depends="compile-15">
<echo message="Creating jar archive..."/>
- <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/jax-1_1-fr-qname-class.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/jsr173_1.0_api.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/jax-1_1-fr-qname-class.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/jsr173_1.0_api.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}">
+ </unjar>
<jar jarfile="${dist.dir}/mxquery-15.jar">
<fileset dir="${build.dir}" excludes="examples/**/*.*"/>
<fileset dir="${src.dir}" includes="ch/**/*.xq"/>
- <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
+ <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
<fileset dir="${src.dir}" includes="ch/**/*.txt"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
- </manifest>
-
-
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
+ </manifest>
+
+
</jar>
- </target>
+ </target>
<target name="jar-14" depends="compile-14">
<echo message="Creating jar archive..."/>
- <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xml-apis.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/jax-1_1-fr-qname-class.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/jsr173_1.0_api.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}"></unjar>
+ <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xml-apis.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xercesImpl.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/jax-1_1-fr-qname-class.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/jsr173_1.0_api.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/tagsoup-1.2.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xqjapi.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/commons-cli-1.2.jar" dest="${build.dir}">
+ </unjar>
<jar jarfile="${dist.dir}/mxquery-14.jar">
<fileset dir="${build.dir}" excludes="examples/**/*.*"/>
<fileset dir="${src.dir}" includes="ch/**/*.xq"/>
- <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
+ <fileset dir="${src.dir}" includes="ch/**/*.xml"/>
<fileset dir="${src.dir}" includes="ch/**/*.txt"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
- </manifest>
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ <attribute name="Main-Class" value="ch.ethz.mxquery.cmdline.MXQuery"/>
+ </manifest>
</jar>
- </target>
-
+ </target>
+
<target name="war" depends="jar">
<echo message="Creating the SOAP Server war ... "/>
<mkdir dir="${war.dir}"/>
- <delete>
- <fileset dir="${war.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
+ <delete>
+ <fileset dir="${war.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
<mkdir dir="${webinf.dir}"/>
<mkdir dir="${weblib.dir}"/>
<mkdir dir="${webclasses.dir}"/>
<mkdir dir="${servlet.dir}}"/>
- <mkdir dir="${utilservlet.dir}}"/>
+ <mkdir dir="${utilservlet.dir}}"/>
<copy file="${build.dir}/ch/ethz/mxquery/query/webservice/MultipleXQueryServer.class" todir="${servlet.dir}"/>
<copy file="${build.dir}/ch/ethz/mxquery/query/webservice/SingleXQueryServer.class" todir="${servlet.dir}"/>
<copy file="${build.dir}/ch/ethz/mxquery/util/MultipleSchemaExposer.class" todir="${utilservlet.dir}"/>
@@ -329,160 +360,169 @@
<copy file="${src.dir}/ch/ethz/mxquery/query/webservice/web.xml" todir="${webinf.dir}"/>
<copy file="${src.dir}/ch/ethz/mxquery/query/webservice/index.html" todir="${war.dir}"/>
<copy file="${dist.dir}/mxquery.jar" todir="${weblib.dir}"/>
- <copy todir="${war.dir}"><fileset dir="${modules.dir}"/></copy>
+ <copy todir="${war.dir}">
+ <fileset dir="${modules.dir}"/>
+ </copy>
<jar jarfile="${dist.dir}/MXQuery.war">
- <fileset dir="${war.dir}" includes="**/*.*"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- </manifest>
- </jar>
+ <fileset dir="${war.dir}" includes="**/*.*"/>
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ </manifest>
+ </jar>
</target>
-
-
+
+
<target name="xsp" depends="war">
<echo message="Creating the XSP war ... "/>
<mkdir dir="${war.dir}"/>
- <delete>
- <fileset dir="${war.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
+ <delete>
+ <fileset dir="${war.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
<mkdir dir="${webinf.dir}"/>
<mkdir dir="${weblib.dir}"/>
<mkdir dir="${servlet.dir}}"/>
- <mkdir dir="${utilservlet.dir}}"/>
+ <mkdir dir="${utilservlet.dir}}"/>
<copy file="${build.dir}/ch/ethz/mxquery/query/webservice/XSPMain.class" todir="${utilservlet.dir}"/>
<copy file="${dist.dir}/mxquery.jar" todir="${weblib.dir}"/>
- <copy todir="${war.dir}"><fileset dir="${xspcontent.dir}"/></copy>
+ <copy todir="${war.dir}">
+ <fileset dir="${xspcontent.dir}"/>
+ </copy>
<jar jarfile="${dist.dir}/XSP.war">
- <fileset dir="${war.dir}" includes="**/*.*"/>
- <manifest>
- <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
- </manifest>
- </jar>
+ <fileset dir="${war.dir}" includes="**/*.*"/>
+ <manifest>
+ <attribute name="Built-By" value="MXQuery Team at ETH Zurich (in...@mx...)"/>
+ </manifest>
+ </jar>
</target>
-
+
<target name="midp_prepare" depends="clean">
- <echo message="Merging source trees"/>
- <delete>
- <fileset dir="${midptmp.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
- <copy todir="${midptmp.dir}"><fileset dir="${src.dir}"/></copy>
- <copy todir="${midptmp.dir}" overwrite="yes"><fileset dir="${midpsrc.dir}"/></copy>
- <echo message="Removing unsupported classes"/>
-
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/parallel/"/>
+ <echo message="Merging source trees"/>
+ <delete>
+ <fileset dir="${midptmp.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+ <copy todir="${midptmp.dir}">
+ <fileset dir="${src.dir}"/>
+ </copy>
+ <copy todir="${midptmp.dir}" overwrite="yes">
+ <fileset dir="${midpsrc.dir}"/>
+ </copy>
+ <echo message="Removing unsupported classes"/>
+
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/parallel/"/>
<delete dir="${midptmp.dir}/javax/"/>
<delete dir="${midptmp.dir}/org/tartarus"/>
<delete dir="${midptmp.dir}/com/"/>
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/xqj/"/>
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/opt/expr"/>
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/opt/index"/>
- <delete dir="${midptmp.dir}/ch/ethz/mxquery/query/optimizer"/>
-
- <delete>
- <fileset dir="${midptmp.dir}/ch/ethz/mxquery/sms/MMimpl/">
- <include name="*.java"/>
- <exclude name="TokenBufferStore.java"/>
- <exclude name="MaterializingTokenBufferStore.java"/>
- </fileset>
- </delete>
- <delete>
- <fileset dir="${midptmp.dir}/examples">
- <include name="*.java"/>
- </fileset>
- </delete>
- <delete>
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/xqj/"/>
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/opt/expr"/>
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/opt/index"/>
+ <delete dir="${midptmp.dir}/ch/ethz/mxquery/query/optimizer"/>
+
+ <delete>
+ <fileset dir="${midptmp.dir}/ch/ethz/mxquery/sms/MMimpl/">
+ <include name="*.java"/>
+ <exclude name="TokenBufferStore.java"/>
+ <exclude name="MaterializingTokenBufferStore.java"/>
+ </fileset>
+ </delete>
+ <delete>
+ <fileset dir="${midptmp.dir}/examples">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete>
<fileset dir="${midptmp.dir}/ch/ethz/mxquery/cmdline">
<include name="*.java"/>
</fileset>
- </delete>
+ </delete>
- <delete>
- <fileset dir="${midptmp.dir}/ch/ethz/mxquery/extensionsModules" id="id">
+ <delete>
+ <fileset dir="${midptmp.dir}/ch/ethz/mxquery/extensionsModules" id="id">
<include name="**/*.java"/>
- <exclude name="ExtensionModulesConfig.java"/>
- <exclude name="zorbaRest/HttpIO.java"/>
- </fileset>
- </delete>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexInterface.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexRead.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexUpdate.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/RandomUpdate.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/ftstore/SnowballBasedStemmer.java" />
- <delete>
+ <exclude name="ExtensionModulesConfig.java"/>
+ <exclude name="zorbaRest/HttpIO.java"/>
+ </fileset>
+ </delete>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexInterface.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexRead.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexUpdate.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/interfaces/RandomUpdate.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/sms/ftstore/SnowballBasedStemmer.java" />
+ <delete>
<fileset dir="${midptmp.dir}/ch/ethz/mxquery/dmcq/">
<include name="*.java"/>
</fileset>
- </delete>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/util/PerfTools.java" />
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/GroupByIndexIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/DirectXMLIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/PFFLWORIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/PGFLWORIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/PGroupBy.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/CommandLineInIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/NativeFuncCall.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowIndexIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBinding.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBindingParallel.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/util/UnicodeInputStream.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/util/UnicodeReader.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/DirectXMLWrapperIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/Collection.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/CommandLineInIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/SubFiles.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/SubFiles2.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/Eratosthenes.java"></delete>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Floor.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Ceiling.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Abs.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Round.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Put.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Matches.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/AvailEnvVars.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/EnvVar.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/IRItoURI.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/DocAvailable.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/math/Pow.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/math/Sqrt.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/math/TransMath.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/model/ws/MultiPartFormOutputStream.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/query/parser/SchemaParser.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/query/parser/SEParser.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/query/parser/J56Parser.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/ValidateIterator.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/ValidatedSaxImportAdapter.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2StaxAdapter.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2SaxAdapter.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2DOMAdapter.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonSchemaValidatingSaxImportAdapter.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingDOMAdapter.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingStaxAdapter.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/MultipleXQueryServer.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/SingleXQueryServer.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/XSPMain.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/util/MultipleSchemaExposer.java"/>
- <delete file="${midptmp.dir}/ch/ethz/mxquery/util/SingleSchemaExposer.java"/>
- <!--<delete file="${midptmp.dir}/ch/ethz/mxquery/util/BitSetjava"/>-->
- <!--<delete file="${midptmp.dir}/org/tartarus/snowball/TestApp.java" />-->
+ </delete>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/util/PerfTools.java" />
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/GroupByIndexIterator.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/DirectXMLIterator.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/PFFLWORIterator.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/PGFLWORIterator.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/PGroupBy.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/CommandLineInIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/NativeFuncCall.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowIndexIterator.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBinding.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBindingParallel.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/util/UnicodeInputStream.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/util/UnicodeReader.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/DirectXMLWrapperIterator.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/Collection.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/CommandLineInIterator.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/SubFiles.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/SubFiles2.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/mxq/Eratosthenes.java">
+ </delete>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Floor.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Ceiling.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Abs.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Round.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Put.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/Matches.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/AvailEnvVars.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/EnvVar.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/IRItoURI.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/DocAvailable.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/math/Pow.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/math/Sqrt.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/functions/math/TransMath.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/model/ws/MultiPartFormOutputStream.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/query/parser/SchemaParser.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/query/parser/SEParser.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/query/parser/J56Parser.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/iterators/ValidateIterator.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/ValidatedSaxImportAdapter.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2StaxAdapter.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2SaxAdapter.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2DOMAdapter.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonSchemaValidatingSaxImportAdapter.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingDOMAdapter.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingStaxAdapter.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/MultipleXQueryServer.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/SingleXQueryServer.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/query/webservice/XSPMain.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/util/MultipleSchemaExposer.java"/>
+ <delete file="${midptmp.dir}/ch/ethz/mxquery/util/SingleSchemaExposer.java"/>
+ <!--<delete file="${midptmp.dir}/ch/ethz/mxquery/util/BitSetjava"/>-->
+ <!--<delete file="${midptmp.dir}/org/tartarus/snowball/TestApp.java" />-->
</target>
- <target name="midp_compile_wtk" depends="midp_prepare">
-
+ <target name="midp_compile_wtk" depends="midp_prepare">
+
<echo message="Compiling..."/>
-
+
<depend srcdir="${midptmp.dir}"
destdir="${build.dir}"
cache="depcache"
closure="yes"
/>
- <wtkbuild source="${src.version}"
+ <wtkbuild source="${src.version}"
srcdir="${midptmp.dir}"
destdir="${build.dir}"
classpathref="midlet.class.path"
@@ -490,139 +530,145 @@
optimize="${optimize}"
extdirs=""
preverify="false"
- />
- </target>
+ />
+ </target>
<target name="midp_wtk" depends="midp_compile_wtk">
<echo message="Creating midp jar archive..."/>
- <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}"></unjar>
- <unjar src="${resources.dir}/microlog-logger-core-2.3.5.jar" dest="${build.dir}"></unjar>
- <wtkjad jarfile="${dist.dir}/mxquery_midp.jar"
+ <unjar src="${resources.dir}/kxml2-min-2.3.0.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/xmlpull_1_1_3_4c.jar" dest="${build.dir}">
+ </unjar>
+ <unjar src="${resources.dir}/microlog-logger-core-2.3.5.jar" dest="${build.dir}">
+ </unjar>
+ <wtkjad jarfile="${dist.dir}/mxquery_midp.jar"
jadfile="${dist.dir}/mxquery_midp.jad"
name="MXQuery"
vendor="MXQuery Team at ETH Zurich"
version="${version}">
- <midlet name="MXQuery" class="ch.ethz.mxquery.mobile.MIDP"/>
- <attribute name="MIDlet-Permissions-Opt" value="javax.microedition.io.PushRegistry, javax.microedition.io.Connector.http, javax.microedition.io.Connector.socket, javax.microedition.io.Connector.https, javax.microedition.io.Connector.ssl, javax.microedition.io.Connector.datagram, javax.microedition.io.Connector.serversocket, javax.microedition.io.Connector.datagramreceiver, javax.microedition.io.Connector.comm"/>
- </wtkjad>
+ <midlet name="MXQuery" class="ch.ethz.mxquery.mobile.MIDP"/>
+ <attribute name="MIDlet-Permissions-Opt" value="javax.microedition.io.PushRegistry, javax.microedition.io.Connector.http, javax.microedition.io.Connector.socket, javax.microedition.io.Connector.https, javax.microedition.io.Connector.ssl, javax.microedition.io.Connector.datagram, javax.microedition.io.Connector.serversocket, javax.microedition.io.Connector.datagramreceiver, javax.microedition.io.Connector.comm"/>
+ </wtkjad>
<wtkpackage jarfile="${dist.dir}/mxquery_midp.jar"
jadfile="${dist.dir}/mxquery_midp.jad"
preverify="false">
<fileset dir="${build.dir}" includes="**/*.*"/>
<fileset dir="${midptmp.dir}" includes="**/*.xq"/>
- <fileset dir="${midptmp.dir}" includes="**/*.xml"/>
+ <fileset dir="${midptmp.dir}" includes="**/*.xml"/>
</wtkpackage>
<wtkpreverify jarfile="${dist.dir}/mxquery_midp.jar"
jadfile="${dist.dir}/mxquery_midp.jad"/>
</target>
-
- <property name="junit.output.dir" value="junit-out"/>
- <path id="JUnit 4.libraryclasspath">
- <pathelement location="lib/junit.jar"/>
- <!--<pathelement location="${ECLIPSE_HOME}/plugins/org.hamcrest.core_1.1.0.v20090501071000.jar"/>-->
- </path>
+ <property name="junit.output.dir" value="junit-out"/>
- <path id="GWT SDK.libraryclasspath">
- <pathelement location="gwt-2.3.0/gwt-user.jar"/>
- <pathelement location="gwt-2.3.0/gwt-dev.jar"/>
- </path>
- <path id="MXQueryJS.classpath">
- <pathelement location="${gwt_webclasses.dir}"/>
- <path refid="JUnit 4.libraryclasspath"/>
- <path refid="GWT SDK.libraryclasspath"/>
- </path>
- <path id="run.MXQueryJS.classpath">
- <pathelement location="${xqibtmp.dir}"/>
- <path refid="MXQueryJS.classpath"/>
- </path>
-
+ <path id="JUnit 4.libraryclasspath">
+ <pathelement location="lib/junit.jar"/>
+ <!--<pathelement location="${ECLIPSE_HOME}/plugins/org.hamcrest.core_1.1.0.v20090501071000.jar"/>-->
+ </path>
+
+ <path id="GWT SDK.libraryclasspath">
+ <pathelement location="gwt-2.3.0/gwt-user.jar"/>
+ <pathelement location="gwt-2.3.0/gwt-dev.jar"/>
+ </path>
+ <path id="MXQueryJS.classpath">
+ <pathelement location="${gwt_webclasses.dir}"/>
+ <path refid="JUnit 4.libraryclasspath"/>
+ <path refid="GWT SDK.libraryclasspath"/>
+ </path>
+ <path id="run.MXQueryJS.classpath">
+ <pathelement location="${xqibtmp.dir}"/>
+ <path refid="MXQueryJS.classpath"/>
+ </path>
+
<target name="xqib-js_prepare" depends="clean">
<mkdir dir="${gwt_war.dir}/WEB-INF"/>
<delete includeemptydirs="true">
<fileset dir="${gwt_war.dir}/WEB-INF">
- <include name="**/*"/>
+ <include name="**/*"/>
</fileset>
</delete>
- <echo message="Merging source trees"/>
-
- <delete>
- <fileset dir="${xqibtmp.dir}/">
- <include name="**/*"/>
- </fileset>
- </delete>
- <copy todir="${xqibtmp.dir}"><fileset dir="${src.dir}"/></copy>
- <echo message="Removing unsupported classes"/>
-
- <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/parallel/"/>
+ <echo message="Merging source trees"/>
+
+ <delete>
+ <fileset dir="${xqibtmp.dir}/">
+ <include name="**/*"/>
+ </fileset>
+ </delete>
+ <copy todir="${xqibtmp.dir}">
+ <fileset dir="${src.dir}"/>
+ </copy>
+ <echo message="Removing unsupported classes"/>
+
+ <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/parallel/"/>
<delete dir="${xqibtmp.dir}/javax/"/>
<delete dir="${xqibtmp.dir}/org/tartarus"/>
- <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/xqj/"/>
- <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/opt/expr"/>
- <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/opt/index"/>
- <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/query/optimizer"/>
-
- <delete>
- <fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/sms/MMimpl/">
- <include name="*.java"/>
- <exclude name="TokenBufferStore.java"/>
- <exclude name="MaterializingTokenBufferStore.java"/>
- </fileset>
- </delete>
- <delete>
- <fileset dir="${xqibtmp.dir}/examples">
- <include name="*.java"/>
- </fileset>
- </delete>
- <delete>
+ <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/xqj/"/>
+ <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/opt/expr"/>
+ <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/opt/index"/>
+ <delete dir="${xqibtmp.dir}/ch/ethz/mxquery/query/optimizer"/>
+
+ <delete>
+ <fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/sms/MMimpl/">
+ <include name="*.java"/>
+ <exclude name="TokenBufferStore.java"/>
+ <exclude name="MaterializingTokenBufferStore.java"/>
+ </fileset>
+ </delete>
+ <delete>
+ <fileset dir="${xqibtmp.dir}/examples">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete>
<fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/cmdline">
<include name="*.java"/>
</fileset>
- </delete>
+ </delete>
- <delete>
- <fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/extensionsModules" id="id">
+ <delete>
+ <fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/extensionsModules" id="id">
<include name="**/*.java"/>
- <exclude name="ExtensionModulesConfig.java"/>
- <exclude name="expathhttp/HttpIO.java"/>
- </fileset>
- </delete>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexInterface.java" />
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexRead.java" />
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexUpdate.java" />
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/interfaces/RandomUpdate.java" />
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/ftstore/SnowballBasedStemmer.java" />
- <delete>
+ <exclude name="ExtensionModulesConfig.java"/>
+ <exclude name="expathhttp/HttpIO.java"/>
+ </fileset>
+ </delete>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadThreadUpdate.java" />
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/activeStore/ReadDataThread.java" />
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexInterface.java" />
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexRead.java" />
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/interfaces/IndexUpdate.java" />
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/interfaces/RandomUpdate.java" />
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/sms/ftstore/SnowballBasedStemmer.java" />
+ <delete>
<fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/dmcq/">
<include name="*.java"/>
</fileset>
- </delete>
- <delete file="${customtmp.dir}/ch/ethz/mxquery/util/PerfTools.java" />
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/GroupByIndexIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/DirectXMLIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/PFFLWORIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/PGFLWORIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/PGroupBy.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/CommandLineInIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowIndexIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBinding.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBindingParallel.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/NativeFuncCall.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/util/UnicodeInputStream.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/util/UnicodeReader.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/DirectXMLWrapperIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/Collection.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/CommandLineInIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/SubFiles.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/SubFiles2.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/Eratosthenes.java"></delete>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/fn/DocAvailable.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java"/>
+ </delete>
+ <delete file="${customtmp.dir}/ch/ethz/mxquery/util/PerfTools.java" />
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/GroupByIndexIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/DirectXMLIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/PFFLWORIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/PGFLWORIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/PGroupBy.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/CommandLineInIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowIndexIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBinding.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/forseq/ForseqWindowEarlyBindingParallel.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/NativeFuncCall.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/util/UnicodeInputStream.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/util/UnicodeReader.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/DirectXMLWrapperIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/Collection.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/CommandLineInIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/SubFiles.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/SubFiles2.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/mxq/Eratosthenes.java">
+ </delete>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/fn/DocAvailable.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/fn/NormalizeUnicode.java"/>
<!--<delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/fn/Floor.java"/>
<delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/fn/Ceiling.java"/>
<delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/fn/Abs.java"/>
@@ -633,100 +679,103 @@
<delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/math/Pow.java"/>-->
<!--<delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/math/Sqrt.java"/>
<delete file="${xqibtmp.dir}/ch/ethz/mxquery/functions/math/TransMath.java"/>-->
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/model/ws/MultiPartFormOutputStream.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/parser/SchemaParser.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/parser/SEParser.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/parser/J56Parser.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/ValidateIterator.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/ValidatedSaxImportAdapter.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2StaxAdapter.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2SaxAdapter.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2DOMAdapter.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonSchemaValidatingSaxImportAdapter.java"/>
- <!--<delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingDOMAdapter.java"/>-->
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/model/ws/MultiPartFormOutputStream.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/parser/SchemaParser.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/parser/SEParser.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/parser/J56Parser.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/iterators/ValidateIterator.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/ValidatedSaxImportAdapter.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2StaxAdapter.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2SaxAdapter.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/Token2DOMAdapter.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonSchemaValidatingSaxImportAdapter.java"/>
+ <!--<delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingDOMAdapter.java"/>-->
<delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/XPPImportAdapter.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingStaxAdapter.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/webservice/MultipleXQueryServer.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/webservice/SingleXQueryServer.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/webservice/XSPMain.java"/>
-
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/util/MultipleSchemaExposer.java"/>
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/util/SingleSchemaExposer.java"/>
-
- <delete file="${xqibtmp.dir}/ch/ethz/mxquery/cmdline/MXQuery.java"/>
- <delete file="${xqibtmp.dir}/org/tartarus/snowball/TestApp.java" />
-
- <delete file="${xqibtmp.dir}\ch\ethz\mxquery\query\parser\PlanLoader.java" />
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/xdmio/xmlAdapters/NonValidatingStaxAdapter.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/webservice/MultipleXQueryServer.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/webservice/SingleXQueryServer.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/query/webservice/XSPMain.java"/>
+
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/util/MultipleSchemaExposer.java"/>
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/util/SingleSchemaExposer.java"/>
+
+ <delete file="${xqibtmp.dir}/ch/ethz/mxquery/cmdline/MXQuery.java"/>
+ <delete file="${xqibtmp.dir}/org/tartarus/snowball/TestApp.java" />
+
+ <delete file="${xqibtmp.dir}\ch\ethz\mxquery\query\parser\PlanLoader.java" />
<delete file="${xqibtmp.dir}\ch\ethz\mxquery\functions\fn\Parse.java" />
<delete file="${xqibtmp.dir}\ch\ethz\mxquery\functions\fn\Soap_call.java" />
<delete file="${xqibtmp.dir}\ch\ethz\mxquery\iterators\scripting\WSFunction.java" />
<delete file="${xqibtmp.dir}\ch\ethz\mxquery\sms\ftstore\WordNetRemoteThesaurus.java" />
<!--
<delete file="${xqibtmp.dir}" />-->
-
-
- <delete>
- <fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/query/webservice">
- </fileset>
- <fileset dir="${xqibtmp.dir}\ch\ethz\mxquery\functions\mxq">
- <!--<include name="include"/>
+
+
+ <delete>
+ <fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/query/webservice">
+ </fileset>
+ <fileset dir="${xqibtmp.dir}\ch\ethz\mxquery\functions\mxq">
+ <!--<include name="include"/>
<exclude name="exclude"/>-->
- </fileset>
- <fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/model/ws">
- <!--<include name="include"/>
+ </fileset>
+ <fileset dir="${xqibtmp.dir}/ch/ethz/mxquery/model/ws">
+ <!--<include name="include"/>
<exclude name="exclude"/>-->
- </fileset>
-</delete>
+ </fileset>
+ </delete>
- <copy todir="${xqibtmp.dir}" overwrite="yes"><fileset dir="${xqibsrc.dir}"/></copy>
+ <copy todir="${xqibtmp.dir}" overwrite="yes">
+ <fileset dir="${xqibsrc.dir}"/>
+ </copy>
<copy file="${midpsrc.dir}/ch/ethz/mxquery/functions/NativeFunctionImporter.java" todir="${customtmp.dir}/ch/ethz/mxquery/functions/" overwrite="yes" />
<copy file="${midpsrc.dir}/ch/ethz/mxquery/sms/MMimpl/TokenBufferStore.java" todir="${customtmp.dir}/ch/ethz/mxquery/sms/MMimpl/" overwrite="yes" />
- <copy file="${midpsrc.dir}/ch/ethz/mxquery/bindings/WindowBuffer.java" todir="${customtmp.dir}/ch/ethz/mxquery/bindings/" overwrite="yes" />
+ <copy file="${midpsrc.dir}/ch/ethz/mxquery/bindings/WindowBuffer.java" todir="${customtmp.dir}/ch/ethz/mxquery/bindings/" overwrite="yes" />
</target>
-
-
+
+
<target name="xqib-js_compile" depends="xqib-js_prepare">
-
- <antcall target="xqib-js_compile_only"></antcall>
- </target>
+
+ <antcall target="xqib-js_compile_only">
+ </antcall>
+ </target>
<target name="xqib-js_compile_only" >
-
- <echo message="Compiling with java..."/>
- <echo message="${ant.project.name}: ${ant.file}"/>
- <mkdir dir="${gwt_webclasses.dir}"/>
- <javac debug="true" debuglevel="${debuglevel}" destdir="${gwt_webclasses.dir}" >
- <src path="${xqibtmp.dir}"/>
- <src path="xqib_junit"/>
- <exclude name="ch/ethz/mxquery/benchmark/"/>
- <exclude name="ch/ethz/mxquery/benchmark/ft/"/>
- <exclude name="ch/ethz/mxquery/test/CMDLineTests.java"/>
- <exclude name="ch/ethz/mxquery/test/CombineNodeTest.java"/>
- <exclude name="ch/ethz/mxquery/test/DOMSAXOutput.java"/>
- <exclude name="ch/ethz/mxquery/test/DateTimeTest.java"/>
- <exclude name="ch/ethz/mxquery/test/NamespaceTest.java"/>
- <exclude name="ch/ethz/mxquery/test/SchemaImportTest.java"/>
- <exclude name="ch/ethz/mxquery/test/TestStart.java"/>
- <exclude name="ch/ethz/mxquery/test/TypeTest.java"/>
- <exclude name="ch/ethz/mxquery/test/WebService/"/>
- <exclude name="ch/ethz/mxquery/test/WindowBufferTest.java"/>
- <exclude name="ch/ethz/mxquery/test/XQScriptingTest.java"/>
- <exclude name="ch/ethz/mxquery/test/XQSerializerTest.java"/>
- <exclude name="ch/ethz/mxquery/test/XQUpdateTest.java"/>
- <exclude name="ch/ethz/mxquery/test/XQUpdateTests.java"/>
- <exclude name="ch/ethz/mxquery/test/_NotImplemented.java"/>
- <exclude name="ch/ethz/mxquery/test/dmcq/"/>
- <exclude name="ch/ethz/mxquery/test/fulltext/"/>
- <exclude name="ch/ethz/mxquery/test/fulltext/FTDemoTests/"/>
- <exclude name="ch/ethz/mxquery/test/pattern/"/>
- <exclude name="ch/ethz/mxquery/test/scripting/"/>
- <exclude name="ch/ethz/mxquery/test/xq11streaming/"/>
- <exclude name="ch/ethz/mxquery/tester/"/>
- <exclude name="ch/ethz/mxquery/testsuite/internal/"/>
- <exclude name="ch/ethz/mxquery/unused/"/>
- <!--<exclude name="mxquery/test/WebService/"/>
+
+ <echo message="Compiling with java..."/>
+ <echo message="${ant.project.name}: ${ant.file}"/>
+ <mkdir dir="${gwt_webclasses.dir}"/>
+ <javac debug="true" debuglevel="${debuglevel}" destdir="${gwt_webclasses.dir}" >
+ <src path="${xqibtmp.dir}"/>
+ <src path="xqib_junit"/>
+ <exclude name="ch/ethz/mxquery/benchmark/"/>
+ <exclude name="ch/ethz/mxquery/benchmark/ft/"/>
+ <exclude name="ch/ethz/mxquery/test/CMDLineTests.java"/>
+ <exclude name="ch/ethz/mxquery/test/CombineNodeTest.java"/>
+ <exclude name="ch/ethz/mxquery/test/DOMSAXOutput.java"/>
+ <exclude name="ch/ethz/mxquery/test/DateTimeTest.java"/>
+ <exclude name="ch/ethz/mxquery/test/NamespaceTest.java"/>
+ <exclude name="ch/ethz/mxquery/test/SchemaImportTest.java"/>
+ <exclude name="ch/ethz/mxquery/test/TestStart.java"/>
+ <exclude name="ch/ethz/mxquery/test/TypeTest.java"/>
+ <exclude name="ch/ethz/mxquery/test/WebService/"/>
+ <exclude name="ch/ethz/mxquery/test/WindowBufferTest.java"/>
+ <exclude name="ch/ethz/mxquery/test/XQScriptingTest.java"/>
+ <exclude name="ch/ethz/mxquery/test/XQSerializerTest.java"/>
+ <exclude name="ch/ethz/mxquery/test/XQUpdateTest.java"/>
+ <exclude name="ch/ethz/mxquery/test/XQUpdateTests.java"/>
+ <exclude name="ch/ethz/mxquery/test/_NotImplemented.java"/>
+ ...
[truncated message content] |
|
From: <et...@us...> - 2011-10-03 20:56:41
|
Revision: 4465
http://mxquery.svn.sourceforge.net/mxquery/?rev=4465&view=rev
Author: etterth
Date: 2011-10-03 20:56:35 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
- added some debug stuff
Modified Paths:
--------------
trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java
Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java 2011-10-03 19:15:54 UTC (rev 4464)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java 2011-10-03 20:56:35 UTC (rev 4465)
@@ -28,6 +28,7 @@
try {
driver = createDriver();
driver.get(executionpath +"/test.html");
+ System.out.println("loaded page at " + driver.getCurrentUrl());
} catch (Throwable e) {
e.printStackTrace();
// TODO: handle exception
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
