You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/03/19 23:20:21 UTC
[31/50] [abbrv] incubator-usergrid git commit: Renames listener to
complete.
Renames listener to complete.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/dc87edc1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/dc87edc1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/dc87edc1
Branch: refs/heads/USERGRID-493
Commit: dc87edc13e3c1241dc9ab6bed56b11f8a953e9b0
Parents: 275e74a
Author: Todd Nine <tn...@apigee.com>
Authored: Fri Mar 6 11:33:04 2015 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Fri Mar 6 11:33:04 2015 -0700
----------------------------------------------------------------------
.../corepersistence/migration/MigrationModuleVersionPlugin.java | 5 +----
.../core/migration/data/AbstractMigrationPlugin.java | 2 +-
.../core/migration/data/DataMigrationManagerImpl.java | 2 +-
.../persistence/core/migration/data/ProgressObserver.java | 2 +-
.../persistence/core/migration/data/TestProgressObserver.java | 2 +-
5 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dc87edc1/stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/MigrationModuleVersionPlugin.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/MigrationModuleVersionPlugin.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/MigrationModuleVersionPlugin.java
index e548410..00e7f11 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/MigrationModuleVersionPlugin.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/MigrationModuleVersionPlugin.java
@@ -22,10 +22,7 @@ package org.apache.usergrid.corepersistence.migration;
import org.apache.usergrid.persistence.collection.serialization.impl.MvccEntitySerializationStrategyV2Impl;
import org.apache.usergrid.persistence.collection.serialization.impl.migration.CollectionMigrationPlugin;
-import org.apache.usergrid.persistence.collection.serialization.impl.migration.EntityIdScope;
import org.apache.usergrid.persistence.core.migration.data.MigrationInfoSerialization;
-import org.apache.usergrid.persistence.core.migration.data.DataMigration;
-import org.apache.usergrid.persistence.core.migration.data.MigrationDataProvider;
import org.apache.usergrid.persistence.core.migration.data.MigrationPlugin;
import org.apache.usergrid.persistence.core.migration.data.PluginPhase;
import org.apache.usergrid.persistence.core.migration.data.ProgressObserver;
@@ -110,7 +107,7 @@ public class MigrationModuleVersionPlugin implements MigrationPlugin{
//save the version
migrationInfoSerialization.setVersion( NAME, getMaxVersion() );
- observer.stop();
+ observer.complete();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dc87edc1/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/AbstractMigrationPlugin.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/AbstractMigrationPlugin.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/AbstractMigrationPlugin.java
index 1d351d1..0cd26d4 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/AbstractMigrationPlugin.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/AbstractMigrationPlugin.java
@@ -118,7 +118,7 @@ public abstract class AbstractMigrationPlugin<T> implements MigrationPlugin {
//write the version
migrationInfoSerialization.setVersion( getName(), newSystemVersion );
- po.stop();
+ po.complete();
//signal we've run a migration and return
return true;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dc87edc1/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
index 3f763a2..fe9e741 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
@@ -194,7 +194,7 @@ public class DataMigrationManagerImpl implements DataMigrationManager {
@Override
- public void stop() {
+ public void complete() {
migrationInfoSerialization.setStatusCode( pluginName, StatusCode.COMPLETE.status );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dc87edc1/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/ProgressObserver.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/ProgressObserver.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/ProgressObserver.java
index 50abc6f..43987eb 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/ProgressObserver.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/ProgressObserver.java
@@ -34,7 +34,7 @@ public interface ProgressObserver {
/**
* Signal the process has stopped
*/
- public void stop();
+ public void complete();
/**
* Mark the migration as failed
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dc87edc1/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/migration/data/TestProgressObserver.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/migration/data/TestProgressObserver.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/migration/data/TestProgressObserver.java
index 1612779..7f59151 100644
--- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/migration/data/TestProgressObserver.java
+++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/migration/data/TestProgressObserver.java
@@ -41,7 +41,7 @@ public class TestProgressObserver implements ProgressObserver {
@Override
- public void stop() {
+ public void complete() {
started = false;
}