You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/09/29 22:00:30 UTC
[04/15] usergrid git commit: Merge branch 'two-dot-o-dev' of
https://github.com/apache/usergrid into export-feature
Merge branch 'two-dot-o-dev' of https://github.com/apache/usergrid into export-feature
# By Shawn Feldman (12) and others
# Via Shawn Feldman (4) and others
* 'two-dot-o-dev' of https://github.com/apache/usergrid:
Fixing weird formatting in license headers, no code changes. This closes #385.
clean up uuid to string code for index
change parsing logic to parse uuid as string
change parsing logic to parse uuid as string
change location to entity field
handle errors
Add note that notification expiration timestamp is specified in seconds.
Fix issue with portal login button not handling failed logins properly when logging is disabled. Bump version.
Change 'expire' property for notifications to support milliseconds, matching the 'deliver' property.
remove location if its not a map
removing noop exceptions, removing failures due to bad location fields
removing noop exceptions, removing failures due to bad location fields
Updating EdgeDeleteEvent
Add database setup to migration script.
add apm mobile config
fix default queue
Fix push notification delivery expiration.
USERGRID-645: fix superuser access via token
add map for bad types
remove pathquery deserialization
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/202150fc
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/202150fc
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/202150fc
Branch: refs/heads/export-feature
Commit: 202150fccd009babc2af0f0b8219f7c44228d4df
Parents: 40b894e 65d2608
Author: GERey <gr...@apigee.com>
Authored: Wed Sep 16 14:41:09 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Wed Sep 16 14:41:09 2015 -0700
----------------------------------------------------------------------
.../creating-and-managing-notifications.md | 2 +
portal/bower.json | 2 +-
portal/js/libs/usergrid.sdk.js | 8 +-
portal/package.json | 2 +-
.../asyncevents/AmazonAsyncEventService.java | 6 +-
.../rx/impl/AllApplicationsObservableImpl.java | 36 +++-----
.../persistence/entities/Notification.java | 22 +++--
.../corepersistence/CpEntityMapUtilsTest.java | 52 ++++++++++-
.../org/apache/usergrid/persistence/GeoIT.java | 52 ++++++++++-
.../migration/MvccEntityDataMigrationImpl.java | 94 +++++++++++---------
stack/corepersistence/model/pom.xml | 6 +-
.../model/entity/EntityToMapConverter.java | 17 +++-
.../model/entity/MapToEntityConverter.java | 64 +++++++------
.../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/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 | 28 +++---
.../index/migration/IndexDataVersions.java | 30 +++----
.../persistence/index/query/ParsedQuery.java | 36 ++++----
.../index/query/ParsedQueryBuilder.java | 36 ++++----
.../persistence/index/query/SortPredicate.java | 36 ++++----
.../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 +++----
.../queue/impl/QueueManagerFactoryImpl.java | 16 +++-
.../rest/applications/ApplicationResource.java | 11 ++-
.../exceptions/AbstractExceptionMapper.java | 13 ++-
.../organizations/OrganizationResource.java | 7 +-
.../security/SecuredResourceFilterFactory.java | 7 +-
.../shiro/filters/BasicAuthSecurityFilter.java | 5 +-
.../applications/ApplicationResourceIT.java | 12 +++
stack/scripts/migrate_entity_data.py | 17 ++++
.../apache/usergrid/security/shiro/Realm.java | 24 +++++
.../notifications/apns/APNsNotification.java | 8 +-
.../services/notifications/gcm/GCMAdapter.java | 9 +-
.../services/notifications/wns/WNSAdapter.java | 13 ++-
.../apns/NotificationsServiceIT.java | 1 +
.../gcm/NotificationsServiceIT.java | 1 +
66 files changed, 981 insertions(+), 784 deletions(-)
----------------------------------------------------------------------