You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2017/01/23 19:17:38 UTC

[46/50] [abbrv] geode git commit: GEODE-2316: Renamed namespace GemStone.GemFire.Cache -> Apache.Geode.Client

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/TallyLoaderN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/TallyLoaderN.cs b/src/clicache/integration-test/TallyLoaderN.cs
index 2dbbadb..60c9ce4 100644
--- a/src/clicache/integration-test/TallyLoaderN.cs
+++ b/src/clicache/integration-test/TallyLoaderN.cs
@@ -18,12 +18,12 @@
 using System;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
-  using GemStone.GemFire.DUnitFramework;
+  using Apache.Geode.DUnitFramework;
 
-  using GemStone.GemFire.Cache;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.Client;
+  using Apache.Geode.Client.Generic;
 
   class TallyLoader<TKey, TVal> : ICacheLoader<TKey, TVal>
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/TallyResolverN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/TallyResolverN.cs b/src/clicache/integration-test/TallyResolverN.cs
index 154b5cb..1f868d1 100755
--- a/src/clicache/integration-test/TallyResolverN.cs
+++ b/src/clicache/integration-test/TallyResolverN.cs
@@ -18,12 +18,12 @@
 using System;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
-  using GemStone.GemFire.DUnitFramework;
+  using Apache.Geode.DUnitFramework;
 
-  using GemStone.GemFire.Cache;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.Client;
+  using Apache.Geode.Client.Generic;
 
   class TallyResolver<TKey, TVal> : IPartitionResolver<TKey, TVal>
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/TallyWriter.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/TallyWriter.cs b/src/clicache/integration-test/TallyWriter.cs
index bd98156..9e1bac0 100644
--- a/src/clicache/integration-test/TallyWriter.cs
+++ b/src/clicache/integration-test/TallyWriter.cs
@@ -18,11 +18,11 @@
 using System;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests
