update transformation during branch import to have acesss to OperationReporter and this to add needed finalizeTransform in V0_9_2Transformer

15 files changed, 101 insertions, 38 deletions

diff --git a/plugins/org.eclipse.osee.framework.branch.management/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.branch.management/META-INF/MANIFEST.MF
index 3801fb98f17..2b89203ca7e 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.branch.management/META-INF/MANIFEST.MF
@@ -34,6 +34,7 @@ Import-Package: org.eclipse.core.runtime,
  org.eclipse.osee.framework.resource.management,
  org.eclipse.osee.framework.resource.management.exception,
  org.eclipse.osee.framework.resource.management.util,
+ org.eclipse.osgi.framework.console,
  org.osgi.framework,
  org.osgi.util.tracker
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/IBranchExchange.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/IBranchExchange.java
index b6055b261eb..7532fe5f23e 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/IBranchExchange.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/IBranchExchange.java
@@ -12,6 +12,7 @@ package org.eclipse.osee.framework.branch.management;
 
 import java.util.List;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.operation.OperationReporter;
 import org.eclipse.osee.framework.resource.management.IResourceLocator;
 import org.eclipse.osee.framework.resource.management.Options;
 
@@ -22,7 +23,7 @@ public interface IBranchExchange {
 
    public IResourceLocator exportBranch(String exportName, Options options, List<Integer> branchIds) throws Exception;
 
-   public void importBranch(IResourceLocator fileToImport, Options options, List<Integer> branchIds) throws OseeCoreException;
+   public void importBranch(IResourceLocator fileToImport, Options options, List<Integer> branchIds, OperationReporter reporter) throws OseeCoreException;
 
    public IResourceLocator checkIntegrity(IResourceLocator fileToCheck) throws Exception;
 }
diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/management/TxCurrentsAndModTypesCommand.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/TxCurrentsAndModTypesCommand.java
index 866e120a5af..8f7623dc7b9 100644
--- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/management/TxCurrentsAndModTypesCommand.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/TxCurrentsAndModTypesCommand.java
@@ -8,40 +8,46 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.server.admin.management;
+package org.eclipse.osee.framework.branch.management;
 
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.osee.framework.branch.management.internal.Activator;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.operation.AbstractOperation;
 import org.eclipse.osee.framework.core.operation.CommandInterpreterReporter;
+import org.eclipse.osee.framework.core.operation.OperationReporter;
 import org.eclipse.osee.framework.database.operation.InvalidTxCurrentsAndModTypes;
-import org.eclipse.osee.framework.server.admin.BaseServerCommand;
 import org.eclipse.osgi.framework.console.CommandInterpreter;
 
 /**
  * @author Ryan D. Brooks
  */
