geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dschnei...@apache.org
Subject [30/76] [abbrv] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
Date Thu, 15 Sep 2016 21:01:47 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/oql.g
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/oql.g b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/oql.g
index caf0ec0..a743752 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/oql.g
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/parse/oql.g
@@ -23,9 +23,9 @@
 */
 
 header {
-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.*;
 }
 
 options {
@@ -311,7 +311,7 @@ ML_COMMENT
 /***************************** OQL PARSER *************************************/
 
 class OQLParser
-extends Parser("com.gemstone.gemfire.cache.query.internal.parse.UtilParser");
+extends Parser("org.apache.geode.cache.query.internal.parse.UtilParser");
 
 options {
     buildAST = true;
@@ -356,14 +356,14 @@ queryProgram :
        	EOF!
         { #queryProgram =
           #([QUERY_PROGRAM, "queryProgram",
-            "com.gemstone.gemfire.cache.query.internal.parse.GemFireAST"],
+            "org.apache.geode.cache.query.internal.parse.GemFireAST"],
             #queryProgram); }
     ;
 
 traceCommand:
 		( 	
 			TOK_LT!
-			"trace"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTTrace>
+			"trace"^<AST=org.apache.geode.cache.query.internal.parse.ASTTrace>
 			TOK_GT!
 		)
 	;
@@ -377,7 +377,7 @@ loneFromClause :
         )* EOF!
     { #loneFromClause =
           #([LITERAL_from, "from",
-            "com.gemstone.gemfire.cache.query.internal.parse.ASTCombination"],
+            "org.apache.geode.cache.query.internal.parse.ASTCombination"],
             #loneFromClause); }
     ;
 
@@ -396,7 +396,7 @@ declaration :
 
 importQuery :
 
-        "import"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTImport>
+        "import"^<AST=org.apache.geode.cache.query.internal.parse.ASTImport>
         qualifiedName
         (
             "as" identifier
@@ -410,7 +410,7 @@ loneImports :
         EOF!
         // combine into a single node
         { #loneImports = #([IMPORTS, "imports",
-            "com.gemstone.gemfire.cache.query.internal.parse.GemFireAST"],
+            "org.apache.geode.cache.query.internal.parse.GemFireAST"],
                 #loneImports); }
     ;
 
@@ -469,7 +469,7 @@ query :
 
 selectExpr :
 		( hintCommand )?
-        "select"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTSelect>
+        "select"^<AST=org.apache.geode.cache.query.internal.parse.ASTSelect>
 
         (
             // ambig. betweed this distinct and a distinct conversion expr
@@ -479,8 +479,8 @@ selectExpr :
                 warnWhenFollowAmbig = false;
             } :
 
-            "distinct" <AST=com.gemstone.gemfire.cache.query.internal.parse.ASTDummy>
-            | "all" <AST=com.gemstone.gemfire.cache.query.internal.parse.ASTDummy>
+            "distinct" <AST=org.apache.geode.cache.query.internal.parse.ASTDummy>
+            | "all" <AST=org.apache.geode.cache.query.internal.parse.ASTDummy>
         )?
 
         
@@ -496,7 +496,7 @@ selectExpr :
 
 fromClause :
 
