feature[ats_ATS146077]: Remove OseeModel Servlet

Change-Id: I909cf9831f98baf9ec7c0e794e909caddedbc953
Signed-off-by: Angel Avila <angel.avila2@boeing.com>

23 files changed, 3 insertions, 831 deletions

diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java
index 63e0741e076..1a0a812bbe8 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java
@@ -10,13 +10,10 @@
  *******************************************************************************/
 package org.eclipse.osee.framework.core.message.test.mocks;
 
-import java.util.List;
 import org.eclipse.osee.framework.core.message.DatastoreInitRequest;
 import org.eclipse.osee.framework.core.model.AbstractOseeType;
 import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.core.model.IBasicArtifact;
-import org.eclipse.osee.framework.core.model.OseeImportModelRequest;
-import org.eclipse.osee.framework.core.model.OseeImportModelResponse;
 import org.eclipse.osee.framework.core.model.TableData;
 import org.eclipse.osee.framework.core.model.TransactionRecord;
 import org.eclipse.osee.framework.core.model.TypeUtil;
@@ -144,32 +141,6 @@ public final class DataAsserts {
       }
    }
 
-   public static void assertEquals(OseeImportModelRequest expected, OseeImportModelRequest actual) {
-      if (expected == null) {
-         Assert.assertNull(actual);
-      } else {
-         Assert.assertEquals(expected.getModel(), actual.getModel());
-         Assert.assertEquals(expected.getModelName(), actual.getModelName());
-         Assert.assertEquals(expected.isCreateCompareReport(), actual.isCreateCompareReport());
-         Assert.assertEquals(expected.isCreateTypeChangeReport(), actual.isCreateTypeChangeReport());
-      }
-   }
-
-   public static void assertEquals(OseeImportModelResponse expected, OseeImportModelResponse actual) {
-      if (expected == null) {
-         Assert.assertNull(actual);
-      } else {
-         Assert.assertEquals(expected.getComparisonSnapshotModelName(), actual.getComparisonSnapshotModelName());
-         Assert.assertEquals(expected.getComparisonSnapshotModel(), actual.getComparisonSnapshotModel());
-         List<TableData> expDatas = expected.getReportData();
-         List<TableData> actualData = actual.getReportData();
-         Assert.assertEquals(expDatas.size(), actualData.size());
-         for (int index = 0; index < expDatas.size(); index++) {
-            assertEquals(expDatas.get(index), actualData.get(index));
-         }
-      }
-   }
-
    public static void assertEquals(TableData expected, TableData actual) {
       Assert.assertEquals(expected.getTitle(), actual.getTitle());
       Assert.assertFalse(Compare.isDifferent(expected.getColumns(), actual.getColumns()));
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockRequestFactory.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockRequestFactory.java
index 6fb418bc4d0..365343d5762 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockRequestFactory.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/MockRequestFactory.java
@@ -11,17 +11,9 @@
 package org.eclipse.osee.framework.core.message.test.mocks;
 
 import org.eclipse.osee.framework.core.enums.ModificationType;
-import org.eclipse.osee.framework.core.model.BranchFactory;
-import org.eclipse.osee.framework.core.model.OseeModelFactoryService;
-import org.eclipse.osee.framework.core.model.TransactionRecordFactory;
 import org.eclipse.osee.framework.core.model.change.ChangeItem;
 import org.eclipse.osee.framework.core.model.change.ChangeItemUtil;
 import org.eclipse.osee.framework.core.model.change.ChangeVersion;
-import org.eclipse.osee.framework.core.model.type.ArtifactTypeFactory;
-import org.eclipse.osee.framework.core.model.type.AttributeTypeFactory;
-import org.eclipse.osee.framework.core.model.type.OseeEnumTypeFactory;
-import org.eclipse.osee.framework.core.model.type.RelationTypeFactory;
-import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
 import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
 
 public final class MockRequestFactory {
@@ -30,11 +22,6 @@ public final class MockRequestFactory {
       // Utility class
    }
 
-   public static IOseeModelFactoryService createFactoryService() {
-      return new OseeModelFactoryService(new BranchFactory(), new TransactionRecordFactory(),
-         new ArtifactTypeFactory(), new AttributeTypeFactory(), new RelationTypeFactory(), new OseeEnumTypeFactory());
-   }
-
    public static ChangeItem createArtifactChangeItem() throws OseeArgumentException {
       int artId = (int) Math.random();
       Long gammaIdNumber = Long.valueOf((int) Math.random());
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DataTranslationServiceFactoryTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DataTranslationServiceFactoryTest.java
index e31f9eda9e0..1c8e24e2360 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DataTranslationServiceFactoryTest.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DataTranslationServiceFactoryTest.java
@@ -14,16 +14,7 @@ import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
 import org.eclipse.osee.framework.core.message.internal.DataTranslationService;
 import org.eclipse.osee.framework.core.message.internal.DataTranslationServiceFactory;
 import org.eclipse.osee.framework.core.message.internal.translation.DatastoreInitRequestTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.OseeImportModelRequestTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.OseeImportModelResponseTranslator;
 import org.eclipse.osee.framework.core.message.internal.translation.TableDataTranslator;
-import org.eclipse.osee.framework.core.model.BranchFactory;
-import org.eclipse.osee.framework.core.model.TransactionRecordFactory;
-import org.eclipse.osee.framework.core.model.type.ArtifactTypeFactory;
-import org.eclipse.osee.framework.core.model.type.AttributeTypeFactory;
-import org.eclipse.osee.framework.core.model.type.OseeEnumTypeFactory;
-import org.eclipse.osee.framework.core.model.type.RelationTypeFactory;
-import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
 import org.eclipse.osee.framework.core.translation.IDataTranslationService;
 import org.eclipse.osee.framework.core.translation.ITranslator;
 import org.eclipse.osee.framework.core.translation.ITranslatorId;
@@ -41,11 +32,8 @@ public class DataTranslationServiceFactoryTest {
    @Test
    public void testServiceCreation() throws OseeCoreException {
       DataTranslationService srvc = new DataTranslationService();
-      srvc.setModelFactory(new MockModelFactoryService());
       srvc.start();
 
-      checkExists(srvc, OseeImportModelRequestTranslator.class, CoreTranslatorId.OSEE_IMPORT_MODEL_REQUEST);
-      checkExists(srvc, OseeImportModelResponseTranslator.class, CoreTranslatorId.OSEE_IMPORT_MODEL_RESPONSE);
       checkExists(srvc, TableDataTranslator.class, CoreTranslatorId.TABLE_DATA);
 
       checkExists(srvc, DatastoreInitRequestTranslator.class, CoreTranslatorId.OSEE_DATASTORE_INIT_REQUEST);
@@ -59,37 +47,4 @@ public class DataTranslationServiceFactoryTest {
       Assert.assertEquals(expected, actual.getClass());
    }
 
-   private final class MockModelFactoryService implements IOseeModelFactoryService {
-
-      @Override
-      public TransactionRecordFactory getTransactionFactory() {
-         return null;
-      }
-
-      @Override
-      public RelationTypeFactory getRelationTypeFactory() {
-         return null;
-      }
-
-      @Override
-      public OseeEnumTypeFactory getOseeEnumTypeFactory() {
-         return null;
-      }
-
-      @Override
-      public BranchFactory getBranchFactory() {
-         return null;
-      }
-
-      @Override
-      public AttributeTypeFactory getAttributeTypeFactory() {
-         return null;
-      }
-
-      @Override
-      public ArtifactTypeFactory getArtifactTypeFactory() {
-         return null;
-      }
-   }
-
 }
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelRequestTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelRequestTranslatorTest.java
deleted file mode 100644
index 334ec75b999..00000000000
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelRequestTranslatorTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.message.test.translation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.eclipse.osee.framework.core.message.internal.translation.OseeImportModelRequestTranslator;
-import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
-import org.eclipse.osee.framework.core.model.OseeImportModelRequest;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.junit.Assert;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Test Case for {@link OseeImportModelRequest}
- * 
- * @author Roberto E. Escobar
- */
-@RunWith(Parameterized.class)
-public class OseeImportModelRequestTranslatorTest extends BaseTranslatorTest<OseeImportModelRequest> {
-
-   public OseeImportModelRequestTranslatorTest(OseeImportModelRequest data, ITranslator<OseeImportModelRequest> translator) {
-      super(data, translator);
-   }
-
-   @Override
-   protected void checkEquals(OseeImportModelRequest expected, OseeImportModelRequest actual) {
-      Assert.assertNotSame(expected, actual);
-      DataAsserts.assertEquals(expected, actual);
-   }
-
-   @Parameters
-   public static Collection<Object[]> data() {
-      ITranslator<OseeImportModelRequest> translator = new OseeImportModelRequestTranslator();
-
-      List<Object[]> data = new ArrayList<Object[]>();
-      data.add(new Object[] {new OseeImportModelRequest("dummy:/model.osee", "dummy model", false, true), translator});
-      return data;
-   }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelResponseTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelResponseTranslatorTest.java
deleted file mode 100644
index 2c981cfa2f3..00000000000
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelResponseTranslatorTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.message.test.translation;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import org.junit.Assert;
-import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
-import org.eclipse.osee.framework.core.message.internal.DataTranslationService;
-import org.eclipse.osee.framework.core.message.internal.translation.OseeImportModelResponseTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.TableDataTranslator;
-import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts;
-import org.eclipse.osee.framework.core.model.OseeImportModelResponse;
-import org.eclipse.osee.framework.core.model.TableData;
-import org.eclipse.osee.framework.core.translation.IDataTranslationService;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Test Case for {@link OseeImportModelResponse}
- * 
- * @author Roberto E. Escobar
- */
-@RunWith(Parameterized.class)
-public class OseeImportModelResponseTranslatorTest extends BaseTranslatorTest<OseeImportModelResponse> {
-
-   public OseeImportModelResponseTranslatorTest(OseeImportModelResponse data, ITranslator<OseeImportModelResponse> translator) {
-      super(data, translator);
-   }
-
-   @Override
-   protected void checkEquals(OseeImportModelResponse expected, OseeImportModelResponse actual) {
-      Assert.assertNotSame(expected, actual);
-      Assert.assertNotNull(actual);
-      DataAsserts.assertEquals(expected, actual);
-   }
-
-   @Parameters
-   public static Collection<Object[]> data() throws OseeCoreException {
-      IDataTranslationService service = new DataTranslationService();
-      service.addTranslator(new TableDataTranslator(), CoreTranslatorId.TABLE_DATA);
-      ITranslator<OseeImportModelResponse> translator = new OseeImportModelResponseTranslator(service);
-
-      List<Object[]> data = new ArrayList<Object[]>();
-      OseeImportModelResponse response = new OseeImportModelResponse();
-      response.setComparisonSnapshotModel("dummy compare");
-      response.setComparisonSnapshotModelName("dummy compare name");
-      response.setPersisted(true);
-
-      List<TableData> tableDatas = new ArrayList<TableData>();
-      tableDatas.add(new TableData("hello", new String[] {"col1", "col2"}, Arrays.asList(new String[] {"one1", "two2"},
-         new String[] {"one3", "two4"})));
-      response.setReportData(tableDatas);
-      data.add(new Object[] {response, translator});
-      return data;
-   }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TranslationTestSuite.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TranslationTestSuite.java
index 55d909917d5..9055f3f925f 100644
--- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TranslationTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TranslationTestSuite.java
@@ -18,8 +18,6 @@ import org.junit.runners.Suite;
    DatastoreInitRequestTranslatorTest.class,
    DataTranslationServiceFactoryTest.class,
    DataTranslationServiceTest.class,
-   OseeImportModelRequestTranslatorTest.class,
-   OseeImportModelResponseTranslatorTest.class,
    TableDataTranslatorTest.class})
 /**
  * @author Roberto E. Escobar
diff --git a/plugins/org.eclipse.osee.framework.core.message/OSGI-INF/osee.message.translation.service.xml b/plugins/org.eclipse.osee.framework.core.message/OSGI-INF/osee.message.translation.service.xml
index 6859f37fed9..2a418ce1c15 100644
--- a/plugins/org.eclipse.osee.framework.core.message/OSGI-INF/osee.message.translation.service.xml
+++ b/plugins/org.eclipse.osee.framework.core.message/OSGI-INF/osee.message.translation.service.xml
@@ -4,5 +4,4 @@
    <service>
       <provide interface="org.eclipse.osee.framework.core.translation.IDataTranslationService"/>
    </service>
-   <reference bind="setModelFactory" cardinality="1..1" interface="org.eclipse.osee.framework.core.services.IOseeModelFactoryService" name="IOseeModelFactoryService" policy="static"/>
 </scr:component>
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationService.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationService.java
index 9f570c9e58d..c4c15fec930 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationService.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationService.java
@@ -18,8 +18,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import org.eclipse.osee.framework.core.exception.OseeExceptions;
-import org.eclipse.osee.framework.core.model.type.AttributeTypeFactory;
-import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
 import org.eclipse.osee.framework.core.translation.IDataTranslationService;
 import org.eclipse.osee.framework.core.translation.ITranslator;
 import org.eclipse.osee.framework.core.translation.ITranslatorId;
@@ -37,17 +35,9 @@ public class DataTranslationService implements IDataTranslationService {
    private final Map<ITranslatorId, ITranslator<?>> translators =
       new ConcurrentHashMap<ITranslatorId, ITranslator<?>>();
 
-   private IOseeModelFactoryService modelFactory;
-
-   public void setModelFactory(IOseeModelFactoryService modelFactory) {
-      this.modelFactory = modelFactory;
-   }
-
    public void start() throws OseeCoreException {
-      AttributeTypeFactory attributeTypeFactory = modelFactory.getAttributeTypeFactory();
-
       translators.clear();
-      factoryConfigurator.configureService(this, attributeTypeFactory);
+      factoryConfigurator.configureService(this);
    }
 
    public void stop() {
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceFactory.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceFactory.java
index 576127312dd..5f993c46f2f 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceFactory.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/DataTranslationServiceFactory.java
@@ -12,10 +12,7 @@ package org.eclipse.osee.framework.core.message.internal;
 
 import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
 import org.eclipse.osee.framework.core.message.internal.translation.DatastoreInitRequestTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.OseeImportModelRequestTranslator;
-import org.eclipse.osee.framework.core.message.internal.translation.OseeImportModelResponseTranslator;
 import org.eclipse.osee.framework.core.message.internal.translation.TableDataTranslator;
-import org.eclipse.osee.framework.core.model.type.AttributeTypeFactory;
 import org.eclipse.osee.framework.core.translation.IDataTranslationService;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 
@@ -29,9 +26,7 @@ public class DataTranslationServiceFactory {
       //
    }
 
-   public void configureService(IDataTranslationService service, AttributeTypeFactory attributeTypeFactory) throws OseeCoreException {
-      service.addTranslator(new OseeImportModelRequestTranslator(), CoreTranslatorId.OSEE_IMPORT_MODEL_REQUEST);
-      service.addTranslator(new OseeImportModelResponseTranslator(service), CoreTranslatorId.OSEE_IMPORT_MODEL_RESPONSE);
+   public void configureService(IDataTranslationService service) throws OseeCoreException {
       service.addTranslator(new TableDataTranslator(), CoreTranslatorId.TABLE_DATA);
 
       service.addTranslator(new DatastoreInitRequestTranslator(), CoreTranslatorId.OSEE_DATASTORE_INIT_REQUEST);
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/OseeImportModelRequestTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/OseeImportModelRequestTranslator.java
deleted file mode 100644
index 3556f715eeb..00000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/OseeImportModelRequestTranslator.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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.message.internal.translation;
-
-import org.eclipse.osee.framework.core.model.OseeImportModelRequest;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
-
-/**
- * @author Roberto E. Escobar
- */
-public class OseeImportModelRequestTranslator implements ITranslator<OseeImportModelRequest> {
-
-   private static enum Fields {
-      GENERATE_EMF_COMPARE,
-      GENERATE_DIRTY_REPORT,
-      MODEL_NAME,
-      MODEL;
-   }
-
-   @Override
-   public OseeImportModelRequest convert(PropertyStore store) {
-      String model = store.get(Fields.MODEL.name());
-      String modelName = store.get(Fields.MODEL_NAME.name());
-      boolean createTypeChangeReport = store.getBoolean(Fields.GENERATE_DIRTY_REPORT.name());
-      boolean createCompareReport = store.getBoolean(Fields.GENERATE_EMF_COMPARE.name());
-
-      return new OseeImportModelRequest(modelName, model, createTypeChangeReport, createCompareReport);
-   }
-
-   @Override
-   public PropertyStore convert(OseeImportModelRequest object) {
-      PropertyStore store = new PropertyStore();
-      store.put(Fields.MODEL_NAME.name(), object.getModelName());
-      store.put(Fields.MODEL.name(), object.getModel());
-      store.put(Fields.GENERATE_DIRTY_REPORT.name(), object.isCreateTypeChangeReport());
-      store.put(Fields.GENERATE_EMF_COMPARE.name(), object.isCreateCompareReport());
-      return store;
-   }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/OseeImportModelResponseTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/OseeImportModelResponseTranslator.java
deleted file mode 100644
index 63ba6eb2572..00000000000
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/OseeImportModelResponseTranslator.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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.message.internal.translation;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
-import org.eclipse.osee.framework.core.model.OseeImportModelResponse;
-import org.eclipse.osee.framework.core.model.TableData;
-import org.eclipse.osee.framework.core.translation.IDataTranslationService;
-import org.eclipse.osee.framework.core.translation.ITranslator;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
-
-/**
- * @author Roberto E. Escobar
- */
-public class OseeImportModelResponseTranslator implements ITranslator<OseeImportModelResponse> {
-
-   private static enum Fields {
-      WAS_PERSISTED,
-      EMF_COMPARE_REPORT,
-      EMF_COMPARE_NAME,
-      DIRTY_REPORT,
-      TABLE_COUNT,
-      TABLE,
-      TITLE,
-      HEADERS,
-      ROW,
-      ROW_COUNT;
-   }
-
-   private final IDataTranslationService service;
-
-   public OseeImportModelResponseTranslator(IDataTranslationService service) {
-      this.service = service;
-   }
-
-   @Override
-   public OseeImportModelResponse convert(PropertyStore store) throws OseeCoreException {
-      OseeImportModelResponse response = new OseeImportModelResponse();
-      response.setPersisted(store.getBoolean(Fields.WAS_PERSISTED.name()));
-      response.setComparisonSnapshotModelName(store.get(Fields.EMF_COMPARE_NAME.name()));
-      response.setComparisonSnapshotModel(store.get(Fields.EMF_COMPARE_REPORT.name()));
-      List<TableData> data = new ArrayList<TableData>();
-
-      int numberOfTables = store.getInt(Fields.TABLE_COUNT.name());
-      for (int index = 0; index < numberOfTables; index++) {
-         PropertyStore innerStore = store.getPropertyStore(createKey(Fields.TABLE, index));
-         TableData table = service.convert(innerStore, CoreTranslatorId.TABLE_DATA);
-         data.add(table);
-      }
-      response.setReportData(data);
-      return response;
-   }
-
-   @Override
-   public PropertyStore convert(OseeImportModelResponse object) throws OseeCoreException {
-      PropertyStore store = new PropertyStore();
-      store.put(Fields.WAS_PERSISTED.name(), object.wasPersisted());
-      store.put(Fields.EMF_COMPARE_NAME.name(), object.getComparisonSnapshotModelName());
-      store.put(Fields.EMF_COMPARE_REPORT.name(), object.getComparisonSnapshotModel());
-
-      List<TableData> tableData = object.getReportData();
-      for (int index = 0; index < tableData.size(); index++) {
-         TableData data = tableData.get(index);
-         PropertyStore innerStore = service.convert(data, CoreTranslatorId.TABLE_DATA);
-         store.put(createKey(Fields.TABLE, index), innerStore);
-      }
-      store.put(Fields.TABLE_COUNT.name(), tableData.size());
-      return store;
-   }
-
-   private String createKey(Enum<?> prefix, int index) {
-      return prefix.name() + "_" + index;
-   }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.model/META-INF/MANIFEST.MF
index 77881a2dfb4..c02a08581b5 100644
--- a/plugins/org.eclipse.osee.framework.core.model/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core.model/META-INF/MANIFEST.MF
@@ -29,4 +29,3 @@ Export-Package: org.eclipse.osee.framework.core.model,
  org.eclipse.osee.framework.core.model.tabledataframework,
  org.eclipse.osee.framework.core.model.type,
  org.eclipse.osee.framework.core.services
-Service-Component: OSGI-INF/*.xml
diff --git a/plugins/org.eclipse.osee.framework.core.model/OSGI-INF/osee.model.factory.xml b/plugins/org.eclipse.osee.framework.core.model/OSGI-INF/osee.model.factory.xml
deleted file mode 100644
index fbd27859055..00000000000
--- a/plugins/org.eclipse.osee.framework.core.model/OSGI-INF/osee.model.factory.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" immediate="true" name="org.eclipse.osee.framework.core.model.internal.OseeModelFactoryProxy">
-   <implementation class="org.eclipse.osee.framework.core.model.internal.OseeModelFactoryProxy"/>
-   <service>
-      <provide interface="org.eclipse.osee.framework.core.services.IOseeModelFactoryService"/>
-   </service>
-</scr:component>
diff --git a/plugins/org.eclipse.osee.framework.core.model/build.properties b/plugins/org.eclipse.osee.framework.core.model/build.properties
index 6ec2fe47e56..6fc926f0069 100644
--- a/plugins/org.eclipse.osee.framework.core.model/build.properties
+++ b/plugins/org.eclipse.osee.framework.core.model/build.properties
@@ -1,5 +1,4 @@
 output.. = bin/
 source.. = src/
 bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
+               .
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/OseeImportModelRequest.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/OseeImportModelRequest.java
deleted file mode 100644
index 8041fd2e1bc..00000000000
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/OseeImportModelRequest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.model;
-
-/**
- * @author Roberto E. Escobar
- */
-public class OseeImportModelRequest {
-
-   private final String model;
-   private final String modelName;
-   private final boolean createTypeChangeReport;
-   private final boolean createCompareReport;
-
-   public OseeImportModelRequest(String modelName, String model, boolean createTypeChangeReport, boolean createCompareReport) {
-      this.modelName = modelName;
-      this.model = model;
-      this.createCompareReport = createCompareReport;
-      this.createTypeChangeReport = createTypeChangeReport;
-   }
-
-   public String getModel() {
-      return model;
-   }
-
-   public boolean isCreateTypeChangeReport() {
-      return createTypeChangeReport;
-   }
-
-   public boolean isCreateCompareReport() {
-      return createCompareReport;
-   }
-
-   public String getModelName() {
-      return modelName;
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/OseeImportModelResponse.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/OseeImportModelResponse.java
deleted file mode 100644
index fe6a4213175..00000000000
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/OseeImportModelResponse.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.model;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @author Roberto E. Escobar
- */
-public class OseeImportModelResponse {
-
-   private final List<TableData> reportData;
-   private boolean wasPersisted;
-   private String comparisonSnapshotModel;
-   private String comparisonSnapshotModelName;
-
-   public OseeImportModelResponse() {
-      this.wasPersisted = false;
-      this.reportData = new ArrayList<TableData>();
-   }
-
-   public List<TableData> getReportData() {
-      return reportData;
-   }
-
-   public void setReportData(Collection<TableData> data) {
-      reportData.addAll(data);
-   }
-
-   public boolean wasPersisted() {
-      return wasPersisted;
-   }
-
-   public void setPersisted(boolean wasPersisted) {
-      this.wasPersisted = wasPersisted;
-   }
-
-   public String getComparisonSnapshotModel() {
-      return comparisonSnapshotModel;
-   }
-
-   public String getComparisonSnapshotModelName() {
-      return comparisonSnapshotModelName;
-   }
-
-   public void setComparisonSnapshotModel(String comparisonSnapshotModel) {
-      this.comparisonSnapshotModel = comparisonSnapshotModel;
-   }
-
-   public void setComparisonSnapshotModelName(String comparisonSnapshotModelName) {
-      this.comparisonSnapshotModelName = comparisonSnapshotModelName;
-   }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/OseeModelFactoryService.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/OseeModelFactoryService.java
deleted file mode 100644
index 8d28e8bcb79..00000000000
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/OseeModelFactoryService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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.model;
-
-import org.eclipse.osee.framework.core.model.type.ArtifactTypeFactory;
-import org.eclipse.osee.framework.core.model.type.AttributeTypeFactory;
-import org.eclipse.osee.framework.core.model.type.OseeEnumTypeFactory;
-import org.eclipse.osee.framework.core.model.type.RelationTypeFactory;
-import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
-
-/**
- * @author Roberto E. Escobar
- */
-public class OseeModelFactoryService implements IOseeModelFactoryService {
-
-   private final BranchFactory branchFactory;
-   private final TransactionRecordFactory txFactory;
-   private final ArtifactTypeFactory artTypeFactory;
-   private final AttributeTypeFactory attrTypeFactory;
-   private final RelationTypeFactory relTypeFactory;
-   private final OseeEnumTypeFactory oseEnumTypeFactory;
-
-   public OseeModelFactoryService(BranchFactory branchFactory, TransactionRecordFactory txFactory, ArtifactTypeFactory artTypeFactory, AttributeTypeFactory attrTypeFactory, RelationTypeFactory relTypeFactory, OseeEnumTypeFactory oseEnumTypeFactory) {
-      this.branchFactory = branchFactory;
-      this.txFactory = txFactory;
-      this.artTypeFactory = artTypeFactory;
-      this.attrTypeFactory = attrTypeFactory;
-      this.relTypeFactory = relTypeFactory;
-      this.oseEnumTypeFactory = oseEnumTypeFactory;
-   }
-
-   @Override
-   public BranchFactory getBranchFactory() {
-      return branchFactory;
-   }
-
-   @Override
-   public TransactionRecordFactory getTransactionFactory() {
-      return txFactory;
-   }
-
-   @Override
-   public ArtifactTypeFactory getArtifactTypeFactory() {
-      return artTypeFactory;
-   }
-
-   @Override
-   public AttributeTypeFactory getAttributeTypeFactory() {
-      return attrTypeFactory;
-   }
-
-   @Override
-   public RelationTypeFactory getRelationTypeFactory() {
-      return relTypeFactory;
-   }
-
-   @Override
-   public OseeEnumTypeFactory getOseeEnumTypeFactory() {
-      return oseEnumTypeFactory;
-   }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/internal/OseeModelFactoryProxy.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/internal/OseeModelFactoryProxy.java
deleted file mode 100644
index a9337eb6fe8..00000000000
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/internal/OseeModelFactoryProxy.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 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.model.internal;
-
-import org.eclipse.osee.framework.core.model.BranchFactory;
-import org.eclipse.osee.framework.core.model.OseeModelFactoryService;
-import org.eclipse.osee.framework.core.model.TransactionRecordFactory;
-import org.eclipse.osee.framework.core.model.type.ArtifactTypeFactory;
-import org.eclipse.osee.framework.core.model.type.AttributeTypeFactory;
-import org.eclipse.osee.framework.core.model.type.OseeEnumTypeFactory;
-import org.eclipse.osee.framework.core.model.type.RelationTypeFactory;
-import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
-
-/**
- * @author Roberto E. Escobar
- */
-public class OseeModelFactoryProxy implements IOseeModelFactoryService {
-   private IOseeModelFactoryService service;
-
-   public void start() {
-      service =
-         new OseeModelFactoryService(new BranchFactory(), new TransactionRecordFactory(), new ArtifactTypeFactory(),
-            new AttributeTypeFactory(), new RelationTypeFactory(), new OseeEnumTypeFactory());
-
-   }
-
-   public void stop() {
-      service = null;
-   }
-
-   @Override
-   public BranchFactory getBranchFactory() {
-      return service.getBranchFactory();
-   }
-
-   @Override
-   public TransactionRecordFactory getTransactionFactory() {
-      return service.getTransactionFactory();
-   }
-
-   @Override
-   public ArtifactTypeFactory getArtifactTypeFactory() {
-      return service.getArtifactTypeFactory();
-   }
-
-   @Override
-   public AttributeTypeFactory getAttributeTypeFactory() {
-      return service.getAttributeTypeFactory();
-   }
-
-   @Override
-   public RelationTypeFactory getRelationTypeFactory() {
-      return service.getRelationTypeFactory();
-   }
-
-   @Override
-   public OseeEnumTypeFactory getOseeEnumTypeFactory() {
-      return service.getOseeEnumTypeFactory();
-   }
-}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IOseeArtifactService.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IOseeArtifactService.java
deleted file mode 100644
index a5662ef9c7e..00000000000
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IOseeArtifactService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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.services;
-
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.core.model.IBasicArtifact;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface IOseeArtifactService {
-
-   IBasicArtifact<?> getArtifact(String guid, Branch branch) throws OseeCoreException;
-
-   IBasicArtifact<?> getDefaultHierarchyRootArtifact(Branch branch) throws OseeCoreException;
-}
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IOseeModelFactoryService.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IOseeModelFactoryService.java
deleted file mode 100644
index 5397eb1ebd7..00000000000
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/services/IOseeModelFactoryService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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.services;
-
-import org.eclipse.osee.framework.core.model.BranchFactory;
-import org.eclipse.osee.framework.core.model.TransactionRecordFactory;
-import org.eclipse.osee.framework.core.model.type.ArtifactTypeFactory;
-import org.eclipse.osee.framework.core.model.type.AttributeTypeFactory;
-import org.eclipse.osee.framework.core.model.type.OseeEnumTypeFactory;
-import org.eclipse.osee.framework.core.model.type.RelationTypeFactory;
-
-/**
- * @author Roberto E. Escobar
- */
-public interface IOseeModelFactoryService {
-
-   BranchFactory getBranchFactory();
-
-   TransactionRecordFactory getTransactionFactory();
-
-   ArtifactTypeFactory getArtifactTypeFactory();
-
-   AttributeTypeFactory getAttributeTypeFactory();
-
-   RelationTypeFactory getRelationTypeFactory();
-
-   OseeEnumTypeFactory getOseeEnumTypeFactory();
-}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreTranslatorId.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreTranslatorId.java
index a56151f6d19..f726fae9ca7 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreTranslatorId.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreTranslatorId.java
@@ -19,9 +19,6 @@ import org.eclipse.osee.framework.core.translation.ITranslatorId;
 public enum CoreTranslatorId implements ITranslatorId {
    OSEE_DATASTORE_INIT_REQUEST,
 
-   OSEE_IMPORT_MODEL_REQUEST,
-   OSEE_IMPORT_MODEL_RESPONSE,
-
    TABLE_DATA;
 
    @Override
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeModelServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeModelServlet.java
deleted file mode 100644
index 380b0e592ec..00000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeModelServlet.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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.manager.servlet;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
-import org.eclipse.osee.framework.core.exception.OseeExceptions;
-import org.eclipse.osee.framework.core.model.OseeImportModelRequest;
-import org.eclipse.osee.framework.core.model.OseeImportModelResponse;
-import org.eclipse.osee.framework.core.server.ISessionManager;
-import org.eclipse.osee.framework.core.server.SecureOseeHttpServlet;
-import org.eclipse.osee.framework.core.translation.IDataTranslationService;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.Lib;
-import org.eclipse.osee.framework.resource.management.IResource;
-import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.OrcsTypes;
-
-/**
- * @author Roberto E. Escobar
- */
-public class OseeModelServlet extends SecureOseeHttpServlet {
-
-   private static final long serialVersionUID = -2639113870500561780L;
-
-   private final OrcsApi orcsApi;
-   private final IDataTranslationService dataTransalatorService;
-
-   public OseeModelServlet(Log logger, ISessionManager sessionManager, IDataTranslationService dataTransalatorService, OrcsApi orcsApi) {
-      super(logger, sessionManager);
-      this.dataTransalatorService = dataTransalatorService;
-      this.orcsApi = orcsApi;
-   }
-
-   private OrcsTypes getOrcsTypes() {
-      return orcsApi.getOrcsTypes(null);
-   }
-
-   @Override
-   protected void checkAccessControl(HttpServletRequest request) throws OseeCoreException {
-      if (!request.getMethod().equalsIgnoreCase("GET")) {
-         super.checkAccessControl(request);
-      }
-   }
-
-   private void handleError(HttpServletResponse resp, String request, Throwable th) throws IOException {
-      getLogger().error(th, "Osee Cache request error: [%s]", request);
-      resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-      resp.setContentType("text/plain");
-      resp.getWriter().write(Lib.exceptionToString(th));
-      resp.getWriter().flush();
-      resp.getWriter().close();
-   }
-
-   @Override
-   protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-      ByteArrayOutputStream output = new ByteArrayOutputStream();
-      try {
-         getOrcsTypes().writeTypes(output).call();
-         resp.setStatus(HttpServletResponse.SC_ACCEPTED);
-         resp.setContentType("text/plain");
-         resp.setCharacterEncoding("UTF-8");
-
-         Lib.inputStreamToOutputStream(new ByteArrayInputStream(output.toByteArray()), resp.getOutputStream());
-      } catch (Exception ex) {
-         handleError(resp, req.getQueryString(), ex);
-      }
-   }
-
-   @Override
-   protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-      try {
-         final OseeImportModelRequest modelRequest =
-            dataTransalatorService.convert(req.getInputStream(), CoreTranslatorId.OSEE_IMPORT_MODEL_REQUEST);
-
-         IResource resource = new IResource() {
-
-            @Override
-            public InputStream getContent() throws OseeCoreException {
-               InputStream inputStream = null;
-               try {
-                  inputStream = new ByteArrayInputStream(modelRequest.getModel().getBytes("UTF-8"));
-               } catch (UnsupportedEncodingException ex) {
-                  OseeExceptions.wrapAndThrow(ex);
-               }
-               return inputStream;
-            }
-
-            @Override
-            public URI getLocation() {
-               try {
-                  String modelName = modelRequest.getModelName();
-                  if (!modelName.endsWith(".osee")) {
-                     modelName += ".osee";
-                  }
-                  return new URI("osee:/" + modelName);
-               } catch (URISyntaxException ex) {
-                  getLogger().error(ex, "Error creating location URI for model import");
-               }
-               return null;
-            }
-
-            @Override
-            public String getName() {
-               return modelRequest.getModelName();
-            }
-
-            @Override
-            public boolean isCompressed() {
-               return false;
-            }
-
-         };
-
-         OseeImportModelResponse modelResponse = new OseeImportModelResponse();
-
-         getOrcsTypes().loadTypes(resource).call();
-
-         resp.setStatus(HttpServletResponse.SC_ACCEPTED);
-         resp.setContentType("text/xml");
-         resp.setCharacterEncoding("UTF-8");
-
-         InputStream inputStream =
-            dataTransalatorService.convertToStream(modelResponse, CoreTranslatorId.OSEE_IMPORT_MODEL_RESPONSE);
-         Lib.inputStreamToOutputStream(inputStream, resp.getOutputStream());
-      } catch (Exception ex) {
-         handleError(resp, req.toString(), ex);
-      }
-   }
-}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java
index 695f4378e44..b7c04529824 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java
@@ -25,7 +25,6 @@ import org.eclipse.osee.framework.manager.servlet.AtsServlet;
 import org.eclipse.osee.framework.manager.servlet.BranchExchangeServlet;
 import org.eclipse.osee.framework.manager.servlet.ConfigurationServlet;
 import org.eclipse.osee.framework.manager.servlet.DataServlet;
-import org.eclipse.osee.framework.manager.servlet.OseeModelServlet;
 import org.eclipse.osee.framework.manager.servlet.ResourceManagerServlet;
 import org.eclipse.osee.framework.manager.servlet.SearchEngineTaggerServlet;
 import org.eclipse.osee.framework.manager.servlet.SessionClientLoopbackServlet;
@@ -122,8 +121,6 @@ public class ServletRegistrationHandler {
       register(new SessionManagementServlet(logger, sessionManager, authenticationManager, activityLog),
          OseeServerContext.SESSION_CONTEXT);
       register(new SessionClientLoopbackServlet(logger, sessionManager), OseeServerContext.CLIENT_LOOPBACK_CONTEXT);
-      register(new OseeModelServlet(logger, sessionManager, translationService, orcsApi),
-         OseeServerContext.OSEE_MODEL_CONTEXT);
 
       register(new AtsServlet(logger, resourceManager, orcsApi, jdbcClient), "osee/ats");
       register(new ConfigurationServlet(logger, translationService, orcsApi), OseeServerContext.OSEE_CONFIGURE_CONTEXT);