+namespace Apache.Geode.Client.UnitTests
 {
-  using GemStone.GemFire.DUnitFramework;
+  using Apache.Geode.DUnitFramework;
 
-  class TallyWriter : GemStone.GemFire.Cache.Generic.CacheWriterAdapter<Object, Object>
+  class TallyWriter : Apache.Geode.Client.Generic.CacheWriterAdapter<Object, Object>
   {
     #region Private members
 
@@ -30,10 +30,10 @@ namespace GemStone.GemFire.Cache.UnitTests
     private int m_updates = 0;
     private int m_invalidates = 0;
     private int m_destroys = 0;
-    private GemStone.GemFire.Cache.Generic.IGFSerializable m_callbackArg = null;
+    private Apache.Geode.Client.Generic.IGFSerializable m_callbackArg = null;
     private int m_clears = 0;
-    private GemStone.GemFire.Cache.Generic.IGFSerializable m_lastKey = null;
-    private GemStone.GemFire.Cache.Generic.IGFSerializable m_lastValue = null;
+    private Apache.Geode.Client.Generic.IGFSerializable m_lastKey = null;
+    private Apache.Geode.Client.Generic.IGFSerializable m_lastValue = null;
     private bool isWriterFailed = false;
     private bool isWriterInvoke = false;
     private bool isCallbackCalled = false;
@@ -82,7 +82,7 @@ namespace GemStone.GemFire.Cache.UnitTests
     }
 
 
-    public GemStone.GemFire.Cache.Generic.IGFSerializable LastKey
+    public Apache.Geode.Client.Generic.IGFSerializable LastKey
     {
       get
       {
@@ -90,7 +90,7 @@ namespace GemStone.GemFire.Cache.UnitTests
       }
     }
 
-    public GemStone.GemFire.Cache.Generic.IGFSerializable CallbackArgument
+    public Apache.Geode.Client.Generic.IGFSerializable CallbackArgument
     {
       get
       {
@@ -99,7 +99,7 @@ namespace GemStone.GemFire.Cache.UnitTests
     }
 
 
-    public GemStone.GemFire.Cache.Generic.IGFSerializable LastValue
+    public Apache.Geode.Client.Generic.IGFSerializable LastValue
     {
       get
       {
@@ -112,7 +112,7 @@ namespace GemStone.GemFire.Cache.UnitTests
     isWriterFailed = true;
    }
 
-  public void SetCallBackArg( GemStone.GemFire.Cache.Generic.IGFSerializable callbackArg )
+  public void SetCallBackArg( Apache.Geode.Client.Generic.IGFSerializable callbackArg )
   {
     m_callbackArg = callbackArg;
   }
@@ -167,14 +167,14 @@ namespace GemStone.GemFire.Cache.UnitTests
         Updates, Creates, Invalidates, Destroys);
     }
 
-    public void CheckcallbackArg(GemStone.GemFire.Cache.Generic.EntryEvent<Object, Object> ev)
+    public void CheckcallbackArg(Apache.Geode.Client.Generic.EntryEvent<Object, Object> ev)
       {
 
         if(!isWriterInvoke)
           isWriterInvoke = true;
         if (m_callbackArg != null)
         {
-          GemStone.GemFire.Cache.Generic.IGFSerializable callbkArg = (GemStone.GemFire.Cache.Generic.IGFSerializable)ev.CallbackArgument;
+          Apache.Geode.Client.Generic.IGFSerializable callbkArg = (Apache.Geode.Client.Generic.IGFSerializable)ev.CallbackArgument;
           if (m_callbackArg.Equals(callbkArg))
             isCallbackCalled = true;
         }  
@@ -187,7 +187,7 @@ namespace GemStone.GemFire.Cache.UnitTests
 
     #region ICacheWriter Members
 
-    public override bool BeforeCreate(GemStone.GemFire.Cache.Generic.EntryEvent<Object, Object> ev)
+    public override bool BeforeCreate(Apache.Geode.Client.Generic.EntryEvent<Object, Object> ev)
     {
       m_creates++;
       Util.Log("TallyWriter::BeforeCreate");
@@ -195,7 +195,7 @@ namespace GemStone.GemFire.Cache.UnitTests
       return !isWriterFailed;
     }
 
-    public override bool BeforeDestroy(GemStone.GemFire.Cache.Generic.EntryEvent<Object, Object> ev)
+    public override bool BeforeDestroy(Apache.Geode.Client.Generic.EntryEvent<Object, Object> ev)
     {
       m_destroys++;
       Util.Log("TallyWriter::BeforeDestroy");
@@ -203,14 +203,14 @@ namespace GemStone.GemFire.Cache.UnitTests
       return !isWriterFailed;
     }
 
-    public override bool BeforeRegionClear(GemStone.GemFire.Cache.Generic.RegionEvent<Object, Object> ev)
+    public override bool BeforeRegionClear(Apache.Geode.Client.Generic.RegionEvent<Object, Object> ev)
     {
       m_clears++;
       Util.Log("TallyWriter::BeforeRegionClear");
       return true;
     }
 
-    public override bool BeforeUpdate(GemStone.GemFire.Cache.Generic.EntryEvent<Object, Object> ev)
+    public override bool BeforeUpdate(Apache.Geode.Client.Generic.EntryEvent<Object, Object> ev)
     {
       m_updates++;
       Util.Log("TallyWriter::BeforeUpdate");

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/TallyWriterN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/TallyWriterN.cs b/src/clicache/integration-test/TallyWriterN.cs
index bd57878..3b19215 100644
--- a/src/clicache/integration-test/TallyWriterN.cs
+++ b/src/clicache/integration-test/TallyWriterN.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
   class TallyWriter<TKey, TVal> : CacheWriterAdapter<TKey, TVal>
   {
     #region Private members

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs b/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
index d2ba448..b9d68bc 100644
--- a/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
+++ b/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
@@ -17,15 +17,15 @@
 
 \ufeffusing System;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
-    using GemStone.GemFire.Cache.Generic;
-    using GemStone.GemFire.Cache.Tests.NewAPI;
-    using GemStone.GemFire.DUnitFramework;
+    using Apache.Geode.Client.Generic;
+    using Apache.Geode.Client.Tests.NewAPI;
+    using Apache.Geode.DUnitFramework;
     using NUnit.Framework;
-    using QueryCategory = GemStone.GemFire.Cache.Tests.QueryCategory;
-    using QueryStatics = GemStone.GemFire.Cache.Tests.QueryStatics;
-    using QueryStrings = GemStone.GemFire.Cache.Tests.QueryStrings;
+    using QueryCategory = Apache.Geode.Client.Tests.QueryCategory;
+    using QueryStatics = Apache.Geode.Client.Tests.QueryStatics;
+    using QueryStrings = Apache.Geode.Client.Tests.QueryStrings;
 
     [TestFixture]
     [Category("group1")]
@@ -74,8 +74,8 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
         {
             Serializable.RegisterTypeGeneric(Portfolio.CreateDeserializable);
             Serializable.RegisterTypeGeneric(Position.CreateDeserializable);
-            Serializable.RegisterPdxType(GemStone.GemFire.Cache.Tests.NewAPI.PortfolioPdx.CreateDeserializable);
-            Serializable.RegisterPdxType(GemStone.GemFire.Cache.Tests.NewAPI.PositionPdx.CreateDeserializable);
+            Serializable.RegisterPdxType(Apache.Geode.Client.Tests.NewAPI.PortfolioPdx.CreateDeserializable);
+            Serializable.RegisterPdxType(Apache.Geode.Client.Tests.NewAPI.PositionPdx.CreateDeserializable);
         }
 
         public void CreateCache(string locators)
@@ -90,7 +90,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
               null, locators, "__TESTPOOL1_", true);
 
             IRegion<object, object> region = CacheHelper.GetRegion<object, object>(QueryRegionNames[0]);
-            GemStone.GemFire.Cache.Generic.RegionAttributes<object, object> regattrs = region.Attributes;
+            Apache.Geode.Client.Generic.RegionAttributes<object, object> regattrs = region.Attributes;
             region.CreateSubRegion(QueryRegionNames[1], regattrs);
         }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientCSTXN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientCSTXN.cs b/src/clicache/integration-test/ThinClientCSTXN.cs
index 6896058..430dfba 100644
--- a/src/clicache/integration-test/ThinClientCSTXN.cs
+++ b/src/clicache/integration-test/ThinClientCSTXN.cs
@@ -19,14 +19,14 @@ using System;
 using System.Threading;
 using System.Collections.Generic;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
-  using GemStone.GemFire.Cache.UnitTests.NewAPI;
-  using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>;
-  using GemStone.GemFire.Cache.Tests.NewAPI;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client.UnitTests.NewAPI;
+  using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
+  using Apache.Geode.Client.Tests.NewAPI;
   #region CSTX_COMMENTED - transaction listener and writer are disabled for now
   /* 
   class CSTXListener<TKey, TVal> : TransactionListenerAdapter<TKey, TVal>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientCallbackArgN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientCallbackArgN.cs b/src/clicache/integration-test/ThinClientCallbackArgN.cs
index 3dba707..fca1163 100644
--- a/src/clicache/integration-test/ThinClientCallbackArgN.cs
+++ b/src/clicache/integration-test/ThinClientCallbackArgN.cs
@@ -18,15 +18,15 @@
 using System;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Tests.NewAPI;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Tests.NewAPI;
 
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.Client.Generic;
 
-  using GIRegion = GemStone.GemFire.Cache.Generic.IRegion<int, object>;
+  using GIRegion = Apache.Geode.Client.Generic.IRegion<int, object>;
   using System.Collections.Generic;
 
   public class CallbackListener : CacheListenerAdapter<int, object>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientConflationTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientConflationTestsN.cs b/src/clicache/integration-test/ThinClientConflationTestsN.cs
index 805a7ee..8986e98 100644
--- a/src/clicache/integration-test/ThinClientConflationTestsN.cs
+++ b/src/clicache/integration-test/ThinClientConflationTestsN.cs
@@ -19,12 +19,12 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Tests.NewAPI;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Generic;
 
   #region Listener
   class ConflationListner<TKey, TValue> : ICacheListener<TKey, TValue>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientCqIRTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientCqIRTestsN.cs b/src/clicache/integration-test/ThinClientCqIRTestsN.cs
index 336d735..f812435 100644
--- a/src/clicache/integration-test/ThinClientCqIRTestsN.cs
+++ b/src/clicache/integration-test/ThinClientCqIRTestsN.cs
@@ -19,12 +19,12 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Tests.NewAPI;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Generic;
 
 
   [TestFixture]
@@ -93,7 +93,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
         null, locators, "__TESTPOOL1_", true);
 
       IRegion<object, object> region = CacheHelper.GetRegion<object, object>(QueryRegionNames[0]);
-      GemStone.GemFire.Cache.Generic.RegionAttributes<object, object> regattrs = region.Attributes;
+      Apache.Geode.Client.Generic.RegionAttributes<object, object> regattrs = region.Attributes;
       region.CreateSubRegion(QueryRegionNames[1], regattrs);
     }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientCqTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientCqTestsN.cs b/src/clicache/integration-test/ThinClientCqTestsN.cs
index ddbe686..93a8ac3 100644
--- a/src/clicache/integration-test/ThinClientCqTestsN.cs
+++ b/src/clicache/integration-test/ThinClientCqTestsN.cs
@@ -19,12 +19,12 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Tests.NewAPI;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Generic;
 
   public class MyCqListener<TKey, TResult> : ICqListener<TKey, TResult>
   {
@@ -319,7 +319,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
       CacheHelper.CreateTCRegion_Pool<object, object>("DistRegionAck", true, true,
         null, locators, "__TESTPOOL1_", true);
       IRegion<object, object> region = CacheHelper.GetRegion<object, object>(QueryRegionNames[0]);
-      GemStone.GemFire.Cache.Generic.RegionAttributes<object, object> regattrs = region.Attributes;
+      Apache.Geode.Client.Generic.RegionAttributes<object, object> regattrs = region.Attributes;
       region.CreateSubRegion(QueryRegionNames[1], regattrs);
     }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientDeltaTestN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientDeltaTestN.cs b/src/clicache/integration-test/ThinClientDeltaTestN.cs
index 08eda43..fcb9268 100644
--- a/src/clicache/integration-test/ThinClientDeltaTestN.cs
+++ b/src/clicache/integration-test/ThinClientDeltaTestN.cs
@@ -22,13 +22,13 @@ using System.Threading;
 
 #pragma warning disable 618
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Tests.NewAPI;
-  using GemStone.GemFire.Cache.Generic;
-  using DeltaEx = GemStone.GemFire.Cache.Tests.DeltaEx;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Generic;
+  using DeltaEx = Apache.Geode.Client.Tests.DeltaEx;
 
   public class CqDeltaListener<TKey, TResult> : ICqListener<TKey, TResult>
   {
@@ -245,7 +245,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
     }
     public void CreateRegion(string name, bool enableNotification, bool cloningEnabled)
     {
-      GemStone.GemFire.Cache.Generic.RegionAttributes<object, object> attrs;
+      Apache.Geode.Client.Generic.RegionAttributes<object, object> attrs;
       AttributesFactory<object, object> attrFac = new AttributesFactory<object, object>();
       attrFac.SetCacheListener(new SimpleCacheListener<object, object>());
       attrFac.SetCloningEnabled(cloningEnabled);

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientDocExamplesN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientDocExamplesN.cs b/src/clicache/integration-test/ThinClientDocExamplesN.cs
index 615c988..af540f3 100644
--- a/src/clicache/integration-test/ThinClientDocExamplesN.cs
+++ b/src/clicache/integration-test/ThinClientDocExamplesN.cs
@@ -21,13 +21,13 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Diagnostics;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Tests.NewAPI;
-  using GemStone.GemFire.Cache.Examples;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Examples;
+  using Apache.Geode.Client.Generic;
 
   namespace gemfire.cliwrap.Examples
   {
@@ -849,8 +849,8 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
     {
       Properties<string, string> secProp = Properties<string, string>.Create<string, string>();
       secProp.Insert("security-client-auth-factory",
-      "GemStone.GemFire.Templates.Cache.Security.UserPasswordAuthInit.Create");
-      secProp.Insert("security-client-auth-library", "GemStone.GemFire.Templates.Cache.Security");
+      "Apache.Geode.Templates.Cache.Security.UserPasswordAuthInit.Create");
+      secProp.Insert("security-client-auth-library", "Apache.Geode.Templates.Cache.Security");
       secProp.Insert("security-username", " gemfire6");
       secProp.Insert("security-password", " gemfire6Pass");
       CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(secProp);
@@ -1125,7 +1125,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
       bool args0 = true;
       //test data dependant function execution
       //     test get function with result
-      GemStone.GemFire.Cache.Generic.Execution<object> exc = GemStone.GemFire.Cache.Generic.FunctionService<object>.OnRegion<object, object>(region);
+      Apache.Geode.Client.Generic.Execution<object> exc = Apache.Geode.Client.Generic.FunctionService<object>.OnRegion<object, object>(region);
       IResultCollector<object> rc = exc.WithArgs<bool>(args0).WithFilter<object>(routingObj).Execute(
       getFuncName);
       ICollection<object> executeFunctionResult = rc.GetResult();
@@ -1165,7 +1165,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
       Console.WriteLine("routingObj count= {0}.", routingObj.Length);
       //test date independant fucntion execution on one server
       //     test get function with result
-      GemStone.GemFire.Cache.Generic.Execution<object> exc = GemStone.GemFire.Cache.Generic.FunctionService<object>.OnServer(cache);
+      Apache.Geode.Client.Generic.Execution<object> exc = Apache.Geode.Client.Generic.FunctionService<object>.OnServer(cache);
       //TODO::split
       //CacheableVector args1 = new CacheableVector();
       System.Collections.ArrayList args1 = new System.Collections.ArrayList();

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientDurableCqTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientDurableCqTestsN.cs b/src/clicache/integration-test/ThinClientDurableCqTestsN.cs
index e6d2749..aee1ec5 100644
--- a/src/clicache/integration-test/ThinClientDurableCqTestsN.cs
+++ b/src/clicache/integration-test/ThinClientDurableCqTestsN.cs
@@ -16,12 +16,12 @@
  */
 
 using NUnit.Framework;
-using GemStone.GemFire.DUnitFramework;
-using GemStone.GemFire.Cache.Tests.NewAPI;
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.DUnitFramework;
+using Apache.Geode.Client.Tests.NewAPI;
+using Apache.Geode.Client.Generic;
 using System;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
 
   [TestFixture]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientDurableTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientDurableTestsN.cs b/src/clicache/integration-test/ThinClientDurableTestsN.cs
index e0368d3..8f9228c 100644
--- a/src/clicache/integration-test/ThinClientDurableTestsN.cs
+++ b/src/clicache/integration-test/ThinClientDurableTestsN.cs
@@ -19,14 +19,14 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
 
 
-  using AssertionException = GemStone.GemFire.Cache.Generic.AssertionException;
+  using AssertionException = Apache.Geode.Client.Generic.AssertionException;
   [TestFixture]
   [Category("group2")]
   [Category("unicast_only")]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs b/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs
index 2987824..bb7378c 100644
--- a/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs
+++ b/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs
@@ -20,13 +20,13 @@ using System.Collections.Generic;
 using System.Collections;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
+  using Apache.Geode.DUnitFramework;
 
-  using GemStone.GemFire.Cache.Generic;
-  using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>;
+  using Apache.Geode.Client.Generic;
+  using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
 
   public class MyResultCollector<TResult> : Generic.IResultCollector<TResult>
   {
@@ -243,7 +243,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
       //test data dependant function execution
       //     test get function with result
       
-      GemStone.GemFire.Cache.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<object, object>(region);
+      Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<object, object>(region);
       Generic.IResultCollector<object> rc = exc.WithArgs<object>(args).WithFilter<object>(routingObj).Execute(getFuncName);
       ICollection<object> executeFunctionResult = rc.GetResult();
       List<object> resultList = new List<object>();
@@ -441,7 +441,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
       int args1 = 0;
      
       MyResultCollector<int> myRC = new MyResultCollector<int>();
-      GemStone.GemFire.Cache.Generic.Execution<int> exc = Generic.FunctionService<int>.OnServers/*OnRegion<string, string>*/(pl/*region*/);
+      Apache.Geode.Client.Generic.Execution<int> exc = Generic.FunctionService<int>.OnServers/*OnRegion<string, string>*/(pl/*region*/);
       Generic.IResultCollector<int> rc = exc.WithArgs<int>(args1).WithCollector(myRC).Execute("SingleStrGetFunction");
       
       Util.Log("add result count= {0}.", myRC.GetAddResultCount());
@@ -492,7 +492,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
       }
 
       MyResultCollector<string> myRC = new MyResultCollector<string>();
-      GemStone.GemFire.Cache.Generic.Execution<string> exc = Generic.FunctionService<string>.OnServers/*OnRegion<string, string>*/(pl/*region*/);
+      Apache.Geode.Client.Generic.Execution<string> exc = Generic.FunctionService<string>.OnServers/*OnRegion<string, string>*/(pl/*region*/);
       Generic.IResultCollector<string> rc = exc.WithArgs<ArrayList>(args1).WithCollector(myRC).Execute("SingleStrGetFunction");
       
       Util.Log("add result count= {0}.", myRC.GetAddResultCount());
@@ -541,7 +541,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
         count++;
       }
 
-      GemStone.GemFire.Cache.Generic.Execution<string> exc = Generic.FunctionService<string>.OnServers/*OnRegion<string, string>*/(pl/*region*/);
+      Apache.Geode.Client.Generic.Execution<string> exc = Generic.FunctionService<string>.OnServers/*OnRegion<string, string>*/(pl/*region*/);
       Generic.IResultCollector<string> rc = exc.WithArgs<ArrayList>(args1).Execute("SingleStrGetFunction");
 
       Assert.IsTrue(rc.GetResult().Count == 2, "result count check failed");
@@ -588,7 +588,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
         count++;
       }
 
