geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [34/50] [abbrv] geode git commit: GEODE-2316: Removed namespace Apache.Geode.Client.Generic.
Date Mon, 23 Jan 2017 19:17:26 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs b/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs
index bb7378c..b939cf9 100644
--- a/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs
+++ b/src/clicache/integration-test/ThinClientFunctionExecutionTestsN.cs
@@ -25,10 +25,10 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
 
-  using Apache.Geode.Client.Generic;
-  using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
+  using Apache.Geode.Client;
+  using Region = Apache.Geode.Client.IRegion<Object, Object>;
 
-  public class MyResultCollector<TResult> : Generic.IResultCollector<TResult>
+  public class MyResultCollector<TResult> : Client.IResultCollector<TResult>
   {
     #region Private members
     private bool m_resultReady = false;
@@ -243,8 +243,8 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       //test data dependant function execution
       //     test get function with result
       
-      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);
+      Apache.Geode.Client.Execution<object> exc = Client.FunctionService<object>.OnRegion<object, object>(region);
+      Client.IResultCollector<object> rc = exc.WithArgs<object>(args).WithFilter<object>(routingObj).Execute(getFuncName);
       ICollection<object> executeFunctionResult = rc.GetResult();
       List<object> resultList = new List<object>();
       //resultList.Clear();
@@ -284,7 +284,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 
       args = true;
 
-      exc = Generic.FunctionService<object>.OnRegion<object, object>(region);
+      exc = Client.FunctionService<object>.OnRegion<object, object>(region);
 
       rc = exc.WithArgs<object>(args).WithFilter<object>(filter).Execute(exFuncNameSendException);
 
@@ -332,7 +332,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       //test date independant fucntion execution on one server
       //     test get function with result
       
-      exc = Generic.FunctionService<object>.OnServer(pl);
+      exc = Client.FunctionService<object>.OnServer(pl);
       ArrayList args1 = new ArrayList();
       for (int i = 0; i < routingObj.Length; i++)
       {
@@ -361,7 +361,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       //test data independant fucntion execution on all servers
       //     test get function with result
       
-      exc = Generic.FunctionService<object>.OnServers(pl);
+      exc = Client.FunctionService<object>.OnServers(pl);
       rc = exc.WithArgs<ArrayList>(args1).Execute(getFuncIName);
       executeFunctionResult = rc.GetResult();
       resultList.Clear();
@@ -441,8 +441,8 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       int args1 = 0;
      
       MyResultCollector<int> myRC = new MyResultCollector<int>();
-      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");
+      Apache.Geode.Client.Execution<int> exc = Client.FunctionService<int>.OnServers/*OnRegion<string, string>*/(pl/*region*/);
+      Client.IResultCollector<int> rc = exc.WithArgs<int>(args1).WithCollector(myRC).Execute("SingleStrGetFunction");
       
       Util.Log("add result count= {0}.", myRC.GetAddResultCount());
       Util.Log("get result count= {0}.", myRC.GetGetResultCount());
@@ -492,8 +492,8 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       }
 
       MyResultCollector<string> myRC = new MyResultCollector<string>();
-      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");
+      Apache.Geode.Client.Execution<string> exc = Client.FunctionService<string>.OnServers/*OnRegion<string, string>*/(pl/*region*/);
+      Client.IResultCollector<string> rc = exc.WithArgs<ArrayList>(args1).WithCollector(myRC).Execute("SingleStrGetFunction");
       
       Util.Log("add result count= {0}.", myRC.GetAddResultCount());
       Util.Log("get result count= {0}.", myRC.GetGetResultCount());
@@ -541,8 +541,8 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
         count++;
       }
 
-      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");
+      Apache.Geode.Client.Execution<string> exc = Client.FunctionService<string>.OnServers/*OnRegion<string, string>*/(pl/*region*/);
+      Client.IResultCollector<string> rc = exc.WithArgs<ArrayList>(args1).Execute("SingleStrGetFunction");
 
       Assert.IsTrue(rc.GetResult().Count == 2, "result count check failed");
 
@@ -588,8 +588,8 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
         count++;
       }
 
-      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");
+      Apache.Geode.Client.Execution<object> exc = Client.FunctionService<object>.OnServers/*OnRegion<string, string>*/(pl/*region*/);
+      Client.IResultCollector<object> rc = exc.WithArgs<ArrayList>(args1).Execute("PdxFunctionTest");
 
       Assert.IsTrue(rc.GetResult().Count == 2, "result count check failed");
 
@@ -629,8 +629,8 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       bool args = true;
       //test data dependant function execution
       //     test get function with result
-      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);
+      Apache.Geode.Client.Execution<object> exc = Client.FunctionService<object>.OnRegion<object, object>(region);
+      Client.IResultCollector<object> rc = exc.WithArgs<bool>(args).WithFilter<object>(routingObj).Execute(getFuncName);
       ICollection<object> executeFunctionResult = rc.GetResult();
       List<object> resultList = new List<object>();
       //resultList.Clear();
@@ -684,11 +684,11 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 
       //test data independant function execution with result OnRegion
 
-      Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<object, object>(region);
+      Apache.Geode.Client.Execution<object> exc = Client.FunctionService<object>.OnRegion<object, object>(region);
 
       Assert.IsTrue(exc != null, "onRegion Returned NULL");
 
-      Generic.IResultCollector<object> rc = exc.WithArgs<ArrayList>(args1).Execute(RegionOperationsHAFunctionPrSHOP, 15);
+      Client.IResultCollector<object> rc = exc.WithArgs<ArrayList>(args1).Execute(RegionOperationsHAFunctionPrSHOP, 15);
 
       ICollection<object> executeFunctionResult = rc.GetResult();
       List<Object> resultList = new List<Object>();
@@ -739,11 +739,11 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 
       //test data independant function execution with result onServer
       
-      Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<object, object>(region);
+      Apache.Geode.Client.Execution<object> exc = Client.FunctionService<object>.OnRegion<object, object>(region);
 
       Assert.IsTrue(exc != null, "onRegion Returned NULL");
 
-      Generic.IResultCollector<object> rc = exc.WithArgs<ArrayList>(args1).Execute(RegionOperationsHAFunction, 15);
+      Client.IResultCollector<object> rc = exc.WithArgs<ArrayList>(args1).Execute(RegionOperationsHAFunction, 15);
 
       ICollection<object> executeFunctionResult = rc.GetResult();
       List<Object> resultList = new List<Object>();
@@ -812,7 +812,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
         Util.Log("filter count= {0}.", filter.Length);
 
 
-        Execution<object> exc = Generic.FunctionService<object>.OnRegion<object, object>(region);        
+        Execution<object> exc = Client.FunctionService<object>.OnRegion<object, object>(region);        
         IResultCollector<object> rc = exc.WithFilter<object>(filter).Execute(FEOnRegionPrSHOP);
         ICollection<object> executeFunctionResult = rc.GetResult();
         Util.Log("OnRegionPrSHOPSingleFilterKey for filter executeFunctionResult.Count = {0} ", executeFunctionResult.Count);
@@ -861,7 +861,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       Util.Log("filter count= {0}.", filter.Length);
 
 
-      Execution<object> exc = Generic.FunctionService<object>.OnRegion<object, object>(region);
+      Execution<object> exc = Client.FunctionService<object>.OnRegion<object, object>(region);
 
       IResultCollector<object> rc = exc.WithFilter<object>(filter).Execute(putFuncName);
 
@@ -897,7 +897,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 
         object args = true;
 
-        Execution<object> exc = Generic.FunctionService<object>.OnRegion<object, object>(region);
+        Execution<object> exc = Client.FunctionService<object>.OnRegion<object, object>(region);
 
         IResultCollector<object> rc = exc.WithFilter<object>(filter).Execute(getFuncName);
         ICollection<object> executeFunctionResult = rc.GetResult();
@@ -972,7 +972,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
         }
         Util.Log("filter count= {0}.", filter.Length);
 
-        Execution<object> exc = Generic.FunctionService<object>.OnRegion<object, object>(region);
+        Execution<object> exc = Client.FunctionService<object>.OnRegion<object, object>(region);
         IResultCollector<object> rc = exc.WithArgs<Object>(args).WithFilter<object>(filter).Execute(FuncTimeOutName, 5000);
         ICollection<object> FunctionResult = rc.GetResult();
         Util.Log("ExecuteFETimeOut onRegion FunctionResult.Count = {0} ", FunctionResult.Count);        
@@ -986,7 +986,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       }
 
       Pool pool = PoolManager.Find(poolName);
-      Execution<object> excs = Generic.FunctionService<object>.OnServer(pool);
+      Execution<object> excs = Client.FunctionService<object>.OnServer(pool);
       IResultCollector<object> rcs = excs.WithArgs<Object>(args).Execute(FuncTimeOutName, 5000);
       ICollection<object> ServerFunctionResult = rcs.GetResult();
       Util.Log("ExecuteFETimeOut onServer FunctionResult.Count = {0} ", ServerFunctionResult.Count);
