You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/02/26 02:08:45 UTC
[09/10] 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 (6) and Todd Nine (2)
# Via Dave Johnson (2) and Todd Nine (1)
* 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
Changes to allow us to fix the old tests that are broken because tests now share the same C* keyspace, and some fixes to the old ApplicationResourceIT.
Removes wait from progress observer, since this is no longer used.
Simple REST tests now working again with Tomcat embedded.
Add jackson-xc back in.
Add jackson-xc back in.
Fixes startup order bug.
Moving back to embedded Tomcat instead of Arquillian.
Back off of Arquillian for now.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/95ac7af1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/95ac7af1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/95ac7af1
Branch: refs/heads/USERGRID-273
Commit: 95ac7af1d964a92d215e225277b8f4d8ecc67c40
Parents: 4be53fb ec6d4e8
Author: grey <gr...@apigee.com>
Authored: Wed Feb 25 15:21:40 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Wed Feb 25 15:21:40 2015 -0800
----------------------------------------------------------------------
.../corepersistence/CpEntityManagerFactory.java | 7 +-
.../persistence/EntityManagerFactory.java | 5 -
.../PerformanceEntityRebuildIndexTest.java | 13 +-
.../cassandra/EntityManagerFactoryImplIT.java | 5 -
stack/pom.xml | 1 +
stack/rest/pom.xml | 134 ++++---------
.../org/apache/usergrid/rest/IndexResource.java | 27 +--
.../applications/ApplicationsResource.java | 20 +-
.../resources/usergrid-rest-deploy-context.xml | 2 +-
.../apache/usergrid/rest/AbstractRestIT.java | 188 ++++++++++--------
.../java/org/apache/usergrid/rest/BasicIT.java | 66 +++----
.../java/org/apache/usergrid/rest/ITSetup.java | 57 +-----
.../org/apache/usergrid/rest/SimplestTest.java | 35 ++++
.../org/apache/usergrid/rest/TomcatRuntime.java | 192 +++++++++++++++++++
.../applications/ApplicationResourceIT.java | 174 +++++++----------
.../rest/management/RegistrationIT.java | 9 +-
.../test/resource2point0/AbstractRestIT.java | 77 ++++----
.../resources/usergrid-deployment.properties | 111 -----------
.../resources/usergrid-rest-deploy-context.xml | 26 +++
19 files changed, 571 insertions(+), 578 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/95ac7af1/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
----------------------------------------------------------------------