usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [3/4] incubator-usergrid git commit: Merge branch 'two-dot-o' into pr/149
Date Wed, 25 Feb 2015 20:11:01 GMT
Merge branch 'two-dot-o' into pr/149


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

Branch: refs/heads/two-dot-o
Commit: b5550df8c2fb3e6c5e42665deff8accacc4cdfb7
Parents: b6cbc3d 198f479
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Wed Feb 25 13:06:09 2015 -0700
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Wed Feb 25 13:06:09 2015 -0700

----------------------------------------------------------------------
 .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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b5550df8/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b5550df8/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/CollectionEndpoint.java
----------------------------------------------------------------------
diff --cc stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/CollectionEndpoint.java
index a37ac46,3cb7a32..6f62a20
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/CollectionEndpoint.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/CollectionEndpoint.java
@@@ -53,13 -49,9 +53,13 @@@ public class CollectionEndpoint extend
  
  
      public EntityEndpoint entity(final String identifier ){
-         return new EntityEndpoint(identifier, context, this);
+         return uniqueID(identifier);
      }
  
 +    public CollectionEndpoint withAcceptHeader(final String acceptHeader) {
 +        this.acceptHeaders.add(acceptHeader);
 +        return this;
 +    }
  
      /**
       *


Mime
View raw message