geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [48/90] [abbrv] incubator-geode git commit: GEODE-1377: Initial move of system properties from private to public
Date Wed, 08 Jun 2016 00:05:25 GMT
GEODE-1377: Initial move of system properties from private to public


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

Branch: refs/heads/feature/GEODE-835
Commit: 0a0598587f5d9386b1a8a8f6fba9f7f2e3f5d4d9
Parents: 03f5e0c
Author: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Authored: Tue May 31 13:38:05 2016 +1000
Committer: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Committed: Thu Jun 2 10:01:42 2016 +1000

----------------------------------------------------------------------
 .../LocatorLauncherLocalIntegrationTest.java           |  6 +++---
 .../ServerLauncherLocalIntegrationTest.java            |  3 +--
 .../gemfire/disttx/CacheMapDistTXDUnitTest.java        |  1 -
 .../com/gemstone/gemfire/disttx/DistTXJUnitTest.java   |  6 ++----
 .../gemstone/gemfire/disttx/DistTXOrderDUnitTest.java  |  1 -
 .../gemfire/disttx/DistTXRestrictionsDUnitTest.java    |  2 --
 .../gemfire/disttx/DistTXWithDeltaDUnitTest.java       |  1 -
 .../disttx/DistributedTransactionDUnitTest.java        |  2 --
 .../com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java |  1 -
 .../com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java |  1 -
 .../gemfire/disttx/PRDistTXWithVersionsDUnitTest.java  |  1 -
 ...PersistentPartitionedRegionWithDistTXDUnitTest.java |  1 -
 .../gemfire/internal/cache/DiskRegionTestingBase.java  |  3 ---
 .../internal/cache/partitioned/Bug43684DUnitTest.java  |  4 ----
 .../internal/cache/partitioned/Bug51400DUnitTest.java  | 13 -------------
 .../tier/sockets/DurableClientQueueSizeDUnitTest.java  | 11 -----------
 .../management/bean/stats/MBeanStatsTestCase.java      |  1 -
 .../gemfire/test/dunit/standalone/DUnitLauncher.java   |  4 ++--
 .../gemfire/test/dunit/standalone/ProcessManager.java  |  4 +++-
 19 files changed, 11 insertions(+), 55 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
