usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [37/37] incubator-usergrid git commit: Merge branch 'two-dot-o' of https://github.com/apache/incubator-usergrid into USERGRID-422
Date Tue, 03 Mar 2015 20:01:16 GMT
Merge branch 'two-dot-o' of https://github.com/apache/incubator-usergrid into USERGRID-422

# By Shawn Feldman (15) and others
# Via Shawn Feldman (9) and others
* 'two-dot-o' of https://github.com/apache/incubator-usergrid: (24 commits)
  This fixes many tests in ApplicationResourceIT.  This is a technically a merge but Usergrid
333 was already merged into two-dot-o.
  Removing unnecessary test class and commented out dependencies.
  Exclude Codehaus Jackson JAX-RS dependency, plus some better logging & test improvements.
  compilation
  fix compilation
  indexbuffer: update method names
  index message comments
  undo change
  change config
  add batching
  Add futures to batch and refresh
  Add batch of batches
  add batches of batches
  removing future, moving around some initialization code
  add comments
  add blocking queue
  Adding metrics to cp
  adding index buffer
  Added test for user feeds and started testCaseSensitivity test.
  Fixed another test that uses the superuser token, and added a different endpoint to facilitate
using the superuser token or the default endpoint.
  ...


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

Branch: refs/heads/USERGRID-422
Commit: 19e73d66d3df03bcfab0cc42f3bdb6b2c075b571
Parents: efb6e72 67cb719
Author: grey <greyes@apigee.com>
Authored: Tue Mar 3 11:44:46 2015 -0800
Committer: grey <greyes@apigee.com>
Committed: Tue Mar 3 11:44:46 2015 -0800

----------------------------------------------------------------------
 .../batch/service/JobSchedulerService.java      |    2 +-
 .../corepersistence/CpEntityManager.java        |    4 +-
 .../corepersistence/CpRelationManager.java      |    6 +-
 .../results/FilteringLoader.java                |   42 +-
 .../apache/usergrid/metrics/MetricsFactory.java |  112 --
 .../main/resources/usergrid-core-context.xml    |    4 +-
 .../usergrid/persistence/CollectionIT.java      |    2 +-
 stack/corepersistence/common/pom.xml            |   12 +
 .../persistence/core/future/BetterFuture.java   |   43 +
 .../persistence/core/guice/CommonModule.java    |    6 +-
 .../core/metrics/MetricsFactory.java            |   34 +
 .../core/metrics/MetricsFactoryImpl.java        |  113 ++
 .../persistence/core/metrics/MetricsFig.java    |   33 +
 stack/corepersistence/pom.xml                   |    1 +
 .../persistence/index/EntityIndexBatch.java     |   32 +-
 .../persistence/index/IndexBatchBuffer.java     |   36 +
 .../persistence/index/IndexBufferConsumer.java  |   26 +
 .../persistence/index/IndexBufferProducer.java  |   36 +
 .../usergrid/persistence/index/IndexFig.java    |   45 +-
 .../index/IndexOperationMessage.java            |   64 +
 .../persistence/index/guice/IndexModule.java    |   17 +-
 .../index/impl/EsEntityIndexBatchImpl.java      |  130 +-
 .../index/impl/EsEntityIndexImpl.java           |   16 +-
 .../index/impl/EsIndexBufferConsumerImpl.java   |  183 +++
 .../index/impl/EsIndexBufferProducerImpl.java   |   57 +
 .../index/impl/CorePerformanceIT.java           |   44 +-
 .../impl/EntityConnectionIndexImplTest.java     |    7 +-
 .../persistence/index/impl/EntityIndexTest.java |  106 +-
 stack/rest/pom.xml                              |   37 +-
 .../org/apache/usergrid/rest/SimplestTest.java  |   35 -
 .../collection/BrowserCompatibilityTest.java    |    5 +-
 .../collection/CollectionsResourceIT.java       |    3 +-
 .../applications/queries/GeoPagingTest.java     |   44 +-
 .../usergrid/rest/management/AdminUsersIT.java  | 1342 +++++++++---------
 .../rest/management/ImportResourceIT.java       |    1 -
 .../rest/test/resource2point0/ClientSetup.java  |   19 +-
 .../rest/test/resource2point0/RestClient.java   |   11 +
 .../endpoints/CollectionEndpoint.java           |  155 +-
 .../endpoints/mgmt/FeedResource.java            |   48 +
 .../endpoints/mgmt/OrgResource.java             |   81 +-
 .../endpoints/mgmt/PasswordResource.java        |   61 +
 .../endpoints/mgmt/UserResource.java            |   55 +
 .../endpoints/mgmt/UsersResource.java           |    6 +-
 .../test/resource2point0/model/Credentials.java |    4 +-
 .../rest/test/resource2point0/model/Entity.java |    6 -
 .../resources/usergrid-custom-test.properties   |   12 +
 stack/services/pom.xml                          |    6 +
 .../usergrid/services/guice/ServiceModule.java  |    2 -
 .../notifications/NotificationsService.java     |    4 +-
 .../services/notifications/QueueJob.java        |    6 +-
 .../services/notifications/QueueListener.java   |    6 +-
 .../impl/ApplicationQueueManagerImpl.java       |    2 +-
 .../services/queues/ImportQueueListener.java    |    7 +-
 .../usergrid/services/queues/QueueListener.java |    7 +-
 .../resources/usergrid-services-context.xml     |    1 -
 .../apns/NotificationsServiceIT.java            |    2 +-
 .../gcm/NotificationsServiceIT.java             |    4 +-
 stack/test-utils/pom.xml                        |   11 -
 58 files changed, 2020 insertions(+), 1176 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/19e73d66/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/RestClient.java
----------------------------------------------------------------------


Mime
View raw message