@@ -998,7 +998,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       Util.Log("ExecuteFETimeOut onServer Done");
 
 
-      Execution<object> excss = Generic.FunctionService<object>.OnServers(pool);
+      Execution<object> excss = Client.FunctionService<object>.OnServers(pool);
       IResultCollector<object> rcss = excss.WithArgs<Object>(args).Execute(FuncTimeOutName, 5000);
       ICollection<object> ServerFunctionResults = rcss.GetResult();
       Util.Log("ExecuteFETimeOut onServer FunctionResult.Count = {0} ", ServerFunctionResults.Count);
@@ -1033,7 +1033,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 
         object args = true;
 
-        Execution<object> exc = Generic.FunctionService<object>.OnRegion<object, object>(region);
+        Execution<object> exc = Client.FunctionService<object>.OnRegion<object, object>(region);
 
         IResultCollector<object> rc = exc.WithFilter<object>(filter).Execute(getFuncName);
         ICollection<object> executeFunctionResult = rc.GetResult();
@@ -1110,7 +1110,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 
         object args = true;
 
-        Execution<object> exc = Generic.FunctionService<object>.OnRegion<object, object>(region);
+        Execution<object> exc = Client.FunctionService<object>.OnRegion<object, object>(region);
 
         IResultCollector<object> rc = exc.WithFilter<object>(filter).Execute(FEOnRegionPrSHOP);
         ICollection<object> executeFunctionResult = rc.GetResult();
@@ -1173,7 +1173,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
         Util.Log("FEOnRegionPrSHOP_OptimizeForWrite with ResultCollector done");
       }
       
-      Execution<object> exe = Generic.FunctionService<object>.OnRegion<object, object>(region);      
+      Execution<object> exe = Client.FunctionService<object>.OnRegion<object, object>(region);      
 
       //w/o filter      
       IResultCollector<object> collector = exe.Execute(FEOnRegionPrSHOP);
@@ -1255,7 +1255,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       Util.Log("filter count= {0}.", fil.Length);
 
       // Fire N Forget with filter keys
-      exe = Generic.FunctionService<object>.OnRegion<object, object>(region);
+      exe = Client.FunctionService<object>.OnRegion<object, object>(region);
       exe.WithFilter<object>(fil).Execute(putFuncName);
       Util.Log("Executing ExecuteFunctionOnRegion on region for execKeys for arrList arguement done.");
       Thread.Sleep(4000); //wait for results to be updated
@@ -1275,7 +1275,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       {
         args1.Add("KEY--" + i);
       }
-      exe = Generic.FunctionService<object>.OnRegion<object, object>(region);
+      exe = Client.FunctionService<object>.OnRegion<object, object>(region);
       exe.WithArgs<ArrayList>(args1).Execute(putFuncIName);
       Util.Log("Executing ExecuteFunctionOnRegion on region for execKeys for arrList arguement done.");
       Thread.Sleep(4000); ////wait for results to be updated
@@ -1321,10 +1321,10 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       //test data independant function execution with result onServer
       Pool/*<TKey, TValue>*/ pool = PoolManager/*<TKey, TValue>*/.Find(poolName);
       
-      Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnServer(pool);
+      Apache.Geode.Client.Execution<object> exc = Client.FunctionService<object>.OnServer(pool);
       Assert.IsTrue(exc != null, "onServer Returned NULL");
 
-      Generic.IResultCollector<object> rc = exc.WithArgs<ArrayList>(args1).Execute(OnServerHAExceptionFunction, 15);
+      Client.IResultCollector<object> rc = exc.WithArgs<ArrayList>(args1).Execute(OnServerHAExceptionFunction, 15);
 
       ICollection<object> executeFunctionResult = rc.GetResult();
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientHARegionTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientHARegionTestsN.cs b/src/clicache/integration-test/ThinClientHARegionTestsN.cs
index b02aa43..62a0cce 100644
--- a/src/clicache/integration-test/ThinClientHARegionTestsN.cs
+++ b/src/clicache/integration-test/ThinClientHARegionTestsN.cs
@@ -24,9 +24,9 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client.Tests.NewAPI;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
-  using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
+  using Region = Apache.Geode.Client.IRegion<Object, Object>;
 
   [TestFixture]
   [Category("group4")]

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientListenerWriterN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientListenerWriterN.cs b/src/clicache/integration-test/ThinClientListenerWriterN.cs
index 726ebff..80d186a 100644
--- a/src/clicache/integration-test/ThinClientListenerWriterN.cs
+++ b/src/clicache/integration-test/ThinClientListenerWriterN.cs
@@ -22,9 +22,9 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
   using Apache.Geode.Client.UnitTests.NewAPI;
-  using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
+  using Region = Apache.Geode.Client.IRegion<Object, Object>;
 
   [TestFixture]
   [Category("group1")]

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientPdxTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientPdxTests.cs b/src/clicache/integration-test/ThinClientPdxTests.cs
index d9b7239..24b4e4e 100755
--- a/src/clicache/integration-test/ThinClientPdxTests.cs
+++ b/src/clicache/integration-test/ThinClientPdxTests.cs
@@ -28,8 +28,8 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
-  using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
+  using Apache.Geode.Client;
+  using Region = Apache.Geode.Client.IRegion<Object, Object>;
 
   
   [TestFixture]
@@ -1556,7 +1556,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
          {
              object retVal = localregion[p1];
          }
-         catch (Apache.Geode.Client.Generic.KeyNotFoundException)
+         catch (Apache.Geode.Client.KeyNotFoundException)
          {
              Util.Log("Got expected KeyNotFoundException exception");
          }
@@ -1770,11 +1770,11 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
          region0[1] = pRet;
          if (m_useWeakHashMap == false)
          {
-           Assert.AreEqual(Generic.Internal.PdxTypeRegistry.testNumberOfPreservedData(), 0);
+           Assert.AreEqual(Client.Internal.PdxTypeRegistry.testNumberOfPreservedData(), 0);
          }
          else
          {
-           Assert.IsTrue(Generic.Internal.PdxTypeRegistry.testNumberOfPreservedData() > 0); 
+           Assert.IsTrue(Client.Internal.PdxTypeRegistry.testNumberOfPreservedData() > 0); 
          }
        }
 
@@ -1797,12 +1797,12 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 
        if (m_useWeakHashMap == false)
        {
-         Assert.AreEqual(Generic.Internal.PdxTypeRegistry.testNumberOfPreservedData(), 0);
+         Assert.AreEqual(Client.Internal.PdxTypeRegistry.testNumberOfPreservedData(), 0);
        }
        else
        {
          //it has extra fields, so no need to preserve data
-         Assert.IsTrue(Generic.Internal.PdxTypeRegistry.testNumberOfPreservedData() == 0); 
+         Assert.IsTrue(Client.Internal.PdxTypeRegistry.testNumberOfPreservedData() == 0); 
        }
      }
 
@@ -1911,7 +1911,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
        {
          pRet = region0.GetLocalView()[key];
        }
-       catch (Apache.Geode.Client.Generic.KeyNotFoundException )
+       catch (Apache.Geode.Client.KeyNotFoundException )
        {
          isKNFE = true;
        }
@@ -2990,7 +2990,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
        ret = region0[2];
        Util.Log("Put from pool-2 completed");
 
-       int pdxIds = Apache.Geode.Client.Generic.Internal.PdxTypeRegistry.testGetNumberOfPdxIds();
+       int pdxIds = Apache.Geode.Client.Internal.PdxTypeRegistry.testGetNumberOfPdxIds();
 
        Assert.AreEqual(3, pdxIds);
      }
@@ -5020,7 +5020,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
               entryFound++;
           }
         }
-        catch (Generic.KeyNotFoundException )
+        catch (Client.KeyNotFoundException )
         {
           entryNotFound++;
         }
@@ -5112,7 +5112,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
                entryFound++;
            }
          }
-         catch (Generic.KeyNotFoundException )
+         catch (Client.KeyNotFoundException )
          {
            entryNotFound++;
          }
