http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java index 6533869..e501898 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java @@ -49,7 +49,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings; 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.SerializableCallable; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -361,8 +361,8 @@ public class ClientHealthStatsDUnitTest extends DistributedTestCase { String[] clientIds = bean.getClientIds(); assertTrue(clientIds.length == 2); - LogWriterSupport.getLogWriter().info("<ExpectedString> ClientId-1 of the Server is " + clientIds[0] + "</ExpectedString> "); - LogWriterSupport.getLogWriter().info("<ExpectedString> ClientId-2 of the Server is " + clientIds[1] + "</ExpectedString> "); + LogWriterUtils.getLogWriter().info("<ExpectedString> ClientId-1 of the Server is " + clientIds[0] + "</ExpectedString> "); + LogWriterUtils.getLogWriter().info("<ExpectedString> ClientId-2 of the Server is " + clientIds[1] + "</ExpectedString> "); ClientHealthStatus[] clientStatuses = bean.showAllClientStats(); @@ -372,15 +372,15 @@ public class ClientHealthStatsDUnitTest extends DistributedTestCase { ClientHealthStatus clientStatus2 = bean.showClientStats(clientIds[1]); assertNotNull(clientStatus1); assertNotNull(clientStatus2); - LogWriterSupport.getLogWriter().info("<ExpectedString> ClientStats-1 of the Server is " + clientStatus1 + "</ExpectedString> "); - LogWriterSupport.getLogWriter().info("<ExpectedString> ClientStats-2 of the Server is " + clientStatus2 + "</ExpectedString> "); + LogWriterUtils.getLogWriter().info("<ExpectedString> ClientStats-1 of the Server is " + clientStatus1 + "</ExpectedString> "); + LogWriterUtils.getLogWriter().info("<ExpectedString> ClientStats-2 of the Server is " + clientStatus2 + "</ExpectedString> "); - LogWriterSupport.getLogWriter().info("<ExpectedString> clientStatuses " + clientStatuses + "</ExpectedString> "); + LogWriterUtils.getLogWriter().info("<ExpectedString> clientStatuses " + clientStatuses + "</ExpectedString> "); assertNotNull(clientStatuses); assertTrue(clientStatuses.length == 2); for (ClientHealthStatus status : clientStatuses) { - LogWriterSupport.getLogWriter().info("<ExpectedString> ClientStats of the Server is " + status + "</ExpectedString> "); + LogWriterUtils.getLogWriter().info("<ExpectedString> ClientStats of the Server is " + status + "</ExpectedString> "); }
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.java index 03e32fe..827d9b1 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.java @@ -29,7 +29,7 @@ import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedM import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.management.internal.MBeanJMXAdapter; import com.gemstone.gemfire.management.internal.SystemManagementService; -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; @@ -202,7 +202,7 @@ public class DLockManagementDUnitTest extends ManagementTestBase { assertNotNull(grantor); - LogWriterSupport.getLogWriter().info("In identifyLockGrantor - grantor is " + grantor); + LogWriterUtils.getLogWriter().info("In identifyLockGrantor - grantor is " + grantor); @@ -340,10 +340,10 @@ public class DLockManagementDUnitTest extends ManagementTestBase { assertNotNull(bean); String[] listHeldLock = bean.listHeldLocks(); assertEquals(listHeldLock.length, 1); - LogWriterSupport.getLogWriter().info("List Of Lock Object is " + listHeldLock[0]); + LogWriterUtils.getLogWriter().info("List Of Lock Object is " + listHeldLock[0]); Map<String, String> lockThreadMap = bean.listThreadsHoldingLock(); assertEquals(lockThreadMap.size(), 1); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "List Of Lock Thread is " + lockThreadMap.toString()); } }; @@ -376,10 +376,10 @@ public class DLockManagementDUnitTest extends ManagementTestBase { assertNotNull(bean); String[] listHeldLock = bean.listHeldLocks(); assertEquals(listHeldLock.length, 1); - LogWriterSupport.getLogWriter().info("List Of Lock Object is " + listHeldLock[0]); + LogWriterUtils.getLogWriter().info("List Of Lock Object is " + listHeldLock[0]); Map<String, String> lockThreadMap = bean.listThreadsHoldingLock(); assertEquals(lockThreadMap.size(), 1); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "List Of Lock Thread is " + lockThreadMap.toString()); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java index b796b49..6d7b799 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java @@ -178,9 +178,9 @@ public class DiskManagementDUnitTest extends ManagementTestBase { VM vm1 = getManagedNodeList().get(1); VM vm2 = getManagedNodeList().get(2); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Creating region in VM0"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Creating region in VM0"); createPersistentRegion(vm0); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Creating region in VM1"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Creating region in VM1"); createPersistentRegion(vm1); putAnEntry(vm0); @@ -199,12 +199,12 @@ public class DiskManagementDUnitTest extends ManagementTestBase { } }); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("closing region in vm0"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("closing region in vm0"); closeRegion(vm0); updateTheEntry(vm1); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("closing region in vm1"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("closing region in vm1"); closeRegion(vm1); AsyncInvocation future = createPersistentRegionAsync(vm0); waitForBlockedInitialization(vm0); @@ -219,14 +219,14 @@ public class DiskManagementDUnitTest extends ManagementTestBase { DistributedSystemMXBean bean = service.getDistributedSystemMXBean(); PersistentMemberDetails[] missingDiskStores = bean .listMissingDiskStores(); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("waiting members=" + missingDiskStores); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("waiting members=" + missingDiskStores); assertNotNull(missingDiskStores); assertEquals(1, missingDiskStores.length); for (PersistentMemberDetails id : missingDiskStores) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Missing DiskStoreID is =" + id.getDiskStoreId()); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Missing Host is =" + id.getHost()); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Missing Directory is =" + id.getDirectory()); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Missing DiskStoreID is =" + id.getDiskStoreId()); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Missing Host is =" + id.getHost()); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Missing Directory is =" + id.getDirectory()); try { bean.revokeMissingDiskStores(id.getDiskStoreId()); @@ -379,11 +379,11 @@ public class DiskManagementDUnitTest extends ManagementTestBase { Cache cache = getCache(); Region region = cache.getRegion(REGION_NAME); DiskRegion dr = ((LocalRegion) region).getDiskRegion(); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("putting key1"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("putting key1"); region.put("key1", "value1"); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("putting key2"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("putting key2"); region.put("key2", "value2"); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("removing key2"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("removing key2"); region.remove("key2"); // now that it is compactable the following forceCompaction should // go ahead and do a roll and compact it. @@ -415,7 +415,7 @@ public class DiskManagementDUnitTest extends ManagementTestBase { assertTrue(compactedDiskStores.length > 0); for (int i = 0; i < compactedDiskStores.length; i++) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info( + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info( "<ExpectedString> Compacted Store " + i + " " + compactedDiskStores[i] + "</ExpectedString> "); } @@ -465,13 +465,13 @@ public class DiskManagementDUnitTest extends ManagementTestBase { String[] allDisks = bean.listDiskStores(true); assertNotNull(allDisks); List<String> listString = Arrays.asList(allDisks); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info( + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info( "<ExpectedString> Remote All Disk Stores Are " + listString.toString() + "</ExpectedString> "); String[] compactedDiskStores = bean.compactAllDiskStores(); assertTrue(compactedDiskStores.length > 0); for (int i = 0; i < compactedDiskStores.length; i++) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info( + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info( "<ExpectedString> Remote Compacted Store " + i + " " + compactedDiskStores[i] + "</ExpectedString> "); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java index bb6ae96..85a92dc 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java @@ -50,7 +50,7 @@ import com.gemstone.gemfire.management.internal.SystemManagementService; import com.gemstone.gemfire.management.internal.beans.MemberMBean; import com.gemstone.gemfire.management.internal.beans.SequenceNumber; 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.Host; import com.gemstone.gemfire.test.dunit.SerializableCallable; import com.gemstone.gemfire.test.dunit.SerializableRunnable; @@ -308,7 +308,7 @@ public class DistributedSystemDUnitTest extends ManagementTestBase { null); notificationListenerMap.put(objectName, listener); } catch (InstanceNotFoundException e) { - LogWriterSupport.getLogWriter().error(e); + LogWriterUtils.getLogWriter().error(e); } } } @@ -387,9 +387,9 @@ public class DistributedSystemDUnitTest extends ManagementTestBase { try { mbeanServer.removeNotificationListener(objectName, listener); } catch (ListenerNotFoundException e) { - LogWriterSupport.getLogWriter().error(e); + LogWriterUtils.getLogWriter().error(e); } catch (InstanceNotFoundException e) { - LogWriterSupport.getLogWriter().error(e); + LogWriterUtils.getLogWriter().error(e); } } @@ -454,7 +454,7 @@ public class DistributedSystemDUnitTest extends ManagementTestBase { try { mbeanServer.removeNotificationListener(objectName, listener); } catch (InstanceNotFoundException e) { - LogWriterSupport.getLogWriter().error(e); + LogWriterUtils.getLogWriter().error(e); } catch (ListenerNotFoundException e) { // TODO: apparently there is never a notification listener on any these mbeans at this point // fix this test so it doesn't hit these unexpected exceptions -- getLogWriter().error(e); @@ -484,7 +484,7 @@ public class DistributedSystemDUnitTest extends ManagementTestBase { } catch (ListenerNotFoundException e) { // Expected Exception Do nothing } catch (InstanceNotFoundException e) { - LogWriterSupport.getLogWriter().error(e); + LogWriterUtils.getLogWriter().error(e); } } } @@ -733,10 +733,10 @@ public class DistributedSystemDUnitTest extends ManagementTestBase { Iterator<DistributedMember> memberIt = otherMemberSet.iterator(); while (memberIt.hasNext()) { DistributedMember member = memberIt.next(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "JVM Metrics For Member " + member.getId() + ":" + bean.showJVMMetrics(member.getId())); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "OS Metrics For Member " + member.getId() + ":" + bean.showOSMetrics(member.getId())); } @@ -782,7 +782,7 @@ public class DistributedSystemDUnitTest extends ManagementTestBase { DistributedSystemMXBean bean = service.getDistributedSystemMXBean(); assertNotNull(service.getDistributedSystemMXBean()); bean.shutDownAllMembers(); - Wait.staticPause(2000); + Wait.pause(2000); assertEquals( cache.getDistributedSystem().getAllOtherMembers().size(), 1); return null; @@ -809,7 +809,7 @@ public class DistributedSystemDUnitTest extends ManagementTestBase { waitForAllMembers(4); for(int i =0; i< bean.listMemberObjectNames().length ; i++){ - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "ObjectNames Of the Mmeber" + bean.listMemberObjectNames()[i] ); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java index fdc6367..3f1c472 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java @@ -33,7 +33,7 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.management.internal.ManagementConstants; 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.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -167,7 +167,7 @@ public class LocatorManagementDUnitTest extends ManagementTestBase { props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0"); props.setProperty(DistributionConfig.LOCATORS_NAME, ""); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterSupport.getDUnitLogLevel()); + props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); InetAddress bindAddr = null; try { @@ -229,8 +229,8 @@ public class LocatorManagementDUnitTest extends ManagementTestBase { LocatorMXBean bean = service.getLocalLocatorMXBean(); assertNotNull(bean); assertEquals(locPort, bean.getPort()); - LogWriterSupport.getLogWriter().info("Log of Locator" + bean.viewLog()); - LogWriterSupport.getLogWriter().info("BindAddress" + bean.getBindAddress()); + LogWriterUtils.getLogWriter().info("Log of Locator" + bean.viewLog()); + LogWriterUtils.getLogWriter().info("BindAddress" + bean.getBindAddress()); assertEquals(isPeer, bean.isPeerLocator()); return null; } @@ -255,8 +255,8 @@ public class LocatorManagementDUnitTest extends ManagementTestBase { LocatorMXBean bean = MBeanUtil.getLocatorMbeanProxy(member); assertNotNull(bean); - LogWriterSupport.getLogWriter().info("Log of Locator" + bean.viewLog()); - LogWriterSupport.getLogWriter().info("BindAddress" + bean.getBindAddress()); + LogWriterUtils.getLogWriter().info("Log of Locator" + bean.viewLog()); + LogWriterUtils.getLogWriter().info("BindAddress" + bean.getBindAddress()); return null; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/MBeanUtil.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/MBeanUtil.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/MBeanUtil.java index af085b3..6c3c8e7 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/MBeanUtil.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/MBeanUtil.java @@ -37,7 +37,7 @@ import com.gemstone.gemfire.management.internal.MBeanJMXAdapter; import com.gemstone.gemfire.management.internal.ManagementConstants; import com.gemstone.gemfire.management.internal.SystemManagementService; import com.gemstone.gemfire.test.dunit.DistributedTestCase; -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; @@ -538,7 +538,7 @@ public class MBeanUtil { try { propertyName = attributeInfo.getName(); propertyValue = mbeanServer.getAttribute(objName, propertyName); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> " + propertyName + " = " + propertyValue + "</ExpectedString> "); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java index 0c2d24b..d5b3178 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java @@ -558,7 +558,7 @@ public class ManagementTestBase extends DistributedTestCase { RegionFactory rf = cache .createRegionFactory(RegionShortcut.LOCAL); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Creating Local Region"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Creating Local Region"); rf.create(localRegionName); } @@ -581,7 +581,7 @@ public class ManagementTestBase extends DistributedTestCase { SystemManagementService service = (SystemManagementService) getManagementService(); Region region = cache.getRegion(parentRegionPath); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Creating Sub Region"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Creating Sub Region"); region.createSubregion(subregionName, region.getAttributes()); } @@ -624,7 +624,7 @@ public class ManagementTestBase extends DistributedTestCase { SystemManagementService service = (SystemManagementService) getManagementService(); RegionFactory rf = cache.createRegionFactory(RegionShortcut.REPLICATE); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Creating Dist Region"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Creating Dist Region"); rf.create(regionName); } @@ -646,7 +646,7 @@ public class ManagementTestBase extends DistributedTestCase { SystemManagementService service = (SystemManagementService) getManagementService(); RegionFactory rf = cache .createRegionFactory(RegionShortcut.PARTITION_REDUNDANT); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Creating Par Region"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Creating Par Region"); rf.create(partitionRegionName); } @@ -665,7 +665,7 @@ public class ManagementTestBase extends DistributedTestCase { public void run() { GemFireCacheImpl cache = GemFireCacheImpl.getInstance(); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Closing Dist Region"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Closing Dist Region"); Region region = cache.getRegion(regionPath); region.close(); @@ -689,7 +689,7 @@ public class ManagementTestBase extends DistributedTestCase { public boolean done() { if (bean.listMemberObjectNames() != null) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info( + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info( "Member Length " + bean.listMemberObjectNames().length); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java index 3db8048..284e7f8 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java @@ -26,7 +26,7 @@ import com.gemstone.gemfire.internal.NanoTimer; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.process.PidUnavailableException; import com.gemstone.gemfire.internal.process.ProcessUtils; -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; @@ -113,7 +113,7 @@ public class MemberMBeanAttributesDUnitTest extends ManagementTestBase { public void run() { GemFireCacheImpl cache = GemFireCacheImpl.getInstance(); RegionFactory rf = cache.createRegionFactory(RegionShortcut.REPLICATE); - LogWriterSupport.getLogWriter().info("Creating Dist Region"); + LogWriterUtils.getLogWriter().info("Creating Dist Region"); rf.create("testRegion1"); rf.create("testRegion2"); rf.create("testRegion3"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java index 84a270f..f98af24 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java @@ -53,7 +53,7 @@ import com.gemstone.gemfire.management.internal.cli.json.TypedJson; import com.gemstone.gemfire.pdx.PdxInstance; import com.gemstone.gemfire.pdx.PdxInstanceFactory; import com.gemstone.gemfire.pdx.internal.PdxInstanceFactoryImpl; -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.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; @@ -172,7 +172,7 @@ public class QueryDataDUnitTest extends ManagementTestBase { Region region = cache.getRegion(regionName); for (int j = from; j < to; j++) region.put(new Integer(j), portfolio[j]); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryDUnitHelper#getCacheSerializableRunnableForPRPuts: Inserted Portfolio data on Region " + regionName); @@ -407,7 +407,7 @@ public class QueryDataDUnitTest extends ManagementTestBase { if (jsonString1.contains("result")) { JSONObject jsonObj = new JSONObject(jsonString1); } else { - LogWriterSupport.getLogWriter().info("Failed Test String" + queriesForRR[i] + " is = " + jsonString1); + LogWriterUtils.getLogWriter().info("Failed Test String" + queriesForRR[i] + " is = " + jsonString1); fail("Join on Replicated did not work."); } } @@ -800,19 +800,19 @@ public class QueryDataDUnitTest extends ManagementTestBase { }, MAX_WAIT, 1000, true); - LogWriterSupport.getLogWriter().info("member1RealData is = " + member1RealData); - LogWriterSupport.getLogWriter().info("member2RealData is = " + member2RealData); - LogWriterSupport.getLogWriter().info("member3RealData is = " + member3RealData); + LogWriterUtils.getLogWriter().info("member1RealData is = " + member1RealData); + LogWriterUtils.getLogWriter().info("member2RealData is = " + member2RealData); + LogWriterUtils.getLogWriter().info("member3RealData is = " + member3RealData); String member1Result = bean.queryData(query, member1.getId(), 0); - LogWriterSupport.getLogWriter().info("member1Result " + query + " is = " + member1Result); + LogWriterUtils.getLogWriter().info("member1Result " + query + " is = " + member1Result); String member2Result = bean.queryData(query, member2.getId(), 0); - LogWriterSupport.getLogWriter().info("member2Result " + query + " is = " + member2Result); + LogWriterUtils.getLogWriter().info("member2Result " + query + " is = " + member2Result); String member3Result = bean.queryData(query, member3.getId(), 0); - LogWriterSupport.getLogWriter().info("member3Result " + query + " is = " + member3Result); + LogWriterUtils.getLogWriter().info("member3Result " + query + " is = " + member3Result); for (String val : member1RealData) { assertTrue(member1Result.contains(val)); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java index fde678a..4166273 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java @@ -50,7 +50,7 @@ import com.gemstone.gemfire.internal.cache.partitioned.fixed.SingleHopQuarterPar import com.gemstone.gemfire.management.internal.MBeanJMXAdapter; import com.gemstone.gemfire.management.internal.SystemManagementService; import com.gemstone.gemfire.test.dunit.Assert; -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; @@ -443,7 +443,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase { region.put(new Integer(total), array); } assertTrue(bean.getEntrySize() > 0); - LogWriterSupport.getLogWriter().info("DEBUG: EntrySize =" + bean.getEntrySize()); + LogWriterUtils.getLogWriter().info("DEBUG: EntrySize =" + bean.getEntrySize()); @@ -474,7 +474,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase { assertNotNull(bean); assertTrue(bean.getEntrySize() > 0); - LogWriterSupport.getLogWriter().info("DEBUG: EntrySize =" + bean.getEntrySize()); + LogWriterUtils.getLogWriter().info("DEBUG: EntrySize =" + bean.getEntrySize()); } }); @@ -677,14 +677,14 @@ public class RegionManagementDUnitTest extends ManagementTestBase { attr.setPartitionAttributes(paf.create()); fixedPrRegion = cache.createRegion(FIXED_PR_NAME, attr.create()); assertNotNull(fixedPrRegion); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region " + FIXED_PR_NAME + " created Successfully :" + fixedPrRegion.toString()); RegionMXBean bean = service.getLocalRegionMBean(FIXED_PR_PATH); RegionAttributes regAttrs = fixedPrRegion.getAttributes(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "FixedPartitionAttribute From GemFire :" + regAttrs.getPartitionAttributes().getFixedPartitionAttributes()); @@ -701,7 +701,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase { assertEquals(3, fixedPrData.length); for (int i = 0; i < fixedPrData.length; i++) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> Fixed PR Data is " + fixedPrData[i] + "</ExpectedString> "); } @@ -735,7 +735,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase { assertNotNull(fixedPrData); assertEquals(3, fixedPrData.length); for (int i = 0; i < fixedPrData.length; i++) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> Remote PR Data is " + fixedPrData[i] + "</ExpectedString> "); } @@ -774,7 +774,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase { Set<ObjectName> names = service.queryMBeanNames(member); if(names != null){ for(ObjectName name : names){ - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> ObjectNames arr" + name + "</ExpectedString> "); } @@ -909,10 +909,10 @@ public class RegionManagementDUnitTest extends ManagementTestBase { EvictionAttributesData evictionData = bean.listEvictionAttributes(); assertNotNull(membershipData); assertNotNull(evictionData); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> Membership Data is " + membershipData.toString() + "</ExpectedString> "); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> Eviction Data is " + membershipData.toString() + "</ExpectedString> "); @@ -987,15 +987,15 @@ public class RegionManagementDUnitTest extends ManagementTestBase { // Check Stats related Data // Add Mock testing - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "<ExpectedString> CacheListenerCallsAvgLatency is " + bean.getCacheListenerCallsAvgLatency() + "</ExpectedString> "); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> CacheWriterCallsAvgLatency is " + bean.getCacheWriterCallsAvgLatency() + "</ExpectedString> "); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> CreatesRate is " + bean.getCreatesRate() + "</ExpectedString> "); @@ -1096,10 +1096,10 @@ public class RegionManagementDUnitTest extends ManagementTestBase { EvictionAttributesData evictionData = bean.listEvictionAttributes(); assertNotNull(membershipData); assertNotNull(evictionData); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> Membership Data is " + membershipData.toString() + "</ExpectedString> "); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> Eviction Data is " + membershipData.toString() + "</ExpectedString> "); } @@ -1147,7 +1147,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase { try { bean = service.getLocalRegionMBean(REGION_PATH); } catch (ManagementException mgtEx) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> Expected Exception " + mgtEx.getLocalizedMessage() + "</ExpectedString> "); } @@ -1172,12 +1172,12 @@ public class RegionManagementDUnitTest extends ManagementTestBase { public void run() { GemFireCacheImpl cache = GemFireCacheImpl.getInstance(); ManagementService service = getManagementService(); - LogWriterSupport.getLogWriter().info("Closing Par Region"); + LogWriterUtils.getLogWriter().info("Closing Par Region"); RegionMXBean bean = null; try { bean = service.getLocalRegionMBean(PARTITIONED_REGION_PATH); } catch (ManagementException mgtEx) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> Expected Exception " + mgtEx.getLocalizedMessage() + "</ExpectedString> "); } @@ -1198,14 +1198,14 @@ public class RegionManagementDUnitTest extends ManagementTestBase { public void run() { GemFireCacheImpl cache = GemFireCacheImpl.getInstance(); ManagementService service = getManagementService(); - LogWriterSupport.getLogWriter().info("Closing Fixed Par Region"); + LogWriterUtils.getLogWriter().info("Closing Fixed Par Region"); Region region = cache.getRegion(FIXED_PR_PATH); region.close(); RegionMXBean bean = null; try { bean = service.getLocalRegionMBean(FIXED_PR_PATH); } catch (ManagementException mgtEx) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> Expected Exception " + mgtEx.getLocalizedMessage() + "</ExpectedString> "); } @@ -1426,7 +1426,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase { Notification rn = notification; assertTrue(rn.getType().equals(JMXNotificationType.REGION_CREATED) || rn.getType().equals(JMXNotificationType.REGION_CLOSED)); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> Member Level Notifications" + rn.toString() + "</ExpectedString> "); } @@ -1445,7 +1445,7 @@ public class RegionManagementDUnitTest extends ManagementTestBase { public void handleNotification(Notification notification, Object handback) { assertNotNull(notification); Notification rn = notification; - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedString> Distributed System Notifications" + rn.toString() + "</ExpectedString> "); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java index 17a9bd0..c25a1db 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java @@ -50,7 +50,7 @@ import com.gemstone.gemfire.management.membership.MembershipEvent; import com.gemstone.gemfire.management.membership.MembershipListener; import com.gemstone.gemfire.management.membership.UniversalMembershipListenerAdapter; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.NetworkSupport; +import com.gemstone.gemfire.test.dunit.NetworkUtils; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -378,7 +378,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes final int[] ports = new int[1]; // create BridgeServer in controller vm... - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] Create BridgeServer"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] Create BridgeServer"); getSystem(); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -392,9 +392,9 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes final DistributedMember serverMember = getDistributedMember(); final Properties serverProperties = getSystem().getProperties(); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] ports[0]=" + ports[0]); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] serverMemberId=" + serverMemberId); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] serverMember=" + serverMember); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] ports[0]=" + ports[0]); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] serverMemberId=" + serverMemberId); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] serverMember=" + serverMember); // register the bridge listener ClientMembership.registerClientMembershipListener(bridgeListener); @@ -413,14 +413,14 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes new CacheSerializableRunnable("Create bridge client") { @Override public void run2() throws CacheException { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] create bridge client"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] create bridge client"); Properties config = new Properties(); config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); config.setProperty(DistributionConfig.LOCATORS_NAME, ""); getSystem(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); - ClientServerTestCase.configureConnectionPool(factory, NetworkSupport.getServerHostName(host), ports, false, -1, -1, null); + ClientServerTestCase.configureConnectionPool(factory, NetworkUtils.getServerHostName(host), ports, false, -1, -1, null); createRegion(name, factory.create()); assertNotNull(getRootRegion().getSubregion(name)); } @@ -446,7 +446,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] assert server detected client join"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] assert server detected client join"); assertTrue(firedBridge[JOINED]); assertEquals(clientMember, memberBridge[JOINED]); //as of 6.1 the id can change when a bridge is created or a connection pool is created @@ -492,7 +492,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes vm0.invoke(new SerializableRunnable("Wait for client to fully connect") { public void run() { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] wait for client to fully connect"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] wait for client to fully connect"); final String pl = getRootRegion().getSubregion(name).getAttributes().getPoolName(); PoolImpl pi = (PoolImpl)PoolManager.find(pl); @@ -502,7 +502,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes vm0.invoke(new SerializableRunnable("Close bridge client region") { public void run() { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] close bridge client region"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] close bridge client region"); getRootRegion().getSubregion(name).close(); PoolManager.close(); } @@ -519,7 +519,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] assert server detected client left"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] assert server detected client left"); assertFalse(firedBridge[JOINED]); assertNull(memberIdBridge[JOINED]); @@ -581,7 +581,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] assert server detected client re-join"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] assert server detected client re-join"); assertTrue(firedBridge[JOINED]); assertEquals(clientMember, memberBridge[JOINED]); assertEquals(clientMemberId, memberIdBridge[JOINED]); @@ -626,7 +626,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes vm0.invoke(new SerializableRunnable("Wait for client to fully connect") { public void run() { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] wait for client to fully connect"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] wait for client to fully connect"); final String pl = getRootRegion().getSubregion(name).getAttributes().getPoolName(); PoolImpl pi = (PoolImpl)PoolManager.find(pl); @@ -638,7 +638,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes try { vm0.invoke(new SerializableRunnable("Stop bridge client") { public void run() { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] Stop bridge client"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] Stop bridge client"); getRootRegion().getSubregion(name).close(); PoolManager.close(); } @@ -655,7 +655,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testLonerClientEventsInServer] assert server detected client crashed"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testLonerClientEventsInServer] assert server detected client crashed"); assertFalse(firedBridge[JOINED]); assertNull(memberIdBridge[JOINED]); assertNull(memberBridge[JOINED]); @@ -762,7 +762,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes new UniversalMembershipListenerAdapter() { @Override public synchronized void memberJoined(MembershipEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] memberJoined >" + event.getMemberId() + "<"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] memberJoined >" + event.getMemberId() + "<"); firedAdapterDuplicate[JOINED] = firedAdapter[JOINED]; firedAdapter[JOINED] = true; memberAdapter[JOINED] = event.getDistributedMember(); @@ -775,7 +775,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } @Override public synchronized void memberLeft(MembershipEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] memberLeft >" + event.getMemberId() + "<"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] memberLeft >" + event.getMemberId() + "<"); firedAdapterDuplicate[LEFT] = firedAdapter[LEFT]; firedAdapter[LEFT] = true; memberAdapter[LEFT] = event.getDistributedMember(); @@ -788,7 +788,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } @Override public synchronized void memberCrashed(MembershipEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] memberCrashed >" + event.getMemberId() + "<"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] memberCrashed >" + event.getMemberId() + "<"); firedAdapterDuplicate[CRASHED] = firedAdapter[CRASHED]; firedAdapter[CRASHED] = true; memberAdapter[CRASHED] = event.getDistributedMember(); @@ -834,7 +834,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes final int[] ports = new int[1]; // create BridgeServer in controller vm... - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] Create BridgeServer"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] Create BridgeServer"); getSystem(); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -854,9 +854,9 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes serverProperties.remove(DistributionConfig.SSL_PROTOCOLS_NAME); serverProperties.remove(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] ports[0]=" + ports[0]); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] serverMemberId=" + serverMemberId); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] serverMember=" + serverMember); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] ports[0]=" + ports[0]); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] serverMemberId=" + serverMemberId); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] serverMember=" + serverMember); // register the bridge listener ClientMembership.registerClientMembershipListener(bridgeListener); @@ -875,12 +875,12 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes new CacheSerializableRunnable("Create bridge client") { @Override public void run2() throws CacheException { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] create system bridge client"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] create system bridge client"); assertTrue(getSystem(serverProperties).isConnected()); assertFalse(getCache().isClosed()); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); - ClientServerTestCase.configureConnectionPool(factory, NetworkSupport.getServerHostName(host), ports, false, -1, -1, null); + ClientServerTestCase.configureConnectionPool(factory, NetworkUtils.getServerHostName(host), ports, false, -1, -1, null); createRegion(name, factory.create()); assertNotNull(getRootRegion().getSubregion(name)); } @@ -910,7 +910,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client join"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client join"); assertFalse(firedSystemDuplicate); assertFalse(firedAdapterDuplicate); assertFalse(firedBridgeDuplicate); @@ -959,7 +959,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes vm0.invoke(new SerializableRunnable("Wait for client to fully connect") { public void run() { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect"); final String pl = getRootRegion().getSubregion(name).getAttributes().getPoolName(); PoolImpl pi = (PoolImpl)PoolManager.find(pl); @@ -970,7 +970,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes // close bridge client region vm0.invoke(new SerializableRunnable("Close bridge client region") { public void run() { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] close bridge client region"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] close bridge client region"); getRootRegion().getSubregion(name).close(); PoolManager.close(); } @@ -987,7 +987,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client left"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client left"); assertFalse(firedSystemDuplicate); assertFalse(firedAdapterDuplicate); assertFalse(firedBridgeDuplicate); @@ -1052,7 +1052,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client re-join"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client re-join"); assertFalse(firedSystemDuplicate); assertFalse(firedAdapterDuplicate); assertFalse(firedBridgeDuplicate); @@ -1101,7 +1101,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes vm0.invoke(new SerializableRunnable("Wait for client to fully connect") { public void run() { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect"); final String pl = getRootRegion().getSubregion(name).getAttributes().getPoolName(); PoolImpl pi = (PoolImpl)PoolManager.find(pl); @@ -1112,7 +1112,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes // have bridge client disconnect from system vm0.invoke(new SerializableRunnable("Disconnect bridge client") { public void run() { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] disconnect bridge client"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] disconnect bridge client"); closeCache(); disconnectFromDS(); } @@ -1134,7 +1134,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client left"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client left"); assertFalse(firedSystemDuplicate); assertFalse(firedAdapterDuplicate); assertFalse(firedBridgeDuplicate); @@ -1204,7 +1204,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client re-join"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client re-join"); assertFalse(firedSystemDuplicate); assertFalse(firedAdapterDuplicate); assertFalse(firedBridgeDuplicate); @@ -1253,7 +1253,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes vm0.invoke(new SerializableRunnable("Wait for client to fully connect") { public void run() { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect"); final String pl = getRootRegion().getSubregion(name).getAttributes().getPoolName(); PoolImpl pi = (PoolImpl)PoolManager.find(pl); @@ -1266,7 +1266,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes try { vm0.invoke(new SerializableRunnable("Close bridge client region") { public void run() { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] close bridge client region"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] close bridge client region"); getRootRegion().getSubregion(name).close(); PoolManager.close(); } @@ -1283,7 +1283,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client crashed"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client crashed"); assertFalse(firedSystemDuplicate); assertFalse(firedAdapterDuplicate); assertFalse(firedBridgeDuplicate); @@ -1337,7 +1337,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes * Note: This probably won't work if the pool has more than one Endpoint. */ protected void waitForClientToFullyConnect(final PoolImpl pool) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[waitForClientToFullyConnect]"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[waitForClientToFullyConnect]"); final long failMillis = System.currentTimeMillis() + JOIN_FAIL_MILLIS; boolean fullyConnected = false; while (!fullyConnected) { @@ -1350,7 +1350,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes + " connections were created.", System.currentTimeMillis() < failMillis); } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[waitForClientToFullyConnect] fullyConnected=" + fullyConnected); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[waitForClientToFullyConnect] fullyConnected=" + fullyConnected); } /** @@ -1461,7 +1461,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes new UniversalMembershipListenerAdapter() { @Override public synchronized void memberJoined(MembershipEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInSystemClient] memberJoined >" + event.getMemberId() + "<"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInSystemClient] memberJoined >" + event.getMemberId() + "<"); firedAdapterDuplicate[JOINED] = firedAdapter[JOINED]; firedAdapter[JOINED] = true; memberAdapter[JOINED] = event.getDistributedMember(); @@ -1474,7 +1474,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } @Override public synchronized void memberLeft(MembershipEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInSystemClient] memberLeft >" + event.getMemberId() + "<"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInSystemClient] memberLeft >" + event.getMemberId() + "<"); firedAdapterDuplicate[LEFT] = firedAdapter[LEFT]; firedAdapter[LEFT] = true; memberAdapter[LEFT] = event.getDistributedMember(); @@ -1487,7 +1487,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } @Override public synchronized void memberCrashed(MembershipEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInSystemClient] memberCrashed >" + event.getMemberId() + "<"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInSystemClient] memberCrashed >" + event.getMemberId() + "<"); firedAdapterDuplicate[CRASHED] = firedAdapter[CRASHED]; firedAdapter[CRASHED] = true; memberAdapter[CRASHED] = event.getDistributedMember(); @@ -1535,7 +1535,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes assertTrue(ports[0] != 0); // create BridgeServer in controller vm... - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[doTestSystemClientEventsInServer] Create BridgeServer"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] Create BridgeServer"); getSystem(); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -1554,9 +1554,9 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes serverProperties.remove(DistributionConfig.SSL_PROTOCOLS_NAME); serverProperties.remove(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInPeerSystem] ports[0]=" + ports[0]); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInPeerSystem] serverMemberId=" + serverMemberId); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInPeerSystem] serverMember=" + serverMember); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] ports[0]=" + ports[0]); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] serverMemberId=" + serverMemberId); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] serverMember=" + serverMember); GemFireCacheImpl cache = GemFireCacheImpl.getExisting(); assertNotNull(cache); @@ -1572,7 +1572,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes new CacheSerializableRunnable("Create Peer Cache") { @Override public void run2() throws CacheException { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInPeerSystem] Create Peer cache"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] Create Peer cache"); getSystem(serverProperties); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -1589,8 +1589,8 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes DistributedMember peerMember = (DistributedMember) vm0.invoke( UniversalMembershipListenerAdapterDUnitTest.class, "getDistributedMember"); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInPeerSystem] peerMemberId=" + peerMemberId); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInPeerSystem] peerMember=" + peerMember); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] peerMemberId=" + peerMemberId); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] peerMember=" + peerMember); @@ -1605,7 +1605,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInPeerSystem] assert server detected peer join"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] assert server detected peer join"); assertFalse(firedSystemDuplicate); // TODO: sometimes get adapter duplicate since memberId isn't endpoint // initial impl uses Endpoint.toString() for memberId of server; final @@ -1653,7 +1653,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes try { vm0.invoke(new SerializableRunnable("Disconnect Peer server") { public void run() { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInPeerSystem] disconnect peer server"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] disconnect peer server"); closeCache(); disconnectFromDS(); } @@ -1676,7 +1676,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes ex.remove(); } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInPeerSystem] assert server detected peer crashed"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] assert server detected peer crashed"); assertFalse(firedSystemDuplicate); // TODO: sometimes get adapter duplicate since memberId isn't endpoint // initial impl uses Endpoint.toString() for memberId of server; final @@ -1757,7 +1757,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes new UniversalMembershipListenerAdapter() { @Override public synchronized void memberJoined(MembershipEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] memberJoined >" + event.getMemberId() + "<"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] memberJoined >" + event.getMemberId() + "<"); firedAdapterDuplicate[JOINED] = firedAdapter[JOINED]; firedAdapter[JOINED] = true; memberAdapter[JOINED] = event.getDistributedMember(); @@ -1770,7 +1770,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } @Override public synchronized void memberLeft(MembershipEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] memberLeft >" + event.getMemberId() + "<"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] memberLeft >" + event.getMemberId() + "<"); firedAdapterDuplicate[LEFT] = firedAdapter[LEFT]; firedAdapter[LEFT] = true; memberAdapter[LEFT] = event.getDistributedMember(); @@ -1783,7 +1783,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } @Override public synchronized void memberCrashed(MembershipEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] memberCrashed >" + event.getMemberId() + "<"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] memberCrashed >" + event.getMemberId() + "<"); firedAdapterDuplicate[CRASHED] = firedAdapter[CRASHED]; firedAdapter[CRASHED] = true; memberAdapter[CRASHED] = event.getDistributedMember(); @@ -1830,13 +1830,13 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes { AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET) }; assertTrue(ports[0] != 0); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] create loner bridge client"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] create loner bridge client"); Properties config = new Properties(); config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); config.setProperty(DistributionConfig.LOCATORS_NAME, ""); getSystem(config); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] create system bridge client"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] create system bridge client"); getSystem(); // register the bridge listener @@ -1852,7 +1852,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes new CacheSerializableRunnable("Create BridgeServer") { @Override public void run2() throws CacheException { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] Create BridgeServer"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] Create BridgeServer"); getSystem(); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -1863,7 +1863,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes testServerEventsInLonerClient_port = startBridgeServer(ports[0]); } catch (IOException e) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().error(e); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().error(e); fail(e.getMessage()); } } @@ -1880,14 +1880,14 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes DistributedMember serverMember = (DistributedMember) vm0.invoke( UniversalMembershipListenerAdapterDUnitTest.class, "getDistributedMember"); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] ports[0]=" + ports[0]); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] serverMemberId=" + serverMemberId); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] serverMember=" + serverMember); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] ports[0]=" + ports[0]); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] serverMemberId=" + serverMemberId); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] serverMember=" + serverMember); // create region which connects to bridge server AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); - ClientServerTestCase.configureConnectionPool(factory, NetworkSupport.getServerHostName(host), ports, false, -1, -1, null); + ClientServerTestCase.configureConnectionPool(factory, NetworkUtils.getServerHostName(host), ports, false, -1, -1, null); createRegion(name, factory.create()); assertNotNull(getRootRegion().getSubregion(name)); @@ -1902,7 +1902,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] assert client detected server join"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] assert client detected server join"); // TODO: sometimes get adapter duplicate since memberId isn't endpoint KIRK // initial impl uses Endpoint.toString() for memberId of server; final // impl should have server send its real memberId to client via HandShake @@ -1942,7 +1942,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes assertFalse(isClientAdapter[CRASHED]); resetArraysForTesting(firedAdapter, memberAdapter, memberIdAdapter, isClientAdapter); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] wait for client to fully connect"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] wait for client to fully connect"); final String pl = getRootRegion().getSubregion(name).getAttributes().getPoolName(); PoolImpl pi = (PoolImpl)PoolManager.find(pl); @@ -1971,7 +1971,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes try { vm0.invoke(new SerializableRunnable("Disconnect bridge server") { public void run() { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] disconnect bridge server"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] disconnect bridge server"); closeCache(); } }); @@ -1995,7 +1995,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes lw.info(removeExpected2); } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] assert client detected server crashed"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] assert client detected server crashed"); // TODO: sometimes get adapter duplicate since memberId isn't endpoint KIRK // initial impl uses Endpoint.toString() for memberId of server; final // impl should have server send its real memberId to client via HandShake @@ -2051,9 +2051,9 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes serverMember = (DistributedMember) vm0.invoke( UniversalMembershipListenerAdapterDUnitTest.class, "getDistributedMember"); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] ports[0]=" + ports[0]); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] serverMemberId=" + serverMemberId); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] serverMember=" + serverMember); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] ports[0]=" + ports[0]); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] serverMemberId=" + serverMemberId); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] serverMember=" + serverMember); synchronized(adapter) { if (!firedAdapter[JOINED]) { @@ -2066,7 +2066,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testServerEventsInLonerClient] assert client detected server re-join"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInLonerClient] assert client detected server re-join"); // TODO: sometimes get adapter duplicate since memberId isn't endpoint KIRK // initial impl uses Endpoint.toString() for memberId of server; final // impl should have server send its real memberId to client via HandShake http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java index 0511622..192b458 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java @@ -39,7 +39,7 @@ import com.gemstone.gemfire.management.RegionMXBean; import com.gemstone.gemfire.management.internal.cli.result.CommandResultException; 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; @@ -165,22 +165,22 @@ public class CliUtilDUnitTest extends CacheTestCase { checkBean(REGION_MEMBER1_GROUP2,1) && checkBean(REGION_MEMBER2_GROUP2,1) ; if(!flag){ - LogWriterSupport.getLogWriter().info("Still probing for mbeans"); + LogWriterUtils.getLogWriter().info("Still probing for mbeans"); return false; } else{ - LogWriterSupport.getLogWriter().info("All distributed region mbeans are federated to manager."); + LogWriterUtils.getLogWriter().info("All distributed region mbeans are federated to manager."); return true; } } private boolean checkBean(String string, int memberCount) { DistributedRegionMXBean bean2 = service.getDistributedRegionMXBean(Region.SEPARATOR+string); - LogWriterSupport.getLogWriter().info("DistributedRegionMXBean for region=" + string + " is " + bean2); + LogWriterUtils.getLogWriter().info("DistributedRegionMXBean for region=" + string + " is " + bean2); if(bean2==null) return false; else{ int members = bean2.getMemberCount(); - LogWriterSupport.getLogWriter().info("DistributedRegionMXBean for region=" + string + " is aggregated for " + memberCount + " expected count=" + memberCount); + LogWriterUtils.getLogWriter().info("DistributedRegionMXBean for region=" + string + " is aggregated for " + memberCount + " expected count=" + memberCount); if(members<memberCount){ return false; } @@ -196,7 +196,7 @@ public class CliUtilDUnitTest extends CacheTestCase { }; Wait.waitForCriterion(waitForMaangerMBean, 120000, 2000, true); - LogWriterSupport.getLogWriter().info("Manager federation is complete"); + LogWriterUtils.getLogWriter().info("Manager federation is complete"); } private void registerFunction() { @@ -212,7 +212,7 @@ public class CliUtilDUnitTest extends CacheTestCase { assertNotNull(service.getMemberMXBean()); RegionMXBean bean = service.getLocalRegionMBean(Region.SEPARATOR+regionName); assertNotNull(bean); - LogWriterSupport.getLogWriter().info("Created region=" + regionName + " Bean=" + bean); + LogWriterUtils.getLogWriter().info("Created region=" + regionName + " Bean=" + bean); return region; } @@ -224,7 +224,7 @@ public class CliUtilDUnitTest extends CacheTestCase { localProps.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "false"); int jmxPort = AvailablePortHelper.getRandomAvailableTCPPort(); localProps.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, ""+jmxPort); - LogWriterSupport.getLogWriter().info("Set jmx-port="+ jmxPort); + LogWriterUtils.getLogWriter().info("Set jmx-port="+ jmxPort); getSystem(localProps); getCache(); final ManagementService service = ManagementService.getManagementService(getCache()); @@ -243,7 +243,7 @@ public class CliUtilDUnitTest extends CacheTestCase { final VM vm1 = Host.getHost(0).getVM(0); - LogWriterSupport.getLogWriter().info("testFor - findAllMatchingMembers"); + LogWriterUtils.getLogWriter().info("testFor - findAllMatchingMembers"); vm1.invoke(new SerializableRunnable() { @Override public void run() { @@ -259,7 +259,7 @@ public class CliUtilDUnitTest extends CacheTestCase { } }); - LogWriterSupport.getLogWriter().info("testFor - getDistributedMemberByNameOrId"); + LogWriterUtils.getLogWriter().info("testFor - getDistributedMemberByNameOrId"); vm1.invoke(new SerializableRunnable() { @Override public void run() { @@ -267,7 +267,7 @@ public class CliUtilDUnitTest extends CacheTestCase { } }); - LogWriterSupport.getLogWriter().info("testFor - executeFunction"); + LogWriterUtils.getLogWriter().info("testFor - executeFunction"); vm1.invoke(new SerializableRunnable() { @Override public void run() { @@ -275,7 +275,7 @@ public class CliUtilDUnitTest extends CacheTestCase { } }); - LogWriterSupport.getLogWriter().info("testFor - getRegionAssociatedMembers"); + LogWriterUtils.getLogWriter().info("testFor - getRegionAssociatedMembers"); vm1.invoke(new SerializableRunnable() { @Override public void run() { @@ -421,7 +421,7 @@ public class CliUtilDUnitTest extends CacheTestCase { Region region = cache.getRegion(COMMON_REGION); String id = cache.getDistributedSystem().getDistributedMember().getName(); region.put(id, object); - LogWriterSupport.getLogWriter().info("Completed executeFunction on member : " + id); + LogWriterUtils.getLogWriter().info("Completed executeFunction on member : " + id); context.getResultSender().lastResult(true); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java index ee47beb..664e7a6 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java @@ -29,7 +29,7 @@ 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.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; @@ -548,18 +548,18 @@ public class CliCommandTestBase extends CacheTestCase { } protected void info(String string) { - LogWriterSupport.getLogWriter().info(string); + LogWriterUtils.getLogWriter().info(string); } protected void debug(String string) { - LogWriterSupport.getLogWriter().fine(string); + LogWriterUtils.getLogWriter().fine(string); } protected void error(String string) { - LogWriterSupport.getLogWriter().error(string); + LogWriterUtils.getLogWriter().error(string); } protected void error(String string, Throwable e) { - LogWriterSupport.getLogWriter().error(string, e); + LogWriterUtils.getLogWriter().error(string, e); } }
