Merge branch 'develop' into GEODE-2267 # Conflicts: # geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarterRule.java # geode-core/src/test/java/org/apache/geode/test/dunit/rules/ServerStarterRule.java
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/815bee61 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/815bee61 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/815bee61 Branch: refs/heads/feature/GEODE-2267 Commit: 815bee611e6df87b58ca5b9700e510655761fc91 Parents: 60aa612 8314150 Author: Jinmei Liao <[email protected]> Authored: Tue Feb 14 11:16:51 2017 -0800 Committer: Jinmei Liao <[email protected]> Committed: Tue Feb 14 11:16:51 2017 -0800 ---------------------------------------------------------------------- .../internal/web/RestSecurityWithSSLTest.java | 16 +- .../org/apache/geode/internal/cache/Oplog.java | 39 +- .../geode/internal/cache/OplogFlushTest.java | 169 +++++++++ .../geode/management/JMXMBeanDUnitTest.java | 380 +++++++------------ .../internal/cli/NetstatDUnitTest.java | 3 +- .../security/CacheServerStartupRule.java | 16 +- .../security/MemberMBeanSecurityJUnitTest.java | 16 +- .../security/AbstractSecureServerDUnitTest.java | 7 +- .../ClusterConfigWithoutSecurityDUnitTest.java | 13 +- .../SecurityClusterConfigDUnitTest.java | 28 +- .../SecurityWithoutClusterConfigDUnitTest.java | 13 +- .../security/StartServerAuthorizationTest.java | 18 +- .../dunit/rules/GfshShellConnectionRule.java | 15 +- .../dunit/rules/LocatorServerStartupRule.java | 14 +- .../test/dunit/rules/LocatorStarterRule.java | 23 +- .../dunit/rules/MBeanServerConnectionRule.java | 101 +++-- .../test/dunit/rules/ServerStarterRule.java | 47 ++- .../geode/security/CQClientAuthDunitTest.java | 14 +- .../auto_serialization.html.md.erb | 11 +- .../internal/directory/RegionDirectory.java | 8 +- gradle/dependency-versions.properties | 2 +- 21 files changed, 551 insertions(+), 402 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/815bee61/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarterRule.java ---------------------------------------------------------------------- diff --cc geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarterRule.java index 300b569,c3e493e..4c64526 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarterRule.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarterRule.java @@@ -57,9 -55,12 +58,16 @@@ public class LocatorStarterRule extend } public void startLocator() throws Exception { - if (properties == null) - properties = new Properties(); + startLocator(properties); + } + + public void startLocator(Properties properties) throws Exception { ++ if (properties == null) ++ properties = new Properties(); ++ + if (!properties.containsKey(NAME)) { + properties.put(NAME, "locator"); + } if (!properties.containsKey(MCAST_PORT)) { properties.setProperty(MCAST_PORT, "0"); } http://git-wip-us.apache.org/repos/asf/geode/blob/815bee61/geode-core/src/test/java/org/apache/geode/test/dunit/rules/ServerStarterRule.java ---------------------------------------------------------------------- diff --cc geode-core/src/test/java/org/apache/geode/test/dunit/rules/ServerStarterRule.java index cab04a6,b5ddee6..d90cdd2 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/ServerStarterRule.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/ServerStarterRule.java @@@ -69,14 -95,10 +97,10 @@@ public class ServerStarterRule extends properties.setProperty(MCAST_PORT, "0"); } if (!properties.containsKey(NAME)) { - properties.setProperty(NAME, this.getClass().getName()); + properties.setProperty(NAME, "Server"); } if (!properties.containsKey(LOCATORS)) { - if (locatorPort > 0) { - properties.setProperty(LOCATORS, "localhost[" + locatorPort + "]"); - } else { - properties.setProperty(LOCATORS, ""); - } + properties.setProperty(LOCATORS, ""); } if (properties.containsKey(JMX_MANAGER_PORT)) { int jmxPort = Integer.parseInt(properties.getProperty(JMX_MANAGER_PORT));
