http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/cardinality/Cardinality.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/cardinality/Cardinality.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/cardinality/Cardinality.java
index d906f0d..c4288ac 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/cardinality/Cardinality.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/cardinality/Cardinality.java
@@ -21,4 +21,4 @@ public enum Cardinality {
     ONE,
     MANY;
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrder.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrder.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrder.java
index b142014..c01d5e6 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrder.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrder.java
@@ -21,4 +21,4 @@ public enum DocumentOrder {
     YES,
     NO;
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderNOPropagationPolicy.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderNOPropagationPolicy.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderNOPropagationPolicy.java
index 572e3dc..a09b741 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderNOPropagationPolicy.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderNOPropagationPolicy.java
@@ -24,4 +24,4 @@ public class DocumentOrderNOPropagationPolicy extends 
ConstantPropertyPropagatio
         super(DocumentOrder.NO);
     }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderYESPropagationPolicy.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderYESPropagationPolicy.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderYESPropagationPolicy.java
index c72a736..9641de6 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderYESPropagationPolicy.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/documentorder/DocumentOrderYESPropagationPolicy.java
@@ -24,4 +24,4 @@ public class DocumentOrderYESPropagationPolicy extends 
ConstantPropertyPropagati
         super(DocumentOrder.YES);
     }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodes.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodes.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodes.java
index fca5864..a0ea383 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodes.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodes.java
@@ -21,4 +21,4 @@ public enum UniqueNodes {
     YES,
     NO;
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesNOPropagationPolicy.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesNOPropagationPolicy.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesNOPropagationPolicy.java
index 85d9856..a5b8ac1 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesNOPropagationPolicy.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesNOPropagationPolicy.java
@@ -24,4 +24,4 @@ public class UniqueNodesNOPropagationPolicy extends 
ConstantPropertyPropagationP
         super(UniqueNodes.NO);
     }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesYESPropagationPolicy.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesYESPropagationPolicy.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesYESPropagationPolicy.java
index 4c4b7b9..f21a5cc 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesYESPropagationPolicy.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/propagationpolicies/uniquenodes/UniqueNodesYESPropagationPolicy.java
@@ -24,4 +24,4 @@ public class UniqueNodesYESPropagationPolicy extends 
ConstantPropertyPropagation
         super(UniqueNodes.YES);
     }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/CardinalityRuleToolbox.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/CardinalityRuleToolbox.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/CardinalityRuleToolbox.java
index 5b4594e..7744eb2 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/CardinalityRuleToolbox.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/CardinalityRuleToolbox.java
@@ -19,10 +19,10 @@ package org.apache.vxquery.compiler.rewriter.rules.util;
 import org.apache.vxquery.compiler.rewriter.VXQueryOptimizationContext;
 import 
