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 2014/10/22 22:42:55 UTC
[09/13] git commit: merge from usergrid-master
merge from usergrid-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/bac5259a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/bac5259a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/bac5259a
Branch: refs/heads/master
Commit: bac5259ab3a2f25a8c92eb0bb2e054c08aa6009f
Parents: 41a8d4f d61fba9
Author: Shawn Feldman <sh...@gmail.com>
Authored: Fri Aug 1 11:34:38 2014 -0600
Committer: Shawn Feldman <sh...@gmail.com>
Committed: Fri Aug 1 11:34:38 2014 -0600
----------------------------------------------------------------------
README.md | 5 +-
.../main/resources/usergrid-default.properties | 7 +-
stack/core/pom.xml | 22 ++
.../java/org/apache/usergrid/batch/Job.java | 12 +-
.../org/apache/usergrid/batch/JobFactory.java | 2 +-
.../usergrid/batch/UsergridJobFactory.java | 6 +-
.../batch/service/JobSchedulerService.java | 302 +++++++++++++------
.../apache/usergrid/metrics/MetricsFactory.java | 113 +++++++
.../persistence/MultiQueryIterator.java | 6 +-
.../persistence/ObservableIterator.java | 82 +++++
.../persistence/PagingResultsIterator.java | 7 +-
.../usergrid/persistence/ResultsIterator.java | 30 ++
.../main/resources/usergrid-core-context.xml | 3 +
.../apache/usergrid/batch/BulkTestUtils.java | 10 +-
.../usergrid/batch/UsergridJobFactoryTest.java | 3 +-
.../usergrid/batch/job/CountdownLatchJob.java | 6 +
.../usergrid/batch/job/DelayExecution.java | 6 +
.../usergrid/batch/job/DelayHeartbeat.java | 6 +
.../batch/job/FailureJobExceuction.java | 74 -----
.../usergrid/batch/job/FailureJobExecution.java | 87 ++++++
.../usergrid/batch/job/OnlyOnceExceution.java | 6 +
.../job/OnlyOnceUnlockOnFailExceution.java | 6 +
.../usergrid/batch/job/SchedulerRuntime1IT.java | 5 +-
.../usergrid/batch/job/SchedulerRuntime2IT.java | 13 +-
.../usergrid/batch/job/SchedulerRuntime3IT.java | 34 ++-
.../usergrid/batch/job/SchedulerRuntime4IT.java | 11 +-
.../usergrid/batch/job/SchedulerRuntime5IT.java | 4 +-
.../usergrid/batch/job/SchedulerRuntime6IT.java | 8 +-
.../usergrid/batch/job/SchedulerRuntime7IT.java | 11 +-
.../usergrid/batch/job/SchedulerRuntime8IT.java | 4 +-
.../batch/job/SchedulerRuntimeIntervalIT.java | 115 +++++++
.../usergrid/batch/job/TestJobListener.java | 67 ++--
.../usergrid/batch/job/TestJobListenerTest.java | 7 +-
stack/pom.xml | 3 +-
.../rest/management/ExportResourceIT.java | 130 +++++---
.../cassandra/ManagementServiceImpl.java | 2 +-
.../usergrid/management/export/ExportJob.java | 6 +
.../management/export/ExportServiceImpl.java | 5 +
38 files changed, 919 insertions(+), 307 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bac5259a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------