usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [49/50] [abbrv] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-628
Date Mon, 01 Jun 2015 21:48:58 GMT
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
into USERGRID-628


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

Branch: refs/heads/USERGRID-628
Commit: f1747579c8bbf251dad2cdbabeb1075a23db6240
Parents: 29e885f b068525
Author: Todd Nine <tnine@apigee.com>
Authored: Mon Jun 1 15:43:46 2015 -0600
Committer: Todd Nine <tnine@apigee.com>
Committed: Mon Jun 1 15:43:46 2015 -0600

----------------------------------------------------------------------
 README.md                                       |   2 +-
 docs/file-storage-configuration.md              |  39 ++
 docs/get_2.0_running_locally.md                 | 165 ++++++
 docs/index.md                                   |   3 +-
 .../main/resources/usergrid-default.properties  |  24 +-
 .../corepersistence/CpEntityManagerFactory.java |  33 +-
 .../asyncevents/AmazonAsyncEventService.java    |   4 +-
 .../pipeline/builder/EntityBuilder.java         |   2 +-
 .../search/AbstractElasticSearchFilter.java     |  13 +-
 .../pipeline/read/search/Candidate.java         |  11 +-
 .../read/search/CandidateEntityFilter.java      |  66 ++-
 .../corepersistence/util/CpNamingUtils.java     |   8 +
 .../org/apache/usergrid/persistence/Query.java  |   8 +-
 .../persistence/cassandra/CassandraService.java |  54 +-
 .../org/apache/usergrid/utils/JsonUtils.java    |   2 +-
 .../corepersistence/StaleIndexCleanupTest.java  |   2 +-
 .../org/apache/usergrid/persistence/GeoIT.java  |   1 -
 .../apache/usergrid/persistence/IndexIT.java    |  44 +-
 .../persistence/model/field/AbstractField.java  |   1 +
 .../usergrid/persistence/model/field/Field.java |  13 +-
 .../persistence/queue/DefaultQueueManager.java  |   6 +-
 .../persistence/queue/QueueManager.java         |   4 +-
 .../queue/impl/SNSQueueManagerImpl.java         |   6 +-
 .../queue/impl/SQSQueueManagerImpl.java         |   6 +-
 .../persistence/queue/QueueManagerTest.java     |   8 +-
 stack/pom.xml                                   |  28 +-
 .../rest/applications/ServiceResource.java      |   2 +-
 .../rest/management/ManagementResource.java     | 403 ++++++++++++++-
 .../organizations/OrganizationsResource.java    |  20 +-
 .../rest/management/users/UserResource.java     |  42 ++
 .../rest/management/users/UsersResource.java    |  45 +-
 .../OAuth2AccessTokenSecurityFilter.java        |   4 +
 .../applications/assets/AssetResourceIT.java    | 302 +++++++----
 .../collection/paging/PagingResourceIT.java     |  14 +-
 .../collection/users/PermissionsResourceIT.java |  20 +-
 .../collection/users/RetrieveUsersTest.java     |   5 +-
 .../collection/users/UserResourceIT.java        |  17 +-
 .../applications/queries/AndOrQueryTest.java    |   4 +-
 .../applications/queries/GeoPagingTest.java     |   3 +-
 .../rest/applications/queries/OrderByTest.java  |   8 +-
 .../rest/applications/utils/UserRepo.java       |  36 +-
 .../rest/filters/ContentTypeResourceIT.java     | 177 +++----
 .../usergrid/rest/management/AdminUsersIT.java  |  14 +-
 .../rest/management/ManagementResourceIT.java   | 513 ++++++++++++++++++-
 .../rest/management/OrganizationsIT.java        |   5 +
 .../rest/management/RegistrationIT.java         | 408 ++++++---------
 .../rest/test/PropertiesResourceIT.java         |  23 +-
 .../test/resource2point0/AbstractRestIT.java    |   2 -
 .../rest/test/resource2point0/ClientSetup.java  |  25 +-
 .../endpoints/mgmt/FeedResource.java            |   5 +-
 .../resource2point0/model/Organization.java     |   4 +-
 .../src/test/resources/cat-larger-than-6mb.jpg  | Bin 0 -> 9799257 bytes
 stack/rest/src/test/resources/log4j.properties  |   3 +-
 stack/services/pom.xml                          |  21 +
 .../usergrid/management/ManagementService.java  |   5 +-
 .../cassandra/ManagementServiceImpl.java        |   7 +
 .../management/export/S3ExportImpl.java         |   7 +
 .../apache/usergrid/security/shiro/Realm.java   |  10 +-
 .../usergrid/security/tokens/TokenService.java  |   3 +
 .../tokens/cassandra/TokenServiceImpl.java      |  44 +-
 .../assets/data/AwsSdkS3BinaryStore.java        | 230 +++++++++
 .../services/assets/data/S3BinaryStore.java     | 268 +++++++---
 .../services/notifications/QueueListener.java   | 159 +++---
 .../services/queues/ImportQueueManager.java     |   5 +-
 .../usergrid/services/queues/QueueListener.java |  75 +--
 .../usergrid/management/importer/S3Upload.java  |   9 +-
 .../security/tokens/TokenServiceIT.java         |  42 ++
 .../usergrid/services/ConnectionsServiceIT.java |   2 +-
 .../setup/ConcurrentProcessSingleton.java       |   8 +-
 ugc/README.md                                   |   2 +-
 70 files changed, 2620 insertions(+), 934 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f1747579/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f1747579/stack/core/src/test/java/org/apache/usergrid/persistence/GeoIT.java
----------------------------------------------------------------------


Mime
View raw message