http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsByteOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsByteOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsByteOperation.java
index d3efe10..31bf45e 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsByteOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsByteOperation.java
@@ -24,13 +24,13 @@ import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.functions.cast.CastToByteOperation;
 
-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.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+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.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class CastableAsByteOperation extends AbstractCastableAsOperation {
     private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -109,4 +109,4 @@ public class CastableAsByteOperation extends 
AbstractCastableAsOperation {
         dOut.write((byte) 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/runtime/functions/castable/CastableAsDTDurationOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDTDurationOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDTDurationOperation.java
index ec2e4c0..1e68cc5 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDTDurationOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDTDurationOperation.java
@@ -24,10 +24,10 @@ import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.functions.cast.CastToDTDurationOperation;
 
-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.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class CastableAsDTDurationOperation extends AbstractCastableAsOperation 
{
     private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -70,4 +70,4 @@ public class CastableAsDTDurationOperation extends 
AbstractCastableAsOperation {
         convertString(stringp, dOut);
     }
 
-}
\ 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/runtime/functions/castable/CastableAsDateOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDateOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDateOperation.java
index e54d436..822a073 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDateOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDateOperation.java
@@ -25,8 +25,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.functions.cast.CastToDateOperation;
 
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class CastableAsDateOperation extends AbstractCastableAsOperation {
     private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -62,4 +62,4 @@ public class CastableAsDateOperation extends 
AbstractCastableAsOperation {
     public void convertUntypedAtomic(UTF8StringPointable stringp, DataOutput 
dOut) throws SystemException, IOException {
         convertString(stringp, dOut);
     }
-}
\ 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/runtime/functions/castable/CastableAsDateTimeOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDateTimeOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDateTimeOperation.java
index 5bdc333..ef731c3 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDateTimeOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDateTimeOperation.java
@@ -25,8 +25,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.functions.cast.CastToDateTimeOperation;
 
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class CastableAsDateTimeOperation extends AbstractCastableAsOperation {
     private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -63,4 +63,4 @@ public class CastableAsDateTimeOperation extends 
AbstractCastableAsOperation {
         convertString(stringp, dOut);
     }
 
-}
\ 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/runtime/functions/castable/CastableAsDecimalOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDecimalOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDecimalOperation.java
index 96b10e5..7d32581 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDecimalOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDecimalOperation.java
@@ -24,12 +24,12 @@ import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.functions.cast.CastToDecimalOperation;
 
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-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.LongPointable;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.FloatPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class CastableAsDecimalOperation extends AbstractCastableAsOperation {
     private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -100,4 +100,4 @@ public class CastableAsDecimalOperation extends 
AbstractCastableAsOperation {
         convertString(stringp, dOut);
     }
 
-}
\ 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/runtime/functions/castable/CastableAsDoubleOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDoubleOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDoubleOperation.java
index 22205df..1b3978e 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDoubleOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDoubleOperation.java
@@ -24,15 +24,15 @@ import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.functions.cast.CastToDoubleOperation;
 
-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.util.ArrayBackedValueStorage;
+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.util.ArrayBackedValueStorage;
 
 public class CastableAsDoubleOperation extends AbstractCastableAsOperation {
     private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -149,4 +149,4 @@ public class CastableAsDoubleOperation extends 
AbstractCastableAsOperation {
         dOut.write(ValueTag.XS_BOOLEAN_TAG);
         dOut.write((byte) 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/runtime/functions/castable/CastableAsDurationOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDurationOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDurationOperation.java
index 9f2cc38..01a9c4f 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDurationOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsDurationOperation.java
@@ -24,10 +24,10 @@ import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.functions.cast.CastToDurationOperation;
 
-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.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class CastableAsDurationOperation extends AbstractCastableAsOperation {
     private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -70,4 +70,4 @@ public class CastableAsDurationOperation extends 
AbstractCastableAsOperation {
         convertString(stringp, dOut);
     }
 
-}
\ 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/runtime/functions/castable/CastableAsFloatOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsFloatOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsFloatOperation.java
index cd42c5f..7c2ecf9 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsFloatOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsFloatOperation.java
@@ -24,15 +24,15 @@ import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.functions.cast.CastToFloatOperation;
 
-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.util.ArrayBackedValueStorage;
+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.util.ArrayBackedValueStorage;
 
 public class CastableAsFloatOperation extends AbstractCastableAsOperation {
     private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -149,4 +149,4 @@ public class CastableAsFloatOperation extends 
AbstractCastableAsOperation {
         dOut.write(ValueTag.XS_BOOLEAN_TAG);
         dOut.write((byte) 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/runtime/functions/castable/CastableAsGDayOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGDayOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGDayOperation.java
index 98cfc32..c0d9ad1 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGDayOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGDayOperation.java
@@ -25,8 +25,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.functions.cast.CastToGDayOperation;
 
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class CastableAsGDayOperation extends AbstractCastableAsOperation {
     private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -69,4 +69,4 @@ public class CastableAsGDayOperation extends 
AbstractCastableAsOperation {
         convertString(stringp, dOut);
     }
 
-}
\ 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/runtime/functions/castable/CastableAsGMonthDayOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGMonthDayOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGMonthDayOperation.java
index f2f837f..59d24e6 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGMonthDayOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGMonthDayOperation.java
@@ -25,8 +25,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.functions.cast.CastToGMonthDayOperation;
 
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class CastableAsGMonthDayOperation extends AbstractCastableAsOperation {
     private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -69,4 +69,4 @@ public class CastableAsGMonthDayOperation extends 
AbstractCastableAsOperation {
         convertString(stringp, dOut);
     }
 
-}
\ 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/runtime/functions/castable/CastableAsGMonthOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGMonthOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGMonthOperation.java
index b1c9cb9..0584627 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGMonthOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGMonthOperation.java
@@ -25,8 +25,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.functions.cast.CastToGMonthOperation;
 
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class CastableAsGMonthOperation extends AbstractCastableAsOperation {
     private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -69,4 +69,4 @@ public class CastableAsGMonthOperation extends 
AbstractCastableAsOperation {
         convertString(stringp, dOut);
     }
 
-}
\ 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/runtime/functions/castable/CastableAsGYearMonthOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGYearMonthOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGYearMonthOperation.java
index 4d9b17d..e012e65 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGYearMonthOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGYearMonthOperation.java
@@ -25,8 +25,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.functions.cast.CastToGYearMonthOperation;
 
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class CastableAsGYearMonthOperation extends AbstractCastableAsOperation 
{
     private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -70,4 +70,4 @@ public class CastableAsGYearMonthOperation extends 
AbstractCastableAsOperation {
         dOut.write((byte) 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/runtime/functions/castable/CastableAsGYearOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGYearOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGYearOperation.java
index 846ac07..c926ae6 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGYearOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsGYearOperation.java
@@ -25,8 +25,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.functions.cast.CastToGYearOperation;
 
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class CastableAsGYearOperation extends AbstractCastableAsOperation {
     private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -69,4 +69,4 @@ public class CastableAsGYearOperation extends 
AbstractCastableAsOperation {
         convertString(stringp, dOut);
     }
 
-}
\ 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/runtime/functions/castable/CastableAsHexBinaryOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsHexBinaryOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsHexBinaryOperation.java
index c177d53..99c7b77 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsHexBinaryOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsHexBinaryOperation.java
@@ -24,8 +24,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.functions.cast.CastToHexBinaryOperation;
 
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class CastableAsHexBinaryOperation extends AbstractCastableAsOperation {
     private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -61,4 +61,4 @@ public class CastableAsHexBinaryOperation extends 
AbstractCastableAsOperation {
     public void convertUntypedAtomic(UTF8StringPointable stringp, DataOutput 
dOut) throws SystemException, IOException {
         convertString(stringp, dOut);
     }
-}
\ 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/runtime/functions/castable/CastableAsIntOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsIntOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsIntOperation.java
index 168160c..0186508 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsIntOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsIntOperation.java
@@ -24,15 +24,15 @@ import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.functions.cast.CastToIntOperation;
 
-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.util.ArrayBackedValueStorage;
+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.util.ArrayBackedValueStorage;
 
 public class CastableAsIntOperation extends AbstractCastableAsOperation {
     private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -130,4 +130,4 @@ public class CastableAsIntOperation extends 
AbstractCastableAsOperation {
         dOut.write(ValueTag.XS_BOOLEAN_TAG);
         dOut.write((byte) 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/runtime/functions/castable/CastableAsIntegerOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsIntegerOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsIntegerOperation.java
index b1707f2..7a31393 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsIntegerOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsIntegerOperation.java
@@ -24,15 +24,15 @@ import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.functions.cast.CastToIntegerOperation;
 
-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.util.ArrayBackedValueStorage;
+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.util.ArrayBackedValueStorage;
 
 public class CastableAsIntegerOperation extends AbstractCastableAsOperation {
     private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -165,4 +165,4 @@ public class CastableAsIntegerOperation extends 
AbstractCastableAsOperation {
         dOut.write(ValueTag.XS_BOOLEAN_TAG);
         dOut.write((byte) 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/runtime/functions/castable/CastableAsLongOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsLongOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsLongOperation.java
index 894a5cc..31b123b 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsLongOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsLongOperation.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.runtime.functions.castable;
 
 public class CastableAsLongOperation extends CastableAsIntegerOperation {
 
-}
\ 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/runtime/functions/castable/CastableAsNegativeIntegerOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNegativeIntegerOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNegativeIntegerOperation.java
index 994b17f..b3b7499 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNegativeIntegerOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNegativeIntegerOperation.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.runtime.functions.castable;
 
 public class CastableAsNegativeIntegerOperation extends 
CastableAsIntegerOperation {
 
-}
\ 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/runtime/functions/castable/CastableAsNonNegativeIntegerOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNonNegativeIntegerOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNonNegativeIntegerOperation.java
index c066a99..0002946 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNonNegativeIntegerOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNonNegativeIntegerOperation.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.runtime.functions.castable;
 
 public class CastableAsNonNegativeIntegerOperation extends 
CastableAsIntegerOperation {
 
-}
\ 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/runtime/functions/castable/CastableAsNonPositiveIntegerOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNonPositiveIntegerOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNonPositiveIntegerOperation.java
index ab6ebd8..100d11e 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNonPositiveIntegerOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNonPositiveIntegerOperation.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.runtime.functions.castable;
 
 public class CastableAsNonPositiveIntegerOperation extends 
CastableAsIntegerOperation {
 
-}
\ 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/runtime/functions/castable/CastableAsNotationOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNotationOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNotationOperation.java
index 6219305..b5ea6e2 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNotationOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsNotationOperation.java
@@ -29,12 +29,12 @@ import 
org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
 import org.apache.vxquery.exceptions.ErrorCode;
 import org.apache.vxquery.exceptions.SystemException;
 
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-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.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+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.UTF8StringPointable;
 
 public class CastableAsNotationOperation extends AbstractCastableAsOperation {
     public void convertAnyURI(UTF8StringPointable stringp, DataOutput dOut) 
throws SystemException, IOException {
@@ -128,4 +128,4 @@ public class CastableAsNotationOperation extends 
AbstractCastableAsOperation {
     public void convertYMDuration(IntegerPointable intp, DataOutput dOut) 
throws SystemException, IOException {
         throw new SystemException(ErrorCode.XPTY0004);
     }
-}
\ 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/runtime/functions/castable/CastableAsPositiveIntegerOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsPositiveIntegerOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsPositiveIntegerOperation.java
index af55a52..f75a254 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsPositiveIntegerOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsPositiveIntegerOperation.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.runtime.functions.castable;
 
 public class CastableAsPositiveIntegerOperation extends 
CastableAsIntegerOperation {
 
-}
\ 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/runtime/functions/castable/CastableAsQNameOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsQNameOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsQNameOperation.java
index 25bafbe..6c2c9ef 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsQNameOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsQNameOperation.java
@@ -23,7 +23,7 @@ import 
org.apache.vxquery.datamodel.accessors.atomic.XSQNamePointable;
 import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
 
 public class CastableAsQNameOperation extends AbstractCastableAsOperation {
 
@@ -39,4 +39,4 @@ public class CastableAsQNameOperation extends 
AbstractCastableAsOperation {
         dOut.write((byte) 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/runtime/functions/castable/CastableAsShortOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsShortOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsShortOperation.java
index 2754ea5..444e4c9 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsShortOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsShortOperation.java
@@ -24,14 +24,14 @@ import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.functions.cast.CastToShortOperation;
 
-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.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.util.ArrayBackedValueStorage;
+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.LongPointable;
+import org.apache.hyracks.data.std.primitive.ShortPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class CastableAsShortOperation extends AbstractCastableAsOperation {
     private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -119,4 +119,4 @@ public class CastableAsShortOperation extends 
AbstractCastableAsOperation {
         dOut.write(ValueTag.XS_BOOLEAN_TAG);
         dOut.write((byte) 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/runtime/functions/castable/CastableAsStringOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsStringOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsStringOperation.java
index 2a34c62..ae6abdf 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsStringOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsStringOperation.java
@@ -29,12 +29,12 @@ import 
org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
 import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-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.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+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.UTF8StringPointable;
 
 public class CastableAsStringOperation extends AbstractCastableAsOperation {
 
@@ -174,4 +174,4 @@ public class CastableAsStringOperation extends 
AbstractCastableAsOperation {
         dOut.write(ValueTag.XS_BOOLEAN_TAG);
         dOut.write((byte) 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/runtime/functions/castable/CastableAsTimeOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsTimeOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsTimeOperation.java
index c9a8030..5c435c2 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsTimeOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsTimeOperation.java
@@ -25,8 +25,8 @@ import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.functions.cast.CastToTimeOperation;
 
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class CastableAsTimeOperation extends AbstractCastableAsOperation {
     private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -63,4 +63,4 @@ public class CastableAsTimeOperation extends 
AbstractCastableAsOperation {
         convertString(stringp, dOut);
     }
 
-}
\ 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/runtime/functions/castable/CastableAsUnsignedByteOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedByteOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedByteOperation.java
index be8eb17..0b7446b 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedByteOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedByteOperation.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.runtime.functions.castable;
 
 public class CastableAsUnsignedByteOperation extends CastableAsShortOperation {
 
-}
\ 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/runtime/functions/castable/CastableAsUnsignedIntOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedIntOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedIntOperation.java
index 63c69e1..0b96f5f 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedIntOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedIntOperation.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.runtime.functions.castable;
 
 public class CastableAsUnsignedIntOperation extends CastableAsIntegerOperation 
{
 
-}
\ 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/runtime/functions/castable/CastableAsUnsignedLongOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedLongOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedLongOperation.java
index 17a1ce4..3ab5278 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedLongOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedLongOperation.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.runtime.functions.castable;
 
 public class CastableAsUnsignedLongOperation extends 
CastableAsIntegerOperation {
 
-}
\ 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/runtime/functions/castable/CastableAsUnsignedShortOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedShortOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedShortOperation.java
index c3a7441..3445bcf 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedShortOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUnsignedShortOperation.java
@@ -18,4 +18,4 @@ package org.apache.vxquery.runtime.functions.castable;
 
 public class CastableAsUnsignedShortOperation extends CastableAsIntOperation {
 
-}
\ 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/runtime/functions/castable/CastableAsUntypedAtomicOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUntypedAtomicOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUntypedAtomicOperation.java
index 8d31990..b22185c 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUntypedAtomicOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsUntypedAtomicOperation.java
@@ -17,4 +17,4 @@
 package org.apache.vxquery.runtime.functions.castable;
 
 public class CastableAsUntypedAtomicOperation extends 
CastableAsStringOperation {
-}
\ 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/runtime/functions/castable/CastableAsYMDurationOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsYMDurationOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsYMDurationOperation.java
index 2beef20..46876bf 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsYMDurationOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableAsYMDurationOperation.java
@@ -24,10 +24,10 @@ import org.apache.vxquery.datamodel.values.ValueTag;
 import org.apache.vxquery.exceptions.SystemException;
 import org.apache.vxquery.runtime.functions.cast.CastToYMDurationOperation;
 
-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.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.IntegerPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class CastableAsYMDurationOperation extends AbstractCastableAsOperation 
{
     private ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage();
@@ -70,4 +70,4 @@ public class CastableAsYMDurationOperation extends 
AbstractCastableAsOperation {
         dOut.write((byte) 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/runtime/functions/castable/CastableScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableScalarEvaluatorFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableScalarEvaluatorFactory.java
index e93bb5c..b76c74a 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableScalarEvaluatorFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/castable/CastableScalarEvaluatorFactory.java
@@ -28,12 +28,12 @@ import 
org.apache.vxquery.runtime.functions.type.AbstractTypeScalarEvaluatorFact
 import org.apache.vxquery.types.BuiltinTypeRegistry;
 import org.apache.vxquery.types.SequenceType;
 
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class CastableScalarEvaluatorFactory extends 
AbstractTypeScalarEvaluatorFactory {
     private static final long serialVersionUID = 1L;
@@ -358,4 +358,4 @@ public class CastableScalarEvaluatorFactory extends 
AbstractTypeScalarEvaluatorF
         };
     }
 
-}
\ 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/runtime/functions/comparison/AbstractDisjunctiveComparisonOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractDisjunctiveComparisonOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractDisjunctiveComparisonOperation.java
index f00479b..05bf961 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractDisjunctiveComparisonOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractDisjunctiveComparisonOperation.java
@@ -28,12 +28,12 @@ import 
org.apache.vxquery.datamodel.accessors.atomic.XSQNamePointable;
 import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
 import org.apache.vxquery.exceptions.SystemException;
 
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-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.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+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.UTF8StringPointable;
 
 public abstract class AbstractDisjunctiveComparisonOperation extends 
AbstractValueComparisonOperation {
     final AbstractValueComparisonOperation aOp1 = 
createBaseComparisonOperation1();
@@ -326,4 +326,4 @@ public abstract class 
AbstractDisjunctiveComparisonOperation extends AbstractVal
             IOException {
         return (aOp1.operateYMDurationYMDuration(intp1, intp2) || 
aOp2.operateYMDurationYMDuration(intp1, intp2));
     }
-}
\ 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/runtime/functions/comparison/AbstractNegatingComparisonOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractNegatingComparisonOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractNegatingComparisonOperation.java
index 9976270..1c0b7ef 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractNegatingComparisonOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractNegatingComparisonOperation.java
@@ -28,12 +28,12 @@ import 
org.apache.vxquery.datamodel.accessors.atomic.XSQNamePointable;
 import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
 import org.apache.vxquery.exceptions.SystemException;
 
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-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.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+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.UTF8StringPointable;
 
 public abstract class AbstractNegatingComparisonOperation extends 
AbstractValueComparisonOperation {
     final AbstractValueComparisonOperation aOp = 
createBaseComparisonOperation();
@@ -316,4 +316,4 @@ public abstract class AbstractNegatingComparisonOperation 
extends AbstractValueC
         return !aOp.operateYMDurationYMDuration(intp1, intp2);
     }
 
-}
\ 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/runtime/functions/comparison/AbstractValueComparisonOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonOperation.java
index 7f29a25..61383ff 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonOperation.java
@@ -28,12 +28,12 @@ import 
org.apache.vxquery.datamodel.accessors.atomic.XSQNamePointable;
 import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
 import org.apache.vxquery.exceptions.SystemException;
 
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-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.UTF8StringPointable;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+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.UTF8StringPointable;
 
 public abstract class AbstractValueComparisonOperation {
     public abstract boolean operateAnyURIAnyURI(UTF8StringPointable stringp, 
UTF8StringPointable stringp2)
@@ -155,4 +155,4 @@ public abstract class AbstractValueComparisonOperation {
 
     public abstract boolean operateYMDurationYMDuration(IntegerPointable 
intp1, IntegerPointable intp2)
             throws SystemException, 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/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java
index a1ae69e..4d5eca2 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java
@@ -30,13 +30,13 @@ import 
org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal
 import 
org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory;
 import org.apache.vxquery.runtime.functions.util.FunctionHelper;
 
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.LongPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public abstract class AbstractValueComparisonScalarEvaluatorFactory extends
         AbstractTaggedValueArgumentScalarEvaluatorFactory {
@@ -138,4 +138,4 @@ public abstract class 
AbstractValueComparisonScalarEvaluatorFactory extends
     }
 
     protected abstract AbstractValueComparisonOperation 
createValueComparisonOperation();
-}
\ 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/runtime/functions/comparison/ValueEqComparisonOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonOperation.java
index 9e007b1..f4eb340 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonOperation.java
@@ -30,13 +30,13 @@ import 
org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable;
 import org.apache.vxquery.datamodel.util.DateTime;
 import org.apache.vxquery.exceptions.SystemException;
 
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-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.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+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.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class ValueEqComparisonOperation extends 
AbstractValueComparisonOperation {
     protected final ArrayBackedValueStorage abvsInner = new 
ArrayBackedValueStorage();
@@ -422,4 +422,4 @@ public class ValueEqComparisonOperation extends 
AbstractValueComparisonOperation
         return true;
     }
 
-}
\ 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/runtime/functions/comparison/ValueEqComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonScalarEvaluatorFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonScalarEvaluatorFactory.java
index fdddcb5..2ba5056 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonScalarEvaluatorFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueEqComparisonScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.vxquery.runtime.functions.comparison;
 
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
 
 public class ValueEqComparisonScalarEvaluatorFactory extends 
AbstractValueComparisonScalarEvaluatorFactory {
     private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class ValueEqComparisonScalarEvaluatorFactory extends 
AbstractValueCompar
     protected AbstractValueComparisonOperation 
createValueComparisonOperation() {
         return new ValueEqComparisonOperation();
     }
-}
\ 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/runtime/functions/comparison/ValueGeComparisonOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonOperation.java
index 4138572..d3197da 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonOperation.java
@@ -23,4 +23,4 @@ public class ValueGeComparisonOperation extends 
AbstractNegatingComparisonOperat
         return new ValueLtComparisonOperation();
     }
 
-}
\ 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/runtime/functions/comparison/ValueGeComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonScalarEvaluatorFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonScalarEvaluatorFactory.java
index 88e890d..3bbddfa 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonScalarEvaluatorFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGeComparisonScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.vxquery.runtime.functions.comparison;
 
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
 
 public class ValueGeComparisonScalarEvaluatorFactory extends 
AbstractValueComparisonScalarEvaluatorFactory {
     private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class ValueGeComparisonScalarEvaluatorFactory extends 
AbstractValueCompar
     protected AbstractValueComparisonOperation 
createValueComparisonOperation() {
         return new ValueGeComparisonOperation();
     }
-}
\ 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/runtime/functions/comparison/ValueGtComparisonOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonOperation.java
index 2852d2e..9017de2 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonOperation.java
@@ -23,4 +23,4 @@ public class ValueGtComparisonOperation extends 
AbstractNegatingComparisonOperat
         return new ValueLeComparisonOperation();
     }
 
-}
\ 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/runtime/functions/comparison/ValueGtComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonScalarEvaluatorFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonScalarEvaluatorFactory.java
index 0e39f72..7b87dce 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonScalarEvaluatorFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueGtComparisonScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.vxquery.runtime.functions.comparison;
 
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
 
 public class ValueGtComparisonScalarEvaluatorFactory extends 
AbstractValueComparisonScalarEvaluatorFactory {
     private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class ValueGtComparisonScalarEvaluatorFactory extends 
AbstractValueCompar
     protected AbstractValueComparisonOperation 
createValueComparisonOperation() {
         return new ValueGtComparisonOperation();
     }
-}
\ 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/runtime/functions/comparison/ValueLeComparisonOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonOperation.java
index 1810cec..6849e7a 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonOperation.java
@@ -28,4 +28,4 @@ public class ValueLeComparisonOperation extends 
AbstractDisjunctiveComparisonOpe
         return new ValueEqComparisonOperation();
     }
 
-}
\ 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/runtime/functions/comparison/ValueLeComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonScalarEvaluatorFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonScalarEvaluatorFactory.java
index eb464e8..00032be 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonScalarEvaluatorFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLeComparisonScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.vxquery.runtime.functions.comparison;
 
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
 
 public class ValueLeComparisonScalarEvaluatorFactory extends 
AbstractValueComparisonScalarEvaluatorFactory {
     private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class ValueLeComparisonScalarEvaluatorFactory extends 
AbstractValueCompar
     protected AbstractValueComparisonOperation 
createValueComparisonOperation() {
         return new ValueLeComparisonOperation();
     }
-}
\ 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/runtime/functions/comparison/ValueLtComparisonOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonOperation.java
index 512aa83..baa41a1 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonOperation.java
@@ -31,13 +31,13 @@ import org.apache.vxquery.datamodel.util.DateTime;
 import org.apache.vxquery.exceptions.ErrorCode;
 import org.apache.vxquery.exceptions.SystemException;
 
-import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable;
-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.UTF8StringPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.data.std.primitive.BooleanPointable;
+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.UTF8StringPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public class ValueLtComparisonOperation extends 
AbstractValueComparisonOperation {
     protected final ArrayBackedValueStorage abvsInner = new 
ArrayBackedValueStorage();
@@ -388,4 +388,4 @@ public class ValueLtComparisonOperation extends 
AbstractValueComparisonOperation
         return (intp1.compareTo(intp2) == -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/runtime/functions/comparison/ValueLtComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonScalarEvaluatorFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonScalarEvaluatorFactory.java
index dab381e..2182626 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonScalarEvaluatorFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueLtComparisonScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.vxquery.runtime.functions.comparison;
 
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
 
 public class ValueLtComparisonScalarEvaluatorFactory extends 
AbstractValueComparisonScalarEvaluatorFactory {
     private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class ValueLtComparisonScalarEvaluatorFactory extends 
AbstractValueCompar
     protected AbstractValueComparisonOperation 
createValueComparisonOperation() {
         return new ValueLtComparisonOperation();
     }
-}
\ 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/runtime/functions/comparison/ValueNeComparisonOperation.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonOperation.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonOperation.java
index d82b38d..8d36055 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonOperation.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonOperation.java
@@ -23,4 +23,4 @@ public class ValueNeComparisonOperation extends 
AbstractNegatingComparisonOperat
         return new ValueEqComparisonOperation();
     }
 
-}
\ 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/runtime/functions/comparison/ValueNeComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonScalarEvaluatorFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonScalarEvaluatorFactory.java
index 93e951c..5427f77 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonScalarEvaluatorFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/ValueNeComparisonScalarEvaluatorFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.vxquery.runtime.functions.comparison;
 
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
 
 public class ValueNeComparisonScalarEvaluatorFactory extends 
AbstractValueComparisonScalarEvaluatorFactory {
     private static final long serialVersionUID = 1L;
@@ -29,4 +29,4 @@ public class ValueNeComparisonScalarEvaluatorFactory extends 
AbstractValueCompar
     protected AbstractValueComparisonOperation 
createValueComparisonOperation() {
         return new ValueNeComparisonOperation();
     }
-}
\ 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/runtime/functions/comparison/general/AbstractGeneralComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/AbstractGeneralComparisonScalarEvaluatorFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/AbstractGeneralComparisonScalarEvaluatorFactory.java
index 99c4faa..cc1e117 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/AbstractGeneralComparisonScalarEvaluatorFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/AbstractGeneralComparisonScalarEvaluatorFactory.java
@@ -66,14 +66,14 @@ import 
org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOp
 import org.apache.vxquery.runtime.functions.util.AtomizeHelper;
 import org.apache.vxquery.runtime.functions.util.FunctionHelper;
 
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator;
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
-import edu.uci.ics.hyracks.api.context.IHyracksTaskContext;
-import edu.uci.ics.hyracks.data.std.api.IPointable;
-import edu.uci.ics.hyracks.data.std.primitive.DoublePointable;
-import edu.uci.ics.hyracks.data.std.primitive.VoidPointable;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.DoublePointable;
+import org.apache.hyracks.data.std.primitive.VoidPointable;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
 
 public abstract class AbstractGeneralComparisonScalarEvaluatorFactory extends
         AbstractTaggedValueArgumentScalarEvaluatorFactory {
@@ -384,4 +384,4 @@ public abstract class 
AbstractGeneralComparisonScalarEvaluatorFactory extends
     }
 
     protected abstract AbstractValueComparisonOperation 
createValueComparisonOperation();
-}
\ 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/runtime/functions/comparison/general/GeneralEqComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralEqComparisonScalarEvaluatorFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralEqComparisonScalarEvaluatorFactory.java
index d79c6b2..f30e262 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralEqComparisonScalarEvaluatorFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralEqComparisonScalarEvaluatorFactory.java
@@ -19,7 +19,7 @@ package 
org.apache.vxquery.runtime.functions.comparison.general;
 import 
org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation;
 import 
org.apache.vxquery.runtime.functions.comparison.ValueEqComparisonOperation;
 
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
 
 public class GeneralEqComparisonScalarEvaluatorFactory extends 
AbstractGeneralComparisonScalarEvaluatorFactory {
     private static final long serialVersionUID = 1L;
@@ -32,4 +32,4 @@ public class GeneralEqComparisonScalarEvaluatorFactory 
extends AbstractGeneralCo
     protected AbstractValueComparisonOperation 
createValueComparisonOperation() {
         return new ValueEqComparisonOperation();
     }
-}
\ 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/runtime/functions/comparison/general/GeneralGeComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralGeComparisonScalarEvaluatorFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralGeComparisonScalarEvaluatorFactory.java
index a9a1761..2829803 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralGeComparisonScalarEvaluatorFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralGeComparisonScalarEvaluatorFactory.java
@@ -19,7 +19,7 @@ package 
org.apache.vxquery.runtime.functions.comparison.general;
 import 
org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation;
 import 
org.apache.vxquery.runtime.functions.comparison.ValueGeComparisonOperation;
 
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
 
 public class GeneralGeComparisonScalarEvaluatorFactory extends 
AbstractGeneralComparisonScalarEvaluatorFactory {
     private static final long serialVersionUID = 1L;
@@ -32,4 +32,4 @@ public class GeneralGeComparisonScalarEvaluatorFactory 
extends AbstractGeneralCo
     protected AbstractValueComparisonOperation 
createValueComparisonOperation() {
         return new ValueGeComparisonOperation();
     }
-}
\ 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/runtime/functions/comparison/general/GeneralGtComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralGtComparisonScalarEvaluatorFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralGtComparisonScalarEvaluatorFactory.java
index 8ecf4b8..bcec218 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralGtComparisonScalarEvaluatorFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralGtComparisonScalarEvaluatorFactory.java
@@ -19,7 +19,7 @@ package 
org.apache.vxquery.runtime.functions.comparison.general;
 import 
org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation;
 import 
org.apache.vxquery.runtime.functions.comparison.ValueGtComparisonOperation;
 
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
 
 public class GeneralGtComparisonScalarEvaluatorFactory extends 
AbstractGeneralComparisonScalarEvaluatorFactory {
     private static final long serialVersionUID = 1L;
@@ -32,4 +32,4 @@ public class GeneralGtComparisonScalarEvaluatorFactory 
extends AbstractGeneralCo
     protected AbstractValueComparisonOperation 
createValueComparisonOperation() {
         return new ValueGtComparisonOperation();
     }
-}
\ 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/runtime/functions/comparison/general/GeneralLeComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralLeComparisonScalarEvaluatorFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralLeComparisonScalarEvaluatorFactory.java
index 84ce2a8..13239d6 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralLeComparisonScalarEvaluatorFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralLeComparisonScalarEvaluatorFactory.java
@@ -19,7 +19,7 @@ package 
org.apache.vxquery.runtime.functions.comparison.general;
 import 
org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation;
 import 
org.apache.vxquery.runtime.functions.comparison.ValueLeComparisonOperation;
 
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
 
 public class GeneralLeComparisonScalarEvaluatorFactory extends 
AbstractGeneralComparisonScalarEvaluatorFactory {
     private static final long serialVersionUID = 1L;
@@ -32,4 +32,4 @@ public class GeneralLeComparisonScalarEvaluatorFactory 
extends AbstractGeneralCo
     protected AbstractValueComparisonOperation 
createValueComparisonOperation() {
         return new ValueLeComparisonOperation();
     }
-}
\ 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/runtime/functions/comparison/general/GeneralLtComparisonScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralLtComparisonScalarEvaluatorFactory.java
 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralLtComparisonScalarEvaluatorFactory.java
index 0f9f7ba..33f91ad 100644
--- 
a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralLtComparisonScalarEvaluatorFactory.java
+++ 
b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/general/GeneralLtComparisonScalarEvaluatorFactory.java
@@ -19,7 +19,7 @@ package 
org.apache.vxquery.runtime.functions.comparison.general;
 import 
org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation;
 import 
org.apache.vxquery.runtime.functions.comparison.ValueLtComparisonOperation;
 
-import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
 
 public class GeneralLtComparisonScalarEvaluatorFactory extends 
AbstractGeneralComparisonScalarEvaluatorFactory {
     private static final long serialVersionUID = 1L;
@@ -32,4 +32,4 @@ public class GeneralLtComparisonScalarEvaluatorFactory 
extends AbstractGeneralCo
     protected AbstractValueComparisonOperation 
createValueComparisonOperation() {
         return new ValueLtComparisonOperation();
     }
-}
\ No newline at end of file
+}

Reply via email to