@@ -7163,7 +7163,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 
 namespace javaobject
 {
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
   #region Pdx Delta class
   public class PdxDelta : IPdxSerializable, IGFDelta, ICloneable
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientPoolTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientPoolTestsN.cs b/src/clicache/integration-test/ThinClientPoolTestsN.cs
index fc2e311..e510449 100644
--- a/src/clicache/integration-test/ThinClientPoolTestsN.cs
+++ b/src/clicache/integration-test/ThinClientPoolTestsN.cs
@@ -24,8 +24,8 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
-  using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
+  using Apache.Geode.Client;
+  using Region = Apache.Geode.Client.IRegion<Object, Object>;
 
   [TestFixture]
   [Category("group2")]
@@ -71,7 +71,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 
     bool checkPoolAttributes
     (
-      Generic.Pool pool,
+      Client.Pool pool,
       string[] locators,
       string[] servers,
       int freeConnectionTimeout,

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientQueryTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientQueryTestsN.cs b/src/clicache/integration-test/ThinClientQueryTestsN.cs
index 3bf9b0f..a3eb260 100644
--- a/src/clicache/integration-test/ThinClientQueryTestsN.cs
+++ b/src/clicache/integration-test/ThinClientQueryTestsN.cs
@@ -25,7 +25,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client.Tests.NewAPI;
   
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
   using QueryStatics = Apache.Geode.Client.Tests.QueryStatics;
   using QueryCategory = Apache.Geode.Client.Tests.QueryCategory;
@@ -169,7 +169,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
         null, locators, "__TESTPOOL1_", true);
 
       IRegion<object, object> region = CacheHelper.GetRegion<object, object>(QueryRegionNames[0]);
-      Apache.Geode.Client.Generic.RegionAttributes<object, object> regattrs = region.Attributes;
+      Apache.Geode.Client.RegionAttributes<object, object> regattrs = region.Attributes;
       region.CreateSubRegion(QueryRegionNames[1], regattrs);
     }
     

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientRegionInterestTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientRegionInterestTestsN.cs b/src/clicache/integration-test/ThinClientRegionInterestTestsN.cs
index dfe01c3..fb1db13 100644
--- a/src/clicache/integration-test/ThinClientRegionInterestTestsN.cs
+++ b/src/clicache/integration-test/ThinClientRegionInterestTestsN.cs
@@ -23,7 +23,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
   [TestFixture]
   [Category("group1")]

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientRegionStepsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientRegionStepsN.cs b/src/clicache/integration-test/ThinClientRegionStepsN.cs
index c291e31..22dbd47 100644
--- a/src/clicache/integration-test/ThinClientRegionStepsN.cs
+++ b/src/clicache/integration-test/ThinClientRegionStepsN.cs
@@ -23,8 +23,8 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
-  using AssertionException = Apache.Geode.Client.Generic.AssertionException;
+  using Apache.Geode.Client;
+  using AssertionException = Apache.Geode.Client.AssertionException;
 
 
   [TestFixture]
@@ -320,12 +320,12 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       CacheHelper.ReadyForEvents();
     }
 
-    public void DoPutsMU(int numOps, Generic.Properties<string, string> credentials, bool multiuserMode, ExpectedResult result)
+    public void DoPutsMU(int numOps, Client.Properties<string, string> credentials, bool multiuserMode, ExpectedResult result)
     {
       DoPuts(numOps, false, result, credentials, multiuserMode);
     }
 
-    public void DoPutsMU(int numOps, Generic.Properties<string, string> credentials, bool multiuserMode)
+    public void DoPutsMU(int numOps, Client.Properties<string, string> credentials, bool multiuserMode)
     {
       DoPuts(numOps, false, ExpectedResult.Success, credentials, multiuserMode);
     }
@@ -345,7 +345,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       DoPuts(numOps, useNewVal, expect, null, false);
     }
 
-    public void DoPuts(int numOps, bool useNewVal, ExpectedResult expect, Generic.Properties<string, string> credentials, bool multiuserMode)
+    public void DoPuts(int numOps, bool useNewVal, ExpectedResult expect, Client.Properties<string, string> credentials, bool multiuserMode)
     {
       string valPrefix = (useNewVal ? NValuePrefix : ValuePrefix);
       IRegion<object, object> region;
@@ -426,7 +426,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       }
     }
 
-    public void DoPutsTx(int numOps, bool useNewVal, ExpectedResult expect, Generic.Properties<string, string> credentials, bool multiuserMode)
+    public void DoPutsTx(int numOps, bool useNewVal, ExpectedResult expect, Client.Properties<string, string> credentials, bool multiuserMode)
     {
       Util.Log("DoPutsTx starts");
       CacheHelper.CSTXManager.Begin();
@@ -504,12 +504,12 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       Util.Log("DoPutsTx Done");
     }
 
-    public void DoGetsMU(int numOps, Generic.Properties<string, string> credential, bool isMultiuser, ExpectedResult result)
+    public void DoGetsMU(int numOps, Client.Properties<string, string> credential, bool isMultiuser, ExpectedResult result)
     {
       DoGets(numOps, false, result, credential, isMultiuser);
     }
 
-    public void DoGetsMU(int numOps, Generic.Properties<string, string> credential, bool isMultiuser)
+    public void DoGetsMU(int numOps, Client.Properties<string, string> credential, bool isMultiuser)
     {
       DoGets(numOps, false, ExpectedResult.Success, credential, isMultiuser);
     }
@@ -528,7 +528,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
     {
       DoGets(numOps, useNewVal, expect, null, false);
     }
