You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by im...@apache.org on 2015/08/25 18:45:11 UTC

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

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-aql/src/main/java/org/apache/asterix/aql/literal/TrueLiteral.java
----------------------------------------------------------------------
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/literal/TrueLiteral.java b/asterix-aql/src/main/java/org/apache/asterix/aql/literal/TrueLiteral.java
index 97c6b73..27114de 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/literal/TrueLiteral.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/literal/TrueLiteral.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.literal;
+package org.apache.asterix.aql.literal;
 
-import edu.uci.ics.asterix.aql.base.Literal;
+import org.apache.asterix.aql.base.Literal;
 
 public class TrueLiteral extends Literal {
     private static final long serialVersionUID = -8513245514578847512L;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-aql/src/main/java/org/apache/asterix/aql/parser/ScopeChecker.java
----------------------------------------------------------------------
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/parser/ScopeChecker.java b/asterix-aql/src/main/java/org/apache/asterix/aql/parser/ScopeChecker.java
index ef2112a..6f3e99d 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/parser/ScopeChecker.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/parser/ScopeChecker.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.parser;
+package org.apache.asterix.aql.parser;
 
 import java.util.List;
 import java.util.Stack;
 
-import edu.uci.ics.asterix.aql.context.Scope;
-import edu.uci.ics.asterix.aql.expression.Identifier;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.Counter;
+import org.apache.asterix.aql.context.Scope;
+import org.apache.asterix.aql.expression.Identifier;
+import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.hyracks.algebricks.core.algebra.base.Counter;
 
 public abstract class ScopeChecker {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/AqlRewriter.java
----------------------------------------------------------------------
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/AqlRewriter.java b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/AqlRewriter.java
index 618160a..39b68f3 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/AqlRewriter.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/AqlRewriter.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.rewrites;
+package org.apache.asterix.aql.rewrites;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -21,77 +21,77 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.base.Expression.Kind;
-import edu.uci.ics.asterix.aql.expression.CallExpr;
-import edu.uci.ics.asterix.aql.expression.CompactStatement;
-import edu.uci.ics.asterix.aql.expression.ConnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateDataverseStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFeedPolicyStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFunctionStatement;
-import edu.uci.ics.asterix.aql.expression.CreateIndexStatement;
-import edu.uci.ics.asterix.aql.expression.CreatePrimaryFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateSecondaryFeedStatement;
-import edu.uci.ics.asterix.aql.expression.DatasetDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDropStatement;
-import edu.uci.ics.asterix.aql.expression.DeleteStatement;
-import edu.uci.ics.asterix.aql.expression.DisconnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.DistinctClause;
-import edu.uci.ics.asterix.aql.expression.DropStatement;
-import edu.uci.ics.asterix.aql.expression.FLWOGRExpression;
-import edu.uci.ics.asterix.aql.expression.FeedDropStatement;
-import edu.uci.ics.asterix.aql.expression.FeedPolicyDropStatement;
-import edu.uci.ics.asterix.aql.expression.FieldAccessor;
-import edu.uci.ics.asterix.aql.expression.FieldBinding;
-import edu.uci.ics.asterix.aql.expression.ForClause;
-import edu.uci.ics.asterix.aql.expression.FunctionDecl;
-import edu.uci.ics.asterix.aql.expression.FunctionDropStatement;
-import edu.uci.ics.asterix.aql.expression.GbyVariableExpressionPair;
-import edu.uci.ics.asterix.aql.expression.GroupbyClause;
-import edu.uci.ics.asterix.aql.expression.IfExpr;
-import edu.uci.ics.asterix.aql.expression.IndexAccessor;
-import edu.uci.ics.asterix.aql.expression.IndexDropStatement;
-import edu.uci.ics.asterix.aql.expression.InsertStatement;
-import edu.uci.ics.asterix.aql.expression.LetClause;
-import edu.uci.ics.asterix.aql.expression.LimitClause;
-import edu.uci.ics.asterix.aql.expression.ListConstructor;
-import edu.uci.ics.asterix.aql.expression.LiteralExpr;
-import edu.uci.ics.asterix.aql.expression.LoadStatement;
-import edu.uci.ics.asterix.aql.expression.NodeGroupDropStatement;
-import edu.uci.ics.asterix.aql.expression.NodegroupDecl;
-import edu.uci.ics.asterix.aql.expression.OperatorExpr;
-import edu.uci.ics.asterix.aql.expression.OrderbyClause;
-import edu.uci.ics.asterix.aql.expression.OrderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.QuantifiedExpression;
-import edu.uci.ics.asterix.aql.expression.QuantifiedPair;
-import edu.uci.ics.asterix.aql.expression.Query;
-import edu.uci.ics.asterix.aql.expression.RecordConstructor;
-import edu.uci.ics.asterix.aql.expression.RecordTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.SetStatement;
-import edu.uci.ics.asterix.aql.expression.TypeDecl;
-import edu.uci.ics.asterix.aql.expression.TypeDropStatement;
-import edu.uci.ics.asterix.aql.expression.TypeReferenceExpression;
-import edu.uci.ics.asterix.aql.expression.UnaryExpr;
-import edu.uci.ics.asterix.aql.expression.UnionExpr;
-import edu.uci.ics.asterix.aql.expression.UnorderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.UpdateClause;
-import edu.uci.ics.asterix.aql.expression.UpdateStatement;
-import edu.uci.ics.asterix.aql.expression.VarIdentifier;
-import edu.uci.ics.asterix.aql.expression.VariableExpr;
-import edu.uci.ics.asterix.aql.expression.WhereClause;
-import edu.uci.ics.asterix.aql.expression.WriteStatement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.util.FunctionUtils;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
-import edu.uci.ics.asterix.metadata.MetadataManager;
-import edu.uci.ics.asterix.metadata.MetadataTransactionContext;
-import edu.uci.ics.asterix.metadata.declared.AqlMetadataProvider;
-import edu.uci.ics.asterix.metadata.entities.Function;
-import edu.uci.ics.asterix.om.functions.AsterixBuiltinFunctions;
-import edu.uci.ics.asterix.om.functions.AsterixFunction;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.Expression.Kind;
+import org.apache.asterix.aql.expression.CallExpr;
+import org.apache.asterix.aql.expression.CompactStatement;
+import org.apache.asterix.aql.expression.ConnectFeedStatement;
+import org.apache.asterix.aql.expression.CreateDataverseStatement;
+import org.apache.asterix.aql.expression.CreateFeedPolicyStatement;
+import org.apache.asterix.aql.expression.CreateFunctionStatement;
+import org.apache.asterix.aql.expression.CreateIndexStatement;
+import org.apache.asterix.aql.expression.CreatePrimaryFeedStatement;
+import org.apache.asterix.aql.expression.CreateSecondaryFeedStatement;
+import org.apache.asterix.aql.expression.DatasetDecl;
+import org.apache.asterix.aql.expression.DataverseDecl;
+import org.apache.asterix.aql.expression.DataverseDropStatement;
+import org.apache.asterix.aql.expression.DeleteStatement;
+import org.apache.asterix.aql.expression.DisconnectFeedStatement;
+import org.apache.asterix.aql.expression.DistinctClause;
+import org.apache.asterix.aql.expression.DropStatement;
+import org.apache.asterix.aql.expression.FLWOGRExpression;
+import org.apache.asterix.aql.expression.FeedDropStatement;
+import org.apache.asterix.aql.expression.FeedPolicyDropStatement;
+import org.apache.asterix.aql.expression.FieldAccessor;
+import org.apache.asterix.aql.expression.FieldBinding;
+import org.apache.asterix.aql.expression.ForClause;
+import org.apache.asterix.aql.expression.FunctionDecl;
+import org.apache.asterix.aql.expression.FunctionDropStatement;
+import org.apache.asterix.aql.expression.GbyVariableExpressionPair;
+import org.apache.asterix.aql.expression.GroupbyClause;
+import org.apache.asterix.aql.expression.IfExpr;
+import org.apache.asterix.aql.expression.IndexAccessor;
+import org.apache.asterix.aql.expression.IndexDropStatement;
+import org.apache.asterix.aql.expression.InsertStatement;
+import org.apache.asterix.aql.expression.LetClause;
+import org.apache.asterix.aql.expression.LimitClause;
+import org.apache.asterix.aql.expression.ListConstructor;
+import org.apache.asterix.aql.expression.LiteralExpr;
+import org.apache.asterix.aql.expression.LoadStatement;
+import org.apache.asterix.aql.expression.NodeGroupDropStatement;
+import org.apache.asterix.aql.expression.NodegroupDecl;
+import org.apache.asterix.aql.expression.OperatorExpr;
+import org.apache.asterix.aql.expression.OrderbyClause;
+import org.apache.asterix.aql.expression.OrderedListTypeDefinition;
+import org.apache.asterix.aql.expression.QuantifiedExpression;
+import org.apache.asterix.aql.expression.QuantifiedPair;
+import org.apache.asterix.aql.expression.Query;
+import org.apache.asterix.aql.expression.RecordConstructor;
+import org.apache.asterix.aql.expression.RecordTypeDefinition;
+import org.apache.asterix.aql.expression.SetStatement;
+import org.apache.asterix.aql.expression.TypeDecl;
+import org.apache.asterix.aql.expression.TypeDropStatement;
+import org.apache.asterix.aql.expression.TypeReferenceExpression;
+import org.apache.asterix.aql.expression.UnaryExpr;
+import org.apache.asterix.aql.expression.UnionExpr;
+import org.apache.asterix.aql.expression.UnorderedListTypeDefinition;
+import org.apache.asterix.aql.expression.UpdateClause;
+import org.apache.asterix.aql.expression.UpdateStatement;
+import org.apache.asterix.aql.expression.VarIdentifier;
+import org.apache.asterix.aql.expression.VariableExpr;
+import org.apache.asterix.aql.expression.WhereClause;
+import org.apache.asterix.aql.expression.WriteStatement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.util.FunctionUtils;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.metadata.MetadataManager;
+import org.apache.asterix.metadata.MetadataTransactionContext;
+import org.apache.asterix.metadata.declared.AqlMetadataProvider;
+import org.apache.asterix.metadata.entities.Function;
+import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
+import org.apache.asterix.om.functions.AsterixFunction;
 
 public final class AqlRewriter {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/AqlRewritingContext.java
----------------------------------------------------------------------
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/AqlRewritingContext.java b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/AqlRewritingContext.java
index 449da2e..990f4a1 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/AqlRewritingContext.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/AqlRewritingContext.java
@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.rewrites;
+package org.apache.asterix.aql.rewrites;
 
 import java.util.HashMap;
 
-import edu.uci.ics.asterix.aql.expression.VarIdentifier;
+import org.apache.asterix.aql.expression.VarIdentifier;
 
 public final class AqlRewritingContext {
     private int varCounter;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/CloneAndSubstituteVariablesVisitor.java
----------------------------------------------------------------------
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/CloneAndSubstituteVariablesVisitor.java b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/CloneAndSubstituteVariablesVisitor.java
index 6dd2f9c..6b9b44d 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/CloneAndSubstituteVariablesVisitor.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/CloneAndSubstituteVariablesVisitor.java
@@ -12,76 +12,76 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.rewrites;
+package org.apache.asterix.aql.rewrites;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.base.IAqlExpression;
-import edu.uci.ics.asterix.aql.expression.CallExpr;
-import edu.uci.ics.asterix.aql.expression.CompactStatement;
-import edu.uci.ics.asterix.aql.expression.ConnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateDataverseStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFeedPolicyStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFunctionStatement;
-import edu.uci.ics.asterix.aql.expression.CreateIndexStatement;
-import edu.uci.ics.asterix.aql.expression.CreatePrimaryFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateSecondaryFeedStatement;
-import edu.uci.ics.asterix.aql.expression.DatasetDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDropStatement;
-import edu.uci.ics.asterix.aql.expression.DeleteStatement;
-import edu.uci.ics.asterix.aql.expression.DisconnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.DistinctClause;
-import edu.uci.ics.asterix.aql.expression.DropStatement;
-import edu.uci.ics.asterix.aql.expression.FLWOGRExpression;
-import edu.uci.ics.asterix.aql.expression.FeedDropStatement;
-import edu.uci.ics.asterix.aql.expression.FeedPolicyDropStatement;
-import edu.uci.ics.asterix.aql.expression.FieldAccessor;
-import edu.uci.ics.asterix.aql.expression.FieldBinding;
-import edu.uci.ics.asterix.aql.expression.ForClause;
-import edu.uci.ics.asterix.aql.expression.FunctionDecl;
-import edu.uci.ics.asterix.aql.expression.FunctionDropStatement;
-import edu.uci.ics.asterix.aql.expression.GbyVariableExpressionPair;
-import edu.uci.ics.asterix.aql.expression.GroupbyClause;
-import edu.uci.ics.asterix.aql.expression.IfExpr;
-import edu.uci.ics.asterix.aql.expression.IndexAccessor;
-import edu.uci.ics.asterix.aql.expression.IndexDropStatement;
-import edu.uci.ics.asterix.aql.expression.InsertStatement;
-import edu.uci.ics.asterix.aql.expression.LetClause;
-import edu.uci.ics.asterix.aql.expression.LimitClause;
-import edu.uci.ics.asterix.aql.expression.ListConstructor;
-import edu.uci.ics.asterix.aql.expression.LiteralExpr;
-import edu.uci.ics.asterix.aql.expression.LoadStatement;
-import edu.uci.ics.asterix.aql.expression.NodeGroupDropStatement;
-import edu.uci.ics.asterix.aql.expression.NodegroupDecl;
-import edu.uci.ics.asterix.aql.expression.OperatorExpr;
-import edu.uci.ics.asterix.aql.expression.OrderbyClause;
-import edu.uci.ics.asterix.aql.expression.OrderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.QuantifiedExpression;
-import edu.uci.ics.asterix.aql.expression.QuantifiedPair;
-import edu.uci.ics.asterix.aql.expression.Query;
-import edu.uci.ics.asterix.aql.expression.RecordConstructor;
-import edu.uci.ics.asterix.aql.expression.RecordTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.SetStatement;
-import edu.uci.ics.asterix.aql.expression.TypeDecl;
-import edu.uci.ics.asterix.aql.expression.TypeDropStatement;
-import edu.uci.ics.asterix.aql.expression.TypeReferenceExpression;
-import edu.uci.ics.asterix.aql.expression.UnaryExpr;
-import edu.uci.ics.asterix.aql.expression.UnionExpr;
-import edu.uci.ics.asterix.aql.expression.UnorderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.UpdateClause;
-import edu.uci.ics.asterix.aql.expression.UpdateStatement;
-import edu.uci.ics.asterix.aql.expression.VarIdentifier;
-import edu.uci.ics.asterix.aql.expression.VariableExpr;
-import edu.uci.ics.asterix.aql.expression.WhereClause;
-import edu.uci.ics.asterix.aql.expression.WriteStatement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.IAqlExpression;
+import org.apache.asterix.aql.expression.CallExpr;
+import org.apache.asterix.aql.expression.CompactStatement;
+import org.apache.asterix.aql.expression.ConnectFeedStatement;
+import org.apache.asterix.aql.expression.CreateDataverseStatement;
+import org.apache.asterix.aql.expression.CreateFeedPolicyStatement;
+import org.apache.asterix.aql.expression.CreateFunctionStatement;
+import org.apache.asterix.aql.expression.CreateIndexStatement;
+import org.apache.asterix.aql.expression.CreatePrimaryFeedStatement;
+import org.apache.asterix.aql.expression.CreateSecondaryFeedStatement;
+import org.apache.asterix.aql.expression.DatasetDecl;
+import org.apache.asterix.aql.expression.DataverseDecl;
+import org.apache.asterix.aql.expression.DataverseDropStatement;
+import org.apache.asterix.aql.expression.DeleteStatement;
+import org.apache.asterix.aql.expression.DisconnectFeedStatement;
+import org.apache.asterix.aql.expression.DistinctClause;
+import org.apache.asterix.aql.expression.DropStatement;
+import org.apache.asterix.aql.expression.FLWOGRExpression;
+import org.apache.asterix.aql.expression.FeedDropStatement;
+import org.apache.asterix.aql.expression.FeedPolicyDropStatement;
+import org.apache.asterix.aql.expression.FieldAccessor;
+import org.apache.asterix.aql.expression.FieldBinding;
+import org.apache.asterix.aql.expression.ForClause;
+import org.apache.asterix.aql.expression.FunctionDecl;
+import org.apache.asterix.aql.expression.FunctionDropStatement;
+import org.apache.asterix.aql.expression.GbyVariableExpressionPair;
+import org.apache.asterix.aql.expression.GroupbyClause;
+import org.apache.asterix.aql.expression.IfExpr;
+import org.apache.asterix.aql.expression.IndexAccessor;
+import org.apache.asterix.aql.expression.IndexDropStatement;
+import org.apache.asterix.aql.expression.InsertStatement;
+import org.apache.asterix.aql.expression.LetClause;
+import org.apache.asterix.aql.expression.LimitClause;
+import org.apache.asterix.aql.expression.ListConstructor;
+import org.apache.asterix.aql.expression.LiteralExpr;
+import org.apache.asterix.aql.expression.LoadStatement;
+import org.apache.asterix.aql.expression.NodeGroupDropStatement;
+import org.apache.asterix.aql.expression.NodegroupDecl;
+import org.apache.asterix.aql.expression.OperatorExpr;
+import org.apache.asterix.aql.expression.OrderbyClause;
+import org.apache.asterix.aql.expression.OrderedListTypeDefinition;
+import org.apache.asterix.aql.expression.QuantifiedExpression;
+import org.apache.asterix.aql.expression.QuantifiedPair;
+import org.apache.asterix.aql.expression.Query;
+import org.apache.asterix.aql.expression.RecordConstructor;
+import org.apache.asterix.aql.expression.RecordTypeDefinition;
+import org.apache.asterix.aql.expression.SetStatement;
+import org.apache.asterix.aql.expression.TypeDecl;
+import org.apache.asterix.aql.expression.TypeDropStatement;
+import org.apache.asterix.aql.expression.TypeReferenceExpression;
+import org.apache.asterix.aql.expression.UnaryExpr;
+import org.apache.asterix.aql.expression.UnionExpr;
+import org.apache.asterix.aql.expression.UnorderedListTypeDefinition;
+import org.apache.asterix.aql.expression.UpdateClause;
+import org.apache.asterix.aql.expression.UpdateStatement;
+import org.apache.asterix.aql.expression.VarIdentifier;
+import org.apache.asterix.aql.expression.VariableExpr;
+import org.apache.asterix.aql.expression.WhereClause;
+import org.apache.asterix.aql.expression.WriteStatement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.hyracks.algebricks.common.utils.Pair;
 
 public class CloneAndSubstituteVariablesVisitor implements
         IAqlExpressionVisitor<Pair<IAqlExpression, List<VariableSubstitution>>, List<VariableSubstitution>> {

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/InlineUdfsVisitor.java
----------------------------------------------------------------------
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/InlineUdfsVisitor.java b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/InlineUdfsVisitor.java
index cb63a8f..d94dbf9 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/InlineUdfsVisitor.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/InlineUdfsVisitor.java
@@ -12,78 +12,78 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.rewrites;
+package org.apache.asterix.aql.rewrites;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.base.Expression.Kind;
-import edu.uci.ics.asterix.aql.base.IAqlExpression;
-import edu.uci.ics.asterix.aql.expression.CallExpr;
-import edu.uci.ics.asterix.aql.expression.CompactStatement;
-import edu.uci.ics.asterix.aql.expression.ConnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateDataverseStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFeedPolicyStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFunctionStatement;
-import edu.uci.ics.asterix.aql.expression.CreateIndexStatement;
-import edu.uci.ics.asterix.aql.expression.CreatePrimaryFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateSecondaryFeedStatement;
-import edu.uci.ics.asterix.aql.expression.DatasetDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDropStatement;
-import edu.uci.ics.asterix.aql.expression.DeleteStatement;
-import edu.uci.ics.asterix.aql.expression.DisconnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.DistinctClause;
-import edu.uci.ics.asterix.aql.expression.DropStatement;
-import edu.uci.ics.asterix.aql.expression.FLWOGRExpression;
-import edu.uci.ics.asterix.aql.expression.FeedDropStatement;
-import edu.uci.ics.asterix.aql.expression.FeedPolicyDropStatement;
-import edu.uci.ics.asterix.aql.expression.FieldAccessor;
-import edu.uci.ics.asterix.aql.expression.FieldBinding;
-import edu.uci.ics.asterix.aql.expression.ForClause;
-import edu.uci.ics.asterix.aql.expression.FunctionDecl;
-import edu.uci.ics.asterix.aql.expression.FunctionDropStatement;
-import edu.uci.ics.asterix.aql.expression.GbyVariableExpressionPair;
-import edu.uci.ics.asterix.aql.expression.GroupbyClause;
-import edu.uci.ics.asterix.aql.expression.IfExpr;
-import edu.uci.ics.asterix.aql.expression.IndexAccessor;
-import edu.uci.ics.asterix.aql.expression.IndexDropStatement;
-import edu.uci.ics.asterix.aql.expression.InsertStatement;
-import edu.uci.ics.asterix.aql.expression.LetClause;
-import edu.uci.ics.asterix.aql.expression.LimitClause;
-import edu.uci.ics.asterix.aql.expression.ListConstructor;
-import edu.uci.ics.asterix.aql.expression.LiteralExpr;
-import edu.uci.ics.asterix.aql.expression.LoadStatement;
-import edu.uci.ics.asterix.aql.expression.NodeGroupDropStatement;
-import edu.uci.ics.asterix.aql.expression.NodegroupDecl;
-import edu.uci.ics.asterix.aql.expression.OperatorExpr;
-import edu.uci.ics.asterix.aql.expression.OrderbyClause;
-import edu.uci.ics.asterix.aql.expression.OrderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.QuantifiedExpression;
-import edu.uci.ics.asterix.aql.expression.QuantifiedPair;
-import edu.uci.ics.asterix.aql.expression.Query;
-import edu.uci.ics.asterix.aql.expression.RecordConstructor;
-import edu.uci.ics.asterix.aql.expression.RecordTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.SetStatement;
-import edu.uci.ics.asterix.aql.expression.TypeDecl;
-import edu.uci.ics.asterix.aql.expression.TypeDropStatement;
-import edu.uci.ics.asterix.aql.expression.TypeReferenceExpression;
-import edu.uci.ics.asterix.aql.expression.UnaryExpr;
-import edu.uci.ics.asterix.aql.expression.UnionExpr;
-import edu.uci.ics.asterix.aql.expression.UnorderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.UpdateClause;
-import edu.uci.ics.asterix.aql.expression.UpdateStatement;
-import edu.uci.ics.asterix.aql.expression.VarIdentifier;
-import edu.uci.ics.asterix.aql.expression.VariableExpr;
-import edu.uci.ics.asterix.aql.expression.WhereClause;
-import edu.uci.ics.asterix.aql.expression.WriteStatement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
-import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.Expression.Kind;
+import org.apache.asterix.aql.base.IAqlExpression;
+import org.apache.asterix.aql.expression.CallExpr;
+import org.apache.asterix.aql.expression.CompactStatement;
+import org.apache.asterix.aql.expression.ConnectFeedStatement;
+import org.apache.asterix.aql.expression.CreateDataverseStatement;
+import org.apache.asterix.aql.expression.CreateFeedPolicyStatement;
+import org.apache.asterix.aql.expression.CreateFunctionStatement;
+import org.apache.asterix.aql.expression.CreateIndexStatement;
+import org.apache.asterix.aql.expression.CreatePrimaryFeedStatement;
+import org.apache.asterix.aql.expression.CreateSecondaryFeedStatement;
+import org.apache.asterix.aql.expression.DatasetDecl;
+import org.apache.asterix.aql.expression.DataverseDecl;
+import org.apache.asterix.aql.expression.DataverseDropStatement;
+import org.apache.asterix.aql.expression.DeleteStatement;
+import org.apache.asterix.aql.expression.DisconnectFeedStatement;
+import org.apache.asterix.aql.expression.DistinctClause;
+import org.apache.asterix.aql.expression.DropStatement;
+import org.apache.asterix.aql.expression.FLWOGRExpression;
+import org.apache.asterix.aql.expression.FeedDropStatement;
+import org.apache.asterix.aql.expression.FeedPolicyDropStatement;
+import org.apache.asterix.aql.expression.FieldAccessor;
+import org.apache.asterix.aql.expression.FieldBinding;
+import org.apache.asterix.aql.expression.ForClause;
+import org.apache.asterix.aql.expression.FunctionDecl;
+import org.apache.asterix.aql.expression.FunctionDropStatement;
+import org.apache.asterix.aql.expression.GbyVariableExpressionPair;
+import org.apache.asterix.aql.expression.GroupbyClause;
+import org.apache.asterix.aql.expression.IfExpr;
+import org.apache.asterix.aql.expression.IndexAccessor;
+import org.apache.asterix.aql.expression.IndexDropStatement;
+import org.apache.asterix.aql.expression.InsertStatement;
+import org.apache.asterix.aql.expression.LetClause;
+import org.apache.asterix.aql.expression.LimitClause;
+import org.apache.asterix.aql.expression.ListConstructor;
+import org.apache.asterix.aql.expression.LiteralExpr;
+import org.apache.asterix.aql.expression.LoadStatement;
+import org.apache.asterix.aql.expression.NodeGroupDropStatement;
+import org.apache.asterix.aql.expression.NodegroupDecl;
+import org.apache.asterix.aql.expression.OperatorExpr;
+import org.apache.asterix.aql.expression.OrderbyClause;
+import org.apache.asterix.aql.expression.OrderedListTypeDefinition;
+import org.apache.asterix.aql.expression.QuantifiedExpression;
+import org.apache.asterix.aql.expression.QuantifiedPair;
+import org.apache.asterix.aql.expression.Query;
+import org.apache.asterix.aql.expression.RecordConstructor;
+import org.apache.asterix.aql.expression.RecordTypeDefinition;
+import org.apache.asterix.aql.expression.SetStatement;
+import org.apache.asterix.aql.expression.TypeDecl;
+import org.apache.asterix.aql.expression.TypeDropStatement;
+import org.apache.asterix.aql.expression.TypeReferenceExpression;
+import org.apache.asterix.aql.expression.UnaryExpr;
+import org.apache.asterix.aql.expression.UnionExpr;
+import org.apache.asterix.aql.expression.UnorderedListTypeDefinition;
+import org.apache.asterix.aql.expression.UpdateClause;
+import org.apache.asterix.aql.expression.UpdateStatement;
+import org.apache.asterix.aql.expression.VarIdentifier;
+import org.apache.asterix.aql.expression.VariableExpr;
+import org.apache.asterix.aql.expression.WhereClause;
+import org.apache.asterix.aql.expression.WriteStatement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.hyracks.algebricks.common.utils.Pair;
 
 public class InlineUdfsVisitor implements IAqlExpressionVisitor<Boolean, List<FunctionDecl>> {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/VariableSubstitution.java
----------------------------------------------------------------------
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/VariableSubstitution.java b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/VariableSubstitution.java
index 74f9a1a..71c3b4a 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/VariableSubstitution.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/VariableSubstitution.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.rewrites;
+package org.apache.asterix.aql.rewrites;
 
-import edu.uci.ics.asterix.aql.expression.VarIdentifier;
+import org.apache.asterix.aql.expression.VarIdentifier;
 
 public final class VariableSubstitution {
     private final VarIdentifier oldVar;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-aql/src/main/java/org/apache/asterix/aql/util/FunctionUtils.java
----------------------------------------------------------------------
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/util/FunctionUtils.java b/asterix-aql/src/main/java/org/apache/asterix/aql/util/FunctionUtils.java
index f850a8d..1f10020 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/util/FunctionUtils.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/util/FunctionUtils.java
@@ -13,23 +13,23 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.asterix.aql.util;
+package org.apache.asterix.aql.util;
 
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.FunctionDecl;
-import edu.uci.ics.asterix.aql.expression.VarIdentifier;
-import edu.uci.ics.asterix.aql.parser.AQLParser;
-import edu.uci.ics.asterix.aql.parser.ParseException;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
-import edu.uci.ics.asterix.metadata.entities.Function;
-import edu.uci.ics.asterix.om.functions.AsterixBuiltinFunctions;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.FunctionDecl;
+import org.apache.asterix.aql.expression.VarIdentifier;
+import org.apache.asterix.aql.parser.AQLParser;
+import org.apache.asterix.aql.parser.ParseException;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.metadata.entities.Function;
+import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
 
 public class FunctionUtils {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-aql/src/main/java/org/apache/asterix/aql/util/RangeMapBuilder.java
----------------------------------------------------------------------
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/util/RangeMapBuilder.java b/asterix-aql/src/main/java/org/apache/asterix/aql/util/RangeMapBuilder.java
index 223358c..4336f13 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/util/RangeMapBuilder.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/util/RangeMapBuilder.java
@@ -12,43 +12,43 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.util;
+package org.apache.asterix.aql.util;
 
 import java.io.DataOutput;
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.base.Expression.Kind;
-import edu.uci.ics.asterix.aql.base.Literal;
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.ListConstructor;
-import edu.uci.ics.asterix.aql.expression.LiteralExpr;
-import edu.uci.ics.asterix.aql.expression.Query;
-import edu.uci.ics.asterix.aql.literal.DoubleLiteral;
-import edu.uci.ics.asterix.aql.literal.FloatLiteral;
-import edu.uci.ics.asterix.aql.literal.IntegerLiteral;
-import edu.uci.ics.asterix.aql.literal.LongIntegerLiteral;
-import edu.uci.ics.asterix.aql.literal.StringLiteral;
-import edu.uci.ics.asterix.aql.parser.AQLParser;
-import edu.uci.ics.asterix.aql.parser.ParseException;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider;
-import edu.uci.ics.asterix.formats.nontagged.AqlSerializerDeserializerProvider;
-import edu.uci.ics.asterix.om.base.AMutableDouble;
-import edu.uci.ics.asterix.om.base.AMutableFloat;
-import edu.uci.ics.asterix.om.base.AMutableInt32;
-import edu.uci.ics.asterix.om.base.AMutableInt64;
-import edu.uci.ics.asterix.om.base.AMutableString;
-import edu.uci.ics.asterix.om.types.ATypeTag;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.NotImplementedException;
-import edu.uci.ics.hyracks.api.dataflow.value.IBinaryComparator;
-import edu.uci.ics.hyracks.api.dataflow.value.IBinaryComparatorFactory;
-import edu.uci.ics.hyracks.api.dataflow.value.ISerializerDeserializer;
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
-import edu.uci.ics.hyracks.dataflow.common.data.partition.range.IRangeMap;
-import edu.uci.ics.hyracks.dataflow.common.data.partition.range.RangeMap;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.Expression.Kind;
+import org.apache.asterix.aql.base.Literal;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.ListConstructor;
+import org.apache.asterix.aql.expression.LiteralExpr;
+import org.apache.asterix.aql.expression.Query;
+import org.apache.asterix.aql.literal.DoubleLiteral;
+import org.apache.asterix.aql.literal.FloatLiteral;
+import org.apache.asterix.aql.literal.IntegerLiteral;
+import org.apache.asterix.aql.literal.LongIntegerLiteral;
+import org.apache.asterix.aql.literal.StringLiteral;
+import org.apache.asterix.aql.parser.AQLParser;
+import org.apache.asterix.aql.parser.ParseException;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider;
+import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider;
+import org.apache.asterix.om.base.AMutableDouble;
+import org.apache.asterix.om.base.AMutableFloat;
+import org.apache.asterix.om.base.AMutableInt32;
+import org.apache.asterix.om.base.AMutableInt64;
+import org.apache.asterix.om.base.AMutableString;
+import org.apache.asterix.om.types.ATypeTag;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException;
+import org.apache.hyracks.api.dataflow.value.IBinaryComparator;
+import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
+import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.dataflow.common.data.partition.range.IRangeMap;
+import org.apache.hyracks.dataflow.common.data.partition.range.RangeMap;
 
 public abstract class RangeMapBuilder {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-aql/src/main/javacc/AQL.jj
----------------------------------------------------------------------
diff --git a/asterix-aql/src/main/javacc/AQL.jj b/asterix-aql/src/main/javacc/AQL.jj
index 52d2b83..0aab549 100644
--- a/asterix-aql/src/main/javacc/AQL.jj
+++ b/asterix-aql/src/main/javacc/AQL.jj
@@ -8,7 +8,7 @@ options {
 
 PARSER_BEGIN(AQLParser)
 
-package edu.uci.ics.asterix.aql.parser;
+package org.apache.asterix.aql.parser;
 
 // For AQLParserTokenManager
 import org.apache.xerces.util.IntStack;
@@ -27,111 +27,111 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.base.Literal;
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.context.RootScopeFactory;
-import edu.uci.ics.asterix.aql.context.Scope;
-import edu.uci.ics.asterix.aql.expression.AbstractAccessor;
-import edu.uci.ics.asterix.aql.expression.CallExpr;
-import edu.uci.ics.asterix.aql.expression.CompactStatement;
-import edu.uci.ics.asterix.aql.expression.ConnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFeedPolicyStatement;
-import edu.uci.ics.asterix.aql.expression.CreatePrimaryFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateSecondaryFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateDataverseStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFunctionStatement;
-import edu.uci.ics.asterix.aql.expression.CreateIndexStatement;
-import edu.uci.ics.asterix.aql.expression.DatasetDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDropStatement;
-import edu.uci.ics.asterix.aql.expression.DeleteStatement;
-import edu.uci.ics.asterix.aql.expression.DisconnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.DistinctClause;
-import edu.uci.ics.asterix.aql.expression.DropStatement;
-import edu.uci.ics.asterix.aql.expression.ExternalDetailsDecl;
-import edu.uci.ics.asterix.aql.expression.FLWOGRExpression;
-import edu.uci.ics.asterix.aql.expression.FeedDropStatement;
-import edu.uci.ics.asterix.aql.expression.FieldAccessor;
-import edu.uci.ics.asterix.aql.expression.FieldBinding;
-import edu.uci.ics.asterix.aql.expression.ForClause;
-import edu.uci.ics.asterix.aql.expression.FunctionDecl;
-import edu.uci.ics.asterix.aql.expression.FunctionDropStatement;
-import edu.uci.ics.asterix.aql.expression.GbyVariableExpressionPair;
-import edu.uci.ics.asterix.aql.expression.GroupbyClause;
-import edu.uci.ics.asterix.aql.expression.Identifier;
-import edu.uci.ics.asterix.aql.expression.IfExpr;
-import edu.uci.ics.asterix.aql.expression.IndexAccessor;
-import edu.uci.ics.asterix.aql.expression.IndexDropStatement;
-import edu.uci.ics.asterix.aql.expression.InsertStatement;
-import edu.uci.ics.asterix.aql.expression.InternalDetailsDecl;
-import edu.uci.ics.asterix.aql.expression.LetClause;
-import edu.uci.ics.asterix.aql.expression.LimitClause;
-import edu.uci.ics.asterix.aql.expression.ListConstructor;
-import edu.uci.ics.asterix.aql.expression.LiteralExpr;
-import edu.uci.ics.asterix.aql.expression.LoadStatement;
-import edu.uci.ics.asterix.aql.expression.NodeGroupDropStatement;
-import edu.uci.ics.asterix.aql.expression.NodegroupDecl;
-import edu.uci.ics.asterix.aql.expression.OperatorExpr;
-import edu.uci.ics.asterix.aql.expression.OrderbyClause;
-import edu.uci.ics.asterix.aql.expression.OrderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.QuantifiedExpression;
-import edu.uci.ics.asterix.aql.expression.QuantifiedPair;
-import edu.uci.ics.asterix.aql.expression.Query;
-import edu.uci.ics.asterix.aql.expression.RecordConstructor;
-import edu.uci.ics.asterix.aql.expression.RecordTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.RefreshExternalDatasetStatement;
-import edu.uci.ics.asterix.aql.expression.RunStatement;
-import edu.uci.ics.asterix.aql.expression.SetStatement;
-import edu.uci.ics.asterix.aql.expression.TypeDecl;
-import edu.uci.ics.asterix.aql.expression.TypeDropStatement;
-import edu.uci.ics.asterix.aql.expression.TypeExpression;
-import edu.uci.ics.asterix.aql.expression.TypeReferenceExpression;
-import edu.uci.ics.asterix.aql.expression.UnaryExpr;
-import edu.uci.ics.asterix.aql.expression.UnaryExpr.Sign;
-import edu.uci.ics.asterix.aql.expression.UnionExpr;
-import edu.uci.ics.asterix.aql.expression.UnorderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.UpdateClause;
-import edu.uci.ics.asterix.aql.expression.UpdateStatement;
-import edu.uci.ics.asterix.aql.expression.VarIdentifier;
-import edu.uci.ics.asterix.aql.expression.VariableExpr;
-import edu.uci.ics.asterix.aql.expression.WhereClause;
-import edu.uci.ics.asterix.aql.expression.WriteStatement;
-import edu.uci.ics.asterix.aql.literal.DoubleLiteral;
-import edu.uci.ics.asterix.aql.literal.FalseLiteral;
-import edu.uci.ics.asterix.aql.literal.FloatLiteral;
-import edu.uci.ics.asterix.aql.literal.LongIntegerLiteral;
-import edu.uci.ics.asterix.aql.literal.NullLiteral;
-import edu.uci.ics.asterix.aql.literal.StringLiteral;
-import edu.uci.ics.asterix.aql.literal.TrueLiteral;
-import edu.uci.ics.asterix.aql.util.RangeMapBuilder;
-import edu.uci.ics.asterix.common.annotations.AutoDataGen;
-import edu.uci.ics.asterix.common.annotations.DateBetweenYearsDataGen;
-import edu.uci.ics.asterix.common.annotations.DatetimeAddRandHoursDataGen;
-import edu.uci.ics.asterix.common.annotations.DatetimeBetweenYearsDataGen;
-import edu.uci.ics.asterix.common.annotations.FieldIntervalDataGen;
-import edu.uci.ics.asterix.common.annotations.FieldValFileDataGen;
-import edu.uci.ics.asterix.common.annotations.FieldValFileSameIndexDataGen;
-import edu.uci.ics.asterix.common.annotations.IRecordFieldDataGen;
-import edu.uci.ics.asterix.common.annotations.InsertRandIntDataGen;
-import edu.uci.ics.asterix.common.annotations.ListDataGen;
-import edu.uci.ics.asterix.common.annotations.ListValFileDataGen;
-import edu.uci.ics.asterix.common.annotations.SkipSecondaryIndexSearchExpressionAnnotation;
-import edu.uci.ics.asterix.common.annotations.TypeDataGen;
-import edu.uci.ics.asterix.common.annotations.UndeclaredFieldsDataGen;
-import edu.uci.ics.asterix.common.config.DatasetConfig.DatasetType;
-import edu.uci.ics.asterix.common.config.DatasetConfig.IndexType;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
-import edu.uci.ics.asterix.metadata.bootstrap.MetadataConstants;
-import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
-import edu.uci.ics.hyracks.algebricks.common.utils.Triple;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionAnnotation;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IndexedNLJoinExpressionAnnotation;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
-import edu.uci.ics.hyracks.dataflow.common.data.partition.range.IRangeMap;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.Literal;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.context.RootScopeFactory;
+import org.apache.asterix.aql.context.Scope;
+import org.apache.asterix.aql.expression.AbstractAccessor;
+import org.apache.asterix.aql.expression.CallExpr;
+import org.apache.asterix.aql.expression.CompactStatement;
+import org.apache.asterix.aql.expression.ConnectFeedStatement;
+import org.apache.asterix.aql.expression.CreateFeedPolicyStatement;
+import org.apache.asterix.aql.expression.CreatePrimaryFeedStatement;
+import org.apache.asterix.aql.expression.CreateSecondaryFeedStatement;
+import org.apache.asterix.aql.expression.CreateDataverseStatement;
+import org.apache.asterix.aql.expression.CreateFeedStatement;
+import org.apache.asterix.aql.expression.CreateFunctionStatement;
+import org.apache.asterix.aql.expression.CreateIndexStatement;
+import org.apache.asterix.aql.expression.DatasetDecl;
+import org.apache.asterix.aql.expression.DataverseDecl;
+import org.apache.asterix.aql.expression.DataverseDropStatement;
+import org.apache.asterix.aql.expression.DeleteStatement;
+import org.apache.asterix.aql.expression.DisconnectFeedStatement;
+import org.apache.asterix.aql.expression.DistinctClause;
+import org.apache.asterix.aql.expression.DropStatement;
+import org.apache.asterix.aql.expression.ExternalDetailsDecl;
+import org.apache.asterix.aql.expression.FLWOGRExpression;
+import org.apache.asterix.aql.expression.FeedDropStatement;
+import org.apache.asterix.aql.expression.FieldAccessor;
+import org.apache.asterix.aql.expression.FieldBinding;
+import org.apache.asterix.aql.expression.ForClause;
+import org.apache.asterix.aql.expression.FunctionDecl;
+import org.apache.asterix.aql.expression.FunctionDropStatement;
+import org.apache.asterix.aql.expression.GbyVariableExpressionPair;
+import org.apache.asterix.aql.expression.GroupbyClause;
+import org.apache.asterix.aql.expression.Identifier;
+import org.apache.asterix.aql.expression.IfExpr;
+import org.apache.asterix.aql.expression.IndexAccessor;
+import org.apache.asterix.aql.expression.IndexDropStatement;
+import org.apache.asterix.aql.expression.InsertStatement;
+import org.apache.asterix.aql.expression.InternalDetailsDecl;
+import org.apache.asterix.aql.expression.LetClause;
+import org.apache.asterix.aql.expression.LimitClause;
+import org.apache.asterix.aql.expression.ListConstructor;
+import org.apache.asterix.aql.expression.LiteralExpr;
+import org.apache.asterix.aql.expression.LoadStatement;
+import org.apache.asterix.aql.expression.NodeGroupDropStatement;
+import org.apache.asterix.aql.expression.NodegroupDecl;
+import org.apache.asterix.aql.expression.OperatorExpr;
+import org.apache.asterix.aql.expression.OrderbyClause;
+import org.apache.asterix.aql.expression.OrderedListTypeDefinition;
+import org.apache.asterix.aql.expression.QuantifiedExpression;
+import org.apache.asterix.aql.expression.QuantifiedPair;
+import org.apache.asterix.aql.expression.Query;
+import org.apache.asterix.aql.expression.RecordConstructor;
+import org.apache.asterix.aql.expression.RecordTypeDefinition;
+import org.apache.asterix.aql.expression.RefreshExternalDatasetStatement;
+import org.apache.asterix.aql.expression.RunStatement;
+import org.apache.asterix.aql.expression.SetStatement;
+import org.apache.asterix.aql.expression.TypeDecl;
+import org.apache.asterix.aql.expression.TypeDropStatement;
+import org.apache.asterix.aql.expression.TypeExpression;
+import org.apache.asterix.aql.expression.TypeReferenceExpression;
+import org.apache.asterix.aql.expression.UnaryExpr;
+import org.apache.asterix.aql.expression.UnaryExpr.Sign;
+import org.apache.asterix.aql.expression.UnionExpr;
+import org.apache.asterix.aql.expression.UnorderedListTypeDefinition;
+import org.apache.asterix.aql.expression.UpdateClause;
+import org.apache.asterix.aql.expression.UpdateStatement;
+import org.apache.asterix.aql.expression.VarIdentifier;
+import org.apache.asterix.aql.expression.VariableExpr;
+import org.apache.asterix.aql.expression.WhereClause;
+import org.apache.asterix.aql.expression.WriteStatement;
+import org.apache.asterix.aql.literal.DoubleLiteral;
+import org.apache.asterix.aql.literal.FalseLiteral;
+import org.apache.asterix.aql.literal.FloatLiteral;
+import org.apache.asterix.aql.literal.LongIntegerLiteral;
+import org.apache.asterix.aql.literal.NullLiteral;
+import org.apache.asterix.aql.literal.StringLiteral;
+import org.apache.asterix.aql.literal.TrueLiteral;
+import org.apache.asterix.aql.util.RangeMapBuilder;
+import org.apache.asterix.common.annotations.AutoDataGen;
+import org.apache.asterix.common.annotations.DateBetweenYearsDataGen;
+import org.apache.asterix.common.annotations.DatetimeAddRandHoursDataGen;
+import org.apache.asterix.common.annotations.DatetimeBetweenYearsDataGen;
+import org.apache.asterix.common.annotations.FieldIntervalDataGen;
+import org.apache.asterix.common.annotations.FieldValFileDataGen;
+import org.apache.asterix.common.annotations.FieldValFileSameIndexDataGen;
+import org.apache.asterix.common.annotations.IRecordFieldDataGen;
+import org.apache.asterix.common.annotations.InsertRandIntDataGen;
+import org.apache.asterix.common.annotations.ListDataGen;
+import org.apache.asterix.common.annotations.ListValFileDataGen;
+import org.apache.asterix.common.annotations.SkipSecondaryIndexSearchExpressionAnnotation;
+import org.apache.asterix.common.annotations.TypeDataGen;
+import org.apache.asterix.common.annotations.UndeclaredFieldsDataGen;
+import org.apache.asterix.common.config.DatasetConfig.DatasetType;
+import org.apache.asterix.common.config.DatasetConfig.IndexType;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.metadata.bootstrap.MetadataConstants;
+import org.apache.hyracks.algebricks.common.utils.Pair;
+import org.apache.hyracks.algebricks.common.utils.Triple;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionAnnotation;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IndexedNLJoinExpressionAnnotation;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.dataflow.common.data.partition.range.IRangeMap;
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/pom.xml
----------------------------------------------------------------------
diff --git a/asterix-common/pom.xml b/asterix-common/pom.xml
index 3afba1e..dcef054 100644
--- a/asterix-common/pom.xml
+++ b/asterix-common/pom.xml
@@ -11,7 +11,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>asterix</artifactId>
-		<groupId>edu.uci.ics.asterix</groupId>
+		<groupId>org.apache.asterix</groupId>
 		<version>0.8.7-SNAPSHOT</version>
 	</parent>
 	<artifactId>asterix-common</artifactId>
@@ -68,7 +68,7 @@
 							<schemaIncludes>
 								<include>asterix-conf.xsd</include>
 							</schemaIncludes>
-							<generatePackage>edu.uci.ics.asterix.common.configuration</generatePackage>
+							<generatePackage>org.apache.asterix.common.configuration</generatePackage>
 							<bindingDirectory>src/main/resources/schema</bindingDirectory>
 							<bindingIncludes>
 								<bindingInclude>jaxb-bindings.xjb</bindingInclude>
@@ -102,7 +102,7 @@
 							<schemaIncludes>
 								<include>cluster.xsd</include>
 							</schemaIncludes>
-							<generatePackage>edu.uci.ics.asterix.event.schema.cluster</generatePackage>
+							<generatePackage>org.apache.asterix.event.schema.cluster</generatePackage>
 							<generateDirectory>${project.build.directory}/generated-sources/cluster</generateDirectory>
 							<bindingDirectory>src/main/resources/schema</bindingDirectory>
 							<bindingIncludes>
@@ -136,7 +136,7 @@
 							<schemaIncludes>
 								<include>yarn_cluster.xsd</include>
 							</schemaIncludes>
-							<generatePackage>edu.uci.ics.asterix.event.schema.yarnCluster</generatePackage>
+							<generatePackage>org.apache.asterix.event.schema.yarnCluster</generatePackage>
 							<generateDirectory>${project.build.directory}/generated-sources/yarn_cluster</generateDirectory>
 							<bindingDirectory>src/main/resources/schema</bindingDirectory>
 							<bindingIncludes>
@@ -177,43 +177,43 @@
 			<version>3.0.1</version>
 		</dependency>
 		<dependency>
-			<groupId>edu.uci.ics.hyracks</groupId>
+			<groupId>org.apache.hyracks</groupId>
 			<artifactId>algebricks-compiler</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>edu.uci.ics.hyracks</groupId>
+			<groupId>org.apache.hyracks</groupId>
 			<artifactId>hyracks-dataflow-std</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>edu.uci.ics.hyracks</groupId>
+			<groupId>org.apache.hyracks</groupId>
 			<artifactId>hyracks-storage-am-lsm-common</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>edu.uci.ics.hyracks</groupId>
+			<groupId>org.apache.hyracks</groupId>
 			<artifactId>hyracks-storage-am-common</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>edu.uci.ics.hyracks</groupId>
+			<groupId>org.apache.hyracks</groupId>
 			<artifactId>hyracks-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>edu.uci.ics.asterix</groupId>
+			<groupId>org.apache.asterix</groupId>
 			<artifactId>asterix-test-framework</artifactId>
 			<version>0.8.7-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>edu.uci.ics.hyracks</groupId>
+			<groupId>org.apache.hyracks</groupId>
 			<artifactId>hyracks-storage-am-lsm-btree</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>edu.uci.ics.hyracks</groupId>
+			<groupId>org.apache.hyracks</groupId>
 			<artifactId>
 				hyracks-storage-am-lsm-invertedindex
 			</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>edu.uci.ics.hyracks</groupId>
+			<groupId>org.apache.hyracks</groupId>
 			<artifactId>hyracks-storage-am-lsm-rtree</artifactId>
 		</dependency>
 		<dependency>

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/annotations/AutoDataGen.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/annotations/AutoDataGen.java b/asterix-common/src/main/java/org/apache/asterix/common/annotations/AutoDataGen.java
index 1a65750..4aa10ba 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/annotations/AutoDataGen.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/annotations/AutoDataGen.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.annotations;
+package org.apache.asterix.common.annotations;
 
 public class AutoDataGen implements IRecordFieldDataGen {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/annotations/DateBetweenYearsDataGen.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/annotations/DateBetweenYearsDataGen.java b/asterix-common/src/main/java/org/apache/asterix/common/annotations/DateBetweenYearsDataGen.java
index 8adb9f4..04d72d1 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/annotations/DateBetweenYearsDataGen.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/annotations/DateBetweenYearsDataGen.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.annotations;
+package org.apache.asterix.common.annotations;
 
 public class DateBetweenYearsDataGen implements IRecordFieldDataGen {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/annotations/DatetimeAddRandHoursDataGen.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/annotations/DatetimeAddRandHoursDataGen.java b/asterix-common/src/main/java/org/apache/asterix/common/annotations/DatetimeAddRandHoursDataGen.java
index 9768c87..96ac635 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/annotations/DatetimeAddRandHoursDataGen.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/annotations/DatetimeAddRandHoursDataGen.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.annotations;
+package org.apache.asterix.common.annotations;
 
 public class DatetimeAddRandHoursDataGen implements IRecordFieldDataGen {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/annotations/DatetimeBetweenYearsDataGen.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/annotations/DatetimeBetweenYearsDataGen.java b/asterix-common/src/main/java/org/apache/asterix/common/annotations/DatetimeBetweenYearsDataGen.java
index 40cb20e..e1f49c1 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/annotations/DatetimeBetweenYearsDataGen.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/annotations/DatetimeBetweenYearsDataGen.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.annotations;
+package org.apache.asterix.common.annotations;
 
 public class DatetimeBetweenYearsDataGen implements IRecordFieldDataGen {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/annotations/FieldIntervalDataGen.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/annotations/FieldIntervalDataGen.java b/asterix-common/src/main/java/org/apache/asterix/common/annotations/FieldIntervalDataGen.java
index a6f261b..d08aea1 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/annotations/FieldIntervalDataGen.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/annotations/FieldIntervalDataGen.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.annotations;
+package org.apache.asterix.common.annotations;
 
 public class FieldIntervalDataGen implements IRecordFieldDataGen {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/annotations/FieldValFileDataGen.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/annotations/FieldValFileDataGen.java b/asterix-common/src/main/java/org/apache/asterix/common/annotations/FieldValFileDataGen.java
index 0300f87..184bd95 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/annotations/FieldValFileDataGen.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/annotations/FieldValFileDataGen.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.annotations;
+package org.apache.asterix.common.annotations;
 
 import java.io.File;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/annotations/FieldValFileSameIndexDataGen.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/annotations/FieldValFileSameIndexDataGen.java b/asterix-common/src/main/java/org/apache/asterix/common/annotations/FieldValFileSameIndexDataGen.java
index dfc1f58..e5d8e73 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/annotations/FieldValFileSameIndexDataGen.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/annotations/FieldValFileSameIndexDataGen.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.annotations;
+package org.apache.asterix.common.annotations;
 
 import java.io.File;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/annotations/IRecordFieldDataGen.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/annotations/IRecordFieldDataGen.java b/asterix-common/src/main/java/org/apache/asterix/common/annotations/IRecordFieldDataGen.java
index 3e62b26..9b8733e 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/annotations/IRecordFieldDataGen.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/annotations/IRecordFieldDataGen.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.annotations;
+package org.apache.asterix.common.annotations;
 
 public interface IRecordFieldDataGen {
     public enum Kind {

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/annotations/IRecordTypeAnnotation.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/annotations/IRecordTypeAnnotation.java b/asterix-common/src/main/java/org/apache/asterix/common/annotations/IRecordTypeAnnotation.java
index 2da1ae3..8d59801 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/annotations/IRecordTypeAnnotation.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/annotations/IRecordTypeAnnotation.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.annotations;
+package org.apache.asterix.common.annotations;
 
 public interface IRecordTypeAnnotation {
     public enum Kind {

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/annotations/InsertRandIntDataGen.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/annotations/InsertRandIntDataGen.java b/asterix-common/src/main/java/org/apache/asterix/common/annotations/InsertRandIntDataGen.java
index 51c7f72..52048ca 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/annotations/InsertRandIntDataGen.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/annotations/InsertRandIntDataGen.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.annotations;
+package org.apache.asterix.common.annotations;
 
 public class InsertRandIntDataGen implements IRecordFieldDataGen {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/annotations/ListDataGen.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/annotations/ListDataGen.java b/asterix-common/src/main/java/org/apache/asterix/common/annotations/ListDataGen.java
index 1747664..e76dd77 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/annotations/ListDataGen.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/annotations/ListDataGen.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.annotations;
+package org.apache.asterix.common.annotations;
 
 public class ListDataGen implements IRecordFieldDataGen {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/annotations/ListValFileDataGen.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/annotations/ListValFileDataGen.java b/asterix-common/src/main/java/org/apache/asterix/common/annotations/ListValFileDataGen.java
index e6b1771..6f37ebb 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/annotations/ListValFileDataGen.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/annotations/ListValFileDataGen.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.annotations;
+package org.apache.asterix.common.annotations;
 
 import java.io.File;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/annotations/RecordDataGenAnnotation.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/annotations/RecordDataGenAnnotation.java b/asterix-common/src/main/java/org/apache/asterix/common/annotations/RecordDataGenAnnotation.java
index 110d757..56d6faa 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/annotations/RecordDataGenAnnotation.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/annotations/RecordDataGenAnnotation.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.annotations;
+package org.apache.asterix.common.annotations;
 
 import java.io.Serializable;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/annotations/SkipSecondaryIndexSearchExpressionAnnotation.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/annotations/SkipSecondaryIndexSearchExpressionAnnotation.java b/asterix-common/src/main/java/org/apache/asterix/common/annotations/SkipSecondaryIndexSearchExpressionAnnotation.java
index 942e187..0919fcb 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/annotations/SkipSecondaryIndexSearchExpressionAnnotation.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/annotations/SkipSecondaryIndexSearchExpressionAnnotation.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.annotations;
+package org.apache.asterix.common.annotations;
 
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionAnnotation;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionAnnotation;
 
 public class SkipSecondaryIndexSearchExpressionAnnotation implements IExpressionAnnotation {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/annotations/TypeDataGen.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/annotations/TypeDataGen.java b/asterix-common/src/main/java/org/apache/asterix/common/annotations/TypeDataGen.java
index 3578062..4ada9df 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/annotations/TypeDataGen.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/annotations/TypeDataGen.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.annotations;
+package org.apache.asterix.common.annotations;
 
 public class TypeDataGen {
     private final boolean dgen;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/annotations/UndeclaredFieldsDataGen.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/annotations/UndeclaredFieldsDataGen.java b/asterix-common/src/main/java/org/apache/asterix/common/annotations/UndeclaredFieldsDataGen.java
index 76cf061..95f5d72 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/annotations/UndeclaredFieldsDataGen.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/annotations/UndeclaredFieldsDataGen.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.annotations;
+package org.apache.asterix.common.annotations;
 
 public class UndeclaredFieldsDataGen {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/api/AsterixContextInfo.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/api/AsterixContextInfo.java b/asterix-common/src/main/java/org/apache/asterix/common/api/AsterixContextInfo.java
index 3f83a88..34e76d4 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/api/AsterixContextInfo.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/api/AsterixContextInfo.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.api;
+package org.apache.asterix.common.api;
 
-import edu.uci.ics.hyracks.api.application.ICCApplicationContext;
+import org.apache.hyracks.api.application.ICCApplicationContext;
 
 public class AsterixContextInfo implements IAsterixContextInfo {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/api/AsterixThreadExecutor.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/api/AsterixThreadExecutor.java b/asterix-common/src/main/java/org/apache/asterix/common/api/AsterixThreadExecutor.java
index 93b1b43..c8b8338 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/api/AsterixThreadExecutor.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/api/AsterixThreadExecutor.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.api;
+package org.apache.asterix.common.api;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executor;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/api/AsterixThreadFactory.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/api/AsterixThreadFactory.java b/asterix-common/src/main/java/org/apache/asterix/common/api/AsterixThreadFactory.java
index 25aa7c7..a28589e 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/api/AsterixThreadFactory.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/api/AsterixThreadFactory.java
@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.api;
+package org.apache.asterix.common.api;
 
 import java.util.concurrent.ThreadFactory;
 
-import edu.uci.ics.hyracks.api.lifecycle.ILifeCycleComponentManager;
+import org.apache.hyracks.api.lifecycle.ILifeCycleComponentManager;
 
 public class AsterixThreadFactory implements ThreadFactory {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/api/IAsterixAppRuntimeContext.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/api/IAsterixAppRuntimeContext.java b/asterix-common/src/main/java/org/apache/asterix/common/api/IAsterixAppRuntimeContext.java
index 2c084ce..b417e87 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/api/IAsterixAppRuntimeContext.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/api/IAsterixAppRuntimeContext.java
@@ -12,27 +12,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.api;
+package org.apache.asterix.common.api;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.Executor;
 
-import edu.uci.ics.asterix.common.exceptions.ACIDException;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.common.feeds.api.IFeedManager;
-import edu.uci.ics.asterix.common.transactions.ITransactionSubsystem;
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.api.io.IIOManager;
-import edu.uci.ics.hyracks.storage.am.common.api.IIndexLifecycleManager;
-import edu.uci.ics.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler;
-import edu.uci.ics.hyracks.storage.am.lsm.common.api.ILSMMergePolicyFactory;
-import edu.uci.ics.hyracks.storage.am.lsm.common.api.ILSMOperationTracker;
-import edu.uci.ics.hyracks.storage.am.lsm.common.api.IVirtualBufferCache;
-import edu.uci.ics.hyracks.storage.common.buffercache.IBufferCache;
-import edu.uci.ics.hyracks.storage.common.file.IFileMapProvider;
-import edu.uci.ics.hyracks.storage.common.file.ILocalResourceRepository;
-import edu.uci.ics.hyracks.storage.common.file.ResourceIdFactory;
+import org.apache.asterix.common.exceptions.ACIDException;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.feeds.api.IFeedManager;
+import org.apache.asterix.common.transactions.ITransactionSubsystem;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.api.io.IIOManager;
+import org.apache.hyracks.storage.am.common.api.IIndexLifecycleManager;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicyFactory;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker;
+import org.apache.hyracks.storage.am.lsm.common.api.IVirtualBufferCache;
+import org.apache.hyracks.storage.common.buffercache.IBufferCache;
+import org.apache.hyracks.storage.common.file.IFileMapProvider;
+import org.apache.hyracks.storage.common.file.ILocalResourceRepository;
+import org.apache.hyracks.storage.common.file.ResourceIdFactory;
 
 public interface IAsterixAppRuntimeContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/api/IAsterixContextInfo.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/api/IAsterixContextInfo.java b/asterix-common/src/main/java/org/apache/asterix/common/api/IAsterixContextInfo.java
index 325fc07..c5e0b73 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/api/IAsterixContextInfo.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/api/IAsterixContextInfo.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.api;
+package org.apache.asterix.common.api;
 
-import edu.uci.ics.hyracks.api.application.ICCApplicationContext;
+import org.apache.hyracks.api.application.ICCApplicationContext;
 
 public interface IAsterixContextInfo {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/api/IAsterixRuntimeComponentsProvider.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/api/IAsterixRuntimeComponentsProvider.java b/asterix-common/src/main/java/org/apache/asterix/common/api/IAsterixRuntimeComponentsProvider.java
index 071f271..3ce6a6c 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/api/IAsterixRuntimeComponentsProvider.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/api/IAsterixRuntimeComponentsProvider.java
@@ -12,18 +12,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.api;
-
-import edu.uci.ics.hyracks.api.io.IIOManager;
-import edu.uci.ics.hyracks.storage.am.common.api.IIndexLifecycleManager;
-import edu.uci.ics.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallbackProvider;
-import edu.uci.ics.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler;
-import edu.uci.ics.hyracks.storage.am.lsm.common.api.ILSMMergePolicy;
-import edu.uci.ics.hyracks.storage.am.lsm.common.api.ILSMOperationTrackerProvider;
-import edu.uci.ics.hyracks.storage.common.buffercache.IBufferCache;
-import edu.uci.ics.hyracks.storage.common.file.IFileMapProvider;
-import edu.uci.ics.hyracks.storage.common.file.ILocalResourceRepository;
-import edu.uci.ics.hyracks.storage.common.file.ResourceIdFactory;
+package org.apache.asterix.common.api;
+
+import org.apache.hyracks.api.io.IIOManager;
+import org.apache.hyracks.storage.am.common.api.IIndexLifecycleManager;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallbackProvider;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicy;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTrackerProvider;
+import org.apache.hyracks.storage.common.buffercache.IBufferCache;
+import org.apache.hyracks.storage.common.file.IFileMapProvider;
+import org.apache.hyracks.storage.common.file.ILocalResourceRepository;
+import org.apache.hyracks.storage.common.file.ResourceIdFactory;
 
 public interface IAsterixRuntimeComponentsProvider {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterEventsSubscriber.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterEventsSubscriber.java b/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterEventsSubscriber.java
index 9b4616b..bbc87b5 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterEventsSubscriber.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterEventsSubscriber.java
@@ -1,4 +1,4 @@
-package edu.uci.ics.asterix.common.api;
+package org.apache.asterix.common.api;
 
 /*
  * Copyright 2009-2013 by The Regents of the University of California
@@ -16,7 +16,7 @@ package edu.uci.ics.asterix.common.api;
  */
 import java.util.Set;
 
-import edu.uci.ics.asterix.common.api.IClusterManagementWork.ClusterState;
+import org.apache.asterix.common.api.IClusterManagementWork.ClusterState;
 
 public interface IClusterEventsSubscriber {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWork.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWork.java b/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWork.java
index 50dff35..283c419 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWork.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWork.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.api;
+package org.apache.asterix.common.api;
 
 public interface IClusterManagementWork {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWorkResponse.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWorkResponse.java b/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWorkResponse.java
index 7f9a7dd..b023017 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWorkResponse.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/api/IClusterManagementWorkResponse.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.api;
+package org.apache.asterix.common.api;
 
 
 public interface IClusterManagementWorkResponse {

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/api/ILocalResourceMetadata.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/api/ILocalResourceMetadata.java b/asterix-common/src/main/java/org/apache/asterix/common/api/ILocalResourceMetadata.java
index 2b72a49..1d0d2ca 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/api/ILocalResourceMetadata.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/api/ILocalResourceMetadata.java
@@ -12,13 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.api;
+package org.apache.asterix.common.api;
 
 import java.io.Serializable;
 
-import edu.uci.ics.asterix.common.transactions.IAsterixAppRuntimeContextProvider;
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.storage.am.lsm.common.api.ILSMIndex;
+import org.apache.asterix.common.transactions.IAsterixAppRuntimeContextProvider;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
 
 public interface ILocalResourceMetadata extends Serializable {
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractAsterixProperties.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractAsterixProperties.java b/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractAsterixProperties.java
index bad1802..4c10aff 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractAsterixProperties.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractAsterixProperties.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.config;
+package org.apache.asterix.common.config;
 
 public abstract class AbstractAsterixProperties {
     protected final AsterixPropertiesAccessor accessor;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCompilerProperties.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCompilerProperties.java b/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCompilerProperties.java
index bd7116b..b70098e 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCompilerProperties.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCompilerProperties.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.config;
+package org.apache.asterix.common.config;
 
 public class AsterixCompilerProperties extends AbstractAsterixProperties {
     private static final String COMPILER_SORTMEMORY_KEY = "compiler.sortmemory";

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixExternalProperties.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixExternalProperties.java b/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixExternalProperties.java
index 934c91f..2044abf 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixExternalProperties.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixExternalProperties.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.config;
+package org.apache.asterix.common.config;
 
 import java.util.logging.Level;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/f18bba26/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixFeedProperties.java
----------------------------------------------------------------------
diff --git a/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixFeedProperties.java b/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixFeedProperties.java
index b854415..308c0c0 100644
--- a/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixFeedProperties.java
+++ b/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixFeedProperties.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.common.config;
+package org.apache.asterix.common.config;
 
 public class AsterixFeedProperties extends AbstractAsterixProperties {