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/10/30 14:51:19 UTC
[1/4] git commit: send out final notifications on stop
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-events ec0d69aa3 -> ac03027c0
send out final notifications on stop
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7cd722ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7cd722ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7cd722ee
Branch: refs/heads/two-dot-o-events
Commit: 7cd722ee0b6f3fea990432baed19d4550077fd94
Parents: 77b8c59
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Oct 29 13:47:39 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Oct 29 13:47:39 2014 -0600
----------------------------------------------------------------------
.../usergrid/services/notifications/gcm/GCMAdapter.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7cd722ee/stack/services/src/main/java/org/apache/usergrid/services/notifications/gcm/GCMAdapter.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/gcm/GCMAdapter.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/gcm/GCMAdapter.java
index 36cb7f0..5580ea8 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/gcm/GCMAdapter.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/gcm/GCMAdapter.java
@@ -139,7 +139,15 @@ public class GCMAdapter implements ProviderAdapter {
@Override
public void stop() {
-
+ try {
+ synchronized (this) {
+ for (Batch batch : batches.values()) {
+ batch.send();
+ }
+ }
+ }catch (Exception e){
+ LOG.error("error while trying to send on stop",e);
+ }
}
@Override
[3/4] git commit: changing tab order in portal
Posted by sn...@apache.org.
changing tab order in portal
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0bfca7e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0bfca7e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0bfca7e3
Branch: refs/heads/two-dot-o-events
Commit: 0bfca7e39e40c4efd8e9344303167655c2e1b2d5
Parents: 3e1f33d
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Oct 29 14:12:48 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Oct 29 14:12:48 2014 -0600
----------------------------------------------------------------------
portal/js/push/push-config.html | 89 ++++++++++++++++++------------------
1 file changed, 45 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0bfca7e3/portal/js/push/push-config.html
----------------------------------------------------------------------
diff --git a/portal/js/push/push-config.html b/portal/js/push/push-config.html
index b4ab1a3..1184964 100644
--- a/portal/js/push/push-config.html
+++ b/portal/js/push/push-config.html
@@ -6,16 +6,16 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
- <page-title icon="⚒" title="Configuration"></page-title>
+ <page-title icon="⚒" title="Configure Notifiers"></page-title>
<bsmodal id="deleteNotifier"
@@ -30,6 +30,47 @@
<a style="float: right" target="_blank" href="http://apigee.com/docs/usergrid/content/push-notifications" class="notifications-links">Learn more in our docs</a>
<tabs>
+ <pane heading="Notifiers">
+
+ <bsmodal id="deleteNotifiers"
+ title="Are you sure you want to delete the notifiers(s)?"
+ close="hideModal"
+ closelabel="Cancel"
+ extrabutton="deleteNotifiersDialog"
+ extrabuttonlabel="Delete"
+ ng-cloak>
+ <fieldset>
+ <div class="control-group">
+ </div>
+ </fieldset>
+ </bsmodal>
+
+ <span class="button-strip">
+ <button class="btn btn-primary" ng-disabled="!valueSelected(notifiersCollection._list)" ng-click="deleteNotifiersDialog()">Delete Notifier(s)</button>
+ </span>
+ <table class="table table-striped collection-list">
+ <tbody>
+ <tr class="zebraRows notifications-row">
+ <td style="width: 30px;"><input type="checkbox" ng-click="selectAllEntities(notifiersCollection._list,this,'queryBoxesSelected',true)"></td>
+ <td class="notifications-details bold-header">Provider</td>
+ <td class="notifications-details bold-header">Notifier</td>
+ </tr>
+
+ <tr class="zebraRows notifications-row" ng-repeat="notifier in notifiersCollection._list">
+ <td>
+ <input
+ type="checkbox"
+ ng-value="notifier.uuid"
+
+ ng-model="notifier.checked"
+ >
+ </td>
+ <td class="details">{{notifier.get('provider')}}</td>
+ <td class="details">{{notifier.get('name')}}</td>
+ </tr>
+ </table>
+ </pane>
+
<pane heading="Apple">
<div style="margin-top: 10px;"> <!-- ng-controller="PushConfigCtrl"-->
<div class="user-header-title">Apple Push Notification Service</div>
@@ -117,48 +158,8 @@
</div>
</pane>
- <pane heading="Notifiers">
-
- <bsmodal id="deleteNotifiers"
- title="Are you sure you want to delete the notifiers(s)?"
- close="hideModal"
- closelabel="Cancel"
- extrabutton="deleteNotifiersDialog"
- extrabuttonlabel="Delete"
- ng-cloak>
- <fieldset>
- <div class="control-group">
- </div>
- </fieldset>
- </bsmodal>
-
- <span class="button-strip">
- <button class="btn btn-primary" ng-disabled="!valueSelected(notifiersCollection._list)" ng-click="deleteNotifiersDialog()">Delete Notifier(s)</button>
- </span>
- <table class="table table-striped collection-list">
- <tbody>
- <tr class="zebraRows notifications-row">
- <td style="width: 30px;"><input type="checkbox" ng-click="selectAllEntities(notifiersCollection._list,this,'queryBoxesSelected',true)"></td>
- <td class="notifications-details bold-header">Provider</td>
- <td class="notifications-details bold-header">Notifier</td>
- </tr>
-
- <tr class="zebraRows notifications-row" ng-repeat="notifier in notifiersCollection._list">
- <td>
- <input
- type="checkbox"
- ng-value="notifier.uuid"
-
- ng-model="notifier.checked"
- >
- </td>
- <td class="details">{{notifier.get('provider')}}</td>
- <td class="details">{{notifier.get('name')}}</td>
- </tr>
- </table>
- </pane>
</tabs>
-</div>
\ No newline at end of file
+</div>
[2/4] 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
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3e1f33dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3e1f33dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3e1f33dc
Branch: refs/heads/two-dot-o-events
Commit: 3e1f33dc86a7c693fc1e4ab3ab406e3e57229c57
Parents: 7cd722e 97ee70f
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Oct 29 13:48:00 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Oct 29 13:48:00 2014 -0600
----------------------------------------------------------------------
.../corepersistence/CpEntityDeleteListener.java | 45 +++++++------
.../usergrid/corepersistence/CpSetup.java | 1 -
.../usergrid/corepersistence/CpWalker.java | 44 +++++++-----
.../results/FilteringLoader.java | 63 +++++++++--------
.../results/ResultsLoaderFactory.java | 5 +-
.../results/ResultsLoaderFactoryImpl.java | 4 --
.../results/ResultsVerifier.java | 6 +-
.../results/VersionVerifier.java | 8 ++-
.../corepersistence/util/CpEntityMapUtils.java | 5 +-
.../usergrid/persistence/index/EntityIndex.java | 4 +-
.../persistence/index/EntityIndexBatch.java | 6 --
.../persistence/index/EntityIndexFactory.java | 2 -
.../usergrid/persistence/index/IndexScope.java | 9 +--
.../persistence/index/guice/IndexModule.java | 1 -
.../index/impl/EsEntityIndexBatchImpl.java | 3 +-
.../index/impl/EsEntityIndexImpl.java | 71 ++++++++++----------
.../persistence/index/impl/EsProvider.java | 11 ++-
.../index/query/CandidateResults.java | 7 +-
.../persistence/index/query/Identifier.java | 3 +-
.../usergrid/persistence/index/query/Query.java | 27 +++++---
.../persistence/index/query/Results.java | 4 +-
21 files changed, 169 insertions(+), 160 deletions(-)
----------------------------------------------------------------------
[4/4] git commit: Merge branch 'two-dot-o' into two-dot-o-events
Posted by sn...@apache.org.
Merge branch 'two-dot-o' into two-dot-o-events
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ac03027c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ac03027c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ac03027c
Branch: refs/heads/two-dot-o-events
Commit: ac03027c0695eca8f955fa787f3f07842ac0b727
Parents: ec0d69a 0bfca7e
Author: Dave Johnson <dm...@apigee.com>
Authored: Thu Oct 30 09:50:57 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Thu Oct 30 09:50:57 2014 -0400
----------------------------------------------------------------------
portal/js/push/push-config.html | 89 ++++++++++----------
.../services/notifications/gcm/GCMAdapter.java | 10 ++-
2 files changed, 54 insertions(+), 45 deletions(-)
----------------------------------------------------------------------