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 2015/02/26 18:11:20 UTC
[19/50] [abbrv] incubator-usergrid git commit: Merge branch
'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
into USERGRID-409
Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-409
# By Dave Johnson
# Via Dave Johnson
* 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
Effort to use arquillian-suite-extension
Adding some JVM options to help with the OOM PermGen problems, and removing all tests from except for one (for now)
changes to get REST tests working with Arquillian: - Add setenv.sh to set memory and debug options for Tomcat - Make Arqillian profile active by default - Add shutdown hook to stop job service when Usergrid is underplayed
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/53e73fbe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/53e73fbe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/53e73fbe
Branch: refs/heads/two-dot-o-import
Commit: 53e73fbeffe8dbe956ed2500918abc6332ef0fbc
Parents: 07755c1 99d694b
Author: grey <gr...@apigee.com>
Authored: Tue Feb 24 12:28:07 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Tue Feb 24 12:28:07 2015 -0800
----------------------------------------------------------------------
stack/rest/catalina_base/bin/setenv.sh | 8 +++
stack/rest/pom.xml | 67 +++++++-----------
.../usergrid/rest/JobServiceBoostrap.java | 4 +-
.../apache/usergrid/rest/ShutdownListener.java | 73 ++++++++++++++++++++
.../applications/ApplicationsResource.java | 1 +
stack/rest/src/main/webapp/WEB-INF/web.xml | 13 ++--
.../apache/usergrid/rest/AbstractRestIT.java | 7 +-
.../java/org/apache/usergrid/rest/BasicIT.java | 5 +-
stack/rest/src/test/resources/arquillian.xml | 14 +---
9 files changed, 123 insertions(+), 69 deletions(-)
----------------------------------------------------------------------