-      GemStone.GemFire.Cache.Generic.Execution<object> exc = Generic.FunctionService<object>.OnServers/*OnRegion<string, string>*/(pl/*region*/);
+      Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnServers/*OnRegion<string, string>*/(pl/*region*/);
       Generic.IResultCollector<object> rc = exc.WithArgs<ArrayList>(args1).Execute("PdxFunctionTest");
 
       Assert.IsTrue(rc.GetResult().Count == 2, "result count check failed");
@@ -629,7 +629,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
       bool args = true;
       //test data dependant function execution
       //     test get function with result
-      GemStone.GemFire.Cache.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<object, object>(region);
+      Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<object, object>(region);
       Generic.IResultCollector<object> rc = exc.WithArgs<bool>(args).WithFilter<object>(routingObj).Execute(getFuncName);
       ICollection<object> executeFunctionResult = rc.GetResult();
       List<object> resultList = new List<object>();
@@ -684,7 +684,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
 
       //test data independant function execution with result OnRegion
 
-      GemStone.GemFire.Cache.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<object, object>(region);
+      Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<object, object>(region);
 
       Assert.IsTrue(exc != null, "onRegion Returned NULL");
 
@@ -739,7 +739,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
 
       //test data independant function execution with result onServer
       
-      GemStone.GemFire.Cache.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<object, object>(region);
+      Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<object, object>(region);
 
       Assert.IsTrue(exc != null, "onRegion Returned NULL");
 
@@ -1321,7 +1321,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
       //test data independant function execution with result onServer
       Pool/*<TKey, TValue>*/ pool = PoolManager/*<TKey, TValue>*/.Find(poolName);
       
-      GemStone.GemFire.Cache.Generic.Execution<object> exc = Generic.FunctionService<object>.OnServer(pool);
+      Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnServer(pool);
       Assert.IsTrue(exc != null, "onServer Returned NULL");
 
       Generic.IResultCollector<object> rc = exc.WithArgs<ArrayList>(args1).Execute(OnServerHAExceptionFunction, 15);

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientHARegionTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientHARegionTestsN.cs b/src/clicache/integration-test/ThinClientHARegionTestsN.cs
index 1db0ca8..b02aa43 100644
--- a/src/clicache/integration-test/ThinClientHARegionTestsN.cs
+++ b/src/clicache/integration-test/ThinClientHARegionTestsN.cs
@@ -19,14 +19,14 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Tests.NewAPI;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Generic;
 
-  using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>;
+  using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
 
   [TestFixture]
   [Category("group4")]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientListenerWriterN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientListenerWriterN.cs b/src/clicache/integration-test/ThinClientListenerWriterN.cs
index 4a6607b..726ebff 100644
--- a/src/clicache/integration-test/ThinClientListenerWriterN.cs
+++ b/src/clicache/integration-test/ThinClientListenerWriterN.cs
@@ -18,13 +18,13 @@
 using System;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
-  using GemStone.GemFire.Cache.UnitTests.NewAPI;
-  using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client.UnitTests.NewAPI;
+  using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
 
   [TestFixture]
   [Category("group1")]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientPdxTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientPdxTests.cs b/src/clicache/integration-test/ThinClientPdxTests.cs
