You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/10/06 23:59:42 UTC
[1/2] git commit: temporary removal of 1.8 specific api
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o 4ce4956fb -> c40aecb2a
temporary removal of 1.8 specific api
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/31c74195
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/31c74195
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/31c74195
Branch: refs/heads/two-dot-o
Commit: 31c741955a3f0b96bf10c37d8615d179d74f96ae
Parents: 9c4b26e
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Oct 6 15:57:36 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Oct 6 15:57:36 2014 -0600
----------------------------------------------------------------------
stack/tools/src/main/java/org/apache/usergrid/tools/ApiDoc.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/31c74195/stack/tools/src/main/java/org/apache/usergrid/tools/ApiDoc.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/ApiDoc.java b/stack/tools/src/main/java/org/apache/usergrid/tools/ApiDoc.java
index 9b54887..40200e4 100644
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/ApiDoc.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/ApiDoc.java
@@ -36,7 +36,9 @@ import org.apache.usergrid.persistence.schema.CollectionInfo;
import org.apache.usergrid.tools.apidoc.swagger.ApiListing;
import org.apache.usergrid.utils.JsonUtils;
import org.w3c.dom.Document;
+import org.yaml.snakeyaml.Loader;
import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.BaseConstructor;
import org.yaml.snakeyaml.constructor.Constructor;
import org.apache.commons.cli.CommandLine;
@@ -82,7 +84,8 @@ public class ApiDoc extends ToolBase {
public ApiListing loadListing( String section ) {
- Yaml yaml = new Yaml( new Constructor( ApiListing.class ) );
+ Yaml yaml = new Yaml( new Loader());
+ //TODO: fix line above
String yamlString = readClasspathFileAsString( "/apidoc/" + section + ".yaml" );
ApiListing listing = ( ApiListing ) yaml.load( yamlString );
return listing;
[2/2] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Posted by sf...@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/c40aecb2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c40aecb2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c40aecb2
Branch: refs/heads/two-dot-o
Commit: c40aecb2a3242e42269bae1fb4d26aecb417b7ac
Parents: 31c7419 4ce4956
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Oct 6 15:57:40 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Oct 6 15:57:40 2014 -0600
----------------------------------------------------------------------
stack/core/pom.xml | 15 ++
.../usergrid/corepersistence/GuiceModule.java | 4 +
stack/corepersistence/map/pom.xml | 16 ++
stack/corepersistence/pom.xml | 17 ++
stack/corepersistence/queue/pom.xml | 92 ++++++++
.../usergrid/persistence/queue/Queue.java | 31 +++
.../usergrid/persistence/queue/QueueFig.java | 16 ++
.../persistence/queue/QueueManager.java | 64 +++++
.../persistence/queue/QueueManagerFactory.java | 23 ++
.../persistence/queue/QueueMessage.java | 42 ++++
.../usergrid/persistence/queue/QueueScope.java | 31 +++
.../persistence/queue/guice/QueueModule.java | 51 ++++
.../persistence/queue/impl/QueueScopeImpl.java | 87 +++++++
.../queue/impl/SQSQueueManagerImpl.java | 234 +++++++++++++++++++
.../persistence/queue/QueueManagerTest.java | 100 ++++++++
.../queue/guice/TestQueueModule.java | 33 +++
stack/pom.xml | 8 +-
.../apache/usergrid/rest/SystemResource.java | 67 ++++--
.../notifications/ApplicationQueueManager.java | 96 +++-----
.../notifications/ApplicationQueueMessage.java | 67 ++----
.../notifications/NotificationsService.java | 15 +-
.../services/notifications/QueueListener.java | 69 +++---
.../services/notifications/QueueManager.java | 31 ---
.../services/notifications/TaskManager.java | 54 ++---
.../apns/NotificationsServiceIT.java | 47 ++--
.../gcm/NotificationsServiceIT.java | 2 +-
26 files changed, 1068 insertions(+), 244 deletions(-)
----------------------------------------------------------------------