usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [14/27] incubator-usergrid git commit: Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-273-indexbuffer
Date Tue, 03 Mar 2015 00:22:02 GMT
Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
USERGRID-273-indexbuffer


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2145f21c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2145f21c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2145f21c

Branch: refs/heads/USERGRID-280
Commit: 2145f21cc54f408a9ca94b1b8ad7ac4b7c6b1ed2
Parents: 6276726 9b846c3
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Wed Feb 25 10:08:24 2015 -0700
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Wed Feb 25 10:08:24 2015 -0700

----------------------------------------------------------------------
 .../corepersistence/CpEntityManagerFactory.java |   7 +-
 .../persistence/EntityManagerFactory.java       |   5 -
 .../PerformanceEntityRebuildIndexTest.java      |  13 +-
 .../cassandra/EntityManagerFactoryImplIT.java   |   5 -
 stack/rest/catalina_base/bin/setenv.sh          |   8 +
 stack/rest/pom.xml                              | 153 +++++----------
 .../org/apache/usergrid/rest/IndexResource.java |  27 +--
 .../usergrid/rest/JobServiceBoostrap.java       |   4 +-
 .../apache/usergrid/rest/ShutdownListener.java  |  73 +++++++
 .../applications/ApplicationsResource.java      |  19 +-
 stack/rest/src/main/webapp/WEB-INF/web.xml      |  13 +-
 .../apache/usergrid/rest/AbstractRestIT.java    |  77 ++++----
 .../java/org/apache/usergrid/rest/BasicIT.java  |  69 ++++---
 .../java/org/apache/usergrid/rest/ITSetup.java  |  57 +-----
 .../org/apache/usergrid/rest/TomcatRuntime.java | 192 +++++++++++++++++++
 .../rest/management/RegistrationIT.java         |   9 +-
 .../test/resource2point0/AbstractRestIT.java    |  77 ++++----
 stack/rest/src/test/resources/arquillian.xml    |  14 +-
 .../resources/usergrid-deployment.properties    | 111 -----------
 19 files changed, 472 insertions(+), 461 deletions(-)
----------------------------------------------------------------------



Mime
View raw message