-    public void DoGets(int numOps, bool useNewVal, ExpectedResult expect, Generic.Properties<string, string> credential, bool isMultiuser)
+    public void DoGets(int numOps, bool useNewVal, ExpectedResult expect, Client.Properties<string, string> credential, bool isMultiuser)
     {
       string valPrefix = (useNewVal ? NValuePrefix : ValuePrefix);
       IRegion<object, object> region;

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientRegionTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientRegionTestsN.cs b/src/clicache/integration-test/ThinClientRegionTestsN.cs
index a563322..c85624c 100644
--- a/src/clicache/integration-test/ThinClientRegionTestsN.cs
+++ b/src/clicache/integration-test/ThinClientRegionTestsN.cs
@@ -26,7 +26,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
   [Serializable]
   public class CustomPartitionResolver<TValue> : IPartitionResolver<int, TValue>
@@ -574,7 +574,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       {
         Assert.Fail("Expected region size 0");
       }
-      Apache.Geode.Client.Generic.RegionAttributes<object, object> attr = region0.Attributes;
+      Apache.Geode.Client.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/649e4a87/src/clicache/integration-test/ThinClientSecurityAuthTestsMUN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientSecurityAuthTestsMUN.cs b/src/clicache/integration-test/ThinClientSecurityAuthTestsMUN.cs
index 461f394..d23fd5e 100644
--- a/src/clicache/integration-test/ThinClientSecurityAuthTestsMUN.cs
+++ b/src/clicache/integration-test/ThinClientSecurityAuthTestsMUN.cs
@@ -24,7 +24,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using NUnit.Framework;
   using Apache.Geode.Client.Tests.NewAPI;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
   [TestFixture]
   [Category("group4")]
   [Category("unicast_only")]

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientSecurityAuthTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientSecurityAuthTestsN.cs b/src/clicache/integration-test/ThinClientSecurityAuthTestsN.cs
index d559ef0..730e6fb 100644
--- a/src/clicache/integration-test/ThinClientSecurityAuthTestsN.cs
+++ b/src/clicache/integration-test/ThinClientSecurityAuthTestsN.cs
@@ -24,7 +24,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using NUnit.Framework;
   using Apache.Geode.Client.Tests.NewAPI;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
   [TestFixture]
   [Category("group1")]

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs b/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs
index 067677f..164138e 100644
--- a/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs
+++ b/src/clicache/integration-test/ThinClientSecurityAuthzTestBaseN.cs
@@ -24,9 +24,9 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using NUnit.Framework;
   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;
+  using Apache.Geode.Client;
+  //using Region = Apache.Geode.Client.IRegion<Object, Object>;
+  using AssertionException = Apache.Geode.Client.AssertionException;
   public abstract class ThinClientSecurityAuthzTestBase : ThinClientRegionSteps
   {
     #region Protected members
@@ -194,7 +194,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
                 {
                   value = region[key];
                 }
-                catch (Generic.KeyNotFoundException )
+                catch (Client.KeyNotFoundException )
                 {
                   Util.Log("KeyNotFoundException while getting key. should be ok as we are just testing auth");
                 }
@@ -432,8 +432,8 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
                 Pool/*<object, object>*/ pool2 = PoolManager/*<object, object>*/.Find("__TESTPOOL1_");
                 if (pool2 != null)
                 {
-                  Generic.FunctionService<object>.OnServer(pool2).Execute("securityTest");
-                  Generic.FunctionService<object>.OnRegion<object, object>(region).Execute("FireNForget"); 
+                  Client.FunctionService<object>.OnServer(pool2).Execute("securityTest");
+                  Client.FunctionService<object>.OnRegion<object, object>(region).Execute("FireNForget"); 
                 }
                 else
                 {
@@ -445,11 +445,11 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
                 //FunctionService fs = CacheHelper.getMultiuserCache(creds).GetFunctionService();
                 //Execution exe =  fs.OnServer();
                 IRegionService userCache = CacheHelper.getMultiuserCache(creds);
-                Apache.Geode.Client.Generic.Execution<object> exe = Generic.FunctionService<object>.OnServer(userCache);
+                Apache.Geode.Client.Execution<object> exe = Client.FunctionService<object>.OnServer(userCache);
                 exe.Execute("securityTest");
-                exe = Generic.FunctionService<object>.OnServers(userCache);
-                Generic.FunctionService<object>.OnRegion<object, object>(region);
-                Generic.FunctionService<object>.OnRegion<object, object>(userCache.GetRegion<object, object>(region.Name)).Execute("FireNForget");
+                exe = Client.FunctionService<object>.OnServers(userCache);
+                Client.FunctionService<object>.OnRegion<object, object>(region);
+                Client.FunctionService<object>.OnRegion<object, object>(userCache.GetRegion<object, object>(region.Name)).Execute("FireNForget");
               }
               break;
             default:

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs b/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs
index a853a7a..52cb879 100644
--- a/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs
+++ b/src/clicache/integration-test/ThinClientSecurityAuthzTestsMUN.cs
@@ -24,7 +24,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client.Tests.NewAPI;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
   public class MyCqListener2<TKey, TResult> : ICqListener<TKey, TResult>
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientSecurityAuthzTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientSecurityAuthzTestsN.cs b/src/clicache/integration-test/ThinClientSecurityAuthzTestsN.cs
index 3d20896..2ae797e 100644
--- a/src/clicache/integration-test/ThinClientSecurityAuthzTestsN.cs
+++ b/src/clicache/integration-test/ThinClientSecurityAuthzTestsN.cs
@@ -24,7 +24,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client.Tests.NewAPI;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
   [TestFixture]
   [Category("group3")]

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientStatisticTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientStatisticTestsN.cs b/src/clicache/integration-test/ThinClientStatisticTestsN.cs
index 3c9e19e..7b87525 100644
--- a/src/clicache/integration-test/ThinClientStatisticTestsN.cs
+++ b/src/clicache/integration-test/ThinClientStatisticTestsN.cs
@@ -23,7 +23,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using Apache.Geode.DUnitFramework;
   using System.Threading;
 
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
   public class TestStatisticsType
   {

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

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

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/AttributesFactory.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesFactory.cpp b/src/clicache/src/AttributesFactory.cpp
index a90b0d8..6495411 100644
--- a/src/clicache/src/AttributesFactory.cpp
+++ b/src/clicache/src/AttributesFactory.cpp
@@ -47,10 +47,9 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       generic<class TKey, class TValue>
-      AttributesFactory<TKey, TValue>::AttributesFactory( Apache::Geode::Client::Generic::RegionAttributes<TKey, TValue>^ regionAttributes )
+      AttributesFactory<TKey, TValue>::AttributesFactory( Apache::Geode::Client::RegionAttributes<TKey, TValue>^ regionAttributes )
         : UMWrap( )
       {
         apache::geode::client::RegionAttributesPtr attribptr(
@@ -105,8 +104,8 @@ namespace Generic
       {
         apache::geode::client::PartitionResolverPtr resolverptr;
         if ( partitionresolver != nullptr ) {
-          Generic::IFixedPartitionResolver<TKey, TValue>^ resolver = 
-            dynamic_cast<Generic::IFixedPartitionResolver<TKey, TValue>^>(partitionresolver);
+          Client::IFixedPartitionResolver<TKey, TValue>^ resolver = 
+            dynamic_cast<Client::IFixedPartitionResolver<TKey, TValue>^>(partitionresolver);
           if (resolver != nullptr) {            
             FixedPartitionResolverGeneric<TKey, TValue>^ prg = gcnew FixedPartitionResolverGeneric<TKey, TValue>();
             prg->SetPartitionResolver(partitionresolver);
@@ -316,18 +315,17 @@ namespace Generic
       // FACTORY METHOD
 
       generic<class TKey, class TValue>
-      Apache::Geode::Client::Generic::RegionAttributes<TKey, TValue>^ AttributesFactory<TKey, TValue>::CreateRegionAttributes()
+      Apache::Geode::Client::RegionAttributes<TKey, TValue>^ AttributesFactory<TKey, TValue>::CreateRegionAttributes()
       {
         _GF_MG_EXCEPTION_TRY2/* due to auto replace */
 
-          apache::geode::client::RegionAttributesPtr& nativeptr (
-            NativePtr->createRegionAttributes( ) );
-          return Apache::Geode::Client::Generic::RegionAttributes<TKey, TValue>::Create(nativeptr.ptr());
+          apache::geode::client::RegionAttributesPtr& nativeptr(
+          NativePtr->createRegionAttributes());
+        return Apache::Geode::Client::RegionAttributes<TKey, TValue>::Create(nativeptr.ptr());
 
         _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
       }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
-} //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/AttributesFactory.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesFactory.hpp b/src/clicache/src/AttributesFactory.hpp
index 8cfe869..3cc82a6 100644
--- a/src/clicache/src/AttributesFactory.hpp
+++ b/src/clicache/src/AttributesFactory.hpp
@@ -42,8 +42,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic 
-    {
 
       //ref class RegionAttributes;
       //interface class ICacheLoader;
@@ -509,8 +507,7 @@ namespace Generic
         /// </exception>
         RegionAttributes<TKey, TValue>^ CreateRegionAttributes( );
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/AttributesMutator.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesMutator.cpp b/src/clicache/src/AttributesMutator.cpp
index 0df93ba..6008d34 100644
--- a/src/clicache/src/AttributesMutator.cpp
+++ b/src/clicache/src/AttributesMutator.cpp
@@ -33,8 +33,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       generic<class TKey, class TValue>
       int32_t AttributesMutator<TKey, TValue>::SetEntryIdleTimeout( int32_t idleTimeout )
@@ -178,9 +176,8 @@ namespace Generic
 
         NativePtr->setCacheWriter( mg_libpath.CharPtr,
           mg_factoryFunctionName.CharPtr );
-      }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
  } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/AttributesMutator.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesMutator.hpp b/src/clicache/src/AttributesMutator.hpp
index 36f6685..fdeb394 100644
--- a/src/clicache/src/AttributesMutator.hpp
+++ b/src/clicache/src/AttributesMutator.hpp
@@ -34,8 +34,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       /// <summary>
       /// Supports modification of certain region attributes after the region
@@ -260,8 +258,7 @@ namespace Generic
         inline AttributesMutator<TKey, TValue>( apache::geode::client::AttributesMutator* nativeptr )
           : SBWrap( nativeptr ) { }
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/Cache.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Cache.cpp b/src/clicache/src/Cache.cpp
index 8f0e0a4..160bbbd 100644
--- a/src/clicache/src/Cache.cpp
+++ b/src/clicache/src/Cache.cpp
@@ -41,9 +41,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
-     
 
       String^ Cache::Name::get( )
       {
@@ -60,7 +57,7 @@ namespace Generic
         apache::geode::client::DistributedSystemPtr& nativeptr(
           NativePtr->getDistributedSystem( ) );
 
-        return Apache::Geode::Client::Generic::DistributedSystem::Create(
+        return Apache::Geode::Client::DistributedSystem::Create(
           nativeptr.ptr( ) );
       }
 
@@ -69,7 +66,7 @@ namespace Generic
         apache::geode::client::InternalCacheTransactionManager2PCPtr& nativeptr = static_cast<InternalCacheTransactionManager2PCPtr>(
           NativePtr->getCacheTransactionManager( ) );
 
-        return Apache::Geode::Client::Generic::CacheTransactionManager::Create(
+        return Apache::Geode::Client::CacheTransactionManager::Create(
           nativeptr.ptr( ) );
       }
 
@@ -82,9 +79,9 @@ namespace Generic
       {
         _GF_MG_EXCEPTION_TRY2
 
-          Apache::Geode::Client::Generic::DistributedSystem::acquireDisconnectLock();
+          Apache::Geode::Client::DistributedSystem::acquireDisconnectLock();
 
-        Apache::Geode::Client::Generic::DistributedSystem::disconnectInstance();
+        Apache::Geode::Client::DistributedSystem::disconnectInstance();
           CacheFactory::m_connected = false;
 
           NativePtr->close( keepalive );
@@ -92,16 +89,16 @@ namespace Generic
           // If DS automatically disconnected due to the new bootstrap API, then cleanup the C++/CLI side
           //if (!apache::geode::client::DistributedSystem::isConnected())
           {
-            Apache::Geode::Client::Generic::DistributedSystem::UnregisterBuiltinManagedTypes();
+            Apache::Geode::Client::DistributedSystem::UnregisterBuiltinManagedTypes();
           }
 
         _GF_MG_EXCEPTION_CATCH_ALL2
         finally
         {
-					Apache::Geode::Client::Generic::Internal::PdxTypeRegistry::clear();
+					Apache::Geode::Client::Internal::PdxTypeRegistry::clear();
           Serializable::Clear();
-          Apache::Geode::Client::Generic::DistributedSystem::releaseDisconnectLock();
-          Apache::Geode::Client::Generic::DistributedSystem::unregisterCliCallback();
+          Apache::Geode::Client::DistributedSystem::releaseDisconnectLock();
+          Apache::Geode::Client::DistributedSystem::unregisterCliCallback();
         }
       }
 
@@ -115,7 +112,7 @@ namespace Generic
       }
 
       generic<class TKey, class TValue>
-      Generic::IRegion<TKey,TValue>^ Cache::GetRegion( String^ path )
+      Client::IRegion<TKey,TValue>^ Cache::GetRegion( String^ path )
       {
         _GF_MG_EXCEPTION_TRY2/* due to auto replace */
 
@@ -123,39 +120,39 @@ namespace Generic
           apache::geode::client::RegionPtr& nativeptr(
             NativePtr->getRegion( mg_path.CharPtr ) );
 
-          return Generic::Region<TKey,TValue>::Create( nativeptr.ptr( ) );
+          return Client::Region<TKey,TValue>::Create( nativeptr.ptr( ) );
 
         _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
       }
 
       generic<class TKey, class TValue>
-      array<Generic::IRegion<TKey, TValue>^>^ Cache::RootRegions( )
+      array<Client::IRegion<TKey, TValue>^>^ Cache::RootRegions( )
       {
         apache::geode::client::VectorOfRegion vrr;
         NativePtr->rootRegions( vrr );
-        array<Generic::IRegion<TKey, TValue>^>^ rootRegions =
-          gcnew array<Generic::IRegion<TKey, TValue>^>( vrr.size( ) );
+        array<Client::IRegion<TKey, TValue>^>^ rootRegions =
+          gcnew array<Client::IRegion<TKey, TValue>^>( vrr.size( ) );
 
         for( int32_t index = 0; index < vrr.size( ); index++ )
         {
           apache::geode::client::RegionPtr& nativeptr( vrr[ index ] );
-          rootRegions[ index ] = Generic::Region<TKey, TValue>::Create( nativeptr.ptr( ) );
+          rootRegions[ index ] = Client::Region<TKey, TValue>::Create( nativeptr.ptr( ) );
         }
         return rootRegions;
       }
 
       generic<class TKey, class TResult>
-      Generic::QueryService<TKey, TResult>^ Cache::GetQueryService( )
+      Client::QueryService<TKey, TResult>^ Cache::GetQueryService( )
       {
         _GF_MG_EXCEPTION_TRY2
 
-          return Generic::QueryService<TKey, TResult>::Create( NativePtr->getQueryService( ).ptr( ) );
+          return Client::QueryService<TKey, TResult>::Create( NativePtr->getQueryService( ).ptr( ) );
 
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
 
       generic<class TKey, class TResult>
-      Generic::QueryService<TKey, TResult>^ Cache::GetQueryService(String^ poolName )
+      Client::QueryService<TKey, TResult>^ Cache::GetQueryService(String^ poolName )
       {
         _GF_MG_EXCEPTION_TRY2
 
@@ -262,8 +259,8 @@ namespace Generic
         IPdxInstanceFactory^ Cache::CreatePdxInstanceFactory(String^ className)
         {
           return gcnew Internal::PdxInstanceFactoryImpl(className);
-        }
-      } // end namespace Generic
-    }
-  }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/Cache.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Cache.hpp b/src/clicache/src/Cache.hpp
index dbe935f..47d20f8 100644
--- a/src/clicache/src/Cache.hpp
+++ b/src/clicache/src/Cache.hpp
@@ -38,8 +38,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
 
 				generic<class TKey, class TResult>
 				ref class QueryService;
@@ -110,18 +108,18 @@ namespace Generic
         /// This method does not throw
         /// <c>CacheClosedException</c> if the cache is closed.
         /// </remarks>
-        virtual property Apache::Geode::Client::Generic::DistributedSystem^ DistributedSystem
+        virtual property Apache::Geode::Client::DistributedSystem^ DistributedSystem
         {
-          Apache::Geode::Client::Generic::DistributedSystem^ get( );
+          Apache::Geode::Client::DistributedSystem^ get( );
         }
 
         /// <summary>
         /// Returns the cache transaction manager of
         /// <see cref="CacheFactory.Create" /> this cache.
         /// </summary>
-        virtual property Apache::Geode::Client::Generic::CacheTransactionManager^ CacheTransactionManager
+        virtual property Apache::Geode::Client::CacheTransactionManager^ CacheTransactionManager
         {
-          Apache::Geode::Client::Generic::CacheTransactionManager^ get( );
+          Apache::Geode::Client::CacheTransactionManager^ get( );
         }
 
         /// <summary>
@@ -197,7 +195,7 @@ namespace Generic
         /// before actually firing a query.
         /// </remarks>
         generic<class TKey, class TResult>
-        virtual Generic::QueryService<TKey, TResult>^ GetQueryService();
+        virtual Client::QueryService<TKey, TResult>^ GetQueryService();
 
         /// <summary>
         /// Get a query service object to be able to query the cache.
@@ -209,7 +207,7 @@ namespace Generic
         /// before actually firing a query.
         /// </remarks>
         generic<class TKey, class TResult>
-        virtual Generic::QueryService<TKey, TResult>^ GetQueryService(String^ poolName );
+        virtual Client::QueryService<TKey, TResult>^ GetQueryService(String^ poolName );
 
         /// <summary>
         /// Returns the instance of <see cref="RegionFactory" /> to create the region
@@ -286,7 +284,7 @@ namespace Generic
         inline Cache( apache::geode::client::Cache* nativeptr )
           : SBWrap( nativeptr ) { }
       };
-      } // end namespace Generic
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheFactory.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheFactory.cpp b/src/clicache/src/CacheFactory.cpp
index b78e478..10602cf 100644
--- a/src/clicache/src/CacheFactory.cpp
+++ b/src/clicache/src/CacheFactory.cpp
@@ -37,8 +37,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
+
       CacheFactory^ CacheFactory::CreateCacheFactory()
       {
         return CacheFactory::CreateCacheFactory(Properties<String^, String^>::Create<String^, String^>());
@@ -87,7 +86,7 @@ namespace Generic
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::PdxType,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Generic::Internal::PdxType::CreateDeserializable),
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Internal::PdxType::CreateDeserializable),
               nullptr);
 
            if(!m_connected)
@@ -105,8 +104,8 @@ namespace Generic
           finally {
             DistributedSystem::registerCliCallback();
 						Serializable::RegisterPDXManagedCacheableKey(appDomainEnable);
-					Apache::Geode::Client::Generic::Internal::PdxTypeRegistry::PdxIgnoreUnreadFields = pdxIgnoreUnreadFields; 
-          Apache::Geode::Client::Generic::Internal::PdxTypeRegistry::PdxReadSerialized = pdxReadSerialized; 
+					Apache::Geode::Client::Internal::PdxTypeRegistry::PdxIgnoreUnreadFields = pdxIgnoreUnreadFields; 
+          Apache::Geode::Client::Internal::PdxTypeRegistry::PdxReadSerialized = pdxReadSerialized; 
           DistributedSystem::releaseDisconnectLock();
         }
       }
