[10/51] [partial] incubator-asterixdb git commit: Change Java package from edu.uci.ics to org.apache

[im...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlPrinterFactoryProvider.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlPrinterFactoryProvider.java b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlPrinterFactoryProvider.java
index 6737837..1a60624 100644
--- a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlPrinterFactoryProvider.java
+++ b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlPrinterFactoryProvider.java
@@ -12,47 +12,47 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.formats.nontagged;
+package org.apache.asterix.formats.nontagged;
 
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.ABinaryPrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.ABooleanPrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.ACirclePrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.ADatePrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.ADateTimePrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.ADayTimeDurationPrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.ADoublePrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.ADurationPrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.AFloatPrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.AInt16PrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.AInt32PrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.AInt64PrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.AInt8PrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.AIntervalPrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.ALinePrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.ANullPrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.ANullableFieldPrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.AObjectPrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.AOrderedlistPrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.APoint3DPrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.APointPrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.APolygonPrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.ARecordPrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.ARectanglePrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.AStringPrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.ATimePrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.AUUIDPrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.AUnionPrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.AUnorderedlistPrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.AYearMonthDurationPrinterFactory;
-import edu.uci.ics.asterix.dataflow.data.nontagged.printers.ShortWithoutTypeInfoPrinterFactory;
-import edu.uci.ics.asterix.om.types.AOrderedListType;
-import edu.uci.ics.asterix.om.types.ARecordType;
-import edu.uci.ics.asterix.om.types.AUnionType;
-import edu.uci.ics.asterix.om.types.AUnorderedListType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.data.IPrinterFactory;
-import edu.uci.ics.hyracks.algebricks.data.IPrinterFactoryProvider;
+import org.apache.asterix.dataflow.data.nontagged.printers.ABinaryPrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.ABooleanPrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.ACirclePrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.ADatePrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.ADateTimePrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.ADayTimeDurationPrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.ADoublePrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.ADurationPrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.AFloatPrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.AInt16PrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.AInt32PrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.AInt64PrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.AInt8PrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.AIntervalPrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.ALinePrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.ANullPrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.ANullableFieldPrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.AObjectPrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.AOrderedlistPrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.APoint3DPrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.APointPrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.APolygonPrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.ARecordPrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.ARectanglePrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.AStringPrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.ATimePrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.AUUIDPrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.AUnionPrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.AUnorderedlistPrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.AYearMonthDurationPrinterFactory;
+import org.apache.asterix.dataflow.data.nontagged.printers.ShortWithoutTypeInfoPrinterFactory;
+import org.apache.asterix.om.types.AOrderedListType;
+import org.apache.asterix.om.types.ARecordType;
+import org.apache.asterix.om.types.AUnionType;
+import org.apache.asterix.om.types.AUnorderedListType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.algebricks.data.IPrinterFactoryProvider;
 
 public class AqlPrinterFactoryProvider implements IPrinterFactoryProvider {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlSerializerDeserializerProvider.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlSerializerDeserializerProvider.java b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlSerializerDeserializerProvider.java
index cd61730..1bf7515 100644
--- a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlSerializerDeserializerProvider.java
+++ b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlSerializerDeserializerProvider.java
@@ -12,55 +12,55 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.formats.nontagged;
+package org.apache.asterix.formats.nontagged;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.io.Serializable;
 
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.ABinarySerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.ABooleanSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.ACircleSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.ADateSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.ADateTimeSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.ADayTimeDurationSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.ADurationSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.AFloatSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.AIntervalSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.ALineSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.ANullSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.AObjectSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.AOrderedListSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.APoint3DSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.APointSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.APolygonSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.ARecordSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.ARectangleSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.AStringSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.ATimeSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.AUUIDSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.AUUIDStringSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.AUnorderedListSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.AYearMonthDurationSerializerDeserializer;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.SerializerDeserializerUtil;
-import edu.uci.ics.asterix.om.base.ANull;
-import edu.uci.ics.asterix.om.base.IAObject;
-import edu.uci.ics.asterix.om.types.AOrderedListType;
-import edu.uci.ics.asterix.om.types.ARecordType;
-import edu.uci.ics.asterix.om.types.ATypeTag;
-import edu.uci.ics.asterix.om.types.AUnorderedListType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.NotImplementedException;
-import edu.uci.ics.hyracks.algebricks.data.ISerializerDeserializerProvider;
-import edu.uci.ics.hyracks.api.dataflow.value.ISerializerDeserializer;
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.dataflow.common.data.marshalling.ShortSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.ABinarySerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.ABooleanSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.ACircleSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.ADateSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.ADateTimeSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.ADayTimeDurationSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.ADurationSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.AFloatSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.AIntervalSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.ALineSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.ANullSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.AObjectSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.AOrderedListSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.APoint3DSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.APointSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.APolygonSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.ARecordSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.ARectangleSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.AStringSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.ATimeSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.AUUIDSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.AUUIDStringSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.AUnorderedListSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.AYearMonthDurationSerializerDeserializer;
+import org.apache.asterix.dataflow.data.nontagged.serde.SerializerDeserializerUtil;
+import org.apache.asterix.om.base.ANull;
+import org.apache.asterix.om.base.IAObject;
+import org.apache.asterix.om.types.AOrderedListType;
+import org.apache.asterix.om.types.ARecordType;
+import org.apache.asterix.om.types.ATypeTag;
+import org.apache.asterix.om.types.AUnorderedListType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException;
+import org.apache.hyracks.algebricks.data.ISerializerDeserializerProvider;
+import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.dataflow.common.data.marshalling.ShortSerializerDeserializer;
 
 public class AqlSerializerDeserializerProvider implements ISerializerDeserializerProvider, Serializable {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlTypeTraitProvider.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlTypeTraitProvider.java b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlTypeTraitProvider.java
index 756dddc..c4347ff 100644
--- a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlTypeTraitProvider.java
+++ b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlTypeTraitProvider.java
@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.formats.nontagged;
+package org.apache.asterix.formats.nontagged;
 
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.hyracks.algebricks.data.ITypeTraitProvider;
-import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits;
+import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.data.ITypeTraitProvider;
+import org.apache.hyracks.api.dataflow.value.ITypeTraits;
 
 public class AqlTypeTraitProvider implements ITypeTraitProvider {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/NGramUTF8StringBinaryTokenizerFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/NGramUTF8StringBinaryTokenizerFactory.java b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/NGramUTF8StringBinaryTokenizerFactory.java
index 4993a08..a0d0336 100644
--- a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/NGramUTF8StringBinaryTokenizerFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/NGramUTF8StringBinaryTokenizerFactory.java
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.asterix.formats.nontagged;
+package org.apache.asterix.formats.nontagged;
 
-import edu.uci.ics.hyracks.storage.am.lsm.invertedindex.tokenizers.IBinaryTokenizer;
-import edu.uci.ics.hyracks.storage.am.lsm.invertedindex.tokenizers.IBinaryTokenizerFactory;
-import edu.uci.ics.hyracks.storage.am.lsm.invertedindex.tokenizers.ITokenFactory;
-import edu.uci.ics.hyracks.storage.am.lsm.invertedindex.tokenizers.NGramUTF8StringBinaryTokenizer;
+import org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers.IBinaryTokenizer;
+import org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers.IBinaryTokenizerFactory;
+import org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers.ITokenFactory;
+import org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers.NGramUTF8StringBinaryTokenizer;
 
 // TODO: Should be moved into Hyracks with the rest of the tokenizer code.
 public class NGramUTF8StringBinaryTokenizerFactory implements IBinaryTokenizerFactory {

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/UTF8StringLowercasePointable.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/UTF8StringLowercasePointable.java b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/UTF8StringLowercasePointable.java
index ddf530f..4876d7a 100644
--- a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/UTF8StringLowercasePointable.java
+++ b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/UTF8StringLowercasePointable.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.formats.nontagged;
-
-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.IPointable;
-import edu.uci.ics.hyracks.data.std.api.IPointableFactory;
-import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
+package org.apache.asterix.formats.nontagged;
+
+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.IPointable;
+import org.apache.hyracks.data.std.api.IPointableFactory;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
 
 // TODO: Perhaps this class should go into hyracks.
 public final class UTF8StringLowercasePointable extends AbstractPointable implements IHashable, IComparable {

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/ABinary.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/ABinary.java b/asterix-om/src/main/java/org/apache/asterix/om/base/ABinary.java
index b0b993c..b660693 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/ABinary.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/ABinary.java
@@ -12,14 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
-
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.dataflow.data.nontagged.serde.ABinarySerializerDeserializer;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
-import edu.uci.ics.hyracks.data.std.primitive.ByteArrayPointable;
+package org.apache.asterix.om.base;
+
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.dataflow.data.nontagged.serde.ABinarySerializerDeserializer;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
+import org.apache.hyracks.data.std.primitive.ByteArrayPointable;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/ABitArray.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/ABitArray.java b/asterix-om/src/main/java/org/apache/asterix/om/base/ABitArray.java
index 61bf2e7..ee46e66 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/ABitArray.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/ABitArray.java
@@ -12,16 +12,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public final class ABitArray implements IAObject {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/ABoolean.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/ABoolean.java b/asterix-om/src/main/java/org/apache/asterix/om/base/ABoolean.java
index a779dea..d41edff 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/ABoolean.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/ABoolean.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public final class ABoolean implements IAObject {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/ACircle.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/ACircle.java b/asterix-om/src/main/java/org/apache/asterix/om/base/ACircle.java
index b323a99..20edace 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/ACircle.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/ACircle.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class ACircle implements IAObject {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/ACollectionCursor.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/ACollectionCursor.java b/asterix-om/src/main/java/org/apache/asterix/om/base/ACollectionCursor.java
index 3c316a3..5d0f86e 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/ACollectionCursor.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/ACollectionCursor.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import java.util.ArrayList;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/ADate.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/ADate.java b/asterix-om/src/main/java/org/apache/asterix/om/base/ADate.java
index 6b18375..9d22ca3 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/ADate.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/ADate.java
@@ -12,18 +12,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import java.io.IOException;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.base.temporal.GregorianCalendarSystem;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.base.temporal.GregorianCalendarSystem;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 /**
  * ADate type represents dates in a gregorian calendar system.

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/ADateTime.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/ADateTime.java b/asterix-om/src/main/java/org/apache/asterix/om/base/ADateTime.java
index 46653e3..fa03a77 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/ADateTime.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/ADateTime.java
@@ -12,18 +12,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import java.io.IOException;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.base.temporal.GregorianCalendarSystem;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.base.temporal.GregorianCalendarSystem;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 /**
  * ADateTime type represents the timestamp values.

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/ADayTimeDuration.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/ADayTimeDuration.java b/asterix-om/src/main/java/org/apache/asterix/om/base/ADayTimeDuration.java
index 2f80796..2c9ab85 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/ADayTimeDuration.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/ADayTimeDuration.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class ADayTimeDuration implements IAObject {
 
@@ -35,7 +35,7 @@ public class ADayTimeDuration implements IAObject {
     }
 
     /* (non-Javadoc)
-     * @see edu.uci.ics.hyracks.api.dataflow.value.JSONSerializable#toJSON()
+     * @see org.apache.hyracks.api.dataflow.value.JSONSerializable#toJSON()
      */
     @Override
     public JSONObject toJSON() throws JSONException {
@@ -49,7 +49,7 @@ public class ADayTimeDuration implements IAObject {
     }
 
     /* (non-Javadoc)
-     * @see edu.uci.ics.asterix.om.base.IAObject#getType()
+     * @see org.apache.asterix.om.base.IAObject#getType()
      */
     @Override
     public IAType getType() {
@@ -57,7 +57,7 @@ public class ADayTimeDuration implements IAObject {
     }
 
     /* (non-Javadoc)
-     * @see edu.uci.ics.asterix.om.base.IAObject#accept(edu.uci.ics.asterix.om.visitors.IOMVisitor)
+     * @see org.apache.asterix.om.base.IAObject#accept(org.apache.asterix.om.visitors.IOMVisitor)
      */
     @Override
     public void accept(IOMVisitor visitor) throws AsterixException {
@@ -65,7 +65,7 @@ public class ADayTimeDuration implements IAObject {
     }
 
     /* (non-Javadoc)
-     * @see edu.uci.ics.asterix.om.base.IAObject#deepEqual(edu.uci.ics.asterix.om.base.IAObject)
+     * @see org.apache.asterix.om.base.IAObject#deepEqual(org.apache.asterix.om.base.IAObject)
      */
     @Override
     public boolean deepEqual(IAObject obj) {
@@ -73,7 +73,7 @@ public class ADayTimeDuration implements IAObject {
     }
 
     /* (non-Javadoc)
-     * @see edu.uci.ics.asterix.om.base.IAObject#hash()
+     * @see org.apache.asterix.om.base.IAObject#hash()
      */
     @Override
     public int hash() {

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/ADouble.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/ADouble.java b/asterix-om/src/main/java/org/apache/asterix/om/base/ADouble.java
index 079fa19..bb39755 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/ADouble.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/ADouble.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class ADouble implements IAObject {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/ADuration.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/ADuration.java b/asterix-om/src/main/java/org/apache/asterix/om/base/ADuration.java
index 217273e..e440910 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/ADuration.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/ADuration.java
@@ -12,16 +12,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.base.temporal.GregorianCalendarSystem;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.base.temporal.GregorianCalendarSystem;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 /**
  * ADuration type represents time duration (unanchored time length) values.

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AFloat.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AFloat.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AFloat.java
index 1fe4380..1c4aedd 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AFloat.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AFloat.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class AFloat implements IAObject {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AInt16.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AInt16.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AInt16.java
index 911a5ee..21e6c46 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AInt16.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AInt16.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class AInt16 implements IAObject {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AInt32.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AInt32.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AInt32.java
index da9e6b1..3b6d352 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AInt32.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AInt32.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class AInt32 implements IAObject {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AInt64.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AInt64.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AInt64.java
index a7d1381..752010d 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AInt64.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AInt64.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class AInt64 implements IAObject {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AInt8.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AInt8.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AInt8.java
index 007e9ba..038af84 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AInt8.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AInt8.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class AInt8 implements IAObject {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AInterval.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AInterval.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AInterval.java
index 3372b08..db71b35 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AInterval.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AInterval.java
@@ -12,19 +12,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import java.io.IOException;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.base.temporal.GregorianCalendarSystem;
-import edu.uci.ics.asterix.om.types.ATypeTag;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.base.temporal.GregorianCalendarSystem;
+import org.apache.asterix.om.types.ATypeTag;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class AInterval implements IAObject {
 
@@ -39,7 +39,7 @@ public class AInterval implements IAObject {
     }
 
     /* (non-Javadoc)
-     * @see edu.uci.ics.asterix.om.base.IAObject#getType()
+     * @see org.apache.asterix.om.base.IAObject#getType()
      */
     @Override
     public IAType getType() {
@@ -75,7 +75,7 @@ public class AInterval implements IAObject {
     }
 
     /* (non-Javadoc)
-     * @see edu.uci.ics.asterix.om.base.IAObject#accept(edu.uci.ics.asterix.om.visitors.IOMVisitor)
+     * @see org.apache.asterix.om.base.IAObject#accept(org.apache.asterix.om.visitors.IOMVisitor)
      */
     @Override
     public void accept(IOMVisitor visitor) throws AsterixException {
@@ -83,7 +83,7 @@ public class AInterval implements IAObject {
     }
 
     /* (non-Javadoc)
-     * @see edu.uci.ics.asterix.om.base.IAObject#deepEqual(edu.uci.ics.asterix.om.base.IAObject)
+     * @see org.apache.asterix.om.base.IAObject#deepEqual(org.apache.asterix.om.base.IAObject)
      */
     @Override
     public boolean deepEqual(IAObject obj) {
@@ -91,7 +91,7 @@ public class AInterval implements IAObject {
     }
 
     /* (non-Javadoc)
-     * @see edu.uci.ics.asterix.om.base.IAObject#hash()
+     * @see org.apache.asterix.om.base.IAObject#hash()
      */
     @Override
     public int hash() {

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/ALine.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/ALine.java b/asterix-om/src/main/java/org/apache/asterix/om/base/ALine.java
index c4c8005..46a4361 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/ALine.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/ALine.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class ALine implements IAObject {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableBinary.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableBinary.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableBinary.java
index 14c7e1e..11ad80d 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableBinary.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableBinary.java
@@ -13,7 +13,7 @@
  *  limitations under the License.
  */
 
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutableBinary extends ABinary {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableCircle.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableCircle.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableCircle.java
index 1b06862..a5afcc6 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableCircle.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableCircle.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutableCircle extends ACircle {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDate.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDate.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDate.java
index daf3a2f..ddc6750 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDate.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDate.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutableDate extends ADate {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDateTime.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDateTime.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDateTime.java
index d09fbb9..ea21f44 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDateTime.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDateTime.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutableDateTime extends ADateTime {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDayTimeDuration.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDayTimeDuration.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDayTimeDuration.java
index 0dd41c4..84126b3 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDayTimeDuration.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDayTimeDuration.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutableDayTimeDuration extends ADayTimeDuration {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDouble.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDouble.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDouble.java
index ff11373..28f402f 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDouble.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDouble.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutableDouble extends ADouble {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDuration.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDuration.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDuration.java
index 6d49d24..27a2911 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDuration.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableDuration.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutableDuration extends ADuration {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableFloat.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableFloat.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableFloat.java
index 3012a4e..a9afb52 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableFloat.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableFloat.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutableFloat extends AFloat {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt16.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt16.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt16.java
index 8bbe31d..a7111ac 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt16.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt16.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutableInt16 extends AInt16 {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt32.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt32.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt32.java
index 56f20f0..1057f26 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt32.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt32.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutableInt32 extends AInt32 {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt64.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt64.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt64.java
index 602d3d6..7a86605 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt64.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt64.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutableInt64 extends AInt64 {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt8.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt8.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt8.java
index 56a9b89..fa18400 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt8.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInt8.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutableInt8 extends AInt8 {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInterval.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInterval.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInterval.java
index d79dbfa..13574ba 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInterval.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableInterval.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
 
 public class AMutableInterval extends AInterval {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableLine.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableLine.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableLine.java
index e335505..8d0576b 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableLine.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableLine.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutableLine extends ALine {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableOrderedList.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableOrderedList.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableOrderedList.java
index 60fb02e..0b0159d 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableOrderedList.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableOrderedList.java
@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import java.util.ArrayList;
 
-import edu.uci.ics.asterix.om.types.AOrderedListType;
+import org.apache.asterix.om.types.AOrderedListType;
 
 public class AMutableOrderedList extends AOrderedList {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutablePoint.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutablePoint.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutablePoint.java
index 145bbc7..59e49a5 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutablePoint.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutablePoint.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutablePoint extends APoint {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutablePoint3D.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutablePoint3D.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutablePoint3D.java
index 0dc6970..6a00703 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutablePoint3D.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutablePoint3D.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutablePoint3D extends APoint3D {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutablePolygon.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutablePolygon.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutablePolygon.java
index 22a6c37..f103bc5 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutablePolygon.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutablePolygon.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutablePolygon extends APolygon {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableRecord.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableRecord.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableRecord.java
index d644788..6f69cf4 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableRecord.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableRecord.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
-import edu.uci.ics.asterix.om.types.ARecordType;
+import org.apache.asterix.om.types.ARecordType;
 
 public class AMutableRecord extends ARecord {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableRectangle.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableRectangle.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableRectangle.java
index b5d6800..98e007b 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableRectangle.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableRectangle.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutableRectangle extends ARectangle {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableString.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableString.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableString.java
index b93c879..77b9805 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableString.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableString.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutableString extends AString {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableTime.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableTime.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableTime.java
index 1bc5aaa..0f20e92 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableTime.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableTime.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutableTime extends ATime {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableUUID.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableUUID.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableUUID.java
index b603092..f96ad0f 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableUUID.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableUUID.java
@@ -13,7 +13,7 @@
  *  limitations under the License.
  */
 
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutableUUID extends AUUID {
     private final long[] uuidBits;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableUnorderedList.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableUnorderedList.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableUnorderedList.java
index 2644cbb..780dab3 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableUnorderedList.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableUnorderedList.java
@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import java.util.ArrayList;
 
-import edu.uci.ics.asterix.om.types.AUnorderedListType;
+import org.apache.asterix.om.types.AUnorderedListType;
 
 public final class AMutableUnorderedList extends AUnorderedList {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableYearMonthDuration.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableYearMonthDuration.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableYearMonthDuration.java
index bd678ef..b52794b 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableYearMonthDuration.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AMutableYearMonthDuration.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class AMutableYearMonthDuration extends AYearMonthDuration {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/ANull.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/ANull.java b/asterix-om/src/main/java/org/apache/asterix/om/base/ANull.java
index 0ab086f..1be4d58 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/ANull.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/ANull.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 // We should avoid representing nulls explicitly. This class is for cases when it is
 // harder not to.

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AOrderedList.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AOrderedList.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AOrderedList.java
index 6281d1c..1eb313e 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AOrderedList.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AOrderedList.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,11 +21,11 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.AOrderedListType;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.AOrderedListType;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class AOrderedList implements IACollection {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/APoint.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/APoint.java b/asterix-om/src/main/java/org/apache/asterix/om/base/APoint.java
index ddbb2f7..543c81f 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/APoint.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/APoint.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class APoint implements IAObject {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/APoint3D.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/APoint3D.java b/asterix-om/src/main/java/org/apache/asterix/om/base/APoint3D.java
index f68b285..89f07ce 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/APoint3D.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/APoint3D.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class APoint3D implements IAObject {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/APolygon.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/APolygon.java b/asterix-om/src/main/java/org/apache/asterix/om/base/APolygon.java
index 81a0b3b..a867967 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/APolygon.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/APolygon.java
@@ -12,16 +12,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class APolygon implements IAObject {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/ARecord.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/ARecord.java b/asterix-om/src/main/java/org/apache/asterix/om/base/ARecord.java
index f5587ab..246e094 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/ARecord.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/ARecord.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.ARecordType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.ARecordType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class ARecord implements IAObject {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/ARectangle.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/ARectangle.java b/asterix-om/src/main/java/org/apache/asterix/om/base/ARectangle.java
index 56d7b7e..836f4cd 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/ARectangle.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/ARectangle.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class ARectangle implements IAObject {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AString.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AString.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AString.java
index 20f6001..26cde3c 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AString.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AString.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class AString implements IAObject {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/ATime.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/ATime.java b/asterix-om/src/main/java/org/apache/asterix/om/base/ATime.java
index db24bac..a2f3ebf 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/ATime.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/ATime.java
@@ -12,18 +12,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import java.io.IOException;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.base.temporal.GregorianCalendarSystem;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.base.temporal.GregorianCalendarSystem;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class ATime implements IAObject {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AUUID.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AUUID.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AUUID.java
index 2fe7c1e..c20909b 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AUUID.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AUUID.java
@@ -13,7 +13,7 @@
  *  limitations under the License.
  */
 
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import java.security.SecureRandom;
 import java.util.UUID;
@@ -21,10 +21,10 @@ import java.util.UUID;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class AUUID implements IAObject {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AUnorderedList.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AUnorderedList.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AUnorderedList.java
index 52249bf..c2c126a 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AUnorderedList.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AUnorderedList.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import java.util.ArrayList;
 
@@ -20,10 +20,10 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.AUnorderedListType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.AUnorderedListType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class AUnorderedList implements IACollection {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/AYearMonthDuration.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/AYearMonthDuration.java b/asterix-om/src/main/java/org/apache/asterix/om/base/AYearMonthDuration.java
index 63f5b95..da4d421 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/AYearMonthDuration.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/AYearMonthDuration.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 /**
  * AYearMonthDuration represents the duration in the unit of months.
@@ -43,7 +43,7 @@ public class AYearMonthDuration implements IAObject {
     }
 
     /* (non-Javadoc)
-     * @see edu.uci.ics.hyracks.api.dataflow.value.JSONSerializable#toJSON()
+     * @see org.apache.hyracks.api.dataflow.value.JSONSerializable#toJSON()
      */
     @Override
     public JSONObject toJSON() throws JSONException {
@@ -57,7 +57,7 @@ public class AYearMonthDuration implements IAObject {
     }
 
     /* (non-Javadoc)
-     * @see edu.uci.ics.asterix.om.base.IAObject#getType()
+     * @see org.apache.asterix.om.base.IAObject#getType()
      */
     @Override
     public IAType getType() {
@@ -65,7 +65,7 @@ public class AYearMonthDuration implements IAObject {
     }
 
     /* (non-Javadoc)
-     * @see edu.uci.ics.asterix.om.base.IAObject#accept(edu.uci.ics.asterix.om.visitors.IOMVisitor)
+     * @see org.apache.asterix.om.base.IAObject#accept(org.apache.asterix.om.visitors.IOMVisitor)
      */
     @Override
     public void accept(IOMVisitor visitor) throws AsterixException {
@@ -73,7 +73,7 @@ public class AYearMonthDuration implements IAObject {
     }
 
     /* (non-Javadoc)
-     * @see edu.uci.ics.asterix.om.base.IAObject#deepEqual(edu.uci.ics.asterix.om.base.IAObject)
+     * @see org.apache.asterix.om.base.IAObject#deepEqual(org.apache.asterix.om.base.IAObject)
      */
     @Override
     public boolean deepEqual(IAObject obj) {
@@ -81,7 +81,7 @@ public class AYearMonthDuration implements IAObject {
     }
 
     /* (non-Javadoc)
-     * @see edu.uci.ics.asterix.om.base.IAObject#hash()
+     * @see org.apache.asterix.om.base.IAObject#hash()
      */
     @Override
     public int hash() {

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/IACollection.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/IACollection.java b/asterix-om/src/main/java/org/apache/asterix/om/base/IACollection.java
index 92e9fd7..1dd712e 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/IACollection.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/IACollection.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public interface IACollection extends IAObject {
     /** may be expensive for certain list implementations */

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/IACursor.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/IACursor.java b/asterix-om/src/main/java/org/apache/asterix/om/base/IACursor.java
index 4a1efe4..f00f250 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/IACursor.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/IACursor.java
@@ -15,7 +15,7 @@
 /**
  *
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 /**
  * @author Nicola

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/IAObject.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/IAObject.java b/asterix-om/src/main/java/org/apache/asterix/om/base/IAObject.java
index 60a6dd9..e44dd95 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/IAObject.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/IAObject.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
-import edu.uci.ics.hyracks.api.dataflow.value.JSONSerializable;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
+import org.apache.hyracks.api.dataflow.value.JSONSerializable;
 
 /**
  * Represents an object in Asterix.

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/InMemUtils.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/InMemUtils.java b/asterix-om/src/main/java/org/apache/asterix/om/base/InMemUtils.java
index bef31dc..2d70a6c 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/InMemUtils.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/InMemUtils.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 public class InMemUtils {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-om/src/main/java/org/apache/asterix/om/base/ShortWithoutTypeInfo.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/om/base/ShortWithoutTypeInfo.java b/asterix-om/src/main/java/org/apache/asterix/om/base/ShortWithoutTypeInfo.java
index 8957263..5759cea 100644
--- a/asterix-om/src/main/java/org/apache/asterix/om/base/ShortWithoutTypeInfo.java
+++ b/asterix-om/src/main/java/org/apache/asterix/om/base/ShortWithoutTypeInfo.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.om.base;
+package org.apache.asterix.om.base;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.asterix.om.types.IAType;
-import edu.uci.ics.asterix.om.visitors.IOMVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.om.visitors.IOMVisitor;
 
 public class ShortWithoutTypeInfo implements IAObject {