index 654f2ea..d9b7239 100755
--- a/src/clicache/integration-test/ThinClientPdxTests.cs
+++ b/src/clicache/integration-test/ThinClientPdxTests.cs
@@ -24,12 +24,12 @@ using System.Threading;
 using PdxTests;
 using System.Reflection;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
-  using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
+  using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
 
   
   [TestFixture]
@@ -1556,7 +1556,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
          {
              object retVal = localregion[p1];
          }
-         catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException)
+         catch (Apache.Geode.Client.Generic.KeyNotFoundException)
          {
              Util.Log("Got expected KeyNotFoundException exception");
          }
@@ -1911,7 +1911,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
        {
          pRet = region0.GetLocalView()[key];
        }
-       catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException )
+       catch (Apache.Geode.Client.Generic.KeyNotFoundException )
        {
          isKNFE = true;
        }
@@ -2990,7 +2990,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
        ret = region0[2];
        Util.Log("Put from pool-2 completed");
 
-       int pdxIds = GemStone.GemFire.Cache.Generic.Internal.PdxTypeRegistry.testGetNumberOfPdxIds();
+       int pdxIds = Apache.Geode.Client.Generic.Internal.PdxTypeRegistry.testGetNumberOfPdxIds();
 
        Assert.AreEqual(3, pdxIds);
      }
@@ -7163,7 +7163,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
 
 namespace javaobject
 {
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.Client.Generic;
   #region Pdx Delta class
   public class PdxDelta : IPdxSerializable, IGFDelta, ICloneable
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientPoolTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientPoolTestsN.cs b/src/clicache/integration-test/ThinClientPoolTestsN.cs
index 17cea3d..fc2e311 100644
--- a/src/clicache/integration-test/ThinClientPoolTestsN.cs
+++ b/src/clicache/integration-test/ThinClientPoolTestsN.cs
@@ -20,12 +20,12 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
-  using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
+  using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
 
   [TestFixture]
   [Category("group2")]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientQueryTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientQueryTestsN.cs b/src/clicache/integration-test/ThinClientQueryTestsN.cs
index 8a88fb9..3bf9b0f 100644
--- a/src/clicache/integration-test/ThinClientQueryTestsN.cs
+++ b/src/clicache/integration-test/ThinClientQueryTestsN.cs
@@ -19,17 +19,17 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Tests.NewAPI;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Tests.NewAPI;
   
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.Client.Generic;
 
-  using QueryStatics = GemStone.GemFire.Cache.Tests.QueryStatics;
-  using QueryCategory = GemStone.GemFire.Cache.Tests.QueryCategory;
-  using QueryStrings = GemStone.GemFire.Cache.Tests.QueryStrings;
+  using QueryStatics = Apache.Geode.Client.Tests.QueryStatics;
+  using QueryCategory = Apache.Geode.Client.Tests.QueryCategory;
+  using QueryStrings = Apache.Geode.Client.Tests.QueryStrings;
   
   [TestFixture]
   [Category("group1")]
@@ -79,8 +79,8 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
       {
         Serializable.RegisterTypeGeneric(Portfolio.CreateDeserializable);
         Serializable.RegisterTypeGeneric(Position.CreateDeserializable);
-        Serializable.RegisterPdxType(GemStone.GemFire.Cache.Tests.NewAPI.PortfolioPdx.CreateDeserializable);
-        Serializable.RegisterPdxType(GemStone.GemFire.Cache.Tests.NewAPI.PositionPdx.CreateDeserializable);
+        Serializable.RegisterPdxType(Apache.Geode.Client.Tests.NewAPI.PortfolioPdx.CreateDeserializable);
+        Serializable.RegisterPdxType(Apache.Geode.Client.Tests.NewAPI.PositionPdx.CreateDeserializable);
       }
       catch (IllegalStateException)
       {
@@ -169,7 +169,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
         null, locators, "__TESTPOOL1_", true);
 
       IRegion<object, object> region = CacheHelper.GetRegion<object, object>(QueryRegionNames[0]);
-      GemStone.GemFire.Cache.Generic.RegionAttributes<object, object> regattrs = region.Attributes;
+      Apache.Geode.Client.Generic.RegionAttributes<object, object> regattrs = region.Attributes;
       region.CreateSubRegion(QueryRegionNames[1], regattrs);
     }
     

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientRegionInterestTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientRegionInterestTestsN.cs b/src/clicache/integration-test/ThinClientRegionInterestTestsN.cs
index a97ff8c..dfe01c3 100644
--- a/src/clicache/integration-test/ThinClientRegionInterestTestsN.cs
+++ b/src/clicache/integration-test/ThinClientRegionInterestTestsN.cs
@@ -19,11 +19,11 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
 
   [TestFixture]
   [Category("group1")]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientRegionStepsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientRegionStepsN.cs b/src/clicache/integration-test/ThinClientRegionStepsN.cs
index 164f5f6..c291e31 100644
--- a/src/clicache/integration-test/ThinClientRegionStepsN.cs
+++ b/src/clicache/integration-test/ThinClientRegionStepsN.cs
@@ -19,12 +19,12 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
-  using AssertionException = GemStone.GemFire.Cache.Generic.AssertionException;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
+  using AssertionException = Apache.Geode.Client.Generic.AssertionException;
 
 
   [TestFixture]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientRegionTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientRegionTestsN.cs b/src/clicache/integration-test/ThinClientRegionTestsN.cs
index 3900950..a563322 100644
--- a/src/clicache/integration-test/ThinClientRegionTestsN.cs
+++ b/src/clicache/integration-test/ThinClientRegionTestsN.cs
@@ -22,11 +22,11 @@ using System.Collections.ObjectModel;
 using System.IO;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
 
   [Serializable]
   public class CustomPartitionResolver<TValue> : IPartitionResolver<int, TValue>
@@ -574,7 +574,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
       {
         Assert.Fail("Expected region size 0");
       }
-      GemStone.GemFire.Cache.Generic.RegionAttributes<object, object> attr = region0.Attributes;
+      Apache.Geode.Client.Generic.RegionAttributes<object, object> attr = region0.Attributes;
       TallyListener<object, object> listener = attr.CacheListener as TallyListener<object, object>;
       TallyWriter<object, object> writer = attr.CacheWriter as TallyWriter<object, object>;
       if (listener.Clears != 1)

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientSecurityAuthTestsMUN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientSecurityAuthTestsMUN.cs b/src/clicache/integration-test/ThinClientSecurityAuthTestsMUN.cs
index eb847e8..461f394 100644
--- a/src/clicache/integration-test/ThinClientSecurityAuthTestsMUN.cs
+++ b/src/clicache/integration-test/ThinClientSecurityAuthTestsMUN.cs
@@ -19,12 +19,12 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.Cache.Tests.NewAPI;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
   [TestFixture]
   [Category("group4")]
   [Category("unicast_only")]
@@ -253,7 +253,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
         Util.Log("InvalidAuthInit: For first client credentials: " +
           credentials + " : " + javaProps);
         m_client1.Call(SecurityTestUtil.CreateClientMU, RegionName,
-          CacheHelper.Locators, "GemStone.GemFire.Templates.Cache.Security.none",
+          CacheHelper.Locators, "Apache.Geode.Templates.Cache.Security.none",
           (Properties<string, string>)null, true);
 
         // Perform some put operations from client1
@@ -635,7 +635,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
         // Trying to create the region on client with valid credentials should
         // throw an authentication failed exception
         m_client2.Call(SecurityTestUtil.CreateClient, RegionName,
-          CacheHelper.Locators, "GemStone.GemFire.Templates.Cache.Security.none",
+          CacheHelper.Locators, "Apache.Geode.Templates.Cache.Security.none",
           credentials1, 0, ExpectedResult.AuthRequiredException);
 
         // Try connection with null auth-init on clients.

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientSecurityAuthTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientSecurityAuthTestsN.cs b/src/clicache/integration-test/ThinClientSecurityAuthTestsN.cs
index 4fc033f..d559ef0 100644
--- a/src/clicache/integration-test/ThinClientSecurityAuthTestsN.cs
+++ b/src/clicache/integration-test/ThinClientSecurityAuthTestsN.cs
@@ -19,12 +19,12 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.Cache.Tests.NewAPI;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
 
   [TestFixture]
   [Category("group1")]
@@ -275,7 +275,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
         Util.Log("InvalidAuthInit: For first client credentials: " +
           credentials + " : " + javaProps);
         m_client1.Call(SecurityTestUtil.CreateClient, RegionName,
-          CacheHelper.Locators, "GemStone.GemFire.Templates.Cache.Security.none",
+          CacheHelper.Locators, "Apache.Geode.Templates.Cache.Security.none",
           credentials, ExpectedResult.AuthRequiredException);
 
         m_client1.Call(Close);