index 8500399..ff8ca6f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
@@ -257,7 +257,8 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
   @Test
   @Ignore("Need to rewrite this without using dunit.Host")
   public void testStartUsingForceOverwritesExistingPidFile() throws Throwable {
-  }/*
+  }
+  /*
     assertTrue(getUniqueName() + " is broken if PID == Integer.MAX_VALUE", ProcessUtils.identifyPid()
!= Integer.MAX_VALUE);
     
     // create existing pid file
@@ -272,7 +273,6 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
         .setMemberName(getUniqueName())
         .setPort(this.locatorPort)
         .setRedirectOutput(true)
-        .set(LOG_LEVEL, "config");
 
     assertTrue(builder.getForce());
     this.launcher = builder.build();
@@ -422,7 +422,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
         .setMemberName(getUniqueName())
         .setPort(this.locatorPort)
         .setRedirectOutput(true)
-        .set(LOG_LEVEL, "config");
+        .set(logLevel, "config");
 
     assertFalse(builder.getForce());
     this.launcher = builder.build();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
index e15da94..a30c85f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
@@ -416,7 +416,6 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
         .setForce(true)
         .setMemberName(getUniqueName())
         .setRedirectOutput(true)
-        .set(LOG_LEVEL, "config")
         .set(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "0");
 
     assertTrue(builder.getForce());
@@ -697,7 +696,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
         .setDisableDefaultServer(true)
         .setMemberName(getUniqueName())
         .setRedirectOutput(true)
-        .set(LOG_LEVEL, "config")
+        .set(logLevel, "config")
         .set(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "0");
 
     assertFalse(builder.getForce());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
index 217ebf8..32748b3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
@@ -61,7 +61,6 @@ public class CacheMapDistTXDUnitTest extends CacheMapTxnDUnitTest {
 
   public static void setDistributedTX() {
     props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
-//    props.setProperty(LOG_LEVEL, "fine");
   }
 
   public static void checkIsDistributedTX() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
index 7f1a37a..0f91d55 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
@@ -20,7 +20,6 @@ import com.gemstone.gemfire.TXJUnitTest;
 import com.gemstone.gemfire.cache.CacheException;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.test.junit.categories.DistributedTransactionsTest;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -32,7 +31,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 /**
  * Run the basic transaction functionality tests in TXJUnitTest after setting
@@ -49,8 +48,7 @@ public class DistTXJUnitTest extends TXJUnitTest {
   protected void createCache() throws Exception {
     Properties p = new Properties();
     p.setProperty(MCAST_PORT, "0"); // loner
-    p.setProperty(SystemConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
-    //    p.setProperty(LOG_LEVEL, "fine");
+    p.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
     this.cache = (GemFireCacheImpl)CacheFactory.create(DistributedSystem.connect(p));
     createRegion();
     this.txMgr = this.cache.getCacheTransactionManager();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
index a6a8a0f..2dfa96b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
@@ -37,7 +37,6 @@ public class DistTXOrderDUnitTest extends TXOrderDUnitTest {
   public Properties getDistributedSystemProperties() {
     Properties props = super.getDistributedSystemProperties();
     props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
-//    props.setProperty(LOG_LEVEL, "fine");
     return props;
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
index 78a648a..1350ecb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
@@ -33,9 +33,7 @@ public class DistTXRestrictionsDUnitTest extends TXRestrictionsDUnitTest
{
   @Override
   public Properties getDistributedSystemProperties() {
     Properties props = super.getDistributedSystemProperties();
-//    props.put("distributed-transactions", "true");
     props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
-//    props.setProperty(LOG_LEVEL, "fine");
     return props;
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
index b22d37e..53e8344 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
@@ -30,7 +30,6 @@ public class DistTXWithDeltaDUnitTest extends TransactionsWithDeltaDUnitTest
{
   public Properties getDistributedSystemProperties() {
     Properties props = super.getDistributedSystemProperties();
     props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
-    // props.setProperty(LOG_LEVEL, "fine");
     return props;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
index 8aecf6b..3538e41 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
@@ -150,8 +150,6 @@ public class DistributedTransactionDUnitTest extends CacheTestCase {
   @Override
   public Properties getDistributedSystemProperties() {
     Properties props = super.getDistributedSystemProperties();
-    //props.put("distributed-transactions", "true");
-//    props.setProperty(LOG_LEVEL, "fine");
     return props;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
index 66535bb..2ecd31a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
@@ -30,7 +30,6 @@ public class PRDistTXDUnitTest extends PRTransactionDUnitTest {
   public Properties getDistributedSystemProperties() {
     Properties props = super.getDistributedSystemProperties();
     props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
-//    props.setProperty(LOG_LEVEL, "fine");
     return props;
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
index e50755e..8e98f04 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
@@ -48,7 +48,6 @@ public class PRDistTXJUnitTest extends PRTXJUnitTest {
     Properties p = new Properties();
     p.setProperty(MCAST_PORT, "0"); // loner
     p.setProperty(SystemConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
-    // p.setProperty(LOG_LEVEL, "fine");
     this.cache = (GemFireCacheImpl) CacheFactory.create(DistributedSystem
         .connect(p));
     createRegion();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
index 934aef2..4306444 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
@@ -33,7 +33,6 @@ public class PRDistTXWithVersionsDUnitTest extends
   public Properties getDistributedSystemProperties() {
     Properties props = super.getDistributedSystemProperties();
     props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
-//    props.setProperty(LOG_LEVEL, "fine");
     return props;
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
index c514b60..a2d88c2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
@@ -33,7 +33,6 @@ public class PersistentPartitionedRegionWithDistTXDUnitTest extends
   public Properties getDistributedSystemProperties() {
     Properties props = super.getDistributedSystemProperties();
     props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
-//    props.setProperty(LOG_LEVEL, "fine");
     return props;
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
index 83a29ae..e6ac042 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
@@ -174,9 +174,6 @@ public class DiskRegionTestingBase
   }
 
   protected Cache createCache() {
-    // useful for debugging:
-//    props.put(LOG_FILE, "diskRegionTestingBase_system.log");
-//    props.put(LOG_LEVEL, getGemFireLogLevel());
     cache = new CacheFactory(props).create();
     ds = cache.getDistributedSystem();
     logWriter = cache.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
index b8eeccd..6fbcdff 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
@@ -232,8 +232,6 @@ public class Bug43684DUnitTest extends DistributedTestCase {
     DistributedTestCase.disconnectFromDS();
     Properties props = new Properties();
     props.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort()
+ "]");
-//    props.setProperty("log-file", "server_" + OSProcess.getId() + ".log");
-    //    props.setProperty(LOG_LEVEL, "fine");
     props.setProperty(STATISTIC_ARCHIVE_FILE, "server_" + OSProcess.getId()
         + ".gfs");
     props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
@@ -260,8 +258,6 @@ public class Bug43684DUnitTest extends DistributedTestCase {
   public static void createClientCache(Host host, Integer port) {
     DistributedTestCase.disconnectFromDS();
     Properties props = new Properties();
-//    props.setProperty("log-file", "client_" + OSProcess.getId() + ".log");
-    //    props.setProperty(LOG_LEVEL, "fine");
     props.setProperty(STATISTIC_ARCHIVE_FILE, "client_" + OSProcess.getId()
         + ".gfs");
     props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java
index bd8a71d..9ee0319 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java
@@ -91,11 +91,6 @@ public class Bug51400DUnitTest extends DistributedTestCase {
       Integer maxMessageCount) throws Exception {
     Properties props = new Properties();
     props.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort()
+ "]");
-//    props.setProperty("log-file", "server_" + OSProcess.getId() + ".log");
-    //    props.setProperty(LOG_LEVEL, "fine");
-//    props.setProperty("statistic-archive-file", "server_" + OSProcess.getId()
-//        + ".gfs");
-//    props.setProperty("statistic-sampling-enabled", "true");
 
     Bug51400DUnitTest test = new Bug51400DUnitTest("Bug51400DUnitTest");
     DistributedSystem ds = test.getSystem(props);
@@ -120,14 +115,6 @@ public class Bug51400DUnitTest extends DistributedTestCase {
   public static void createClientCache(String hostName, Integer[] ports,
       Integer interval) throws Exception {
     Properties props = new Properties();
-//    props.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME,
-//        "my-durable-client-" + ports.length);
-//    props.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, "300000");
-//    props.setProperty("log-file", "client_" + OSProcess.getId() + ".log");
-    //    props.setProperty(LOG_LEVEL, "fine");
-//    props.setProperty("statistic-archive-file", "client_" + OSProcess.getId()
-//        + ".gfs");
-//    props.setProperty("statistic-sampling-enabled", "true");
 
     DistributedSystem ds = new Bug51400DUnitTest("Bug51400DUnitTest").getSystem(props);
     ds.disconnect();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
index 3705336..4e16cad 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
@@ -253,12 +253,6 @@ public class DurableClientQueueSizeDUnitTest extends DistributedTestCase
{
       throws Exception {
     Properties props = new Properties();
     props.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort()
+ "]");
-    //    props.setProperty(LOG_LEVEL, "fine");
-//    props.setProperty("log-file", "server_" + OSProcess.getId() + ".log");
-//    props.setProperty("statistic-archive-file", "server_" + OSProcess.getId()
-//        + ".gfs");
-//    props.setProperty("statistic-sampling-enabled", "true");
-
     DurableClientQueueSizeDUnitTest test = new DurableClientQueueSizeDUnitTest(
         "DurableClientQueueSizeDUnitTest");
     DistributedSystem ds = test.getSystem(props);
@@ -310,11 +304,6 @@ public class DurableClientQueueSizeDUnitTest extends DistributedTestCase
{
       props.setProperty(DURABLE_CLIENT_TIMEOUT,
           timeoutSeconds);
     }
-    //    props.setProperty("log-file", "client_" + OSProcess.getId() + ".log");
-    //    props.setProperty(LOG_LEVEL, "fine");
-//    props.setProperty("statistic-archive-file", "client_" + OSProcess.getId()
-//        + ".gfs");
-//    props.setProperty("statistic-sampling-enabled", "true");
 
     DistributedSystem ds = new DurableClientQueueSizeDUnitTest(
         "DurableClientQueueSizeDUnitTest").getSystem(props);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
index 3bba787..b1d8ba7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
@@ -50,7 +50,6 @@ public abstract class MBeanStatsTestCase {
     //System.setProperty("gemfire.stats.debug.debugSampleCollector", "true");
 
     final Properties props = new Properties();
-    //props.setProperty(LOG_LEVEL, "finest");
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(ENABLE_TIME_STATISTICS, "true");
     props.setProperty(STATISTIC_SAMPLING_ENABLED, "false");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
index a1fa2dd..99990be 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
@@ -64,7 +64,7 @@ import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 public class DUnitLauncher {
 
   /** change this to use a different log level in unit tests */
