Merge branch 'two-dot-o-dev' into usergrid-1007-shiro-cache
Conflicts:
stack/rest/src/test/resources/log4j.properties
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/af5d260e
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/af5d260e
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/af5d260e
Branch: refs/heads/usergrid-1007-shiro-cache
Commit: af5d260ef9b33cd4001b831f01b10b175eb16351
Parents: 0149864 a2389e6
Author: Dave Johnson <[email protected]>
Authored: Sun Sep 20 16:43:46 2015 -0400
Committer: Dave Johnson <[email protected]>
Committed: Sun Sep 20 16:43:46 2015 -0400
----------------------------------------------------------------------
docs/jersey2skeleton/README.md | 9 +
docs/jersey2skeleton/pom.xml | 387 ++++++++++++
.../usergrid/testapp/AbstractResource.java | 51 ++
.../apache/usergrid/testapp/ApiResponse.java | 52 ++
.../org/apache/usergrid/testapp/Entity.java | 55 ++
.../usergrid/testapp/ManagementResource.java | 56 ++
.../usergrid/testapp/OrganizationResource.java | 64 ++
.../usergrid/testapp/OrganizationsResource.java | 76 +++
.../apache/usergrid/testapp/StatusResource.java | 34 +
.../java/org/apache/usergrid/testapp/User.java | 28 +
.../src/main/resources/applicationContext.xml | 28 +
.../main/resources/jersey2skeleton-context.xml | 28 +
.../src/main/webapp/WEB-INF/web.xml | 95 +++
.../usergrid/testapp/AvailablePortFinder.java | 208 ++++++
.../usergrid/testapp/OrganizationTest.java | 127 ++++
.../org/apache/usergrid/testapp/TomcatMain.java | 57 ++
.../apache/usergrid/testapp/TomcatRuntime.java | 185 ++++++
.../src/test/resources/log4j.properties | 31 +
.../src/test/resources/logging.properties | 26 +
docs/jersey2skeleton/templates/markdown.hbs | 108 ++++
docs/jersey2skeleton/templates/operation.hbs | 73 +++
docs/jersey2skeleton/templates/security.hbs | 88 +++
.../templates/strapdown.html.hbs | 10 +
stack/build-tools/pom.xml | 2 +-
stack/config/pom.xml | 2 +-
stack/core/pom.xml | 14 +-
.../usergrid/corepersistence/CoreModule.java | 51 +-
.../corepersistence/CpRelationManager.java | 23 +-
.../asyncevents/AsyncEventService.java | 2 +
.../migration/CoreMigration.java | 45 +-
.../migration/CoreMigrationPlugin.java | 38 +-
.../migration/DeDupConnectionDataMigration.java | 93 +++
.../migration/EntityTypeMappingMigration.java | 104 ---
.../migration/MigrationModuleVersionPlugin.java | 5 -
.../corepersistence/migration/Versions.java | 31 -
.../builder/PipelineBuilderFactory.java | 3 +
.../service/ConnectionScope.java | 53 ++
.../service/ConnectionService.java | 10 +
.../service/ConnectionServiceImpl.java | 89 ++-
.../corepersistence/util/CpNamingUtils.java | 13 +-
.../corepersistence/TestCoreModule.java | 34 +
.../DeDupConnectionDataMigrationTest.java | 145 +++++
.../migration/EntityTypeMappingMigrationIT.java | 125 ----
.../service/ConnectionServiceImplTest.java | 235 +++++++
stack/core/src/test/resources/log4j.properties | 6 +-
stack/corepersistence/collection/pom.xml | 2 +-
.../serialization/impl/SerializationModule.java | 4 +-
.../migration/CollectionMigrationPlugin.java | 8 +-
.../migration/MvccEntityDataMigrationImpl.java | 10 +-
...ctMvccEntityDataMigrationV1ToV3ImplTest.java | 39 +-
stack/corepersistence/common/pom.xml | 2 +-
.../migration/data/AbstractMigrationPlugin.java | 17 +-
.../core/migration/data/DataMigration.java | 11 +-
.../migration/data/MigrationDataProvider.java | 2 +-
.../core/migration/data/MigrationPlugin.java | 4 +-
.../migration/schema/MigrationManagerFig.java | 1 +
.../migration/data/TestProgressObserver.java | 10 +-
stack/corepersistence/graph/pom.xml | 2 +-
.../persistence/graph/guice/GraphModule.java | 4 +-
.../graph/impl/GraphManagerImpl.java | 4 +-
.../impl/stage/EdgeDeleteListenerImpl.java | 4 +-
.../graph/impl/stage/EdgeDeleteRepairImpl.java | 61 +-
.../impl/TargetIdObservableImpl.java | 13 +-
.../impl/migration/EdgeDataMigrationImpl.java | 12 +-
.../impl/migration/GraphMigrationPlugin.java | 8 +-
.../impl/shard/impl/EdgeSearcher.java | 14 +-
.../impl/ShardedEdgeSerializationImpl.java | 59 +-
.../shard/impl/serialize/EdgeSerializer.java | 21 +-
.../persistence/graph/GraphManagerIT.java | 73 ++-
.../migration/EdgeDataMigrationImplTest.java | 59 +-
stack/corepersistence/map/pom.xml | 2 +-
stack/corepersistence/model/pom.xml | 2 +-
stack/corepersistence/pom.xml | 2 +-
stack/corepersistence/queryindex/pom.xml | 2 +-
.../persistence/index/CandidateResult.java | 32 +-
.../persistence/index/CandidateResults.java | 34 +-
.../SearchRequestBuilderStrategyV2.java | 30 +-
.../usergrid/persistence/index/IndexEdge.java | 36 +-
.../index/IndexLocationStrategy.java | 30 +-
.../persistence/index/IndexRefreshCommand.java | 30 +-
.../usergrid/persistence/index/SearchType.java | 30 +-
.../usergrid/persistence/index/SearchTypes.java | 32 +-
.../persistence/index/SelectFieldMapping.java | 36 +-
.../persistence/index/guice/IndexModule.java | 4 +-
.../persistence/index/impl/EntityField.java | 32 +-
.../index/impl/EntityMappingParser.java | 37 +-
.../index/impl/EsEntityIndexFactoryImpl.java | 29 +-
.../index/impl/EsIndexBufferConsumerImpl.java | 28 +-
.../index/impl/EsIndexCacheImpl.java | 29 +-
.../persistence/index/impl/EsQueryVistor.java | 50 +-
.../persistence/index/impl/FailureMonitor.java | 30 +-
.../index/impl/FailureMonitorImpl.java | 32 +-
.../persistence/index/impl/FieldParser.java | 36 +-
.../persistence/index/impl/GeoSortFields.java | 36 +-
.../index/impl/IndexBufferConsumer.java | 28 +-
.../persistence/index/impl/IndexCache.java | 30 +-
.../persistence/index/impl/IndexEdgeImpl.java | 36 +-
.../index/impl/IndexIdentifierv2Impl.java | 30 +-
.../index/impl/IndexRefreshCommandImpl.java | 30 +-
.../index/impl/NoOpFilterBuilder.java | 32 +-
.../index/impl/NoOpQueryBuilder.java | 32 +-
.../impl/SearchRequestBuilderStrategy.java | 30 +-
.../persistence/index/impl/SortBuilder.java | 36 +-
.../EsIndexMappingMigrationPlugin.java | 30 +-
.../index/migration/EsIndexMigrationPlugin.java | 8 +-
.../index/migration/IndexDataVersions.java | 30 +-
.../persistence/index/query/ParsedQuery.java | 36 +-
.../index/query/ParsedQueryBuilder.java | 36 +-
.../persistence/index/query/SortPredicate.java | 36 +-
.../persistence/index/usergrid-mappings.json | 5 -
.../persistence/index/impl/EntityIndexTest.java | 13 +-
.../index/impl/EntityToMapConverterTest.java | 38 +-
.../impl/EsIndexMappingMigrationPluginTest.java | 30 +-
.../persistence/index/impl/EsRunner.java | 32 +-
.../persistence/index/impl/GeoPagingTest.java | 36 +-
.../index/impl/TestIndexIdentifier.java | 30 +-
stack/corepersistence/queue/pom.xml | 2 +-
stack/pom.xml | 252 ++++----
stack/rest/pom.xml | 141 +++--
.../usergrid/rest/AbstractContextResource.java | 45 +-
.../usergrid/rest/ApplicationsResource.java | 40 +-
.../apache/usergrid/rest/DatabaseResource.java | 17 +-
.../org/apache/usergrid/rest/IndexResource.java | 54 +-
.../apache/usergrid/rest/MigrateResource.java | 61 +-
.../org/apache/usergrid/rest/RootResource.java | 92 ++-
.../apache/usergrid/rest/SwaggerServlet.java | 5 +-
.../apache/usergrid/rest/SystemResource.java | 29 +-
.../usergrid/rest/TextToJsonSwapWriter.java | 182 +++---
.../rest/applications/ApplicationResource.java | 30 +-
.../rest/applications/ServiceResource.java | 111 ++--
.../applications/assets/AssetsResource.java | 13 +-
.../applications/events/EventsResource.java | 36 +-
.../notifiers/NotifierResource.java | 29 +-
.../notifiers/NotifiersResource.java | 29 +-
.../rest/applications/queues/QueueResource.java | 86 ++-
.../queues/QueueSubscriberResource.java | 63 +-
.../queues/QueueSubscriptionResource.java | 63 +-
.../queues/QueueTransactionsResource.java | 40 +-
.../rest/applications/users/UserResource.java | 134 ++--
.../rest/applications/users/UsersResource.java | 51 +-
.../exceptions/NotFoundExceptionMapper.java | 3 +-
.../rest/exceptions/SecurityException.java | 31 +-
.../exceptions/SecurityExceptionMapper.java | 3 +-
.../exceptions/UnsupportedMediaTypeMapper.java | 43 ++
.../rest/filters/ContentTypeFilter.java | 74 +--
.../rest/filters/JSONPCallbackFilter.java | 26 +-
.../usergrid/rest/filters/MeteringFilter.java | 632 ++++++++++---------
.../usergrid/rest/filters/TracingFilter.java | 37 +-
.../rest/management/ManagementResource.java | 53 +-
.../management/metrics/MetricsResource.java | 9 +-
.../organizations/OrganizationResource.java | 64 +-
.../organizations/OrganizationsResource.java | 66 +-
.../applications/ApplicationResource.java | 56 +-
.../applications/ApplicationsResource.java | 20 +-
.../imports/FileErrorsResource.java | 41 +-
.../imports/FileIncludesResource.java | 15 +-
.../applications/imports/ImportsResource.java | 57 +-
.../organizations/users/UsersResource.java | 88 +--
.../rest/management/users/UserResource.java | 95 +--
.../rest/management/users/UsersResource.java | 11 +-
.../organizations/OrganizationsResource.java | 76 +--
.../organizations/OrganizationResource.java | 28 +-
.../rest/security/CrossOriginRequestFilter.java | 18 +-
.../security/SecuredResourceFilterFactory.java | 181 +++---
.../ShiroAuthenticationExceptionMapper.java | 3 +-
.../shiro/filters/BasicAuthSecurityFilter.java | 35 +-
.../ClientCredentialsSecurityFilter.java | 25 +-
.../OAuth2AccessTokenSecurityFilter.java | 168 +++--
.../security/shiro/filters/SecurityFilter.java | 33 +-
.../apache/usergrid/rest/utils/CORSUtils.java | 42 +-
stack/rest/src/main/webapp/WEB-INF/web.xml | 63 +-
.../java/org/apache/usergrid/rest/BasicIT.java | 22 +-
.../usergrid/rest/CollectionMetadataIT.java | 7 +-
.../apache/usergrid/rest/IndexResourceIT.java | 43 +-
.../apache/usergrid/rest/NotificationsIT.java | 6 +-
.../apache/usergrid/rest/PartialUpdateTest.java | 16 +-
.../apache/usergrid/rest/SystemResourceIT.java | 7 +-
.../org/apache/usergrid/rest/TomcatRuntime.java | 12 +-
.../rest/applications/ApplicationCreateIT.java | 14 +-
.../rest/applications/ApplicationDeleteIT.java | 206 +++---
.../applications/ApplicationResourceIT.java | 266 ++++----
.../applications/assets/AssetResourceIT.java | 21 +-
.../applications/assets/AwsAssetResourceIT.java | 53 +-
.../applications/assets/aws/NoAWSCredsRule.java | 15 +-
.../collection/CollectionsResourceIT.java | 26 +-
.../collection/DuplicateNameIT.java | 5 +-
.../activities/ActivityResourceIT.java | 5 +-
.../collection/devices/DevicesResourceIT.java | 4 +-
.../collection/groups/GroupResourceIT.java | 28 +-
.../users/ConnectionResourceTest.java | 8 +-
.../collection/users/OwnershipResourceIT.java | 15 +-
.../collection/users/PermissionsResourceIT.java | 34 +-
.../collection/users/UserResourceIT.java | 126 ++--
.../queries/BadGrammarQueryTest.java | 15 +-
.../applications/queries/BasicGeoTests.java | 45 +-
.../rest/filters/ContentTypeResourceIT.java | 70 +-
.../usergrid/rest/management/AccessTokenIT.java | 42 +-
.../usergrid/rest/management/AdminUsersIT.java | 48 +-
.../rest/management/ExportResourceIT.java | 137 ++--
.../rest/management/ImportResourceIT.java | 50 +-
.../rest/management/ManagementResourceIT.java | 149 +++--
.../rest/management/OrganizationsIT.java | 60 +-
.../rest/management/RegistrationIT.java | 32 +-
.../organizations/AdminEmailEncodingIT.java | 5 +-
.../rest/test/resource/AbstractRestIT.java | 79 ++-
.../rest/test/resource/ClientSetup.java | 4 +-
.../usergrid/rest/test/resource/RestClient.java | 44 +-
.../test/resource/TestPropertiesResource.java | 14 +-
.../endpoints/ApplicationsResource.java | 8 +-
.../resource/endpoints/BoostrapResource.java | 19 +-
.../resource/endpoints/CollectionEndpoint.java | 109 ++--
.../test/resource/endpoints/EntityEndpoint.java | 40 +-
.../test/resource/endpoints/NamedResource.java | 164 +++--
.../test/resource/endpoints/RootResource.java | 4 +-
.../test/resource/endpoints/SetupResource.java | 20 +-
.../test/resource/endpoints/SystemResource.java | 46 +-
.../test/resource/endpoints/TokenResource.java | 15 +-
.../test/resource/endpoints/UrlResource.java | 7 +-
.../endpoints/mgmt/ApplicationResource.java | 27 +-
.../endpoints/mgmt/ApplicationsResource.java | 4 +-
.../endpoints/mgmt/AuthorizeResource.java | 7 +-
.../endpoints/mgmt/ConfirmResource.java | 12 +-
.../endpoints/mgmt/CredentialsResource.java | 7 +-
.../resource/endpoints/mgmt/FeedResource.java | 5 +-
.../resource/endpoints/mgmt/OrgResource.java | 68 +-
.../endpoints/mgmt/OrganizationResource.java | 15 +-
.../endpoints/mgmt/PasswordResource.java | 8 -
.../endpoints/mgmt/ReactivateResource.java | 10 +-
.../resource/endpoints/mgmt/ResetResource.java | 10 +-
.../resource/endpoints/mgmt/TokenResource.java | 7 +-
.../resource/endpoints/mgmt/UserResource.java | 20 +-
.../resource/endpoints/mgmt/UsersResource.java | 6 -
stack/rest/src/test/resources/log4j.properties | 33 +-
.../rest/src/test/resources/logging.properties | 13 +-
stack/services/pom.xml | 51 +-
.../management/AppInfoMigrationPlugin.java | 234 ++++---
.../security/providers/AbstractProvider.java | 16 +-
.../security/providers/FacebookProvider.java | 7 +-
.../security/providers/FoursquareProvider.java | 38 +-
.../providers/PingIdentityProvider.java | 38 +-
.../usergrid/management/OrganizationIT.java | 18 +-
stack/test-utils/pom.xml | 2 +-
.../org/apache/usergrid/tools/ExportAdmins.java | 17 +-
243 files changed, 6897 insertions(+), 4370 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/af5d260e/stack/corepersistence/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/af5d260e/stack/rest/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --cc stack/rest/src/test/resources/log4j.properties
index 43c6e85,201550b..0288842
--- a/stack/rest/src/test/resources/log4j.properties
+++ b/stack/rest/src/test/resources/log4j.properties
@@@ -26,14 -26,12 +26,17 @@@ log4j.appender.stdout=org.apache.log4j.
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d %p (%t) %c{1} - %m%n
+ log4j.logger.org.glassfish=DEBUG
+ log4j.logger.org.apache.shiro=DEBUG
log4j.logger.org.apache.usergrid=INFO
+
#log4j.logger.org.apache.usergrid.cassandra=DEBUG
#log4j.logger.org.apache.usergrid.persistence.cassandra=DEBUG
+log4j.category.org.apache=ERROR
+log4j.category.org.apache.usergrid=WARN
+log4j.category.org.apache.usergrid.rest=INFO
+log4j.category.org.apache.shiro=DEBUG
+log4j.category.org.apache.usergrid.rest.security.shiro=DEBUG
log4j.logger.org.apache.usergrid.persistence.cassandra.CounterUtils=ERROR
log4j.logger.org.apache.usergrid.persistence.cassandra.DB=WARN
