Merge branch 'develop' into feature/GEODE-420 # Conflicts: # geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1cc8d4e0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1cc8d4e0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1cc8d4e0 Branch: refs/heads/feature/GEODE-420 Commit: 1cc8d4e09b76cc0eb88f7595846980b2650eb8ae Parents: 5fd94d5 98531a1 Author: Udo Kohlmeyer <[email protected]> Authored: Thu Aug 25 10:37:44 2016 +1000 Committer: Udo Kohlmeyer <[email protected]> Committed: Thu Aug 25 10:37:44 2016 +1000 ---------------------------------------------------------------------- .../modules/session/catalina/DeltaSession8.java | 5 +- .../modules/session/EmbeddedTomcat8.java | 6 +- .../session/TestSessionsTomcat8Base.java | 54 ++------ .../Tomcat8SessionsClientServerDUnitTest.java | 96 +++++++++++++ .../session/Tomcat8SessionsDUnitTest.java | 77 +++++++++++ .../session/Tomcat8SessionsJUnitTest.java | 32 ----- .../session/bootstrap/AbstractCache.java | 4 +- .../session/bootstrap/ClientServerCache.java | 2 +- .../session/bootstrap/PeerToPeerCache.java | 2 +- .../modules/session/catalina/DeltaSession.java | 5 +- .../session/catalina/DeltaSessionInterface.java | 1 + .../SessionExpirationCacheListener.java | 5 +- .../distributed/internal/InternalLocator.java | 4 +- .../internal/WanLocatorDiscoverer.java | 2 +- .../admin/remote/DistributionLocatorId.java | 12 +- .../internal/cache/CacheServerLauncher.java | 7 + .../internal/cache/PartitionedRegion.java | 13 +- .../internal/cache/xmlcache/CacheCreation.java | 49 +++---- .../gemfire/internal/i18n/LocalizedStrings.java | 2 +- .../management/ResourceManagerDUnitTest.java | 7 +- .../distributed/DistributedSystemDUnitTest.java | 6 +- .../PersistentRVVRecoveryDUnitTest.java | 2 +- .../cache/wan/AsyncEventQueueTestBase.java | 55 ++++++++ .../asyncqueue/AsyncEventListenerDUnitTest.java | 29 ++++ .../cache/xmlcache/CacheCreationJUnitTest.java | 25 ++++ .../security/ClientAuthenticationTestCase.java | 33 +++-- .../lucene/LuceneQueriesPeerPRDUnitTest.java | 5 +- .../LuceneQueriesPeerPRRedundancyDUnitTest.java | 5 +- geode-site/website/content/releases/index.html | 50 +++++++ .../internal/locator/wan/LocatorDiscovery.java | 4 +- .../locator/wan/WanLocatorDiscovererImpl.java | 36 +++-- .../gemfire/internal/cache/wan/WANTestBase.java | 50 ++++--- .../wan/misc/WanAutoDiscoveryDUnitTest.java | 134 ++++++++++++------- ...rialGatewaySenderEventListenerDUnitTest.java | 1 - gradle/publish.gradle | 2 + 35 files changed, 586 insertions(+), 236 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1cc8d4e0/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java ---------------------------------------------------------------------- diff --cc geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java index 23ee38e,3c9fa97..8511d8b --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java @@@ -798,13 -830,13 +798,13 @@@ public class InternalLocator extends Lo } else { InternalDistributedSystem.addConnectListener(this); } - + this.locatorDiscoverer = WANServiceProvider.createLocatorDiscoverer(); - if (this.locatorDiscoverer != null) { - this.locatorDiscoverer.discover(getPort(), config, locatorListener); + if(this.locatorDiscoverer != null) { + this.locatorDiscoverer.discover(getPort(), config, locatorListener, hostnameForClients); } } - + /** * Start server location services in this locator. Server location * can only be started once there is a running distributed system. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1cc8d4e0/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1cc8d4e0/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1cc8d4e0/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1cc8d4e0/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1cc8d4e0/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1cc8d4e0/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java ----------------------------------------------------------------------
