Merge remote-tracking branch 'origin/develop' into develop

Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/ab96cf49
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/ab96cf49
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/ab96cf49

Branch: refs/heads/ValueSerializationCleaning
Commit: ab96cf490bec71b6d908de363b6f38964d81dac3
Parents: 5762bf8 7862b9c
Author: Niclas Hedhman <[email protected]>
Authored: Tue Jun 14 18:07:31 2016 +0800
Committer: Niclas Hedhman <[email protected]>
Committed: Tue Jun 14 18:07:31 2016 +0800

----------------------------------------------------------------------
 build.gradle                                    |  16 +-
 .../src/main/groovy/AsciidocBuildInfo.groovy    |   4 +-
 buildSrc/src/main/groovy/VersionClass.groovy    |   2 +-
 .../apache/zest/bootstrap/ClassScannerTest.java |   2 +-
 def.xml                                         | 334 -------------------
 extensions/entitystore-geode/build.gradle       |  39 +++
 extensions/entitystore-geode/dev-status.xml     |  38 +++
 .../entitystore-geode/src/docs/es-geode.txt     |  51 +++
 .../entitystore/geode/GeodeConfiguration.java   |  81 +++++
 .../geode/GeodeEntityStoreMixin.java            | 223 +++++++++++++
 .../geode/GeodeEntityStoreService.java          |  50 +++
 .../zest/entitystore/geode/GeodeTopology.java   |  29 ++
 .../assembly/GeodeEntityStoreAssembler.java     |  51 +++
 .../entitystore/geode/assembly/package.html     |  24 ++
 .../apache/zest/entitystore/geode/package.html  |  24 ++
 .../entitystore/geode/GeodeEntityStoreTest.java |  47 +++
 .../geode/GeodeEntityStoreWithCacheTest.java    |  43 +++
 gradle/wrapper/gradle-wrapper.properties        |   2 +-
 libraries.gradle                                |  88 +++--
 .../zest/library/http/AbstractJettyTest.java    |  28 +-
 .../library/http/AbstractSecureJettyTest.java   | 115 ++++---
 .../library/http/SecureJettyServiceTest.java    |  32 +-
 libraries/lang-scala/build.gradle               |   2 -
 .../zest/library/rest/admin/RestTest.java       | 121 +++----
 libraries/restlet/src/docs/restlet.txt          |   2 +-
 ...bstractPooledDataSourceServiceAssembler.java |   3 +-
 .../sql/datasource/DataSourceConfiguration.java |   5 +-
 .../DataSourceConfigurationValue.java           |  30 --
 manual/src/docs/userguide/extensions.txt        |   4 +
 settings.gradle                                 |   1 +
 tools/shell/src/docs/shell.txt                  |   8 +-
 31 files changed, 910 insertions(+), 589 deletions(-)
----------------------------------------------------------------------


Reply via email to