org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.cardinality.Cardinality;
 
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractOperatorWithNestedPlans;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import 
org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import 
org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractOperatorWithNestedPlans;
+import 
org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator;
 
 public class CardinalityRuleToolbox {
     /**

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java
index 7e916d7..10a8dca 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/ExpressionToolbox.java
@@ -29,18 +29,18 @@ import org.apache.vxquery.types.AnyNodeType;
 import org.apache.vxquery.types.Quantifier;
 import org.apache.vxquery.types.SequenceType;
 
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractAssignOperator;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import 
org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import 
org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
+import 
org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import 
org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractAssignOperator;
+import 
org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import 
org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
 
 public class ExpressionToolbox {
     public static Mutable<ILogicalExpression> 
findVariableExpression(Mutable<ILogicalExpression> mutableLe,

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/OperatorToolbox.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/OperatorToolbox.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/OperatorToolbox.java
index 78cd80f..2c57c32 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/OperatorToolbox.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/util/OperatorToolbox.java
@@ -21,17 +21,17 @@ import java.util.List;
 
 import org.apache.commons.lang3.mutable.Mutable;
 
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractAssignOperator;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractBinaryJoinOperator;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractScanOperator;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractUnnestOperator;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator;
-import 
edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.SelectOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import 
org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractAssignOperator;
+import 
org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractBinaryJoinOperator;
+import 
org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import 
org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractScanOperator;
+import 
org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractUnnestOperator;
+import 
org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator;
+import 
org.apache.hyracks.algebricks.core.algebra.operators.logical.SelectOperator;
 
 public class OperatorToolbox {
 

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/context/DefaultDocumentURIResolverImpl.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/context/DefaultDocumentURIResolverImpl.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/context/DefaultDocumentURIResolverImpl.java
index 84bde33..3d763d5 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/context/DefaultDocumentURIResolverImpl.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/context/DefaultDocumentURIResolverImpl.java
@@ -33,4 +33,4 @@ public class DefaultDocumentURIResolverImpl implements 
DocumentURIResolver {
         if (! file.isAbsolute()) file = new File(base + "/" + href);
         return new FileInputStream(file);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/context/DelegatingStaticContextImpl.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/context/DelegatingStaticContextImpl.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/context/DelegatingStaticContextImpl.java
index dec7d81..bffcd25 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/context/DelegatingStaticContextImpl.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/context/DelegatingStaticContextImpl.java
@@ -295,4 +295,4 @@ public abstract class DelegatingStaticContextImpl 
implements StaticContext {
     public void setOrderingModeProperty(OrderingModeProperty orderingMode) {
         parent.setOrderingModeProperty(orderingMode);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/context/DocumentURIResolver.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/context/DocumentURIResolver.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/context/DocumentURIResolver.java
index de68016..5df5a86 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/context/DocumentURIResolver.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/context/DocumentURIResolver.java
@@ -21,4 +21,4 @@ import java.io.InputStream;
 
 public interface DocumentURIResolver {
     public InputStream resolveDocumentURI(String base, String href) throws 
IOException;
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContext.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContext.java 
b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContext.java
index da85b33..2b3ec8a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContext.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContext.java
@@ -18,8 +18,8 @@ package org.apache.vxquery.context;
 
 import javax.xml.namespace.QName;
 
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IValueReference;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IValueReference;
 
 public interface DynamicContext {
     public IDynamicContextFactory createFactory();
@@ -33,4 +33,4 @@ public interface DynamicContext {
     public void bindVariable(QName var, IValueReference vReference);
 
     public void lookupVariable(QName var, IPointable value);
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImpl.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImpl.java 
b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImpl.java
index 9f59644..6a2a930 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImpl.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImpl.java
@@ -21,9 +21,9 @@ import java.util.Map;
 
 import javax.xml.namespace.QName;
 
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IValueReference;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IValueReference;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class DynamicContextImpl implements DynamicContext {
     private StaticContext sCtx;
@@ -82,4 +82,4 @@ public class DynamicContextImpl implements DynamicContext {
     Map<QName, ArrayBackedValueStorage> getVariableMap() {
         return variables;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImplFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImplFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImplFactory.java
index a8fd821..a30c5ad 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImplFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/context/DynamicContextImplFactory.java
@@ -23,9 +23,9 @@ import javax.xml.namespace.QName;
 
 import org.apache.vxquery.datamodel.accessors.atomic.XSDateTimePointable;
 
-import edu.uci.ics.hyracks.api.context.IHyracksJobletContext;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.api.context.IHyracksJobletContext;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 class DynamicContextImplFactory implements IDynamicContextFactory {
     private static final long serialVersionUID = 1L;
@@ -91,4 +91,4 @@ class DynamicContextImplFactory implements 
IDynamicContextFactory {
         return new DynamicContextImplFactory(scFactory, currentDateTime, 
variableNames, valueOffsets,
                 Arrays.copyOfRange(abvs.getByteArray(), abvs.getStartOffset(), 
abvs.getLength()));
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/context/IDynamicContextFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/context/IDynamicContextFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/context/IDynamicContextFactory.java
index c004357..2e8a7b3 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/context/IDynamicContextFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/context/IDynamicContextFactory.java
@@ -18,8 +18,8 @@ package org.apache.vxquery.context;
 
 import java.io.Serializable;
 
-import edu.uci.ics.hyracks.api.context.IHyracksJobletContext;
+import org.apache.hyracks.api.context.IHyracksJobletContext;
 
 public interface IDynamicContextFactory extends Serializable {
     public DynamicContext createDynamicContext(IHyracksJobletContext ctx);
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/context/IStaticContextFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/context/IStaticContextFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/context/IStaticContextFactory.java
index bf46935..c74ddd7 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/context/IStaticContextFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/context/IStaticContextFactory.java
@@ -20,4 +20,4 @@ import java.io.Serializable;
 
 public interface IStaticContextFactory extends Serializable {
     public StaticContext createStaticContext();
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/context/ModuleURIResolver.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/context/ModuleURIResolver.java 
b/vxquery-core/src/main/java/org/apache/vxquery/context/ModuleURIResolver.java
index 9b5d927..20ca42a 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/context/ModuleURIResolver.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/context/ModuleURIResolver.java
@@ -20,4 +20,4 @@ import java.io.InputStream;
 
 public interface ModuleURIResolver {
     public InputStream[] resolve(String moduleUri, String baseUri, String[] 
locationHints);
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextFactory.java
index 48ddbcf..b766f05 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextFactory.java
@@ -28,4 +28,4 @@ public class RootStaticContextFactory implements 
IStaticContextFactory {
     public StaticContext createStaticContext() {
         return RootStaticContextImpl.INSTANCE;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextImpl.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextImpl.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextImpl.java
index a219dab..cd80824 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextImpl.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/context/RootStaticContextImpl.java
@@ -218,4 +218,4 @@ public final class RootStaticContextImpl extends 
StaticContextImpl {
     public IStaticContextFactory createFactory() {
         return RootStaticContextFactory.INSTANCE;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContext.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContext.java 
b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContext.java
index 31693ee..815cf78 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContext.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContext.java
@@ -162,4 +162,4 @@ public interface StaticContext {
     }
 
     public IStaticContextFactory createFactory();
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImpl.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImpl.java 
b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImpl.java
index 09cfaff..c3aeda9 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImpl.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImpl.java
@@ -654,4 +654,4 @@ public class StaticContextImpl implements StaticContext {
             }
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImplFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImplFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImplFactory.java
index 879c84d..12d3c33 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImplFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/context/StaticContextImplFactory.java
@@ -47,4 +47,4 @@ class StaticContextImplFactory implements 
IStaticContextFactory {
         return new StaticContextImplFactory(parentSCFactory, new 
ArrayList<SequenceType>(
                 staticContextImpl.getSequenceTypeList()));
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImpl.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImpl.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImpl.java
index ea87dda..5873fcb 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImpl.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImpl.java
@@ -47,4 +47,4 @@ public class ThinStaticContextImpl extends 
DelegatingStaticContextImpl {
     public IStaticContextFactory createFactory() {
         return ThinStaticContextImplFactory.createInstance(this);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImplFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImplFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImplFactory.java
index 079f4af..b0fe514 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImplFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/context/ThinStaticContextImplFactory.java
@@ -34,4 +34,4 @@ class ThinStaticContextImplFactory implements 
IStaticContextFactory {
         IStaticContextFactory delegateSCFactory = 
staticContextImpl.getParent().createFactory();
         return new ThinStaticContextImplFactory(delegateSCFactory);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/context/XQueryVariable.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/context/XQueryVariable.java 
b/vxquery-core/src/main/java/org/apache/vxquery/context/XQueryVariable.java
index cdd79b2..15c7fc5 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/context/XQueryVariable.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/context/XQueryVariable.java
@@ -20,7 +20,7 @@ import javax.xml.namespace.QName;
 
 import org.apache.vxquery.types.SequenceType;
 
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
 
 public class XQueryVariable {
     private final QName name;
@@ -46,4 +46,4 @@ public class XQueryVariable {
     public LogicalVariable getLogicalVariable() {
         return var;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointableCache.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointableCache.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointableCache.java
index c362e7d..adbe097 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointableCache.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointableCache.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.datamodel.accessors;
 import java.util.ArrayList;
 import java.util.List;
 
-import edu.uci.ics.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointable;
 
 public class PointableCache<T extends IPointable> {
     private final List<T> list;
@@ -38,4 +38,4 @@ public class PointableCache<T extends IPointable> {
     public void giveBack(T pointable) {
         list.add(pointable);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePool.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePool.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePool.java
index 4eccf33..1a85781 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePool.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePool.java
@@ -19,8 +19,8 @@ package org.apache.vxquery.datamodel.accessors;
 import java.util.HashMap;
 import java.util.Map;
 
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
 
 public class PointablePool {
     private final Map<Class<? extends IPointable>, IPointableFactory> pfMap;
@@ -53,4 +53,4 @@ public class PointablePool {
         PointableCache<T> pc = (PointableCache<T>) 
pcMap.get(pointable.getClass());
         pc.giveBack(pointable);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePoolFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePoolFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePoolFactory.java
index 7a5b6e8..9ec9bab 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePoolFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/PointablePoolFactory.java
@@ -31,15 +31,15 @@ import 
org.apache.vxquery.datamodel.accessors.nodes.NodeTreePointable;
 import org.apache.vxquery.datamodel.accessors.nodes.PINodePointable;
 import org.apache.vxquery.datamodel.accessors.nodes.TextOrCommentNodePointable;
 
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
 
 public class PointablePoolFactory {
     public static final PointablePoolFactory INSTANCE = new 
PointablePoolFactory();
@@ -79,4 +79,4 @@ public class PointablePoolFactory {
 
         return pp;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/SequencePointable.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/SequencePointable.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/SequencePointable.java
index 1c81b48..0aa66f7 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/SequencePointable.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/SequencePointable.java
@@ -16,12 +16,12 @@
  */
 package org.apache.vxquery.datamodel.accessors;
 
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
 
 public class SequencePointable extends AbstractPointable {
     private static final int ENTRY_COUNT_SIZE = 4;
@@ -77,4 +77,4 @@ public class SequencePointable extends AbstractPointable {
     private static int getDataAreaOffset(byte[] bytes, int start) {
         return getSlotArrayOffset(start) + getEntryCount(bytes, start) * 
SLOT_SIZE;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TaggedValuePointable.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TaggedValuePointable.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TaggedValuePointable.java
index 5760fc1..ac40491 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TaggedValuePointable.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TaggedValuePointable.java
@@ -16,12 +16,12 @@
  */
 package org.apache.vxquery.datamodel.accessors;
 
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
 
 public class TaggedValuePointable extends AbstractPointable {
     public static final IPointableFactory FACTORY = new IPointableFactory() {
@@ -45,4 +45,4 @@ public class TaggedValuePointable extends AbstractPointable {
     public void getValue(IPointable value) {
         value.set(bytes, start + 1, length - 1);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TypedPointables.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TypedPointables.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TypedPointables.java
index d303dfe..32eed34 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TypedPointables.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TypedPointables.java
@@ -30,14 +30,14 @@ import 
org.apache.vxquery.datamodel.accessors.nodes.NodeTreePointable;
 import org.apache.vxquery.datamodel.accessors.nodes.PINodePointable;
 import org.apache.vxquery.datamodel.accessors.nodes.TextOrCommentNodePointable;
 
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.FloatPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
 
 /**
  * One pointable for each type.

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/CodedQNamePointable.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/CodedQNamePointable.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/CodedQNamePointable.java
index 83a3d3b..7c3d390 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/CodedQNamePointable.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/CodedQNamePointable.java
@@ -16,11 +16,11 @@
  */
 package org.apache.vxquery.datamodel.accessors.atomic;
 
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
 
 public class CodedQNamePointable extends AbstractPointable {
     public static final int SIZE = 12;
@@ -68,4 +68,4 @@ public class CodedQNamePointable extends AbstractPointable {
     public int getLocalCode() {
         return IntegerPointable.getInteger(bytes, start + OFF_LOCAL);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java
index ccd9936..36af614 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java
@@ -16,10 +16,10 @@
  */
 package org.apache.vxquery.datamodel.accessors.atomic;
 
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
 
 public class XSBinaryPointable extends AbstractPointable {
     public static final ITypeTraits TYPE_TRAITS = new ITypeTraits() {

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java
index e7aaf8a..d728927 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java
@@ -19,12 +19,12 @@ package org.apache.vxquery.datamodel.accessors.atomic;
 import org.apache.vxquery.datamodel.api.IDate;
 import org.apache.vxquery.datamodel.api.ITimezone;
 
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
 
 /**
  * The date is split up into five sections. Due to leap year, we have decided 
to keep the
@@ -156,4 +156,4 @@ public class XSDatePointable extends AbstractPointable 
implements IDate, ITimezo
         return getDay(bytes, start) * CHRONON_OF_DAY;
     }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java
index a40dc01..5691d73 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java
@@ -24,13 +24,13 @@ import org.apache.vxquery.datamodel.api.ITime;
 import org.apache.vxquery.datamodel.api.ITimezone;
 import org.apache.vxquery.datamodel.util.DateTime;
 
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
 
 /**
  * The datetime is split up into eight sections. Due to leap year, we have 
decided to keep the
@@ -245,4 +245,4 @@ public class XSDateTimePointable extends AbstractPointable 
implements IDate, ITi
                         + getTimezoneHour(bytes, start) + ":" + 
getTimezoneMinute(bytes, start) : "");
     }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java
index f60d9bd..1559b06 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java
@@ -16,15 +16,15 @@
  */
 package org.apache.vxquery.datamodel.accessors.atomic;
 
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IComparable;
-import edu.uci.ics.hyracks.data.std.api.IHashable;
-import edu.uci.ics.hyracks.data.std.api.INumeric;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IComparable;
+import org.apache.hyracks.data.std.api.IHashable;
+import org.apache.hyracks.data.std.api.INumeric;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
 
 public class XSDecimalPointable extends AbstractPointable implements 
IHashable, IComparable, INumeric {
     private final static int DECIMAL_PLACE_OFFSET = 0;
@@ -200,4 +200,4 @@ public class XSDecimalPointable extends AbstractPointable 
implements IHashable,
         return ((double) getDecimalValue()) / Math.pow(10, getDecimalPlace());
     }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java
index 0a9bd1f..e997349 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java
@@ -16,12 +16,12 @@
  */
 package org.apache.vxquery.datamodel.accessors.atomic;
 
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
 
 public class XSDurationPointable extends AbstractPointable {
     private final static int YEAR_MONTH_OFFSET = 0;
@@ -86,4 +86,4 @@ public class XSDurationPointable extends AbstractPointable {
     public void setDayTime(long value) {
         setDayTime(bytes, start, value);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java
index f35c067..f8e63b6 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java
@@ -16,11 +16,11 @@
  */
 package org.apache.vxquery.datamodel.accessors.atomic;
 
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
 
 /**
  * The XSQNamePointable holds three strings: URI, Prefix and Local Name.

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java
index 2919bc0..62eedde 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java
@@ -19,12 +19,12 @@ package org.apache.vxquery.datamodel.accessors.atomic;
 import org.apache.vxquery.datamodel.api.ITime;
 import org.apache.vxquery.datamodel.api.ITimezone;
 
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
 
 /**
  * The time is split up into five sections. Due to leap year, we have decided 
to keep the
@@ -153,4 +153,4 @@ public class XSTimePointable extends AbstractPointable 
implements ITime, ITimezo
         return 0;
     }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AbstractNodePointable.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AbstractNodePointable.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AbstractNodePointable.java
index b5ced2c..7601688 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AbstractNodePointable.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AbstractNodePointable.java
@@ -17,8 +17,8 @@
 
 package org.apache.vxquery.datamodel.accessors.nodes;
 
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
 
 public abstract class AbstractNodePointable extends AbstractPointable {
     public int getLocalNodeId(NodeTreePointable nodeTree) {

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java
index 030222b..fd4cfc6 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java
@@ -18,10 +18,10 @@ package org.apache.vxquery.datamodel.accessors.nodes;
 
 import org.apache.vxquery.datamodel.accessors.atomic.CodedQNamePointable;
 
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
 
 /*
  * Attribute {
@@ -100,4 +100,4 @@ public class AttributeNodePointable extends 
AbstractNodePointable {
     private int getValueSize(NodeTreePointable nodeTree) {
         return length - (getValueOffset(nodeTree) - start);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java
index d2dc5d0..95dc404 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java
@@ -18,10 +18,10 @@ package org.apache.vxquery.datamodel.accessors.nodes;
 
 import org.apache.vxquery.datamodel.accessors.SequencePointable;
 
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
 
 /*
  * Document {
@@ -64,4 +64,4 @@ public class DocumentNodePointable extends 
AbstractNodePointable {
     private int getContentSize(NodeTreePointable nodeTree) {
         return length - (getContentOffset(nodeTree) - start);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java
index faadd33..4367d91 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java
@@ -19,12 +19,12 @@ package org.apache.vxquery.datamodel.accessors.nodes;
 import org.apache.vxquery.datamodel.accessors.SequencePointable;
 import org.apache.vxquery.datamodel.accessors.atomic.CodedQNamePointable;
 
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
 
 /*
  * Element {
@@ -201,4 +201,4 @@ public class ElementNodePointable extends 
AbstractNodePointable {
     private int getChildrenChunkSize(NodeTreePointable nodeTree) {
         return childrenChunkExists() ? 
SequencePointable.getSequenceLength(bytes, getChildrenChunkOffset(nodeTree)) : 
0;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java
index 4b0697f..db03e28 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java
@@ -18,16 +18,16 @@ package org.apache.vxquery.datamodel.accessors.nodes;
 
 import org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
 
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.algorithms.BinarySearchAlgorithm;
-import edu.uci.ics.hyracks.data.std.api.AbstractPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.collections.api.IValueReferenceVector;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.algorithms.BinarySearchAlgorithm;
+import org.apache.hyracks.data.std.api.AbstractPointable;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.collections.api.IValueReferenceVector;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
 
 /*
  * NodeTree {
@@ -204,4 +204,4 @@ public class NodeTreePointable extends AbstractPointable {
     private int getRootNodeOffset() {
         return getDictionaryOffset() + getDictionarySize();
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java
index 2318ba6..3ae5126 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java
@@ -16,11 +16,11 @@
  */
 package org.apache.vxquery.datamodel.accessors.nodes;
 
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
 
 /*
  * PI {
@@ -76,4 +76,4 @@ public class PINodePointable extends AbstractNodePointable {
     private int getContentSize(NodeTreePointable nodeTree) {
         return UTF8StringPointable.getUTFLength(bytes, 
getContentOffset(nodeTree)) + 2;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java
index 2ab2555..cea7c02 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java
@@ -16,10 +16,10 @@
  */
 package org.apache.vxquery.datamodel.accessors.nodes;
 
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
 
 /*
  * Text | Comment {
@@ -63,4 +63,4 @@ public class TextOrCommentNodePointable extends 
AbstractNodePointable {
         return length - (getValueOffset(nodeTree) - start);
     }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/StringValueBuilder.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/StringValueBuilder.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/StringValueBuilder.java
index ad59a5c..215d1b1 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/StringValueBuilder.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/StringValueBuilder.java
@@ -19,7 +19,7 @@ package org.apache.vxquery.datamodel.builders.atomic;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringWriter;
+import org.apache.hyracks.data.std.primitive.UTF8StringWriter;
 
 public class StringValueBuilder {
     private final UTF8StringWriter writer;
@@ -31,4 +31,4 @@ public class StringValueBuilder {
     public void write(CharSequence string, DataOutput out) throws IOException {
         writer.writeUTF8String(string, out);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java
index f1961ff..51c026b 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java
@@ -23,8 +23,8 @@ import java.io.UTFDataFormatException;
 import org.apache.vxquery.datamodel.builders.base.AbstractBuilder;
 import org.apache.vxquery.runtime.functions.util.FunctionHelper;
 
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.primitive.BytePointable;
 
 public class UTF8StringBuilder extends AbstractBuilder {
     private IMutableValueStorage mvs;
@@ -51,4 +51,4 @@ public class UTF8StringBuilder extends AbstractBuilder {
             throw new UTFDataFormatException("encoded string too long: " + 
mvs.getLength() + " bytes");
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java
index 4ba9a14..bacad26 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java
@@ -18,10 +18,10 @@ package org.apache.vxquery.datamodel.builders.base;
 
 import java.io.IOException;
 
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
 
 public abstract class AbstractBuilder {
     public abstract void reset(IMutableValueStorage mvs) throws IOException;
 
     public abstract void finish() throws IOException;
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractValueBuilder.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractValueBuilder.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractValueBuilder.java
index 15eea32..abe8eb1 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractValueBuilder.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractValueBuilder.java
@@ -17,4 +17,4 @@
 package org.apache.vxquery.datamodel.builders.base;
 
 public abstract class AbstractValueBuilder implements IValueBuilder {
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/IValueBuilder.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/IValueBuilder.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/IValueBuilder.java
index a83b6b1..fc38cda 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/IValueBuilder.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/IValueBuilder.java
@@ -22,4 +22,4 @@ public interface IValueBuilder {
     public void reset();
 
     public void write(DataOutput out);
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java
index 1c5c7a5..955668f 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java
@@ -18,10 +18,10 @@ package org.apache.vxquery.datamodel.builders.nodes;
 
 import java.io.IOException;
 
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
 
 public abstract class AbstractNodeBuilder {
     public abstract void reset(IMutableValueStorage mvs) throws IOException;
 
     public abstract void finish() throws IOException;
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java
index cea7799..7743cd8 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java
@@ -21,8 +21,8 @@ import java.io.IOException;
 
 import org.apache.vxquery.datamodel.values.ValueTag;
 
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.api.IValueReference;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.api.IValueReference;
 
 public class AttributeNodeBuilder extends AbstractNodeBuilder {
     private DataOutput out;
@@ -56,4 +56,4 @@ public class AttributeNodeBuilder extends AbstractNodeBuilder 
{
     public void setValue(IValueReference value) throws IOException {
         out.write(value.getByteArray(), value.getStartOffset(), 
value.getLength());
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java
index 104868f..d79bb88 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java
@@ -21,8 +21,8 @@ import java.io.IOException;
 
 import org.apache.vxquery.datamodel.values.ValueTag;
 
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.api.IValueReference;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.api.IValueReference;
 
 public class CommentNodeBuilder extends AbstractNodeBuilder {
     private DataOutput out;
@@ -44,4 +44,4 @@ public class CommentNodeBuilder extends AbstractNodeBuilder {
     public void setValue(IValueReference value) throws IOException {
         out.write(value.getByteArray(), value.getStartOffset(), 
value.getLength());
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java
index bee221d..dae149f 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java
@@ -24,12 +24,12 @@ import java.util.TreeMap;
 
 import org.apache.vxquery.util.GrowableIntArray;
 
-import edu.uci.ics.hyracks.data.std.algorithms.BinarySearchAlgorithm;
-import edu.uci.ics.hyracks.data.std.collections.api.IValueReferenceVector;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
-import edu.uci.ics.hyracks.data.std.util.ByteArrayAccessibleOutputStream;
+import org.apache.hyracks.data.std.algorithms.BinarySearchAlgorithm;
+import org.apache.hyracks.data.std.collections.api.IValueReferenceVector;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.util.ByteArrayAccessibleOutputStream;
 
 public class DictionaryBuilder {
     private final GrowableIntArray stringEndOffsets;
@@ -158,4 +158,4 @@ public class DictionaryBuilder {
         cacheReady = false;
         return slotIndex;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java
index 176580e..47c811c 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java
@@ -22,8 +22,8 @@ import java.io.IOException;
 import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.util.GrowableIntArray;
 
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class DocumentNodeBuilder extends AbstractNodeBuilder {
     private final GrowableIntArray childrenSlots;
@@ -79,4 +79,4 @@ public class DocumentNodeBuilder extends AbstractNodeBuilder {
             out.write(childrenDataArea.getByteArray(), 
childrenDataArea.getStartOffset(), childrenDataArea.getLength());
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java
index d455fd5..89aaddc 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java
@@ -23,11 +23,11 @@ import 
org.apache.vxquery.datamodel.accessors.nodes.ElementNodePointable;
 import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.util.GrowableIntArray;
 
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.api.IValueReference;
-import edu.uci.ics.hyracks.data.std.primitive.BytePointable;
-import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.api.IValueReference;
+import org.apache.hyracks.data.std.primitive.BytePointable;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class ElementNodeBuilder extends AbstractNodeBuilder {
     private final GrowableIntArray attrSlots;
@@ -176,4 +176,4 @@ public class ElementNodeBuilder extends AbstractNodeBuilder 
{
             out.write(childrenDataArea.getByteArray(), 
childrenDataArea.getStartOffset(), childrenDataArea.getLength());
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java
index c890f3b..5eb08df 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java
@@ -23,7 +23,7 @@ import 
org.apache.vxquery.datamodel.accessors.TaggedValuePointable;
 import org.apache.vxquery.datamodel.accessors.nodes.NodeTreePointable;
 import org.apache.vxquery.datamodel.values.ValueTag;
 
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
 
 public class NodeSubTreeBuilder extends AbstractNodeBuilder {
     private DataOutput mainOut;
@@ -67,4 +67,4 @@ public class NodeSubTreeBuilder extends AbstractNodeBuilder {
     }
 
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java
index a472143..ee37511 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java
@@ -21,8 +21,8 @@ import java.io.IOException;
 
 import org.apache.vxquery.datamodel.values.ValueTag;
 
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.api.IValueReference;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.api.IValueReference;
 
 public class PINodeBuilder extends AbstractNodeBuilder {
     private DataOutput out;
@@ -48,4 +48,4 @@ public class PINodeBuilder extends AbstractNodeBuilder {
     public void setContent(IValueReference value) throws IOException {
         out.write(value.getByteArray(), value.getStartOffset(), 
value.getLength());
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java
index acddb8b..84ee20e 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java
@@ -21,8 +21,8 @@ import java.io.IOException;
 
 import org.apache.vxquery.datamodel.values.ValueTag;
 
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.api.IValueReference;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.api.IValueReference;
 
 public class TextNodeBuilder extends AbstractNodeBuilder {
     private DataOutput out;
@@ -44,4 +44,4 @@ public class TextNodeBuilder extends AbstractNodeBuilder {
     public void setValue(IValueReference value) throws IOException {
         out.write(value.getByteArray(), value.getStartOffset(), 
value.getLength());
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java
index 96d6c3d..12f4ad7 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java
@@ -22,9 +22,9 @@ import java.io.IOException;
 import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.util.GrowableIntArray;
 
-import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage;
-import edu.uci.ics.hyracks.data.std.api.IValueReference;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.api.IMutableValueStorage;
+import org.apache.hyracks.data.std.api.IValueReference;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class SequenceBuilder {
     private final GrowableIntArray slots = new GrowableIntArray();
@@ -62,4 +62,4 @@ public class SequenceBuilder {
             out.write(dataArea.getByteArray(), dataArea.getStartOffset(), 
dataArea.getLength());
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java
index c30c77b..e2c89e9 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java
@@ -100,4 +100,4 @@ public class ValueTag {
                 return false;
         }
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/XDMConstants.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/XDMConstants.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/XDMConstants.java
index 8f1d7b3..bc058c7 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/XDMConstants.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/XDMConstants.java
@@ -21,9 +21,9 @@ import java.util.Arrays;
 
 import org.apache.vxquery.datamodel.builders.sequence.SequenceBuilder;
 
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class XDMConstants {
     private static final byte[] BOOLEAN_TRUE_CONSTANT;
@@ -81,4 +81,4 @@ public class XDMConstants {
 
     private XDMConstants() {
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/exceptions/DefaultSystemExceptionFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/DefaultSystemExceptionFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/DefaultSystemExceptionFactory.java
index 3c0e143..6dfd040 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/DefaultSystemExceptionFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/DefaultSystemExceptionFactory.java
@@ -38,4 +38,4 @@ public final class DefaultSystemExceptionFactory implements 
SystemExceptionFacto
     public SystemException createException(ErrorCode code, SourceLocation 
location) {
         return new SystemException(code, location);
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorReporter.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorReporter.java 
b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorReporter.java
index d271095..8a1cdb0 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorReporter.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorReporter.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.exceptions;
 
 public interface ErrorReporter {
     public void reportError(Exception e);
-}
\ No newline at end of file
+}

Reply via email to