@@ -406,8 +405,8 @@ namespace Generic
           return this;
 
 			  _GF_MG_EXCEPTION_CATCH_ALL2
-      }
-      } // end namespace Generic
-    }
-  }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheFactory.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheFactory.hpp b/src/clicache/src/CacheFactory.hpp
index 867ee23..d422be2 100644
--- a/src/clicache/src/CacheFactory.hpp
+++ b/src/clicache/src/CacheFactory.hpp
@@ -31,8 +31,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
+
       ref class Cache;
       ref class CacheAttributes;
       ref class DistributedSystem;
@@ -605,8 +604,7 @@ namespace Generic
         internal:
           static bool m_connected = false;
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
-}

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheListenerAdapter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheListenerAdapter.hpp b/src/clicache/src/CacheListenerAdapter.hpp
index ed530b9..9bbafca 100644
--- a/src/clicache/src/CacheListenerAdapter.hpp
+++ b/src/clicache/src/CacheListenerAdapter.hpp
@@ -27,8 +27,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       /// <summary>
       /// Utility class that implements all methods in <c>ICacheListener</c>
@@ -72,15 +70,14 @@ namespace Generic
         {
         }
 
-        virtual void Close(Apache::Geode::Client::Generic::IRegion<TKey, TValue>^ region)
+        virtual void Close(Apache::Geode::Client::IRegion<TKey, TValue>^ region)
         {
         }
