geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aba...@apache.org
Subject [46/50] [abbrv] geode-native git commit: GEODE-2422: Switch remaining GemFire strings to Geode.
Date Thu, 09 Feb 2017 18:09:43 GMT
http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/RemoteQuery.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/RemoteQuery.cs b/src/quickstart/csharp/RemoteQuery.cs
index 7ae7887..b33aae8 100644
--- a/src/quickstart/csharp/RemoteQuery.cs
+++ b/src/quickstart/csharp/RemoteQuery.cs
@@ -20,7 +20,7 @@
  *
  * This example takes the following steps:
  *
- * 1. Create a GemFire Cache Programmatically.
+ * 1. Create a Geode Cache Programmatically.
  * 2. Create the example Region Programmatically.
  * 3. Populate some query objects on the Region.
  * 4. Execute a query that returns a Result Set.
@@ -33,7 +33,7 @@
 // Use standard namespaces
 using System;
 
-// Use the GemFire namespace
+// Use the Geode namespace
 using Apache.Geode.Client;
 
 // Use the "Tests" namespace for the query objects.
@@ -48,11 +48,11 @@ namespace Apache.Geode.Client.QuickStart
     {
       try
       {
-        // Create a GemFire Cache Programmatically.
+        // Create a Geode Cache Programmatically.
         CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
         Cache cache = cacheFactory.SetSubscriptionEnabled(true).Create();
 
-        Console.WriteLine("Created the GemFire Cache");
+        Console.WriteLine("Created the Geode Cache");
 
         RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.CACHING_PROXY);
 
@@ -143,16 +143,16 @@ namespace Apache.Geode.Client.QuickStart
           Console.WriteLine("Row {0} Column 2 is named {1}, value is {2}", rowCount, st.Set.GetFieldName(0),
st[1].ToString());
         }
         
-        // Close the GemFire Cache.
+        // Close the Geode Cache.
         cache.Close();
 
-        Console.WriteLine("Closed the GemFire Cache");
+        Console.WriteLine("Closed the Geode Cache");
         
       }
       // An exception should not occur
-      catch (GemFireException gfex)
+      catch (GeodeException gfex)
       {
-        Console.WriteLine("RemoteQuery GemFire Exception: {0}", gfex.Message);
+        Console.WriteLine("RemoteQuery Geode Exception: {0}", gfex.Message);
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/Security.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/Security.cs b/src/quickstart/csharp/Security.cs
index b67441d..882f20a 100644
--- a/src/quickstart/csharp/Security.cs
+++ b/src/quickstart/csharp/Security.cs
@@ -21,7 +21,7 @@
  * This example takes the following steps:
  *
  * 1. Sets the authinit property and the other security properties.
- * 2. Connect to a GemFire Distributed System.
+ * 2. Connect to a Geode Distributed System.
  * 3. Does all operations. ( for which it has all permissions)
  * 4. Does a put and get. ( for which it have put permission. )
  * 5. Does a get and put. ( for which it have get permission. )
@@ -33,7 +33,7 @@
 // Use standard namespaces
 using System;
 
-// Use the GemFire namespace
+// Use the Geode namespace
 using Apache.Geode.Client;
 
 namespace Apache.Geode.Client.QuickStart
@@ -55,7 +55,7 @@ namespace Apache.Geode.Client.QuickStart
 
       Cache cache = cacheFactory.Create();
 
-      Console.WriteLine("Created the GemFire Cache");
+      Console.WriteLine("Created the Geode Cache");
 
       // Get the example Region from the Cache which is declared in the Cache XML file.
       IRegion<string, string> region = cache.GetRegion<string, string>("exampleRegion");
@@ -98,7 +98,7 @@ namespace Apache.Geode.Client.QuickStart
 
       Cache cache = cacheFactory.Create();
 
-      Console.WriteLine("Created the GemFire Cache");
+      Console.WriteLine("Created the Geode Cache");
 
       // Get the example Region from the Cache which is declared in the Cache XML file.
       IRegion<string, string> region = cache.GetRegion<string, string>("exampleRegion");
@@ -141,7 +141,7 @@ namespace Apache.Geode.Client.QuickStart
 
       Cache cache = cacheFactory.Create();
 
-      Console.WriteLine("Created the GemFire Cache");
+      Console.WriteLine("Created the Geode Cache");
 
       // Get the example Region from the Cache which is declared in the Cache XML file.
       IRegion<string, string> region = cache.GetRegion<string, string>("exampleRegion");
@@ -176,9 +176,9 @@ namespace Apache.Geode.Client.QuickStart
         ex.RunSecurityExampleWithGetPermission();
       }
       // An exception should not occur