@@ -651,7 +651,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
         // Trying to create the region on client with valid credentials should
         // throw an authentication failed exception
         m_client2.Call(SecurityTestUtil.CreateClient, RegionName,
-          CacheHelper.Locators, "GemStone.GemFire.Templates.Cache.Security.none",
+          CacheHelper.Locators, "Apache.Geode.Templates.Cache.Security.none",
           credentials1, 0, ExpectedResult.AuthRequiredException);
 
         // Try connection with null auth-init on clients.

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs b/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs
index 1374b71..067677f 100644
--- a/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs
+++ b/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs
@@ -19,14 +19,14 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Tests.NewAPI;
-  using GemStone.GemFire.Cache.Generic;
-  //using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>;
-  using AssertionException = GemStone.GemFire.Cache.Generic.AssertionException;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Generic;
+  //using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
+  using AssertionException = Apache.Geode.Client.Generic.AssertionException;
   public abstract class ThinClientSecurityAuthzTestBase : ThinClientRegionSteps
   {
     #region Protected members
@@ -445,7 +445,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
                 //FunctionService fs = CacheHelper.getMultiuserCache(creds).GetFunctionService();
                 //Execution exe =  fs.OnServer();
                 IRegionService userCache = CacheHelper.getMultiuserCache(creds);
-                GemStone.GemFire.Cache.Generic.Execution<object> exe = Generic.FunctionService<object>.OnServer(userCache);
+                Apache.Geode.Client.Generic.Execution<object> exe = Generic.FunctionService<object>.OnServer(userCache);
                 exe.Execute("securityTest");
                 exe = Generic.FunctionService<object>.OnServers(userCache);
                 Generic.FunctionService<object>.OnRegion<object, object>(region);

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs b/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs
index f3e44e2..a853a7a 100644
--- a/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs
+++ b/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs
@@ -19,12 +19,12 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Tests.NewAPI;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Generic;
 
   public class MyCqListener2<TKey, TResult> : ICqListener<TKey, TResult>
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientSecurityAuthzTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientSecurityAuthzTestsN.cs b/src/clicache/integration-test/ThinClientSecurityAuthzTestsN.cs
index 2c80756..3d20896 100644
--- a/src/clicache/integration-test/ThinClientSecurityAuthzTestsN.cs
+++ b/src/clicache/integration-test/ThinClientSecurityAuthzTestsN.cs
@@ -19,12 +19,12 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Tests.NewAPI;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Generic;
 
   [TestFixture]
   [Category("group3")]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientStatisticTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientStatisticTestsN.cs b/src/clicache/integration-test/ThinClientStatisticTestsN.cs
index d66c53f..3c9e19e 100644
--- a/src/clicache/integration-test/ThinClientStatisticTestsN.cs
+++ b/src/clicache/integration-test/ThinClientStatisticTestsN.cs
@@ -17,13 +17,13 @@
 
 using System;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
+  using Apache.Geode.DUnitFramework;
   using System.Threading;
 
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.Client.Generic;
 
   public class TestStatisticsType
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ThinClientStringArrayTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientStringArrayTestsN.cs b/src/clicache/integration-test/ThinClientStringArrayTestsN.cs
index 4247bcd..f72f600 100644
--- a/src/clicache/integration-test/ThinClientStringArrayTestsN.cs
+++ b/src/clicache/integration-test/ThinClientStringArrayTestsN.cs
@@ -19,12 +19,12 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Tests.NewAPI;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.Client.Generic;
 
 
   [TestFixture]
@@ -92,7 +92,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
         null, locators, "__TESTPOOL1_", true);
 
       IRegion<object, object> region = CacheHelper.GetRegion<object, object>(QueryRegionNames[0]);
-      GemStone.GemFire.Cache.Generic.RegionAttributes<object, object> regattrs = region.Attributes;
+      Apache.Geode.Client.Generic.RegionAttributes<object, object> regattrs = region.Attributes;
       region.CreateSubRegion(QueryRegionNames[1], regattrs);
     }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/UnitTests.csproj.in
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/UnitTests.csproj.in b/src/clicache/integration-test/UnitTests.csproj.in
index 0873c8f..b156e77 100644
--- a/src/clicache/integration-test/UnitTests.csproj.in
+++ b/src/clicache/integration-test/UnitTests.csproj.in
@@ -12,7 +12,7 @@
     <ProjectGuid>{CC6D226A-1DFF-31D1-89D1-D99420F6AF72}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>GemStone.GemFire.Cache.UnitTests</RootNamespace>
+    <RootNamespace>Apache.Geode.Client.UnitTests</RootNamespace>
     <AssemblyName>UnitTests</AssemblyName>
     <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
     <FileUpgradeFlags>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/UnitTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/UnitTestsN.cs b/src/clicache/integration-test/UnitTestsN.cs
index 540e373..6454735 100644
--- a/src/clicache/integration-test/UnitTestsN.cs
+++ b/src/clicache/integration-test/UnitTestsN.cs
@@ -17,14 +17,14 @@
 
 using System;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
   using System.IO;
 
-  //using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>;
+  //using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
 
   /// <summary>
   /// Setup the test parameters including logfile, timebomb and timeout settings.

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/client_generics_plugins.xml
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/client_generics_plugins.xml b/src/clicache/integration-test/client_generics_plugins.xml
index 303811a..d3381cf 100644
--- a/src/clicache/integration-test/client_generics_plugins.xml
+++ b/src/clicache/integration-test/client_generics_plugins.xml
@@ -10,19 +10,19 @@
 
 	<root-region name='DistRegionAck'>
 	   <region-attributes pool-name="__TESTPOOL1_">
-	     <cache-listener library-name="UnitTests" library-function-name="GemStone.GemFire.Cache.UnitTests.NewAPI.TallyListener&lt;System.Object, System.Object&gt;.Create"/>
-	     <cache-loader library-name="UnitTests" library-function-name="GemStone.GemFire.Cache.UnitTests.NewAPI.TallyLoader&lt;System.Object, System.Object&gt;.Create"/>
-	     <cache-writer library-name="UnitTests" library-function-name="GemStone.GemFire.Cache.UnitTests.NewAPI.TallyWriter&lt;System.Object, System.Object&gt;.Create"/>
-	     <partition-resolver library-name="UnitTests" library-function-name="GemStone.GemFire.Cache.UnitTests.NewAPI.TallyResolver&lt;System.Object, System.Object&gt;.Create"/>
+	     <cache-listener library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.NewAPI.TallyListener&lt;System.Object, System.Object&gt;.Create"/>
+	     <cache-loader library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.NewAPI.TallyLoader&lt;System.Object, System.Object&gt;.Create"/>
+	     <cache-writer library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.NewAPI.TallyWriter&lt;System.Object, System.Object&gt;.Create"/>
+	     <partition-resolver library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.NewAPI.TallyResolver&lt;System.Object, System.Object&gt;.Create"/>
 	   </region-attributes>
 	</root-region>
   
   <root-region name='DistRegionNoAck'>
 	   <region-attributes pool-name="__TESTPOOL1_">
-	     <cache-listener library-name="UnitTests" library-function-name="GemStone.GemFire.Cache.UnitTests.NewAPI.TallyListener&lt;System.Object, System.Object&gt;.Create"/>
-	     <cache-loader library-name="UnitTests" library-function-name="GemStone.GemFire.Cache.UnitTests.NewAPI.TallyLoader&lt;System.Object, System.Object&gt;.Create"/>
-	     <cache-writer library-name="UnitTests" library-function-name="GemStone.GemFire.Cache.UnitTests.NewAPI.TallyWriter&lt;System.Object, System.Object&gt;.Create"/>
-	     <partition-resolver library-name="UnitTests" library-function-name="GemStone.GemFire.Cache.UnitTests.NewAPI.TallyResolver&lt;System.Object, System.Object&gt;.Create"/>
+	     <cache-listener library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.NewAPI.TallyListener&lt;System.Object, System.Object&gt;.Create"/>
+	     <cache-loader library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.NewAPI.TallyLoader&lt;System.Object, System.Object&gt;.Create"/>
+	     <cache-writer library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.NewAPI.TallyWriter&lt;System.Object, System.Object&gt;.Create"/>
+	     <partition-resolver library-name="UnitTests" library-function-name="Apache.Geode.Client.UnitTests.NewAPI.TallyResolver&lt;System.Object, System.Object&gt;.Create"/>
 	   </region-attributes>
 	</root-region>
   

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/valid_overflowAttr.xml
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/valid_overflowAttr.xml b/src/clicache/integration-test/valid_overflowAttr.xml
index f9d89d2..88b7d51 100644
--- a/src/clicache/integration-test/valid_overflowAttr.xml
+++ b/src/clicache/integration-test/valid_overflowAttr.xml
@@ -119,7 +119,7 @@
        <entry-time-to-live>
          <expiration-attributes timeout="0" action="local-invalidate"/>
        </entry-time-to-live>