-		virtual void AfterRegionDisconnected(Apache::Geode::Client::Generic::IRegion<TKey, TValue>^ region)
+		virtual void AfterRegionDisconnected(Apache::Geode::Client::IRegion<TKey, TValue>^ region)
         {
         }
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheStatistics.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheStatistics.cpp b/src/clicache/src/CacheStatistics.cpp
index 7ddd7d1..326ffec 100644
--- a/src/clicache/src/CacheStatistics.cpp
+++ b/src/clicache/src/CacheStatistics.cpp
@@ -25,8 +25,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       uint32_t CacheStatistics::LastModifiedTime::get( )
       {
@@ -36,9 +34,8 @@ namespace Generic
       uint32_t CacheStatistics::LastAccessedTime::get( )
       {
         return NativePtr->getLastAccessedTime( );
-      }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
  } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheStatistics.hpp b/src/clicache/src/CacheStatistics.hpp
index b2a751f..dfedb24 100644
--- a/src/clicache/src/CacheStatistics.hpp
+++ b/src/clicache/src/CacheStatistics.hpp
@@ -28,8 +28,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       /// <summary>
       /// Defines common statistical information for both the region and its entries.
@@ -149,8 +147,7 @@ namespace Generic
         inline CacheStatistics( apache::geode::client::CacheStatistics* nativeptr )
           : SBWrap( nativeptr ) { }
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheTransactionManager.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheTransactionManager.cpp b/src/clicache/src/CacheTransactionManager.cpp
index 06a2f35..6d15b38 100644
--- a/src/clicache/src/CacheTransactionManager.cpp
+++ b/src/clicache/src/CacheTransactionManager.cpp
@@ -29,8 +29,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       void CacheTransactionManager::Begin( )
       {
@@ -73,23 +71,23 @@ namespace Generic
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
 
-      Apache::Geode::Client::Generic::TransactionId^ CacheTransactionManager::Suspend( )
+      Apache::Geode::Client::TransactionId^ CacheTransactionManager::Suspend( )
       {
         _GF_MG_EXCEPTION_TRY2
        
-          return Apache::Geode::Client::Generic::TransactionId::Create( NativePtr->suspend().ptr() );
+          return Apache::Geode::Client::TransactionId::Create( NativePtr->suspend().ptr() );
        
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
-			Apache::Geode::Client::Generic::TransactionId^ CacheTransactionManager::TransactionId::get( )
+			Apache::Geode::Client::TransactionId^ CacheTransactionManager::TransactionId::get( )
       {
         _GF_MG_EXCEPTION_TRY2
 
-          return Apache::Geode::Client::Generic::TransactionId::Create( NativePtr->getTransactionId().ptr() );
+          return Apache::Geode::Client::TransactionId::Create( NativePtr->getTransactionId().ptr() );
 
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
-      void CacheTransactionManager::Resume(Apache::Geode::Client::Generic::TransactionId^ transactionId)
+      void CacheTransactionManager::Resume(Apache::Geode::Client::TransactionId^ transactionId)
       {
         _GF_MG_EXCEPTION_TRY2
         
@@ -97,7 +95,7 @@ namespace Generic
 
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
-      bool CacheTransactionManager::IsSuspended(Apache::Geode::Client::Generic::TransactionId^ transactionId)
+      bool CacheTransactionManager::IsSuspended(Apache::Geode::Client::TransactionId^ transactionId)
       {
         _GF_MG_EXCEPTION_TRY2
 
@@ -105,7 +103,7 @@ namespace Generic
 
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
-      bool CacheTransactionManager::TryResume(Apache::Geode::Client::Generic::TransactionId^ transactionId)
+      bool CacheTransactionManager::TryResume(Apache::Geode::Client::TransactionId^ transactionId)
       {
         _GF_MG_EXCEPTION_TRY2
 
@@ -113,7 +111,7 @@ namespace Generic
 
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
-      bool CacheTransactionManager::TryResume(Apache::Geode::Client::Generic::TransactionId^ transactionId, int32_t waitTimeInMilliSec)
+      bool CacheTransactionManager::TryResume(Apache::Geode::Client::TransactionId^ transactionId, int32_t waitTimeInMilliSec)
       {
         _GF_MG_EXCEPTION_TRY2
 
@@ -121,7 +119,7 @@ namespace Generic
 
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
-      bool CacheTransactionManager::Exists(Apache::Geode::Client::Generic::TransactionId^ transactionId)
+      bool CacheTransactionManager::Exists(Apache::Geode::Client::TransactionId^ transactionId)
       {
         _GF_MG_EXCEPTION_TRY2
 
@@ -208,7 +206,7 @@ namespace Generic
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
 #endif
-    }
-  }
-}
- } //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheTransactionManager.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheTransactionManager.hpp b/src/clicache/src/CacheTransactionManager.hpp
index 2f70d57..c6f1323 100644
--- a/src/clicache/src/CacheTransactionManager.hpp
+++ b/src/clicache/src/CacheTransactionManager.hpp
@@ -32,9 +32,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
-      
+
       /// <summary>
       /// CacheTransactionManager encapsulates the transactions for a cache
       /// </summary>
@@ -104,7 +102,7 @@ namespace Generic
         /// </summary>
         /// <returns>the transaction identifier of the suspended transaction or null if
         /// the thread was not associated with a transaction</returns>
-        Apache::Geode::Client::Generic::TransactionId^ Suspend();
+        Apache::Geode::Client::TransactionId^ Suspend();
 
         /// <summary>
         /// On the current thread, resumes a transaction that was previously suspended
@@ -117,7 +115,7 @@ namespace Generic
         /// <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(Apache::Geode::Client::Generic::TransactionId^ transactionId);
+        void Resume(Apache::Geode::Client::TransactionId^ transactionId);
 
         /// <summary>
         /// This method can be used to determine if a transaction with the given
@@ -130,7 +128,7 @@ namespace Generic
         /// <param name="transactionId"></param>
         /// <returns>true if the transaction is in suspended state, false otherwise</returns>
         /// <see cref="TransactionId"/>
-        bool IsSuspended(Apache::Geode::Client::Generic::TransactionId^ transactionId);
+        bool IsSuspended(Apache::Geode::Client::TransactionId^ transactionId);
 
 
         /// <summary>
@@ -149,7 +147,7 @@ namespace Generic
         /// </summary>
         /// <param name="transactionId">the transaction to resume</param>
         /// <returns>true if the transaction was resumed, false otherwise</returns>
-        bool TryResume(Apache::Geode::Client::Generic::TransactionId^ transactionId);
+        bool TryResume(Apache::Geode::Client::TransactionId^ transactionId);
 
 
         /// <summary>
@@ -173,7 +171,7 @@ namespace Generic
         /// <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(Apache::Geode::Client::Generic::TransactionId^ transactionId, int32_t waitTimeInMilliSec);
+        bool TryResume(Apache::Geode::Client::TransactionId^ transactionId, int32_t waitTimeInMilliSec);
 
 
 
@@ -188,7 +186,7 @@ namespace Generic
         /// <param name="transactionId">the given transaction identifier</param>
         /// <returns>true if the transaction is in progress, false otherwise.</returns>
         /// <see cref="isSuspended"/> 
-        bool Exists(Apache::Geode::Client::Generic::TransactionId^ transactionId);
+        bool Exists(Apache::Geode::Client::TransactionId^ transactionId);
 
 
         /// <summary>
@@ -198,10 +196,10 @@ namespace Generic
         /// </para>
         /// </summary>
         /// <returns>the transaction identifier or null if no transaction exists</returns>
-        property Apache::Geode::Client::Generic::TransactionId^ TransactionId
+        property Apache::Geode::Client::TransactionId^ TransactionId
         {
         //TODO::split
-        Apache::Geode::Client::Generic::TransactionId^ get( );
+        Apache::Geode::Client::TransactionId^ get( );
         }        
 
 #ifdef CSTX_COMMENTED
@@ -265,8 +263,6 @@ namespace Generic
         inline CacheTransactionManager( apache::geode::client::InternalCacheTransactionManager2PC* nativeptr )
           : SBWrap( nativeptr ) { }
       };
-
-    }
-  }
-}
- } //namespace 
\ No newline at end of file
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheWriterAdapter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheWriterAdapter.hpp b/src/clicache/src/CacheWriterAdapter.hpp
index 8744270..3731f9e 100644
--- a/src/clicache/src/CacheWriterAdapter.hpp
+++ b/src/clicache/src/CacheWriterAdapter.hpp
@@ -27,8 +27,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       /// <summary>
       /// Utility class that implements all methods in <c>ICacheWriter</c>
