You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/06/29 19:40:30 UTC
[18/50] [abbrv] incubator-usergrid git commit: Merge branch
'two-dot-o-dev' of github.com:apache/incubator-usergrid into two-dot-o-dev
Merge branch 'two-dot-o-dev' of github.com:apache/incubator-usergrid into two-dot-o-dev
Conflicts:
stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1926389a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1926389a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1926389a
Branch: refs/heads/USERGRID-703
Commit: 1926389acd8a77e00a24322417f6d86a8819695b
Parents: d954008 b51b668
Author: Jeff West <jw...@apigee.com>
Authored: Wed Jun 17 11:41:04 2015 -0700
Committer: Jeff West <jw...@apigee.com>
Committed: Wed Jun 17 11:41:04 2015 -0700
----------------------------------------------------------------------
.../usergrid/corepersistence/CoreModule.java | 1 +
.../corepersistence/CpEntityManager.java | 3 +-
.../corepersistence/CpEntityManagerFactory.java | 73 +++---
.../corepersistence/CpRelationManager.java | 3 +-
.../asyncevents/AmazonAsyncEventService.java | 2 +-
.../index/ApplicationIndexBucketLocator.java | 66 +++++
.../index/ApplicationIndexLocationStrategy.java | 54 ++--
.../corepersistence/index/CoreIndexFig.java | 13 +-
.../index/IndexLocationStrategyFactoryImpl.java | 12 +-
.../index/ManagementIndexLocationStrategy.java | 17 +-
.../index/ReIndexServiceImpl.java | 29 ++-
.../usergrid/persistence/EntityManager.java | 2 +-
.../org/apache/usergrid/CoreApplication.java | 6 +-
.../corepersistence/index/IndexNamingTest.java | 108 +++++++-
.../usergrid/persistence/PathQueryIT.java | 4 +
.../usergrid/persistence/PermissionsIT.java | 1 +
.../resources/usergrid-custom-test.properties | 2 +-
.../cache/CachedEntityCollectionManager.java | 1 +
.../mvcc/entity/impl/MvccEntityImpl.java | 2 +-
.../MvccEntitySerializationStrategyV3Impl.java | 251 +++++++++----------
.../MvccEntitySerializationStrategyV2Test.java | 5 +
.../core/astyanax/FieldBufferBuilder.java | 18 +-
.../core/astyanax/FieldBufferParser.java | 13 +-
.../persistence/core/guice/CommonModule.java | 31 +--
.../persistence/core/guicyfig/ClusterFig.java | 37 +++
.../persistence/model/entity/Entity.java | 2 +-
.../persistence/model/entity/EntityMap.java | 58 ++---
.../model/entity/EntityToMapConverter.java | 11 +-
.../model/entity/MapToEntityConverter.java | 13 +-
stack/corepersistence/queryindex/README.md | 19 +-
.../usergrid/persistence/index/EntityIndex.java | 13 +-
.../usergrid/persistence/index/IndexFig.java | 5 -
.../index/IndexLocationStrategy.java | 11 +-
.../index/impl/EntityToMapConverter.java | 6 -
.../index/impl/EsEntityIndexBatchImpl.java | 12 +-
.../index/impl/EsEntityIndexImpl.java | 57 ++---
.../persistence/index/impl/EntityIndexTest.java | 4 +-
.../index/impl/TestIndexIdentifier.java | 15 +-
.../queue/impl/SNSQueueManagerImpl.java | 7 +-
.../queue/impl/SQSQueueManagerImpl.java | 7 +-
.../org/apache/usergrid/rest/IndexResource.java | 217 ++++++++--------
.../rest/applications/ApplicationResource.java | 93 ++-----
...ationApplicationNotFoundExceptionMapper.java | 2 +-
.../applications/ApplicationResource.java | 83 ++++--
.../applications/ApplicationsResource.java | 13 -
.../rest/applications/ApplicationCreateIT.java | 8 +-
.../rest/applications/ApplicationDeleteIT.java | 114 +++++----
.../applications/ApplicationResourceIT.java | 12 +-
.../applications/assets/AssetResourceIT.java | 8 +
.../usergrid/rest/management/AdminUsersIT.java | 6 +-
.../rest/management/ExportResourceIT.java | 60 ++---
.../rest/management/ImportResourceIT.java | 38 +--
.../rest/management/ManagementResourceIT.java | 14 +-
.../rest/management/OrganizationsIT.java | 18 +-
.../rest/management/RegistrationIT.java | 7 +-
.../organizations/AdminEmailEncodingIT.java | 3 +-
.../rest/test/resource2point0/ClientSetup.java | 14 +-
.../endpoints/mgmt/ApplicationsResource.java | 7 +
.../endpoints/mgmt/OrgResource.java | 2 +-
.../resources/usergrid-custom-test.properties | 2 +-
.../cassandra/ManagementServiceImpl.java | 6 +-
.../services/notifications/QueueListener.java | 2 +-
.../usergrid/services/queues/QueueListener.java | 2 +-
.../resources/usergrid-custom-test.properties | 2 +-
64 files changed, 988 insertions(+), 739 deletions(-)
----------------------------------------------------------------------