-        "from"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTCombination>
+        "from"^<AST=org.apache.geode.cache.query.internal.parse.ASTCombination>
         iteratorDef
         (
             TOK_COMMA!
@@ -511,7 +511,7 @@ iteratorDef! :
             id1:identifier
             "in"!
             ex1:expr ( "type"! t1:type )?
-            { #iteratorDef = #([ITERATOR_DEF, "iterDef", "com.gemstone.gemfire.cache.query.internal.parse.ASTIteratorDef"], #ex1, #id1, #t1); }
+            { #iteratorDef = #([ITERATOR_DEF, "iterDef", "org.apache.geode.cache.query.internal.parse.ASTIteratorDef"], #ex1, #id1, #t1); }
 
         |   ex2:expr
             (
@@ -520,7 +520,7 @@ iteratorDef! :
             )?
             ( "type"! t2:type )?
 
-            { #iteratorDef = #([ITERATOR_DEF, "iterDef", "com.gemstone.gemfire.cache.query.internal.parse.ASTIteratorDef"], #ex2, #id2, #t2); }
+            { #iteratorDef = #([ITERATOR_DEF, "iterDef", "org.apache.geode.cache.query.internal.parse.ASTIteratorDef"], #ex2, #id2, #t2); }
     ;
 
 whereClause :
@@ -532,9 +532,9 @@ limitClause! :
 
         "limit" (TOK_DOLLAR NUM_INT
         { #limitClause = #([LIMIT, "limitParam",
-               "com.gemstone.gemfire.cache.query.internal.parse.ASTParameter"],
+               "org.apache.geode.cache.query.internal.parse.ASTParameter"],
                    #NUM_INT); }
-         | n:NUM_INT{ #limitClause =#[LIMIT,n.getText(),"com.gemstone.gemfire.cache.query.internal.parse.ASTLimit"] ; })
+         | n:NUM_INT{ #limitClause =#[LIMIT,n.getText(),"org.apache.geode.cache.query.internal.parse.ASTLimit"] ; })
     ;
 
 projectionAttributes :
@@ -546,10 +546,10 @@ projectionAttributes :
                 projection
             )*
             { #projectionAttributes = #([PROJECTION_ATTRS, "projectionAttrs",
-                "com.gemstone.gemfire.cache.query.internal.parse.ASTCombination"],
+                "org.apache.geode.cache.query.internal.parse.ASTCombination"],
                 #projectionAttributes); }
 
-        |   TOK_STAR <AST=com.gemstone.gemfire.cache.query.internal.parse.ASTDummy>
+        |   TOK_STAR <AST=org.apache.geode.cache.query.internal.parse.ASTDummy>
         )
     ;
 
@@ -557,7 +557,7 @@ projection!{ AST node  = null;}:
         
             lb1:identifier TOK_COLON!  ( tok1:aggregateExpr{node = #tok1;} | tok2:expr{node = #tok2;})
             { #projection = #([PROJECTION, "projection",
-            "com.gemstone.gemfire.cache.query.internal.parse.ASTProjection"],  node, #lb1); } 
+            "org.apache.geode.cache.query.internal.parse.ASTProjection"],  node, #lb1); } 
         |
             (tok3:aggregateExpr{node = #tok3;} | tok4:expr{node = #tok4;})
             (
@@ -565,7 +565,7 @@ projection!{ AST node  = null;}:
                 lb2: identifier
             )?
             { #projection = #([PROJECTION, "projection",
-            "com.gemstone.gemfire.cache.query.internal.parse.ASTProjection"], node, #lb2); }
+            "org.apache.geode.cache.query.internal.parse.ASTProjection"], node, #lb2); }
     ;
 
 
@@ -573,7 +573,7 @@ projection!{ AST node  = null;}:
 
 groupClause :
 
-        "group"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTGroupBy>
+        "group"^<AST=org.apache.geode.cache.query.internal.parse.ASTGroupBy>
         "by"!  groupByList
 
         (
@@ -585,7 +585,7 @@ groupClause :
 hintCommand :
 		 	
 			TOK_LT!
-			"hint"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTHint>
+			"hint"^<AST=org.apache.geode.cache.query.internal.parse.ASTHint>
 			hintIdentifier
 			(
 			  TOK_COMMA! hintIdentifier
@@ -596,12 +596,12 @@ hintCommand :
 
       
 hintIdentifier :
- 	n:StringLiteral{ #hintIdentifier =#[HINT,n.getText(),"com.gemstone.gemfire.cache.query.internal.parse.ASTHintIdentifier"] ; }       
+ 	n:StringLiteral{ #hintIdentifier =#[HINT,n.getText(),"org.apache.geode.cache.query.internal.parse.ASTHintIdentifier"] ; }       
 ;
 
 orderClause :
 
-        "order"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTOrderBy>
+        "order"^<AST=org.apache.geode.cache.query.internal.parse.ASTOrderBy>
         "by"!
         sortCriterion
         (
@@ -611,7 +611,7 @@ orderClause :
 
 sortCriterion :
 
-        tok:expr { #sortCriterion = #([SORT_CRITERION, "asc", "com.gemstone.gemfire.cache.query.internal.parse.ASTSortCriterion"],
+        tok:expr { #sortCriterion = #([SORT_CRITERION, "asc", "org.apache.geode.cache.query.internal.parse.ASTSortCriterion"],
             tok); }        
         (
             "asc"! {#sortCriterion.setText("asc");}
@@ -634,7 +634,7 @@ castExpr
         // follows, it's a typecast.  No semantic checking needed to parse.
         // if it _looks_ like a cast, it _is_ a cast; else it's a "(expr)"
     	(TOK_LPAREN type TOK_RPAREN castExpr)=>
-        lp:TOK_LPAREN^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTTypeCast>
+        lp:TOK_LPAREN^<AST=org.apache.geode.cache.query.internal.parse.ASTTypeCast>
                 {#lp.setType(TYPECAST); #lp.setText("typecast");}
             type TOK_RPAREN!
         castExpr
@@ -648,7 +648,7 @@ orExpr
             orelseExpr ( "or"! orelseExpr  { cmplx = true; } )*
        { if (cmplx) {
             #orExpr = #([LITERAL_or, "or",
-                    "com.gemstone.gemfire.cache.query.internal.parse.ASTOr"],
+                    "org.apache.geode.cache.query.internal.parse.ASTOr"],
                 #orExpr); } }
       ;
 
@@ -664,7 +664,7 @@ andExpr
            quantifierExpr ( "and"! quantifierExpr { cmplx = true; } )*
         { if (cmplx) {
             #andExpr = #([LITERAL_and, "and",
-                    "com.gemstone.gemfire.cache.query.internal.parse.ASTAnd"],
+                    "org.apache.geode.cache.query.internal.parse.ASTAnd"],
                     #andExpr); } }
     ;
 
@@ -704,8 +704,8 @@ equalityExpr :
 
             (   
                 (   (
-                        TOK_EQ^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTCompareOp>
-                    |   TOK_NE^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTCompareOp>
+                        TOK_EQ^<AST=org.apache.geode.cache.query.internal.parse.ASTCompareOp>
+                    |   TOK_NE^<AST=org.apache.geode.cache.query.internal.parse.ASTCompareOp>
                     )
                     (   "all"^
                     |   "any"^
@@ -713,7 +713,7 @@ equalityExpr :
                     )?
                 relationalExpr )+
     
-            |   (  "like"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTLike>
+            |   (  "like"^<AST=org.apache.geode.cache.query.internal.parse.ASTLike>
                 relationalExpr )*
             )
     ;
@@ -723,10 +723,10 @@ relationalExpr :
         additiveExpr
         (
             (
-                TOK_LT^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTCompareOp>
-            |   TOK_GT^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTCompareOp>
-            |   TOK_LE^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTCompareOp>
-            |   TOK_GE^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTCompareOp>
+                TOK_LT^<AST=org.apache.geode.cache.query.internal.parse.ASTCompareOp>
+            |   TOK_GT^<AST=org.apache.geode.cache.query.internal.parse.ASTCompareOp>
+            |   TOK_LE^<AST=org.apache.geode.cache.query.internal.parse.ASTCompareOp>
+            |   TOK_GE^<AST=org.apache.geode.cache.query.internal.parse.ASTCompareOp>
             )
 
             (
@@ -777,7 +777,7 @@ inExpr :
 
         unaryExpr
         (
-            "in"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTIn> unaryExpr
+            "in"^<AST=org.apache.geode.cache.query.internal.parse.ASTIn> unaryExpr
         )?
     ;
 
@@ -786,9 +786,9 @@ unaryExpr :
         (
             (
                 TOK_PLUS!
-            |   TOK_MINUS^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTUnary>
+            |   TOK_MINUS^<AST=org.apache.geode.cache.query.internal.parse.ASTUnary>
             |   "abs"^
-            |   "not"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTUnary>
+            |   "not"^<AST=org.apache.geode.cache.query.internal.parse.ASTUnary>
             )
         )*
         postfixExpr
@@ -811,7 +811,7 @@ postfixExpr
             )*
             { if (cmplx) {
                 #postfixExpr = #([POSTFIX, "postfix",
-                   "com.gemstone.gemfire.cache.query.internal.parse.ASTPostfix"],
+                   "org.apache.geode.cache.query.internal.parse.ASTPostfix"],
                     #postfixExpr);
               }
             }
@@ -823,7 +823,7 @@ methodInvocation! [boolean implicitReceiver] :
             methodName:identifier args:argList  
             { #methodInvocation =
                 #([METHOD_INV, "methodInv",
-                    "com.gemstone.gemfire.cache.query.internal.parse.ASTMethodInvocation"],
+                    "org.apache.geode.cache.query.internal.parse.ASTMethodInvocation"],
                   #methodName, #args); 
               ((ASTMethodInvocation)#methodInvocation).setImplicitReceiver(implicitReceiver); }
         ;
@@ -852,14 +852,14 @@ index :
           | TOK_STAR
         )
         { #index = #([TOK_LBRACK, "index",
-            "com.gemstone.gemfire.cache.query.internal.parse.ASTCombination"],
+            "org.apache.geode.cache.query.internal.parse.ASTCombination"],
                 #index);
         }
     ;
 
 argList :
 
-        t:TOK_LPAREN^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTCombination>
+        t:TOK_LPAREN^<AST=org.apache.geode.cache.query.internal.parse.ASTCombination>
         (
             expr
             (
@@ -886,7 +886,7 @@ primaryExpr :
         |   queryParam
         |   literal
         |   TOK_LPAREN! query TOK_RPAREN!
-        |   RegionPath<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTRegionPath>
+        |   RegionPath<AST=org.apache.geode.cache.query.internal.parse.ASTRegionPath>
         )
     ;
 
@@ -896,7 +896,7 @@ conversionExpr :
 
 	    (
                   "listtoset"^
-              |   "element"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTConversionExpr>
+              |   "element"^<AST=org.apache.geode.cache.query.internal.parse.ASTConversionExpr>
             
               |   "distinct"^
               |   "flatten"^
@@ -905,7 +905,7 @@ conversionExpr :
         |
            (  
               (
-               "nvl"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTConversionExpr>
+               "nvl"^<AST=org.apache.geode.cache.query.internal.parse.ASTConversionExpr>
               )
               TOK_LPAREN!
               expr TOK_COMMA! expr
@@ -914,7 +914,7 @@ conversionExpr :
         |
            (  
               (
-               "to_date"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTConversionExpr>
+               "to_date"^<AST=org.apache.geode.cache.query.internal.parse.ASTConversionExpr>
               )
               TOK_LPAREN!
               stringLiteral TOK_COMMA! stringLiteral
@@ -942,7 +942,7 @@ aggregateExpr  { int aggFunc = -1; boolean distinctOnly = false; }:
 
              !("sum" {aggFunc = SUM;} | "avg" {aggFunc = AVG;} )
               TOK_LPAREN ("distinct"! {distinctOnly = true;} ) ? tokExpr1:expr TOK_RPAREN 
-              { #aggregateExpr = #([AGG_FUNC, "aggregate", "com.gemstone.gemfire.cache.query.internal.parse.ASTAggregateFunc"],
+              { #aggregateExpr = #([AGG_FUNC, "aggregate", "org.apache.geode.cache.query.internal.parse.ASTAggregateFunc"],
               #tokExpr1); 
                 ((ASTAggregateFunc)#aggregateExpr).setAggregateFunctionType(aggFunc);
                 ((ASTAggregateFunc)#aggregateExpr).setDistinctOnly(distinctOnly);
@@ -951,14 +951,14 @@ aggregateExpr  { int aggFunc = -1; boolean distinctOnly = false; }:
              |
              !("min" {aggFunc = MIN;} | "max" {aggFunc = MAX;} )
               TOK_LPAREN  tokExpr2:expr TOK_RPAREN 
-              { #aggregateExpr = #([AGG_FUNC, "aggregate", "com.gemstone.gemfire.cache.query.internal.parse.ASTAggregateFunc"],
+              { #aggregateExpr = #([AGG_FUNC, "aggregate", "org.apache.geode.cache.query.internal.parse.ASTAggregateFunc"],
               #tokExpr2); 
                 ((ASTAggregateFunc)#aggregateExpr).setAggregateFunctionType(aggFunc);               
                }
              
              |
-              "count"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTAggregateFunc>
-              TOK_LPAREN!  ( TOK_STAR <AST=com.gemstone.gemfire.cache.query.internal.parse.ASTDummy>
+              "count"^<AST=org.apache.geode.cache.query.internal.parse.ASTAggregateFunc>
+              TOK_LPAREN!  ( TOK_STAR <AST=org.apache.geode.cache.query.internal.parse.ASTDummy>
               | ("distinct"! {distinctOnly = true;} ) ? expr ) TOK_RPAREN! 
               {  
                  ((ASTAggregateFunc)#aggregateExpr).setAggregateFunctionType(COUNT);
@@ -970,8 +970,8 @@ aggregateExpr  { int aggFunc = -1; boolean distinctOnly = false; }:
 undefinedExpr :
 
         (
-            "is_undefined"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTUndefinedExpr>
-        |   "is_defined"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTUndefinedExpr>
+            "is_undefined"^<AST=org.apache.geode.cache.query.internal.parse.ASTUndefinedExpr>
+        |   "is_defined"^<AST=org.apache.geode.cache.query.internal.parse.ASTUndefinedExpr>
         )
         TOK_LPAREN!
         query
@@ -1004,7 +1004,7 @@ groupByList :
             expr
         )*
         /*{ #groupByList = #([COMBO, "groupByList",
-            "com.gemstone.gemfire.cache.query.internal.parse.ASTCombination"],
+            "org.apache.geode.cache.query.internal.parse.ASTCombination"],
                 #groupByList); }*/
   ;
 
@@ -1018,7 +1018,7 @@ fieldList :
             TOK_COLON! expr
         )*
         { #fieldList = #([COMBO, "fieldList",
-            "com.gemstone.gemfire.cache.query.internal.parse.ASTCombination"],
+            "org.apache.geode.cache.query.internal.parse.ASTCombination"],
                 #fieldList); }
     ;
 
@@ -1026,7 +1026,7 @@ collectionConstruction :
         (
             (
                 "array"^
-            |   "set"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTConstruction>
+            |   "set"^<AST=org.apache.geode.cache.query.internal.parse.ASTConstruction>
             |   "bag"^
             )
             argList
@@ -1050,7 +1050,7 @@ queryParam! :
 
         TOK_DOLLAR NUM_INT
         { #queryParam = #([QUERY_PARAM, "queryParam",
-               "com.gemstone.gemfire.cache.query.internal.parse.ASTParameter"],
+               "org.apache.geode.cache.query.internal.parse.ASTParameter"],
                    #NUM_INT); }
         
     ;
@@ -1060,26 +1060,26 @@ type :
       (
 //            ( "unsigned" )? // ignored
 //            (
-                typ00:"short"<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTType>
+                typ00:"short"<AST=org.apache.geode.cache.query.internal.parse.ASTType>
                     { #typ00.setJavaType(TypeUtils.getObjectType(Short.class)); }
-            |   typ01:"long"<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTType>
+            |   typ01:"long"<AST=org.apache.geode.cache.query.internal.parse.ASTType>
                     { #typ01.setJavaType(TypeUtils.getObjectType(Long.class)); }
 //            )
-        |   typ02:"int"<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTType>
+        |   typ02:"int"<AST=org.apache.geode.cache.query.internal.parse.ASTType>
                     { #typ02.setJavaType(TypeUtils.getObjectType(Integer.class)); }
-        |   typ03:"float"<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTType>
+        |   typ03:"float"<AST=org.apache.geode.cache.query.internal.parse.ASTType>
                     { #typ03.setJavaType(TypeUtils.getObjectType(Float.class)); }
-        |   typ04:"double"<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTType>
+        |   typ04:"double"<AST=org.apache.geode.cache.query.internal.parse.ASTType>
                     { #typ04.setJavaType(TypeUtils.getObjectType(Double.class)); }
-        |   typ05:"char"<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTType>
+        |   typ05:"char"<AST=org.apache.geode.cache.query.internal.parse.ASTType>
                     { #typ05.setJavaType(TypeUtils.getObjectType(Character.class)); }
-        |   typ06:"string"<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTType>
+        |   typ06:"string"<AST=org.apache.geode.cache.query.internal.parse.ASTType>
                     { #typ06.setJavaType(TypeUtils.getObjectType(String.class)); }
-        |   typ07:"boolean"<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTType>
+        |   typ07:"boolean"<AST=org.apache.geode.cache.query.internal.parse.ASTType>
                     { #typ07.setJavaType(TypeUtils.getObjectType(Boolean.class)); }
-        |   typ08:"byte"<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTType>
+        |   typ08:"byte"<AST=org.apache.geode.cache.query.internal.parse.ASTType>
                     { #typ08.setJavaType(TypeUtils.getObjectType(Byte.class)); } 
-        |   typ09:"octet"<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTType>
+        |   typ09:"octet"<AST=org.apache.geode.cache.query.internal.parse.ASTType>
                     { #typ09.setJavaType(TypeUtils.getObjectType(Byte.class)); }
         |   "enum"^ // unsupported
             (
@@ -1087,32 +1087,32 @@ type :
                 TOK_DOT
             )?
             identifier
-        |   typ10:"date"<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTType>
+        |   typ10:"date"<AST=org.apache.geode.cache.query.internal.parse.ASTType>
                     { #typ10.setJavaType(TypeUtils.getObjectType(java.sql.Date.class)); }
-        |   typ11:"time"<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTType>
+        |   typ11:"time"<AST=org.apache.geode.cache.query.internal.parse.ASTType>
                     { #typ11.setJavaType(TypeUtils.getObjectType(java.sql.Time.class)); }
         |   "interval" // unsupported
-        |   typ12:"timestamp"<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTType>
+        |   typ12:"timestamp"<AST=org.apache.geode.cache.query.internal.parse.ASTType>
                     { #typ12.setJavaType(TypeUtils.getObjectType(java.sql.Timestamp.class)); }
-        |   typ13:"set"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTType>
+        |   typ13:"set"^<AST=org.apache.geode.cache.query.internal.parse.ASTType>
                 TOK_LT! type TOK_GT!
                     { #typ13.setJavaType(new CollectionTypeImpl(Set.class, TypeUtils.OBJECT_TYPE /*resolved later*/)); } 
-        |   typ14:"collection"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTType>
+        |   typ14:"collection"^<AST=org.apache.geode.cache.query.internal.parse.ASTType>
                 TOK_LT! type TOK_GT!
                     { #typ14.setJavaType(new CollectionTypeImpl(Collection.class, TypeUtils.OBJECT_TYPE /*resolved later*/)); } 
         |   "bag"^ TOK_LT! type TOK_GT! // not supported
-        |   typ15:"list"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTType> TOK_LT! type TOK_GT!
+        |   typ15:"list"^<AST=org.apache.geode.cache.query.internal.parse.ASTType> TOK_LT! type TOK_GT!
                     { #typ15.setJavaType(new CollectionTypeImpl(List.class, TypeUtils.OBJECT_TYPE /*resolved later*/)); }
-        |   typ16:"array"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTType> TOK_LT! type TOK_GT!
+        |   typ16:"array"^<AST=org.apache.geode.cache.query.internal.parse.ASTType> TOK_LT! type TOK_GT!
                     { #typ16.setJavaType(new CollectionTypeImpl(Object[].class, TypeUtils.OBJECT_TYPE /*resolved later*/)); }
-        |   (typ17:"dictionary"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTType>
+        |   (typ17:"dictionary"^<AST=org.apache.geode.cache.query.internal.parse.ASTType>
                     { #typ17.setJavaType(new MapTypeImpl(Map.class, TypeUtils.OBJECT_TYPE , TypeUtils.OBJECT_TYPE /*resolved later*/)); }
-                | typ18:"map"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTType>
+                | typ18:"map"^<AST=org.apache.geode.cache.query.internal.parse.ASTType>
                     { #typ18.setJavaType(new MapTypeImpl(Map.class, TypeUtils.OBJECT_TYPE , TypeUtils.OBJECT_TYPE /*resolved later*/)); }
             )
             TOK_LT! type TOK_COMMA! type TOK_GT!
         |!   id:identifier { String txt = #id.getText();
-                #type = #[Identifier, txt, "com.gemstone.gemfire.cache.query.internal.parse.ASTType"];
+                #type = #[Identifier, txt, "org.apache.geode.cache.query.internal.parse.ASTType"];
                  ((ASTType)#type).setTypeName(txt); }
       )
       
@@ -1133,25 +1133,25 @@ literal :
 
 objectLiteral :
 
-        "nil"<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTLiteral>
-      | "null"<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTLiteral>
-      | "undefined"<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTLiteral>
+        "nil"<AST=org.apache.geode.cache.query.internal.parse.ASTLiteral>
+      | "null"<AST=org.apache.geode.cache.query.internal.parse.ASTLiteral>
+      | "undefined"<AST=org.apache.geode.cache.query.internal.parse.ASTLiteral>
     ;
 
 booleanLiteral :
 
         (
-            "true"<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTLiteral>
-        |   "false"<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTLiteral>
+            "true"<AST=org.apache.geode.cache.query.internal.parse.ASTLiteral>
+        |   "false"<AST=org.apache.geode.cache.query.internal.parse.ASTLiteral>
         )
     ;
 
 numericLiteral :
 
-        (   NUM_INT<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTLiteral>
-          | NUM_LONG<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTLiteral>
-          | NUM_FLOAT<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTLiteral>
-          | NUM_DOUBLE<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTLiteral>
+        (   NUM_INT<AST=org.apache.geode.cache.query.internal.parse.ASTLiteral>
+          | NUM_LONG<AST=org.apache.geode.cache.query.internal.parse.ASTLiteral>
+          | NUM_FLOAT<AST=org.apache.geode.cache.query.internal.parse.ASTLiteral>
+          | NUM_DOUBLE<AST=org.apache.geode.cache.query.internal.parse.ASTLiteral>
         )
         
     ;
@@ -1159,37 +1159,37 @@ numericLiteral :
 
 charLiteral :
 
-        "char"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTLiteral>
+        "char"^<AST=org.apache.geode.cache.query.internal.parse.ASTLiteral>
             StringLiteral
     ;
 
 
 stringLiteral :
 
-        StringLiteral<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTLiteral>
+        StringLiteral<AST=org.apache.geode.cache.query.internal.parse.ASTLiteral>
     ;
 
 dateLiteral :
 
-        "date"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTLiteral>
+        "date"^<AST=org.apache.geode.cache.query.internal.parse.ASTLiteral>
             StringLiteral
     ;
 
 timeLiteral :
 
-        "time"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTLiteral>
+        "time"^<AST=org.apache.geode.cache.query.internal.parse.ASTLiteral>
             StringLiteral
     ;
 
 timestampLiteral :
 
-        "timestamp"^<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTLiteral>
+        "timestamp"^<AST=org.apache.geode.cache.query.internal.parse.ASTLiteral>
            StringLiteral
     ;
 
 identifier :
-        Identifier<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTIdentifier>
-    |   q:QuotedIdentifier<AST=com.gemstone.gemfire.cache.query.internal.parse.ASTIdentifier> 
+        Identifier<AST=org.apache.geode.cache.query.internal.parse.ASTIdentifier>
+    |   q:QuotedIdentifier<AST=org.apache.geode.cache.query.internal.parse.ASTIdentifier> 
             { #q.setType(Identifier); }
     ;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java
index f8f4b50..aeb3430 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/CollectionTypeImpl.java
@@ -15,22 +15,22 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.query.internal.types;
+package org.apache.geode.cache.query.internal.types;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.util.*;
 
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.query.internal.NWayMergeResults;
-import com.gemstone.gemfire.cache.query.internal.Ordered;
-import com.gemstone.gemfire.cache.query.internal.ResultsSet;
-import com.gemstone.gemfire.cache.query.internal.SortedResultSet;
-import com.gemstone.gemfire.cache.query.internal.SortedStructSet;
-import com.gemstone.gemfire.cache.query.internal.StructSet;
-import com.gemstone.gemfire.cache.query.types.*;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.query.internal.NWayMergeResults;
+import org.apache.geode.cache.query.internal.Ordered;
+import org.apache.geode.cache.query.internal.ResultsSet;
+import org.apache.geode.cache.query.internal.SortedResultSet;
+import org.apache.geode.cache.query.internal.SortedStructSet;
+import org.apache.geode.cache.query.internal.StructSet;
+import org.apache.geode.cache.query.types.*;
 
 /**
  * Implementation of CollectionType

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ExtendedNumericComparator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ExtendedNumericComparator.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ExtendedNumericComparator.java
index 649a8c2..f5b8afb 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ExtendedNumericComparator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ExtendedNumericComparator.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.query.internal.types;
+package org.apache.geode.cache.query.internal.types;
 
 import java.util.*;
 
-import com.gemstone.gemfire.cache.query.internal.NullToken;
-import com.gemstone.gemfire.cache.query.internal.Undefined;
+import org.apache.geode.cache.query.internal.NullToken;
+import org.apache.geode.cache.query.internal.Undefined;
 
 /**
  * A general comparator that will let us compare different numeric types for equality

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
index 4943e97..b3b36f0 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/MapTypeImpl.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.query.internal.types;
+package org.apache.geode.cache.query.internal.types;
 
 import java.io.*;
-import com.gemstone.gemfire.cache.query.types.*;
-import com.gemstone.gemfire.DataSerializer;
+import org.apache.geode.cache.query.types.*;
+import org.apache.geode.DataSerializer;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/NumericComparator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/NumericComparator.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/NumericComparator.java
index a09313c..5978cff 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/NumericComparator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/NumericComparator.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.query.internal.types;
+package org.apache.geode.cache.query.internal.types;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ObjectTypeImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ObjectTypeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ObjectTypeImpl.java
index 9ea5d63..5d488af 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ObjectTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/ObjectTypeImpl.java
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.query.internal.types;
+package org.apache.geode.cache.query.internal.types;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.cache.query.types.ObjectType;
-import com.gemstone.gemfire.internal.DataSerializableFixedID;
-import com.gemstone.gemfire.internal.ClassPathLoader;
-import com.gemstone.gemfire.internal.InternalDataSerializer;
-import com.gemstone.gemfire.internal.Version;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.cache.query.types.ObjectType;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.ClassPathLoader;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.Version;
 
 /**
  * Implementation of ObjectType

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
index 1b7aa50..926ef51 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/StructTypeImpl.java
@@ -15,19 +15,19 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.query.internal.types;
+package org.apache.geode.cache.query.internal.types;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.util.*;
 
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.cache.query.*;
-import com.gemstone.gemfire.cache.query.types.*;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.types.*;
 
-import com.gemstone.gemfire.cache.query.internal.*;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.geode.cache.query.internal.*;
+import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Implementation of StructType

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TemporalComparator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TemporalComparator.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TemporalComparator.java
index 0bbba7f..6c78068 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TemporalComparator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TemporalComparator.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.query.internal.types;
+package org.apache.geode.cache.query.internal.types;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TypeUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TypeUtils.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TypeUtils.java
index d244798..d2405dc 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TypeUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TypeUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.query.internal.types;
+package org.apache.geode.cache.query.internal.types;
 
 
 import java.util.Arrays;
@@ -24,19 +24,19 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import com.gemstone.gemfire.InternalGemFireError;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.query.QueryService;
-import com.gemstone.gemfire.cache.query.TypeMismatchException;
-import com.gemstone.gemfire.cache.query.internal.Support;
-import com.gemstone.gemfire.cache.query.internal.Undefined;
-import com.gemstone.gemfire.cache.query.internal.parse.OQLLexerTokenTypes;
-import com.gemstone.gemfire.cache.query.types.MapType;
-import com.gemstone.gemfire.cache.query.types.ObjectType;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.pdx.internal.EnumInfo.PdxInstanceEnumInfo;
-import com.gemstone.gemfire.pdx.internal.PdxInstanceEnum;
-import com.gemstone.gemfire.pdx.internal.PdxString;
+import org.apache.geode.InternalGemFireError;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.TypeMismatchException;
+import org.apache.geode.cache.query.internal.Support;
+import org.apache.geode.cache.query.internal.Undefined;
+import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
+import org.apache.geode.cache.query.types.MapType;
+import org.apache.geode.cache.query.types.ObjectType;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.pdx.internal.EnumInfo.PdxInstanceEnumInfo;
+import org.apache.geode.pdx.internal.PdxInstanceEnum;
+import org.apache.geode.pdx.internal.PdxString;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/utils/LimitIterator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/utils/LimitIterator.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/utils/LimitIterator.java
index af9e88d..4083613 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/utils/LimitIterator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/utils/LimitIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.query.internal.utils;
+package org.apache.geode.cache.query.internal.utils;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/internal/utils/PDXUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/utils/PDXUtils.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/utils/PDXUtils.java
index 3bbeb33..b0457d0 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/utils/PDXUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/utils/PDXUtils.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.utils;
+package org.apache.geode.cache.query.internal.utils;
 
-import com.gemstone.gemfire.cache.CacheException;
-import com.gemstone.gemfire.cache.query.internal.StructImpl;
-import com.gemstone.gemfire.internal.cache.VMCachedDeserializable;
-import com.gemstone.gemfire.pdx.PdxInstance;
-import com.gemstone.gemfire.pdx.internal.PdxString;
+import org.apache.geode.cache.CacheException;
+import org.apache.geode.cache.query.internal.StructImpl;
+import org.apache.geode.internal.cache.VMCachedDeserializable;
+import org.apache.geode.pdx.PdxInstance;
+import org.apache.geode.pdx.internal.PdxString;
 
 public class PDXUtils {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/package.html
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/package.html b/geode-core/src/main/java/org/apache/geode/cache/query/package.html
index c11298d..c7829cf 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/package.html
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/package.html
@@ -18,7 +18,7 @@ limitations under the License.
 <HTML>
 <HEAD>
 	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
-	<TITLE>com.gemstone.gemfire.cache.query</TITLE>
+	<TITLE>org.apache.geode.cache.query</TITLE>
 	<META NAME="GENERATOR" CONTENT="OpenOffice.org 1.1.4  (Solaris Sparc)">
 	<META NAME="CREATED" CONTENT="20050524;10003600">
 	<META NAME="CHANGEDBY" CONTENT="Eric Zoerner">
@@ -37,15 +37,15 @@ of a high-level query language. The query language allows you to
 access the data based on multiple attributes and to tranform the
 results. The service also allows you to create indexes in order to
 optimize the performance of data retrieval<B>. <BR></B><BR>The
-{@linkplain com.gemstone.gemfire.cache.query.QueryService
+{@linkplain org.apache.geode.cache.query.QueryService
 QueryService} interface provides the public entry point to query
 execution, query compilation, and index creation. A <TT>QueryService
 </TT>instance is obtained from {@linkplain
-com.gemstone.gemfire.cache.Cache#getQueryService}. Queries can also
+org.apache.geode.cache.Cache#getQueryService}. Queries can also
 be performed by using the shortcut methods {@linkplain
-com.gemstone.gemfire.cache.Region#query}, {@linkplain
-com.gemstone.gemfire.cache.Region#selectValue}, and {@linkplain
-com.gemstone.gemfire.cache.Region#existsValue}. 
+org.apache.geode.cache.Region#query}, {@linkplain
+org.apache.geode.cache.Region#selectValue}, and {@linkplain
+org.apache.geode.cache.Region#existsValue}. 
 </P>
 <P>This package description contains the following sections: 
 </P>
@@ -116,7 +116,7 @@ com.gemstone.gemfire.cache.Region#existsValue}.
 	generate structs whose elements can be referred to as an attribute
 	in the query language. Structures that are returned to Java are
 	immutable and implement the {@linkplain
-	com.gemstone.gemfire.cache.query.Struct Struct} interface. 
+	org.apache.geode.cache.query.Struct Struct} interface. 
 	</DD></DL>
 <H1>
 <A NAME="Query_Language"></A>Query Language</H1>
@@ -183,7 +183,7 @@ the keys or entries of the region. To facilitate this, when a region
 path evaluates to a Region in the context of a query, the type of
 object it refers to has the following interface: 
 </P>
-<PRE STYLE="margin-bottom: 0.2in"> interface QRegion extends com.gemstone.gemfire.cache.Region, java.util.Collection { }</PRE><P>
+<PRE STYLE="margin-bottom: 0.2in"> interface QRegion extends org.apache.geode.cache.Region, java.util.Collection { }</PRE><P>
 Thus, the interface inherits all the attributes and methods from both
 Region and Collection. When used as a Collection, the elements are
 the values of the region. This enables a query to use a Region as
@@ -225,7 +225,7 @@ is bound to a collection, or a nested SELECT statement. &nbsp;
 <H3><A NAME="SelectResults"></A><A NAME="Result of a Select Statement|outline"></A>
 Result of a Select Statement</H3>
 <P>The result of a SELECT statement is a collection that implements
-the {@linkplain com.gemstone.gemfire.cache.query.SelectResults
+the {@linkplain org.apache.geode.cache.query.SelectResults
 SelectResults} interface.</P>
 <P>The SelectResults is a simple collection of unstructured objects
 in two cases:</P>
@@ -563,7 +563,7 @@ same path found in a WHERE clause when used to compare against a
 constant expression (i.e. an expression that does not depend on the
 iterator context) using the relational operators. The exact use and
 specification of the indexedExpression varies depending on the index
-type. See {@linkplain com.gemstone.gemfire.cache.query.IndexType}. No
+type. See {@linkplain org.apache.geode.cache.query.IndexType}. No
 query parameters or region paths are permitted.</P>
 <P>The <I>imports</I> provides packages and classes used in variable
 typing and typecasts.</P>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/types/CollectionType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/types/CollectionType.java b/geode-core/src/main/java/org/apache/geode/cache/query/types/CollectionType.java
index ad2ddaf..e62f32f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/types/CollectionType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/types/CollectionType.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.query.types;
+package org.apache.geode.cache.query.types;
 
 /**
  * Represents the type of a collection, an object that can contain element

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/types/MapType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/types/MapType.java b/geode-core/src/main/java/org/apache/geode/cache/query/types/MapType.java
index d532f53..ea555d1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/types/MapType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/types/MapType.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.query.types;
+package org.apache.geode.cache.query.types;
 
 /**
  * Represents the type of a Map, a collection that contains keys as well

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/types/ObjectType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/types/ObjectType.java b/geode-core/src/main/java/org/apache/geode/cache/query/types/ObjectType.java
index 92ce907..2057a9c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/types/ObjectType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/types/ObjectType.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.query.types;
+package org.apache.geode.cache.query.types;
 
-import com.gemstone.gemfire.DataSerializable;
+import org.apache.geode.DataSerializable;
 
 /**
  * An ObjectType represents the type of an object in a query.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/query/types/StructType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/types/StructType.java b/geode-core/src/main/java/org/apache/geode/cache/query/types/StructType.java
index 92c3d59..ef0390f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/types/StructType.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/types/StructType.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.query.types;
+package org.apache.geode.cache.query.types;
 
 
 /**
  * Describes the field names and types for each field in a {@link
- * com.gemstone.gemfire.cache.query.Struct}.
+ * org.apache.geode.cache.query.Struct}.
  *
  * @since GemFire 4.0
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/server/CacheServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/CacheServer.java b/geode-core/src/main/java/org/apache/geode/cache/server/CacheServer.java
index 57d7984..910f34d 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/server/CacheServer.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/CacheServer.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.server;
+package org.apache.geode.cache.server;
 
 import java.io.IOException;
 import java.util.Set;
 
-import com.gemstone.gemfire.cache.ClientSession;
-import com.gemstone.gemfire.cache.InterestRegistrationListener;
-import com.gemstone.gemfire.cache.client.Pool;
-import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig;
-import com.gemstone.gemfire.cache.server.ServerLoadProbe;
-import com.gemstone.gemfire.cache.server.internal.ConnectionCountProbe;
-import com.gemstone.gemfire.distributed.DistributedMember;
+import org.apache.geode.cache.ClientSession;
+import org.apache.geode.cache.InterestRegistrationListener;
+import org.apache.geode.cache.client.Pool;
+import org.apache.geode.cache.server.ClientSubscriptionConfig;
+import org.apache.geode.cache.server.ServerLoadProbe;
+import org.apache.geode.cache.server.internal.ConnectionCountProbe;
+import org.apache.geode.distributed.DistributedMember;
 
 /**
  * A cache server that serves the contents of a
@@ -34,8 +34,8 @@ import com.gemstone.gemfire.distributed.DistributedMember;
  * client {@link Pool} to connect two regions
  * that reside in different distributed systems.
  *
- * @see com.gemstone.gemfire.cache.Cache#addCacheServer
- * @see com.gemstone.gemfire.cache.Cache#getCacheServers
+ * @see org.apache.geode.cache.Cache#addCacheServer
+ * @see org.apache.geode.cache.Cache#getCacheServers
  *
  * @since GemFire 5.7
  */
@@ -175,7 +175,7 @@ public interface CacheServer {
    * <p>Setting a specific bind address will cause the cache server to always
    * use this address and ignore any address specified by "server-bind-address"
    * or "bind-address" in the <code>gemfire.properties</code> file
-   * (see {@link com.gemstone.gemfire.distributed.DistributedSystem}
+   * (see {@link org.apache.geode.distributed.DistributedSystem}
    * for a description of these properties).
    * <p> The value <code>""</code> does not override the <code>gemfire.properties</code>.
    * It will cause the local machine's default address to be listened on if the

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/server/ClientSubscriptionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/ClientSubscriptionConfig.java b/geode-core/src/main/java/org/apache/geode/cache/server/ClientSubscriptionConfig.java
index 9a4316c..62a9401 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/server/ClientSubscriptionConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/ClientSubscriptionConfig.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.server;
+package org.apache.geode.cache.server;
 
 /**
  * Used to configure queuing on a cache server for client subscriptions.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoad.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoad.java b/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoad.java
index a0247f9..d94e0a9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoad.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoad.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.server;
+package org.apache.geode.cache.server;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import com.gemstone.gemfire.DataSerializable;
+import org.apache.geode.DataSerializable;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoadProbe.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoadProbe.java b/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoadProbe.java
index 0848e94..03cdd92 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoadProbe.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoadProbe.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.server;
+package org.apache.geode.cache.server;
 
-import com.gemstone.gemfire.cache.CacheCallback;
+import org.apache.geode.cache.CacheCallback;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoadProbeAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoadProbeAdapter.java b/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoadProbeAdapter.java
index e64629a..905df15 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoadProbeAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/ServerLoadProbeAdapter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.server;
+package org.apache.geode.cache.server;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/server/ServerMetrics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/ServerMetrics.java b/geode-core/src/main/java/org/apache/geode/cache/server/ServerMetrics.java
index 081cfb0..aba4b4a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/server/ServerMetrics.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/ServerMetrics.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.server;
+package org.apache.geode.cache.server;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/server/internal/ConnectionCountProbe.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/internal/ConnectionCountProbe.java b/geode-core/src/main/java/org/apache/geode/cache/server/internal/ConnectionCountProbe.java
index 59052f4..1754e7e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/server/internal/ConnectionCountProbe.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/internal/ConnectionCountProbe.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.server.internal;
+package org.apache.geode.cache.server.internal;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.util.Properties;
 
-import com.gemstone.gemfire.DataSerializable;
-import com.gemstone.gemfire.cache.server.ServerLoad;
-import com.gemstone.gemfire.cache.server.ServerLoadProbeAdapter;
-import com.gemstone.gemfire.cache.server.ServerMetrics;
-import com.gemstone.gemfire.internal.cache.xmlcache.Declarable2;
+import org.apache.geode.DataSerializable;
+import org.apache.geode.cache.server.ServerLoad;
+import org.apache.geode.cache.server.ServerLoadProbeAdapter;
+import org.apache.geode.cache.server.ServerMetrics;
+import org.apache.geode.internal.cache.xmlcache.Declarable2;
 
 /**
  * A load probe which returns load as a function of the

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/server/internal/LoadMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/internal/LoadMonitor.java b/geode-core/src/main/java/org/apache/geode/cache/server/internal/LoadMonitor.java
index f98e2e1..2de4932 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/server/internal/LoadMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/internal/LoadMonitor.java
@@ -14,28 +14,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.server.internal;
+package org.apache.geode.cache.server.internal;
 
 import java.util.ArrayList;
 import java.util.Set;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.CancelException;
-import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.cache.client.internal.CacheServerLoadMessage;
-import com.gemstone.gemfire.cache.server.ServerLoad;
-import com.gemstone.gemfire.cache.server.ServerLoadProbe;
-import com.gemstone.gemfire.distributed.internal.ServerLocation;
-import com.gemstone.gemfire.distributed.internal.membership.MembershipManager;
-import com.gemstone.gemfire.internal.cache.CacheServerAdvisor;
-import com.gemstone.gemfire.internal.cache.tier.Acceptor;
-import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerStats;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ConnectionListener;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.CancelException;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.cache.client.internal.CacheServerLoadMessage;
+import org.apache.geode.cache.server.ServerLoad;
+import org.apache.geode.cache.server.ServerLoadProbe;
+import org.apache.geode.distributed.internal.ServerLocation;
+import org.apache.geode.distributed.internal.membership.MembershipManager;
+import org.apache.geode.internal.cache.CacheServerAdvisor;
+import org.apache.geode.internal.cache.tier.Acceptor;
+import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
+import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
+import org.apache.geode.internal.cache.tier.sockets.ConnectionListener;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
 /**
  * A class which monitors the load on a bridge server and 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/server/internal/ServerMetricsImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/internal/ServerMetricsImpl.java b/geode-core/src/main/java/org/apache/geode/cache/server/internal/ServerMetricsImpl.java
index bcfc4af..b63455d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/server/internal/ServerMetricsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/internal/ServerMetricsImpl.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.server.internal;
+package org.apache.geode.cache.server.internal;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import com.gemstone.gemfire.cache.server.ServerMetrics;
+import org.apache.geode.cache.server.ServerMetrics;
 
 /**
  * Metrics describing the load on a  bridge server.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/server/package.html
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/package.html b/geode-core/src/main/java/org/apache/geode/cache/server/package.html
index 42db083..d323ad0 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/server/package.html
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/package.html
@@ -17,25 +17,25 @@ limitations under the License.
 -->
 <HTML>
   <HEAD>
-    <TITLE>com.gemstone.gemfire.cache.server package</TITLE>
+    <TITLE>org.apache.geode.cache.server package</TITLE>
   </HEAD>
   <BODY>
-  The <code>com.gemstone.gemfire.cache.server</code> package provides APIs used
+  The <code>org.apache.geode.cache.server</code> package provides APIs used
   for the server side of client/server caching.
 <p>
-A {@link com.gemstone.gemfire.cache.server.CacheServer cache server} can be
+A {@link org.apache.geode.cache.server.CacheServer cache server} can be
 declared using the <code>cache-server</code> element described in the
 <code>cache6_5.dtd</code>.
 <p>
-Or it can be created by calling {@link com.gemstone.gemfire.cache.Cache#addCacheServer}.
+Or it can be created by calling {@link org.apache.geode.cache.Cache#addCacheServer}.
 <p>
 Another option is to use the <code>cacheserver</code> executable which can be found
 in the GemFire <code>bin</code> directory.
 <p>
 To obtain an instance of <code>CacheServer</code> that has already been created
-use {@link com.gemstone.gemfire.cache.Cache#getCacheServers}.
+use {@link org.apache.geode.cache.Cache#getCacheServers}.
 <p>
-See the <a href="{@docRoot}/com/gemstone/gemfire/cache/client/package-summary.html#package_description">client</a> package for information
+See the <a href="{@docRoot}/org/apache/geode/cache/client/package-summary.html#package_description">client</a> package for information
 on how to create clients that will connect to and access the cache in your
 cache server.
   </BODY>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/snapshot/CacheSnapshotService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/snapshot/CacheSnapshotService.java b/geode-core/src/main/java/org/apache/geode/cache/snapshot/CacheSnapshotService.java
index 3c57817..7af469c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/snapshot/CacheSnapshotService.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/snapshot/CacheSnapshotService.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.snapshot;
+package org.apache.geode.cache.snapshot;
 
 import java.io.File;
 import java.io.IOException;
 
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.Instantiator;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.snapshot.SnapshotOptions.SnapshotFormat;
-import com.gemstone.gemfire.pdx.PdxSerializer;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.Instantiator;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.snapshot.SnapshotOptions.SnapshotFormat;
+import org.apache.geode.pdx.PdxSerializer;
 
 /**
  * Allows a snapshot of cache data to be imported and exported. Each region in 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/snapshot/RegionSnapshotService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/snapshot/RegionSnapshotService.java b/geode-core/src/main/java/org/apache/geode/cache/snapshot/RegionSnapshotService.java
index 32d8c45..ed9a214 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/snapshot/RegionSnapshotService.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/snapshot/RegionSnapshotService.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.snapshot;
+package org.apache.geode.cache.snapshot;
 
 import java.io.File;
 import java.io.IOException;
 
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.Instantiator;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.snapshot.SnapshotOptions.SnapshotFormat;
-import com.gemstone.gemfire.pdx.PdxSerializer;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.Instantiator;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.snapshot.SnapshotOptions.SnapshotFormat;
+import org.apache.geode.pdx.PdxSerializer;
 
 /**
  * Allows a snapshot of region data to be imported and exported. Example usage:

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotFilter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotFilter.java b/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotFilter.java
index 0c7cc81..4fa7e4d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotFilter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotFilter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.snapshot;
+package org.apache.geode.cache.snapshot;
 
 import java.io.Serializable;
 import java.util.Map.Entry;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotIterator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotIterator.java b/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotIterator.java
index 07206ca..30c566f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotIterator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.snapshot;
+package org.apache.geode.cache.snapshot;
 
 import java.io.IOException;
 import java.util.NoSuchElementException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotOptions.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotOptions.java b/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotOptions.java
index 01b4196..b3f3386 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotOptions.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotOptions.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.snapshot;
+package org.apache.geode.cache.snapshot;
 
 import java.io.Serializable;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotReader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotReader.java b/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotReader.java
index 31e4f99..695025a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotReader.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/snapshot/SnapshotReader.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.snapshot;
+package org.apache.geode.cache.snapshot;
 
 import java.io.File;
 import java.io.IOException;
 
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.Instantiator;
-import com.gemstone.gemfire.internal.cache.snapshot.GFSnapshot;
-import com.gemstone.gemfire.pdx.PdxSerializer;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.Instantiator;
+import org.apache.geode.internal.cache.snapshot.GFSnapshot;
+import org.apache.geode.pdx.PdxSerializer;
 
 /**
  * Provides utilities for reading cache data.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/snapshot/package.html
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/snapshot/package.html b/geode-core/src/main/java/org/apache/geode/cache/snapshot/package.html
index 6239302..a5801c9 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/snapshot/package.html
+++ b/geode-core/src/main/java/org/apache/geode/cache/snapshot/package.html
@@ -17,7 +17,7 @@ limitations under the License.
 -->
 <html>
 <head>
- <title>com.gemstone.gemfire.cache.snapshot</title>
+ <title>org.apache.geode.cache.snapshot</title>
 </head>
 <body>
 
@@ -25,18 +25,18 @@ limitations under the License.
 Each snapshot file contains the cache entries (key/value pairs) for a given 
 region.</p>
 
-<p>The {@link com.gemstone.gemfire.cache.snapshot.RegionSnapshotService} can be 
+<p>The {@link org.apache.geode.cache.snapshot.RegionSnapshotService} can be 
 obtained for an individual region using 
-{@link com.gemstone.gemfire.cache.Region#getSnapshotService}. To obtain a 
-{@link com.gemstone.gemfire.cache.snapshot.CacheSnapshotService} (across all 
-regions), invoke {@link com.gemstone.gemfire.cache.Cache#getSnapshotService}.</p>
+{@link org.apache.geode.cache.Region#getSnapshotService}. To obtain a 
+{@link org.apache.geode.cache.snapshot.CacheSnapshotService} (across all 
+regions), invoke {@link org.apache.geode.cache.Cache#getSnapshotService}.</p>
 
-<p>The {@link com.gemstone.gemfire.cache.snapshot.SnapshotOptions} can be used to
+<p>The {@link org.apache.geode.cache.snapshot.SnapshotOptions} can be used to
 configure the behavior of import and export operations.</p>
 
-<p>The {@link com.gemstone.gemfire.cache.snapshot.SnapshotReader} can be used to
+<p>The {@link org.apache.geode.cache.snapshot.SnapshotReader} can be used to
 programmatically read a snapshot created using the GEMFIRE
-{@link com.gemstone.gemfire.cache.snapshot.SnapshotOptions.SnapshotFormat} 
+{@link org.apache.geode.cache.snapshot.SnapshotOptions.SnapshotFormat} 
 format.</p>
 
 Example usage:

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/util/CacheListenerAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/CacheListenerAdapter.java b/geode-core/src/main/java/org/apache/geode/cache/util/CacheListenerAdapter.java
index ccbf5b5..4d23081 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/CacheListenerAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/CacheListenerAdapter.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.util;
+package org.apache.geode.cache.util;
 
-import com.gemstone.gemfire.cache.CacheListener;
-import com.gemstone.gemfire.cache.Declarable;
-import com.gemstone.gemfire.cache.EntryEvent;
-import com.gemstone.gemfire.cache.RegionEvent;
+import org.apache.geode.cache.CacheListener;
+import org.apache.geode.cache.Declarable;
+import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.cache.RegionEvent;
 
 /**
  * <p>Utility class that implements all methods in <code>CacheListener</code>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/util/CacheWriterAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/CacheWriterAdapter.java b/geode-core/src/main/java/org/apache/geode/cache/util/CacheWriterAdapter.java
index 60f23ed..9917d1b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/CacheWriterAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/CacheWriterAdapter.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.util;
+package org.apache.geode.cache.util;
 
-import com.gemstone.gemfire.cache.CacheWriter;
-import com.gemstone.gemfire.cache.CacheWriterException;
-import com.gemstone.gemfire.cache.EntryEvent;
-import com.gemstone.gemfire.cache.RegionEvent;
+import org.apache.geode.cache.CacheWriter;
+import org.apache.geode.cache.CacheWriterException;
+import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.cache.RegionEvent;
 
 /**
  * Utility class that implements all methods in <code>CacheWriter</code>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/util/CqListenerAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/CqListenerAdapter.java b/geode-core/src/main/java/org/apache/geode/cache/util/CqListenerAdapter.java
index ef2397e..2df8d7e 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/util/CqListenerAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/CqListenerAdapter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.util;
+package org.apache.geode.cache.util;
 
 /**
  * Abstract class for CqListener. 
@@ -26,8 +26,8 @@ package com.gemstone.gemfire.cache.util;
  * @since GemFire 5.1
  */
 
-import com.gemstone.gemfire.cache.query.CqListener;
-import com.gemstone.gemfire.cache.query.CqEvent;
+import org.apache.geode.cache.query.CqListener;
+import org.apache.geode.cache.query.CqEvent;
 
 public abstract class CqListenerAdapter implements CqListener {
   
@@ -58,7 +58,7 @@ public abstract class CqListenerAdapter implements CqListener {
   * <p>It is possible for this method to be called multiple times on a single
   * callback instance, so implementations must be tolerant of this.
   *
-  * @see com.gemstone.gemfire.cache.CacheCallback#close
+  * @see org.apache.geode.cache.CacheCallback#close
   */
   public void close() {
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/util/Gateway.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/Gateway.java b/geode-core/src/main/java/org/apache/geode/cache/util/Gateway.java
index 296bc02..b0a39df 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/Gateway.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/Gateway.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.util;
+package org.apache.geode.cache.util;
 
 /**
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictHelper.java b/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictHelper.java
index 255c710..19ed42d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictHelper.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.util;
+package org.apache.geode.cache.util;
 
 /**
  * GatewayConflictHelper is used by an GatewayConflictResolver to decide what to

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictResolver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictResolver.java b/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictResolver.java
index 208a225..41a3509 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/GatewayConflictResolver.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.util;
+package org.apache.geode.cache.util;
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/util/GatewayEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/GatewayEvent.java b/geode-core/src/main/java/org/apache/geode/cache/util/GatewayEvent.java
index a73b6d1..e0d131f 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/util/GatewayEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/GatewayEvent.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache.util;
+package org.apache.geode.cache.util;
 
-import com.gemstone.gemfire.cache.Operation;
-import com.gemstone.gemfire.cache.Region;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.Region;
 
 /**
  * Interface <code>GatewayEvent</code> represents <code>Cache</code> events
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.cache.Region;
  *
  * @since GemFire 5.1
  * 
- * @deprecated as of GemFire 8.0. Use {@link com.gemstone.gemfire.cache.wan.GatewayQueueEvent} instead
+ * @deprecated as of GemFire 8.0. Use {@link org.apache.geode.cache.wan.GatewayQueueEvent} instead
  * 
  */
 @Deprecated

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/util/ObjectSizer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/ObjectSizer.java b/geode-core/src/main/java/org/apache/geode/cache/util/ObjectSizer.java
index 895fa69..cf55e36 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/util/ObjectSizer.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/ObjectSizer.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.util;
+package org.apache.geode.cache.util;
 
-import com.gemstone.gemfire.cache.EvictionAttributes;
-import com.gemstone.gemfire.internal.size.ReflectionObjectSizer;
-import com.gemstone.gemfire.internal.size.SizeClassOnceObjectSizer;
+import org.apache.geode.cache.EvictionAttributes;
+import org.apache.geode.internal.size.ReflectionObjectSizer;
+import org.apache.geode.internal.size.SizeClassOnceObjectSizer;
 
 /**
  * The sizer interface defines a method that when called returns the size of the

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/util/ObjectSizerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/ObjectSizerImpl.java b/geode-core/src/main/java/org/apache/geode/cache/util/ObjectSizerImpl.java
index 8fbd0e8..d1ca256 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/util/ObjectSizerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/ObjectSizerImpl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.util;
+package org.apache.geode.cache.util;
 
 /**
  * This class provides an implementation of the ObjectSizer interface. This

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/util/RegionMembershipListenerAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/RegionMembershipListenerAdapter.java b/geode-core/src/main/java/org/apache/geode/cache/util/RegionMembershipListenerAdapter.java
index a4167bf..adf3f28 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/RegionMembershipListenerAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/RegionMembershipListenerAdapter.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.util;
+package org.apache.geode.cache.util;
 
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.RegionEvent;
-import com.gemstone.gemfire.cache.RegionMembershipListener;
-import com.gemstone.gemfire.distributed.DistributedMember;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionMembershipListener;
+import org.apache.geode.distributed.DistributedMember;
 
 /**
  * Utility class that implements all methods in <code>RegionMembershipListener</code>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/util/RegionRoleListenerAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/RegionRoleListenerAdapter.java b/geode-core/src/main/java/org/apache/geode/cache/util/RegionRoleListenerAdapter.java
index db3cc2d..2bf1206 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/util/RegionRoleListenerAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/RegionRoleListenerAdapter.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.util;
+package org.apache.geode.cache.util;
 
-import com.gemstone.gemfire.cache.RegionRoleListener;
-import com.gemstone.gemfire.cache.RoleEvent;
+import org.apache.geode.cache.RegionRoleListener;
+import org.apache.geode.cache.RoleEvent;
 
 /**
  * Utility class that implements all methods in 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/util/TimestampedEntryEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/TimestampedEntryEvent.java b/geode-core/src/main/java/org/apache/geode/cache/util/TimestampedEntryEvent.java
index c714d63..00a0e4d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/TimestampedEntryEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/TimestampedEntryEvent.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.util;
+package org.apache.geode.cache.util;
 
 /**
  * TimestampedEntryEvent is an EntryEvent that has additional information provided
@@ -24,7 +24,7 @@ package com.gemstone.gemfire.cache.util;
  * previous change to the entry.
  * @since GemFire 7.0
  */
-public interface TimestampedEntryEvent extends com.gemstone.gemfire.cache.EntryEvent {
+public interface TimestampedEntryEvent extends org.apache.geode.cache.EntryEvent {
   // note that this interface inherits the following methods, among others:
   // getRegion(), getOperation(), getCallbackArgument()
   // getKey()

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/util/TransactionListenerAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/TransactionListenerAdapter.java b/geode-core/src/main/java/org/apache/geode/cache/util/TransactionListenerAdapter.java
index ab0e16e..7aaa426 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/TransactionListenerAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/TransactionListenerAdapter.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.util;
+package org.apache.geode.cache.util;
 
-import com.gemstone.gemfire.cache.TransactionListener;
-import com.gemstone.gemfire.cache.TransactionEvent;
+import org.apache.geode.cache.TransactionListener;
+import org.apache.geode.cache.TransactionEvent;
 
 /**
  * Utility class that implements all methods in <code>TransactionListener</code>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/util/package.html
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/package.html b/geode-core/src/main/java/org/apache/geode/cache/util/package.html
index 9fc799f..b42ffb4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/util/package.html
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/package.html
@@ -21,7 +21,7 @@ limitations under the License.
   </HEAD>
   <BODY>
   Provides utilities for use with the Caching API in the
-<code>com.gemstone.gemfire.cache.util</code> package.
+<code>org.apache.geode.cache.util</code> package.
 <p>
 Adapter classes are provided for convenience in implementing the
 CacheListener, RegionMembershipListener, RegionRoleListener, TransactionListener, and CacheWriter interfaces. These adapter

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/wan/EventSequenceID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/EventSequenceID.java b/geode-core/src/main/java/org/apache/geode/cache/wan/EventSequenceID.java
index 54590ba..90223fe 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/EventSequenceID.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/EventSequenceID.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.wan;
+package org.apache.geode.cache.wan;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.util.Arrays;
 
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 
 /**
  * This class wraps 1) DistributedMembershipID 2) ThreadID 3) SequenceID



Mime
View raw message