You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/09/11 03:02:17 UTC
[1/3] git commit: Move awscluster to ES 1.3.2 too.
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o acfe1b4bc -> 51da1ca8f
Move awscluster to ES 1.3.2 too.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b9922cd6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b9922cd6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b9922cd6
Branch: refs/heads/two-dot-o
Commit: b9922cd63a42a50da8cfa4ae9a9debe1f3c146a6
Parents: f0eda9f
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Sep 10 20:58:28 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Sep 10 20:58:28 2014 -0400
----------------------------------------------------------------------
.../src/main/dist/init_instance/install_elasticsearch.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b9922cd6/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh b/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
index cae0eb8..d398591 100644
--- a/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
+++ b/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
@@ -23,7 +23,7 @@ pushd /etc/apt/sources.list.d
# Install and stop ElasticSearch
cat >> elasticsearch.sources.list << EOF
-deb http://packages.elasticsearch.org/elasticsearch/1.2/debian stable main
+deb http://packages.elasticsearch.org/elasticsearch/1.3/debian stable main
EOF
apt-get update
apt-get --force-yes -y install elasticsearch
[3/3] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Conflicts:
stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/51da1ca8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/51da1ca8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/51da1ca8
Branch: refs/heads/two-dot-o
Commit: 51da1ca8fe4976f281d40b4dbc9f7816e61e55bd
Parents: 5672e3f acfe1b4
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Sep 10 21:01:59 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Sep 10 21:01:59 2014 -0400
----------------------------------------------------------------------
.../apache/usergrid/corepersistence/CpRelationManager.java | 4 ++--
.../java/org/apache/usergrid/persistence/PathQuery.java | 8 +++++++-
.../services/notifications/ApplicationQueueManager.java | 5 ++---
.../services/notifications/NotificationsService.java | 5 +++--
.../services/notifications/apns/NotificationsServiceIT.java | 6 +++---
.../services/notifications/gcm/NotificationsServiceIT.java | 9 +++++----
6 files changed, 22 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/51da1ca8/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
----------------------------------------------------------------------
diff --cc stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
index 21c7a79,3db763c..9a12538
--- a/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
@@@ -193,13 -195,15 +193,14 @@@ public class NotificationsServiceIT ext
user.getUuid(), "devices", device1.getUuid()).getEntity();
assertEquals(device.getUuid(), device1.getUuid());
- // create query that searches for that device by providing UUID of the user
++ // create path query to search in user's device collection for device by UUID
Query pQuery = new Query();
pQuery.setLimit(100);
- pQuery.setCollection("devices");
+ pQuery.setCollection("users");
pQuery.setResultsLevel(Query.Level.ALL_PROPERTIES);
-
pQuery.addIdentifier(new ServiceParameter.NameParameter(
- user.getUuid().toString()).getIdentifier());
+ device.getUuid().toString()).getIdentifier());
- ns.getQueueManager().TEST_PATH_QUERY = new PathQuery(user, pQuery);
+ ns.TEST_PATH_QUERY = new PathQuery( user, pQuery );
// create a push notification
String payload = "Hello, World!";
[2/3] git commit: Fix singlePushNotificationViaUser() to use device
UUID to query for device.
Posted by sn...@apache.org.
Fix singlePushNotificationViaUser() to use device UUID to query for device.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5672e3f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5672e3f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5672e3f3
Branch: refs/heads/two-dot-o
Commit: 5672e3f33f92ab6f7d3b480d91d1f84c91594899
Parents: b9922cd
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Sep 10 20:59:16 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Sep 10 20:59:16 2014 -0400
----------------------------------------------------------------------
.../notifications/gcm/NotificationsServiceIT.java | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5672e3f3/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
index 002dce4..21c7a79 100644
--- a/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/services/notifications/gcm/NotificationsServiceIT.java
@@ -39,7 +39,7 @@ import static org.apache.usergrid.services.notifications.NotificationsService.NO
public class NotificationsServiceIT extends AbstractServiceNotificationIT {
- private static final Logger LOG = LoggerFactory
+ private static final Logger logger = LoggerFactory
.getLogger(NotificationsServiceIT.class);
/**
@@ -164,12 +164,10 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
app.put("payloads", payloads);
app.put("queued", System.currentTimeMillis());
- Entity e = app.testRequest(ServiceAction.POST, 1, "notifications")
- .getEntity();
+ Entity e = app.testRequest(ServiceAction.POST, 1, "notifications").getEntity();
app.testRequest(ServiceAction.GET, 1, "notifications", e.getUuid());
- Notification notification = app.getEm().get(e.getUuid(),
- Notification.class);
+ Notification notification = app.getEm().get(e.getUuid(), Notification.class);
assertEquals(
notification.getPayloads().get(notifier.getUuid().toString()),
payload);
@@ -195,15 +193,13 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
user.getUuid(), "devices", device1.getUuid()).getEntity();
assertEquals(device.getUuid(), device1.getUuid());
- // create query that searches for that device by providing UUID of the user
Query pQuery = new Query();
pQuery.setLimit(100);
pQuery.setCollection("devices");
pQuery.setResultsLevel(Query.Level.ALL_PROPERTIES);
-
pQuery.addIdentifier(new ServiceParameter.NameParameter(
- user.getUuid().toString()).getIdentifier());
- ns.getQueueManager().TEST_PATH_QUERY = new PathQuery( user, pQuery );
+ device.getUuid().toString()).getIdentifier());
+ ns.getQueueManager().TEST_PATH_QUERY = new PathQuery(user, pQuery);
// create a push notification
String payload = "Hello, World!";
@@ -506,11 +502,11 @@ public class NotificationsServiceIT extends AbstractServiceNotificationIT {
}
long time = System.currentTimeMillis();
- LOG.error("START DELIVERY OF {} NOTIFICATIONS", NUM_DEVICES);
+ logger.error("START DELIVERY OF {} NOTIFICATIONS", NUM_DEVICES);
// perform push //
notification = scheduleNotificationAndWait(notification);
- LOG.error("END DELIVERY OF {} NOTIFICATIONS ({})", NUM_DEVICES,
+ logger.error("END DELIVERY OF {} NOTIFICATIONS ({})", NUM_DEVICES,
System.currentTimeMillis() - time);
// check receipts //