-public class TxCurrentsAndModTypesCommand extends BaseServerCommand {
+public class TxCurrentsAndModTypesCommand extends AbstractOperation {
    private final boolean archived;
+   private final OperationReporter reporter;
 
-   public TxCurrentsAndModTypesCommand(CommandInterpreter ci) {
-      super("TxCurrents And Mod Types", ci);
-      archived = Boolean.parseBoolean(ci.nextArgument());
+   public TxCurrentsAndModTypesCommand(CommandInterpreter commandInterpreter) {
+      this(new CommandInterpreterReporter(commandInterpreter), Boolean.parseBoolean(commandInterpreter.nextArgument()));
+   }
+
+   public TxCurrentsAndModTypesCommand(OperationReporter reporter, boolean archived) {
+      super("TxCurrents And Mod Types", Activator.PLUGIN_ID);
+      this.archived = archived;
+      this.reporter = reporter;
+   }
+
+   private void checkAndFix(String tableName, String columnName, IProgressMonitor monitor) throws Exception {
+      doSubWork(new InvalidTxCurrentsAndModTypes(tableName, columnName, reporter, true, archived), monitor, 0.3);
    }
 
    @Override
-   protected void doCommandWork(IProgressMonitor monitor) throws Exception {
+   protected void doWork(IProgressMonitor monitor) throws Exception {
       try {
          checkAndFix("osee_artifact", "art_id", monitor);
          checkAndFix("osee_attribute", "attr_id", monitor);
          checkAndFix("osee_relation_link", "rel_link_id", monitor);
-
       } catch (OseeCoreException ex) {
-         printStackTrace(ex);
+         reporter.report(ex);
       }
    }
-
-   private void checkAndFix(String tableName, String columnName, IProgressMonitor monitor) throws Exception {
-      doSubWork(new InvalidTxCurrentsAndModTypes(tableName, columnName, new CommandInterpreterReporter(
-         getCommandInterpreter()), true, archived), monitor, 0.3);
-   }
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/BranchExchange.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/BranchExchange.java
index 75c024b908c..6f1d3eb9709 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/BranchExchange.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/BranchExchange.java
@@ -17,6 +17,7 @@ import org.eclipse.osee.framework.branch.management.exchange.handler.StandardOse
 import org.eclipse.osee.framework.branch.management.exchange.resource.ExchangeLocatorProvider;
 import org.eclipse.osee.framework.branch.management.exchange.transform.ExchangeDataProcessor;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.operation.OperationReporter;
 import org.eclipse.osee.framework.jdk.core.type.Pair;
 import org.eclipse.osee.framework.resource.management.IResourceLocator;
 import org.eclipse.osee.framework.resource.management.Options;
@@ -41,9 +42,10 @@ public class BranchExchange implements IBranchExchange {
    }
 
    @Override
-   public void importBranch(IResourceLocator exportDataLocator, Options options, List<Integer> branchIds) throws OseeCoreException {
+   public void importBranch(IResourceLocator exportDataLocator, Options options, List<Integer> branchIds, OperationReporter reporter) throws OseeCoreException {
       IOseeExchangeDataProvider exportDataProvider = createExportDataProvider(exportDataLocator);
-      ImportController importController = new ImportController(oseeServices, exportDataProvider, options, branchIds);
+      ImportController importController =
+         new ImportController(oseeServices, exportDataProvider, options, branchIds, reporter);
       importController.execute();
    }
 
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ImportController.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ImportController.java
index 10f95ba2dd9..dac5ba9c3be 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ImportController.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ImportController.java
@@ -38,6 +38,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
 import org.eclipse.osee.framework.core.exception.OseeExceptions;
 import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.core.operation.OperationReporter;
 import org.eclipse.osee.framework.database.core.DbTransaction;
 import org.eclipse.osee.framework.database.core.IOseeStatement;
 import org.eclipse.osee.framework.database.core.OseeConnection;
@@ -65,20 +66,22 @@ public final class ImportController {
    private final Options options;
    private final int[] branchesToImport = null;
    private final Map<String, SavePoint> savePoints;
+   private final ExchangeDataProcessor exchangeDataProcessor;
+   private final OperationReporter reporter;
 
    private ExchangeTransformer exchangeTransformer;
-   private final ExchangeDataProcessor exchangeDataProcessor;
    private TranslationManager translator;
    private ManifestSaxHandler manifestHandler;
    private MetaDataSaxHandler metadataHandler;
    private String currentSavePoint;
 
-   ImportController(OseeServices oseeServices, IOseeExchangeDataProvider exportDataProvider, Options options, List<Integer> branchIds) throws OseeArgumentException {
+   ImportController(OseeServices oseeServices, IOseeExchangeDataProvider exportDataProvider, Options options, List<Integer> branchIds, OperationReporter reporter) throws OseeArgumentException {
       this.oseeServices = oseeServices;
       this.exportDataProvider = exportDataProvider;
       this.options = options;
       this.savePoints = new LinkedHashMap<String, SavePoint>();
       this.exchangeDataProcessor = new ExchangeDataProcessor(exportDataProvider);
+      this.reporter = reporter;
 
       if (!branchIds.isEmpty()) {
          throw new OseeArgumentException("selective branch import is not supported.");
@@ -97,7 +100,7 @@ public final class ImportController {
       IExchangeTransformProvider transformProvider = new ExchangeTransformProvider(oseeServices.getCachingService());
       exchangeTransformer = new ExchangeTransformer(transformProvider, exchangeDataProcessor);
 
-      exchangeTransformer.applyTransforms();
+      exchangeTransformer.applyTransforms(reporter);
 
       currentSavePoint = "manifest";
       manifestHandler = new ManifestSaxHandler();
@@ -155,7 +158,7 @@ public final class ImportController {
 
          importBranchesTx.updateBranchParentTransactionId();
 
-         exchangeTransformer.applyFinalTransforms();
+         exchangeTransformer.applyFinalTransforms(reporter);
 
          currentSavePoint = "stop";
          addSavePoint(currentSavePoint);
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/ExchangeTransformer.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/ExchangeTransformer.java
index e875a124aa0..8aceb609001 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/ExchangeTransformer.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/ExchangeTransformer.java
@@ -13,6 +13,7 @@ package org.eclipse.osee.framework.branch.management.exchange.transform;
 import java.util.Collection;
 import org.eclipse.osee.framework.branch.management.exchange.handler.ExportItem;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.operation.OperationReporter;
 import org.eclipse.osee.framework.core.util.Conditions;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.osgi.framework.Version;
@@ -29,7 +30,7 @@ public class ExchangeTransformer {
       this.processor = processor;
    }
 
-   public void applyTransforms() throws Exception {
+   public void applyTransforms(OperationReporter reporter) throws Exception {
       Version exchangeVersion = getExchangeManifestVersion();
       transformers = provider.getApplicableTransformers(exchangeVersion);
 
@@ -38,16 +39,16 @@ public class ExchangeTransformer {
       versionRule.setReplaceVersion(true);
 
       for (IOseeExchangeVersionTransformer transformer : transformers) {
-         Version newVersion = transformer.applyTransform(processor);
+         Version newVersion = transformer.applyTransform(processor, reporter);
          versionRule.setVersion(newVersion);
          processor.transform(ExportItem.EXPORT_MANIFEST, versionRule);
       }
    }
 
-   public void applyFinalTransforms() throws Exception {
+   public void applyFinalTransforms(OperationReporter reporter) throws Exception {
       Conditions.checkNotNull(transformers, "transformers", "forgot to call apply transforms first");
       for (IOseeExchangeVersionTransformer transform : transformers) {
-         transform.finalizeTransform(processor);
+         transform.finalizeTransform(processor, reporter);
       }
       transformers = null;
    }
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/IOseeExchangeVersionTransformer.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/IOseeExchangeVersionTransformer.java
index d46eaa6d3e9..6038a23cfbb 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/IOseeExchangeVersionTransformer.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/IOseeExchangeVersionTransformer.java
@@ -11,6 +11,7 @@
 package org.eclipse.osee.framework.branch.management.exchange.transform;
 
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.operation.OperationReporter;
 import org.osgi.framework.Version;
 
 /**
@@ -18,9 +19,9 @@ import org.osgi.framework.Version;
  */
 public interface IOseeExchangeVersionTransformer {
 
-   public abstract Version applyTransform(ExchangeDataProcessor processor) throws OseeCoreException;
+   public abstract Version applyTransform(ExchangeDataProcessor processor, OperationReporter reporter) throws OseeCoreException;
 
    public abstract Version getMaxVersion();
 
-   public abstract void finalizeTransform(ExchangeDataProcessor processor) throws OseeCoreException;
+   public abstract void finalizeTransform(ExchangeDataProcessor processor, OperationReporter reporter) throws OseeCoreException;
 }
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_8_3Transformer.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_8_3Transformer.java
index a09d952acca..2f80f14e15b 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_8_3Transformer.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_8_3Transformer.java
@@ -13,6 +13,7 @@ package org.eclipse.osee.framework.branch.management.exchange.transform;
 import java.util.regex.Pattern;
 import org.eclipse.osee.framework.branch.management.exchange.handler.ExportItem;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.operation.OperationReporter;
 import org.eclipse.osee.framework.jdk.core.text.rules.ReplaceAll;
 import org.eclipse.osee.framework.jdk.core.type.HashCollection;
 import org.osgi.framework.Version;
@@ -24,7 +25,7 @@ public class V0_8_3Transformer implements IOseeExchangeVersionTransformer {
    private static final Version MAX_VERSION = new Version("0.8.3");
 
    @Override
-   public Version applyTransform(ExchangeDataProcessor processor) throws OseeCoreException {
+   public Version applyTransform(ExchangeDataProcessor processor, OperationReporter reporter) throws OseeCoreException {
 
       HashCollection<String, String> tableToColumns = new HashCollection<String, String>();
       tableToColumns.put("osee_txs", "<column id=\"branch_id\" type=\"INTEGER\" />\n");
@@ -40,7 +41,7 @@ public class V0_8_3Transformer implements IOseeExchangeVersionTransformer {
    }
 
    @Override
-   public void finalizeTransform(ExchangeDataProcessor ruleProcessor) throws OseeCoreException {
+   public void finalizeTransform(ExchangeDataProcessor ruleProcessor, OperationReporter reporter) throws OseeCoreException {
    }
 
    @Override
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_0Transformer.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_0Transformer.java
index 12f8c85d9d0..eb059b3a9c9 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_0Transformer.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_0Transformer.java
@@ -14,6 +14,7 @@ import java.util.HashMap;
 import org.eclipse.osee.framework.branch.management.exchange.handler.ExportItem;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.model.cache.AbstractOseeCache;
+import org.eclipse.osee.framework.core.operation.OperationReporter;
 import org.eclipse.osee.framework.core.services.IOseeCachingService;
 import org.eclipse.osee.framework.jdk.core.text.rules.ReplaceAll;
 import org.eclipse.osee.framework.jdk.core.util.io.xml.SaxTransformer;
@@ -32,7 +33,7 @@ public class V0_9_0Transformer implements IOseeExchangeVersionTransformer {
    }
 
    @Override
-   public Version applyTransform(ExchangeDataProcessor processor) throws OseeCoreException {
+   public Version applyTransform(ExchangeDataProcessor processor, OperationReporter reporter) throws OseeCoreException {
       replaceDataTypeIdsWithGuids(processor, cachingService.getArtifactTypeCache(), ExportItem.OSEE_ARTIFACT_DATA,
          "art_type_id", "name");
       replaceDataTypeIdsWithGuids(processor, cachingService.getAttributeTypeCache(), ExportItem.OSEE_ATTRIBUTE_DATA,
@@ -62,7 +63,7 @@ public class V0_9_0Transformer implements IOseeExchangeVersionTransformer {
    }
 
    @Override
-   public void finalizeTransform(ExchangeDataProcessor processor) throws OseeCoreException {
+   public void finalizeTransform(ExchangeDataProcessor processor, OperationReporter reporter) throws OseeCoreException {
    }
 
    @Override
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_2Transformer.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_2Transformer.java
index d7ec512c195..bcd7a2a69d6 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_2Transformer.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_2Transformer.java
@@ -21,6 +21,8 @@ import java.util.Map;
 import java.util.TreeSet;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.osee.framework.branch.management.TxCurrentsAndModTypesCommand;
 import org.eclipse.osee.framework.branch.management.exchange.ExchangeUtil;
 import org.eclipse.osee.framework.branch.management.exchange.handler.ExportItem;
 import org.eclipse.osee.framework.core.enums.ModificationType;
@@ -28,6 +30,7 @@ import org.eclipse.osee.framework.core.enums.TxChange;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.exception.OseeExceptions;
 import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.core.operation.OperationReporter;
 import org.eclipse.osee.framework.core.operation.Operations;
 import org.eclipse.osee.framework.database.operation.Address;
 import org.eclipse.osee.framework.jdk.core.text.rules.ReplaceAll;
@@ -56,7 +59,7 @@ public class V0_9_2Transformer implements IOseeExchangeVersionTransformer {
    }
 
    @Override
-   public Version applyTransform(ExchangeDataProcessor processor) throws OseeCoreException {
+   public Version applyTransform(ExchangeDataProcessor processor, OperationReporter reporter) throws OseeCoreException {
       List<Integer> branchIds = convertBranchTable(processor);
 
       Map<Long, Long> artifactGammaToNetGammaId = convertArtifactAndConflicts(processor);
@@ -79,7 +82,11 @@ public class V0_9_2Transformer implements IOseeExchangeVersionTransformer {
    }
 
    @Override
-   public void finalizeTransform(ExchangeDataProcessor processor) throws OseeCoreException {
+   public void finalizeTransform(ExchangeDataProcessor processor, OperationReporter reporter) throws OseeCoreException {
+      Operations.executeWorkAndCheckStatus(new TxCurrentsAndModTypesCommand(reporter, false),
+         new NullProgressMonitor(), 0);
+      Operations.executeWorkAndCheckStatus(new TxCurrentsAndModTypesCommand(reporter, true), new NullProgressMonitor(),
+         0);
    }
 
    private List<Integer> convertBranchTable(ExchangeDataProcessor processor) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_4Transformer.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_4Transformer.java
index 78cdf94ded9..5dee7796827 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_4Transformer.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/transform/V0_9_4Transformer.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.osee.framework.branch.management.exchange.transform;
 
+import org.eclipse.osee.framework.core.operation.OperationReporter;
 import org.osgi.framework.Version;
 
 /**
@@ -19,7 +20,7 @@ public class V0_9_4Transformer implements IOseeExchangeVersionTransformer {
    private static final Version MAX_VERSION = new Version("0.9.4");
 
    @Override
-   public Version applyTransform(ExchangeDataProcessor processor) {
+   public Version applyTransform(ExchangeDataProcessor processor, OperationReporter reporter) {
       return getMaxVersion();
    }
 
@@ -29,6 +30,6 @@ public class V0_9_4Transformer implements IOseeExchangeVersionTransformer {
    }
 
    @Override
-   public void finalizeTransform(ExchangeDataProcessor processor) {
+   public void finalizeTransform(ExchangeDataProcessor processor, OperationReporter reporter) {
    }
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/ConsoleReporter.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/ConsoleReporter.java
new file mode 100644
index 00000000000..712d3ad0d43
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/operation/ConsoleReporter.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.framework.core.operation;
+
+/**
+ * @author Ryan D. Brooks
+ */
+public class ConsoleReporter implements OperationReporter {
+
+   @Override
+   public void report(String... row) {
+      for (String cell : row) {
+         System.out.print(cell);
+         System.out.print("   ");
+      }
+      System.out.println();
+   }
+
+   @Override
+   public void report(Throwable th) {
+      th.printStackTrace();
+   }
+
+}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchExchangeServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchExchangeServlet.java
index cc1549a13b5..ae53555a3e5 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchExchangeServlet.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchExchangeServlet.java
@@ -17,6 +17,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.eclipse.osee.framework.branch.management.IBranchExchange;
+import org.eclipse.osee.framework.core.operation.ConsoleReporter;
 import org.eclipse.osee.framework.core.server.ISessionManager;
 import org.eclipse.osee.framework.core.server.SecureOseeHttpServlet;
 import org.eclipse.osee.framework.jdk.core.util.Lib;
@@ -132,7 +133,8 @@ public class BranchExchangeServlet extends SecureOseeHttpServlet {
 
    private void executeImport(HttpBranchExchangeInfo exchangeInfo, HttpServletResponse response) throws Exception {
       IResourceLocator locator = locatorManager.getResourceLocator(exchangeInfo.getPath());
-      branchExchangeService.importBranch(locator, exchangeInfo.getOptions(), exchangeInfo.getSelectedBranchIds());
+      branchExchangeService.importBranch(locator, exchangeInfo.getOptions(), exchangeInfo.getSelectedBranchIds(),
+         new ConsoleReporter());
 
       response.setStatus(HttpServletResponse.SC_ACCEPTED);
       response.setContentType("text/plain");
diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/ServerAdminCommandProvider.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/ServerAdminCommandProvider.java
index d472d6bcacb..d6714ff389b 100644
--- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/ServerAdminCommandProvider.java
+++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/ServerAdminCommandProvider.java
@@ -11,6 +11,7 @@
 package org.eclipse.osee.framework.server.admin;
 
 import java.util.Arrays;
+import org.eclipse.osee.framework.branch.management.TxCurrentsAndModTypesCommand;
 import org.eclipse.osee.framework.core.enums.OseeCacheEnum;
 import org.eclipse.osee.framework.core.operation.Operations;
 import org.eclipse.osee.framework.server.admin.management.AdminCommands;
@@ -18,7 +19,6 @@ import org.eclipse.osee.framework.server.admin.management.ConsolidateArtifactVer
 import org.eclipse.osee.framework.server.admin.management.FinishPartiallyArchivedBranchesCommand;
 import org.eclipse.osee.framework.server.admin.management.GarbageCollectionCommand;
 import org.eclipse.osee.framework.server.admin.management.SchedulingCommand;
-import org.eclipse.osee.framework.server.admin.management.TxCurrentsAndModTypesCommand;
 import org.eclipse.osgi.framework.console.CommandInterpreter;
 import org.eclipse.osgi.framework.console.CommandProvider;
 
diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchImportWorker.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchImportWorker.java
index 14f0618219b..3469bb85a4a 100644
--- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchImportWorker.java
+++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchImportWorker.java
@@ -17,6 +17,8 @@ import java.util.List;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.osee.framework.branch.management.ImportOptions;
 import org.eclipse.osee.framework.core.exception.OseeArgumentException;
+import org.eclipse.osee.framework.core.operation.CommandInterpreterReporter;
+import org.eclipse.osee.framework.core.operation.OperationReporter;
 import org.eclipse.osee.framework.jdk.core.util.Lib;
 import org.eclipse.osee.framework.resource.management.Options;
 import org.eclipse.osee.framework.resource.management.util.ResourceLocator;
@@ -88,7 +90,9 @@ public class BranchImportWorker extends BaseServerCommand {
 
       for (File fileToImport : importFiles) {
          URI uri = new URI("exchange://" + fileToImport.toURI().toASCIIString());
-         Activator.getInstance().getBranchExchange().importBranch(new ResourceLocator(uri), options, branchIds);
+         OperationReporter reporter = new CommandInterpreterReporter(getCommandInterpreter());
+         Activator.getInstance().getBranchExchange().importBranch(new ResourceLocator(uri), options, branchIds,
+            reporter);
       }
    }
 }