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/02/26 19:06:48 UTC
[6/8] incubator-usergrid git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-280
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-280
# By Shawn Feldman (13) and others
# Via Rod Simpson (4) and others
* 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid: (29 commits)
Use example URL instead
fix authentication workflow
fixed double slash bug in data explorer in admin portal
remove lexer
Revert "remove lexer"
remove lexer
compile issue...
add valid notification types
add illegal argument type
add default case to factory
remove sln file
moving files to own dir
push sample
roles/role fix
Working windows phone toasts
added apache lic header
Beginnings of a REST test.
Addition of emf.deleteApplicaton() method and a test for it in EntityManagerFacotryImplIT.
Addition of deleteIndex() method, improvements to logging and minor formatting changes.
add initial windows adapter
...
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/760a09c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/760a09c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/760a09c7
Branch: refs/heads/USERGRID-280
Commit: 760a09c7235e529387e3fed96ff5b43cadd25b55
Parents: 0e17c53 198f479
Author: grey <gr...@apigee.com>
Authored: Tue Feb 3 14:33:00 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Tue Feb 3 14:33:00 2015 -0800
----------------------------------------------------------------------
.gitignore | 4 +-
portal/js/global/ug-service.js | 72 +--
portal/js/push/push-config-controller.js | 18 +-
portal/js/push/push-config.html | 50 ++
.../Usergrid.Notifications/App.xaml | 27 +
.../Usergrid.Notifications/App.xaml.cs | 150 ++++++
.../Assets/Logo.scale-240.png | Bin 0 -> 2516 bytes
.../Assets/SmallLogo.scale-240.png | Bin 0 -> 753 bytes
.../Assets/SplashScreen.scale-240.png | Bin 0 -> 14715 bytes
.../Assets/Square71x71Logo.scale-240.png | Bin 0 -> 1122 bytes
.../Assets/StoreLogo.scale-240.png | Bin 0 -> 2200 bytes
.../Assets/WideLogo.scale-240.png | Bin 0 -> 4530 bytes
.../Client/EntityResponse.cs | 80 +++
.../Client/IUsergridClient.cs | 123 +++++
.../Usergrid.Notifications/Client/PushClient.cs | 155 ++++++
.../Usergrid.Notifications/Client/Usergrid.cs | 122 +++++
.../Usergrid.Notifications/MainPage.xaml | 38 ++
.../Usergrid.Notifications/MainPage.xaml.cs | 124 +++++
.../Package.StoreAssociation.xml | 194 +++++++
.../Usergrid.Notifications/Package.appxmanifest | 53 ++
.../Properties/AssemblyInfo.cs | 29 +
.../Usergrid.Notifications.csproj | 142 +++++
.../Usergrid.Notifications/packages.config | 25 +
.../notifications/packages/repositories.config | 4 +
.../corepersistence/CpEntityManagerFactory.java | 56 +-
.../HybridEntityManagerFactory.java | 9 +-
.../persistence/EntityManagerFactory.java | 11 +-
.../cassandra/EntityManagerFactoryImpl.java | 11 +-
.../usergrid/persistence/entities/Notifier.java | 31 +-
.../cassandra/EntityManagerFactoryImplIT.java | 71 ++-
.../usergrid/persistence/index/EntityIndex.java | 2 +
.../index/impl/EsEntityIndexBatchImpl.java | 14 +-
.../index/impl/EsEntityIndexImpl.java | 115 ++--
.../persistence/index/impl/EsIndexCache.java | 12 +-
.../persistence/queue/impl/QueueScopeImpl.java | 4 -
.../rest/applications/ApplicationResource.java | 32 +-
.../apache/usergrid/rest/PartialUpdateTest.java | 170 +++---
.../applications/ApplicationDeleteTest.java | 54 ++
.../collection/groups/GroupResourceIT.java | 2 +-
.../applications/queries/AndOrQueryTest.java | 528 ++++++++++---------
.../queries/BadGrammarQueryTest.java | 213 ++++++--
.../applications/queries/GeoPagingTest.java | 2 +-
.../rest/applications/queries/OrderByTest.java | 447 +++++++++++-----
.../applications/queries/QueryTestBase.java | 72 +++
.../endpoints/CollectionEndpoint.java | 2 +-
stack/services/pom.xml | 7 +-
.../notifications/ProviderAdapterFactory.java | 5 +
.../impl/ApplicationQueueManagerImpl.java | 8 +-
.../wns/TranslatedNotification.java | 50 ++
.../services/notifications/wns/WNSAdapter.java | 163 ++++++
50 files changed, 2806 insertions(+), 695 deletions(-)
----------------------------------------------------------------------