You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/04/12 19:43:40 UTC

[50/50] [abbrv] incubator-geode git commit: Merge remote-tracking branch 'origin/develop' into feature/GEODE-1162

Merge remote-tracking branch 'origin/develop' into feature/GEODE-1162


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/794708e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/794708e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/794708e0

Branch: refs/heads/feature/GEODE-1162
Commit: 794708e062f0f370fb2ef03d97ea796222809ac3
Parents: 06efab3 86ab7cd
Author: Kirk Lund <kl...@apache.org>
Authored: Tue Apr 12 10:34:25 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Tue Apr 12 10:34:25 2016 -0700

----------------------------------------------------------------------
 KEYS                                            |  309 +++-
 LICENSE                                         |  423 +++--
 NOTICE                                          |   21 +-
 build.gradle                                    |    4 -
 .../release/conf/cache-client.xml               |    6 +-
 .../release/conf/cache-peer.xml                 |    6 +-
 .../release/conf/cache-server.xml               |    6 +-
 extensions/geode-modules-tomcat7/build.gradle   |    9 +-
 extensions/geode-modules/build.gradle           |    2 +-
 geode-assembly/build.gradle                     |   28 +-
 geode-assembly/src/main/dist/LICENSE            |  888 +++++++---
 geode-assembly/src/main/dist/NOTICE             |  655 +++-----
 .../LauncherLifecycleCommandsJUnitTest.java     |   46 +-
 .../src/test/resources/expected_jars.txt        |    3 -
 geode-core/build.gradle                         |    9 +-
 .../gemfire/admin/internal/InetAddressUtil.java |    1 +
 .../admin/jmx/internal/MX4JModelMBean.java      |   16 -
 .../gemstone/gemfire/cache/CacheFactory.java    |    5 +
 .../internal/AsyncEventQueueFactoryImpl.java    |    1 +
 .../internal/SerialAsyncEventQueueImpl.java     |    4 +
 .../cache/client/ClientCacheFactory.java        |   23 +-
 .../gemfire/distributed/ServerLauncher.java     |   26 +-
 .../internal/SharedConfiguration.java           |    4 +-
 .../membership/gms/membership/GMSJoinLeave.java |    2 -
 .../internal/cache/AbstractRegionMap.java       |    5 +-
 .../gemfire/internal/cache/DiskRegion.java      |    1 +
 .../internal/cache/GemFireCacheImpl.java        |    9 +-
 .../internal/cache/xmlcache/CacheXml.java       |   63 +-
 .../cache/xmlcache/CacheXmlGenerator.java       |  148 +-
 .../internal/cache/xmlcache/CacheXmlParser.java |    2 +-
 .../cache/xmlcache/CacheXmlVersion.java         |   56 +-
 .../cache/xmlcache/GeodeEntityResolver.java     |    2 +-
 .../gemfire/internal/i18n/LocalizedStrings.java |    8 +
 .../internal/size/ReflectionObjectSizer.java    |    9 +-
 .../cli/commands/LauncherLifecycleCommands.java |   61 +-
 .../configuration/domain/CacheElement.java      |    4 +-
 .../configuration/domain/XmlEntity.java         |    7 +-
 .../internal/configuration/utils/XmlUtils.java  |    6 +-
 .../geode.apache.org/schema/cache/cache-1.0.xsd | 1469 +++++++++++++++++
 .../gemfire/cache/cache-9.0.xsd                 | 1519 ------------------
 .../gemfire/cache30/CacheXml58DUnitTest.java    |    4 +-
 .../gemfire/cache30/CacheXml90DUnitTest.java    |  234 ---
 .../cache30/CacheXmlGeode10DUnitTest.java       |  234 +++
 .../gemfire/distributed/LocatorDUnitTest.java   |    3 +
 .../distributed/ServerLauncherJUnitTest.java    |   74 +
 .../internal/SharedConfigurationJUnitTest.java  |    2 +-
 .../tier/sockets/HAInterestPart2DUnitTest.java  |    2 +
 .../xmlcache/AbstractEntityResolverTest.java    |  140 ++
 .../xmlcache/CacheXmlVersionJUnitTest.java      |   30 +-
 .../xmlcache/GeodeEntityResolverJUnitTest.java  |   49 +
 .../PivotalEntityResolverJUnitTest.java         |  118 +-
 .../internal/offheap/OffHeapRegionBase.java     |   64 +
 .../size/ReflectionObjectSizerJUnitTest.java    |   71 +
 .../domain/CacheElementJUnitTest.java           |    4 +-
 .../utils/XmlUtilsAddNewNodeJUnitTest.java      |   26 +-
 .../configuration/utils/XmlUtilsJUnitTest.java  |   12 +-
 .../internal/JUnit4DistributedTestCase.java     |    2 +-
 .../codeAnalysis/sanctionedSerializables.txt    |    2 +-
 .../domain/CacheElementJUnitTest.xml            |    6 +-
 ...dNewNodeJUnitTest.testAddNewNodeNewNamed.xml |    6 +-
 ...ewNodeJUnitTest.testAddNewNodeNewUnnamed.xml |    6 +-
 ...itTest.testAddNewNodeNewUnnamedExtension.xml |    6 +-
 ...NodeJUnitTest.testAddNewNodeReplaceNamed.xml |    6 +-
 ...deJUnitTest.testAddNewNodeReplaceUnnamed.xml |    6 +-
 ...st.testAddNewNodeReplaceUnnamedExtension.xml |    6 +-
 ...ddNewNodeJUnitTest.testDeleteNodeUnnamed.xml |    6 +-
 .../utils/XmlUtilsAddNewNodeJUnitTest.xml       |    6 +-
 ...Test.testBuildSchemaLocationMapAttribute.xml |    6 +-
 ...testBuildSchemaLocationMapEmptyAttribute.xml |    4 +-
 ...ationMapMapOfStringListOfStringAttribute.xml |    6 +-
 ....testBuildSchemaLocationMapNullAttribute.xml |    4 +-
 ...XmlUtilsJUnitTest.testQuerySingleElement.xml |    6 +-
 geode-cq/build.gradle                           |    2 +-
 .../cache/query/internal/cq/ServerCQImpl.java   |    7 +-
 .../cq/dunit/CqResultSetUsingPoolDUnitTest.java |   24 +-
 .../internal/cache/PutAllCSDUnitTest.java       |  328 ++--
 geode-lucene/build.gradle                       |    2 +-
 .../LuceneIndexForPartitionedRegion.java        |   19 +-
 .../lucene/internal/LuceneServiceImpl.java      |    2 +-
 .../geode.apache.org/lucene/lucene-1.0.xsd      |   12 +-
 .../internal/LuceneQueryImplJUnitTest.java      |    2 +-
 .../internal/LuceneServiceImplJUnitTest.java    |   10 +-
 .../LuceneFunctionReadPathDUnitTest.java        |   17 +-
 ...erIntegrationJUnitTest.createIndex.cache.xml |    8 +-
 ...serIntegrationJUnitTest.parseIndex.cache.xml |    8 +-
 .../src/main/webapp/META-INF/MANIFEST.MF        |    3 -
 geode-pulse/src/main/webapp/META-INF/NOTICE     |   90 ++
 geode-rebalancer/build.gradle                   |    1 +
 .../util/AutoBalancerIntegrationJUnitTest.java  |   12 +-
 .../cache/util/AutoBalancerJUnitTest.java       |    6 +-
 geode-site/website/content/community/index.html |    8 +-
 .../website/content/schema/cache/cache-1.0.xsd  | 1469 +++++++++++++++++
 geode-site/website/layouts/footer.html          |   12 -
 geode-site/website/layouts/header.html          |   12 +
 geode-wan/build.gradle                          |    2 +-
 .../gemfire/internal/cache/wan/WANTestBase.java |   59 +-
 .../ConcurrentWANPropogation_1_DUnitTest.java   |    4 +-
 ...downAllPersistentGatewaySenderDUnitTest.java |    4 +-
 ...tewaySenderDistributedDeadlockDUnitTest.java |    4 +-
 .../SerialGatewaySenderQueueDUnitTest.java      |    4 +-
 .../serial/SerialWANPropogationDUnitTest.java   |   48 +-
 .../web/swagger/config/SwaggerConfig.java       |   13 +-
 geode-web-api/src/main/webapp/META-INF/NOTICE   |   89 +
 geode-web/build.gradle                          |    7 +-
 geode-web/src/main/webapp/META-INF/NOTICE       |   36 +
 gradle.properties                               |    2 +-
 gradle/dependency-resolution.gradle             |    1 +
 gradle/dependency-versions.properties           |    2 -
 gradle/ide.gradle                               |   10 +-
 gradle/java.gradle                              |    5 +-
 gradle/rat.gradle                               |    5 +-
 gradle/utilities.gradle                         |    9 +-
 112 files changed, 5976 insertions(+), 3399 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/794708e0/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
----------------------------------------------------------------------