From 774064690e816cde5be73e8c67ba515d9920b7d1 Mon Sep 17 00:00:00 2001 From: Stefan Negrea Date: Wed, 20 Aug 2014 11:08:05 -0500 Subject: [PATCH] [BZ 1120418] Pull interfaces for steps runner and job factory in the main to allow only implementations in subpackages. --- .../rhq/enterprise/server/storage/FailedStepRunner.java | 4 ++-- .../org/rhq/enterprise/server/storage/FakeStepRunner.java | 4 ++-- .../storage/StorageClusterMaintenanceManagerBeanTest.java | 2 +- .../enterprise/server/storage/TestStepRunnerFactory.java | 2 +- .../rhq/enterprise/server/storage/CalculatorLookup.java | 2 +- .../server/storage/DefaultCalculatorLookup.java | 2 +- .../storage/StorageClusterMaintenanceManagerBean.java | 8 ++++---- .../storage/StorageClusterMaintenanceManagerLocal.java | 2 +- .../storage/maintenance/DefaultStepRunnerFactory.java | 1 - .../server/storage/maintenance/JobProperties.java | 6 +++--- .../maintenance/{job => }/MaintenanceJobFactory.java | 3 +-- .../maintenance/{step => }/MaintenanceStepRunner.java | 3 +-- .../storage/maintenance/MaintenanceStepRunnerFactory.java | 1 - .../maintenance/{step => }/StepFailureException.java | 2 +- .../maintenance/{step => }/StepFailureStrategy.java | 2 +- .../server/storage/maintenance/job/ChangeAddressJob.java | 1 + .../server/storage/maintenance/job/DeployCalculator.java | 3 ++- .../storage/maintenance/job/FailedRepairCalculator.java | 1 + .../server/storage/maintenance/step/AddMaintenance.java | 2 ++ .../storage/maintenance/step/AnnounceStorageNode.java | 1 + .../server/storage/maintenance/step/BaseStepRunner.java | 1 + .../server/storage/maintenance/step/BootstrapNode.java | 2 ++ .../storage/maintenance/step/DecommissionStorageNode.java | 2 ++ .../storage/maintenance/step/DeleteStorageNode.java | 3 +++ .../storage/maintenance/step/RemoveMaintenance.java | 2 ++ .../maintenance/step/ResourceOperationStepRunner.java | 1 + .../server/storage/maintenance/step/RunRepair.java | 2 ++ .../storage/maintenance/step/ShutdownStorageClient.java | 3 +++ .../storage/maintenance/step/StartStorageClient.java | 3 +++ .../storage/maintenance/step/UnannounceStorageNode.java | 2 ++ .../storage/maintenance/step/UninstallStorageNode.java | 2 ++ .../server/storage/maintenance/step/UpdateSchema.java | 2 ++ .../maintenance/step/UpdateStorageNodeEndpoints.java | 2 ++ .../storage/maintenance/step/UpdateStorageNodeEntity.java | 1 + .../storage/maintenance/step/UpdateStorageNodeStatus.java | 2 ++ 35 files changed, 57 insertions(+), 25 deletions(-) rename modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/{job => }/MaintenanceJobFactory.java (91%) rename modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/{step => }/MaintenanceStepRunner.java (93%) rename modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/{step => }/StepFailureException.java (87%) rename modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/{step => }/StepFailureStrategy.java (94%) diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/FailedStepRunner.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/FailedStepRunner.java index ae9ecdb31a9..f6e6b9165b9 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/FailedStepRunner.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/FailedStepRunner.java @@ -2,9 +2,9 @@ import java.util.concurrent.atomic.AtomicBoolean; +import org.rhq.enterprise.server.storage.maintenance.StepFailureException; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; import org.rhq.enterprise.server.storage.maintenance.StorageMaintenanceJob; -import org.rhq.enterprise.server.storage.maintenance.step.StepFailureException; -import org.rhq.enterprise.server.storage.maintenance.step.StepFailureStrategy; /** * @author John Sanda diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/FakeStepRunner.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/FakeStepRunner.java index 3d3c2aaef0a..02afd53634c 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/FakeStepRunner.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/FakeStepRunner.java @@ -2,9 +2,9 @@ import java.util.concurrent.atomic.AtomicBoolean; +import org.rhq.enterprise.server.storage.maintenance.StepFailureException; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; import org.rhq.enterprise.server.storage.maintenance.step.BaseStepRunner; -import org.rhq.enterprise.server.storage.maintenance.step.StepFailureException; -import org.rhq.enterprise.server.storage.maintenance.step.StepFailureStrategy; /** * @author John Sanda diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerBeanTest.java index 771f687af0e..bcb1f74ae60 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerBeanTest.java @@ -16,9 +16,9 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.storage.MaintenanceStep; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; import org.rhq.enterprise.server.storage.maintenance.StorageMaintenanceJob; import org.rhq.enterprise.server.storage.maintenance.job.StepCalculator; -import org.rhq.enterprise.server.storage.maintenance.step.StepFailureStrategy; import org.rhq.enterprise.server.test.AbstractEJB3Test; import org.rhq.enterprise.server.test.TransactionCallback; diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/TestStepRunnerFactory.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/TestStepRunnerFactory.java index fedf0c3e3c3..03244642e73 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/TestStepRunnerFactory.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/storage/TestStepRunnerFactory.java @@ -6,8 +6,8 @@ import java.util.Queue; import org.rhq.core.domain.storage.MaintenanceStep; +import org.rhq.enterprise.server.storage.maintenance.MaintenanceStepRunner; import org.rhq.enterprise.server.storage.maintenance.MaintenanceStepRunnerFactory; -import org.rhq.enterprise.server.storage.maintenance.step.MaintenanceStepRunner; /** * A {@link MaintenanceStepRunnerFactory maintenance step factory} which verifies that diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/CalculatorLookup.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/CalculatorLookup.java index 3eff05b2185..1a9c1300da7 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/CalculatorLookup.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/CalculatorLookup.java @@ -1,7 +1,7 @@ package org.rhq.enterprise.server.storage; import org.rhq.core.domain.storage.MaintenanceStep; -import org.rhq.enterprise.server.storage.maintenance.job.MaintenanceJobFactory; +import org.rhq.enterprise.server.storage.maintenance.MaintenanceJobFactory; /** * @author John Sanda diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/DefaultCalculatorLookup.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/DefaultCalculatorLookup.java index 5025e57e1d8..3c844da432a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/DefaultCalculatorLookup.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/DefaultCalculatorLookup.java @@ -1,9 +1,9 @@ package org.rhq.enterprise.server.storage; import org.rhq.core.domain.storage.MaintenanceStep; +import org.rhq.enterprise.server.storage.maintenance.MaintenanceJobFactory; import org.rhq.enterprise.server.storage.maintenance.job.DeployCalculator; import org.rhq.enterprise.server.storage.maintenance.job.FailedRepairCalculator; -import org.rhq.enterprise.server.storage.maintenance.job.MaintenanceJobFactory; import org.rhq.enterprise.server.storage.maintenance.job.UndeployCalculator; import org.rhq.enterprise.server.util.LookupUtil; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerBean.java index 6c35860edbc..757e6836160 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerBean.java @@ -29,12 +29,12 @@ import org.rhq.enterprise.server.operation.OperationManagerLocal; import org.rhq.enterprise.server.storage.maintenance.DefaultStepRunnerFactory; import org.rhq.enterprise.server.storage.maintenance.JobProperties; +import org.rhq.enterprise.server.storage.maintenance.MaintenanceJobFactory; +import org.rhq.enterprise.server.storage.maintenance.MaintenanceStepRunner; import org.rhq.enterprise.server.storage.maintenance.MaintenanceStepRunnerFactory; +import org.rhq.enterprise.server.storage.maintenance.StepFailureException; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; import org.rhq.enterprise.server.storage.maintenance.StorageMaintenanceJob; -import org.rhq.enterprise.server.storage.maintenance.job.MaintenanceJobFactory; -import org.rhq.enterprise.server.storage.maintenance.step.MaintenanceStepRunner; -import org.rhq.enterprise.server.storage.maintenance.step.StepFailureException; -import org.rhq.enterprise.server.storage.maintenance.step.StepFailureStrategy; /** * @author John Sanda diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerLocal.java index ff563d4efba..2a6f5116d40 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerLocal.java @@ -35,7 +35,7 @@ public interface StorageClusterMaintenanceManagerLocal { /** * Schedules a new job for later execution when the currently running job encounters a step failure with a failure - * strategy of {@link org.rhq.enterprise.server.storage.maintenance.step.StepFailureStrategy#CONTINUE CONTINUE}. + * strategy of {@link org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy#CONTINUE CONTINUE}. *

* This method calls * {@link org.rhq.enterprise.server.storage.maintenance.job.StepCalculator#createNewJob(StorageMaintenanceJob, MaintenanceStep) StepCalculator.createNewJob(StorageMaintenanceJob, MaintenanceStep)} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/DefaultStepRunnerFactory.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/DefaultStepRunnerFactory.java index 155dd34fede..e604a3cfd70 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/DefaultStepRunnerFactory.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/DefaultStepRunnerFactory.java @@ -1,7 +1,6 @@ package org.rhq.enterprise.server.storage.maintenance; import org.rhq.core.domain.storage.MaintenanceStep; -import org.rhq.enterprise.server.storage.maintenance.step.MaintenanceStepRunner; /** * @author John Sanda diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/JobProperties.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/JobProperties.java index 442d635d449..ac40b9e28c5 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/JobProperties.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/JobProperties.java @@ -27,10 +27,10 @@ public final class JobProperties { public static final String PARAMETERS = "parameters"; /** - * Specifies the {@link org.rhq.enterprise.server.storage.maintenance.step.StepFailureStrategy failure strategy} for - * a step. Each {@link org.rhq.enterprise.server.storage.maintenance.step.MaintenanceStepRunner#getFailureStrategy() step runner} + * Specifies the {@link org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy failure strategy} for + * a step. Each {@link org.rhq.enterprise.server.storage.maintenance.MaintenanceStepRunner#getFailureStrategy() step runner} * defines a failure strategy. This property can be used as a hint or as an override. It should be a string whose - * value is one of the {@link org.rhq.enterprise.server.storage.maintenance.step.StepFailureStrategy failure strategies} + * value is one of the {@link org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy failure strategies} */ public static final String FAILURE_STRATEGY = "failureStrategy"; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/MaintenanceJobFactory.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/MaintenanceJobFactory.java similarity index 91% rename from modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/MaintenanceJobFactory.java rename to modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/MaintenanceJobFactory.java index 56e71daf846..3dd3d4c5511 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/MaintenanceJobFactory.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/MaintenanceJobFactory.java @@ -1,7 +1,6 @@ -package org.rhq.enterprise.server.storage.maintenance.job; +package org.rhq.enterprise.server.storage.maintenance; import org.rhq.core.domain.storage.MaintenanceStep; -import org.rhq.enterprise.server.storage.maintenance.StorageMaintenanceJob; /** * @author John Sanda diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/MaintenanceStepRunner.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/MaintenanceStepRunner.java similarity index 93% rename from modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/MaintenanceStepRunner.java rename to modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/MaintenanceStepRunner.java index 2a639f1409a..923a676bfca 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/MaintenanceStepRunner.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/MaintenanceStepRunner.java @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -package org.rhq.enterprise.server.storage.maintenance.step; +package org.rhq.enterprise.server.storage.maintenance; import java.util.Set; @@ -25,7 +25,6 @@ import org.rhq.enterprise.server.cloud.StorageNodeManagerLocal; import org.rhq.enterprise.server.operation.OperationManagerLocal; import org.rhq.enterprise.server.storage.StorageClientManager; -import org.rhq.enterprise.server.storage.maintenance.StorageMaintenanceJob; /** * @author Stefan Negrea diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/MaintenanceStepRunnerFactory.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/MaintenanceStepRunnerFactory.java index 7d89ba4dac9..48b63be4d3f 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/MaintenanceStepRunnerFactory.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/MaintenanceStepRunnerFactory.java @@ -1,7 +1,6 @@ package org.rhq.enterprise.server.storage.maintenance; import org.rhq.core.domain.storage.MaintenanceStep; -import org.rhq.enterprise.server.storage.maintenance.step.MaintenanceStepRunner; /** * @author John Sanda diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/StepFailureException.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/StepFailureException.java similarity index 87% rename from modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/StepFailureException.java rename to modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/StepFailureException.java index 3d12a5268aa..6bd073c54c4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/StepFailureException.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/StepFailureException.java @@ -1,4 +1,4 @@ -package org.rhq.enterprise.server.storage.maintenance.step; +package org.rhq.enterprise.server.storage.maintenance; /** * @author John Sanda diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/StepFailureStrategy.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/StepFailureStrategy.java similarity index 94% rename from modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/StepFailureStrategy.java rename to modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/StepFailureStrategy.java index 33f4a5239bc..772b25aa6d1 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/StepFailureStrategy.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/StepFailureStrategy.java @@ -1,4 +1,4 @@ -package org.rhq.enterprise.server.storage.maintenance.step; +package org.rhq.enterprise.server.storage.maintenance; /** * Specifies what to do when a step fails. We may need to turn this into a callback interface of sorts if it turns out diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/ChangeAddressJob.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/ChangeAddressJob.java index 721defe6a34..96494852a38 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/ChangeAddressJob.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/ChangeAddressJob.java @@ -25,6 +25,7 @@ import org.rhq.core.domain.storage.MaintenanceStep; import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.storage.StorageClusterSettingsManagerLocal; +import org.rhq.enterprise.server.storage.maintenance.MaintenanceJobFactory; import org.rhq.enterprise.server.storage.maintenance.StorageMaintenanceJob; import org.rhq.enterprise.server.storage.maintenance.step.ShutdownStorageClient; import org.rhq.enterprise.server.storage.maintenance.step.StartStorageClient; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/DeployCalculator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/DeployCalculator.java index c73989048b3..4e6f0300b0c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/DeployCalculator.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/DeployCalculator.java @@ -18,11 +18,12 @@ import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.storage.StorageClusterSettingsManagerLocal; import org.rhq.enterprise.server.storage.maintenance.JobProperties; +import org.rhq.enterprise.server.storage.maintenance.MaintenanceJobFactory; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; import org.rhq.enterprise.server.storage.maintenance.StorageMaintenanceJob; import org.rhq.enterprise.server.storage.maintenance.step.AnnounceStorageNode; import org.rhq.enterprise.server.storage.maintenance.step.BootstrapNode; import org.rhq.enterprise.server.storage.maintenance.step.RunRepair; -import org.rhq.enterprise.server.storage.maintenance.step.StepFailureStrategy; import org.rhq.enterprise.server.storage.maintenance.step.UpdateSchema; import org.rhq.enterprise.server.storage.maintenance.step.UpdateStorageNodeStatus; import org.rhq.server.metrics.SystemDAO; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/FailedRepairCalculator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/FailedRepairCalculator.java index 038753ba0e6..041d8913bce 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/FailedRepairCalculator.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/FailedRepairCalculator.java @@ -7,6 +7,7 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.storage.MaintenanceStep; import org.rhq.enterprise.server.storage.maintenance.JobProperties; +import org.rhq.enterprise.server.storage.maintenance.MaintenanceJobFactory; import org.rhq.enterprise.server.storage.maintenance.StorageMaintenanceJob; import org.rhq.enterprise.server.storage.maintenance.step.RunRepair; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/AddMaintenance.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/AddMaintenance.java index b8b2c520c6d..e3979aba03f 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/AddMaintenance.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/AddMaintenance.java @@ -3,6 +3,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; + /** * @author John Sanda */ diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/AnnounceStorageNode.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/AnnounceStorageNode.java index db21152d4a5..17d0e35c9c3 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/AnnounceStorageNode.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/AnnounceStorageNode.java @@ -8,6 +8,7 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.enterprise.server.storage.maintenance.JobProperties; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; import org.rhq.enterprise.server.storage.maintenance.StorageMaintenanceJob; /** diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/BaseStepRunner.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/BaseStepRunner.java index 34d7ce6e0fc..e593f3bbf3e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/BaseStepRunner.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/BaseStepRunner.java @@ -7,6 +7,7 @@ import org.rhq.enterprise.server.cloud.StorageNodeManagerLocal; import org.rhq.enterprise.server.operation.OperationManagerLocal; import org.rhq.enterprise.server.storage.StorageClientManager; +import org.rhq.enterprise.server.storage.maintenance.MaintenanceStepRunner; import org.rhq.enterprise.server.storage.maintenance.StorageMaintenanceJob; /** diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/BootstrapNode.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/BootstrapNode.java index fea2f1c1966..d5108ca0fac 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/BootstrapNode.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/BootstrapNode.java @@ -3,6 +3,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; + /** * @author John Sanda */ diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/DecommissionStorageNode.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/DecommissionStorageNode.java index 0b3b7b71fa8..b8ac95d7443 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/DecommissionStorageNode.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/DecommissionStorageNode.java @@ -1,5 +1,7 @@ package org.rhq.enterprise.server.storage.maintenance.step; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; + /** * @author John Sanda */ diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/DeleteStorageNode.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/DeleteStorageNode.java index f687df0ce4c..c063cb413e0 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/DeleteStorageNode.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/DeleteStorageNode.java @@ -3,6 +3,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.rhq.enterprise.server.storage.maintenance.StepFailureException; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; + /** * @author John Sanda */ diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/RemoveMaintenance.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/RemoveMaintenance.java index 4d8997d816f..7f1bc9e6e6a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/RemoveMaintenance.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/RemoveMaintenance.java @@ -1,5 +1,7 @@ package org.rhq.enterprise.server.storage.maintenance.step; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; + /** * @author John Sanda */ diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/ResourceOperationStepRunner.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/ResourceOperationStepRunner.java index a057a6c7f94..ce469c1abad 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/ResourceOperationStepRunner.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/ResourceOperationStepRunner.java @@ -12,6 +12,7 @@ import org.rhq.core.domain.operation.bean.ResourceOperationSchedule; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.server.storage.maintenance.JobProperties; +import org.rhq.enterprise.server.storage.maintenance.StepFailureException; /** * @author John Sanda diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/RunRepair.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/RunRepair.java index fc51c56725b..b8fe152d70d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/RunRepair.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/RunRepair.java @@ -6,6 +6,8 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.storage.MaintenanceStep; import org.rhq.enterprise.server.storage.maintenance.JobProperties; +import org.rhq.enterprise.server.storage.maintenance.StepFailureException; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; import org.rhq.enterprise.server.storage.maintenance.StorageMaintenanceJob; /** diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/ShutdownStorageClient.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/ShutdownStorageClient.java index 5725570af24..fbc64a0ca1b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/ShutdownStorageClient.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/ShutdownStorageClient.java @@ -18,6 +18,9 @@ */ package org.rhq.enterprise.server.storage.maintenance.step; +import org.rhq.enterprise.server.storage.maintenance.MaintenanceStepRunner; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; + /** * @author Stefan Negrea diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/StartStorageClient.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/StartStorageClient.java index 9537f821834..bf5739551e8 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/StartStorageClient.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/StartStorageClient.java @@ -18,6 +18,9 @@ */ package org.rhq.enterprise.server.storage.maintenance.step; +import org.rhq.enterprise.server.storage.maintenance.MaintenanceStepRunner; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; + /** * @author Stefan Negrea diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UnannounceStorageNode.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UnannounceStorageNode.java index 8731f3968cf..3b204be0848 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UnannounceStorageNode.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UnannounceStorageNode.java @@ -1,5 +1,7 @@ package org.rhq.enterprise.server.storage.maintenance.step; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; + /** * @author John Sanda */ diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UninstallStorageNode.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UninstallStorageNode.java index 442b39c95cc..2b2c4b10162 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UninstallStorageNode.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UninstallStorageNode.java @@ -1,5 +1,7 @@ package org.rhq.enterprise.server.storage.maintenance.step; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; + /** * @author John Sanda */ diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateSchema.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateSchema.java index 96e2cc8cfd4..5b60a51f234 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateSchema.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateSchema.java @@ -10,6 +10,8 @@ import org.rhq.core.domain.operation.ResourceOperationHistory; import org.rhq.core.domain.operation.bean.ResourceOperationSchedule; import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.server.storage.maintenance.StepFailureException; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; import org.rhq.server.metrics.StorageSession; /** diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateStorageNodeEndpoints.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateStorageNodeEndpoints.java index 398a5fc6e39..19bb2df213a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateStorageNodeEndpoints.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateStorageNodeEndpoints.java @@ -18,6 +18,8 @@ */ package org.rhq.enterprise.server.storage.maintenance.step; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; + /** * @author Stefan Negrea diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateStorageNodeEntity.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateStorageNodeEntity.java index dd3bdeb29c6..b2e293b257f 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateStorageNodeEntity.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateStorageNodeEntity.java @@ -26,6 +26,7 @@ import org.rhq.core.domain.operation.ResourceOperationHistory; import org.rhq.core.domain.operation.bean.ResourceOperationSchedule; import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; /** * @author Stefan Negrea diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateStorageNodeStatus.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateStorageNodeStatus.java index c974ebc75db..733f72af0b6 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateStorageNodeStatus.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateStorageNodeStatus.java @@ -13,6 +13,8 @@ import org.rhq.core.domain.operation.bean.ResourceOperationSchedule; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.server.storage.maintenance.JobProperties; +import org.rhq.enterprise.server.storage.maintenance.StepFailureException; +import org.rhq.enterprise.server.storage.maintenance.StepFailureStrategy; /** * @author John Sanda