usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [09/10] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' into USERGRID-669
Date Mon, 01 Jun 2015 21:38:13 GMT
Merge branch 'two-dot-o-dev' into USERGRID-669


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

Branch: refs/heads/two-dot-o-dev
Commit: 1d2356b46d4e8174a8b810457d3d45b384c0acfb
Parents: 210273b deee37e
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Mon Jun 1 15:37:10 2015 -0600
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Mon Jun 1 15:37:10 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 |  32 +-
 .../pipeline/builder/EntityBuilder.java         |   2 +-
 .../search/AbstractElasticSearchFilter.java     |  13 +-
 .../pipeline/read/search/Candidate.java         |  11 +-
 .../read/search/CandidateEntityFilter.java      |  66 ++-
 .../corepersistence/util/CpNamingUtils.java     |  10 +-
 .../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  |   2 +-
 .../apache/usergrid/persistence/IndexIT.java    |  44 +-
 .../persistence/model/field/AbstractField.java  |   1 +
 .../usergrid/persistence/model/field/Field.java |  13 +-
 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   | 440 +++++++++++++++++--
 .../rest/management/OrganizationsIT.java        |   5 +
 .../rest/management/RegistrationIT.java         | 397 +++++++----------
 .../rest/test/PropertiesResourceIT.java         |  23 +-
 .../test/resource2point0/AbstractRestIT.java    |   2 -
 .../rest/test/resource2point0/ClientSetup.java  |  25 +-
 .../endpoints/NamedResource.java                |   9 +
 .../endpoints/mgmt/FeedResource.java            |   5 +-
 .../endpoints/mgmt/ManagementResource.java      |   4 +
 .../endpoints/mgmt/TokenResource.java           |   8 +
 .../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 +++----
 .../usergrid/management/importer/S3Upload.java  |   9 +-
 .../security/tokens/TokenServiceIT.java         |  42 ++
 .../usergrid/services/ConnectionsServiceIT.java |   2 +-
 .../setup/ConcurrentProcessSingleton.java       |   8 +-
 ugc/README.md                                   |   2 +-
 65 files changed, 2491 insertions(+), 888 deletions(-)
----------------------------------------------------------------------



Mime
View raw message