@@ -69,8 +67,7 @@ namespace Generic
         {
         }
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableArrayList.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableArrayList.hpp b/src/clicache/src/CacheableArrayList.hpp
index 9196105..3ac12a8 100644
--- a/src/clicache/src/CacheableArrayList.hpp
+++ b/src/clicache/src/CacheableArrayList.hpp
@@ -30,8 +30,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       /// <summary>
       /// A mutable <c>IGFSerializable</c> vector wrapper that can serve as
       /// a distributable object for caching. This class extends .NET generic
@@ -92,7 +91,7 @@ namespace Generic
           return gcnew CacheableArrayList(gcnew System::Collections::Generic::List<Object^>());
         }
       };
-    }
-  }
-}
- } //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableBuiltins.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableBuiltins.hpp b/src/clicache/src/CacheableBuiltins.hpp
index b040762..21ab7da 100644
--- a/src/clicache/src/CacheableBuiltins.hpp
+++ b/src/clicache/src/CacheableBuiltins.hpp
@@ -36,8 +36,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       //namespace Internal
       
 
@@ -574,7 +573,7 @@ namespace Generic
       /// as a distributable object for caching.
       /// </summary>
       _GFCLI_CACHEABLE_ARRAY_DEF_NEW(CharArray, Char);
-    }
-  }
-}
- } //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableDate.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableDate.cpp b/src/clicache/src/CacheableDate.cpp
index 921f30b..885598a 100644
--- a/src/clicache/src/CacheableDate.cpp
+++ b/src/clicache/src/CacheableDate.cpp
@@ -33,8 +33,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       CacheableDate::CacheableDate(DateTime dateTime)
         : m_dateTime(dateTime),m_hashcode(0)
       {
@@ -115,9 +114,9 @@ namespace Generic
           return (m_dateTime == otherDate->m_dateTime);
         }
         return false;
-      }
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
  } //namespace 
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableDate.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableDate.hpp b/src/clicache/src/CacheableDate.hpp
index 9fa2325..25b5a45 100644
--- a/src/clicache/src/CacheableDate.hpp
+++ b/src/clicache/src/CacheableDate.hpp
@@ -31,8 +31,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       /// <summary>
       /// An immutable date wrapper that can serve as a distributable
       /// key object for caching as well as being a string value.
@@ -171,8 +170,8 @@ namespace Generic
         DateTime m_dateTime;
         int m_hashcode;
       };
-    }
-  }
-}
- } //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableFileName.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableFileName.cpp b/src/clicache/src/CacheableFileName.cpp
index 5ed733d..e4f3585 100644
--- a/src/clicache/src/CacheableFileName.cpp
+++ b/src/clicache/src/CacheableFileName.cpp
@@ -31,8 +31,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       void CacheableFileName::ToData(DataOutput^ output)
       {
         if (m_str->Length <= 0xFFFF) {
@@ -103,9 +102,9 @@ namespace Generic
           return (m_str == otherFileName->m_str);
         }
         return false;
-      }
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
  } //namespace 
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableFileName.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableFileName.hpp b/src/clicache/src/CacheableFileName.hpp
index d0beb1a..bcdaa93 100644
--- a/src/clicache/src/CacheableFileName.hpp
+++ b/src/clicache/src/CacheableFileName.hpp
@@ -31,8 +31,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       /// <summary>
       /// An immutable filename wrapper that can serve as a distributable
       /// key object for caching as well as being a string value.
@@ -165,9 +164,9 @@ namespace Generic
         String^ m_str;
         int m_hashcode;
       };
-    }
-  }
-}
- } //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
 
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableHashMap.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableHashMap.cpp b/src/clicache/src/CacheableHashMap.cpp
index 541dbdb..8dea0f4 100644
--- a/src/clicache/src/CacheableHashMap.cpp
+++ b/src/clicache/src/CacheableHashMap.cpp
@@ -30,27 +30,25 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       // Region: IGFSerializable Members
 
-      void Generic::CacheableHashMap::ToData(DataOutput^ output)
+      void Client::CacheableHashMap::ToData(DataOutput^ output)
       {
         output->WriteDictionary((System::Collections::IDictionary^)m_dictionary);        
       }
 
-      IGFSerializable^ Generic::CacheableHashMap::FromData(DataInput^ input)
+      IGFSerializable^ Client::CacheableHashMap::FromData(DataInput^ input)
       {
         m_dictionary = input->ReadDictionary();
         return this;
       }
 
-      uint32_t Generic::CacheableHashMap::ObjectSize::get()
+      uint32_t Client::CacheableHashMap::ObjectSize::get()
       {
         return ((System::Collections::IDictionary^)m_dictionary)->Count;
-      }
-      // End Region: IGFSerializable Members
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
  } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableHashMap.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableHashMap.hpp b/src/clicache/src/CacheableHashMap.hpp
index a4df2e7..cbf8183 100644
--- a/src/clicache/src/CacheableHashMap.hpp
+++ b/src/clicache/src/CacheableHashMap.hpp
@@ -33,8 +33,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       /// <summary>
       /// A mutable <c>ICacheableKey</c> to <c>IGFSerializable</c> hash map
       /// that can serve as a distributable object for caching. This class
@@ -142,7 +141,7 @@ namespace Generic
           return gcnew CacheableHashMap();
         }
       };
-    }
-  }
-}
- } //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableHashSet.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableHashSet.hpp b/src/clicache/src/CacheableHashSet.hpp
index f848f15..b07b2d2 100644
--- a/src/clicache/src/CacheableHashSet.hpp
+++ b/src/clicache/src/CacheableHashSet.hpp
@@ -35,8 +35,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       namespace Internal
       {
         /// <summary>
@@ -71,7 +70,7 @@ namespace Generic
           {
             for ( int i = 0; i < len; i++)
             {
-              //Generic::ICacheableKey^ key = dynamic_cast<Generic::ICacheableKey^>(input->ReadObject());
+              //Generic::ICacheableKey^ key = dynamic_cast<Client::ICacheableKey^>(input->ReadObject());
               Object^ key = (input->ReadObject());
               this->Add(key);
             }
@@ -159,7 +158,7 @@ namespace Generic
                   throw gcnew System::InvalidOperationException(
                     "Call MoveNext first.");
                 }
-                //return SafeGenericUMKeyConvert<Generic::ICacheableKey^>((*(*NativePtr())).ptr());
+                //return SafeGenericUMKeyConvert<Client::ICacheableKey^>((*(*NativePtr())).ptr());
                 return Serializable::GetManagedValueGeneric<Object^>((*(*NativePtr())));
               }
             }
@@ -527,7 +526,7 @@ namespace Generic
       }
 
 #define _GFCLI_CACHEABLEHASHSET_DEF_GENERIC(m, HSTYPE)                               \
