geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jinmeil...@apache.org
Subject [33/50] [abbrv] incubator-geode git commit: GEODE-17: hide shiro.ini configuration in the logs
Date Fri, 29 Apr 2016 19:23:43 GMT
GEODE-17: hide shiro.ini configuration in the logs

* hide shiro.ini configuration in the logs
* fixed a merge problem


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9220f429
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9220f429
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9220f429

Branch: refs/heads/develop
Commit: 9220f4292cbd9a0999c2237597bc06ff30961a92
Parents: 7e9d249
Author: Jinmei Liao <jiliao@pivotal.io>
Authored: Mon Apr 25 08:19:22 2016 -0700
Committer: Jinmei Liao <jiliao@pivotal.io>
Committed: Mon Apr 25 08:32:28 2016 -0700

----------------------------------------------------------------------
 .../internal/AbstractDistributionConfig.java    | 13 ++++-----
 .../gemfire/internal/AbstractConfig.java        | 28 +++++++++++++++-----
 .../WanCommandPauseResumeDUnitTest.java         |  8 +++---
 3 files changed, 32 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9220f429/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
index e1881e3..d38e1a9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
@@ -536,14 +536,11 @@ public abstract class AbstractDistributionConfig
 
     Method setter = setters.get(attName);
     if (setter == null) {
-      // if we cann't find the defined setter, look for two more special cases
-      if (attName.startsWith(SECURITY_PREFIX_NAME)) {
-        this.setSecurity(attName,(String)attValue);
-        getAttSourceMap().put(attName, source);
-        return;
-      }
-      if (attName.startsWith(SSL_SYSTEM_PROPS_NAME) || attName.startsWith(SYS_PROP_NAME))
{
-        this.setSSLProperty(attName, (String) attValue);
+      // if we cann't find the defined setter, but the attributeName starts with these special
characters
+      // since we already set it in the respecitive properties above, we need to set the
source then return
+      if (attName.startsWith(SECURITY_PREFIX_NAME) ||
+        attName.startsWith(SSL_SYSTEM_PROPS_NAME) ||
+        attName.startsWith(SYS_PROP_NAME)) {
         getAttSourceMap().put(attName, source);
         return;
       }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9220f429/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
index 09fc61c..a4c2f2f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
@@ -17,18 +17,30 @@
 
 package com.gemstone.gemfire.internal;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.reflect.Array;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeSet;
+
 import com.gemstone.gemfire.InternalGemFireException;
 import com.gemstone.gemfire.UnmodifiableException;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.FlowControlParams;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
-import java.io.*;
-import java.lang.reflect.Array;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.*;
-
 /**
  * Provides an implementation of the {@link Config} interface
  * that implements functionality that all {@link Config} implementations
@@ -159,6 +171,10 @@ public abstract class AbstractConfig implements Config {
           pw.println("### GemFire Properties defined with " + source.getDescription() + "
###");
         }
       }
+      // hide the shiro-init configuration for now. Remove after we can allow customer to
specify shiro.ini file
+      if(attName.equals("shiro-init")){
+        continue;
+      }
       pw.print(attName);
       pw.print('=');
       if (source == null // always show defaults

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9220f429/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
index 17986e0..a4e843c 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
@@ -23,9 +23,6 @@ import static com.gemstone.gemfire.test.dunit.Wait.*;
 import java.util.List;
 import java.util.Properties;
 
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
 import com.gemstone.gemfire.distributed.DistributedMember;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.management.cli.Result;
@@ -34,6 +31,9 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 @Category(DistributedTest.class)
 public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
 
@@ -144,6 +144,8 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase
{
             2, false, 100, 400, false, false, null, true ));
 
     vm3.invoke(() -> startSender( "ln" ));
+    vm4.invoke(() -> startSender( "ln" ));
+    vm5.invoke(() -> startSender( "ln" ));
 
     vm3.invoke(() -> verifySenderState(
             "ln", true, false ));


Mime
View raw message