You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/02/05 01:16:17 UTC
[11/33] incubator-geode git commit: Cleanup
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
index b215055..841c960 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData.S
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.Invoke;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -87,7 +87,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
cmdResult.resetToFirstLine();
if (cmdResult != null) {
String cmdResultStr = commandResultToString(cmdResult);
- LogWriterSupport.getLogWriter().info("testGCForGroup cmdResultStr=" + cmdResultStr + "; cmdResult=" + cmdResult);
+ LogWriterUtils.getLogWriter().info("testGCForGroup cmdResultStr=" + cmdResultStr + "; cmdResult=" + cmdResult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
if (cmdResult.getType().equals(ResultData.TYPE_TABULAR)) {
TabularResultData table = (TabularResultData) cmdResult.getResultData();
@@ -115,7 +115,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
cmdResult.resetToFirstLine();
if (cmdResult != null) {
String cmdResultStr = commandResultToString(cmdResult);
- LogWriterSupport.getLogWriter().info("testGCForMemberID cmdResultStr=" + cmdResultStr);
+ LogWriterUtils.getLogWriter().info("testGCForMemberID cmdResultStr=" + cmdResultStr);
assertEquals(Result.Status.OK, cmdResult.getStatus());
if (cmdResult.getType().equals(ResultData.TYPE_TABULAR)) {
TabularResultData table = (TabularResultData) cmdResult.getResultData();
@@ -141,7 +141,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
if (cmdResult != null) {
String log = commandResultToString(cmdResult);
assertNotNull(log);
- LogWriterSupport.getLogWriter().info("Show Log is" + log);
+ LogWriterUtils.getLogWriter().info("Show Log is" + log);
assertEquals(Result.Status.OK, cmdResult.getStatus());
} else {
fail("testShowLog failed as did not get CommandResult");
@@ -163,7 +163,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
if (cmdResult != null) {
String log = commandResultToString(cmdResult);
assertNotNull(log);
- LogWriterSupport.getLogWriter().info("Show Log is" + log);
+ LogWriterUtils.getLogWriter().info("Show Log is" + log);
assertEquals(Result.Status.OK, cmdResult.getStatus());
} else {
fail("testShowLog failed as did not get CommandResult");
@@ -180,7 +180,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
cmdResult.resetToFirstLine();
if (cmdResult != null) {
String cmdResultStr = commandResultToString(cmdResult);
- LogWriterSupport.getLogWriter().info("testGCForEntireCluster cmdResultStr=" + cmdResultStr + "; cmdResult=" + cmdResult);
+ LogWriterUtils.getLogWriter().info("testGCForEntireCluster cmdResultStr=" + cmdResultStr + "; cmdResult=" + cmdResult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
if (cmdResult.getType().equals(ResultData.TYPE_TABULAR)) {
TabularResultData table = (TabularResultData) cmdResult.getResultData();
@@ -237,7 +237,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
if (cmdResult != null) {
String cmdResultStr = commandResultToString(cmdResult);
- LogWriterSupport.getLogWriter().info("testShutDownWithoutTimeout cmdResultStr=" + cmdResultStr);
+ LogWriterUtils.getLogWriter().info("testShutDownWithoutTimeout cmdResultStr=" + cmdResultStr);
}
verifyShutDown();
@@ -271,7 +271,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
if (cmdResult != null) {
String cmdResultStr = commandResultToString(cmdResult);
- LogWriterSupport.getLogWriter().info("testShutDownWithTIMEOUT cmdResultStr=" + cmdResultStr);
+ LogWriterUtils.getLogWriter().info("testShutDownWithTIMEOUT cmdResultStr=" + cmdResultStr);
}
verifyShutDown();
@@ -308,7 +308,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
if (cmdResult != null) {
String cmdResultStr = commandResultToString(cmdResult);
- LogWriterSupport.getLogWriter().info("testShutDownForTIMEOUT cmdResultStr = " + cmdResultStr);
+ LogWriterUtils.getLogWriter().info("testShutDownForTIMEOUT cmdResultStr = " + cmdResultStr);
CommandResult result = (CommandResult) ResultBuilder.createInfoResult(CliStrings.SHUTDOWN_TIMEDOUT);
String expectedResult = commandResultToString(result);
assertEquals(expectedResult, cmdResultStr);
@@ -419,7 +419,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
String commandString = CliStrings.CHANGE_LOGLEVEL + " --" + CliStrings.CHANGE_LOGLEVEL__LOGLEVEL + "=finer" + " --" + CliStrings.CHANGE_LOGLEVEL__MEMBER + "=" + serverName1 + "," + serverName2;
CommandResult commandResult = executeCommand(commandString);
- LogWriterSupport.getLogWriter().info("testChangeLogLevel commandResult=" + commandResult);
+ LogWriterUtils.getLogWriter().info("testChangeLogLevel commandResult=" + commandResult);
assertTrue(Status.OK.equals(commandResult.getStatus()));
CompositeResultData resultData = (CompositeResultData) commandResult.getResultData();
SectionResultData section = resultData.retrieveSection("section");
@@ -475,7 +475,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
String commandString = CliStrings.CHANGE_LOGLEVEL + " --" + CliStrings.CHANGE_LOGLEVEL__LOGLEVEL + "=finer" + " --" + CliStrings.CHANGE_LOGLEVEL__GROUPS + "=" + grp1 + "," + grp2;
CommandResult commandResult = executeCommand(commandString);
- LogWriterSupport.getLogWriter().info("testChangeLogLevelForGrps commandResult=" + commandResult);
+ LogWriterUtils.getLogWriter().info("testChangeLogLevelForGrps commandResult=" + commandResult);
assertTrue(Status.OK.equals(commandResult.getStatus()));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java
index 4dfd6e4..c8928fa 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.internal.logging.LogWriterImpl;
import com.gemstone.gemfire.management.cli.Result;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -96,11 +96,11 @@ public class MiscellaneousCommandsExportLogsPart1DUnitTest extends CliCommandTes
Result cmdResult = misc.exportLogsPreprocessing("./testExportLogs" + dir, null, null, logLevel, false, false, start,
end, 1);
- LogWriterSupport.getLogWriter().info("testExportLogs command result =" + cmdResult);
+ LogWriterUtils.getLogWriter().info("testExportLogs command result =" + cmdResult);
if (cmdResult != null) {
String cmdStringRsult = commandResultToString((CommandResult) cmdResult);
- LogWriterSupport.getLogWriter().info("testExportLogs cmdStringRsult=" + cmdStringRsult);
+ LogWriterUtils.getLogWriter().info("testExportLogs cmdStringRsult=" + cmdStringRsult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
} else {
fail("testExportLogs failed as did not get CommandResult");
@@ -125,11 +125,11 @@ public class MiscellaneousCommandsExportLogsPart1DUnitTest extends CliCommandTes
Result cmdResult = misc.exportLogsPreprocessing("./testExportLogsForMerge" + dir, null, null, logLevel, false, true,
start, end, 1);
- LogWriterSupport.getLogWriter().info("testExportLogsForMerge command=" + cmdResult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForMerge command=" + cmdResult);
if (cmdResult != null) {
String cmdStringRsult = commandResultToString((CommandResult) cmdResult);
- LogWriterSupport.getLogWriter().info("testExportLogsForMerge cmdStringRsult=" + cmdStringRsult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForMerge cmdStringRsult=" + cmdStringRsult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
} else {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
index 582b562..3d462f4 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.internal.logging.LogWriterImpl;
import com.gemstone.gemfire.management.cli.Result;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -97,11 +97,11 @@ public class MiscellaneousCommandsExportLogsPart2DUnitTest extends CliCommandTes
Result cmdResult = misc.exportLogsPreprocessing("./testExportLogsForLogLevel" + dir, null, null, logLevel, false,
false, start, end, 1);
- LogWriterSupport.getLogWriter().info("testExportLogsForLogLevel command=" + cmdResult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForLogLevel command=" + cmdResult);
if (cmdResult != null) {
String cmdStringRsult = commandResultToString((CommandResult) cmdResult);
- LogWriterSupport.getLogWriter().info("testExportLogsForLogLevel cmdStringRsult=" + cmdStringRsult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForLogLevel cmdStringRsult=" + cmdStringRsult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
} else {
fail("testExportLogsForLogLevel failed as did not get CommandResult");
@@ -129,11 +129,11 @@ public class MiscellaneousCommandsExportLogsPart2DUnitTest extends CliCommandTes
Result cmdResult = misc.exportLogsPreprocessing("./testExportLogsForLogLevelWithUPTOLOGLEVEL" + dir, null, null,
logLevel, true, false, start, end, 1);
- LogWriterSupport.getLogWriter().info("testExportLogsForLogLevelWithUPTOLOGLEVEL command=" + cmdResult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForLogLevelWithUPTOLOGLEVEL command=" + cmdResult);
if (cmdResult != null) {
String cmdStringRsult = commandResultToString((CommandResult) cmdResult);
- LogWriterSupport.getLogWriter().info("testExportLogsForLogLevelWithUPTOLOGLEVEL cmdStringRsult=" + cmdStringRsult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForLogLevelWithUPTOLOGLEVEL cmdStringRsult=" + cmdStringRsult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
} else {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
index 5121846..7d67b61 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.internal.logging.LogWriterImpl;
import com.gemstone.gemfire.management.cli.Result;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -104,10 +104,10 @@ public class MiscellaneousCommandsExportLogsPart3DUnitTest extends CliCommandTes
Result cmdResult = misc.exportLogsPreprocessing("./testExportLogsForGroup" + dir, groups, null, logLevel, false,
false, start, end, 1);
- LogWriterSupport.getLogWriter().info("testExportLogsForGroup command result =" + cmdResult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForGroup command result =" + cmdResult);
if (cmdResult != null) {
String cmdStringRsult = commandResultToString((CommandResult) cmdResult);
- LogWriterSupport.getLogWriter().info("testExportLogsForGroup cmdStringRsult=" + cmdStringRsult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForGroup cmdStringRsult=" + cmdStringRsult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
} else {
fail("testExportLogsForGroup failed as did not get CommandResult");
@@ -137,11 +137,11 @@ public class MiscellaneousCommandsExportLogsPart3DUnitTest extends CliCommandTes
Result cmdResult = misc.exportLogsPreprocessing("./testExportLogsForMember" + dir, null, vm1MemberId, logLevel,
false, false, start, end, 1);
- LogWriterSupport.getLogWriter().info("testExportLogsForMember command result =" + cmdResult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForMember command result =" + cmdResult);
if (cmdResult != null) {
String cmdStringRsult = commandResultToString((CommandResult) cmdResult);
- LogWriterSupport.getLogWriter().info("testExportLogsForMember cmdStringRsult=" + cmdStringRsult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForMember cmdStringRsult=" + cmdStringRsult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
} else {
fail("testExportLogsForMember failed as did not get CommandResult");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
index 1cb7e3a..2d11580 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.internal.logging.LogWriterImpl;
import com.gemstone.gemfire.management.cli.Result;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -95,11 +95,11 @@ public class MiscellaneousCommandsExportLogsPart4DUnitTest extends CliCommandTes
Result cmdResult = misc.exportLogsPreprocessing("./testExportLogsForTimeRange1" + dir, null, null, logLevel, false,
false, start, end, 1);
- LogWriterSupport.getLogWriter().info("testExportLogsForTimeRange1 command result =" + cmdResult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForTimeRange1 command result =" + cmdResult);
if (cmdResult != null) {
String cmdStringRsult = commandResultToString((CommandResult) cmdResult);
- LogWriterSupport.getLogWriter().info("testExportLogsForTimeRange1 cmdStringRsult=" + cmdStringRsult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForTimeRange1 cmdStringRsult=" + cmdStringRsult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
} else {
fail("testExportLogsForTimeRange1 failed as did not get CommandResult");
@@ -123,11 +123,11 @@ public class MiscellaneousCommandsExportLogsPart4DUnitTest extends CliCommandTes
Result cmdResult = misc.exportLogsPreprocessing("./testExportLogsForTimeRangeForOnlyStartTime" + dir, null, null,
logLevel, false, false, s, null, 1);
- LogWriterSupport.getLogWriter().info("testExportLogsForTimeRangeForOnlyStartTime command result =" + cmdResult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForTimeRangeForOnlyStartTime command result =" + cmdResult);
if (cmdResult != null) {
String cmdStringRsult = commandResultToString((CommandResult) cmdResult);
- LogWriterSupport.getLogWriter().info("testExportLogsForTimeRangeForOnlyStartTime cmdStringRsult=" + cmdStringRsult);
+ LogWriterUtils.getLogWriter().info("testExportLogsForTimeRangeForOnlyStartTime cmdStringRsult=" + cmdStringRsult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
} else {
fail("testExportLogsForTimeRangeForOnlyStartTime failed as did not get CommandResult");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
index 8da6e2b..e6c1e47 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
@@ -378,7 +378,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
executeCommand("undeploy --jar=" + fileToDelete.getName());
}
} catch (IOException e) {
- LogWriterSupport.getLogWriter().error("Unable to delete file", e);
+ LogWriterUtils.getLogWriter().error("Unable to delete file", e);
}
}
this.filesToBeDeleted.clear();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
index d1c9efd..9dc9506 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.management.internal.configuration.SharedConfiguratio
import com.gemstone.gemfire.management.internal.configuration.domain.Configuration;
import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -214,23 +214,23 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase {
cmdResult = executeCommand(commandStringBuilder.getCommandString());
String resultString = commandResultToString(cmdResult);
- LogWriterSupport.getLogWriter().info("#SB Result\n");
- LogWriterSupport.getLogWriter().info(resultString);
+ LogWriterUtils.getLogWriter().info("#SB Result\n");
+ LogWriterUtils.getLogWriter().info(resultString);
assertEquals(true, cmdResult.getStatus().equals(Status.OK));
commandStringBuilder = new CommandStringBuilder(CliStrings.STATUS_SHARED_CONFIG);
cmdResult = executeCommand(commandStringBuilder.getCommandString());
resultString = commandResultToString(cmdResult);
- LogWriterSupport.getLogWriter().info("#SB Result\n");
- LogWriterSupport.getLogWriter().info(resultString);
+ LogWriterUtils.getLogWriter().info("#SB Result\n");
+ LogWriterUtils.getLogWriter().info(resultString);
assertEquals(Status.OK, cmdResult.getStatus());
commandStringBuilder = new CommandStringBuilder(CliStrings.EXPORT_SHARED_CONFIG);
commandStringBuilder.addOption(CliStrings.EXPORT_SHARED_CONFIG__FILE, sharedConfigZipFileName);
cmdResult = executeCommand(commandStringBuilder.getCommandString());
resultString = commandResultToString(cmdResult);
- LogWriterSupport.getLogWriter().info("#SB Result\n");
- LogWriterSupport.getLogWriter().info(resultString);
+ LogWriterUtils.getLogWriter().info("#SB Result\n");
+ LogWriterUtils.getLogWriter().info(resultString);
assertEquals(Status.OK, cmdResult.getStatus());
//Import into a running system should fail
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
index 1364f0e..2ff86ba 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import org.junit.Before;
@@ -106,7 +106,7 @@ public class ShellCommandsDUnitTest extends CliCommandTestBase {
if (gfshInstance == null) {
fail("In testEcho command gfshInstance is null");
}
- LogWriterSupport.getLogWriter().info("Gsh " + gfshInstance);
+ LogWriterUtils.getLogWriter().info("Gsh " + gfshInstance);
gfshInstance.setEnvProperty("TESTSYS", "SYS_VALUE");
printAllEnvs(gfshInstance);
@@ -336,9 +336,9 @@ public class ShellCommandsDUnitTest extends CliCommandTestBase {
if (cmdResult != null) {
assertEquals(Result.Status.OK, cmdResult.getStatus());
- LogWriterSupport.getLogWriter().info("testClearHistory cmdResult=" + commandResultToString(cmdResult));
+ LogWriterUtils.getLogWriter().info("testClearHistory cmdResult=" + commandResultToString(cmdResult));
String resultString = commandResultToString(cmdResult);
- LogWriterSupport.getLogWriter().info("testClearHistory resultString=" + resultString);
+ LogWriterUtils.getLogWriter().info("testClearHistory resultString=" + resultString);
assertTrue(resultString.contains(CliStrings.HISTORY__MSG__CLEARED_HISTORY));
assertTrue(gfshInstance.getGfshHistory().size()<= 1);
} else {
@@ -348,18 +348,18 @@ public class ShellCommandsDUnitTest extends CliCommandTestBase {
private static void printCommandOutput(CommandResult cmdResult) {
assertNotNull(cmdResult);
- LogWriterSupport.getLogWriter().info("Command Output : ");
+ LogWriterUtils.getLogWriter().info("Command Output : ");
StringBuilder sb = new StringBuilder();
cmdResult.resetToFirstLine();
while (cmdResult.hasNextLine()) {
sb.append(cmdResult.nextLine()).append(DataCommandRequest.NEW_LINE);
}
- LogWriterSupport.getLogWriter().info(sb.toString());
- LogWriterSupport.getLogWriter().info("");
+ LogWriterUtils.getLogWriter().info(sb.toString());
+ LogWriterUtils.getLogWriter().info("");
}
private void printAllEnvs(Gfsh gfsh) {
- LogWriterSupport.getLogWriter().info("printAllEnvs : " + StringUtils.objectToString(gfsh.getEnv(), false, 0));
+ LogWriterUtils.getLogWriter().info("printAllEnvs : " + StringUtils.objectToString(gfsh.getEnv(), false, 0));
/*
getLogWriter().info("Gfsh printAllEnvs : " + HydraUtil.ObjectToString(getDefaultShell().getEnv()));
getLogWriter().info("gfsh " + gfsh + " default shell " + getDefaultShell());*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
index a70405b..ba942c6 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.Invoke;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -113,7 +113,7 @@ public class ShowDeadlockDUnitTest extends CacheTestCase {
String deadLockOutputFromCommand = getResultAsString(result);
- LogWriterSupport.getLogWriter().info("output = " + deadLockOutputFromCommand);
+ LogWriterUtils.getLogWriter().info("output = " + deadLockOutputFromCommand);
assertEquals(true, result.hasIncomingFiles());
assertEquals(true, result.getStatus().equals(Status.OK));
assertEquals(true, deadLockOutputFromCommand.startsWith(CliStrings.SHOW_DEADLOCK__NO__DEADLOCK));
@@ -149,7 +149,7 @@ public class ShowDeadlockDUnitTest extends CacheTestCase {
Result result = commandProcessor.createCommandStatement(csb.toString(), EMPTY_ENV).process();
String deadLockOutputFromCommand = getResultAsString(result);
- LogWriterSupport.getLogWriter().info("Deadlock = " + deadLockOutputFromCommand);
+ LogWriterUtils.getLogWriter().info("Deadlock = " + deadLockOutputFromCommand);
result.saveIncomingFiles(null);
assertEquals(true, deadLockOutputFromCommand.startsWith(CliStrings.SHOW_DEADLOCK__DEADLOCK__DETECTED));
assertEquals(true, result.getStatus().equals(Status.OK));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
index 51de395..a34b185 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.remote.CommandProcessor;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -101,7 +101,7 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
CommandProcessor commandProcessor = new CommandProcessor();
Result result = commandProcessor.createCommandStatement("show metrics", Collections.EMPTY_MAP).process();
String resultStr = commandResultToString((CommandResult) result);
- LogWriterSupport.getLogWriter().info(resultStr);
+ LogWriterUtils.getLogWriter().info(resultStr);
assertEquals(resultStr, true, result.getStatus().equals(Status.OK));
return resultStr;
}
@@ -113,8 +113,8 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
String managerResult = (String) managerResultObj;
- LogWriterSupport.getLogWriter().info("#SB Manager");
- LogWriterSupport.getLogWriter().info(managerResult);
+ LogWriterUtils.getLogWriter().info("#SB Manager");
+ LogWriterUtils.getLogWriter().info(managerResult);
}
public void systemSetUp() {
@@ -160,8 +160,8 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
String managerResult = (String) managerResultObj;
- LogWriterSupport.getLogWriter().info("#SB Manager");
- LogWriterSupport.getLogWriter().info(managerResult);
+ LogWriterUtils.getLogWriter().info("#SB Manager");
+ LogWriterUtils.getLogWriter().info(managerResult);
}
/***
@@ -258,8 +258,8 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
String managerResult = (String) managerResultObj;
- LogWriterSupport.getLogWriter().info("#SB Manager");
- LogWriterSupport.getLogWriter().info(managerResult);
+ LogWriterUtils.getLogWriter().info("#SB Manager");
+ LogWriterUtils.getLogWriter().info(managerResult);
cs.stop();
}
@@ -299,8 +299,8 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
String managerResult = (String) managerResultObj;
- LogWriterSupport.getLogWriter().info("#SB Manager");
- LogWriterSupport.getLogWriter().info(managerResult);
+ LogWriterUtils.getLogWriter().info("#SB Manager");
+ LogWriterUtils.getLogWriter().info(managerResult);
}
public void testShowMetricsRegionFromMemberWithCategories() throws ClassNotFoundException, IOException, InterruptedException {
@@ -339,7 +339,7 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
String managerResult = (String) managerResultObj;
- LogWriterSupport.getLogWriter().info("#SB Manager");
- LogWriterSupport.getLogWriter().info(managerResult);
+ LogWriterUtils.getLogWriter().info("#SB Manager");
+ LogWriterUtils.getLogWriter().info(managerResult);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
index 4c004fa..11bd352 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -94,9 +94,9 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase {
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.EXPORT_STACKTRACE);
csb.addOption(CliStrings.EXPORT_STACKTRACE__FILE, allStacktracesFile.getCanonicalPath());
String commandString = csb.toString();
- LogWriterSupport.getLogWriter().info("CommandString : " + commandString);
+ LogWriterUtils.getLogWriter().info("CommandString : " + commandString);
CommandResult commandResult = executeCommand(commandString);
- LogWriterSupport.getLogWriter().info("Output : \n" + commandResultToString(commandResult));
+ LogWriterUtils.getLogWriter().info("Output : \n" + commandResultToString(commandResult));
assertTrue(commandResult.getStatus().equals(Status.OK));
File mgrStacktraceFile = new File("managerStacktrace.txt");
@@ -106,9 +106,9 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase {
csb.addOption(CliStrings.EXPORT_STACKTRACE__FILE, mgrStacktraceFile.getCanonicalPath());
csb.addOption(CliStrings.EXPORT_STACKTRACE__MEMBER, "Manager");
commandString = csb.toString();
- LogWriterSupport.getLogWriter().info("CommandString : " + commandString);
+ LogWriterUtils.getLogWriter().info("CommandString : " + commandString);
commandResult = executeCommand(commandString);
- LogWriterSupport.getLogWriter().info("Output : \n" + commandResultToString(commandResult));
+ LogWriterUtils.getLogWriter().info("Output : \n" + commandResultToString(commandResult));
assertTrue(commandResult.getStatus().equals(Status.OK));
File serverStacktraceFile = new File("serverStacktrace.txt");
@@ -118,9 +118,9 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase {
csb.addOption(CliStrings.EXPORT_STACKTRACE__FILE, serverStacktraceFile.getCanonicalPath());
csb.addOption(CliStrings.EXPORT_STACKTRACE__MEMBER, "Server");
commandString = csb.toString();
- LogWriterSupport.getLogWriter().info("CommandString : " + commandString);
+ LogWriterUtils.getLogWriter().info("CommandString : " + commandString);
commandResult = executeCommand(commandString);
- LogWriterSupport.getLogWriter().info("Output : \n" + commandResultToString(commandResult));
+ LogWriterUtils.getLogWriter().info("Output : \n" + commandResultToString(commandResult));
assertTrue(commandResult.getStatus().equals(Status.OK));
File groupStacktraceFile = new File("groupstacktrace.txt");
@@ -130,9 +130,9 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase {
csb.addOption(CliStrings.EXPORT_STACKTRACE__FILE, groupStacktraceFile.getCanonicalPath());
csb.addOption(CliStrings.EXPORT_STACKTRACE__GROUP, "G2");
commandString = csb.toString();
- LogWriterSupport.getLogWriter().info("CommandString : " + commandString);
+ LogWriterUtils.getLogWriter().info("CommandString : " + commandString);
commandResult = executeCommand(commandString);
- LogWriterSupport.getLogWriter().info("Output : \n" + commandResultToString(commandResult));
+ LogWriterUtils.getLogWriter().info("Output : \n" + commandResultToString(commandResult));
assertTrue(commandResult.getStatus().equals(Status.OK));
File wrongStackTraceFile = new File("wrongStackTrace.txt");
@@ -142,9 +142,9 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase {
csb.addOption(CliStrings.EXPORT_STACKTRACE__FILE, wrongStackTraceFile.getCanonicalPath());
csb.addOption(CliStrings.EXPORT_STACKTRACE__MEMBER, "WrongMember");
commandString = csb.toString();
- LogWriterSupport.getLogWriter().info("CommandString : " + commandString);
+ LogWriterUtils.getLogWriter().info("CommandString : " + commandString);
commandResult = executeCommand(commandString);
- LogWriterSupport.getLogWriter().info("Output : \n" + commandResultToString(commandResult));
+ LogWriterUtils.getLogWriter().info("Output : \n" + commandResultToString(commandResult));
assertFalse(commandResult.getStatus().equals(Status.OK));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
index e33e2e0..5cbc40b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
@@ -40,8 +40,8 @@ import com.gemstone.gemfire.management.internal.cli.CliUtil;
import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
-import com.gemstone.gemfire.test.dunit.NetworkSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -110,8 +110,8 @@ public class TestClientIdsDUnitTest extends DistributedTestCase {
helper.startManagingNode(managingNode);
int port = (Integer) createServerCache(server);
DistributedMember serverMember = helper.getMember(server);
- createClientCache(client, NetworkSupport.getServerHostName(server.getHost()), port);
- createClientCache(client2, NetworkSupport.getServerHostName(server.getHost()), port);
+ createClientCache(client, NetworkUtils.getServerHostName(server.getHost()), port);
+ createClientCache(client2, NetworkUtils.getServerHostName(server.getHost()), port);
put(client);
put(client2);
verifyClientIds(managingNode, serverMember, port);
@@ -233,7 +233,7 @@ public class TestClientIdsDUnitTest extends DistributedTestCase {
}
}
}catch (Exception e) {
- LogWriterSupport.getLogWriter().info("exception occured " + e.getMessage() + CliUtil.stackTraceAsString((Throwable)e));
+ LogWriterUtils.getLogWriter().info("exception occured " + e.getMessage() + CliUtil.stackTraceAsString((Throwable)e));
}
return false;
}
@@ -247,7 +247,7 @@ public class TestClientIdsDUnitTest extends DistributedTestCase {
//Now it is sure that bean would be available
CacheServerMXBean bean = MBeanUtil.getCacheServerMbeanProxy(
serverMember, serverPort);
- LogWriterSupport.getLogWriter().info("verifyClientIds = " + bean.getClientIds().length);
+ LogWriterUtils.getLogWriter().info("verifyClientIds = " + bean.getClientIds().length);
assertEquals(true, bean.getClientIds().length > 0 ? true : false);
} catch (Exception e) {
fail("Error while verifying cache server from remote member " + e);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java
index 69b27c0..3bb7162 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.cache.functions.TestFunction;
import com.gemstone.gemfire.management.DistributedSystemMXBean;
import com.gemstone.gemfire.management.ManagementService;
import com.gemstone.gemfire.management.ManagementTestBase;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
@@ -101,7 +101,7 @@ public class TestFunctionsDUnitTest extends ManagementTestBase {
});
Integer numOfRunningFunctions = (Integer) managingNode.invoke(
TestFunctionsDUnitTest.class, "getNumOfRunningFunction");
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"TestNumOfFunctions numOfRunningFunctions= " + numOfRunningFunctions);
assertTrue(numOfRunningFunctions > 0 ? true : false);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java
index 00b0bb9..fd161fd 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.management.internal.pulse;
import com.gemstone.gemfire.management.DistributedSystemMXBean;
import com.gemstone.gemfire.management.ManagementService;
import com.gemstone.gemfire.management.ManagementTestBase;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
@@ -89,7 +89,7 @@ public class TestHeapDUnitTest extends ManagementTestBase {
long totalHeapSizeFromMXBean = ((Number) managingNode.invoke(
TestHeapDUnitTest.class, "getHeapSizeOfDS")).intValue();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testTotalHeapSize totalHeapSizeFromMXBean = "
+ totalHeapSizeFromMXBean + " totalHeapSizeOnAll = "
+ totalHeapSizeOnAll);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java
index 5869d9b..24494ff 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.management.internal.pulse;
import com.gemstone.gemfire.management.DistributedSystemMXBean;
import com.gemstone.gemfire.management.ManagementService;
import com.gemstone.gemfire.management.ManagementTestBase;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
@@ -76,7 +76,7 @@ public class TestLocatorsDUnitTest extends ManagementTestBase {
initManagement(false);
int locatorCount = ((Number) managingNode.invoke(
TestLocatorsDUnitTest.class, "getNumOfLocatorFromMBean")).intValue();
- LogWriterSupport.getLogWriter().info("TestLocatorsDUnitTest locatorCount =" + locatorCount);
+ LogWriterUtils.getLogWriter().info("TestLocatorsDUnitTest locatorCount =" + locatorCount);
assertEquals(1, locatorCount);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
index a7f6575..4043ad4 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
@@ -40,8 +40,8 @@ import com.gemstone.gemfire.management.ManagementTestBase;
import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
-import com.gemstone.gemfire.test.dunit.NetworkSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -102,8 +102,8 @@ public class TestSubscriptionsDUnitTest extends DistributedTestCase {
int port = (Integer) createServerCache(server);
DistributedMember serverMember = helper.getMember(server);
- createClientCache(client, NetworkSupport.getServerHostName(server.getHost()), port);
- createClientCache(client2, NetworkSupport.getServerHostName(server.getHost()), port);
+ createClientCache(client, NetworkUtils.getServerHostName(server.getHost()), port);
+ createClientCache(client2, NetworkUtils.getServerHostName(server.getHost()), port);
put(client);
put(client2);
registerInterest(client);
@@ -244,7 +244,7 @@ public class TestSubscriptionsDUnitTest extends DistributedTestCase {
final DistributedSystemMXBean dsBean = ManagementService
.getExistingManagementService(cache).getDistributedSystemMXBean();
assertNotNull(dsBean);
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"TestSubscriptionsDUnitTest dsBean.getNumSubscriptions() ="
+ dsBean.getNumSubscriptions());
assertTrue(dsBean.getNumSubscriptions() == 2 ? true : false);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
index 62cd89d..40592ff 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
@@ -58,8 +58,8 @@ import com.gemstone.gemfire.internal.cache.versions.VMVersionTag;
import com.gemstone.gemfire.internal.cache.versions.VersionTag;
import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.Invoke;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
-import com.gemstone.gemfire.test.dunit.NetworkSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -282,7 +282,7 @@ public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase {
final VM vm2 = host.getVM(2);
final VM vm3 = host.getVM(3);
- LogWriterSupport.getLogWriter().info("creating region in vm0");
+ LogWriterUtils.getLogWriter().info("creating region in vm0");
createRegionInPeer(vm0, RegionShortcut.PARTITION_REDUNDANT_PERSISTENT);
vm0.invoke(new SerializableRunnable() {
@@ -294,11 +294,11 @@ public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase {
}
});
- LogWriterSupport.getLogWriter().info("creating region in vm1");
+ LogWriterUtils.getLogWriter().info("creating region in vm1");
createRegionInPeer(vm1, RegionShortcut.PARTITION_REDUNDANT_PERSISTENT);
- LogWriterSupport.getLogWriter().info("creating region in vm2");
+ LogWriterUtils.getLogWriter().info("creating region in vm2");
createRegionInPeer(vm2, RegionShortcut.PARTITION_REDUNDANT_PERSISTENT);
- LogWriterSupport.getLogWriter().info("creating region in vm3");
+ LogWriterUtils.getLogWriter().info("creating region in vm3");
createRegionInPeer(vm3, RegionShortcut.PARTITION_PROXY);
expectedExceptions.add(IgnoredException.addIgnoredException("RuntimeException", vm2));
@@ -497,8 +497,8 @@ public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase {
SerializableCallable createRegion = new SerializableCallable("create client region in " + vm) {
public Object call() throws Exception {
ClientCacheFactory cf = new ClientCacheFactory();
- cf.addPoolServer(NetworkSupport.getServerHostName(vm.getHost()), port1);
- cf.addPoolServer(NetworkSupport.getServerHostName(vm.getHost()), port2);
+ cf.addPoolServer(NetworkUtils.getServerHostName(vm.getHost()), port1);
+ cf.addPoolServer(NetworkUtils.getServerHostName(vm.getHost()), port2);
cf.setPoolPRSingleHopEnabled(false);
cf.setPoolThreadLocalConnections(threadLocalConnections);
cf.setPoolReadTimeout(10 * 60 * 1000);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
index 024496d..937ff31 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.pdx.internal.json.PdxToJSON;
import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.NetworkSupport;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.util.test.TestUtil;
@@ -595,7 +595,7 @@ public class JSONPdxClientServerDUnitTest extends CacheTestCase {
SerializableCallable createRegion = new SerializableCallable() {
public Object call() throws Exception {
ClientCacheFactory cf = new ClientCacheFactory();
- cf.addPoolServer(NetworkSupport.getServerHostName(vm.getHost()), port);
+ cf.addPoolServer(NetworkUtils.getServerHostName(vm.getHost()), port);
cf.setPoolThreadLocalConnections(threadLocalConnections);
ClientCache cache = getClientCache(cf);
cache.createClientRegionFactory(ClientRegionShortcut.PROXY)
@@ -611,7 +611,7 @@ public class JSONPdxClientServerDUnitTest extends CacheTestCase {
SerializableCallable createRegion = new SerializableCallable() {
public Object call() throws Exception {
ClientCacheFactory cf = new ClientCacheFactory();
- cf.addPoolServer(NetworkSupport.getServerHostName(vm.getHost()), port);
+ cf.addPoolServer(NetworkUtils.getServerHostName(vm.getHost()), port);
cf.setPoolThreadLocalConnections(threadLocalConnections);
cf.setPdxReadSerialized(isPdxReadSerialized);
ClientCache cache = getClientCache(cf);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
index 8506459..7720890 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.internal.Version;
import com.gemstone.gemfire.pdx.internal.AutoSerializableManager;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.Invoke;
-import com.gemstone.gemfire.test.dunit.NetworkSupport;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -394,11 +394,11 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
getSystem(props);
Cache cache = getCache();
PoolFactory pf = PoolManager.createFactory();
- pf.addServer(NetworkSupport.getServerHostName(vm0.getHost()), port1);
+ pf.addServer(NetworkUtils.getServerHostName(vm0.getHost()), port1);
pf.create("pool1");
pf = PoolManager.createFactory();
- pf.addServer(NetworkSupport.getServerHostName(vm0.getHost()), port2);
+ pf.addServer(NetworkUtils.getServerHostName(vm0.getHost()), port2);
pf.create("pool2");
AttributesFactory af = new AttributesFactory();
@@ -499,7 +499,7 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
getSystem(props);
Cache cache = getCache();
PoolFactory pf = PoolManager.createFactory();
- pf.addServer(NetworkSupport.getServerHostName(vm0.getHost()), port);
+ pf.addServer(NetworkUtils.getServerHostName(vm0.getHost()), port);
pf.create("pool");
AttributesFactory af = new AttributesFactory();
@@ -553,7 +553,7 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
DataSerializer.writeObject(new SimpleClass(57, (byte) 3), out);
PoolFactory pf = PoolManager.createFactory();
- pf.addServer(NetworkSupport.getServerHostName(vm0.getHost()), port);
+ pf.addServer(NetworkUtils.getServerHostName(vm0.getHost()), port);
try {
pf.create("pool");
fail("should have received an exception");
@@ -704,7 +704,7 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
System.setProperty("gemfire.ON_DISCONNECT_CLEAR_PDXTYPEIDS", "true");
}
ClientCacheFactory cf = new ClientCacheFactory();
- cf.addPoolServer(NetworkSupport.getServerHostName(vm.getHost()), port);
+ cf.addPoolServer(NetworkUtils.getServerHostName(vm.getHost()), port);
cf.setPoolThreadLocalConnections(threadLocalConnections);
if(autoSerializerPatterns != null && autoSerializerPatterns.length != 0) {
cf.setPdxSerializer(new ReflectionBasedAutoSerializer(autoSerializerPatterns));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java
index 2ea86d2..c820e72 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.pdx.internal.EnumInfo;
import com.gemstone.gemfire.pdx.internal.PdxType;
import com.gemstone.gemfire.pdx.internal.TypeRegistry;
import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.NetworkSupport;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
public class PdxTypeExportDUnitTest extends CacheTestCase {
@@ -116,7 +116,7 @@ public class PdxTypeExportDUnitTest extends CacheTestCase {
public Object call() throws Exception {
ClientCacheFactory cf = new ClientCacheFactory()
.setPdxSerializer(new MyPdxSerializer())
- .addPoolServer(NetworkSupport.getServerHostName(host), port);
+ .addPoolServer(NetworkUtils.getServerHostName(host), port);
ClientCache cache = getClientCache(cf);
Region r = cache.createClientRegionFactory(ClientRegionShortcut.PROXY).create("pdxtest");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/VersionClassLoader.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/VersionClassLoader.java b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/VersionClassLoader.java
index 5462b5b..f2e6b5a 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/VersionClassLoader.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/VersionClassLoader.java
@@ -25,7 +25,7 @@ import java.lang.reflect.Constructor;
import java.net.URL;
import java.net.URLClassLoader;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
public class VersionClassLoader {
@@ -42,16 +42,16 @@ public class VersionClassLoader {
String alternateVersionClassPath = System.getProperty("JTESTS") +
File.separator + ".." + File.separator + ".." + File.separator +
"classes" + File.separator + "version" + classVersion;
- LogWriterSupport.getLogWriter().info("Initializing the class loader :" + alternateVersionClassPath);
+ LogWriterUtils.getLogWriter().info("Initializing the class loader :" + alternateVersionClassPath);
ClassLoader versionCL = null;
try {
versionCL = new URLClassLoader(new URL[]{new File(alternateVersionClassPath).toURI().toURL()}, cl);
Thread.currentThread().setContextClassLoader(versionCL);
} catch (Exception e) {
- LogWriterSupport.getLogWriter().info("error", e);
+ LogWriterUtils.getLogWriter().info("error", e);
throw new Exception("Failed to initialize the class loader. " + e.getMessage());
}
- LogWriterSupport.getLogWriter().info("Setting/adding class loader with " + alternateVersionClassPath);
+ LogWriterUtils.getLogWriter().info("Setting/adding class loader with " + alternateVersionClassPath);
return versionCL;
}
@@ -90,7 +90,7 @@ public class VersionClassLoader {
newObj = constructor.newInstance();
}
} catch (Exception e) {
- LogWriterSupport.getLogWriter().info("error", e);
+ LogWriterUtils.getLogWriter().info("error", e);
throw new Exception("Failed to get the class instance. ClassName: " + className + " error: ", e);
}
return newObj;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
index 4eb43a4..476702c 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
@@ -25,10 +25,10 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.SocketCreator;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
-import com.gemstone.gemfire.test.dunit.DistributedTestSupport;
+import com.gemstone.gemfire.test.dunit.DistributedTestUtils;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.IgnoredException;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -73,7 +73,7 @@ public class RedisDistDUnitTest extends DistributedTestCase {
client1 = host.getVM(2);
client2 = host.getVM(3);
final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2);
- final int locatorPort = DistributedTestSupport.getDUnitLocatorPort();
+ final int locatorPort = DistributedTestUtils.getDUnitLocatorPort();
final SerializableCallable<Object> startRedisAdapter = new SerializableCallable<Object>() {
private static final long serialVersionUID = 1978017907725504294L;
@@ -83,7 +83,7 @@ public class RedisDistDUnitTest extends DistributedTestCase {
int port = ports[VM.getCurrentVMNum()];
CacheFactory cF = new CacheFactory();
String locator = SocketCreator.getLocalHost().getHostName() + "[" + locatorPort + "]";
- cF.set("log-level", LogWriterSupport.getDUnitLogLevel());
+ cF.set("log-level", LogWriterUtils.getDUnitLogLevel());
cF.set("redis-bind-address", localHost);
cF.set("redis-port", ""+port);
cF.set("mcast-port", "0");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
index ceb01ab..6f57fb6 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.IgnoredException;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
@@ -215,11 +215,11 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
String authenticator = gen.getAuthenticator();
String authInit = gen.getAuthInit();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testValidCredentials: Using scheme: " + gen.classCode());
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testValidCredentials: Using authenticator: " + authenticator);
- LogWriterSupport.getLogWriter().info("testValidCredentials: Using authinit: " + authInit);
+ LogWriterUtils.getLogWriter().info("testValidCredentials: Using authinit: " + authInit);
// Start the servers
Integer locPort1 = SecurityTestUtil.getLocatorPort();
@@ -237,12 +237,12 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
// Start the clients with valid credentials
Properties credentials1 = gen.getValidCredentials(1);
Properties javaProps1 = gen.getJavaProperties();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testValidCredentials: For first client credentials: " + credentials1
+ " : " + javaProps1);
Properties credentials2 = gen.getValidCredentials(2);
Properties javaProps2 = gen.getJavaProperties();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testValidCredentials: For second client credentials: "
+ credentials2 + " : " + javaProps2);
client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient",
@@ -281,11 +281,11 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
String authenticator = gen.getAuthenticator();
String authInit = gen.getAuthInit();
- LogWriterSupport.getLogWriter()
+ LogWriterUtils.getLogWriter()
.info("testNoCredentials: Using scheme: " + gen.classCode());
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testNoCredentials: Using authenticator: " + authenticator);
- LogWriterSupport.getLogWriter().info("testNoCredentials: Using authinit: " + authInit);
+ LogWriterUtils.getLogWriter().info("testNoCredentials: Using authinit: " + authInit);
// Start the servers
Integer locPort1 = SecurityTestUtil.getLocatorPort();
@@ -303,7 +303,7 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
// Start first client with valid credentials
Properties credentials1 = gen.getValidCredentials(1);
Properties javaProps1 = gen.getJavaProperties();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testNoCredentials: For first client credentials: " + credentials1
+ " : " + javaProps1);
client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient",
@@ -346,11 +346,11 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
String authenticator = gen.getAuthenticator();
String authInit = gen.getAuthInit();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testInvalidCredentials: Using scheme: " + gen.classCode());
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testInvalidCredentials: Using authenticator: " + authenticator);
- LogWriterSupport.getLogWriter()
+ LogWriterUtils.getLogWriter()
.info("testInvalidCredentials: Using authinit: " + authInit);
// Start the servers
@@ -369,7 +369,7 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
// Start first client with valid credentials
Properties credentials1 = gen.getValidCredentials(1);
Properties javaProps1 = gen.getJavaProperties();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testInvalidCredentials: For first client credentials: "
+ credentials1 + " : " + javaProps1);
client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient",
@@ -385,7 +385,7 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
// exception
Properties credentials2 = gen.getInvalidCredentials(1);
Properties javaProps2 = gen.getJavaProperties();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testInvalidCredentials: For second client credentials: "
+ credentials2 + " : " + javaProps2);
client2.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient",
@@ -404,9 +404,9 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
Properties javaProps = gen.getJavaProperties();
String authenticator = gen.getAuthenticator();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testInvalidAuthInit: Using scheme: " + gen.classCode());
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testInvalidAuthInit: Using authenticator: " + authenticator);
// Start the server
@@ -419,7 +419,7 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
Properties credentials = gen.getValidCredentials(1);
javaProps = gen.getJavaProperties();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testInvalidAuthInit: For first client credentials: " + credentials
+ " : " + javaProps);
client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient",
@@ -440,9 +440,9 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
String authenticator = gen.getAuthenticator();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testNoAuthInitWithCredentials: Using scheme: " + gen.classCode());
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testNoAuthInitWithCredentials: Using authenticator: "
+ authenticator);
@@ -462,12 +462,12 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
// Start the clients with valid credentials
Properties credentials1 = gen.getValidCredentials(1);
Properties javaProps1 = gen.getJavaProperties();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testNoAuthInitWithCredentials: For first client credentials: "
+ credentials1 + " : " + javaProps1);
Properties credentials2 = gen.getValidCredentials(2);
Properties javaProps2 = gen.getJavaProperties();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testNoAuthInitWithCredentials: For second client credentials: "
+ credentials2 + " : " + javaProps2);
client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient",
@@ -498,9 +498,9 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
Properties javaProps = gen.getJavaProperties();
String authInit = gen.getAuthInit();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testInvalidAuthenticator: Using scheme: " + gen.classCode());
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testInvalidAuthenticator: Using authinit: " + authInit);
// Start the server with invalid authenticator
@@ -514,7 +514,7 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
// Trying to create the region on client should throw a security exception
Properties credentials = gen.getValidCredentials(1);
javaProps = gen.getJavaProperties();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testInvalidAuthenticator: For first client credentials: "
+ credentials + " : " + javaProps);
client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient",
@@ -526,7 +526,7 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
// Also test with invalid credentials
credentials = gen.getInvalidCredentials(1);
javaProps = gen.getJavaProperties();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testInvalidAuthenticator: For first client credentials: "
+ credentials + " : " + javaProps);
client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient",
@@ -546,10 +546,10 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
String authenticator = gen.getAuthenticator();
String authInit = gen.getAuthInit();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testNoAuthenticatorWithCredentials: Using scheme: "
+ gen.classCode());
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testNoAuthenticatorWithCredentials: Using authinit: " + authInit);
// Start the servers with no authenticator
@@ -567,12 +567,12 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
// valid/invalid credentials when none are required on the server side
Properties credentials1 = gen.getValidCredentials(3);
Properties javaProps1 = gen.getJavaProperties();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testNoAuthenticatorWithCredentials: For first client credentials: "
+ credentials1 + " : " + javaProps1);
Properties credentials2 = gen.getInvalidCredentials(5);
Properties javaProps2 = gen.getJavaProperties();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testNoAuthenticatorWithCredentials: For second client credentials: "
+ credentials2 + " : " + javaProps2);
client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient",
@@ -602,11 +602,11 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
String authenticator = gen.getAuthenticator();
String authInit = gen.getAuthInit();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testCredentialsWithFailover: Using scheme: " + gen.classCode());
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testCredentialsWithFailover: Using authenticator: " + authenticator);
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testCredentialsWithFailover: Using authinit: " + authInit);
// Start the first server
@@ -625,12 +625,12 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
// Start the clients with valid credentials
Properties credentials1 = gen.getValidCredentials(5);
Properties javaProps1 = gen.getJavaProperties();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testCredentialsWithFailover: For first client credentials: "
+ credentials1 + " : " + javaProps1);
Properties credentials2 = gen.getValidCredentials(6);
Properties javaProps2 = gen.getJavaProperties();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testCredentialsWithFailover: For second client credentials: "
+ credentials2 + " : " + javaProps2);
client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient",
@@ -683,7 +683,7 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
// Verify that the creation of region throws security exception
credentials1 = gen.getInvalidCredentials(7);
javaProps1 = gen.getJavaProperties();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testCredentialsWithFailover: For first client invalid credentials: "
+ credentials1 + " : " + javaProps1);
client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient",
@@ -711,12 +711,12 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
String authenticator = gen.getAuthenticator();
String authInit = gen.getAuthInit();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testCredentialsForNotifications: Using scheme: " + gen.classCode());
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testCredentialsForNotifications: Using authenticator: "
+ authenticator);
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testCredentialsForNotifications: Using authinit: " + authInit);
// Start the first server
@@ -735,12 +735,12 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
// Start the clients with valid credentials
Properties credentials1 = gen.getValidCredentials(3);
Properties javaProps1 = gen.getJavaProperties();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testCredentialsForNotifications: For first client credentials: "
+ credentials1 + " : " + javaProps1);
Properties credentials2 = gen.getValidCredentials(4);
Properties javaProps2 = gen.getJavaProperties();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testCredentialsForNotifications: For second client credentials: "
+ credentials2 + " : " + javaProps2);
client1.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient",
@@ -806,7 +806,7 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
// Verify that the creation of region throws security exception
credentials2 = gen.getInvalidCredentials(3);
javaProps2 = gen.getJavaProperties();
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testCredentialsForNotifications: For second client invalid credentials: "
+ credentials2 + " : " + javaProps2);
client2.invoke(ClientAuthenticationDUnitTest.class, "createCacheClient",
@@ -846,7 +846,7 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
new Integer(SecurityTestUtil.AUTHFAIL_EXCEPTION) });
}
else {
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testCredentialsForNotifications: Skipping invalid authenticator for scheme ["
+ gen.classCode() + "] which has no authInit");
}
@@ -877,7 +877,7 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
new Integer(SecurityTestUtil.AUTHREQ_EXCEPTION) });
}
else {
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testCredentialsForNotifications: Skipping null authInit for scheme ["
+ gen.classCode() + "] which has no authInit");
}
@@ -937,7 +937,7 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
new Object[] { new Integer(4) });
}
else {
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"testCredentialsForNotifications: Skipping scheme ["
+ gen.classCode() + "] which has no authenticator");
}