-	public ref class m : public Internal::CacheableHashSetType<Apache::Geode::Client::Generic::GemFireClassIds::m, HSTYPE>      \
+	public ref class m : public Internal::CacheableHashSetType<Apache::Geode::Client::GemFireClassIds::m, HSTYPE>      \
       {                                                                       \
       public:                                                                 \
         /** <summary>
@@ -535,7 +534,7 @@ namespace Generic
          *  </summary>
          */                                                                   \
         inline m()                                                            \
-        : Internal::CacheableHashSetType<Apache::Geode::Client::Generic::GemFireClassIds::m, HSTYPE>() {}                      \
+        : Internal::CacheableHashSetType<Apache::Geode::Client::GemFireClassIds::m, HSTYPE>() {}                      \
                                                                               \
         /** <summary>
          *  Allocates a new instance with the given size.
@@ -543,7 +542,7 @@ namespace Generic
          *  <param name="size">the intial size of the new instance</param>
          */                                                                   \
         inline m(int32_t size)                                                 \
-        : Internal::CacheableHashSetType<Apache::Geode::Client::Generic::GemFireClassIds::m, HSTYPE>(size) {}                  \
+        : Internal::CacheableHashSetType<Apache::Geode::Client::GemFireClassIds::m, HSTYPE>(size) {}                  \
                                                                               \
         /** <summary>
          *  Static function to create a new empty instance.
@@ -580,7 +579,7 @@ namespace Generic
                                                                               \
       private:                                                                \
         inline m(apache::geode::client::Serializable* nativeptr)                            \
-        : Internal::CacheableHashSetType<Apache::Geode::Client::Generic::GemFireClassIds::m, HSTYPE>(nativeptr) { }             \
+        : Internal::CacheableHashSetType<Apache::Geode::Client::GemFireClassIds::m, HSTYPE>(nativeptr) { }             \
       };
 
       /// <summary>
@@ -599,7 +598,7 @@ namespace Generic
       /// </summary>
       _GFCLI_CACHEABLEHASHSET_DEF_GENERIC(CacheableLinkedHashSet,
         apache::geode::client::CacheableLinkedHashSet);
-    }
-  }
-}
- } //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableHashTable.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableHashTable.hpp b/src/clicache/src/CacheableHashTable.hpp
index 20d753f..e1ed025 100644
--- a/src/clicache/src/CacheableHashTable.hpp
+++ b/src/clicache/src/CacheableHashTable.hpp
@@ -31,8 +31,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       /// <summary>
       /// A mutable <c>ICacheableKey</c> to <c>IGFSerializable</c> hash table
       /// that can serve as a distributable object for caching. This class
@@ -112,8 +111,7 @@ namespace Generic
           return gcnew CacheableHashTable(hashtable);
         }
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableIdentityHashMap.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableIdentityHashMap.hpp b/src/clicache/src/CacheableIdentityHashMap.hpp
index 4ac1b50..6c30dd4 100644
--- a/src/clicache/src/CacheableIdentityHashMap.hpp
+++ b/src/clicache/src/CacheableIdentityHashMap.hpp
@@ -30,8 +30,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       /// <summary>
       /// A mutable <c>ICacheableKey</c> to <c>IGFSerializable</c> hash map
       /// that can serve as a distributable object for caching. This class
@@ -123,7 +122,7 @@ namespace Generic
           return gcnew CacheableIdentityHashMap();
         }
       };
-    }
-  }
-}
- } //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableKey.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableKey.cpp b/src/clicache/src/CacheableKey.cpp
index fdc2196..f1d6787 100644
--- a/src/clicache/src/CacheableKey.cpp
+++ b/src/clicache/src/CacheableKey.cpp
@@ -28,8 +28,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
      // generic<class TKey>
       int32_t CacheableKey::GetHashCode()
       {
@@ -37,14 +36,14 @@ namespace Generic
       }
 
      // generic<class TKey>
-      bool CacheableKey::Equals(Generic::ICacheableKey^ other)
+      bool CacheableKey::Equals(Client::ICacheableKey^ other)
       {
         if (other == nullptr || other->ClassId != ClassId) {
           return false;
         }
         return static_cast<apache::geode::client::CacheableKey*>(NativePtr())->operator==(
           *static_cast<apache::geode::client::CacheableKey*>(
-            ((Generic::CacheableKey^)other)->NativePtr()));
+            ((Client::CacheableKey^)other)->NativePtr()));
       }
 
       //generic<class TKey>
@@ -112,8 +111,8 @@ namespace Generic
       CacheableKey::operator CacheableKey^ (String^ value)
       {
         return dynamic_cast<CacheableKey^>(CacheableString::Create(value));
-      }
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
 } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableKey.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableKey.hpp b/src/clicache/src/CacheableKey.hpp
index 05d979b..41ba722 100644
--- a/src/clicache/src/CacheableKey.hpp
+++ b/src/clicache/src/CacheableKey.hpp
@@ -32,8 +32,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       /// <summary>
       /// This class wraps the native C++ <c>apache::geode::client::Serializable</c> objects
       /// as managed <see cref="../../IGFSerializable" /> objects.
@@ -124,17 +123,17 @@ namespace Generic
         /// Default constructor.
         /// </summary>
         inline CacheableKey()
-          : Generic::Serializable() { }
+          : Client::Serializable() { }
 
         /// <summary>
         /// Internal constructor to wrap a native object pointer
         /// </summary>
         /// <param name="nativeptr">The native object pointer</param>
         inline CacheableKey(apache::geode::client::Serializable* nativeptr)
-          : Generic::Serializable(nativeptr) { }
+          : Client::Serializable(nativeptr) { }
       };
-    }
-  }
-}
-} //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+ //namespace 
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableLinkedList.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableLinkedList.hpp b/src/clicache/src/CacheableLinkedList.hpp
index aa55fc5..68a1dea 100644
--- a/src/clicache/src/CacheableLinkedList.hpp
+++ b/src/clicache/src/CacheableLinkedList.hpp
@@ -30,8 +30,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       /// <summary>
       /// A mutable <c>IGFSerializable</c> vector wrapper that can serve as
       /// a distributable object for caching. This class extends .NET generic
@@ -147,7 +146,7 @@ namespace Generic
           return gcnew CacheableLinkedList(gcnew System::Collections::Generic::LinkedList<Object^>());
         }
       };
-    }
-  }
-}
- } //namespace
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableObject.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObject.cpp b/src/clicache/src/CacheableObject.cpp
index 593b9ea..e02c2fa 100644
--- a/src/clicache/src/CacheableObject.cpp
+++ b/src/clicache/src/CacheableObject.cpp
@@ -34,8 +34,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       void CacheableObject::ToData(DataOutput^ output)
       {
         if(m_obj != nullptr)
@@ -75,9 +74,9 @@ namespace Generic
           m_objectSize = (uint32_t)sizeof(CacheableObject^) + (uint32_t)ns.Length;
         }
         return m_objectSize;
-      }
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
  } //namespace 
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableObject.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObject.hpp b/src/clicache/src/CacheableObject.hpp
index 1c97aa2..719f204 100644
--- a/src/clicache/src/CacheableObject.hpp
+++ b/src/clicache/src/CacheableObject.hpp
@@ -29,8 +29,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       /// <summary>
       /// An mutable generic <see cref="System.Object" /> wrapper that can
       /// serve as a distributable value for caching.
@@ -151,7 +150,7 @@ namespace Generic
         Object^ m_obj;
         uint32_t m_objectSize;
       };
-    }
-  }
-}
- } //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableObjectArray.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObjectArray.cpp b/src/clicache/src/CacheableObjectArray.cpp
index 9dcac25..8a4803d 100644
--- a/src/clicache/src/CacheableObjectArray.cpp
+++ b/src/clicache/src/CacheableObjectArray.cpp
@@ -36,8 +36,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       // Region: IGFSerializable Members
 
       void CacheableObjectArray::ToData(DataOutput^ output)
@@ -116,9 +115,8 @@ namespace Generic
           }
         }*/
         return Count;
-      }      
-      // End Region: IGFSerializable Members
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
  } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableObjectArray.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObjectArray.hpp b/src/clicache/src/CacheableObjectArray.hpp
index 83c2a90..948b65f 100644
--- a/src/clicache/src/CacheableObjectArray.hpp
+++ b/src/clicache/src/CacheableObjectArray.hpp
@@ -31,8 +31,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       /// <summary>
       /// A mutable <c>IGFSerializable</c> object array wrapper that can serve
@@ -149,8 +147,7 @@ namespace Generic
           return gcnew CacheableObjectArray();
         }
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableObjectXml.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObjectXml.cpp b/src/clicache/src/CacheableObjectXml.cpp
index fa3a6cb..0f58ff7 100644
--- a/src/clicache/src/CacheableObjectXml.cpp
+++ b/src/clicache/src/CacheableObjectXml.cpp
@@ -36,8 +36,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       void CacheableObjectXml::ToData(DataOutput^ output)
       {
         if (m_obj == nullptr) {
@@ -104,9 +103,9 @@ namespace Generic
           }
         }
         return m_objectSize;
-      }
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
  } //namespace 
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableObjectXml.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObjectXml.hpp b/src/clicache/src/CacheableObjectXml.hpp
index b440a95..7d36ad5 100644
--- a/src/clicache/src/CacheableObjectXml.hpp
+++ b/src/clicache/src/CacheableObjectXml.hpp
@@ -29,8 +29,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       /// <summary>
       /// A mutable generic <see cref="System.Object" /> wrapper that can
       /// serve as a distributable value for caching.
@@ -152,7 +151,7 @@ namespace Generic
         Object^ m_obj;
         uint32_t m_objectSize;
       };
-    }
-  }
-}
- } //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableStack.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableStack.cpp b/src/clicache/src/CacheableStack.cpp
index 2138586..060b8b9 100644
--- a/src/clicache/src/CacheableStack.cpp
+++ b/src/clicache/src/CacheableStack.cpp
@@ -34,8 +34,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       // Region: IGFSerializable Members
 
       void CacheableStack::ToData(DataOutput^ output)
@@ -83,11 +82,9 @@ namespace Generic
           }
         }*/
         return m_stack->Count;
-      }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-      // End Region: IGFSerializable Members
-    }
-  }
-}
  } //namespace 
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableStack.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableStack.hpp b/src/clicache/src/CacheableStack.hpp
index 8263958..ada11fb 100644
--- a/src/clicache/src/CacheableStack.hpp
+++ b/src/clicache/src/CacheableStack.hpp
@@ -30,8 +30,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       /// <summary>
       /// A mutable <c>IGFSerializable</c> vector wrapper that can serve as
       /// a distributable object for caching.
@@ -125,7 +124,7 @@ namespace Generic
         private:
           System::Collections::ICollection^ m_stack;
       };
-    }
-  }
-}
- } //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+


Mime
View raw message