[BZ 1120418] Pull interfaces for steps runner and job factory in the …

…main to allow only implementations in subpackages.

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

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

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;
 

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

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

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;
 

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

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}.
      * <p>
      * This method calls
      * {@link org.rhq.enterprise.server.storage.maintenance.job.StepCalculator#createNewJob(StorageMaintenanceJob, MaintenanceStep) StepCalculator.createNewJob(StorageMaintenanceJob, MaintenanceStep)}

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

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";
 

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/MaintenanceJobFactory.java → 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

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/MaintenanceStepRunner.java → 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

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

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/StepFailureException.java → 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

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/StepFailureStrategy.java → 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

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;

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;

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;
 

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
  */

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;
 
 /**

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;
 
 /**

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
  */

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
  */

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
  */

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
  */

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

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;
 
 /**

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

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

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
  */

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
  */

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;
 
 /**

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

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

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