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 2015/02/16 19:18:39 UTC
[4/4] incubator-usergrid git commit: Merge branch 'USERGRID-273' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-365
Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-365
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/eace1cdc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/eace1cdc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/eace1cdc
Branch: refs/heads/USERGRID-365
Commit: eace1cdc4396fe80d3da55639ce4e6932132175c
Parents: dab3ee0 75a8361
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Feb 16 10:18:23 2015 -0800
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Feb 16 10:18:23 2015 -0800
----------------------------------------------------------------------
.../org/apache/usergrid/batch/service/App.java | 86 ----
.../batch/job/AbstractSchedulerRuntimeIT.java | 3 +-
stack/corepersistence/pom.xml | 2 +-
stack/pom.xml | 10 +-
stack/rest/pom.xml | 273 ++++++-------
.../resources/usergrid-rest-deploy-context.xml | 6 +-
.../apache/usergrid/rest/AbstractRestIT.java | 25 ++
.../java/org/apache/usergrid/rest/ITSetup.java | 2 +
.../apache/usergrid/rest/TomcatResource.java | 402 -------------------
.../endpoints/mgmt/ApplicationResource.java | 10 +-
stack/rest/src/test/resources/arquillian.xml | 43 ++
.../apache/usergrid/services/ServiceInfo.java | 5 +-
12 files changed, 223 insertions(+), 644 deletions(-)
----------------------------------------------------------------------