You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/02/27 00:38:22 UTC
[06/24] incubator-usergrid git commit: Merge branch 'USERGRID-273' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
USERGRID-273-indexbuffer
Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-273-indexbuffer
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6075635b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6075635b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6075635b
Branch: refs/heads/two-dot-o
Commit: 6075635be5bf66005dcabd20193926fcf32ed7a3
Parents: 090eb1b 011a5e0
Author: Shawn Feldman <sf...@apache.org>
Authored: Sat Feb 21 08:40:03 2015 -0500
Committer: Shawn Feldman <sf...@apache.org>
Committed: Sat Feb 21 08:40:03 2015 -0500
----------------------------------------------------------------------
.../src/main/groovy/configure_usergrid.groovy | 2 +-
.../main/resources/usergrid-default.properties | 15 +-
.../corepersistence/CpEntityManager.java | 2 +-
.../usergrid/corepersistence/CpSetup.java | 3 +
.../usergrid/corepersistence/CpWalker.java | 73 +++++-----
.../entities/FailedImportEntity.java | 11 +-
.../datagenerators/EntityDataGenerator.scala | 17 ++-
.../datagenerators/FeederGenerator.scala | 24 ++-
.../usergrid/scenarios/EntityScenarios.scala | 20 ++-
.../org/apache/usergrid/settings/Settings.scala | 2 +
.../PostCustomEntitySimulation.scala | 27 +++-
stack/mongo-emulator/pom.xml | 15 +-
stack/pom.xml | 61 ++------
stack/rest/README.md | 14 +-
stack/rest/pom.xml | 20 ++-
.../org/apache/usergrid/rest/IndexResource.java | 26 +++-
.../usergrid/rest/filters/MeteringFilter.java | 2 +
.../security/SecuredResourceFilterFactory.java | 2 +
.../security/shiro/filters/SecurityFilter.java | 3 +
.../apache/usergrid/rest/AbstractRestIT.java | 9 +-
.../usergrid/rest/DatabaseInitializer.java | 146 -------------------
.../rest/management/OrganizationsIT.java | 2 +-
.../test/resource2point0/AbstractRestIT.java | 22 +++
stack/rest/src/test/resources/arquillian.xml | 24 ++-
.../resources/usergrid-deployment.properties | 2 -
.../management/importer/ImportServiceImpl.java | 5 +-
.../usergrid/management/OrganizationIT.java | 30 ++--
.../importer/FileImportTrackerTest.java | 55 +++----
.../management/importer/ImportCollectionIT.java | 51 ++++---
.../services/ApplicationsServiceIT.java | 8 +-
.../usergrid/cassandra/ClearShiroSubject.java | 18 +++
31 files changed, 327 insertions(+), 384 deletions(-)
----------------------------------------------------------------------