-      catch (GemFireException gfex)
+      catch (GeodeException gfex)
       {
-        Console.WriteLine("SecurityExample GemFire Exception: {0}", gfex.Message);
+        Console.WriteLine("SecurityExample Geode Exception: {0}", gfex.Message);
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/Transactions.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/Transactions.cs b/src/quickstart/csharp/Transactions.cs
index 38d86ef..dc532a8 100644
--- a/src/quickstart/csharp/Transactions.cs
+++ b/src/quickstart/csharp/Transactions.cs
@@ -20,7 +20,7 @@
  *
  * This example takes the following steps:
  *
- * 1.  Create a GemFire Cache.
+ * 1.  Create a Geode Cache.
  * 2.  Create the example Region Programmatically.
  * 3   Begin Transaction
  * 4.  Put Entries (Key and Value pairs) into the Region.
@@ -38,7 +38,7 @@
 // Use standard namespaces
 using System;
 
-// Use the GemFire namespace
+// Use the Geode namespace
 using Apache.Geode.Client;
 
 // Use the .NET generics namespace
@@ -54,12 +54,12 @@ namespace Apache.Geode.Client.QuickStart
     {
       try
       {
-        // Create a GemFire Cache
+        // Create a Geode Cache
         CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
         
         Cache cache = cacheFactory.Create();
         
-        Console.WriteLine("Created the GemFire cache.");
+        Console.WriteLine("Created the Geode cache.");
 
         RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.CACHING_PROXY);
 
@@ -122,12 +122,12 @@ namespace Apache.Geode.Client.QuickStart
         
         cache.Close();
 
-        Console.WriteLine("Closed the GemFire Cache");
+        Console.WriteLine("Closed the Geode Cache");
       }
       // An exception should not occur
-      catch (GemFireException gfex)
+      catch (GeodeException gfex)
       {
-        Console.WriteLine("Transactions GemFire Exception: {0}", gfex.Message);
+        Console.WriteLine("Transactions Geode Exception: {0}", gfex.Message);
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/TransactionsXA.cs
----------------------------------------------------------------------
diff --git a/src/quickstart/csharp/TransactionsXA.cs b/src/quickstart/csharp/TransactionsXA.cs
index 3f2f6f3..39da327 100644
--- a/src/quickstart/csharp/TransactionsXA.cs
+++ b/src/quickstart/csharp/TransactionsXA.cs
@@ -20,7 +20,7 @@
  *
  * This example takes the following steps:
  *
- * 1.  Create a GemFire Cache.
+ * 1.  Create a Geode Cache.
  * 2.  Create the example Region Programmatically.
  * 3   Begin Transaction
  * 4.  Put Entries (Key and Value pairs) into the Region.
@@ -38,7 +38,7 @@
 // Use standard namespaces
 using System;
 
-// Use the GemFire namespace
+// Use the Geode namespace
 using Apache.Geode.Client;
 
 // Use the .NET generics namespace
@@ -54,12 +54,12 @@ namespace Apache.Geode.Client.QuickStart
     {
       try
       {
-        // Create a GemFire Cache
+        // Create a Geode Cache
         CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
         
         Cache cache = cacheFactory.Create();
         
-        Console.WriteLine("Created the GemFire cache.");
+        Console.WriteLine("Created the Geode cache.");
 
         RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.CACHING_PROXY);
 
@@ -131,12 +131,12 @@ namespace Apache.Geode.Client.QuickStart
         
         cache.Close();
 
-        Console.WriteLine("Closed the GemFire Cache");
+        Console.WriteLine("Closed the Geode Cache");
       }
       // An exception should not occur
-      catch (GemFireException gfex)
+      catch (GeodeException gfex)
       {
-        Console.WriteLine("Transactions GemFire Exception: {0}", gfex.Message);
+        Console.WriteLine("Transactions Geode Exception: {0}", gfex.Message);
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/sqliteimpl/SqLiteImpl.cpp
----------------------------------------------------------------------
diff --git a/src/sqliteimpl/SqLiteImpl.cpp b/src/sqliteimpl/SqLiteImpl.cpp
index a730077..ce64793 100644
--- a/src/sqliteimpl/SqLiteImpl.cpp
+++ b/src/sqliteimpl/SqLiteImpl.cpp
@@ -18,7 +18,7 @@
 #include "SqLiteImpl.hpp"
 
 namespace {
-std::string g_default_persistence_directory = "GemFireRegionData";
+std::string g_default_persistence_directory = "GeodeRegionData";
 }  // namespace
 
 using namespace apache::geode::client;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/templates/security/csharp/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/src/templates/security/csharp/AssemblyInfo.cs b/src/templates/security/csharp/AssemblyInfo.cs
index af6c405..71bff22 100644
--- a/src/templates/security/csharp/AssemblyInfo.cs
+++ b/src/templates/security/csharp/AssemblyInfo.cs
@@ -22,11 +22,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("GemFire.NETCacheTemplates")]
-[assembly: AssemblyDescription("Templates for GemFire Native Client .NET Cache")]
+[assembly: AssemblyTitle("Geode.NETCacheTemplates")]
+[assembly: AssemblyDescription("Templates for Geode Native Client .NET Cache")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Pivotal Software, Inc.")]
-[assembly: AssemblyProduct("GemFire.NETCacheTemplates")]
+[assembly: AssemblyProduct("Geode.NETCacheTemplates")]
 [assembly: AssemblyCopyright("Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements.  See the NOTICE file distributed with this work for
additional information regarding copyright ownership.")]
 [assembly: AssemblyTrademark("All Rights Reserved")]
 [assembly: AssemblyCulture("")]

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/tests/cli/NewFwkLib/CacheServer.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/CacheServer.cs b/src/tests/cli/NewFwkLib/CacheServer.cs
index 8ad9440..cd6d1d9 100644
--- a/src/tests/cli/NewFwkLib/CacheServer.cs
+++ b/src/tests/cli/NewFwkLib/CacheServer.cs
@@ -228,7 +228,7 @@ namespace Apache.Geode.Client.FwkLib
                                     (errStr.IndexOf("Deserializ") >= 0))
                                 {
                                     throw new Exception("Test got " + errStr + ", but this
error text " +
-                                          "might contain GemFire internal values\n" + ex.Message);
+                                          "might contain Geode internal values\n" + ex.Message);
                                 }
                             }
                            
@@ -4370,7 +4370,7 @@ private void checkUpdatedValue(TKey key, TVal value)
           userProp.Insert(KeyStoreFileProp, GetKeyStoreDir(dataDir) +
             userName + ".keystore");
           userProp.Insert(KeyStoreAliasProp, userName);
-          userProp.Insert(KeyStorePasswordProp, "gemfire");
+          userProp.Insert(KeyStorePasswordProp, "geode");
           //mu_cache = pool.CreateSecureUserCache(userProp);
           //IRegionService mu_cache = CacheHelper.DCache.CreateAuthenticatedView(userProp,
pool.Name);
           IRegionService mu_cache = CacheHelper<TKey, TVal>.DCache.CreateAuthenticatedView(

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/tests/cli/NewFwkLib/Utils.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/NewFwkLib/Utils.cs b/src/tests/cli/NewFwkLib/Utils.cs
index 28e1acc..1913a98 100644
--- a/src/tests/cli/NewFwkLib/Utils.cs
+++ b/src/tests/cli/NewFwkLib/Utils.cs
@@ -238,7 +238,7 @@ namespace Apache.Geode.Client.FwkLib
       int status = GFNoError;
       Process javaProc;
       string javaExePath = gfeDir + PathSep + "bin" + PathSep + exeName;
-      Util.ServerLog("Executing local GemFire command {0} {1}", javaExePath,
+      Util.ServerLog("Executing local Geode command {0} {1}", javaExePath,
         exeArgs);
       if (!Util.StartProcess(javaExePath, exeArgs, false, TempDir,
         true, false, false, out javaProc))
@@ -309,9 +309,9 @@ namespace Apache.Geode.Client.FwkLib
     private string GetSslProperty(string hostType, bool forServer,string startDir)
     {
       string sslCmdStr = null;
-      //if (!File.Exists(startDir + PathSep + "gemfire.properties"))
+      //if (!File.Exists(startDir + PathSep + "geode.properties"))
       //{
-        TextWriter sw = new StreamWriter(startDir + PathSep + "gemfire.properties", false);
+        TextWriter sw = new StreamWriter(startDir + PathSep + "geode.properties", false);
         String locatorAddress = GetJavaLocator();
         sw.WriteLine("locators={0}", locatorAddress);
         ResetKey("sslEnable");
@@ -324,7 +324,7 @@ namespace Apache.Geode.Client.FwkLib
         FwkInfo("ssl is enable");
         if (!forServer)
         {
-          //StreamWriter sw = new StreamWriter("gemfire.properties",false);
+          //StreamWriter sw = new StreamWriter("geode.properties",false);
           sw.WriteLine("ssl-enabled=true");
           sw.WriteLine("ssl-require-authentication=true");
           sw.WriteLine("mcast-port=0");
@@ -595,12 +595,12 @@ namespace Apache.Geode.Client.FwkLib
             if (locatorType != Util.SystemType)
             {
               FwkInfo(StartRemoteGFExe(locatorHost, locatorType,
-                "gemfire", locatorArgs));
+                "geode", locatorArgs));
             }
             else
             {
               string outStr;
-              int status = StartLocalGFExe("gemfire.bat", gfeDir,
+              int status = StartLocalGFExe("geode.bat", gfeDir,
                 locatorArgs, out outStr);
               if (status == GFTimeout)
               {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/tests/cli/SecurityUtil/CredentialGeneratorN.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/SecurityUtil/CredentialGeneratorN.cs b/src/tests/cli/SecurityUtil/CredentialGeneratorN.cs
index a217c76..0471ea2 100644
--- a/src/tests/cli/SecurityUtil/CredentialGeneratorN.cs
+++ b/src/tests/cli/SecurityUtil/CredentialGeneratorN.cs
@@ -68,7 +68,7 @@ namespace Apache.Geode.Client.Tests
     }
 
     /// <summary>
-    /// A set of properties that should be added to the Gemfire system properties
+    /// A set of properties that should be added to the Geode system properties
     /// before using the authentication module.
     /// </summary>
     private Properties<string, string> m_sysProps = null;
@@ -135,7 +135,7 @@ namespace Apache.Geode.Client.Tests
     }
 
     /// <summary>
-    /// A set of extra properties that should be added to Gemfire system
+    /// A set of extra properties that should be added to Geode system
     /// properties when not null.
     /// </summary>
     public Properties<string, string> SystemProperties
@@ -147,7 +147,7 @@ namespace Apache.Geode.Client.Tests
     }
 
     /// <summary>
-    /// A set of extra properties that should be added to Gemfire system
+    /// A set of extra properties that should be added to Geode system
     /// properties when not null.
     /// </summary>
     public Properties<string, string> JavaProperties
@@ -247,7 +247,7 @@ namespace Apache.Geode.Client.Tests
     /// abstract class.
     /// </remarks>
     /// <returns>
-    /// A set of extra properties that should be added to Gemfire system
+    /// A set of extra properties that should be added to Geode system
     /// properties when not null.
     /// </returns>
     /// <exception cref="IllegalArgumentException">

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/tests/cli/SecurityUtil/LdapCredentialGeneratorN.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/SecurityUtil/LdapCredentialGeneratorN.cs b/src/tests/cli/SecurityUtil/LdapCredentialGeneratorN.cs
index f6f8c5c..58a4411 100644
--- a/src/tests/cli/SecurityUtil/LdapCredentialGeneratorN.cs
+++ b/src/tests/cli/SecurityUtil/LdapCredentialGeneratorN.cs
@@ -24,7 +24,7 @@ namespace Apache.Geode.Client.Tests
 
   public class LDAPCredentialGenerator : CredentialGenerator
   {
-    private const string UserPrefix = "gemfire";
+    private const string UserPrefix = "geode";
 
     public LDAPCredentialGenerator()
     {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/tests/cli/SecurityUtil/PKCSCredentialGeneratorN.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/SecurityUtil/PKCSCredentialGeneratorN.cs b/src/tests/cli/SecurityUtil/PKCSCredentialGeneratorN.cs
index 0d9cd7b..e42b4aa 100644
--- a/src/tests/cli/SecurityUtil/PKCSCredentialGeneratorN.cs
+++ b/src/tests/cli/SecurityUtil/PKCSCredentialGeneratorN.cs
@@ -27,7 +27,7 @@ namespace Apache.Geode.Client.Tests
     public const string KeyStoreFileProp = "security-keystorepath";
     public const string KeyStoreAliasProp = "security-alias";
     public const string KeyStorePasswordProp = "security-keystorepass";
-    private const string UserPrefix = "gemfire";
+    private const string UserPrefix = "geode";
     private bool IsMultiUserMode = false;
     Apache.Geode.Client.Tests.PkcsAuthInit Pkcs = null;
 
@@ -55,7 +55,7 @@ namespace Apache.Geode.Client.Tests
       Properties<string, string> props = new Properties<string, string>();
       props.Insert(PublicKeyFileProp, GetKeyStoreDir(m_serverDataDir) +
         "publickeyfile");
-      props.Insert(PublicKeyPassProp, "gemfire");
+      props.Insert(PublicKeyPassProp, "geode");
       return props;
     }
 
@@ -85,9 +85,9 @@ namespace Apache.Geode.Client.Tests
       Properties<string, string> props = new Properties<string, string>();
       int aliasnum = (index % 10) + 1;
       props.Insert(KeyStoreFileProp, GetKeyStoreDir(m_clientDataDir) +
-        "gemfire11.keystore");
-      props.Insert(KeyStoreAliasProp, "gemfire11");
-      props.Insert(KeyStorePasswordProp, "gemfire");
+        "geode11.keystore");
+      props.Insert(KeyStoreAliasProp, "geode11");
+      props.Insert(KeyStorePasswordProp, "geode");
       if (!IsMultiUserMode){
         return props;
       }
@@ -111,7 +111,7 @@ namespace Apache.Geode.Client.Tests
       props.Insert(KeyStoreFileProp, GetKeyStoreDir(m_clientDataDir) +
         UserPrefix + aliasnum + ".keystore");
       props.Insert(KeyStoreAliasProp, UserPrefix + aliasnum);
-      props.Insert(KeyStorePasswordProp, "gemfire");
+      props.Insert(KeyStorePasswordProp, "geode");
       if (!IsMultiUserMode){
         return props;
       }
@@ -135,7 +135,7 @@ namespace Apache.Geode.Client.Tests
       props.Insert(KeyStoreFileProp, GetKeyStoreDir(m_clientDataDir) +
         userName + ".keystore");
       props.Insert(KeyStoreAliasProp, userName);
-      props.Insert(KeyStorePasswordProp, "gemfire");
+      props.Insert(KeyStorePasswordProp, "geode");
       if (!IsMultiUserMode)
       {
         return props;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/tests/cli/SecurityUtil/XmlAuthzCredentialGeneratorN.cs
----------------------------------------------------------------------
diff --git a/src/tests/cli/SecurityUtil/XmlAuthzCredentialGeneratorN.cs b/src/tests/cli/SecurityUtil/XmlAuthzCredentialGeneratorN.cs
index 50f732e..e10160a 100644
--- a/src/tests/cli/SecurityUtil/XmlAuthzCredentialGeneratorN.cs
+++ b/src/tests/cli/SecurityUtil/XmlAuthzCredentialGeneratorN.cs
@@ -222,7 +222,7 @@ namespace Apache.Geode.Client.Tests
 
     private string GetLdapUser(Role roleType, int index)
     {
-      const string userPrefix = "gemfire";
+      const string userPrefix = "geode";
       int[] readerIndices = { 3, 4, 5 };
       int[] writerIndices = { 6, 7, 8 };
       int[] queryIndices = { 9, 10 };

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/tests/cpp/security/CredentialGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/CredentialGenerator.hpp b/src/tests/cpp/security/CredentialGenerator.hpp
index f6158aa..506f945 100644
--- a/src/tests/cpp/security/CredentialGenerator.hpp
+++ b/src/tests/cpp/security/CredentialGenerator.hpp
@@ -211,7 +211,7 @@ class CredentialGenerator : public SharedBase {
           std::string(" --J=-Dgemfire.security-publickey-filepath=") +
           this->getPublickeyfile();
       securityCmdStr +=
-          std::string(" --J=-Dgemfire.security-publickey-pass=gemfire");
+          std::string(" --J=-Dgemfire.security-publickey-pass=geode");
     }
     if ((securityParams.find("dummy") != std::string::npos) &&
         (!this->getClientDummyAuthorizer().empty())) {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/tests/cpp/security/LdapUserCredentialGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/LdapUserCredentialGenerator.hpp b/src/tests/cpp/security/LdapUserCredentialGenerator.hpp
index cb1520c..632ce12 100644
--- a/src/tests/cpp/security/LdapUserCredentialGenerator.hpp
+++ b/src/tests/cpp/security/LdapUserCredentialGenerator.hpp
@@ -83,16 +83,16 @@ class LdapUserCredentialGenerator : public CredentialGenerator {
     return "javaobject.DummyAuthorization.create";
   }
   void getValidCredentials(PropertiesPtr& p) {
-    p->insert("security-username", "gemfire1");
-    p->insert("security-password", "gemfire1");
+    p->insert("security-username", "geode1");
+    p->insert("security-password", "geode1");
     FWKDEBUG("inserted valid security-username "
              << p->find("security-username")->asChar() << " password "
              << p->find("security-password")->asChar());
   }
 
   void getInvalidCredentials(PropertiesPtr& p) {
-    p->insert("security-username", "gemfire1");
-    p->insert("security-password", "1gemfire");
+    p->insert("security-username", "geode1");
+    p->insert("security-password", "1geode");
     FWKDEBUG("inserted invalid security-username "
              << p->find("security-username")->asChar() << " password "
              << p->find("security-password")->asChar());

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/tests/cpp/security/PkcsCredentialGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/PkcsCredentialGenerator.hpp b/src/tests/cpp/security/PkcsCredentialGenerator.hpp
index 8c52c6f..2bc509c 100644
--- a/src/tests/cpp/security/PkcsCredentialGenerator.hpp
+++ b/src/tests/cpp/security/PkcsCredentialGenerator.hpp
@@ -99,8 +99,8 @@ class PKCSCredentialGenerator : public CredentialGenerator {
   void setPKCSProperties(PropertiesPtr& p, char* username) {
     char keyStorePassWord[1024];
 
-    sprintf(keyStorePassWord, "%s", "gemfire");
-    p->insert(SECURITY_USERNAME, "gemfire");
+    sprintf(keyStorePassWord, "%s", "geode");
+    p->insert(SECURITY_USERNAME, "geode");
     p->insert(KEYSTORE_ALIAS, username);
     p->insert(KEYSTORE_PASSWORD, keyStorePassWord);
     insertKeyStorePath(p, username);
@@ -108,7 +108,7 @@ class PKCSCredentialGenerator : public CredentialGenerator {
 
   void getValidCredentials(PropertiesPtr& p) {
     char username[20] = {'\0'};
-    sprintf(username, "gemfire%d", (rand() % 10) + 1);
+    sprintf(username, "geode%d", (rand() % 10) + 1);
     setPKCSProperties(p, username);
     FWKINFO("inserted valid security-username "
             << p->find("security-username")->asChar());
@@ -116,7 +116,7 @@ class PKCSCredentialGenerator : public CredentialGenerator {
 
   void getInvalidCredentials(PropertiesPtr& p) {
     char username[20] = {'\0'};
-    sprintf(username, "%dgemfire", (rand() % 11) + 1);
+    sprintf(username, "%dgeode", (rand() % 11) + 1);
     setPKCSProperties(p, username);
     FWKINFO("inserted invalid security-username "
             << p->find("security-username")->asChar());

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp b/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp
index ff0020f..51c5e07 100644
--- a/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp
+++ b/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp
@@ -195,7 +195,7 @@ class XmlAuthzCredentialGenerator : public SharedBase {
   }
 
   std::string getAllowedUser(ROLES role) {
-    const std::string userPrefix = "gemfire";
+    const std::string userPrefix = "geode";
     const int readerIndices[] = {3, 4, 5};
     const int writerIndices[] = {6, 7, 8};
     const int queryIndices[] = {9, 10};
@@ -250,7 +250,7 @@ class XmlAuthzCredentialGenerator : public SharedBase {
   void getAllowedPkcsAuthz(ROLES role) {
     const std::string userName = getAllowedUser(role);
     (*m_prop)->insert("security-alias", userName.c_str());
-    (*m_prop)->insert("security-keystorepass", "gemfire");
+    (*m_prop)->insert("security-keystorepass", "geode");
 
     FWKINFO("inserted  PKCS security-alias"
             << (*m_prop)->find("security-alias")->asChar() << " password
"


Mime
View raw message