-       <persistence-manager library-name="Gemstone.Gemfire.Plugins.SqLite" library-function-name="GemStone.GemFire.Plugins.SqLite.SqLiteImpl&lt;System.Object, System.Object&gt;.Create" >
+       <persistence-manager library-name="Apache.Geode.Plugins.SqLite" library-function-name="Apache.Geode.Plugins.SqLite.SqLiteImpl&lt;System.Object, System.Object&gt;.Create" >
        
          <properties>
            <property name="PersistenceDirectory" value="SqLite"/>
@@ -131,7 +131,7 @@
 
     <region name="SubRegion31">
          <region-attributes scope="local" caching-enabled="true" initial-capacity="23" load-factor="0.89" concurrency-level="52" lru-entries-limit = "35" disk-policy="overflows">
-         <persistence-manager library-name="Gemstone.Gemfire.Plugins.SqLite" library-function-name="GemStone.GemFire.Plugins.SqLite.SqLiteImpl&lt;System.Object, System.Object&gt;.Create" >
+         <persistence-manager library-name="Apache.Geode.Plugins.SqLite" library-function-name="Apache.Geode.Plugins.SqLite.SqLiteImpl&lt;System.Object, System.Object&gt;.Create" >
           <properties>
            <property name="PersistenceDirectory" value="SqLiteSubRegion"/>
            <property name="MaxPageCount" value="1073741823"/>
@@ -144,7 +144,7 @@
 
     <region name="SubRegion32">
          <region-attributes scope="local" caching-enabled="true" initial-capacity="23" load-factor="0.89" concurrency-level="52" lru-entries-limit = "35" disk-policy="overflows">
-         <persistence-manager library-name="Gemstone.Gemfire.Plugins.SqLite" library-function-name="GemStone.GemFire.Plugins.SqLite.SqLiteImpl&lt;System.Object, System.Object&gt;.Create" >
+         <persistence-manager library-name="Apache.Geode.Plugins.SqLite" library-function-name="Apache.Geode.Plugins.SqLite.SqLiteImpl&lt;System.Object, System.Object&gt;.Create" >
          <properties>
            <property name="PersistenceDirectory" value="SqLiteSubRegion"/>
            <property name="MaxPageCount" value="1073741823"/>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/AttributesFactory.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesFactory.cpp b/src/clicache/src/AttributesFactory.cpp
index 64f8aae..a90b0d8 100644
--- a/src/clicache/src/AttributesFactory.cpp
+++ b/src/clicache/src/AttributesFactory.cpp
@@ -41,14 +41,16 @@
 using namespace System;
 using namespace System::Collections::Generic;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       generic<class TKey, class TValue>