-  public static final String LOG_LEVEL = System.getProperty("logLevel", "info");
+  public static final String logLevel = System.getProperty("logLevel", "info");
   
   public static final String LOG4J = System.getProperty("log4j.configurationFile");
   
@@ -213,7 +213,7 @@ public class DUnitLauncher {
     p.setProperty(MCAST_PORT, "0");
     p.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
     p.setProperty(USE_CLUSTER_CONFIGURATION, "false");
-    p.setProperty(LOG_LEVEL, LOG_LEVEL);
+    p.setProperty(LOG_LEVEL, logLevel);
     return p;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a059858/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
index 797e96a..4245baa 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
@@ -33,6 +33,8 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
  *
  */
@@ -167,7 +169,7 @@ public class ProcessManager {
     if (vmNum >= 0) { // let the locator print a banner
       cmds.add("-D" + InternalLocator.INHIBIT_DM_BANNER + "=true");
     }
-    cmds.add("-DlogLevel=" + DUnitLauncher.LOG_LEVEL);
+    cmds.add("-D"+LOG_LEVEL+"=" + DUnitLauncher.logLevel);
     if (DUnitLauncher.LOG4J != null) {
       cmds.add("-Dlog4j.configurationFile=" + DUnitLauncher.LOG4J);
     }


Mime
View raw message