Merge branch 'master' into steven/hdfs

Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/b2c1e7c9
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/b2c1e7c9
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/b2c1e7c9

Branch: refs/heads/steven/hdfs
Commit: b2c1e7c9098a5241bcfcc30b72e7d9eda930dfa5
Parents: e791fe3 7de1fba
Author: Steven Jacobs <[email protected]>
Authored: Wed May 18 14:33:59 2016 -0700
Committer: Steven Jacobs <[email protected]>
Committed: Wed May 18 14:33:59 2016 -0700

----------------------------------------------------------------------
 src/site/apt/development_eclipse_setup.apt      |    53 +-
 .../apt/development_update_xqts_results.apt     |    14 +-
 src/site/apt/user_query.apt                     |    15 +-
 src/site/apt/user_running_tests.apt             |     4 +-
 .../builders/atomic/UTF8StringBuilder.java      |     9 +-
 .../builders/base/AbstractBuilder.java          |    14 +-
 .../datamodel/builders/base/IBuilder.java       |    27 +
 .../builders/nodes/AbstractNodeBuilder.java     |     8 +-
 .../builders/nodes/AttributeNodeBuilder.java    |    12 +-
 .../builders/nodes/CommentNodeBuilder.java      |    11 +-
 .../builders/nodes/DocumentNodeBuilder.java     |    12 +-
 .../builders/nodes/ElementNodeBuilder.java      |    17 +-
 .../builders/nodes/NodeSubTreeBuilder.java      |    17 +-
 .../datamodel/builders/nodes/PINodeBuilder.java |    11 +-
 .../builders/nodes/TextNodeBuilder.java         |    11 +-
 .../builders/sequence/SequenceBuilder.java      |    11 +-
 .../comparison/ValueEqComparisonOperation.java  |   128 +-
 .../runtime/functions/util/FunctionHelper.java  |    20 +-
 .../datamodel/AbstractPointableTest.java        |    65 +
 .../vxquery/datamodel/SequenceByteTest.java     |   158 +
 vxquery-xtest/pom.xml                           |     2 +-
 vxquery-xtest/results/xqts.txt                  | 34992 ++++++++---------
 .../vxquery/xtest/LineFileReporterImpl.java     |    11 +
 .../apache/vxquery/xtest/ResultFileSorter.java  |   101 +
 .../java/org/apache/vxquery/xtest/XTest.java    |     7 +-
 25 files changed, 18030 insertions(+), 17700 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/vxquery/blob/b2c1e7c9/src/site/apt/user_query.apt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b2c1e7c9/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b2c1e7c9/vxquery-xtest/pom.xml
----------------------------------------------------------------------
diff --cc vxquery-xtest/pom.xml
index bf29648,0c563e7..4cb7c60
--- a/vxquery-xtest/pom.xml
+++ b/vxquery-xtest/pom.xml
@@@ -159,23 -159,8 +159,23 @@@
              <groupId>org.apache.hyracks</groupId>
              <artifactId>hyracks-dataflow-std</artifactId>
          </dependency>
- 
+         
          <dependency>
 +            <groupId>org.apache.hyracks</groupId>
 +            <artifactId>hyracks-hdfs-2.x</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>commons-io</groupId>
 +            <artifactId>commons-io</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.hadoop</groupId>
 +            <artifactId>hadoop-hdfs</artifactId>
 +        </dependency>
 +
 +        <dependency>
              <groupId>org.mortbay.jetty</groupId>
              <artifactId>jetty</artifactId>
              <scope>compile</scope>

Reply via email to