http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java
index 23977d5..77d500c 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java
@@ -21,10 +21,13 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.hyracks.api.comm.IFrameFieldAppender;
+import org.apache.hyracks.api.comm.IFrameWriter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 import org.apache.vxquery.context.StaticContext;
 import org.apache.vxquery.exceptions.VXQueryFileNotFoundException;
 import org.apache.vxquery.exceptions.VXQueryParseException;
@@ -34,12 +37,6 @@ import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
 
-import edu.uci.ics.hyracks.api.comm.IFrameWriter;
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
-import edu.uci.ics.hyracks.dataflow.common.comm.io.FrameTupleAccessor;
-import edu.uci.ics.hyracks.dataflow.common.comm.io.FrameTupleAppender;
-
 public class XMLParser {
     final XMLReader parser;
     final SAXContentHandler handler;
@@ -48,24 +45,23 @@ public class XMLParser {
     final int bufferSize;
 
     public XMLParser(boolean attachTypes, ITreeNodeIdProvider idProvider, 
String nodeId) throws HyracksDataException {
-        this(attachTypes, idProvider, nodeId, null, null, null, null);
+        this(attachTypes, idProvider, nodeId, null, null, null);
     }
 
-    public XMLParser(boolean attachTypes, ITreeNodeIdProvider idProvider, 
String nodeId, ByteBuffer frame,
-            FrameTupleAppender appender, List<Integer> childSeq, StaticContext 
staticContext)
-            throws HyracksDataException {
+    public XMLParser(boolean attachTypes, ITreeNodeIdProvider idProvider, 
String nodeId, IFrameFieldAppender appender,
+            List<Integer> childSeq, StaticContext staticContext) throws 
HyracksDataException {
         bufferSize = 
Integer.parseInt(System.getProperty("vxquery.buffer_size", "-1"));
         this.nodeId = nodeId;
         try {
             parser = XMLReaderFactory.createXMLReader();
-            if (frame == null || appender == null) {
+            if (appender == null) {
                 handler = new SAXContentHandler(attachTypes, idProvider);
             } else {
                 List<SequenceType> childSequenceTypes = new 
ArrayList<SequenceType>();
                 for (int typeCode : childSeq) {
                     
childSequenceTypes.add(staticContext.lookupSequenceType(typeCode));
                 }
-                handler = new SAXContentHandler(attachTypes, idProvider, 
frame, appender, childSequenceTypes);
+                handler = new SAXContentHandler(attachTypes, idProvider, 
appender, childSequenceTypes);
             }
             parser.setContentHandler(handler);
             
parser.setProperty("http://xml.org/sax/properties/lexical-handler";, handler);
@@ -102,7 +98,7 @@ public class XMLParser {
         }
     }
 
-    public void parseElements(File file, IFrameWriter writer, 
FrameTupleAccessor fta, int tupleIndex)
+    public void parseElements(File file, IFrameWriter writer, int tupleIndex)
             throws HyracksDataException {
         try {
             Reader input;
@@ -112,7 +108,7 @@ public class XMLParser {
                 input = new InputStreamReader(new FileInputStream(file));
             }
             in.setCharacterStream(input);
-            handler.setupElementWriter(writer, fta, tupleIndex);
+            handler.setupElementWriter(writer, tupleIndex);
             parser.parse(in);
             input.close();
         } catch (FileNotFoundException e) {
@@ -130,4 +126,4 @@ public class XMLParser {
         }
     }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTNode.java
index 9cc076d..ee31758 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTNode.java
@@ -35,4 +35,4 @@ public abstract class ASTNode {
     public String toString() {
         return Debug.toString(this);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTTag.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTTag.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTTag.java
index c069aee..65acb21 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTTag.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ASTTag.java
@@ -19,4 +19,4 @@ package org.apache.vxquery.xmlquery.ast;
 public enum ASTTag {
     VERSION_DECL, PROLOG, LIBRARY_MODULE, MODULE_DECLARATION, MAIN_MODULE, 
QUERY_BODY, BOUNDARY_SPACE_DECLARATION, DEFAULT_ELEMENT_NAMESPACE_DECLARATION, 
DEFAULT_FUNCTION_NAMESPACE_DECLARATION, OPTION_DECLARATION, 
FT_OPTION_DECLARATION, ORDERING_MODE_DECLARATION, EMPTY_ORDER_DECLARATION, 
COPY_NAMESPACES_DECLARATION, DEFAULT_COLLATION_DECLARATION, 
BASE_URI_DECLARATION, SCHEMA_IMPORT, MODULE_IMPORT, VARIABLE_DECLARATION, 
TYPE_DECLARATION, SEQUENCE_TYPE, ITEM_TYPE, ATOMIC_TYPE, ANY_NODE_TEST, 
ITEM_TEST, DOCUMENT_TEST, QNAME, ELEMENT_TEST, SCHEMA_ELEMENT_TEST, 
ATTRIBUTE_TEST, SCHEMA_ATTRIBUTE_TEST, TEXT_TEST, COMMENT_TEST, PI_TEST, 
TYPE_NAME, CONSTRUCTION_DECLARATION, FUNCTION_DECLARATION, FUNCTION_PARAMETER, 
ENCLOSED_EXPRESSION, EXPRESSION, FLWOR_EXPRESSION, FOR_CLAUSE, 
FOR_VARIABLE_DECLARATION, LET_VARIABLE_DECLARATION, LET_CLAUSE, WHERE_CLAUSE, 
ORDERBY_CLAUSE, ORDER_SPECIFICATION, QUANTIFIED_EXPRESSION, 
QUANTIFIED_VARIABLE_DECLARATION, TYPESWITCH_EXPRESSION, CASE_CLAUSE, 
IF_EXPRESSIO
 N, INFIX_EXPRESSION, TYPE_EXPRESSION, UNARY_EXPRESSION, VALIDATE_EXPRESSION, 
EXTENSION_EXPRESSION, PRAGMA_NODE, PATH_EXPRESSION, AXIS_STEP, NAME_TEST, 
FILTER_EXPRESSION, LITERAL, VARIABLE_REFERENCE, PARENTHESIZED_EXPRESSION, 
CONTEXT_ITEM, ORDERED_EXPRESSION, UNORDERED_EXPRESSION, FUNCTION_EXPRESSION, 
DIRECT_ELEMENT_CONSTRUCTOR, DIRECT_ATTRIBUTE_CONSTRUCTOR, 
DQUOTED_ATTRIBUTE_CONTENT, SQUOTED_ATTRIBUTE_CONTENT, TEXTUAL_NODE_CONTENT, 
CDATA_SECTION, DIRECT_COMMENT_CONSTRUCTOR, DIRECT_PI_CONSTRUCTOR, 
COMPUTED_DOCUMENT_CONSTRUCTOR, COMPUTED_ATTRIBUTE_CONSTRUCTOR, 
COMPUTED_ELEMENT_CONSTRUCTOR, COMPUTED_TEXT_CONSTRUCTOR, 
COMPUTED_COMMENT_CONSTRUCTOR, EMPTY_SEQUENCE_TYPE, RELATIVE_PATH_EXPRESSION, 
COMPUTED_PI_CONSTRUCTOR, NCNAME, CONTENT_CHARS, NAMESPACE_DECLARATION, 
SINGLE_TYPE
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AnyNodeTestNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AnyNodeTestNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AnyNodeTestNode.java
index 29a8376..34659bd 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AnyNodeTestNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AnyNodeTestNode.java
@@ -27,4 +27,4 @@ public class AnyNodeTestNode extends ASTNode {
     public ASTTag getTag() {
         return ASTTag.ANY_NODE_TEST;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AtomicTypeNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AtomicTypeNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AtomicTypeNode.java
index 58b95cb..1c710ae 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AtomicTypeNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AtomicTypeNode.java
@@ -37,4 +37,4 @@ public class AtomicTypeNode extends ASTNode {
     public QNameNode getName() {
         return name;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AttributeTestNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AttributeTestNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AttributeTestNode.java
index 195aec8..c25c173 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AttributeTestNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AttributeTestNode.java
@@ -46,4 +46,4 @@ public class AttributeTestNode extends ASTNode {
     public void setTypeName(QNameNode typeName) {
         this.typeName = typeName;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AxisStepNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AxisStepNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AxisStepNode.java
index 61833d8..b129508 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AxisStepNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/AxisStepNode.java
@@ -61,4 +61,4 @@ public class AxisStepNode extends ASTNode {
     public void setPredicates(List<ASTNode> predicates) {
         this.predicates = predicates;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BaseUriDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BaseUriDeclNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BaseUriDeclNode.java
index 5c2ac8d..4f498fc 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BaseUriDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BaseUriDeclNode.java
@@ -37,4 +37,4 @@ public class BaseUriDeclNode extends ASTNode {
     public void setUri(String uri) {
         this.uri = uri;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BoundarySpaceDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BoundarySpaceDeclNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BoundarySpaceDeclNode.java
index 808b0ad..2ad09c0 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BoundarySpaceDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/BoundarySpaceDeclNode.java
@@ -38,4 +38,4 @@ public class BoundarySpaceDeclNode extends ASTNode {
     public void setMode(StaticContext.BoundarySpaceProperty mode) {
         this.mode = mode;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CDataSectionNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CDataSectionNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CDataSectionNode.java
index bbdd26d..3d56ac8 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CDataSectionNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CDataSectionNode.java
@@ -37,4 +37,4 @@ public class CDataSectionNode extends ASTNode {
     public void setContent(String content) {
         this.content = content;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CaseClauseNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CaseClauseNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CaseClauseNode.java
index d3e0c08..54ac17d 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CaseClauseNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CaseClauseNode.java
@@ -55,4 +55,4 @@ public class CaseClauseNode extends ASTNode {
     public void setValueExpr(ASTNode valueExpr) {
         this.valueExpr = valueExpr;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CommentTestNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CommentTestNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CommentTestNode.java
index c02992a..e5f8145 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CommentTestNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CommentTestNode.java
@@ -27,4 +27,4 @@ public class CommentTestNode extends ASTNode {
     public ASTTag getTag() {
         return ASTTag.COMMENT_TEST;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedAttributeConstructorNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedAttributeConstructorNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedAttributeConstructorNode.java
index d3cefef..d210c82 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedAttributeConstructorNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedAttributeConstructorNode.java
@@ -46,4 +46,4 @@ public class ComputedAttributeConstructorNode extends ASTNode 
{
     public void setContent(ASTNode content) {
         this.content = content;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedCommentConstructorNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedCommentConstructorNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedCommentConstructorNode.java
index b033ad7..6270135 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedCommentConstructorNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedCommentConstructorNode.java
@@ -37,4 +37,4 @@ public class ComputedCommentConstructorNode extends ASTNode {
     public void setContent(ASTNode content) {
         this.content = content;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedDocumentConstructorNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedDocumentConstructorNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedDocumentConstructorNode.java
index 497a4a4..7f078b0 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedDocumentConstructorNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedDocumentConstructorNode.java
@@ -37,4 +37,4 @@ public class ComputedDocumentConstructorNode extends ASTNode {
     public void setContent(ASTNode content) {
         this.content = content;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedElementConstructorNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedElementConstructorNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedElementConstructorNode.java
index af3e35d..99baf35 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedElementConstructorNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedElementConstructorNode.java
@@ -46,4 +46,4 @@ public class ComputedElementConstructorNode extends ASTNode {
     public void setContent(ASTNode content) {
         this.content = content;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedPIConstructorNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedPIConstructorNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedPIConstructorNode.java
index faea166..6bfea1e 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedPIConstructorNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedPIConstructorNode.java
@@ -46,4 +46,4 @@ public class ComputedPIConstructorNode extends ASTNode {
     public void setContent(ASTNode content) {
         this.content = content;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedTextConstructorNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedTextConstructorNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedTextConstructorNode.java
index 78496f7..5bd281e 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedTextConstructorNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ComputedTextConstructorNode.java
@@ -37,4 +37,4 @@ public class ComputedTextConstructorNode extends ASTNode {
     public void setContent(ASTNode content) {
         this.content = content;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ConstructionDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ConstructionDeclNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ConstructionDeclNode.java
index beb15c8..66e4eda 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ConstructionDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ConstructionDeclNode.java
@@ -38,4 +38,4 @@ public class ConstructionDeclNode extends ASTNode {
     public void setMode(StaticContext.ConstructionModeProperty mode) {
         this.mode = mode;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContentCharsNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContentCharsNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContentCharsNode.java
index 2c70da0..ac5836a 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContentCharsNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContentCharsNode.java
@@ -37,4 +37,4 @@ public class ContentCharsNode extends ASTNode {
     public void setContent(String content) {
         this.content = content;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContextItemExprNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContextItemExprNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContextItemExprNode.java
index ca1e1fd..6891b81 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContextItemExprNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ContextItemExprNode.java
@@ -27,4 +27,4 @@ public class ContextItemExprNode extends ASTNode {
     public ASTTag getTag() {
         return ASTTag.CONTEXT_ITEM;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CopyNamespacesDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CopyNamespacesDeclNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CopyNamespacesDeclNode.java
index a4cefba..fdbaa61 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CopyNamespacesDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/CopyNamespacesDeclNode.java
@@ -38,4 +38,4 @@ public class CopyNamespacesDeclNode extends ASTNode {
     public void setMode(StaticContext.CopyNamespacesModeProperty mode) {
         this.mode = mode;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DQuotedAttributeContentNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DQuotedAttributeContentNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DQuotedAttributeContentNode.java
index dbd2181..0b066d6 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DQuotedAttributeContentNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DQuotedAttributeContentNode.java
@@ -37,4 +37,4 @@ public class DQuotedAttributeContentNode extends ASTNode {
     public void setContent(String content) {
         this.content = content;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultCollationDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultCollationDeclNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultCollationDeclNode.java
index 530e4a0..ec2a2b0 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultCollationDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultCollationDeclNode.java
@@ -37,4 +37,4 @@ public class DefaultCollationDeclNode extends ASTNode {
     public void setCollation(String collation) {
         this.collation = collation;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultElementNamespaceDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultElementNamespaceDeclNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultElementNamespaceDeclNode.java
index b53df52..06ff436 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultElementNamespaceDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultElementNamespaceDeclNode.java
@@ -37,4 +37,4 @@ public class DefaultElementNamespaceDeclNode extends ASTNode {
     public void setUri(String uri) {
         this.uri = uri;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultFunctionNamespaceDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultFunctionNamespaceDeclNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultFunctionNamespaceDeclNode.java
index ac335dd..19c091a 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultFunctionNamespaceDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DefaultFunctionNamespaceDeclNode.java
@@ -37,4 +37,4 @@ public class DefaultFunctionNamespaceDeclNode extends ASTNode 
{
     public void setUri(String uri) {
         this.uri = uri;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectAttributeConstructorNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectAttributeConstructorNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectAttributeConstructorNode.java
index 096a8ce..bd936ec 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectAttributeConstructorNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectAttributeConstructorNode.java
@@ -48,4 +48,4 @@ public class DirectAttributeConstructorNode extends ASTNode {
     public void setValue(List<ASTNode> value) {
         this.value = value;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectCommentConstructorNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectCommentConstructorNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectCommentConstructorNode.java
index 6cc7588..f415fbf 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectCommentConstructorNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectCommentConstructorNode.java
@@ -37,4 +37,4 @@ public class DirectCommentConstructorNode extends ASTNode {
     public void setContent(String content) {
         this.content = content;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectElementConstructorNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectElementConstructorNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectElementConstructorNode.java
index 22c8d68..38f762a 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectElementConstructorNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectElementConstructorNode.java
@@ -66,4 +66,4 @@ public class DirectElementConstructorNode extends ASTNode {
     public void setContent(List<ASTNode> content) {
         this.content = content;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectPIConstructorNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectPIConstructorNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectPIConstructorNode.java
index 5331952..65e82e5 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectPIConstructorNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DirectPIConstructorNode.java
@@ -46,4 +46,4 @@ public class DirectPIConstructorNode extends ASTNode {
     public void setContent(String content) {
         this.content = content;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DocumentTestNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DocumentTestNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DocumentTestNode.java
index 2c275d6..6a2bb2d 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DocumentTestNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/DocumentTestNode.java
@@ -37,4 +37,4 @@ public class DocumentTestNode extends ASTNode {
     public void setElementTest(ASTNode elementTest) {
         this.elementTest = elementTest;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ElementTestNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ElementTestNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ElementTestNode.java
index 87aebb4..2c947ad 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ElementTestNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ElementTestNode.java
@@ -55,4 +55,4 @@ public class ElementTestNode extends ASTNode {
     public void setNillable(boolean nillable) {
         this.nillable = nillable;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptyOrderDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptyOrderDeclNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptyOrderDeclNode.java
index 7cd0d20..223896e 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptyOrderDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptyOrderDeclNode.java
@@ -38,4 +38,4 @@ public class EmptyOrderDeclNode extends ASTNode {
     public void setMode(StaticContext.EmptyOrderProperty mode) {
         this.mode = mode;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptySequenceTypeNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptySequenceTypeNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptySequenceTypeNode.java
index f6c9926..8856f6a 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptySequenceTypeNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EmptySequenceTypeNode.java
@@ -27,4 +27,4 @@ public class EmptySequenceTypeNode extends ASTNode {
     public ASTTag getTag() {
         return ASTTag.EMPTY_SEQUENCE_TYPE;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EnclosedExprNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EnclosedExprNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EnclosedExprNode.java
index a3185b7..347db46 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EnclosedExprNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/EnclosedExprNode.java
@@ -37,4 +37,4 @@ public class EnclosedExprNode extends ASTNode {
     public ASTNode getExpression() {
         return expression;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExprNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExprNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExprNode.java
index 1dfe913..8302df4 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExprNode.java
@@ -39,4 +39,4 @@ public class ExprNode extends ASTNode {
     public void setExpressions(List<ASTNode> expressions) {
         this.expressions = expressions;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExtensionExprNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExtensionExprNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExtensionExprNode.java
index fd3ecbe..a9c2a6d 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExtensionExprNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ExtensionExprNode.java
@@ -48,4 +48,4 @@ public class ExtensionExprNode extends ASTNode {
     public void setPragmas(List<PragmaNode> pragmas) {
         this.pragmas = pragmas;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORClauseNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORClauseNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORClauseNode.java
index 625c1f1..1caaf2b 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORClauseNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORClauseNode.java
@@ -22,4 +22,4 @@ public abstract class FLWORClauseNode extends ASTNode {
     public FLWORClauseNode(SourceLocation loc) {
         super(loc);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORExprNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORExprNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORExprNode.java
index 5a89899..c59f1c5 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORExprNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FLWORExprNode.java
@@ -48,4 +48,4 @@ public class FLWORExprNode extends ASTNode {
     public void setReturnExpr(ASTNode returnExpr) {
         this.returnExpr = returnExpr;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FTOptionDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FTOptionDeclNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FTOptionDeclNode.java
index e9bde4b..a249913 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FTOptionDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FTOptionDeclNode.java
@@ -37,4 +37,4 @@ public class FTOptionDeclNode extends ASTNode {
     public void setMatchOption(ASTNode matchOption) {
         this.matchOption = matchOption;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FilterExprNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FilterExprNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FilterExprNode.java
index 2f740ff..a19749b 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FilterExprNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FilterExprNode.java
@@ -48,4 +48,4 @@ public class FilterExprNode extends ASTNode {
     public void setPredicates(List<ASTNode> predicates) {
         this.predicates = predicates;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForClauseNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForClauseNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForClauseNode.java
index 021cee0..6fca1a3 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForClauseNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForClauseNode.java
@@ -39,4 +39,4 @@ public class ForClauseNode extends FLWORClauseNode {
     public void setVariables(List<ForVarDeclNode> variables) {
         this.variables = variables;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForVarDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForVarDeclNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForVarDeclNode.java
index 226f88f..053db91 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForVarDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ForVarDeclNode.java
@@ -73,4 +73,4 @@ public class ForVarDeclNode extends ASTNode {
     public void setScoreVar(QNameNode scoreVar) {
         this.scoreVar = scoreVar;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionDeclNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionDeclNode.java
index 6e7d908..f1c1a07 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionDeclNode.java
@@ -66,4 +66,4 @@ public class FunctionDeclNode extends ASTNode {
     public void setBody(ASTNode body) {
         this.body = body;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionExprNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionExprNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionExprNode.java
index 291be09..32afc32 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionExprNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/FunctionExprNode.java
@@ -48,4 +48,4 @@ public class FunctionExprNode extends ASTNode {
     public void setArguments(List<ASTNode> arguments) {
         this.arguments = arguments;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/IfExprNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/IfExprNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/IfExprNode.java
index 620022f..f963dec 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/IfExprNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/IfExprNode.java
@@ -55,4 +55,4 @@ public class IfExprNode extends ASTNode {
     public void setElseExpr(ASTNode elseExpr) {
         this.elseExpr = elseExpr;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/InfixExprNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/InfixExprNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/InfixExprNode.java
index 83988bc..e105f1d 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/InfixExprNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/InfixExprNode.java
@@ -59,4 +59,4 @@ public class InfixExprNode extends ASTNode {
     public void setRightExpr(ASTNode rightExpr) {
         this.rightExpr = rightExpr;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTestNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTestNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTestNode.java
index f33f631..35a7209 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTestNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTestNode.java
@@ -27,4 +27,4 @@ public class ItemTestNode extends ASTNode {
     public ASTTag getTag() {
         return ASTTag.ITEM_TEST;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTypeNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTypeNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTypeNode.java
index 678511d..6389e97 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTypeNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ItemTypeNode.java
@@ -27,4 +27,4 @@ public class ItemTypeNode extends ASTNode {
     public ASTTag getTag() {
         return ASTTag.ITEM_TYPE;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetClauseNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetClauseNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetClauseNode.java
index a92c03e..fd332d8 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetClauseNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetClauseNode.java
@@ -39,4 +39,4 @@ public class LetClauseNode extends FLWORClauseNode {
     public void setVariables(List<LetVarDeclNode> variables) {
         this.variables = variables;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetVarDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetVarDeclNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetVarDeclNode.java
index b11177c..0644543 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetVarDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LetVarDeclNode.java
@@ -64,4 +64,4 @@ public class LetVarDeclNode extends ASTNode {
     public QNameNode getScoreVar() {
         return scoreVar;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LibraryModuleNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LibraryModuleNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LibraryModuleNode.java
index 7342499..5553ddd 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LibraryModuleNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LibraryModuleNode.java
@@ -37,4 +37,4 @@ public class LibraryModuleNode extends ModuleNode {
     public void setModuleDecl(ModuleDeclNode moduleDecl) {
         this.moduleDecl = moduleDecl;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LiteralNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LiteralNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LiteralNode.java
index 04ef09c..774e38a 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LiteralNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/LiteralNode.java
@@ -53,4 +53,4 @@ public class LiteralNode extends ASTNode {
     public void setType(LiteralType type) {
         this.type = type;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/MainModuleNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/MainModuleNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/MainModuleNode.java
index 0a79847..6416c70 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/MainModuleNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/MainModuleNode.java
@@ -37,4 +37,4 @@ public class MainModuleNode extends ModuleNode {
     public void setQueryBody(QueryBodyNode queryBody) {
         this.queryBody = queryBody;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleDeclNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleDeclNode.java
index 2e342a7..f163f78 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleDeclNode.java
@@ -46,4 +46,4 @@ public class ModuleDeclNode extends ASTNode {
     public void setTargetNS(String targetNS) {
         this.targetNS = targetNS;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleImportNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleImportNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleImportNode.java
index c3ba745..fe2b0f8 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleImportNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleImportNode.java
@@ -57,4 +57,4 @@ public class ModuleImportNode extends ASTNode {
     public void setLocations(List<String> locations) {
         this.locations = locations;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleNode.java
index bc2faa3..531900d 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ModuleNode.java
@@ -42,4 +42,4 @@ public abstract class ModuleNode extends ASTNode {
     public void setProlog(PrologNode prolog) {
         this.prolog = prolog;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NCNameNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NCNameNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NCNameNode.java
index 759a9fe..201773b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NCNameNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NCNameNode.java
@@ -37,4 +37,4 @@ public class NCNameNode extends ASTNode {
     public void setName(String name) {
         this.name = name;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NameTestNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NameTestNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NameTestNode.java
index 6248ed6..e707f83 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NameTestNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NameTestNode.java
@@ -46,4 +46,4 @@ public class NameTestNode extends ASTNode {
     public void setLocalName(String localName) {
         this.localName = localName;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NamespaceDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NamespaceDeclNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NamespaceDeclNode.java
index 2e6b625..3b64122 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NamespaceDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/NamespaceDeclNode.java
@@ -46,4 +46,4 @@ public class NamespaceDeclNode extends ASTNode {
     public void setUri(String uri) {
         this.uri = uri;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OptionDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OptionDeclNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OptionDeclNode.java
index 2dfd4bd..3b33e32 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OptionDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OptionDeclNode.java
@@ -46,4 +46,4 @@ public class OptionDeclNode extends ASTNode {
     public void setValue(String value) {
         this.value = value;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderSpecNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderSpecNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderSpecNode.java
index 4d53cab..0c1df93 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderSpecNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderSpecNode.java
@@ -66,4 +66,4 @@ public class OrderSpecNode extends ASTNode {
     public void setCollation(String collation) {
         this.collation = collation;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderbyClauseNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderbyClauseNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderbyClauseNode.java
index 9b9bca4..7510670 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderbyClauseNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderbyClauseNode.java
@@ -48,4 +48,4 @@ public class OrderbyClauseNode extends FLWORClauseNode {
     public void setStable(boolean stable) {
         this.stable = stable;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderedExprNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderedExprNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderedExprNode.java
index a99866c..2510e96 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderedExprNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderedExprNode.java
@@ -37,4 +37,4 @@ public class OrderedExprNode extends ASTNode {
     public void setExpr(ASTNode expr) {
         this.expr = expr;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderingModeDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderingModeDeclNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderingModeDeclNode.java
index cd57b14..1080be4 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderingModeDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/OrderingModeDeclNode.java
@@ -38,4 +38,4 @@ public class OrderingModeDeclNode extends ASTNode {
     public void setMode(StaticContext.OrderingModeProperty mode) {
         this.mode = mode;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PITestNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PITestNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PITestNode.java
index 80a9507..d7bd8bc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PITestNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PITestNode.java
@@ -37,4 +37,4 @@ public class PITestNode extends ASTNode {
     public void setTarget(String target) {
         this.target = target;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParamNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParamNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParamNode.java
index 42201fc..2eb0fcc 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParamNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParamNode.java
@@ -46,4 +46,4 @@ public class ParamNode extends ASTNode {
     public void setType(TypeDeclNode type) {
         this.type = type;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParenthesizedExprNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParenthesizedExprNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParenthesizedExprNode.java
index 62c7603..da6b5ac 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParenthesizedExprNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ParenthesizedExprNode.java
@@ -37,4 +37,4 @@ public class ParenthesizedExprNode extends ASTNode {
     public void setExpr(ASTNode expr) {
         this.expr = expr;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PathExprNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PathExprNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PathExprNode.java
index f674848..fd2f1a5 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PathExprNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PathExprNode.java
@@ -49,4 +49,4 @@ public class PathExprNode extends ASTNode {
     public void setPaths(List<RelativePathExprNode> paths) {
         this.paths = paths;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PragmaNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PragmaNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PragmaNode.java
index cd30ea2..abc9736 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PragmaNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PragmaNode.java
@@ -46,4 +46,4 @@ public class PragmaNode extends ASTNode {
     public void setPragmaValue(String pragmaValue) {
         this.pragmaValue = pragmaValue;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PrologNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PrologNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PrologNode.java
index 70e3e41..6410372 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PrologNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/PrologNode.java
@@ -39,4 +39,4 @@ public class PrologNode extends ASTNode {
     public void setDecls(List<ASTNode> decls) {
         this.decls = decls;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QNameNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QNameNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QNameNode.java
index 7b412aa..8210185 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QNameNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QNameNode.java
@@ -46,4 +46,4 @@ public class QNameNode extends ASTNode {
     public void setLocalName(String localName) {
         this.localName = localName;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedExprNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedExprNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedExprNode.java
index be5ef1d..e75ca14 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedExprNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedExprNode.java
@@ -61,4 +61,4 @@ public class QuantifiedExprNode extends ASTNode {
     public List<QuantifiedVarDeclNode> getVariables() {
         return variables;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedVarDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedVarDeclNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedVarDeclNode.java
index 2274e75..6c5cf87 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedVarDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QuantifiedVarDeclNode.java
@@ -55,4 +55,4 @@ public class QuantifiedVarDeclNode extends ASTNode {
     public void setSequence(ASTNode sequence) {
         this.sequence = sequence;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QueryBodyNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QueryBodyNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QueryBodyNode.java
index 8fc86d3..c5b23f8 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QueryBodyNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/QueryBodyNode.java
@@ -37,4 +37,4 @@ public class QueryBodyNode extends ASTNode {
     public ASTNode getExpression() {
         return expression;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/RelativePathExprNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/RelativePathExprNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/RelativePathExprNode.java
index 3b7d52b..291a7d6 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/RelativePathExprNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/RelativePathExprNode.java
@@ -47,4 +47,4 @@ public class RelativePathExprNode extends ASTNode {
     public void setPath(ASTNode path) {
         this.path = path;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SQuotedAttributeContentNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SQuotedAttributeContentNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SQuotedAttributeContentNode.java
index d102815..ccdc520 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SQuotedAttributeContentNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SQuotedAttributeContentNode.java
@@ -37,4 +37,4 @@ public class SQuotedAttributeContentNode extends ASTNode {
     public void setContent(String content) {
         this.content = content;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaAttributeTestNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaAttributeTestNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaAttributeTestNode.java
index 7a0582f..c20f473 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaAttributeTestNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaAttributeTestNode.java
@@ -37,4 +37,4 @@ public class SchemaAttributeTestNode extends ASTNode {
     public void setName(QNameNode name) {
         this.name = name;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaElementTestNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaElementTestNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaElementTestNode.java
index 782daa6..36050a1 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaElementTestNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaElementTestNode.java
@@ -37,4 +37,4 @@ public class SchemaElementTestNode extends ASTNode {
     public void setName(QNameNode name) {
         this.name = name;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaImportNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaImportNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaImportNode.java
index 49a263f..39c05b0 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaImportNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SchemaImportNode.java
@@ -66,4 +66,4 @@ public class SchemaImportNode extends ASTNode {
     public boolean isDefaultElementNamespace() {
         return defaultElementNamespace;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SequenceTypeNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SequenceTypeNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SequenceTypeNode.java
index 17fb4ee..7cc63cb 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SequenceTypeNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SequenceTypeNode.java
@@ -47,4 +47,4 @@ public class SequenceTypeNode extends ASTNode {
     public void setQuantifier(XQueryConstants.TypeQuantifier quantifier) {
         this.quantifier = quantifier;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SingleTypeNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SingleTypeNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SingleTypeNode.java
index 3bc78fa..b8014a4 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SingleTypeNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/SingleTypeNode.java
@@ -46,4 +46,4 @@ public class SingleTypeNode extends ASTNode {
     public void setOptional(boolean optional) {
         this.optional = optional;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextTestNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextTestNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextTestNode.java
index e08f680..a5552fb 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextTestNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextTestNode.java
@@ -27,4 +27,4 @@ public class TextTestNode extends ASTNode {
     public ASTTag getTag() {
         return ASTTag.TEXT_TEST;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextualNodeContentNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextualNodeContentNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextualNodeContentNode.java
index 12a6fb7..6b83fd6 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextualNodeContentNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TextualNodeContentNode.java
@@ -37,4 +37,4 @@ public class TextualNodeContentNode extends ASTNode {
     public void setContent(String content) {
         this.content = content;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeDeclNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeDeclNode.java
index 3d54f9a..5b7accc 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeDeclNode.java
@@ -37,4 +37,4 @@ public class TypeDeclNode extends ASTNode {
     public void setType(SequenceTypeNode type) {
         this.type = type;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeExprNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeExprNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeExprNode.java
index 27a3ede..9dc8eb0 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeExprNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeExprNode.java
@@ -59,4 +59,4 @@ public class TypeExprNode extends ASTNode {
     public void setType(ASTNode type) {
         this.type = type;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeswitchExprNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeswitchExprNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeswitchExprNode.java
index 333ae4c..1f75110 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeswitchExprNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/TypeswitchExprNode.java
@@ -66,4 +66,4 @@ public class TypeswitchExprNode extends ASTNode {
     public void setDefaultClause(ASTNode defaultClause) {
         this.defaultClause = defaultClause;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnaryExprNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnaryExprNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnaryExprNode.java
index c6375c3..5313c70 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnaryExprNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnaryExprNode.java
@@ -52,4 +52,4 @@ public class UnaryExprNode extends ASTNode {
     public void setSigns(List<Sign> signs) {
         this.signs = signs;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnorderedExprNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnorderedExprNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnorderedExprNode.java
index 3343386..52b9ad3 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnorderedExprNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/UnorderedExprNode.java
@@ -37,4 +37,4 @@ public class UnorderedExprNode extends ASTNode {
     public void setExpr(ASTNode expr) {
         this.expr = expr;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ValidateExprNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ValidateExprNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ValidateExprNode.java
index 6535591..9971041 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ValidateExprNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/ValidateExprNode.java
@@ -47,4 +47,4 @@ public class ValidateExprNode extends ASTNode {
     public XQueryConstants.ValidationMode getMode() {
         return mode;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarDeclNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarDeclNode.java
index d860566..41a3ca8 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarDeclNode.java
@@ -55,4 +55,4 @@ public class VarDeclNode extends ASTNode {
     public void setValue(ASTNode value) {
         this.value = value;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarRefNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarRefNode.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarRefNode.java
index 82ea5db..b154968 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarRefNode.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VarRefNode.java
@@ -37,4 +37,4 @@ public class VarRefNode extends ASTNode {
     public void setVariable(QNameNode variable) {
         this.variable = variable;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VersionDeclNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VersionDeclNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VersionDeclNode.java
index 0c866c8..e188767 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VersionDeclNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/VersionDeclNode.java
@@ -47,4 +47,4 @@ public class VersionDeclNode extends ASTNode {
     public void setEncoding(String encoding) {
         this.encoding = encoding;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/WhereClauseNode.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/WhereClauseNode.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/WhereClauseNode.java
index 25f01e6..fdc6c57 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/WhereClauseNode.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/ast/WhereClauseNode.java
@@ -37,4 +37,4 @@ public class WhereClauseNode extends FLWORClauseNode {
     public void setCondition(ASTNode condition) {
         this.condition = condition;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/Module.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/Module.java 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/Module.java
index 8707a8b..5de3941 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/Module.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/Module.java
@@ -17,8 +17,8 @@ package org.apache.vxquery.xmlquery.query;
 import org.apache.vxquery.compiler.CompilerControlBlock;
 import org.apache.vxquery.context.StaticContext;
 
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlan;
-import edu.uci.ics.hyracks.api.job.JobSpecification;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalPlan;
+import org.apache.hyracks.api.job.JobSpecification;
 
 public class Module {
     private ModuleType moduleType;
@@ -87,4 +87,4 @@ public class Module {
     public void setHyracksJobSpecification(JobSpecification jobSpec) {
         this.jobSpec = jobSpec;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/NoopXQueryCompilationListener.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/NoopXQueryCompilationListener.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/NoopXQueryCompilationListener.java
index 6b81593..e4f6837 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/NoopXQueryCompilationListener.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/NoopXQueryCompilationListener.java
@@ -41,4 +41,4 @@ public class NoopXQueryCompilationListener implements 
XQueryCompilationListener
     @Override
     public void notifyParseResult(ModuleNode moduleNode) {
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/PrologVariable.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/PrologVariable.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/PrologVariable.java
index 960c931..070529e 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/PrologVariable.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/PrologVariable.java
@@ -28,4 +28,4 @@ public class PrologVariable {
     public XQueryVariable getVariable() {
         return variable;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/VXQueryCompilationListener.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/VXQueryCompilationListener.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/VXQueryCompilationListener.java
index 621e7a8..b3692b1 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/VXQueryCompilationListener.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/VXQueryCompilationListener.java
@@ -21,11 +21,11 @@ import org.json.JSONException;
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.DomDriver;
 
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.prettyprint.LogicalOperatorPrettyPrintVisitor;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.prettyprint.PlanPrettyPrinter;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.visitors.ILogicalExpressionVisitor;
-import edu.uci.ics.hyracks.api.job.JobSpecification;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import 
org.apache.hyracks.algebricks.core.algebra.prettyprint.LogicalOperatorPrettyPrintVisitor;
+import 
org.apache.hyracks.algebricks.core.algebra.prettyprint.PlanPrettyPrinter;
+import 
org.apache.hyracks.algebricks.core.algebra.visitors.ILogicalExpressionVisitor;
+import org.apache.hyracks.api.job.JobSpecification;
 
 public class VXQueryCompilationListener implements XQueryCompilationListener {
     boolean showTET, showRP, showOET, showAST;

Reply via email to