You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by hi...@apache.org on 2016/09/15 01:59:53 UTC

[32/65] [abbrv] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PrimaryKeyIndex.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PrimaryKeyIndex.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PrimaryKeyIndex.java
index 718a2c4..ab3da53 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PrimaryKeyIndex.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PrimaryKeyIndex.java
@@ -19,7 +19,7 @@
  *
  * Created on March 20, 2005, 6:47 PM
  */
-package com.gemstone.gemfire.cache.query.internal.index;
+package org.apache.geode.cache.query.internal.index;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -27,31 +27,31 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.query.FunctionDomainException;
-import com.gemstone.gemfire.cache.query.IndexStatistics;
-import com.gemstone.gemfire.cache.query.IndexType;
-import com.gemstone.gemfire.cache.query.NameResolutionException;
-import com.gemstone.gemfire.cache.query.QueryException;
-import com.gemstone.gemfire.cache.query.QueryInvocationTargetException;
-import com.gemstone.gemfire.cache.query.QueryService;
-import com.gemstone.gemfire.cache.query.SelectResults;
-import com.gemstone.gemfire.cache.query.TypeMismatchException;
-import com.gemstone.gemfire.cache.query.internal.CompiledValue;
-import com.gemstone.gemfire.cache.query.internal.ExecutionContext;
-import com.gemstone.gemfire.cache.query.internal.QueryMonitor;
-import com.gemstone.gemfire.cache.query.internal.QueryObserver;
-import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder;
-import com.gemstone.gemfire.cache.query.internal.QueryUtils;
-import com.gemstone.gemfire.cache.query.internal.RuntimeIterator;
-import com.gemstone.gemfire.cache.query.internal.Support;
-import com.gemstone.gemfire.cache.query.internal.parse.OQLLexerTokenTypes;
-import com.gemstone.gemfire.cache.query.internal.types.ObjectTypeImpl;
-import com.gemstone.gemfire.cache.query.types.ObjectType;
-import com.gemstone.gemfire.internal.cache.LocalRegion;
-import com.gemstone.gemfire.internal.cache.RegionEntry;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.pdx.internal.PdxString;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.query.FunctionDomainException;
+import org.apache.geode.cache.query.IndexStatistics;
+import org.apache.geode.cache.query.IndexType;
+import org.apache.geode.cache.query.NameResolutionException;
+import org.apache.geode.cache.query.QueryException;
+import org.apache.geode.cache.query.QueryInvocationTargetException;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.TypeMismatchException;
+import org.apache.geode.cache.query.internal.CompiledValue;
+import org.apache.geode.cache.query.internal.ExecutionContext;
+import org.apache.geode.cache.query.internal.QueryMonitor;
+import org.apache.geode.cache.query.internal.QueryObserver;
+import org.apache.geode.cache.query.internal.QueryObserverHolder;
+import org.apache.geode.cache.query.internal.QueryUtils;
+import org.apache.geode.cache.query.internal.RuntimeIterator;
+import org.apache.geode.cache.query.internal.Support;
+import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
+import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
+import org.apache.geode.cache.query.types.ObjectType;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.RegionEntry;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.pdx.internal.PdxString;
 
 /**
  * 
@@ -351,7 +351,7 @@ public class PrimaryKeyIndex extends AbstractIndex  {
   /*
    * (non-Javadoc)
    * 
-   * @see com.gemstone.gemfire.cache.query.internal.index.AbstractIndex#lockedQuery(java.lang.Object,
+   * @see org.apache.geode.cache.query.internal.index.AbstractIndex#lockedQuery(java.lang.Object,
    *      int, java.lang.Object, int, java.util.Collection, java.util.Set)
    */
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PrimaryKeyIndexCreationHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PrimaryKeyIndexCreationHelper.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PrimaryKeyIndexCreationHelper.java
index 8f1d116..c4696e8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PrimaryKeyIndexCreationHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PrimaryKeyIndexCreationHelper.java
@@ -19,20 +19,20 @@
  *
  * Created on March 20, 2005, 7:21 PM
  */