-      AttributesFactory<TKey, TValue>::AttributesFactory( GemStone::GemFire::Cache::Generic::RegionAttributes<TKey, TValue>^ regionAttributes )
+      AttributesFactory<TKey, TValue>::AttributesFactory( Apache::Geode::Client::Generic::RegionAttributes<TKey, TValue>^ regionAttributes )
         : UMWrap( )
       {
         apache::geode::client::RegionAttributesPtr attribptr(
@@ -314,13 +316,13 @@ namespace GemStone
       // FACTORY METHOD
 
       generic<class TKey, class TValue>
-      GemStone::GemFire::Cache::Generic::RegionAttributes<TKey, TValue>^ AttributesFactory<TKey, TValue>::CreateRegionAttributes()
+      Apache::Geode::Client::Generic::RegionAttributes<TKey, TValue>^ AttributesFactory<TKey, TValue>::CreateRegionAttributes()
       {
         _GF_MG_EXCEPTION_TRY2/* due to auto replace */
 
           apache::geode::client::RegionAttributesPtr& nativeptr (
             NativePtr->createRegionAttributes( ) );
-          return GemStone::GemFire::Cache::Generic::RegionAttributes<TKey, TValue>::Create(nativeptr.ptr());
+          return Apache::Geode::Client::Generic::RegionAttributes<TKey, TValue>::Create(nativeptr.ptr());
 
         _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/AttributesFactory.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesFactory.hpp b/src/clicache/src/AttributesFactory.hpp
index 2e5ecff..8cfe869 100644
--- a/src/clicache/src/AttributesFactory.hpp
+++ b/src/clicache/src/AttributesFactory.hpp
@@ -36,13 +36,13 @@
 using namespace System;
 using namespace System::Collections::Generic;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache {
-    
-    namespace Generic 
+    namespace Client
+    {
+namespace Generic 
     {
 
       //ref class RegionAttributes;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/AttributesMutator.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesMutator.cpp b/src/clicache/src/AttributesMutator.cpp
index f276f68..0df93ba 100644
--- a/src/clicache/src/AttributesMutator.cpp
+++ b/src/clicache/src/AttributesMutator.cpp
@@ -27,11 +27,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       generic<class TKey, class TValue>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/AttributesMutator.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesMutator.hpp b/src/clicache/src/AttributesMutator.hpp
index a398718..36f6685 100644
--- a/src/clicache/src/AttributesMutator.hpp
+++ b/src/clicache/src/AttributesMutator.hpp
@@ -28,11 +28,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/clicache/src/CMakeLists.txt b/src/clicache/src/CMakeLists.txt
index eef44a2..81827b8 100644
--- a/src/clicache/src/CMakeLists.txt
+++ b/src/clicache/src/CMakeLists.txt
@@ -37,13 +37,12 @@ string(REPLACE "/RTC1" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /clr /wd4947 /doc")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${SHARED_LINKER_FLAGS_STRONG_KEY}")
 
-include_directories(${CMAKE_SOURCE_DIR}/clicache/src/legacy)
 include_directories(${CMAKE_SOURCE_DIR}/clicache/include)
 include_directories(${CMAKE_SOURCE_DIR}/clicache/src)
 include_directories(${CMAKE_SOURCE_DIR}/cppcache/src)
 
 set_target_properties(gfclicache PROPERTIES
-  OUTPUT_NAME Gemstone.Gemfire.Cache
+  OUTPUT_NAME Apache.Geode.Client
   VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2"
   VS_DOTNET_REFERENCES "System;System.Xml")
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Cache.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Cache.cpp b/src/clicache/src/Cache.cpp
index 936a8c4..8f0e0a4 100644
--- a/src/clicache/src/Cache.cpp
+++ b/src/clicache/src/Cache.cpp
@@ -35,13 +35,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
      
 
@@ -60,7 +60,7 @@ namespace GemStone
         apache::geode::client::DistributedSystemPtr& nativeptr(
           NativePtr->getDistributedSystem( ) );
 
-        return GemStone::GemFire::Cache::Generic::DistributedSystem::Create(
+        return Apache::Geode::Client::Generic::DistributedSystem::Create(
           nativeptr.ptr( ) );
       }
 
@@ -69,7 +69,7 @@ namespace GemStone
         apache::geode::client::InternalCacheTransactionManager2PCPtr& nativeptr = static_cast<InternalCacheTransactionManager2PCPtr>(
           NativePtr->getCacheTransactionManager( ) );
 
-        return GemStone::GemFire::Cache::Generic::CacheTransactionManager::Create(
+        return Apache::Geode::Client::Generic::CacheTransactionManager::Create(
           nativeptr.ptr( ) );
       }
 
@@ -82,9 +82,9 @@ namespace GemStone
       {
         _GF_MG_EXCEPTION_TRY2
 
-          GemStone::GemFire::Cache::Generic::DistributedSystem::acquireDisconnectLock();
+          Apache::Geode::Client::Generic::DistributedSystem::acquireDisconnectLock();
 
-        GemStone::GemFire::Cache::Generic::DistributedSystem::disconnectInstance();
+        Apache::Geode::Client::Generic::DistributedSystem::disconnectInstance();
           CacheFactory::m_connected = false;
 
           NativePtr->close( keepalive );
@@ -92,16 +92,16 @@ namespace GemStone
           // If DS automatically disconnected due to the new bootstrap API, then cleanup the C++/CLI side
           //if (!apache::geode::client::DistributedSystem::isConnected())
           {
-            GemStone::GemFire::Cache::Generic::DistributedSystem::UnregisterBuiltinManagedTypes();
+            Apache::Geode::Client::Generic::DistributedSystem::UnregisterBuiltinManagedTypes();
           }
 
         _GF_MG_EXCEPTION_CATCH_ALL2
         finally
         {
-					GemStone::GemFire::Cache::Generic::Internal::PdxTypeRegistry::clear();
+					Apache::Geode::Client::Generic::Internal::PdxTypeRegistry::clear();
           Serializable::Clear();
-          GemStone::GemFire::Cache::Generic::DistributedSystem::releaseDisconnectLock();
-          GemStone::GemFire::Cache::Generic::DistributedSystem::unregisterCliCallback();
+          Apache::Geode::Client::Generic::DistributedSystem::releaseDisconnectLock();
+          Apache::Geode::Client::Generic::DistributedSystem::unregisterCliCallback();
         }
       }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Cache.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Cache.hpp b/src/clicache/src/Cache.hpp
index 9e7eaea..dbe935f 100644
--- a/src/clicache/src/Cache.hpp
+++ b/src/clicache/src/Cache.hpp
@@ -32,13 +32,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
 
 				generic<class TKey, class TResult>
@@ -110,18 +110,18 @@ namespace GemStone
         /// This method does not throw
         /// <c>CacheClosedException</c> if the cache is closed.
         /// </remarks>
-        virtual property GemStone::GemFire::Cache::Generic::DistributedSystem^ DistributedSystem
+        virtual property Apache::Geode::Client::Generic::DistributedSystem^ DistributedSystem
         {
-          GemStone::GemFire::Cache::Generic::DistributedSystem^ get( );
+          Apache::Geode::Client::Generic::DistributedSystem^ get( );
         }
 
         /// <summary>
         /// Returns the cache transaction manager of
         /// <see cref="CacheFactory.Create" /> this cache.
         /// </summary>
-        virtual property GemStone::GemFire::Cache::Generic::CacheTransactionManager^ CacheTransactionManager
+        virtual property Apache::Geode::Client::Generic::CacheTransactionManager^ CacheTransactionManager
         {
-          GemStone::GemFire::Cache::Generic::CacheTransactionManager^ get( );
+          Apache::Geode::Client::Generic::CacheTransactionManager^ get( );
         }
 
         /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheFactory.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheFactory.cpp b/src/clicache/src/CacheFactory.cpp
index c76a6ad..b78e478 100644
--- a/src/clicache/src/CacheFactory.cpp
+++ b/src/clicache/src/CacheFactory.cpp
@@ -31,13 +31,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       CacheFactory^ CacheFactory::CreateCacheFactory()
       {
@@ -87,7 +87,7 @@ namespace GemStone
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::PdxType,
-              gcnew TypeFactoryMethodGeneric(GemStone::GemFire::Cache::Generic::Internal::PdxType::CreateDeserializable),
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Generic::Internal::PdxType::CreateDeserializable),
               nullptr);
 
            if(!m_connected)
@@ -105,8 +105,8 @@ namespace GemStone
           finally {
             DistributedSystem::registerCliCallback();
 						Serializable::RegisterPDXManagedCacheableKey(appDomainEnable);
-					GemStone::GemFire::Cache::Generic::Internal::PdxTypeRegistry::PdxIgnoreUnreadFields = pdxIgnoreUnreadFields; 
-          GemStone::GemFire::Cache::Generic::Internal::PdxTypeRegistry::PdxReadSerialized = pdxReadSerialized; 
+					Apache::Geode::Client::Generic::Internal::PdxTypeRegistry::PdxIgnoreUnreadFields = pdxIgnoreUnreadFields; 
+          Apache::Geode::Client::Generic::Internal::PdxTypeRegistry::PdxReadSerialized = pdxReadSerialized; 
           DistributedSystem::releaseDisconnectLock();
         }
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheFactory.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheFactory.hpp b/src/clicache/src/CacheFactory.hpp
index 31ee627..867ee23 100644
--- a/src/clicache/src/CacheFactory.hpp
+++ b/src/clicache/src/CacheFactory.hpp
@@ -25,13 +25,13 @@
 //using namespace System;
 using namespace System::Collections::Generic;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       ref class Cache;
       ref class CacheAttributes;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheListenerAdapter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheListenerAdapter.hpp b/src/clicache/src/CacheListenerAdapter.hpp
index d6b7fbe..ed530b9 100644
--- a/src/clicache/src/CacheListenerAdapter.hpp
+++ b/src/clicache/src/CacheListenerAdapter.hpp
@@ -21,11 +21,13 @@
 #include "ICacheListener.hpp"
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       /// <summary>
@@ -70,10 +72,10 @@ namespace GemStone
         {
         }
 
-        virtual void Close(GemStone::GemFire::Cache::Generic::IRegion<TKey, TValue>^ region)
+        virtual void Close(Apache::Geode::Client::Generic::IRegion<TKey, TValue>^ region)
         {
         }
-		virtual void AfterRegionDisconnected(GemStone::GemFire::Cache::Generic::IRegion<TKey, TValue>^ region)
+		virtual void AfterRegionDisconnected(Apache::Geode::Client::Generic::IRegion<TKey, TValue>^ region)
         {
         }
       };

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheStatistics.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheStatistics.cpp b/src/clicache/src/CacheStatistics.cpp
index aba6679..7ddd7d1 100644
--- a/src/clicache/src/CacheStatistics.cpp
+++ b/src/clicache/src/CacheStatistics.cpp
@@ -19,11 +19,13 @@
 #include "CacheStatistics.hpp"
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       uint32_t CacheStatistics::LastModifiedTime::get( )

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheStatistics.hpp b/src/clicache/src/CacheStatistics.hpp
index ffbecf6..b2a751f 100644
--- a/src/clicache/src/CacheStatistics.hpp
+++ b/src/clicache/src/CacheStatistics.hpp
@@ -22,11 +22,13 @@
 #include "impl/NativeWrapper.hpp"
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheTransactionManager.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheTransactionManager.cpp b/src/clicache/src/CacheTransactionManager.cpp
index 0650d09..06a2f35 100644
--- a/src/clicache/src/CacheTransactionManager.cpp
+++ b/src/clicache/src/CacheTransactionManager.cpp
@@ -23,12 +23,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache {
-			namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       void CacheTransactionManager::Begin( )
@@ -72,23 +73,23 @@ namespace GemStone
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
 
-      GemStone::GemFire::Cache::Generic::TransactionId^ CacheTransactionManager::Suspend( )
+      Apache::Geode::Client::Generic::TransactionId^ CacheTransactionManager::Suspend( )
       {
         _GF_MG_EXCEPTION_TRY2
        
-          return GemStone::GemFire::Cache::Generic::TransactionId::Create( NativePtr->suspend().ptr() );
+          return Apache::Geode::Client::Generic::TransactionId::Create( NativePtr->suspend().ptr() );
        
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
-			GemStone::GemFire::Cache::Generic::TransactionId^ CacheTransactionManager::TransactionId::get( )
+			Apache::Geode::Client::Generic::TransactionId^ CacheTransactionManager::TransactionId::get( )
       {
         _GF_MG_EXCEPTION_TRY2
 
-          return GemStone::GemFire::Cache::Generic::TransactionId::Create( NativePtr->getTransactionId().ptr() );
+          return Apache::Geode::Client::Generic::TransactionId::Create( NativePtr->getTransactionId().ptr() );
 
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
-      void CacheTransactionManager::Resume(GemStone::GemFire::Cache::Generic::TransactionId^ transactionId)
+      void CacheTransactionManager::Resume(Apache::Geode::Client::Generic::TransactionId^ transactionId)
       {
         _GF_MG_EXCEPTION_TRY2
         
@@ -96,7 +97,7 @@ namespace GemStone
 
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
-      bool CacheTransactionManager::IsSuspended(GemStone::GemFire::Cache::Generic::TransactionId^ transactionId)
+      bool CacheTransactionManager::IsSuspended(Apache::Geode::Client::Generic::TransactionId^ transactionId)
       {
         _GF_MG_EXCEPTION_TRY2
 
@@ -104,7 +105,7 @@ namespace GemStone
 
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
-      bool CacheTransactionManager::TryResume(GemStone::GemFire::Cache::Generic::TransactionId^ transactionId)
+      bool CacheTransactionManager::TryResume(Apache::Geode::Client::Generic::TransactionId^ transactionId)
       {
         _GF_MG_EXCEPTION_TRY2
 
@@ -112,7 +113,7 @@ namespace GemStone
 
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
-      bool CacheTransactionManager::TryResume(GemStone::GemFire::Cache::Generic::TransactionId^ transactionId, int32_t waitTimeInMilliSec)
+      bool CacheTransactionManager::TryResume(Apache::Geode::Client::Generic::TransactionId^ transactionId, int32_t waitTimeInMilliSec)
       {
         _GF_MG_EXCEPTION_TRY2
 
@@ -120,7 +121,7 @@ namespace GemStone
 
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
-      bool CacheTransactionManager::Exists(GemStone::GemFire::Cache::Generic::TransactionId^ transactionId)
+      bool CacheTransactionManager::Exists(Apache::Geode::Client::Generic::TransactionId^ transactionId)
       {
         _GF_MG_EXCEPTION_TRY2
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheTransactionManager.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheTransactionManager.hpp b/src/clicache/src/CacheTransactionManager.hpp
index 26f18ea..2f70d57 100644
--- a/src/clicache/src/CacheTransactionManager.hpp
+++ b/src/clicache/src/CacheTransactionManager.hpp
@@ -26,12 +26,13 @@
 //#include "impl/TransactionListener.hpp"
 
 using namespace System;
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { 
-			namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       
       /// <summary>
@@ -103,7 +104,7 @@ namespace GemStone
         /// </summary>
         /// <returns>the transaction identifier of the suspended transaction or null if
         /// the thread was not associated with a transaction</returns>
-        GemStone::GemFire::Cache::Generic::TransactionId^ Suspend();
+        Apache::Geode::Client::Generic::TransactionId^ Suspend();
 
         /// <summary>
         /// On the current thread, resumes a transaction that was previously suspended
@@ -116,7 +117,7 @@ namespace GemStone
         /// <exception cref="IllegalStateException">if the thread is associated with a transaction or if
         /// would return false for the given transactionId</exception>
         /// <see cref="TransactionId"/> 
-        void Resume(GemStone::GemFire::Cache::Generic::TransactionId^ transactionId);
+        void Resume(Apache::Geode::Client::Generic::TransactionId^ transactionId);
 
         /// <summary>
         /// This method can be used to determine if a transaction with the given
@@ -129,7 +130,7 @@ namespace GemStone
         /// <param name="transactionId"></param>
         /// <returns>true if the transaction is in suspended state, false otherwise</returns>
         /// <see cref="TransactionId"/>
-        bool IsSuspended(GemStone::GemFire::Cache::Generic::TransactionId^ transactionId);
+        bool IsSuspended(Apache::Geode::Client::Generic::TransactionId^ transactionId);
 
 
         /// <summary>
@@ -148,7 +149,7 @@ namespace GemStone
         /// </summary>
         /// <param name="transactionId">the transaction to resume</param>
         /// <returns>true if the transaction was resumed, false otherwise</returns>
-        bool TryResume(GemStone::GemFire::Cache::Generic::TransactionId^ transactionId);
+        bool TryResume(Apache::Geode::Client::Generic::TransactionId^ transactionId);
 
 
         /// <summary>
@@ -172,7 +173,7 @@ namespace GemStone
         /// <param name="transactionId">the transaction to resume</param>
         /// <param name="waitTimeInMilliSec">the maximum milliseconds to wait </param>
         /// <returns>true if the transaction was resumed, false otherwise</returns>
-        bool TryResume(GemStone::GemFire::Cache::Generic::TransactionId^ transactionId, int32_t waitTimeInMilliSec);
+        bool TryResume(Apache::Geode::Client::Generic::TransactionId^ transactionId, int32_t waitTimeInMilliSec);
 
 
 
@@ -187,7 +188,7 @@ namespace GemStone
         /// <param name="transactionId">the given transaction identifier</param>
         /// <returns>true if the transaction is in progress, false otherwise.</returns>
         /// <see cref="isSuspended"/> 
-        bool Exists(GemStone::GemFire::Cache::Generic::TransactionId^ transactionId);
+        bool Exists(Apache::Geode::Client::Generic::TransactionId^ transactionId);
 
 
         /// <summary>
@@ -197,10 +198,10 @@ namespace GemStone
         /// </para>
         /// </summary>
         /// <returns>the transaction identifier or null if no transaction exists</returns>
-        property GemStone::GemFire::Cache::Generic::TransactionId^ TransactionId
+        property Apache::Geode::Client::Generic::TransactionId^ TransactionId
         {
         //TODO::split
-        GemStone::GemFire::Cache::Generic::TransactionId^ get( );
+        Apache::Geode::Client::Generic::TransactionId^ get( );
         }        
 
 #ifdef CSTX_COMMENTED

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheWriterAdapter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheWriterAdapter.hpp b/src/clicache/src/CacheWriterAdapter.hpp
index fb55831..8744270 100644
--- a/src/clicache/src/CacheWriterAdapter.hpp
+++ b/src/clicache/src/CacheWriterAdapter.hpp
@@ -21,11 +21,13 @@
 #include "ICacheWriter.hpp"
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableArrayList.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableArrayList.hpp b/src/clicache/src/CacheableArrayList.hpp
index a6103ea..9196105 100644
--- a/src/clicache/src/CacheableArrayList.hpp
+++ b/src/clicache/src/CacheableArrayList.hpp
@@ -24,11 +24,13 @@
 using namespace System;
 using namespace System::Collections::Generic;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       /// <summary>
       /// A mutable <c>IGFSerializable</c> vector wrapper that can serve as

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableBuiltins.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableBuiltins.hpp b/src/clicache/src/CacheableBuiltins.hpp
index d2f70df..b040762 100644
--- a/src/clicache/src/CacheableBuiltins.hpp
+++ b/src/clicache/src/CacheableBuiltins.hpp
@@ -30,11 +30,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       //namespace Internal
       

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableDate.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableDate.cpp b/src/clicache/src/CacheableDate.cpp
index fd85bb9..921f30b 100644
--- a/src/clicache/src/CacheableDate.cpp
+++ b/src/clicache/src/CacheableDate.cpp
@@ -27,11 +27,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       CacheableDate::CacheableDate(DateTime dateTime)
         : m_dateTime(dateTime),m_hashcode(0)

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableDate.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableDate.hpp b/src/clicache/src/CacheableDate.hpp
index ceea55c..9fa2325 100644
--- a/src/clicache/src/CacheableDate.hpp
+++ b/src/clicache/src/CacheableDate.hpp
@@ -25,11 +25,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       /// <summary>
       /// An immutable date wrapper that can serve as a distributable

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableFileName.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableFileName.cpp b/src/clicache/src/CacheableFileName.cpp
index 1fade1f..5ed733d 100644
--- a/src/clicache/src/CacheableFileName.cpp
+++ b/src/clicache/src/CacheableFileName.cpp
@@ -25,11 +25,13 @@
 #include "GemFireClassIds.hpp"
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       void CacheableFileName::ToData(DataOutput^ output)
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableFileName.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableFileName.hpp b/src/clicache/src/CacheableFileName.hpp
index f4fddfa..d0beb1a 100644
--- a/src/clicache/src/CacheableFileName.hpp
+++ b/src/clicache/src/CacheableFileName.hpp
@@ -25,11 +25,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       /// <summary>
       /// An immutable filename wrapper that can serve as a distributable

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableHashMap.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableHashMap.cpp b/src/clicache/src/CacheableHashMap.cpp
index 434a768..541dbdb 100644
--- a/src/clicache/src/CacheableHashMap.cpp
+++ b/src/clicache/src/CacheableHashMap.cpp
@@ -24,11 +24,13 @@
 using namespace System;
 using namespace System::Collections::Generic;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       // Region: IGFSerializable Members
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/CacheableHashMap.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableHashMap.hpp b/src/clicache/src/CacheableHashMap.hpp
index 3aaf1ed..a4df2e7 100644
--- a/src/clicache/src/CacheableHashMap.hpp
+++ b/src/clicache/src/CacheableHashMap.hpp
@@ -27,11 +27,13 @@ using namespace System::Collections::Generic;
 
 
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       /// <summary>
       /// A mutable <c>ICacheableKey</c> to <c>IGFSerializable</c> hash map