http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/DUnitFramework/ClientBase.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/DUnitFramework/ClientBase.cs b/src/tests/cli/DUnitFramework/ClientBase.cs index 26beff6..1ef7d27 100644 --- a/src/tests/cli/DUnitFramework/ClientBase.cs +++ b/src/tests/cli/DUnitFramework/ClientBase.cs @@ -19,7 +19,7 @@ using System; using System.Reflection; using System.Threading; -namespace GemStone.GemFire.DUnitFramework +namespace Apache.Geode.DUnitFramework { /// <summary> /// Delegate to be invoked on the client side. This one is for
http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/DUnitFramework/ClientGroup.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/DUnitFramework/ClientGroup.cs b/src/tests/cli/DUnitFramework/ClientGroup.cs index cab6591..5bafc60 100644 --- a/src/tests/cli/DUnitFramework/ClientGroup.cs +++ b/src/tests/cli/DUnitFramework/ClientGroup.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using System.Text; using NUnit.Framework; -namespace GemStone.GemFire.DUnitFramework +namespace Apache.Geode.DUnitFramework { public delegate object ClientResultAggregator(List<object> objList); http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/DUnitFramework/DUnitFramework.csproj.in ---------------------------------------------------------------------- diff --git a/src/tests/cli/DUnitFramework/DUnitFramework.csproj.in b/src/tests/cli/DUnitFramework/DUnitFramework.csproj.in index 9779874..a6e2de8 100755 --- a/src/tests/cli/DUnitFramework/DUnitFramework.csproj.in +++ b/src/tests/cli/DUnitFramework/DUnitFramework.csproj.in @@ -12,7 +12,7 @@ <ProjectGuid>{B2F8AE2D-3E73-3A99-BFD2-FF0B7B55C780}</ProjectGuid> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>GemStone.GemFire.DUnitFramework</RootNamespace> + <RootNamespace>Apache.Geode.DUnitFramework</RootNamespace> <AssemblyName>DUnitFramework</AssemblyName> <SignAssembly>${STRONG_NAME_KEY_ENABLED}</SignAssembly> <AssemblyOriginatorKeyFile>${STRONG_NAME_KEY}</AssemblyOriginatorKeyFile> http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/DUnitFramework/DUnitTestClass.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/DUnitFramework/DUnitTestClass.cs b/src/tests/cli/DUnitFramework/DUnitTestClass.cs index fda2336..bca63c6 100644 --- a/src/tests/cli/DUnitFramework/DUnitTestClass.cs +++ b/src/tests/cli/DUnitFramework/DUnitTestClass.cs @@ -22,7 +22,7 @@ using System.IO; using System.Reflection; using System.Threading; -namespace GemStone.GemFire.DUnitFramework +namespace Apache.Geode.DUnitFramework { using NUnit.Framework; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/DUnitFramework/Exceptions.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/DUnitFramework/Exceptions.cs b/src/tests/cli/DUnitFramework/Exceptions.cs index 13d198a..089c36c 100644 --- a/src/tests/cli/DUnitFramework/Exceptions.cs +++ b/src/tests/cli/DUnitFramework/Exceptions.cs @@ -18,7 +18,7 @@ using System; using System.Runtime.Serialization; -namespace GemStone.GemFire.DUnitFramework +namespace Apache.Geode.DUnitFramework { /// <summary> /// Exception thrown when 'Call' is invoked on a client thread/process/... http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/DUnitFramework/IClientServerComm.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/DUnitFramework/IClientServerComm.cs b/src/tests/cli/DUnitFramework/IClientServerComm.cs index 31002cf..cc559f7 100644 --- a/src/tests/cli/DUnitFramework/IClientServerComm.cs +++ b/src/tests/cli/DUnitFramework/IClientServerComm.cs @@ -19,7 +19,7 @@ using System; using System.Collections.Generic; using System.Xml; -namespace GemStone.GemFire.DUnitFramework +namespace Apache.Geode.DUnitFramework { /// <summary> /// Interface for sending commands from server to client. http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/DUnitFramework/Log.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/DUnitFramework/Log.cs b/src/tests/cli/DUnitFramework/Log.cs index 3cb6a92..be19b12 100644 --- a/src/tests/cli/DUnitFramework/Log.cs +++ b/src/tests/cli/DUnitFramework/Log.cs @@ -19,7 +19,7 @@ using System; using System.IO; using System.Text; -namespace GemStone.GemFire.DUnitFramework +namespace Apache.Geode.DUnitFramework { /// <summary> /// Class to do logging. http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/DUnitFramework/ServerCommunication.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/DUnitFramework/ServerCommunication.cs b/src/tests/cli/DUnitFramework/ServerCommunication.cs index 1a1a477..9f1d8c2 100644 --- a/src/tests/cli/DUnitFramework/ServerCommunication.cs +++ b/src/tests/cli/DUnitFramework/ServerCommunication.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using System.IO; using System.Xml; -namespace GemStone.GemFire.DUnitFramework +namespace Apache.Geode.DUnitFramework { public class DriverComm : MarshalByRefObject, IDriverComm { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/DUnitFramework/ServerConnection.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/DUnitFramework/ServerConnection.cs b/src/tests/cli/DUnitFramework/ServerConnection.cs index 3236174..c170b8b 100644 --- a/src/tests/cli/DUnitFramework/ServerConnection.cs +++ b/src/tests/cli/DUnitFramework/ServerConnection.cs @@ -17,7 +17,7 @@ using System; -namespace GemStone.GemFire.DUnitFramework +namespace Apache.Geode.DUnitFramework { public static class ServerConnection<TComm> { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/DUnitFramework/TimeBomb.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/DUnitFramework/TimeBomb.cs b/src/tests/cli/DUnitFramework/TimeBomb.cs index 0b932d1..d753013 100644 --- a/src/tests/cli/DUnitFramework/TimeBomb.cs +++ b/src/tests/cli/DUnitFramework/TimeBomb.cs @@ -21,7 +21,7 @@ using System.Collections.Generic; using System.Reflection; using System.Threading; -namespace GemStone.GemFire.DUnitFramework +namespace Apache.Geode.DUnitFramework { using NUnit.Framework; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/DUnitFramework/UnitProcess.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/DUnitFramework/UnitProcess.cs b/src/tests/cli/DUnitFramework/UnitProcess.cs index 5a45431..62b6b5d 100644 --- a/src/tests/cli/DUnitFramework/UnitProcess.cs +++ b/src/tests/cli/DUnitFramework/UnitProcess.cs @@ -31,7 +31,7 @@ using System.Runtime.Serialization.Formatters; using System.Text; using System.Threading; -namespace GemStone.GemFire.DUnitFramework +namespace Apache.Geode.DUnitFramework { using NUnit.Framework; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/DUnitFramework/UnitThread.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/DUnitFramework/UnitThread.cs b/src/tests/cli/DUnitFramework/UnitThread.cs index a4d4302..157fd7b 100644 --- a/src/tests/cli/DUnitFramework/UnitThread.cs +++ b/src/tests/cli/DUnitFramework/UnitThread.cs @@ -23,7 +23,7 @@ using System.Threading; #pragma warning disable 618 -namespace GemStone.GemFire.DUnitFramework +namespace Apache.Geode.DUnitFramework { using NUnit.Framework; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/DUnitFramework/Util.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/DUnitFramework/Util.cs b/src/tests/cli/DUnitFramework/Util.cs index 881f6d2..91f78c6 100644 --- a/src/tests/cli/DUnitFramework/Util.cs +++ b/src/tests/cli/DUnitFramework/Util.cs @@ -30,7 +30,7 @@ using System.Security.Principal; #pragma warning disable 618 -namespace GemStone.GemFire.DUnitFramework +namespace Apache.Geode.DUnitFramework { using NUnit.Framework; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/DUnitFramework/XmlNodeReaderWriter.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/DUnitFramework/XmlNodeReaderWriter.cs b/src/tests/cli/DUnitFramework/XmlNodeReaderWriter.cs index 2bfd6fb..5bc4bd3 100644 --- a/src/tests/cli/DUnitFramework/XmlNodeReaderWriter.cs +++ b/src/tests/cli/DUnitFramework/XmlNodeReaderWriter.cs @@ -23,7 +23,7 @@ using System.Reflection; using System.Text; using System.Xml; -namespace GemStone.GemFire.DUnitFramework +namespace Apache.Geode.DUnitFramework { public class XmlNodeReaderWriter { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/FwkClient/ClientComm.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/FwkClient/ClientComm.cs b/src/tests/cli/FwkClient/ClientComm.cs index a1eb6bf..921c1a3 100644 --- a/src/tests/cli/FwkClient/ClientComm.cs +++ b/src/tests/cli/FwkClient/ClientComm.cs @@ -25,9 +25,9 @@ using System.Runtime.Remoting.Channels; using System.Text; using System.Threading; -namespace GemStone.GemFire.Cache.FwkClient +namespace Apache.Geode.Client.FwkClient { - using GemStone.GemFire.DUnitFramework; + using Apache.Geode.DUnitFramework; class ClientComm : MarshalByRefObject, IClientComm { @@ -77,7 +77,7 @@ namespace GemStone.GemFire.Cache.FwkClient domain = AppDomain.CreateDomain(appDomain); CreateBBServerConnection urlConn = (CreateBBServerConnection)domain. CreateInstanceAndUnwrap("FwkClient", - "GemStone.GemFire.Cache.FwkClient.CreateBBServerConnection"); + "Apache.Geode.Client.FwkClient.CreateBBServerConnection"); urlConn.OpenBBServerConnection(ClientProcess.bbUrl); urlConn.SetLogFile(Util.LogFile); Util.Log("Created app domain {0}",domain); @@ -87,7 +87,7 @@ namespace GemStone.GemFire.Cache.FwkClient domain = m_appDomainMap[appDomain]; CreateBBServerConnection urlConn = (CreateBBServerConnection)domain. CreateInstanceAndUnwrap("FwkClient", - "GemStone.GemFire.Cache.FwkClient.CreateBBServerConnection"); + "Apache.Geode.Client.FwkClient.CreateBBServerConnection"); urlConn.SetLogFile(Util.LogFile); } try { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/FwkClient/ClientProcess.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/FwkClient/ClientProcess.cs b/src/tests/cli/FwkClient/ClientProcess.cs index 00a2eaf..386c328 100644 --- a/src/tests/cli/FwkClient/ClientProcess.cs +++ b/src/tests/cli/FwkClient/ClientProcess.cs @@ -24,9 +24,9 @@ using System.Runtime.Remoting.Channels.Ipc; using System.Runtime.Remoting.Channels.Tcp; using System.Runtime.Serialization.Formatters; -namespace GemStone.GemFire.Cache.FwkClient +namespace Apache.Geode.Client.FwkClient { - using GemStone.GemFire.DUnitFramework; + using Apache.Geode.DUnitFramework; class ClientProcess { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/FwkClient/FwkClient.csproj.in ---------------------------------------------------------------------- diff --git a/src/tests/cli/FwkClient/FwkClient.csproj.in b/src/tests/cli/FwkClient/FwkClient.csproj.in index 3f576f7..049bd07 100644 --- a/src/tests/cli/FwkClient/FwkClient.csproj.in +++ b/src/tests/cli/FwkClient/FwkClient.csproj.in @@ -12,7 +12,7 @@ <ProjectGuid>{0A33CB39-D33F-39B2-BB11-B0A555805177}</ProjectGuid> <OutputType>Exe</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>GemStone.GemFire.Cache.FwkClient</RootNamespace> + <RootNamespace>Apache.Geode.Client.FwkClient</RootNamespace> <AssemblyName>FwkClient</AssemblyName> <SignAssembly>${STRONG_NAME_KEY_ENABLED}</SignAssembly> <AssemblyOriginatorKeyFile>${STRONG_NAME_KEY}</AssemblyOriginatorKeyFile> http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/FwkLauncher/FwkLauncher.csproj.in ---------------------------------------------------------------------- diff --git a/src/tests/cli/FwkLauncher/FwkLauncher.csproj.in b/src/tests/cli/FwkLauncher/FwkLauncher.csproj.in index ded518b..c99c70f 100644 --- a/src/tests/cli/FwkLauncher/FwkLauncher.csproj.in +++ b/src/tests/cli/FwkLauncher/FwkLauncher.csproj.in @@ -12,7 +12,7 @@ <ProjectGuid>{E69BE55D-1BCF-4958-93F0-D1F00C2BA2DE}</ProjectGuid> <OutputType>Exe</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>GemStone.GemFire.Cache.FwkLauncher</RootNamespace> + <RootNamespace>Apache.Geode.Client.FwkLauncher</RootNamespace> <AssemblyName>FwkLauncher</AssemblyName> <SignAssembly>${STRONG_NAME_KEY_ENABLED}</SignAssembly> <AssemblyOriginatorKeyFile>${STRONG_NAME_KEY}</AssemblyOriginatorKeyFile> http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/FwkLauncher/LauncherComm.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/FwkLauncher/LauncherComm.cs b/src/tests/cli/FwkLauncher/LauncherComm.cs index e3f8ed9..e265a2f 100644 --- a/src/tests/cli/FwkLauncher/LauncherComm.cs +++ b/src/tests/cli/FwkLauncher/LauncherComm.cs @@ -25,9 +25,9 @@ using System.Runtime.Remoting.Channels; using System.Text; using System.Threading; -namespace GemStone.GemFire.Cache.FwkLauncher +namespace Apache.Geode.Client.FwkLauncher { - using GemStone.GemFire.DUnitFramework; + using Apache.Geode.DUnitFramework; class LauncherComm : MarshalByRefObject, IClientCommV2 { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/FwkLauncher/LauncherProcess.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/FwkLauncher/LauncherProcess.cs b/src/tests/cli/FwkLauncher/LauncherProcess.cs index b115e6a..6c39ec0 100644 --- a/src/tests/cli/FwkLauncher/LauncherProcess.cs +++ b/src/tests/cli/FwkLauncher/LauncherProcess.cs @@ -24,9 +24,9 @@ using System.Runtime.Remoting.Channels.Ipc; using System.Runtime.Remoting.Channels.Tcp; using System.Runtime.Serialization.Formatters; -namespace GemStone.GemFire.Cache.FwkLauncher +namespace Apache.Geode.Client.FwkLauncher { - using GemStone.GemFire.DUnitFramework; + using Apache.Geode.DUnitFramework; class LauncherProcess { public static IChannel clientChannel = null; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/FwkUtil/FwkClient.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/FwkUtil/FwkClient.cs b/src/tests/cli/FwkUtil/FwkClient.cs index 970b413..c9109bc 100644 --- a/src/tests/cli/FwkUtil/FwkClient.cs +++ b/src/tests/cli/FwkUtil/FwkClient.cs @@ -20,9 +20,9 @@ using System.Collections; using System.Collections.Generic; using System.Xml; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - using GemStone.GemFire.DUnitFramework; + using Apache.Geode.DUnitFramework; public class FwkClient { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/FwkUtil/FwkData.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/FwkUtil/FwkData.cs b/src/tests/cli/FwkUtil/FwkData.cs index 7b51093..8be91f5 100644 --- a/src/tests/cli/FwkUtil/FwkData.cs +++ b/src/tests/cli/FwkUtil/FwkData.cs @@ -23,10 +23,10 @@ using System.Xml; #pragma warning disable 618 -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - using GemStone.GemFire.DUnitFramework; - using GemStone.GemFire.Cache.Tests; + using Apache.Geode.DUnitFramework; + using Apache.Geode.Client.Tests; [Serializable] public enum DataKind @@ -226,7 +226,7 @@ namespace GemStone.GemFire.Cache.FwkLib // Now collect the region atributes XmlNode attrnode = xmlNode.FirstChild.FirstChild.FirstChild; - GemStone.GemFire.Cache.Generic.Properties<string, string> rattr = GemStone.GemFire.Cache.Generic.Properties<string, string>.Create<string, string>(); + Apache.Geode.Client.Generic.Properties<string, string> rattr = Apache.Geode.Client.Generic.Properties<string, string>.Create<string, string>(); //AttributesFactory af = new AttributesFactory(); if (attrnode.Name == "region-attributes") { @@ -247,7 +247,7 @@ namespace GemStone.GemFire.Cache.FwkLib //SetThisAttribute(tmpnode.Name, tmpnode, af); } } - GemStone.GemFire.Cache.Generic.DataOutput dout = new GemStone.GemFire.Cache.Generic.DataOutput(); + Apache.Geode.Client.Generic.DataOutput dout = new Apache.Geode.Client.Generic.DataOutput(); //RegionAttributes rattr = af.CreateRegionAttributes(); rattr.ToData(dout); // Console.WriteLine("Going to construct FwkData with region = " + regionName + @@ -265,7 +265,7 @@ namespace GemStone.GemFire.Cache.FwkLib XmlAttribute nameattr = xmlNode.FirstChild.FirstChild.Attributes["name"]; String poolName = nameattr.Value; // Now collect the pool atributes - GemStone.GemFire.Cache.Generic.Properties<string, string> prop = GemStone.GemFire.Cache.Generic.Properties<string, string>.Create<string, string>(); + Apache.Geode.Client.Generic.Properties<string, string> prop = Apache.Geode.Client.Generic.Properties<string, string>.Create<string, string>(); XmlAttributeCollection attrcoll = xmlNode.FirstChild.FirstChild.Attributes; if (attrcoll != null) { @@ -273,7 +273,7 @@ namespace GemStone.GemFire.Cache.FwkLib { prop.Insert(eachattr.Name, eachattr.Value); } - GemStone.GemFire.Cache.Generic.DataOutput dout = new GemStone.GemFire.Cache.Generic.DataOutput(); + Apache.Geode.Client.Generic.DataOutput dout = new Apache.Geode.Client.Generic.DataOutput(); prop.ToData(dout); FwkData td = new FwkData(poolName, dout.GetBuffer(), DataKind.Pool); dataNodes[name] = td; @@ -357,7 +357,7 @@ namespace GemStone.GemFire.Cache.FwkLib return null; } - public static void SetThisAttribute(string name, XmlNode node, GemStone.GemFire.Cache.Generic.AttributesFactory<string, string> af) + public static void SetThisAttribute(string name, XmlNode node, Apache.Geode.Client.Generic.AttributesFactory<string, string> af) { string value = node.Value; switch (name) @@ -396,11 +396,11 @@ namespace GemStone.GemFire.Cache.FwkLib case "disk-policy": if (value == "none") { - af.SetDiskPolicy(GemStone.GemFire.Cache.Generic.DiskPolicyType.None); + af.SetDiskPolicy(Apache.Geode.Client.Generic.DiskPolicyType.None); } else if (value == "overflows") { - af.SetDiskPolicy(GemStone.GemFire.Cache.Generic.DiskPolicyType.Overflows); + af.SetDiskPolicy(Apache.Geode.Client.Generic.DiskPolicyType.Overflows); } else { @@ -426,7 +426,7 @@ namespace GemStone.GemFire.Cache.FwkLib if (nlrttl.Name == "expiration-attributes") { XmlAttributeCollection exAttrColl = nlrttl.Attributes; - GemStone.GemFire.Cache.Generic.ExpirationAction action = StrToExpirationAction(exAttrColl["action"].Value); + Apache.Geode.Client.Generic.ExpirationAction action = StrToExpirationAction(exAttrColl["action"].Value); string rttl = exAttrColl["timeout"].Value; af.SetRegionTimeToLive(action, uint.Parse(rttl)); } @@ -441,7 +441,7 @@ namespace GemStone.GemFire.Cache.FwkLib if (nlrit.Name == "expiration-attributes") { XmlAttributeCollection exAttrColl = nlrit.Attributes; - GemStone.GemFire.Cache.Generic.ExpirationAction action = StrToExpirationAction(exAttrColl["action"].Value); + Apache.Geode.Client.Generic.ExpirationAction action = StrToExpirationAction(exAttrColl["action"].Value); string rit = exAttrColl["timeout"].Value; af.SetRegionIdleTimeout(action, uint.Parse(rit)); } @@ -456,7 +456,7 @@ namespace GemStone.GemFire.Cache.FwkLib if (nlettl.Name == "expiration-attributes") { XmlAttributeCollection exAttrColl = nlettl.Attributes; - GemStone.GemFire.Cache.Generic.ExpirationAction action = StrToExpirationAction(exAttrColl["action"].Value); + Apache.Geode.Client.Generic.ExpirationAction action = StrToExpirationAction(exAttrColl["action"].Value); string ettl = exAttrColl["timeout"].Value; af.SetEntryTimeToLive(action, uint.Parse(ettl)); } @@ -471,7 +471,7 @@ namespace GemStone.GemFire.Cache.FwkLib if (nleit.Name == "expiration-attributes") { XmlAttributeCollection exAttrColl = nleit.Attributes; - GemStone.GemFire.Cache.Generic.ExpirationAction action = StrToExpirationAction(exAttrColl["action"].Value); + Apache.Geode.Client.Generic.ExpirationAction action = StrToExpirationAction(exAttrColl["action"].Value); string eit = exAttrColl["timeout"].Value; af.SetEntryIdleTimeout(action, uint.Parse(eit)); } @@ -581,7 +581,7 @@ namespace GemStone.GemFire.Cache.FwkLib case "persistence-manager": string pmlibrary = null; string pmfunction = null; - GemStone.GemFire.Cache.Generic.Properties<string, string> prop = new GemStone.GemFire.Cache.Generic.Properties<string, string>(); + Apache.Geode.Client.Generic.Properties<string, string> prop = new Apache.Geode.Client.Generic.Properties<string, string>(); XmlAttributeCollection pmattrs = node.Attributes; foreach (XmlAttribute attr in pmattrs) { @@ -627,9 +627,9 @@ namespace GemStone.GemFire.Cache.FwkLib } } - private static GemStone.GemFire.Cache.Generic.ExpirationAction StrToExpirationAction(string str) + private static Apache.Geode.Client.Generic.ExpirationAction StrToExpirationAction(string str) { - return (GemStone.GemFire.Cache.Generic.ExpirationAction)Enum.Parse(typeof(GemStone.GemFire.Cache.Generic.ExpirationAction), + return (Apache.Geode.Client.Generic.ExpirationAction)Enum.Parse(typeof(Apache.Geode.Client.Generic.ExpirationAction), str.Replace("-", string.Empty), true); } } @@ -892,34 +892,34 @@ namespace GemStone.GemFire.Cache.FwkLib /// </summary> /// <param name="key">The key of the region to read.</param> /// <returns>The attributes of the region.</returns> - public GemStone.GemFire.Cache.Generic.RegionAttributes<string, string> GetRegionAttributes(string key) + public Apache.Geode.Client.Generic.RegionAttributes<string, string> GetRegionAttributes(string key) { FwkData data = ReadData(key); if (data != null && data.Kind == DataKind.Region) { - GemStone.GemFire.Cache.Generic.AttributesFactory<string, string> af = new GemStone.GemFire.Cache.Generic.AttributesFactory<string, string>(); - GemStone.GemFire.Cache.Generic.RegionAttributes<string, string> attrs = af.CreateRegionAttributes(); + Apache.Geode.Client.Generic.AttributesFactory<string, string> af = new Apache.Geode.Client.Generic.AttributesFactory<string, string>(); + Apache.Geode.Client.Generic.RegionAttributes<string, string> attrs = af.CreateRegionAttributes(); byte[] attrsArr = data.Data2 as byte[]; if (attrsArr != null && attrsArr.Length > 0) { - GemStone.GemFire.Cache.Generic.DataInput dinp = new GemStone.GemFire.Cache.Generic.DataInput(attrsArr); + Apache.Geode.Client.Generic.DataInput dinp = new Apache.Geode.Client.Generic.DataInput(attrsArr); attrs.FromData(dinp); } return attrs; } return null; } - public GemStone.GemFire.Cache.Generic.Properties<string, string> GetPoolAttributes(string key) + public Apache.Geode.Client.Generic.Properties<string, string> GetPoolAttributes(string key) { FwkData data = ReadData(key); if (data != null && data.Kind == DataKind.Pool) { - GemStone.GemFire.Cache.Generic.Properties<string, string> prop = GemStone.GemFire.Cache.Generic.Properties<string, string>.Create<string, string>(); + Apache.Geode.Client.Generic.Properties<string, string> prop = Apache.Geode.Client.Generic.Properties<string, string>.Create<string, string>(); //RegionAttributes attrs = af.CreateRegionAttributes(); byte[] attrsArr = data.Data2 as byte[]; if (attrsArr != null && attrsArr.Length > 0) { - GemStone.GemFire.Cache.Generic.DataInput dinp = new GemStone.GemFire.Cache.Generic.DataInput(attrsArr); + Apache.Geode.Client.Generic.DataInput dinp = new Apache.Geode.Client.Generic.DataInput(attrsArr); prop.FromData(dinp); } return prop; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/FwkUtil/FwkUtil.csproj.in ---------------------------------------------------------------------- diff --git a/src/tests/cli/FwkUtil/FwkUtil.csproj.in b/src/tests/cli/FwkUtil/FwkUtil.csproj.in index 7946b12..600d98b 100644 --- a/src/tests/cli/FwkUtil/FwkUtil.csproj.in +++ b/src/tests/cli/FwkUtil/FwkUtil.csproj.in @@ -12,7 +12,7 @@ <ProjectGuid>{01C46AC4-0529-35C5-9C50-C04F2481DF2A}</ProjectGuid> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>GemStone.GemFire.Cache.FwkLib</RootNamespace> + <RootNamespace>Apache.Geode.Client.FwkLib</RootNamespace> <AssemblyName>FwkUtil</AssemblyName> <SignAssembly>${STRONG_NAME_KEY_ENABLED}</SignAssembly> <AssemblyOriginatorKeyFile>${STRONG_NAME_KEY}</AssemblyOriginatorKeyFile> http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NativeWrapper/ManagedWrapper.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cli/NativeWrapper/ManagedWrapper.cpp b/src/tests/cli/NativeWrapper/ManagedWrapper.cpp index a34f49b..7222f0d 100644 --- a/src/tests/cli/NativeWrapper/ManagedWrapper.cpp +++ b/src/tests/cli/NativeWrapper/ManagedWrapper.cpp @@ -17,8 +17,8 @@ #include "ManagedWrapper.hpp" -using namespace GemStone::GemFire::Cache; -using namespace GemStone::GemFire::Cache::Tests; +using namespace Apache::Geode::Client; +using namespace Apache::Geode::Client::Tests; ManagedWrapper::ManagedWrapper(int len) : m_nativePtr(new NativeType()) { @@ -27,13 +27,13 @@ ManagedWrapper::ManagedWrapper(int len) : m_nativePtr(new NativeType()) ManagedWrapper::~ManagedWrapper() { - GemStone::GemFire::Cache::Generic::Log::Info("Invoked Dispose of ManagedWrapper"); + Apache::Geode::Client::Generic::Log::Info("Invoked Dispose of ManagedWrapper"); InternalCleanup(); } ManagedWrapper::!ManagedWrapper() { - GemStone::GemFire::Cache::Generic::Log::Info("Invoked Finalizer of ManagedWrapper"); + Apache::Geode::Client::Generic::Log::Info("Invoked Finalizer of ManagedWrapper"); InternalCleanup(); } @@ -45,7 +45,7 @@ void ManagedWrapper::InternalCleanup() bool ManagedWrapper::UnsafeDoOp(int size, int numOps) { - GemStone::GemFire::Cache::Generic::Log::Info("Managed string length: {0}", m_str->Length); + Apache::Geode::Client::Generic::Log::Info("Managed string length: {0}", m_str->Length); return UnsafeNativePtr->doOp(size, numOps, (numOps / 5) + 1); } http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NativeWrapper/ManagedWrapper.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cli/NativeWrapper/ManagedWrapper.hpp b/src/tests/cli/NativeWrapper/ManagedWrapper.hpp index 03b797b..b86866b 100644 --- a/src/tests/cli/NativeWrapper/ManagedWrapper.hpp +++ b/src/tests/cli/NativeWrapper/ManagedWrapper.hpp @@ -23,13 +23,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - namespace Internal +namespace Internal { /// <summary> @@ -147,12 +147,12 @@ namespace GemStone /// object is in progress since the temporary <c>ManagedPtrWrap</c> /// object holds a reference to the managed object. /// </summary> - property GemStone::GemFire::Cache::Generic::Internal::ManagedPtrWrap<NativeType, ManagedWrapper> + property Apache::Geode::Client::Generic::Internal::ManagedPtrWrap<NativeType, ManagedWrapper> SafeNativePtr2 { - inline GemStone::GemFire::Cache::Generic::Internal::ManagedPtrWrap<NativeType, ManagedWrapper> get() + inline Apache::Geode::Client::Generic::Internal::ManagedPtrWrap<NativeType, ManagedWrapper> get() { - return GemStone::GemFire::Cache::Generic::Internal::ManagedPtrWrap<NativeType, ManagedWrapper>( + return Apache::Geode::Client::Generic::Internal::ManagedPtrWrap<NativeType, ManagedWrapper>( m_nativePtr, this); } } http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NativeWrapper/NativeType.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cli/NativeWrapper/NativeType.cpp b/src/tests/cli/NativeWrapper/NativeType.cpp index b603f9b..1489d94 100644 --- a/src/tests/cli/NativeWrapper/NativeType.cpp +++ b/src/tests/cli/NativeWrapper/NativeType.cpp @@ -33,7 +33,7 @@ NativeType::NativeType() NativeType::~NativeType() { #ifdef _MANAGED - GemStone::GemFire::Cache::Generic::Log::Info("Invoked destructor of NativeType"); + Apache::Geode::Client::Generic::Log::Info("Invoked destructor of NativeType"); #endif g_nativeTypeDestroyed = true; } @@ -51,7 +51,7 @@ bool NativeType::doOp(int size, int numOps, int numGCOps) std::vector<std::string> vec; for (int i = 1; i <= numOps; ++i) { #ifdef _MANAGED - GemStone::GemFire::Cache::Generic::Log::Info("Allocating string number {0} with " + Apache::Geode::Client::Generic::Log::Info("Allocating string number {0} with " "size {1}", i, size); #endif std::string s(size, 'A' + i); @@ -60,10 +60,10 @@ bool NativeType::doOp(int size, int numOps, int numGCOps) #ifdef _MANAGED System::GC::AddMemoryPressure(size); if ((i % numGCOps) == 0) { - GemStone::GemFire::Cache::Generic::Log::Info("Started GC collection."); + Apache::Geode::Client::Generic::Log::Info("Started GC collection."); System::GC::Collect(); System::GC::WaitForPendingFinalizers(); - GemStone::GemFire::Cache::Generic::Log::Info("Completed GC collection."); + Apache::Geode::Client::Generic::Log::Info("Completed GC collection."); } System::Threading::Thread::Sleep(500); #else http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/CacheHelper.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/CacheHelper.cs b/src/tests/cli/NewFwkLib/CacheHelper.cs index 2ed00db..5c712cf 100644 --- a/src/tests/cli/NewFwkLib/CacheHelper.cs +++ b/src/tests/cli/NewFwkLib/CacheHelper.cs @@ -24,14 +24,14 @@ using System.Xml; #pragma warning disable 618 -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - using GemStone.GemFire.DUnitFramework; - using GemStone.GemFire.Cache.Generic; - //using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>; - //using IntRegion = GemStone.GemFire.Cache.Generic.IRegion<int, byte[]>; - //using StringRegion = GemStone.GemFire.Cache.Generic.IRegion<string, byte[]>; - using VMW = GemStone.GemFire.Cache; + using Apache.Geode.DUnitFramework; + using Apache.Geode.Client.Generic; + //using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>; + //using IntRegion = Apache.Geode.Client.Generic.IRegion<int, byte[]>; + //using StringRegion = Apache.Geode.Client.Generic.IRegion<string, byte[]>; + using VMW = Apache.Geode.Client; public class PropsStringToObject { public PropsStringToObject(Properties<string, object> target) @@ -456,7 +456,7 @@ namespace GemStone.GemFire.Cache.FwkLib } } - public static string RegionTag(GemStone.GemFire.Cache.Generic.RegionAttributes<TKey, TVal> attrs) + public static string RegionTag(Apache.Geode.Client.Generic.RegionAttributes<TKey, TVal> attrs) { string tag = string.Empty; tag += attrs.CachingEnabled ? "Caching" : "NoCache"; @@ -464,7 +464,7 @@ namespace GemStone.GemFire.Cache.FwkLib return tag; } - public static string RegionAttributesToString(GemStone.GemFire.Cache.Generic.RegionAttributes<TKey, TVal> attrs) + public static string RegionAttributesToString(Apache.Geode.Client.Generic.RegionAttributes<TKey, TVal> attrs) { StringBuilder attrsSB = new StringBuilder(); attrsSB.Append(Environment.NewLine + "caching: " + http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/CacheServer.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/CacheServer.cs b/src/tests/cli/NewFwkLib/CacheServer.cs index fcfcde2..6300d9b 100644 --- a/src/tests/cli/NewFwkLib/CacheServer.cs +++ b/src/tests/cli/NewFwkLib/CacheServer.cs @@ -23,14 +23,14 @@ using System.Threading; using System.Reflection; using System.IO; using PdxTests; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - using GemStone.GemFire.DUnitFramework; - using GemStone.GemFire.Cache.Tests.NewAPI; - using GemStone.GemFire.Cache.Generic; - using QueryCategory = GemStone.GemFire.Cache.Tests.QueryCategory; - using QueryStrings = GemStone.GemFire.Cache.Tests.QueryStrings; - using QueryStatics = GemStone.GemFire.Cache.Tests.QueryStatics; + using Apache.Geode.DUnitFramework; + using Apache.Geode.Client.Tests.NewAPI; + using Apache.Geode.Client.Generic; + using QueryCategory = Apache.Geode.Client.Tests.QueryCategory; + using QueryStrings = Apache.Geode.Client.Tests.QueryStrings; + using QueryStatics = Apache.Geode.Client.Tests.QueryStatics; public class SilenceListener<TKey, TVal> : CacheListenerAdapter<TKey, TVal> { @@ -1137,8 +1137,8 @@ namespace GemStone.GemFire.Cache.FwkLib remoteQuery(currentQuery, isLargeSetQuery, isUnsupportedPRQuery, i,false,false); i = Util.Rand(QueryStrings.SSsize); int[] a = new int[] { 4, 6, 7, 9, 12, 14, 15, 16 }; - if ((typeof(TVal).Equals(typeof(GemStone.GemFire.Cache.Tests.NewAPI.PortfolioPdx)) || - (typeof(TVal).Equals(typeof(GemStone.GemFire.Cache.Tests.NewAPI.PositionPdx)))) && ((IList<int>)a).Contains(i)) + if ((typeof(TVal).Equals(typeof(Apache.Geode.Client.Tests.NewAPI.PortfolioPdx)) || + (typeof(TVal).Equals(typeof(Apache.Geode.Client.Tests.NewAPI.PositionPdx)))) && ((IList<int>)a).Contains(i)) { FwkInfo("Skiping Query for pdx object [{0}]", QueryStatics.StructSetQueries[i]); } @@ -1151,8 +1151,8 @@ namespace GemStone.GemFire.Cache.FwkLib currentQuery = QueryStatics.ResultSetParamQueries[i]; remoteQuery(currentQuery, isLargeSetQuery, isUnsupportedPRQuery, i,true,false); i = Util.Rand(QueryStrings.SSPsize); - if ((typeof(TVal).Equals(typeof(GemStone.GemFire.Cache.Tests.NewAPI.PortfolioPdx)) || - (typeof(TVal).Equals(typeof(GemStone.GemFire.Cache.Tests.NewAPI.PositionPdx)))) && ((IList<int>)a).Contains(i)) + if ((typeof(TVal).Equals(typeof(Apache.Geode.Client.Tests.NewAPI.PortfolioPdx)) || + (typeof(TVal).Equals(typeof(Apache.Geode.Client.Tests.NewAPI.PositionPdx)))) && ((IList<int>)a).Contains(i)) { FwkInfo("Skiping Query for pdx object [{0}]", QueryStatics.StructSetParamQueries[i]); } @@ -1710,11 +1710,11 @@ namespace GemStone.GemFire.Cache.FwkLib { anObj = aRegion[key]; } - catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException) + catch (Apache.Geode.Client.Generic.KeyNotFoundException) { if (!EqualityComparer<TVal>.Default.Equals(anObj, default(TVal))) { - throw new GemStone.GemFire.Cache.Generic.KeyNotFoundException(); + throw new Apache.Geode.Client.Generic.KeyNotFoundException(); } } @@ -2284,7 +2284,7 @@ namespace GemStone.GemFire.Cache.FwkLib } //} } - catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException) + catch (Apache.Geode.Client.Generic.KeyNotFoundException) { } catch (Exception e) @@ -2372,7 +2372,7 @@ namespace GemStone.GemFire.Cache.FwkLib } //} } - catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException) + catch (Apache.Geode.Client.Generic.KeyNotFoundException) { } catch (Exception e) @@ -2435,7 +2435,7 @@ namespace GemStone.GemFire.Cache.FwkLib try { value = aRegion[key]; - }catch(GemStone.GemFire.Cache.Generic.KeyNotFoundException){ + }catch(Apache.Geode.Client.Generic.KeyNotFoundException){ value = default(TVal); } regionSnapshot[key] = value; @@ -2630,7 +2630,7 @@ namespace GemStone.GemFire.Cache.FwkLib FwkInfo("CacheServer.DoEntryOperations() Caught non-fatal " + "exception in read: {0}", ex.Message); } - catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException ex) { + catch (Apache.Geode.Client.Generic.KeyNotFoundException ex) { FwkInfo("CacheServer.DoEntryOperations() Caught non-fatal " + "exception in read: {0}", ex.Message); } @@ -2867,7 +2867,7 @@ namespace GemStone.GemFire.Cache.FwkLib addOps = -1; UpdateOperationsMap(opCode, addOps); } - catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException) + catch (Apache.Geode.Client.Generic.KeyNotFoundException) { addOps = -1; UpdateOperationsMap(opCode, addOps); @@ -3770,7 +3770,7 @@ public void doVerifyRegionContentsAfterLateOps() TVal value = regionPtr[key]; checkValue(key, value); } - catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException) + catch (Apache.Geode.Client.Generic.KeyNotFoundException) { } } @@ -3886,7 +3886,7 @@ public void doVerifyRegionContentsAfterLateOps() } } } - catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException) + catch (Apache.Geode.Client.Generic.KeyNotFoundException) {} } } @@ -3903,7 +3903,7 @@ public void doVerifyRegionContentsAfterLateOps() TVal value = regionPtr[key]; checkValue(key, value); } - catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException) + catch (Apache.Geode.Client.Generic.KeyNotFoundException) { } } } @@ -3931,7 +3931,7 @@ public void doVerifyRegionContentsAfterLateOps() } } } - catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException) + catch (Apache.Geode.Client.Generic.KeyNotFoundException) { } } } @@ -4213,7 +4213,7 @@ private void checkUpdatedValue(TKey key, TVal value) rootAttrs = CreatePool(rootAttrs, redundancyLevel); FwkInfo("Entering CacheHelper.CreateRegion()"); region = CacheHelper<TKey, TVal>.CreateRegion(rootRegionName, rootAttrs); - GemStone.GemFire.Cache.Generic.RegionAttributes<TKey, TVal> regAttr = region.Attributes; + Apache.Geode.Client.Generic.RegionAttributes<TKey, TVal> regAttr = region.Attributes; FwkInfo("Region attributes for {0}: {1}", rootRegionName, CacheHelper<TKey, TVal>.RegionAttributesToString(regAttr)); if (isDC) @@ -4679,7 +4679,7 @@ private void checkUpdatedValue(TKey key, TVal value) FwkInfo("MultiUser.DoEntryOperationsForMU() Caught non-fatal " + "ex-ception in read: {0}", ex.Message); } - catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException ex) + catch (Apache.Geode.Client.Generic.KeyNotFoundException ex) { FwkInfo("MultiUser.DoEntryOperationsForMU() Caught non-fatal " + "ex-ception in read: {0}", ex.Message); @@ -4717,7 +4717,7 @@ private void checkUpdatedValue(TKey key, TVal value) string funcName = null; Random rdn = new Random(); int num = rdn.Next(3); - GemStone.GemFire.Cache.Generic.Execution<object> exc = null; + Apache.Geode.Client.Generic.Execution<object> exc = null; ICollection<object> executeFunctionResult = null; ArrayList args = new ArrayList(); Object[] filterObj = new Object[1]; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/DeltaTest/DeltaClientValidationListener.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/DeltaTest/DeltaClientValidationListener.cs b/src/tests/cli/NewFwkLib/DeltaTest/DeltaClientValidationListener.cs index 8572b7a..e7a70cd 100644 --- a/src/tests/cli/NewFwkLib/DeltaTest/DeltaClientValidationListener.cs +++ b/src/tests/cli/NewFwkLib/DeltaTest/DeltaClientValidationListener.cs @@ -19,11 +19,11 @@ using System; using System.Threading; using System.Collections.Generic; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - 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 DeltaClientValidationListener<TKey, TVal> : CacheListenerAdapter<TKey, TVal> { private IDictionary<TKey, Int32> m_latestValues; @@ -147,11 +147,11 @@ namespace GemStone.GemFire.Cache.FwkLib { } - public void Close(GemStone.GemFire.Cache.Generic.IRegion<TKey, TVal> region) + public void Close(Apache.Geode.Client.Generic.IRegion<TKey, TVal> region) { } - public void AfterRegionDisconnected(GemStone.GemFire.Cache.Generic.IRegion<TKey, TVal> region) + public void AfterRegionDisconnected(Apache.Geode.Client.Generic.IRegion<TKey, TVal> region) { } public override void AfterRegionClear(RegionEvent<TKey, TVal> ev) http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/DeltaTest/DeltaTest.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/DeltaTest/DeltaTest.cs b/src/tests/cli/NewFwkLib/DeltaTest/DeltaTest.cs index 2f0020f..4fd661b 100644 --- a/src/tests/cli/NewFwkLib/DeltaTest/DeltaTest.cs +++ b/src/tests/cli/NewFwkLib/DeltaTest/DeltaTest.cs @@ -21,14 +21,14 @@ using System.Collections.Generic; using System.Text; using System.Threading; using System.Xml.Serialization; -using GemStone.GemFire.Cache.Tests; +using Apache.Geode.Client.Tests; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - 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 PutTask<TKey, TVal> : ClientTask { #region Private members http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/DurableTest/DurableClientTests.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/DurableTest/DurableClientTests.cs b/src/tests/cli/NewFwkLib/DurableTest/DurableClientTests.cs index f3b7bd7..f90f1e5 100644 --- a/src/tests/cli/NewFwkLib/DurableTest/DurableClientTests.cs +++ b/src/tests/cli/NewFwkLib/DurableTest/DurableClientTests.cs @@ -19,10 +19,10 @@ using System; using System.Text; using System.Threading; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - using GemStone.GemFire.DUnitFramework; - using GemStone.GemFire.Cache.Generic; + using Apache.Geode.DUnitFramework; + using Apache.Geode.Client.Generic; public class DurableClientTests<TKey,TVal> : PerfTests<TKey,TVal> { @@ -237,7 +237,7 @@ namespace GemStone.GemFire.Cache.FwkLib SetRegionAttributes(rootAttrs, rootRegionData, ref m_isPool); rootAttrs = CreatePool(rootAttrs, redundancyLevel); region = CacheHelper<TKey, TVal>.CreateRegion(rootRegionName, rootAttrs); - GemStone.GemFire.Cache.Generic.RegionAttributes<TKey, TVal> regAttr = region.Attributes; + Apache.Geode.Client.Generic.RegionAttributes<TKey, TVal> regAttr = region.Attributes; FwkInfo("Region attributes for {0}: {1}", rootRegionName, CacheHelper<TKey, TVal>.RegionAttributesToString(regAttr)); @@ -328,7 +328,7 @@ namespace GemStone.GemFire.Cache.FwkLib { currcnt = (Int32)Util.BBGet("DURABLEBB", operkey); } - catch (GemStone.GemFire.DUnitFramework.KeyNotFoundException) + catch (Apache.Geode.DUnitFramework.KeyNotFoundException) { FwkInfo("Key not found for DURABLEBB {0}", operkey); } @@ -337,7 +337,7 @@ namespace GemStone.GemFire.Cache.FwkLib { feedcnt = (Int32)Util.BBGet("DURABLEBB", feedkey); } - catch (GemStone.GemFire.DUnitFramework.KeyNotFoundException) + catch (Apache.Geode.DUnitFramework.KeyNotFoundException) { FwkInfo("Key not found for DURABLEBB {0}", feedkey); } @@ -354,7 +354,7 @@ namespace GemStone.GemFire.Cache.FwkLib { errorMsg = (string)Util.BBGet("DURABLEBB", clientErrorKey); } - catch (GemStone.GemFire.DUnitFramework.KeyNotFoundException) + catch (Apache.Geode.DUnitFramework.KeyNotFoundException) { errorMsg = "unknown"; FwkInfo("Key not found for DURABLEBB {0}", clientErrorKey); http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/DurableTest/DurableListener.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/DurableTest/DurableListener.cs b/src/tests/cli/NewFwkLib/DurableTest/DurableListener.cs index b19a0ae..4472b64 100644 --- a/src/tests/cli/NewFwkLib/DurableTest/DurableListener.cs +++ b/src/tests/cli/NewFwkLib/DurableTest/DurableListener.cs @@ -18,10 +18,10 @@ using System; using System.Collections.Generic; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - using GemStone.GemFire.DUnitFramework; - using GemStone.GemFire.Cache.Generic; + using Apache.Geode.DUnitFramework; + using Apache.Geode.Client.Generic; public class DurableListener<TKey, TVal> : CacheListenerAdapter<TKey, TVal>, IDisposable { @@ -79,7 +79,7 @@ namespace GemStone.GemFire.Cache.FwkLib { current = (Int32)Util.BBGet("DURABLEBB", bbkey); } - catch (GemStone.GemFire.DUnitFramework.KeyNotFoundException) + catch (Apache.Geode.DUnitFramework.KeyNotFoundException) { currTest.FwkInfo("Key not found for DURABLEBB {0}", bbkey); } @@ -100,7 +100,7 @@ namespace GemStone.GemFire.Cache.FwkLib { clientErrorVal = (string)Util.BBGet("DURABLEBB", clientErrorKey); } - catch (GemStone.GemFire.DUnitFramework.KeyNotFoundException) + catch (Apache.Geode.DUnitFramework.KeyNotFoundException) { currTest.FwkInfo("Key not found for DURABLEBB {0}", clientErrorKey); } @@ -163,7 +163,7 @@ namespace GemStone.GemFire.Cache.FwkLib { m_prevValue = (Int32)Util.BBGet("DURABLEBB", clientIndexKey); } - catch (GemStone.GemFire.DUnitFramework.KeyNotFoundException) + catch (Apache.Geode.DUnitFramework.KeyNotFoundException) { m_prevValue = 0; currTest.FwkInfo("Key not found for DURABLEBB {0}", clientIndexKey); http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/DurableTest/DurablePerfListener.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/DurableTest/DurablePerfListener.cs b/src/tests/cli/NewFwkLib/DurableTest/DurablePerfListener.cs index 4b49d20..bb569e0 100644 --- a/src/tests/cli/NewFwkLib/DurableTest/DurablePerfListener.cs +++ b/src/tests/cli/NewFwkLib/DurableTest/DurablePerfListener.cs @@ -19,10 +19,10 @@ using System; using System.Collections.Generic; using System.Threading; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - using GemStone.GemFire.DUnitFramework; - using GemStone.GemFire.Cache.Generic; + using Apache.Geode.DUnitFramework; + using Apache.Geode.Client.Generic; public class DurablePerfListener<TKey, TVal> : CacheListenerAdapter<TKey, TVal>, IDisposable http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/EventTest/ETCacheListener.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/EventTest/ETCacheListener.cs b/src/tests/cli/NewFwkLib/EventTest/ETCacheListener.cs index 3f954c7..94644a8 100644 --- a/src/tests/cli/NewFwkLib/EventTest/ETCacheListener.cs +++ b/src/tests/cli/NewFwkLib/EventTest/ETCacheListener.cs @@ -17,10 +17,10 @@ using System; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - using GemStone.GemFire.DUnitFramework; + using Apache.Geode.DUnitFramework; public class ETCacheListener : ICacheListener { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/EventTest/ETCacheLoader.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/EventTest/ETCacheLoader.cs b/src/tests/cli/NewFwkLib/EventTest/ETCacheLoader.cs index 3da85e5..c01e474 100644 --- a/src/tests/cli/NewFwkLib/EventTest/ETCacheLoader.cs +++ b/src/tests/cli/NewFwkLib/EventTest/ETCacheLoader.cs @@ -17,9 +17,9 @@ using System; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - using GemStone.GemFire.DUnitFramework; + using Apache.Geode.DUnitFramework; public class ETCacheLoader : ICacheLoader { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/EventTest/ETCacheWriter.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/EventTest/ETCacheWriter.cs b/src/tests/cli/NewFwkLib/EventTest/ETCacheWriter.cs index 6c0d709..090185c 100644 --- a/src/tests/cli/NewFwkLib/EventTest/ETCacheWriter.cs +++ b/src/tests/cli/NewFwkLib/EventTest/ETCacheWriter.cs @@ -17,9 +17,9 @@ using System; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - using GemStone.GemFire.DUnitFramework; + using Apache.Geode.DUnitFramework; public class ETCacheWriter : ICacheWriter { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/EventTest/EventTests.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/EventTest/EventTests.cs b/src/tests/cli/NewFwkLib/EventTest/EventTests.cs index 6cfa4d0..d12be3c 100644 --- a/src/tests/cli/NewFwkLib/EventTest/EventTests.cs +++ b/src/tests/cli/NewFwkLib/EventTest/EventTests.cs @@ -19,9 +19,9 @@ using System; using System.Collections.Generic; using System.Text; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - using GemStone.GemFire.DUnitFramework; + using Apache.Geode.DUnitFramework; using System.Threading; using System.Xml.Serialization; using System.IO; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/FunctionExecution/FunctionExecution.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/FunctionExecution/FunctionExecution.cs b/src/tests/cli/NewFwkLib/FunctionExecution/FunctionExecution.cs index c9e044f..a5d7bef 100644 --- a/src/tests/cli/NewFwkLib/FunctionExecution/FunctionExecution.cs +++ b/src/tests/cli/NewFwkLib/FunctionExecution/FunctionExecution.cs @@ -21,10 +21,10 @@ using System.Collections.Generic; using System.Text; using System.Threading; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - using GemStone.GemFire.DUnitFramework; - using GemStone.GemFire.Cache.Generic; + using Apache.Geode.DUnitFramework; + using Apache.Geode.Client.Generic; //----------------------------------- DoOpsTask start ------------------------ public class DoFETask<TKey, TVal> : ClientTask @@ -211,7 +211,7 @@ namespace GemStone.GemFire.Cache.FwkLib if (pdxobject) args.Add(pdxobject); args.Add(filterObj[0]); - GemStone.GemFire.Cache.Generic.Execution<object> exc = + Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<TKey, TVal>(m_region); //FwkTest<TKey, TVal>.CurrentTest.FwkInfo("Going to do addKey execute"); ICollection<object> executeFunctionResult = null; @@ -252,7 +252,7 @@ namespace GemStone.GemFire.Cache.FwkLib if (pdxobject) args.Add(pdxobject); args.Add(filterObj[0]); - GemStone.GemFire.Cache.Generic.Execution<object> exc = + Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<TKey, TVal>(m_region); //FwkTest<TKey, TVal>.CurrentTest.FwkInfo("Going to do addKey execute"); ICollection<object> executeFunctionResult = null; @@ -287,7 +287,7 @@ namespace GemStone.GemFire.Cache.FwkLib if(pdxobject) args.Add(pdxobject); args.Add(filterObj[0]); - GemStone.GemFire.Cache.Generic.Execution<object> exc = + Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<TKey, TVal>(m_region); //FwkTest<TKey, TVal>.CurrentTest.FwkInfo("Going to do invalidate execute"); ICollection<object> executeFunctionResult = null; @@ -323,7 +323,7 @@ namespace GemStone.GemFire.Cache.FwkLib args.Add(pdxobject); args.Add(filterObj[0]); - GemStone.GemFire.Cache.Generic.Execution<object> exc = + Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<TKey, TVal>(m_region); //FwkTest<TKey, TVal>.CurrentTest.FwkInfo("Going to do locally invalidate execute"); ICollection<object> executeFunctionResult = null; @@ -359,7 +359,7 @@ namespace GemStone.GemFire.Cache.FwkLib args.Add(pdxobject); args.Add(filterObj[0]); - GemStone.GemFire.Cache.Generic.Execution<object> exc = + Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<TKey, TVal>(m_region); //FwkTest<TKey, TVal>.CurrentTest.FwkInfo("Going to do destroy execute"); ICollection<object> executeFunctionResult = null; @@ -395,7 +395,7 @@ namespace GemStone.GemFire.Cache.FwkLib args.Add(pdxobject); args.Add(filterObj[0]); - GemStone.GemFire.Cache.Generic.Execution<object> exc = + Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<TKey, TVal>(m_region); //FwkTest<TKey, TVal>.CurrentTest.FwkInfo("Going to do local destroy execute"); ICollection<object> executeFunctionResult = null; @@ -433,7 +433,7 @@ namespace GemStone.GemFire.Cache.FwkLib args.Add(pdxobject); args.Add(filterObj[0]); - GemStone.GemFire.Cache.Generic.Execution<object> exc = + Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<TKey, TVal>(m_region); //FwkTest<TKey, TVal>.CurrentTest.FwkInfo("Going to do update execute"); ICollection<object> executeFunctionResult = null; @@ -470,7 +470,7 @@ namespace GemStone.GemFire.Cache.FwkLib args.Add(pdxobject); args.Add(filterObj[0]); - GemStone.GemFire.Cache.Generic.Execution<object> exc = + Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<TKey, TVal>(m_region); //FwkTest<TKey, TVal>.CurrentTest.FwkInfo("Going to do get execute"); ICollection<object> executeFunctionResult = null; @@ -515,7 +515,7 @@ namespace GemStone.GemFire.Cache.FwkLib args.Add(pdxobject); args.Add(filterObj[0]); - GemStone.GemFire.Cache.Generic.Execution<object> exc = + Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<TKey, TVal>(m_region); //FwkTest<TKey, TVal>.CurrentTest.FwkInfo("Going to do query execute"); ICollection<object> executeFunctionResult = null; @@ -726,7 +726,7 @@ namespace GemStone.GemFire.Cache.FwkLib } } //Execution<object> exc = null; - GemStone.GemFire.Cache.Generic.Execution<object> exc = null; + Apache.Geode.Client.Generic.Execution<object> exc = null; //Execution exc = null; Pool/*<TKey, TVal>*/ pptr = null; IRegion<TKey, TVal> region = GetRegion(); @@ -829,7 +829,7 @@ namespace GemStone.GemFire.Cache.FwkLib } } } - catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException ex) + catch (Apache.Geode.Client.Generic.KeyNotFoundException ex) { FwkInfo("VerifyAddNewResult() caught exception: {0}", ex); } @@ -866,7 +866,7 @@ namespace GemStone.GemFire.Cache.FwkLib { value = region[key].ToString(); } - catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException) + catch (Apache.Geode.Client.Generic.KeyNotFoundException) { if(ops.Equals("destroy") && destroyedKeys.Remove(key)) { @@ -1033,7 +1033,7 @@ namespace GemStone.GemFire.Cache.FwkLib public void DoParitionedRegionFunctionExecution() { FwkInfo("In DoParitionedRegionFunctionExecution()"); - GemStone.GemFire.Cache.Generic.Execution<object> exc = null; + Apache.Geode.Client.Generic.Execution<object> exc = null; IRegion<TKey, TVal> region = GetRegion("partitionedRegion"); try { @@ -1064,11 +1064,11 @@ namespace GemStone.GemFire.Cache.FwkLib Generic.IResultCollector<object> rc = exc.Execute("ExceptionHandlingFunction", 30); } - catch (GemFire.Cache.Generic.FunctionExecutionException) + catch (Apache.Geode.Client.Generic.FunctionExecutionException) { //expected exception } - catch (GemFire.Cache.Generic.TimeoutException) + catch (Apache.Geode.Client.Generic.TimeoutException) { //expected exception } @@ -1077,7 +1077,7 @@ namespace GemStone.GemFire.Cache.FwkLib public void DoReplicatedRegionFunctionExecution() { FwkInfo("In DoReplicatedRegionFunctionExecution()"); - GemStone.GemFire.Cache.Generic.Execution<object> exc = null; + Apache.Geode.Client.Generic.Execution<object> exc = null; IRegion<TKey, TVal> region = GetRegion("replicatedRegion"); try { @@ -1087,11 +1087,11 @@ namespace GemStone.GemFire.Cache.FwkLib // execute function Generic.IResultCollector<object> rc = exc.Execute("ExceptionHandlingFunction", 30); } - catch (GemFire.Cache.Generic.FunctionExecutionException) + catch (Apache.Geode.Client.Generic.FunctionExecutionException) { //expected exception } - catch (GemFire.Cache.Generic.TimeoutException) + catch (Apache.Geode.Client.Generic.TimeoutException) { //expected exception } @@ -1115,15 +1115,15 @@ namespace GemStone.GemFire.Cache.FwkLib try { MyResultCollector<object> myRC = new MyResultCollector<object>(); - GemStone.GemFire.Cache.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<TKey, TVal>(region).WithCollector(myRC); + Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<TKey, TVal>(region).WithCollector(myRC); // execute function Generic.IResultCollector<object> rc = exc.Execute("FireNForget", 30); } - catch (GemFire.Cache.Generic.FunctionExecutionException) + catch (Apache.Geode.Client.Generic.FunctionExecutionException) { //expected exception } - catch (GemFire.Cache.Generic.TimeoutException) + catch (Apache.Geode.Client.Generic.TimeoutException) { //expected exception } @@ -1134,7 +1134,7 @@ namespace GemStone.GemFire.Cache.FwkLib FwkInfo("In DoOnServersFunctionExcecution()"); ResetKey("poolName"); string poolname = GetStringValue("poolName"); - GemStone.GemFire.Cache.Generic.Execution<object> exc = null; + Apache.Geode.Client.Generic.Execution<object> exc = null; try { Pool/*<TKey, TVal>*/ pptr = PoolManager/*<TKey, TVal>*/.Find(poolname); @@ -1143,11 +1143,11 @@ namespace GemStone.GemFire.Cache.FwkLib // execute function Generic.IResultCollector<object> rc = exc.Execute("ExceptionHandlingFunction", 30); } - catch (GemFire.Cache.Generic.FunctionExecutionException) + catch (Apache.Geode.Client.Generic.FunctionExecutionException) { //expected exception } - catch (GemFire.Cache.Generic.TimeoutException) + catch (Apache.Geode.Client.Generic.TimeoutException) { //expected exception } @@ -1163,7 +1163,7 @@ namespace GemStone.GemFire.Cache.FwkLib IRegion<TKey, TVal> region = GetRegion(); ICollection<object> executeFunctionResult = null; string funcName = "GetFunctionExeHA"; - GemStone.GemFire.Cache.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<TKey, TVal>(region); + Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<TKey, TVal>(region); MyResultCollectorHA<object> myRC = new MyResultCollectorHA<object>(); exc = exc.WithCollector(myRC); Generic.IResultCollector<object> rc = exc.Execute(funcName, 120); @@ -1233,7 +1233,7 @@ namespace GemStone.GemFire.Cache.FwkLib for (int i = 0; i < keys.Length; i++) args.Add(keys[i]); string funcName = GetStringValue("funcName"); - GemStone.GemFire.Cache.Generic.Execution<object> exc = + Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<TKey, TVal>(region); //FwkInfo("Going to do get execute"); ICollection<object> executeFunctionResult = null; @@ -1284,7 +1284,7 @@ namespace GemStone.GemFire.Cache.FwkLib for (int i = 0; i < keys.Length; i++) args.Add(keys[i]); string funcName = GetStringValue("funcName"); - GemStone.GemFire.Cache.Generic.Execution<object> exc = + Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<TKey, TVal>(region); //FwkInfo("Going to do get execute"); ICollection<object> executeFunctionResult = null; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/FunctionExecution/MyResultCollector.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/FunctionExecution/MyResultCollector.cs b/src/tests/cli/NewFwkLib/FunctionExecution/MyResultCollector.cs index 7fac56a..f3ec04c 100644 --- a/src/tests/cli/NewFwkLib/FunctionExecution/MyResultCollector.cs +++ b/src/tests/cli/NewFwkLib/FunctionExecution/MyResultCollector.cs @@ -19,10 +19,10 @@ using System; using System.Collections.Generic; using System.Threading; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - using GemStone.GemFire.DUnitFramework; - using GemStone.GemFire.Cache.Generic; + using Apache.Geode.DUnitFramework; + using Apache.Geode.Client.Generic; public class MyResultCollector<TResult> : Generic.IResultCollector<TResult> { #region Private members http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/FwkTask.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/FwkTask.cs b/src/tests/cli/NewFwkLib/FwkTask.cs index 1dad8cf..54b16ee 100644 --- a/src/tests/cli/NewFwkLib/FwkTask.cs +++ b/src/tests/cli/NewFwkLib/FwkTask.cs @@ -21,9 +21,9 @@ using System.Reflection; using System.Text; using System.Xml; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - using GemStone.GemFire.DUnitFramework; + using Apache.Geode.DUnitFramework; public class FwkTask { @@ -296,7 +296,7 @@ namespace GemStone.GemFire.Cache.FwkLib } else { - //typeAttrib = "GemStone.GemFire.Cache.Tests.ArrayOfByte,GemStone.GemFire.Cache.Tests.ArrayOfByte"; + //typeAttrib = "Apache.Geode.Client.Tests.ArrayOfByte,Apache.Geode.Client.Tests.ArrayOfByte"; //typeAttrib = "System.int,System.Int32"; string[] typeNames = typeAttrib.Split(','); string mangledName = typeName + "`" + typeNames.Length.ToString(); @@ -328,7 +328,7 @@ namespace GemStone.GemFire.Cache.FwkLib } else { - typName = "GemStone.GemFire.Cache.Tests.NewAPI." + typName; + typName = "Apache.Geode.Client.Tests.NewAPI." + typName; types[index] = loadAssmb.GetType(typName.Trim(), true, true); //Util.Log("rjk: FwkTask: typeAttrib for userobject 34 argname {0}", typName); } http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/FwkTest.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/FwkTest.cs b/src/tests/cli/NewFwkLib/FwkTest.cs index a279745..99f233e 100644 --- a/src/tests/cli/NewFwkLib/FwkTest.cs +++ b/src/tests/cli/NewFwkLib/FwkTest.cs @@ -24,13 +24,13 @@ using System.Xml; #pragma warning disable 618 -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - using GemStone.GemFire.DUnitFramework; - using GemStone.GemFire.Cache.Tests.NewAPI; - using GemStone.GemFire.Cache.Generic; - using NEWAPI = GemStone.GemFire.Cache.Tests.NewAPI; - //using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>; + using Apache.Geode.DUnitFramework; + using Apache.Geode.Client.Tests.NewAPI; + using Apache.Geode.Client.Generic; + using NEWAPI = Apache.Geode.Client.Tests.NewAPI; + //using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>; /// <summary> @@ -1344,7 +1344,7 @@ namespace GemStone.GemFire.Cache.FwkLib else region = CacheHelper<TKey, TVal>.CreateRegion(rootRegionName, rootAttrs); } - GemStone.GemFire.Cache.Generic.RegionAttributes<TKey, TVal> regAttr = region.Attributes; + Apache.Geode.Client.Generic.RegionAttributes<TKey, TVal> regAttr = region.Attributes; FwkInfo("Region attributes for {0}: {1}", rootRegionName, CacheHelper<TKey, TVal>.RegionAttributesToString(regAttr)); } http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/NewFwkLib.csproj.in ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/NewFwkLib.csproj.in b/src/tests/cli/NewFwkLib/NewFwkLib.csproj.in index 43dc9a7..85c671e 100644 --- a/src/tests/cli/NewFwkLib/NewFwkLib.csproj.in +++ b/src/tests/cli/NewFwkLib/NewFwkLib.csproj.in @@ -12,7 +12,7 @@ <ProjectGuid>{3DAA5FF5-9FA3-3543-9293-7197636A16C3}</ProjectGuid> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>GemStone.GemFire.Cache.FwkLib</RootNamespace> + <RootNamespace>Apache.Geode.Client.FwkLib</RootNamespace> <AssemblyName>NewFwkLib</AssemblyName> <SignAssembly>${STRONG_NAME_KEY_ENABLED}</SignAssembly> <AssemblyOriginatorKeyFile>${STRONG_NAME_KEY}</AssemblyOriginatorKeyFile> http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/PdxTest/PdxTests.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/PdxTest/PdxTests.cs b/src/tests/cli/NewFwkLib/PdxTest/PdxTests.cs index 8ae3a3e..bf20fa6 100644 --- a/src/tests/cli/NewFwkLib/PdxTest/PdxTests.cs +++ b/src/tests/cli/NewFwkLib/PdxTest/PdxTests.cs @@ -25,14 +25,14 @@ using System.Reflection; using PdxTests; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - using GemStone.GemFire.DUnitFramework; - using GemStone.GemFire.Cache.Tests.NewAPI; - using GemStone.GemFire.Cache.Generic; - using QueryCategory = GemStone.GemFire.Cache.Tests.QueryCategory; - using QueryStrings = GemStone.GemFire.Cache.Tests.QueryStrings; - using QueryStatics = GemStone.GemFire.Cache.Tests.QueryStatics; + using Apache.Geode.DUnitFramework; + using Apache.Geode.Client.Tests.NewAPI; + using Apache.Geode.Client.Generic; + using QueryCategory = Apache.Geode.Client.Tests.QueryCategory; + using QueryStrings = Apache.Geode.Client.Tests.QueryStrings; + using QueryStatics = Apache.Geode.Client.Tests.QueryStatics; using System.IO; public class PDXSilenceListener<TKey, TVal> : CacheListenerAdapter<TKey, TVal> @@ -595,11 +595,11 @@ namespace GemStone.GemFire.Cache.FwkLib { anObj = (TVal)aRegion[key]; } - catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException) + catch (Apache.Geode.Client.Generic.KeyNotFoundException) { if (!EqualityComparer<TVal>.Default.Equals(anObj, default(TVal))) { - throw new GemStone.GemFire.Cache.Generic.KeyNotFoundException(); + throw new Apache.Geode.Client.Generic.KeyNotFoundException(); } } @@ -1834,11 +1834,11 @@ namespace GemStone.GemFire.Cache.FwkLib { anObj = aRegion[key]; } - catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException) + catch (Apache.Geode.Client.Generic.KeyNotFoundException) { if (!EqualityComparer<TVal>.Default.Equals(anObj, default(TVal))) { - throw new GemStone.GemFire.Cache.Generic.KeyNotFoundException(); + throw new Apache.Geode.Client.Generic.KeyNotFoundException(); } } @@ -2411,7 +2411,7 @@ namespace GemStone.GemFire.Cache.FwkLib } } - catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException) + catch (Apache.Geode.Client.Generic.KeyNotFoundException) { } catch (Exception e) @@ -2465,7 +2465,7 @@ namespace GemStone.GemFire.Cache.FwkLib { value = aRegion[key]; } - catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException) + catch (Apache.Geode.Client.Generic.KeyNotFoundException) { value = default(TVal); } @@ -2520,7 +2520,7 @@ namespace GemStone.GemFire.Cache.FwkLib expectedValue, valueOnServer, key); //} } - catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException) + catch (Apache.Geode.Client.Generic.KeyNotFoundException) { } catch (EntryNotFoundException) @@ -3373,7 +3373,7 @@ namespace GemStone.GemFire.Cache.FwkLib FwkInfo("CacheServer.DoEntryOperations() Caught non-fatal " + "ex-ception in read: {0}", ex.Message); } - catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException ex) + catch (Apache.Geode.Client.Generic.KeyNotFoundException ex) { FwkInfo("CacheServer.DoEntryOperations() Caught non-fatal " + "ex-ception in read: {0}", ex.Message); http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/PerfTest/DupChecker.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/PerfTest/DupChecker.cs b/src/tests/cli/NewFwkLib/PerfTest/DupChecker.cs index 64732a3..1ce5a57 100644 --- a/src/tests/cli/NewFwkLib/PerfTest/DupChecker.cs +++ b/src/tests/cli/NewFwkLib/PerfTest/DupChecker.cs @@ -18,11 +18,11 @@ using System; using System.Collections.Generic; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - 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>; public class DupChecker<TKey, TVal> : CacheListenerAdapter<TKey, TVal>, IDisposable http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/PerfTest/LatencyListener.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/PerfTest/LatencyListener.cs b/src/tests/cli/NewFwkLib/PerfTest/LatencyListener.cs index 782d870..66ad7ef 100644 --- a/src/tests/cli/NewFwkLib/PerfTest/LatencyListener.cs +++ b/src/tests/cli/NewFwkLib/PerfTest/LatencyListener.cs @@ -17,11 +17,11 @@ using System; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - 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>; public class LatencyListener<TKey, TVal> : CacheListenerAdapter<TKey, TVal>, IDisposable { @@ -88,7 +88,7 @@ namespace GemStone.GemFire.Cache.FwkLib "LatencyBB", "LatencyTag"); tag = taskData.GetLogString(); } - catch (GemStone.GemFire.DUnitFramework.KeyNotFoundException) + catch (Apache.Geode.DUnitFramework.KeyNotFoundException) { tag = null; } http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/PerfTest/PerfTasks.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/PerfTest/PerfTasks.cs b/src/tests/cli/NewFwkLib/PerfTest/PerfTasks.cs index 3537b78..832e502 100644 --- a/src/tests/cli/NewFwkLib/PerfTest/PerfTasks.cs +++ b/src/tests/cli/NewFwkLib/PerfTest/PerfTasks.cs @@ -18,13 +18,13 @@ using System; using System.Threading; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - using GemStone.GemFire.DUnitFramework; - using GemStone.GemFire.Cache.Generic; - //using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>; - //using IntRegion = GemStone.GemFire.Cache.Generic.IRegion<int, byte[]>; - //using StringRegion = GemStone.GemFire.Cache.Generic.IRegion<string, byte[]>; + using Apache.Geode.DUnitFramework; + using Apache.Geode.Client.Generic; + //using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>; + //using IntRegion = Apache.Geode.Client.Generic.IRegion<int, byte[]>; + //using StringRegion = Apache.Geode.Client.Generic.IRegion<string, byte[]>; public class PutsTask<TKey, TVal> : ClientTask { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/PerfTest/PerfTestCacheListener.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/PerfTest/PerfTestCacheListener.cs b/src/tests/cli/NewFwkLib/PerfTest/PerfTestCacheListener.cs index f89277a..d80c04f 100644 --- a/src/tests/cli/NewFwkLib/PerfTest/PerfTestCacheListener.cs +++ b/src/tests/cli/NewFwkLib/PerfTest/PerfTestCacheListener.cs @@ -18,11 +18,11 @@ using System; using System.Threading; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - 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>; public class PerfTestCacheListener<TKey, TVal> : CacheListenerAdapter<TKey, TVal>, IDisposable { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/PerfTest/PerfTests.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/PerfTest/PerfTests.cs b/src/tests/cli/NewFwkLib/PerfTest/PerfTests.cs index 434242b..ed5c96a 100644 --- a/src/tests/cli/NewFwkLib/PerfTest/PerfTests.cs +++ b/src/tests/cli/NewFwkLib/PerfTest/PerfTests.cs @@ -21,13 +21,13 @@ using System.Collections.Generic; using System.Text; using System.Threading; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - using GemStone.GemFire.DUnitFramework; - using GemStone.GemFire.Cache.Generic; - //using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>; - //using IntRegion = GemStone.GemFire.Cache.Generic.IRegion<int, byte[]>; - //using StringRegion = GemStone.GemFire.Cache.Generic.IRegion<string, byte[]>; + using Apache.Geode.DUnitFramework; + using Apache.Geode.Client.Generic; + //using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>; + //using IntRegion = Apache.Geode.Client.Generic.IRegion<int, byte[]>; + //using StringRegion = Apache.Geode.Client.Generic.IRegion<string, byte[]>; public class PerfTests<TKey, TVal> : FwkTest<TKey, TVal> { #region Protected members http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/QueryTest/QueryTests.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/QueryTest/QueryTests.cs b/src/tests/cli/NewFwkLib/QueryTest/QueryTests.cs index 73f5d9b..ddc09f9 100644 --- a/src/tests/cli/NewFwkLib/QueryTest/QueryTests.cs +++ b/src/tests/cli/NewFwkLib/QueryTest/QueryTests.cs @@ -19,16 +19,16 @@ using System; using System.Collections.Generic; using System.Text; -using GemStone.GemFire.Cache.Tests.NewAPI; // for Portfolio and Position classes +using Apache.Geode.Client.Tests.NewAPI; // for Portfolio and Position classes -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - using GemStone.GemFire.DUnitFramework; - using GemStone.GemFire.Cache.Tests.NewAPI; - using GemStone.GemFire.Cache.Generic; - using QueryCategory = GemStone.GemFire.Cache.Tests.QueryCategory; - using QueryStrings = GemStone.GemFire.Cache.Tests.QueryStrings; - using QueryStatics = GemStone.GemFire.Cache.Tests.QueryStatics; + using Apache.Geode.DUnitFramework; + using Apache.Geode.Client.Tests.NewAPI; + using Apache.Geode.Client.Generic; + using QueryCategory = Apache.Geode.Client.Tests.QueryCategory; + using QueryStrings = Apache.Geode.Client.Tests.QueryStrings; + using QueryStatics = Apache.Geode.Client.Tests.QueryStatics; using System.Threading; using System.Xml.Serialization; using System.IO; @@ -501,8 +501,8 @@ namespace GemStone.GemFire.Cache.FwkLib QueryStatics.StructSetQueries[index].IsLargeResultset == isLargeSetQuery) { int [] a = new int[] {4,6,7,9,12,14,15,16}; - if ((typeof(TVal).Equals(typeof(GemStone.GemFire.Cache.Tests.NewAPI.PortfolioPdx))|| - (typeof(TVal).Equals(typeof(GemStone.GemFire.Cache.Tests.NewAPI.PositionPdx)))) && ((IList<int>)a).Contains(index)) + if ((typeof(TVal).Equals(typeof(Apache.Geode.Client.Tests.NewAPI.PortfolioPdx))|| + (typeof(TVal).Equals(typeof(Apache.Geode.Client.Tests.NewAPI.PositionPdx)))) && ((IList<int>)a).Contains(index)) { FwkInfo("Skiping Query for pdx object [{0}]", QueryStatics.StructSetQueries[index].Query); } @@ -665,7 +665,7 @@ namespace GemStone.GemFire.Cache.FwkLib } rootAttrs = CreatePool(rootAttrs, redundancyLevel); region = CacheHelper<TKey, TVal>.CreateRegion(rootRegionName, rootAttrs); - GemStone.GemFire.Cache.Generic.RegionAttributes<TKey, TVal> regAttr = region.Attributes; + Apache.Geode.Client.Generic.RegionAttributes<TKey, TVal> regAttr = region.Attributes; FwkInfo("Region attributes for {0}: {1}", rootRegionName, CacheHelper<TKey, TVal>.RegionAttributesToString(regAttr)); if (isDC) @@ -1398,8 +1398,8 @@ namespace GemStone.GemFire.Cache.FwkLib FwkInfo("Getting inside for registeration"); Serializable.RegisterTypeGeneric(Position.CreateDeserializable); Serializable.RegisterTypeGeneric(Portfolio.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); } IRegion<TKey, TVal> parentRegion = null; @@ -1420,7 +1420,7 @@ namespace GemStone.GemFire.Cache.FwkLib else { string fullName = parentRegion.FullPath; - GemStone.GemFire.Cache.Generic.RegionAttributes<TKey, TVal> regattrs = parentRegion.Attributes; + Apache.Geode.Client.Generic.RegionAttributes<TKey, TVal> regattrs = parentRegion.Attributes; parentRegion.CreateSubRegion(sRegionName, regattrs); Util.BBSet(QueryBB, sRegionName, fullName); parentRegion.SubRegions(false); } @@ -1445,7 +1445,7 @@ namespace GemStone.GemFire.Cache.FwkLib { IRegion<TKey, TVal> parentRegion = GetRegion(); IRegion<TKey, TVal> subRegion; - GemStone.GemFire.Cache.Generic.RegionAttributes<TKey, TVal> regattrs = parentRegion.Attributes; + Apache.Geode.Client.Generic.RegionAttributes<TKey, TVal> regattrs = parentRegion.Attributes; subRegion = parentRegion.CreateSubRegion(regName,regattrs); ICollection<IRegion<TKey, TVal>> subRegions = parentRegion.SubRegions(true); FwkInfo("subregions are {0}",subRegions.Count); http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/tests/cli/NewFwkLib/ResumableTx/ResumableTx.cs ---------------------------------------------------------------------- diff --git a/src/tests/cli/NewFwkLib/ResumableTx/ResumableTx.cs b/src/tests/cli/NewFwkLib/ResumableTx/ResumableTx.cs index 7b205ba..d7ea251 100644 --- a/src/tests/cli/NewFwkLib/ResumableTx/ResumableTx.cs +++ b/src/tests/cli/NewFwkLib/ResumableTx/ResumableTx.cs @@ -21,11 +21,11 @@ using System.Collections.Generic; using System.Text; using System.Threading; -namespace GemStone.GemFire.Cache.FwkLib +namespace Apache.Geode.Client.FwkLib { - 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 EntryTxTask<TKey, TVal> : ClientTask { @@ -372,11 +372,11 @@ namespace GemStone.GemFire.Cache.FwkLib { anObj = aRegion[key]; } - catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException) + catch (Apache.Geode.Client.Generic.KeyNotFoundException) { if (!EqualityComparer<TVal>.Default.Equals(anObj, default(TVal))) { - throw new GemStone.GemFire.Cache.Generic.KeyNotFoundException(); + throw new Apache.Geode.Client.Generic.KeyNotFoundException(); } }