-package com.gemstone.gemfire.cache.query.internal.index;
+package org.apache.geode.cache.query.internal.index;
 
 import java.util.List;
 
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.query.IndexInvalidException;
-import com.gemstone.gemfire.cache.query.internal.CompiledIteratorDef;
-import com.gemstone.gemfire.cache.query.internal.CompiledValue;
-import com.gemstone.gemfire.cache.query.internal.ExecutionContext;
-import com.gemstone.gemfire.cache.query.internal.RuntimeIterator;
-import com.gemstone.gemfire.cache.query.internal.parse.OQLLexerTokenTypes;
-import com.gemstone.gemfire.internal.cache.PartitionedRegion;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.query.IndexInvalidException;
+import org.apache.geode.cache.query.internal.CompiledIteratorDef;
+import org.apache.geode.cache.query.internal.CompiledValue;
+import org.apache.geode.cache.query.internal.ExecutionContext;
+import org.apache.geode.cache.query.internal.RuntimeIterator;
+import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/RangeIndex.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/RangeIndex.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/RangeIndex.java
index cae20c4..0f4b0e2 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/RangeIndex.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/RangeIndex.java
@@ -19,7 +19,7 @@
  *
  * Created on February 4, 2005, 11:10 AM
  */
-package com.gemstone.gemfire.cache.query.internal.index;
+package org.apache.geode.cache.query.internal.index;
 
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 
@@ -34,32 +34,32 @@ import java.util.SortedMap;
 import java.util.concurrent.ConcurrentNavigableMap;
 import java.util.concurrent.ConcurrentSkipListMap;
 
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.RegionAttributes;
-import com.gemstone.gemfire.cache.query.FunctionDomainException;
-import com.gemstone.gemfire.cache.query.IndexStatistics;
-import com.gemstone.gemfire.cache.query.IndexType;
-import com.gemstone.gemfire.cache.query.NameResolutionException;
-import com.gemstone.gemfire.cache.query.QueryException;
-import com.gemstone.gemfire.cache.query.QueryInvocationTargetException;
-import com.gemstone.gemfire.cache.query.QueryService;
-import com.gemstone.gemfire.cache.query.SelectResults;
-import com.gemstone.gemfire.cache.query.TypeMismatchException;
-import com.gemstone.gemfire.cache.query.internal.CompiledSortCriterion;
-import com.gemstone.gemfire.cache.query.internal.CompiledValue;
-import com.gemstone.gemfire.cache.query.internal.ExecutionContext;
-import com.gemstone.gemfire.cache.query.internal.QueryMonitor;
-import com.gemstone.gemfire.cache.query.internal.QueryObserver;
-import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder;
-import com.gemstone.gemfire.cache.query.internal.RuntimeIterator;
-import com.gemstone.gemfire.cache.query.internal.index.IndexManager.TestHook;
-import com.gemstone.gemfire.cache.query.internal.index.IndexStore.IndexStoreEntry;
-import com.gemstone.gemfire.cache.query.internal.parse.OQLLexerTokenTypes;
-import com.gemstone.gemfire.cache.query.internal.types.TypeUtils;
-import com.gemstone.gemfire.cache.query.types.ObjectType;
-import com.gemstone.gemfire.internal.cache.RegionEntry;
-import com.gemstone.gemfire.internal.cache.persistence.query.CloseableIterator;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.query.FunctionDomainException;
+import org.apache.geode.cache.query.IndexStatistics;
+import org.apache.geode.cache.query.IndexType;
+import org.apache.geode.cache.query.NameResolutionException;
+import org.apache.geode.cache.query.QueryException;
+import org.apache.geode.cache.query.QueryInvocationTargetException;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.TypeMismatchException;
+import org.apache.geode.cache.query.internal.CompiledSortCriterion;
+import org.apache.geode.cache.query.internal.CompiledValue;
+import org.apache.geode.cache.query.internal.ExecutionContext;
+import org.apache.geode.cache.query.internal.QueryMonitor;
+import org.apache.geode.cache.query.internal.QueryObserver;
+import org.apache.geode.cache.query.internal.QueryObserverHolder;
+import org.apache.geode.cache.query.internal.RuntimeIterator;
+import org.apache.geode.cache.query.internal.index.IndexManager.TestHook;
+import org.apache.geode.cache.query.internal.index.IndexStore.IndexStoreEntry;
+import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
+import org.apache.geode.cache.query.internal.types.TypeUtils;
+import org.apache.geode.cache.query.types.ObjectType;
+import org.apache.geode.internal.cache.RegionEntry;
+import org.apache.geode.internal.cache.persistence.query.CloseableIterator;
+import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  */
@@ -158,7 +158,7 @@ public class RangeIndex extends AbstractIndex  {
       
       if (indxResultSet != null) {
         if (indxResultSet.getClass().getName()
-            .startsWith("com.gemstone.gemfire.internal.cache.Token$")
+            .startsWith("org.apache.geode.internal.cache.Token$")
             || indxResultSet == QueryService.UNDEFINED) {
           // do nothing, Entries are either removed or invalidated or destroyed
           // by other thread.
@@ -468,7 +468,7 @@ public class RangeIndex extends AbstractIndex  {
     else if (key == QueryService.UNDEFINED) {
       if (value != null) {
         if (value.getClass().getName()
-            .startsWith("com.gemstone.gemfire.internal.cache.Token$")
+            .startsWith("org.apache.geode.internal.cache.Token$")
             || value == QueryService.UNDEFINED) {
           // do nothing, Entries are either removed or invalidated or destroyed
           // by other thread.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/package.html
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/package.html b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/package.html
index c77a3c9..515a2cf 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/package.html
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/package.html
@@ -362,7 +362,7 @@ indexes. </FONT></FONT>
 			 here should not be confused with byte-code compilation which is a
 			lower level of compilation that will most likely not be
 			implemented in this release due resource restrictions. See the
-			package.html for com.gemstone.gemfire.cache.query for further
+			package.html for org.apache.geode.cache.query for further
 			details on byte-code compilation.</FONT></FONT></P>
 			<LI><P CLASS="western" STYLE="margin-bottom: 0in; font-style: normal; font-weight: medium; widows: 0; orphans: 0">
 			<FONT FACE="Arial, sans-serif"><FONT SIZE=3>Each iterator

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAggregateFunc.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAggregateFunc.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAggregateFunc.java
index 8c989f9..da69c90 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAggregateFunc.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAggregateFunc.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.Token;
 
-import com.gemstone.gemfire.cache.query.QueryInvalidException;
-import com.gemstone.gemfire.cache.query.internal.CompiledValue;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.QueryInvalidException;
+import org.apache.geode.cache.query.internal.CompiledValue;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 /**
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAnd.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAnd.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAnd.java
index b5d1b19..bb1ab2d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAnd.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTAnd.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 public class ASTAnd extends GemFireAST {
   private static final long serialVersionUID = 7100190044926605881L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCombination.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCombination.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCombination.java
index a4b4444..6519097 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCombination.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCombination.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 
 import antlr.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCompareOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCompareOp.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCompareOp.java
index 8974564..1aab4b4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCompareOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTCompareOp.java
@@ -16,10 +16,10 @@
  */
 
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 public class ASTCompareOp extends GemFireAST {
   private static final long serialVersionUID = 2764710765423856496L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConstruction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConstruction.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConstruction.java
index d7df084..fcfade1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConstruction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConstruction.java
@@ -16,11 +16,11 @@
  */
 
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
-import com.gemstone.gemfire.cache.query.internal.*;
-import com.gemstone.gemfire.internal.Assert;
+import org.apache.geode.cache.query.internal.*;
+import org.apache.geode.internal.Assert;
 
 public class ASTConstruction extends GemFireAST {  
   private static final long serialVersionUID = 6647545354866647845L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConversionExpr.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConversionExpr.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConversionExpr.java
index d8b3f12..f4139e8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConversionExpr.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTConversionExpr.java
@@ -16,10 +16,10 @@
  */
 
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 public class ASTConversionExpr extends GemFireAST {  
   private static final long serialVersionUID = 8713000632283704611L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTDummy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTDummy.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTDummy.java
index ca251cd..c38a7e3 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTDummy.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTDummy.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.Token;
 
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 public class ASTDummy extends GemFireAST {
 private static final long serialVersionUID = -5390937473819850292L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTGroupBy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTGroupBy.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTGroupBy.java
index 6f4f6cd..d5c9743 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTGroupBy.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTGroupBy.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 /**
  * 
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTHint.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTHint.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTHint.java
index 3fd3069..f7f8f6e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTHint.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTHint.java
@@ -17,11 +17,11 @@
 /**
  * 
  */
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.Token;
 
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 /**
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTHintIdentifier.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTHintIdentifier.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTHintIdentifier.java
index 0b0182e..e05784c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTHintIdentifier.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTHintIdentifier.java
@@ -17,11 +17,11 @@
 /**
  * 
  */
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.Token;
 
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 /**
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIdentifier.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIdentifier.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIdentifier.java
index ad7b2b3..d3cf050 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIdentifier.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIdentifier.java
@@ -16,10 +16,10 @@
  */
 
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 
 public class ASTIdentifier extends GemFireAST {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTImport.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTImport.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTImport.java
index bc679d7..0bac276 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTImport.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTImport.java
@@ -16,11 +16,11 @@
  */
 
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
 import antlr.collections.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 public class ASTImport extends GemFireAST {  
   private static final long serialVersionUID = 6002078657881181949L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIn.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIn.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIn.java
index 4240596..9386f3f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIn.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIn.java
@@ -16,10 +16,10 @@
  */
 
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 public class ASTIn extends GemFireAST {  
   private static final long serialVersionUID = -7688132343283983119L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIteratorDef.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIteratorDef.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIteratorDef.java
index e4a1e19..59bd0a0 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIteratorDef.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTIteratorDef.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
 //import antlr.collections.*;
-import com.gemstone.gemfire.internal.Assert;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLike.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLike.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLike.java
index 075dfbc..ead5155 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLike.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLike.java
@@ -17,11 +17,11 @@
 /**
  * 
  */
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
 
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLimit.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLimit.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLimit.java
index ad36cee..8ef1dfb 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLimit.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLimit.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLiteral.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLiteral.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLiteral.java
index 4a5f573..226f800 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLiteral.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTLiteral.java
@@ -16,14 +16,14 @@
  */
 
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
 import java.util.*;
 import java.sql.*;
-import com.gemstone.gemfire.cache.query.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.internal.QCompiler;
+import org.apache.geode.internal.i18n.LocalizedStrings;
 
 public class ASTLiteral extends GemFireAST {
   private static final long serialVersionUID = 8374021603235812835L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTMethodInvocation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTMethodInvocation.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTMethodInvocation.java
index 136ebf4..e0946b3 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTMethodInvocation.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTMethodInvocation.java
@@ -16,14 +16,14 @@
  */
 
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import org.apache.logging.log4j.Logger;
 
 import antlr.*;
 
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
-import com.gemstone.gemfire.internal.logging.LogService;
+import org.apache.geode.cache.query.internal.QCompiler;
+import org.apache.geode.internal.logging.LogService;
 
 public class ASTMethodInvocation extends GemFireAST {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOr.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOr.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOr.java
index 5fdb1a0..0450ba2 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOr.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOr.java
@@ -16,10 +16,10 @@
  */
 
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 public class ASTOr extends GemFireAST {
   private static final long serialVersionUID = 5770135811089855867L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOrderBy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOrderBy.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOrderBy.java
index a0d1414..a744a95 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOrderBy.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTOrderBy.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 /**
  * 
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTParameter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTParameter.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTParameter.java
index 6ddb1ae..d6a80ff 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTParameter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTParameter.java
@@ -16,10 +16,10 @@
  */
 
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 
 public class ASTParameter extends GemFireAST {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTPostfix.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTPostfix.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTPostfix.java
index 6bfd9f0..3815839 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTPostfix.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTPostfix.java
@@ -16,11 +16,11 @@
  */
 
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
 import antlr.collections.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 /**
  * This handles paths, method invocations, and index operators that

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTProjection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTProjection.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTProjection.java
index 75c2ab3..c935b04 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTProjection.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTProjection.java
@@ -16,10 +16,10 @@
  */
 
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 
 public class ASTProjection extends GemFireAST {  

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTRegionPath.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTRegionPath.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTRegionPath.java
index 67bfa46..a9decd3 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTRegionPath.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTRegionPath.java
@@ -16,10 +16,10 @@
  */
 
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 
 public class ASTRegionPath extends GemFireAST {  

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSelect.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSelect.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSelect.java
index 83c1177..98e3227 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSelect.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSelect.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -24,8 +24,8 @@ import java.util.Map;
 import antlr.*;
 import antlr.collections.*;
 
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
-import com.gemstone.gemfire.cache.query.internal.CompiledValue;
+import org.apache.geode.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.CompiledValue;
 
 public class ASTSelect extends GemFireAST {
   private static final long serialVersionUID = 1389351692304773456L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSortCriterion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSortCriterion.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSortCriterion.java
index ac4aa8d..f93b0c9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSortCriterion.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTSortCriterion.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 
 import antlr.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTrace.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTrace.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTrace.java
index 4528e8b..cc400aa 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTrace.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTrace.java
@@ -17,9 +17,9 @@
 /**
  * 
  */
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 /**
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTType.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTType.java
index f89d411..986b439 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTType.java
@@ -16,12 +16,12 @@
  */
 
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
-import com.gemstone.gemfire.cache.query.types.*;
-import com.gemstone.gemfire.internal.Assert;
+import org.apache.geode.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.types.*;
+import org.apache.geode.internal.Assert;
 
 
 public class ASTType extends GemFireAST {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTypeCast.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTypeCast.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTypeCast.java
index a01afad..6a9e6e9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTypeCast.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTTypeCast.java
@@ -16,10 +16,10 @@
  */
 
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 
 public class ASTTypeCast extends GemFireAST {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnary.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnary.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnary.java
index 32944fc..2b6f273 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnary.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnary.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
 
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
-import com.gemstone.gemfire.cache.query.internal.Support;
+import org.apache.geode.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.Support;
 /**
  * 
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUndefinedExpr.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUndefinedExpr.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUndefinedExpr.java
index 72487c5..7f72693 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUndefinedExpr.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUndefinedExpr.java
@@ -16,10 +16,10 @@
  */
 
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 
 public class ASTUndefinedExpr extends GemFireAST {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnsupported.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnsupported.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnsupported.java
index ec3fa36..cf614df 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnsupported.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/ASTUnsupported.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.geode.cache.query.internal.QCompiler;
+import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * AST class used for an AST node that cannot be compiled directly

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/GemFireAST.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/GemFireAST.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/GemFireAST.java
index efe01da..6f2bdbe 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/GemFireAST.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/GemFireAST.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 
 import antlr.*;
 //import antlr.collections.*;
-//import com.gemstone.gemfire.cache.query.*;
-import com.gemstone.gemfire.cache.query.internal.QCompiler;
+//import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.internal.QCompiler;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/OQLLexer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/OQLLexer.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/OQLLexer.java
index 2ada98d..c508705 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/OQLLexer.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/OQLLexer.java
@@ -1,8 +1,8 @@
 // $ANTLR 2.7.4: "oql.g" -> "OQLLexer.java"$
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 import java.util.*;
-import com.gemstone.gemfire.cache.query.internal.types.*;
+import org.apache.geode.cache.query.internal.types.*;
 
 import java.io.InputStream;
 import antlr.TokenStreamException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/OQLLexerTokenTypes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/OQLLexerTokenTypes.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/OQLLexerTokenTypes.java
index f30f3c0..ed03fb1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/OQLLexerTokenTypes.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/OQLLexerTokenTypes.java
@@ -1,8 +1,8 @@
 // $ANTLR 2.7.4: "oql.g" -> "OQLParser.java"$
 
-package com.gemstone.gemfire.cache.query.internal.parse;
+package org.apache.geode.cache.query.internal.parse;
 import java.util.*;
-import com.gemstone.gemfire.cache.query.internal.types.*;
+import org.apache.geode.cache.query.internal.types.*;
 
 public interface OQLLexerTokenTypes {
 	int EOF = 1;