You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2016/06/09 20:08:33 UTC
[07/17] incubator-geode git commit: GEODE-1377: Renaming of
DistributedSystemConfigProperties to ConfigurationProperties
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java
index 7885fdf..aeba535 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java
@@ -32,7 +32,7 @@ import java.io.IOException;
import java.util.*;
import java.util.Map.Entry;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java
index 600af1b..1c31356 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java
@@ -30,7 +30,7 @@ import redis.clients.jedis.Jedis;
import java.io.IOException;
import java.util.*;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java
index c02a8bb..8a7a470 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java
@@ -20,7 +20,7 @@ import com.gemstone.gemfire.cache.Region;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.SECURITY_CLIENT_AUTHENTICATOR;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR;
import static com.gemstone.gemfire.security.SecurityTestUtils.*;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
index b5a088b..c222e6c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
@@ -18,7 +18,7 @@
*/
package com.gemstone.gemfire.security;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static com.gemstone.gemfire.internal.AvailablePort.*;
import static com.gemstone.gemfire.security.SecurityTestUtils.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
index b9d2d2d..cb1836e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
@@ -18,8 +18,8 @@
*/
package com.gemstone.gemfire.security;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
import com.gemstone.gemfire.distributed.Locator;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.distributed.internal.membership.MembershipManager;
@@ -43,7 +43,7 @@ import org.junit.experimental.categories.Category;
import javax.net.ssl.SSLHandshakeException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static com.gemstone.gemfire.internal.AvailablePort.SOCKET;
import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort;
import static com.gemstone.gemfire.security.SecurityTestUtils.startLocator;
@@ -92,9 +92,9 @@ public class P2PAuthenticationDUnitTest extends JUnit4DistributedTestCase {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "26753");
- props.setProperty(DistributedSystemConfigProperties.LOCATORS, getIPLiteral() + "[" + port + "]");
- props.setProperty(DistributedSystemConfigProperties.SECURITY_PEER_AUTH_INIT, UserPasswordAuthInit.class.getName() + ".create");
- props.setProperty(DistributedSystemConfigProperties.ENABLE_CLUSTER_CONFIGURATION, "false");
+ props.setProperty(ConfigurationProperties.LOCATORS, getIPLiteral() + "[" + port + "]");
+ props.setProperty(ConfigurationProperties.SECURITY_PEER_AUTH_INIT, UserPasswordAuthInit.class.getName() + ".create");
+ props.setProperty(ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, "false");
try {
Locator.startLocatorAndDS(port, null, null, props);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
index c5bfa4c..b3eb186 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
@@ -19,7 +19,7 @@
package com.gemstone.gemfire.security;
import static com.gemstone.gemfire.cache30.ClientServerTestCase.*;
-import static com.gemstone.gemfire.distributed.internal.DistributionConfig.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static com.gemstone.gemfire.internal.AvailablePort.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java
index 502b765..7cde86d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java
@@ -29,7 +29,7 @@ import java.security.Principal;
import java.util.Properties;
import java.util.Random;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
public class LdapUserCredentialGenerator extends CredentialGenerator {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java
index a15a3e3..c591732 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java
@@ -25,7 +25,7 @@ import java.io.IOException;
import java.security.Principal;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
public class SSLCredentialGenerator extends CredentialGenerator {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java
index bc967db..cf6ce9a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java
@@ -29,7 +29,7 @@ import java.util.Properties;
import static org.junit.Assert.assertEquals;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
/**
* <code>DistributedTestUtils</code> provides static utility methods that
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java
index 425bd64..885b1ec 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.test.dunit;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import com.gemstone.gemfire.LogWriter;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
index db5be9c..73218e0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
@@ -59,7 +59,7 @@ import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
/**
* This class is the base class for all distributed tests using JUnit 4 that
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
index cdabd42..9f962db 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.test.dunit.internal;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import com.gemstone.gemfire.admin.internal.AdminDistributedSystemImpl;
import com.gemstone.gemfire.cache.Cache;
@@ -54,8 +54,8 @@ import java.io.Serializable;
import java.text.DecimalFormat;
import java.util.*;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.assertNotNull;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
index cb517bb..b53327d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
@@ -50,7 +50,7 @@ import java.rmi.server.UnicastRemoteObject;
import java.util.List;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
/**
* A class to build a fake test configuration and launch some DUnit VMS.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
index b191013..6f8f8ca 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
@@ -33,7 +33,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java
index 62feeb9..053ecd0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java
@@ -23,7 +23,7 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.Invoke.invokeInEveryVM;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
index 0a4b5d7..e62908a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.test.dunit.tests;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static com.gemstone.gemfire.test.dunit.Invoke.*;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java
index 5915eb7..de02f1a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.test.golden;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.process.ProcessWrapper;
@@ -29,7 +29,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
/**
* Test framework for launching processes and comparing output to expected golden output.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java b/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java
index 645dd30..50c7307 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.test.process;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import com.gemstone.gemfire.internal.logging.LogService;
import org.apache.logging.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java
index 51c4d0d..53c9ecd 100644
--- a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java
+++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import java.util.Set;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
/**
* This is a member representing site 1 who wants to send data to site 2
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java
index afe22bb..0386e78 100644
--- a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java
+++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java
@@ -16,7 +16,7 @@
*/
package com.main;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import com.gemstone.gemfire.distributed.Locator;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import java.io.IOException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
/**
* This is a stand alone locator with a distributed-system-id = -1
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java
index 7f82750..3cf6673 100644
--- a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java
+++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.wan.GatewayReceiver;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
/**
* This is a member representing site 2 who wants to receive data from site 1
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java
index 467af82..99747e2 100644
--- a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java
+++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import java.io.IOException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
/**
* This is a stand alone locator with a distributed-system-id = -2
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java
index 0cb1c14..cee0af4 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.cache.query.cq;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import java.util.Properties;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
index 53d473e..071ce2e 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.cache.query.cq.dunit;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import java.util.HashSet;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
index 25d3380..c2216a6 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.cache.query.cq.dunit;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
index d8fff8b..4827abf 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.cache.query.cq.dunit;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
index 6ba1e14..d95bfcd 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.cache.query.cq.dunit;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import java.util.Properties;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
index 2b34dbd..c7b7b0f 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.cache.query.cq.dunit;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
index 06f1383..0032ee2 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.cache.query.dunit;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
index 9107250..9b0e974 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
@@ -14,18 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.gemstone.gemfire.cache.query.dunit;
-import static org.junit.Assert.*;
+package com.gemstone.gemfire.cache.query.dunit;
import java.io.File;
import java.io.IOException;
import java.util.Properties;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheException;
@@ -37,6 +32,8 @@ import com.gemstone.gemfire.cache.EvictionAttributes;
import com.gemstone.gemfire.cache.PartitionAttributesFactory;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.ClientCache;
+import com.gemstone.gemfire.cache.client.ClientCacheFactory;
import com.gemstone.gemfire.cache.client.Pool;
import com.gemstone.gemfire.cache.client.PoolFactory;
import com.gemstone.gemfire.cache.client.PoolManager;
@@ -67,11 +64,15 @@ import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import com.gemstone.gemfire.test.junit.categories.FlakyTest;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
/**
* Tests for QueryMonitoring service.
- *
* @since GemFire 6.0
*/
@Category(DistributedTest.class)
@@ -80,68 +81,68 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
private final String exampleRegionName = "exampleRegion";
private final String exampleRegionName2 = "exampleRegion2";
private final String poolName = "serverConnectionPool";
-
-
+
+
/* Some of the queries are commented out as they were taking less time */
String[] queryStr = {
- "SELECT ID FROM /root/exampleRegion p WHERE p.ID > 100",
- "SELECT DISTINCT * FROM /root/exampleRegion x, x.positions.values WHERE x.pk != '1000'",
- "SELECT DISTINCT * FROM /root/exampleRegion x, x.positions.values WHERE x.pkid != '1'",
- "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values WHERE p.pk > '1'",
- "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values WHERE p.pkid != '53'",
- "SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE pos.Id > 100",
- "SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE pos.Id > 100 and pos.secId IN SET('YHOO', 'IBM', 'AMZN')",
- "SELECT * FROM /root/exampleRegion p WHERE p.ID > 100 and p.status = 'active' and p.ID < 100000",
- "SELECT * FROM /root/exampleRegion WHERE ID > 100 and status = 'active'",
- "SELECT DISTINCT * FROM /root/exampleRegion p WHERE p.ID > 100 and p.status = 'active' and p.ID < 100000",
- "SELECT DISTINCT ID FROM /root/exampleRegion WHERE status = 'active'",
- "SELECT DISTINCT ID FROM /root/exampleRegion p WHERE p.status = 'active'",
- "SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE pos.secId IN SET('YHOO', 'IBM', 'AMZN')",
- "SELECT DISTINCT proj1:p, proj2:itrX FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos"
- + " WHERE pos.secId = 'YHOO') as itrX",
- "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos"
- + " WHERE pos.secId = 'YHOO') as itrX",
- "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT p.ID FROM /root/exampleRegion x"
- + " WHERE x.ID = p.ID) as itrX",
- "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion x, x.positions.values pos"
- + " WHERE x.ID = p.ID) as itrX",
- "SELECT DISTINCT x.ID FROM /root/exampleRegion x, x.positions.values v WHERE "
- + "v.secId = element(SELECT DISTINCT vals.secId FROM /root/exampleRegion p, p.positions.values vals WHERE vals.secId = 'YHOO')",
- "SELECT DISTINCT * FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE p.status = 'active'",
- "SELECT DISTINCT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE p.ID = p2.ID",
- "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE p.ID = p2.ID and p.status = 'active' and p2.status = 'active'",
- "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE p.ID = p2.ID and p.status = 'active' and p.status = p2.status",
- "SELECT DISTINCT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE p.ID = p2.ID and p.ID > 100 and p2.ID < 100000",
- "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE p.ID = p2.ID and p.ID > 100 and p2.ID < 100000 or p.status = p2.status",
- "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE p.ID = p2.ID and p.ID > 100 and p2.ID < 100000 or p.status = 'active'",
- "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE (p.ID > 1 or p.status = 'active') or (true AND pos.secId ='IBM')",
- "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE (p.ID > 1 or p.status = 'active') or (true AND pos.secId !='IBM')",
- "SELECT DISTINCT structset.sos, structset.key "
- + "FROM /root/exampleRegion p, p.positions.values outerPos, "
- + "(SELECT DISTINCT key: key, sos: pos.sharesOutstanding "
- + "FROM /root/exampleRegion.entries pf, pf.value.positions.values pos "
- + "where outerPos.secId != 'IBM' AND "
- + "pf.key IN (SELECT DISTINCT * FROM pf.value.collectionHolderMap['0'].arr)) structset "
- + "where structset.sos > 2000",
- "SELECT DISTINCT * "
- + "FROM /root/exampleRegion p, p.positions.values outerPos, "
- + "(SELECT DISTINCT key: key, sos: pos.sharesOutstanding "
- + "FROM /root/exampleRegion.entries pf, pf.value.positions.values pos "
- + "where outerPos.secId != 'IBM' AND "
- + "pf.key IN (SELECT DISTINCT * FROM pf.value.collectionHolderMap['0'].arr)) structset "
- + "where structset.sos > 2000",
- "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values position "
- + "WHERE (true = null OR position.secId = 'SUN') AND true",
+ "SELECT ID FROM /root/exampleRegion p WHERE p.ID > 100",
+ "SELECT DISTINCT * FROM /root/exampleRegion x, x.positions.values WHERE x.pk != '1000'",
+ "SELECT DISTINCT * FROM /root/exampleRegion x, x.positions.values WHERE x.pkid != '1'",
+ "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values WHERE p.pk > '1'",
+ "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values WHERE p.pkid != '53'",
+ "SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE pos.Id > 100",
+ "SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE pos.Id > 100 and pos.secId IN SET('YHOO', 'IBM', 'AMZN')",
+ "SELECT * FROM /root/exampleRegion p WHERE p.ID > 100 and p.status = 'active' and p.ID < 100000",
+ "SELECT * FROM /root/exampleRegion WHERE ID > 100 and status = 'active'",
+ "SELECT DISTINCT * FROM /root/exampleRegion p WHERE p.ID > 100 and p.status = 'active' and p.ID < 100000",
+ "SELECT DISTINCT ID FROM /root/exampleRegion WHERE status = 'active'",
+ "SELECT DISTINCT ID FROM /root/exampleRegion p WHERE p.status = 'active'",
+ "SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE pos.secId IN SET('YHOO', 'IBM', 'AMZN')",
+ "SELECT DISTINCT proj1:p, proj2:itrX FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos"
+ + " WHERE pos.secId = 'YHOO') as itrX",
+ "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos"
+ + " WHERE pos.secId = 'YHOO') as itrX",
+ "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT p.ID FROM /root/exampleRegion x"
+ + " WHERE x.ID = p.ID) as itrX",
+ "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion x, x.positions.values pos"
+ + " WHERE x.ID = p.ID) as itrX",
+ "SELECT DISTINCT x.ID FROM /root/exampleRegion x, x.positions.values v WHERE "
+ + "v.secId = element(SELECT DISTINCT vals.secId FROM /root/exampleRegion p, p.positions.values vals WHERE vals.secId = 'YHOO')",
+ "SELECT DISTINCT * FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE p.status = 'active'",
+ "SELECT DISTINCT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE p.ID = p2.ID",
+ "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE p.ID = p2.ID and p.status = 'active' and p2.status = 'active'",
+ "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE p.ID = p2.ID and p.status = 'active' and p.status = p2.status",
+ "SELECT DISTINCT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE p.ID = p2.ID and p.ID > 100 and p2.ID < 100000",
+ "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE p.ID = p2.ID and p.ID > 100 and p2.ID < 100000 or p.status = p2.status",
+ "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE p.ID = p2.ID and p.ID > 100 and p2.ID < 100000 or p.status = 'active'",
+ "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE (p.ID > 1 or p.status = 'active') or (true AND pos.secId ='IBM')",
+ "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE (p.ID > 1 or p.status = 'active') or (true AND pos.secId !='IBM')",
+ "SELECT DISTINCT structset.sos, structset.key "
+ + "FROM /root/exampleRegion p, p.positions.values outerPos, "
+ + "(SELECT DISTINCT key: key, sos: pos.sharesOutstanding "
+ + "FROM /root/exampleRegion.entries pf, pf.value.positions.values pos "
+ + "where outerPos.secId != 'IBM' AND "
+ + "pf.key IN (SELECT DISTINCT * FROM pf.value.collectionHolderMap['0'].arr)) structset "
+ + "where structset.sos > 2000",
+ "SELECT DISTINCT * "
+ + "FROM /root/exampleRegion p, p.positions.values outerPos, "
+ + "(SELECT DISTINCT key: key, sos: pos.sharesOutstanding "
+ + "FROM /root/exampleRegion.entries pf, pf.value.positions.values pos "
+ + "where outerPos.secId != 'IBM' AND "
+ + "pf.key IN (SELECT DISTINCT * FROM pf.value.collectionHolderMap['0'].arr)) structset "
+ + "where structset.sos > 2000",
+ "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values position "
+ + "WHERE (true = null OR position.secId = 'SUN') AND true",
};
String[] prQueryStr = {
- "SELECT ID FROM /root/exampleRegion p WHERE p.ID > 100 and p.status = 'active'",
- "SELECT * FROM /root/exampleRegion WHERE ID > 100 and status = 'active'",
- "SELECT DISTINCT * FROM /root/exampleRegion p WHERE p.ID > 100 and p.status = 'active' and p.ID < 100000",
- "SELECT DISTINCT p.ID FROM /root/exampleRegion p WHERE p.ID > 100 and p.ID < 100000 and p.status = 'active'",
- "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE (p.ID > 1 or p.status = 'active') or (pos.secId != 'IBM')",
+ "SELECT ID FROM /root/exampleRegion p WHERE p.ID > 100 and p.status = 'active'",
+ "SELECT * FROM /root/exampleRegion WHERE ID > 100 and status = 'active'",
+ "SELECT DISTINCT * FROM /root/exampleRegion p WHERE p.ID > 100 and p.status = 'active' and p.ID < 100000",
+ "SELECT DISTINCT p.ID FROM /root/exampleRegion p WHERE p.ID > 100 and p.ID < 100000 and p.status = 'active'",
+ "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE (p.ID > 1 or p.status = 'active') or (pos.secId != 'IBM')",
};
-
+
private int numServers;
@Override
@@ -149,7 +150,7 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
Host host = Host.getHost(0);
disconnectFromDS();
// shut down clients before servers
- for (int i=numServers; i<4; i++) {
+ for (int i = numServers; i < 4; i++) {
host.getVM(i).invoke(() -> CacheTestCase.disconnectFromDS());
}
}
@@ -161,14 +162,14 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
// avoid IllegalStateException from HandShake by connecting all vms tor
// system before creating connection pools
getSystem();
-
+
for (int i = 0; i < numServers; i++) {
host.getVM(i).invoke("getSystem", () -> {
getSystem();
return 0;
});
}
-
+
for (int i = numServers; i < 4; i++) {
host.getVM(i).invoke("getClientSystem", () -> {
Properties props = DistributedTestUtils.getAllDistributedSystemProperties(new Properties());
@@ -178,8 +179,8 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
}
}
- public void createRegion(VM vm){
- createRegion(vm, false, null);
+ public void createRegion() {
+ createRegion(false, null);
}
private void createRegion(final boolean eviction, final String dirName) {
@@ -195,7 +196,7 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
DiskStore ds1 = dsf.setDiskDirs(f).create("ds1");
factory.setDiskStoreName("ds1");
EvictionAttributes evictAttrs = EvictionAttributes
- .createLRUEntryAttributes(100, EvictionAction.OVERFLOW_TO_DISK);
+ .createLRUEntryAttributes(100, EvictionAction.OVERFLOW_TO_DISK);
factory.setEvictionAttributes(evictAttrs);
}
// Create region
@@ -218,7 +219,8 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
int port = 0;
try {
port = startBridgeServer(0, false);
- } catch (Exception ex) {
+ }
+ catch (Exception ex) {
Assert.fail("While starting CacheServer", ex);
}
Cache cache = getCache();
@@ -244,7 +246,7 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
};
server.invoke(stopServer);
}
-
+
private void configClient(String host, int... ports) {
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
@@ -252,18 +254,18 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
poolFactory.setReadTimeout(10 * 60 * 1000); // 10 mins.
ClientServerTestCase.configureConnectionPoolWithNameAndFactory(factory, host, ports, true, -1, -1, null, poolName, poolFactory);
}
-
+
private void verifyException(Exception e) {
e.printStackTrace();
String error = e.getMessage();
if (e.getCause() != null) {
error = e.getCause().getMessage();
}
-
+
if (error.contains("Query execution cancelled after exceeding max execution time") ||
- error.contains("The Query completed sucessfully before it got canceled") ||
- error.contains("The QueryMonitor thread may be sleeping longer than the set sleep time") ||
- error.contains("The query task could not be found but the query is marked as having been canceled")) {
+ error.contains("The Query completed sucessfully before it got canceled") ||
+ error.contains("The QueryMonitor thread may be sleeping longer than the set sleep time") ||
+ error.contains("The query task could not be found but the query is marked as having been canceled")) {
// Expected exception.
return;
}
@@ -271,15 +273,16 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
System.out.println("Unexpected exception:");
if (e.getCause() != null) {
e.getCause().printStackTrace();
- } else {
+ }
+ else {
e.printStackTrace();
}
-
+
fail("Expected exception Not found. Expected exception with message: \n" +
- "\"Query execution taking more than the max execution time\"" + "\n Found \n" +
- error);
+ "\"Query execution taking more than the max execution time\"" + "\n Found \n" +
+ error);
}
-
+
/**
* Tests query execution from client to server (single server).
*/
@@ -287,9 +290,9 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
public void testQueryMonitorClientServer() throws Exception {
setup(1);
-
+
final Host host = Host.getHost(0);
-
+
VM server = host.getVM(0);
VM client1 = host.getVM(1);
VM client2 = host.getVM(2);
@@ -300,9 +303,9 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
// Start server
int serverPort = server.invoke("Create BridgeServer",
- () -> configServer(20, "testQueryMonitorClientServer")); // All the queries taking more than 20ms should be canceled by Query monitor.
+ () -> configServer(20, "testQueryMonitorClientServer")); // All the queries taking more than 20ms should be canceled by Query monitor.
server.invoke("createRegion", () -> createRegion());
-
+
// Initialize server regions.
server.invoke("populatePortfolioRegions", () -> populatePortfolioRegions(numberOfEntries));
@@ -334,7 +337,8 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
Pool pool = PoolManager.find(poolName);
QueryService queryService = pool.getQueryService();
executeQueriesAgainstQueryService(queryService);
- } catch (Exception ex) {
+ }
+ catch (Exception ex) {
GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
}
}
@@ -343,7 +347,8 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
try {
QueryService queryService = GemFireCacheImpl.getInstance().getQueryService();
executeQueriesAgainstQueryService(queryService);
- } catch (Exception ex) {
+ }
+ catch (Exception ex) {
GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
}
}
@@ -361,7 +366,8 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
Query query = queryService.newQuery(qStr);
query.execute();
fail("The query should have been canceled by the QueryMonitor. Query: " + qStr);
- } catch (Exception e) {
+ }
+ catch (Exception e) {
System.out.println("queryStr = " + qStr);
verifyException(e);
}
@@ -374,9 +380,9 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
public void testQueryMonitorMultiClientMultiServer() throws Exception {
setup(2);
-
+
final Host host = Host.getHost(0);
-
+
VM server1 = host.getVM(0);
VM server2 = host.getVM(1);
VM client1 = host.getVM(2);
@@ -388,11 +394,11 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
// Start server
int serverPort1 = server1.invoke("Create BridgeServer",
- () -> configServer(20, "testQueryMonitorMultiClientMultiServer"));// All the queries taking more than 20ms should be canceled by Query monitor.
+ () -> configServer(20, "testQueryMonitorMultiClientMultiServer"));// All the queries taking more than 20ms should be canceled by Query monitor.
server1.invoke("createRegion", () -> createRegion());
int serverPort2 = server2.invoke("Create BridgeServer",
- () -> configServer(20, "testQueryMonitorMultiClientMultiServer"));// All the queries taking more than 20ms should be canceled by Query monitor.
+ () -> configServer(20, "testQueryMonitorMultiClientMultiServer"));// All the queries taking more than 20ms should be canceled by Query monitor.
server2.invoke("createRegion", () -> createRegion());
// Initialize server regions.
@@ -426,9 +432,9 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
public void testQueryExecutionLocally() throws Exception {
setup(2);
-
+
final Host host = Host.getHost(0);
-
+
VM server1 = host.getVM(0);
VM server2 = host.getVM(1);
@@ -436,11 +442,11 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
// Start server
server1.invoke("Create BridgeServer",
- () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
+ () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
server1.invoke("createRegion", () -> createRegion());
server2.invoke("Create BridgeServer",
- () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
+ () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
server2.invoke("createRegion", () -> createRegion());
// Initialize server regions.
@@ -465,9 +471,9 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
public void testQueryExecutionLocallyAndCacheOp() throws Exception {
setup(2);
-
+
final Host host = Host.getHost(0);
-
+
VM server1 = host.getVM(0);
VM server2 = host.getVM(1);
@@ -475,11 +481,11 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
// Start server
server1.invoke("Create BridgeServer",
- () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
+ () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
server1.invoke("createRegion", () -> createRegion());
server2.invoke("Create BridgeServer",
- () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
+ () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
server2.invoke("createRegion", () -> createRegion());
// Initialize server regions.
@@ -494,7 +500,7 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
try {
QueryService queryService = GemFireCacheImpl.getInstance().getQueryService();
String qStr = "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion x, x.positions.values pos"
- + " WHERE x.ID = p.ID) as itrX";
+ + " WHERE x.ID = p.ID) as itrX";
executeQuery(queryService, qStr);
// Create index and Perform cache op. Bug#44307
@@ -504,8 +510,9 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
for (int i = (1 + 100); i <= (numberOfEntries + 200); i++) {
exampleRegion.put("" + i, new Portfolio(i));
}
-
- } catch (Exception ex) {
+
+ }
+ catch (Exception ex) {
Assert.fail("Exception creating the query service", ex);
}
}
@@ -536,9 +543,9 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
public void testQueryMonitorOnPR() throws Exception {
setup(2);
-
+
final Host host = Host.getHost(0);
-
+
VM server1 = host.getVM(0);
VM server2 = host.getVM(1);
VM client1 = host.getVM(2);
@@ -550,28 +557,28 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
// Start server
int serverPort1 = server1.invoke("configServer",
- () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
+ () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
server1.invoke("createPRRegion", () -> createPRRegion());
int serverPort2 = server2.invoke("configServer",
- () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
+ () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
server2.invoke("createPRRegion", () -> createPRRegion());
-
+
// Initialize server regions.
server1.invoke("bulkInsertPorfolio", () -> bulkInsertPorfolio(101, numberOfEntries));
// Initialize server regions.
server2.invoke("bulkInsertPorfolio", () ->
- bulkInsertPorfolio((numberOfEntries + 100), (numberOfEntries + numberOfEntries + 100)));
+ bulkInsertPorfolio((numberOfEntries + 100), (numberOfEntries + numberOfEntries + 100)));
// Initialize Client1 and create client regions.
client1.invoke("Init client", () -> configClient(serverHostName, serverPort1));
client1.invoke("createRegion", () -> createRegion());
-
+
// Initialize Client2 and create client regions.
client2.invoke("Init client", () -> configClient(serverHostName, serverPort2));
client2.invoke("createRegion", () -> createRegion());
-
+
// Execute client queries
client1.invoke("Execute Queries", () -> executeQueriesFromClient(20));
@@ -596,9 +603,9 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
public void testQueryMonitorWithLocalQueryOnPR() throws Exception {
setup(2);
-
+
final Host host = Host.getHost(0);
-
+
VM server1 = host.getVM(0);
VM server2 = host.getVM(1);
@@ -606,11 +613,11 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
// Start server
server1.invoke("configServer",
- () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
+ () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
server1.invoke("Create Partition Regions", () -> createPRRegion());
server2.invoke("configServer",
- () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
+ () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
server2.invoke("Create Partition Regions", () -> createPRRegion());
// Initialize server regions.
@@ -626,7 +633,7 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
bulkInsertPorfolio((numberOfEntries + 100), (numberOfEntries + numberOfEntries + 100));
}
});
-
+
// Execute client queries
server1.invoke("execute queries on server", () -> executeQueriesOnServer());
server2.invoke("execute queries on server", () -> executeQueriesOnServer());
@@ -643,7 +650,7 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
public void testQueryMonitorRegionWithEviction() throws CacheException {
final Host host = Host.getHost(0);
-
+
VM server1 = host.getVM(0);
VM server2 = host.getVM(1);
VM client1 = host.getVM(2);
@@ -655,11 +662,11 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
// Start server
int serverPort1 = server1.invoke("Create BridgeServer",
- () -> configServer(20, "testQueryMonitorRegionWithEviction"));// All the queries taking more than 20ms should be canceled by Query monitor.
+ () -> configServer(20, "testQueryMonitorRegionWithEviction"));// All the queries taking more than 20ms should be canceled by Query monitor.
server1.invoke("createRegion", () -> createRegion(true, "server1_testQueryMonitorRegionWithEviction"));
int serverPort2 = server2.invoke("Create BridgeServer",
- () -> configServer(20, "testQueryMonitorRegionWithEviction"));// All the queries taking more than 20ms should be canceled by Query monitor.
+ () -> configServer(20, "testQueryMonitorRegionWithEviction"));// All the queries taking more than 20ms should be canceled by Query monitor.
server2.invoke("createRegion", () -> createRegion(true, "server2_testQueryMonitorRegionWithEviction"));
// Initialize server regions.
@@ -679,11 +686,11 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
// Initialize Client1 and create client regions.
client1.invoke("Init client", () -> configClient(serverHostName, serverPort1));
client1.invoke("createRegion", () -> createRegion());
-
+
// Initialize Client2 and create client regions.
client2.invoke("Init client", () -> configClient(serverHostName, serverPort2));
client2.invoke("createRegion", () -> createRegion());
-
+
// Execute client queries
client1.invoke("Execute Queries", () -> executeQueriesFromClient(20));
client2.invoke("Execute Queries", () -> executeQueriesFromClient(20));
@@ -699,9 +706,9 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
public void testQueryMonitorRegionWithIndex() throws Exception {
setup(2);
-
+
final Host host = Host.getHost(0);
-
+
VM server1 = host.getVM(0);
VM server2 = host.getVM(1);
VM client1 = host.getVM(2);
@@ -713,11 +720,11 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
// Start server
int serverPort1 = server1.invoke("configServer",
- () -> configServer(20, "testQueryMonitorRegionWithIndex"));// All the queries taking more than 20ms should be canceled by Query monitor.
+ () -> configServer(20, "testQueryMonitorRegionWithIndex"));// All the queries taking more than 20ms should be canceled by Query monitor.
server1.invoke("createRegion", () -> createRegion());
int serverPort2 = server2.invoke("configServer",
- () -> configServer(20, "testQueryMonitorRegionWithIndex"));// All the queries taking more than 20ms should be canceled by Query monitor.
+ () -> configServer(20, "testQueryMonitorRegionWithIndex"));// All the queries taking more than 20ms should be canceled by Query monitor.
server2.invoke("createRegion", () -> createRegion());
// pause(1000);
@@ -763,7 +770,8 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
cacheQS.createIndex("posIdIndex2", IndexType.FUNCTIONAL, "pos.Id", "/root/exampleRegion2 p2, p2.positions.values pos");
cacheQS.createIndex("pkIndex2", IndexType.PRIMARY_KEY, "pk", "/root/exampleRegion2");
cacheQS.createIndex("pkidIndex2", IndexType.PRIMARY_KEY, "pkid", "/root/exampleRegion2");
- } catch (Exception ex) {
+ }
+ catch (Exception ex) {
}
for (int i = (1 + 100); i <= (numberOfEntries + 100); i++) {
exampleRegion.put("" + i, new Portfolio(i));
@@ -772,25 +780,24 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
exampleRegion2.put("" + i, new Portfolio(i));
}
}
-
+
protected CqQueryDUnitTest cqDUnitTest = new CqQueryDUnitTest();
/**
* The following CQ test is added to make sure TEST_MAX_QUERY_EXECUTION_TIME is reset
* and is not affecting other query related tests.
- *
* @throws Exception
*/
@Test
public void testCQWithDestroysAndInvalidates() throws Exception
{
setup(1);
-
+
final Host host = Host.getHost(0);
VM server = host.getVM(0);
VM client = host.getVM(1);
VM producerClient = host.getVM(2);
-
+
cqDUnitTest.createServer(server, 0, true);
final int port = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
final String host0 = NetworkUtils.getServerHostName(server.getHost());
@@ -806,7 +813,7 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
cqDUnitTest.createCQ(client, name, cqDUnitTest.cqs[4]);
cqDUnitTest.executeCQ(client, name, true, null);
-
+
// do destroys and invalidates.
server.invoke(new CacheSerializableRunnable("Create values") {
public void run2() throws CacheException {
@@ -828,7 +835,7 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
for (int i = 1; i <= 5; i++) {
cqDUnitTest.waitForCreated(client, name, CqQueryDUnitTest.KEY + i);
}
-
+
// do more puts to push first five key-value to disk.
cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 10);
// do invalidates on fisrt five keys.
@@ -861,14 +868,14 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
public void testCacheOpAfterQueryCancel() throws Exception {
setup(4);
-
+
final Host host = Host.getHost(0);
-
+
VM server1 = host.getVM(0);
VM server2 = host.getVM(1);
VM server3 = host.getVM(2);
VM server4 = host.getVM(3);
-
+
final int numberOfEntries = 1000;
// Start server
@@ -883,14 +890,15 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
server4.invoke("Create BridgeServer", () -> configServer(5, "testQueryExecutionLocally"));
server4.invoke("Create Partition Regions", () -> createPRRegion());
-
+
server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
public void run2() throws CacheException {
try {
QueryService queryService = GemFireCacheImpl.getInstance().getQueryService();
queryService.createIndex("statusIndex", IndexType.FUNCTIONAL, "status", "/root/exampleRegion");
queryService.createIndex("secIdIndex", IndexType.FUNCTIONAL, "pos.secId", "/root/exampleRegion p, p.positions.values pos");
- } catch (Exception ex) {
+ }
+ catch (Exception ex) {
fail("Failed to create index.");
}
Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
@@ -932,28 +940,31 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
QueryService queryService = GemFireCacheImpl.getInstance().getQueryService();
String qStr = "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values pos1, p.positions.values pos" +
- " where p.ID < pos.sharesOutstanding OR p.ID > 0 OR p.position1.mktValue > 0 " +
- " OR pos.secId in SET ('SUN', 'IBM', 'YHOO', 'GOOG', 'MSFT', " +
- " 'AOL', 'APPL', 'ORCL', 'SAP', 'DELL', 'RHAT', 'NOVL', 'HP')" +
- " order by p.status, p.ID desc";
+ " where p.ID < pos.sharesOutstanding OR p.ID > 0 OR p.position1.mktValue > 0 " +
+ " OR pos.secId in SET ('SUN', 'IBM', 'YHOO', 'GOOG', 'MSFT', " +
+ " 'AOL', 'APPL', 'ORCL', 'SAP', 'DELL', 'RHAT', 'NOVL', 'HP')" +
+ " order by p.status, p.ID desc";
for (int i = 0; i < 500; i++) {
try {
GemFireCacheImpl.getInstance().getLogger().info("Executing query :" + qStr);
Query query = queryService.newQuery(qStr);
query.execute();
- } catch (QueryExecutionTimeoutException qet) {
+ }
+ catch (QueryExecutionTimeoutException qet) {
LogWriterUtils.getLogWriter().info("### Got Expected QueryExecutionTimeout exception. " +
- qet.getMessage());
+ qet.getMessage());
if (qet.getMessage().contains("cancelled after exceeding max execution")) {
LogWriterUtils.getLogWriter().info("### Doing a put operation");
exampleRegion.put("" + i, new Portfolio(i));
}
- } catch (Exception e) {
+ }
+ catch (Exception e) {
fail("Exception executing query." + e.getMessage());
}
}
LogWriterUtils.getLogWriter().info("### Completed Executing queries in testCacheOpAfterQueryCancel");
- } catch (Exception ex) {
+ }
+ catch (Exception ex) {
Assert.fail("Exception creating the query service", ex);
}
}
@@ -961,25 +972,26 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
AsyncInvocation ai3 = server3.invokeAsync(executeQuery);
AsyncInvocation ai4 = server4.invokeAsync(executeQuery);
-
+
LogWriterUtils.getLogWriter().info("### Waiting for async threads to join in testCacheOpAfterQueryCancel");
try {
ThreadUtils.join(ai1, 5 * 60 * 1000);
ThreadUtils.join(ai2, 5 * 60 * 1000);
ThreadUtils.join(ai3, 5 * 60 * 1000);
ThreadUtils.join(ai4, 5 * 60 * 1000);
- } catch (Exception ex) {
+ }
+ catch (Exception ex) {
fail("Async thread join failure");
}
LogWriterUtils.getLogWriter().info("### DONE Waiting for async threads to join in testCacheOpAfterQueryCancel");
-
+
validateQueryMonitorThreadCnt(server1, 0, 1000);
validateQueryMonitorThreadCnt(server2, 0, 1000);
validateQueryMonitorThreadCnt(server3, 0, 1000);
validateQueryMonitorThreadCnt(server4, 0, 1000);
-
+
LogWriterUtils.getLogWriter().info("### DONE validating query monitor threads testCacheOpAfterQueryCancel");
-
+
stopServer(server1);
stopServer(server2);
stopServer(server3);
@@ -1001,9 +1013,10 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
Wait.pause(10);
waited += 10;
continue;
- } else {
+ }
+ else {
fail("Didn't found expected monitoring thread. Expected: " + threadCount +
- " found :" + qm.getQueryMonitorThreadCount());
+ " found :" + qm.getQueryMonitorThreadCount());
}
}
break;
@@ -1013,14 +1026,15 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
};
vm.invoke(validateThreadCnt);
}
-
+
/**
* Starts a bridge server on the given port, using the given
* deserializeValues and notifyBySubscription to serve up the
* given region.
*/
protected int startBridgeServer(int port, boolean notifyBySubscription)
- throws IOException {
+ throws IOException
+ {
Cache cache = getCache();
CacheServer bridge = cache.addCacheServer();
@@ -1035,12 +1049,13 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
*/
private void stopBridgeServer(Cache cache) {
CacheServer bridge =
- (CacheServer) cache.getCacheServers().iterator().next();
+ (CacheServer) cache.getCacheServers().iterator().next();
bridge.stop();
assertFalse(bridge.isRunning());
}
private class QueryTimeoutHook implements DefaultQuery.TestHook {
+
long timeout;
private QueryTimeoutHook(long timeout) {
@@ -1051,7 +1066,8 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
if (description.equals("6")) {
try {
Thread.sleep(timeout * 2);
- } catch (InterruptedException ie) {
+ }
+ catch (InterruptedException ie) {
Thread.currentThread().interrupt();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
index 327de28..6ccb0f7 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.cache.snapshot;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import java.io.File;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
index c178454..4b00d82 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import java.io.DataInput;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
index 08b047a..1b1dffb 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import java.io.DataInput;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
index a806516..8271543 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import java.util.Collections;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
index ed74c70..963df8f 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache.ha;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import java.io.File;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
index 9837cf6..f1f18c5 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
@@ -43,8 +43,8 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
import static com.gemstone.gemfire.internal.AvailablePort.SOCKET;
import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort;
import static com.gemstone.gemfire.test.dunit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
index c8812bb..08b5afb 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import java.io.DataInput;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
index b9faf69..46b672d 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
index 17103c1..6944eb6 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import java.util.Iterator;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
index 4ed2934..cc54a47 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
@@ -16,7 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import java.util.Arrays;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
index 22c0b47..0405b3c 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
@@ -21,8 +21,6 @@ import org.junit.Test;
import static org.junit.Assert.*;
-import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
-import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import com.gemstone.gemfire.cache.Cache;
@@ -49,7 +47,7 @@ import java.net.UnknownHostException;
import java.util.Collections;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
/**
* Cache Server related management test cases
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
index 129c146..5947883 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
@@ -58,7 +58,7 @@ import java.util.Map.Entry;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.getDUnitLocatorPort;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
index e8a5577..495f0c2 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
@@ -23,7 +23,6 @@ import com.gemstone.gemfire.cache.query.*;
import com.gemstone.gemfire.cache.query.data.Portfolio;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
-import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.DistributedRegion;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
@@ -41,7 +40,7 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
import static com.gemstone.gemfire.test.dunit.Assert.assertTrue;
import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.getDUnitLocatorPort;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
index 2015ee4..12fdea8 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.security;
import com.gemstone.gemfire.DataSerializable;
import com.gemstone.gemfire.Instantiator;
import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.security.FilterPostAuthorization;
import com.gemstone.gemfire.internal.security.FilterPreAuthorization;
@@ -212,13 +212,13 @@ public class ClientAuthzObjectModDUnitTest extends ClientAuthorizationTestCase {
private Properties buildProperties(final String authenticator, final Properties extraProps, final String preAccessor, final String postAccessor) {
Properties authProps = new Properties();
if (authenticator != null) {
- authProps.setProperty(DistributedSystemConfigProperties.SECURITY_CLIENT_AUTHENTICATOR, authenticator);
+ authProps.setProperty(ConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR, authenticator);
}
if (preAccessor != null) {
- authProps.setProperty(DistributedSystemConfigProperties.SECURITY_CLIENT_ACCESSOR, preAccessor);
+ authProps.setProperty(ConfigurationProperties.SECURITY_CLIENT_ACCESSOR, preAccessor);
}
if (postAccessor != null) {
- authProps.setProperty(DistributedSystemConfigProperties.SECURITY_CLIENT_ACCESSOR_PP, postAccessor);
+ authProps.setProperty(ConfigurationProperties.SECURITY_CLIENT_ACCESSOR_PP, postAccessor);
}
if (extraProps != null) {
authProps.putAll(extraProps);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java
index 3ed8c1b..e271336 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.query.CqAttributesFactory;
import com.gemstone.gemfire.cache.query.CqException;
import com.gemstone.gemfire.cache.query.CqQuery;
import com.gemstone.gemfire.cache.query.Query;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.PoolManagerImpl;
import com.gemstone.gemfire.security.generator.CredentialGenerator;
@@ -297,7 +297,7 @@ public class MultiUserAPIDUnitTest extends ClientAuthorizationTestCase {
}
if (authenticator != null) {
- authProps.setProperty(DistributedSystemConfigProperties.SECURITY_CLIENT_AUTHENTICATOR, authenticator);
+ authProps.setProperty(ConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR, authenticator);
}
return SecurityTestUtils.createCacheServer(authProps, javaProps, dsPort, locatorString, 0, NO_EXCEPTION);