feature[ats_SF2V6]: Use OrcsTypes in OrcsDataStore

OrcsDataStore needs OrcsTypes which are created in the orcs.core bundle.
The orcs.core bundle needs the OrcsDataStore in order to create the
OrcsTypes.  Once the data store is up, orcs api can come up, create the
orcs types and pass them down to the data store.  The datastore needs
these types in order to set the data proxy on the attributes.

Change-Id: Ie208abba6c4c73d81ebbd3b2e07e6fe6dd4cbb85

8 files changed, 211 insertions, 55 deletions

diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/OSGI-INF/legacy.servlets.xml b/plugins/org.eclipse.osee.framework.manager.servlet/OSGI-INF/legacy.servlets.xml
index b1d139b7f3e..97aac56c0f8 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/OSGI-INF/legacy.servlets.xml
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/OSGI-INF/legacy.servlets.xml
@@ -8,10 +8,11 @@
    <reference bind="setServerLookup" cardinality="1..1" interface="org.eclipse.osee.framework.core.server.IApplicationServerLookup" name="IApplicationServerLookup" policy="static"/>
    <reference bind="setAppServerManager" cardinality="1..1" interface="org.eclipse.osee.framework.core.server.IApplicationServerManager" name="IApplicationServerManager" policy="static"/>
    <reference bind="setTranslationService" cardinality="1..1" interface="org.eclipse.osee.framework.core.translation.IDataTranslationService" name="IDataTranslationService" policy="static"/>
-   <reference bind="setCaching" cardinality="1..1" interface="org.eclipse.osee.framework.core.services.IOseeCachingService" name="IOseeCachingService" policy="static"/>
+   <reference bind="setCaching" cardinality="1..1" interface="org.eclipse.osee.framework.core.services.TempCachingService" name="TempCachingService" policy="static"/>
    <reference bind="setAuthenticationManager" cardinality="1..1" interface="org.eclipse.osee.framework.core.server.IAuthenticationManager" name="IAuthenticationManager" policy="static"/>
    <reference bind="setFactoryService" cardinality="1..1" interface="org.eclipse.osee.framework.core.services.IOseeModelFactoryService" name="IOseeModelFactoryService" policy="static"/>
    <reference bind="setResourceManager" cardinality="1..1" interface="org.eclipse.osee.framework.resource.management.IResourceManager" name="IResourceManager" policy="static"/>
    <reference bind="setOrcsApi" cardinality="1..1" interface="org.eclipse.osee.orcs.OrcsApi" name="OrcsApi" policy="static"/>
+   <reference bind="setIdentityService" cardinality="1..1" interface="org.eclipse.osee.framework.core.services.IdentityService" name="IdentityService" policy="static"/>
    
 </scr:component>
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ArtifactFileServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ArtifactFileServlet.java
index 465e9e3d408..5f752cab70a 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ArtifactFileServlet.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ArtifactFileServlet.java
@@ -20,7 +20,6 @@ import org.eclipse.osee.framework.core.exception.OseeExceptions;
 import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.core.model.cache.BranchCache;
 import org.eclipse.osee.framework.core.server.UnsecuredOseeHttpServlet;
-import org.eclipse.osee.framework.core.services.IOseeCachingService;
 import org.eclipse.osee.framework.core.util.Conditions;
 import org.eclipse.osee.framework.jdk.core.type.Pair;
 import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
@@ -45,10 +44,10 @@ public class ArtifactFileServlet extends UnsecuredOseeHttpServlet {
    private final IResourceManager resourceManager;
    private final BranchCache branchCache;
 
-   public ArtifactFileServlet(Log logger, IResourceManager resourceManager, IOseeCachingService cachingService) {
+   public ArtifactFileServlet(Log logger, IResourceManager resourceManager, BranchCache branchCache) {
       super(logger);
       this.resourceManager = resourceManager;
-      this.branchCache = cachingService.getBranchCache();
+      this.branchCache = branchCache;
    }
 
    @Override
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/AtsServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/AtsServlet.java
index d135cdc7c5f..ec8f21200aa 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/AtsServlet.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/AtsServlet.java
@@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.server.UnsecuredOseeHttpServlet;
-import org.eclipse.osee.framework.core.services.IOseeCachingService;
+import org.eclipse.osee.framework.core.services.TempCachingService;
 import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
 import org.eclipse.osee.framework.manager.servlet.ats.AtsService;
 import org.eclipse.osee.framework.manager.servlet.ats.AtsXmlMessages;
@@ -39,7 +39,7 @@ public class AtsServlet extends UnsecuredOseeHttpServlet {
 
    private final IResourceManager resourceManager;
 
-   public AtsServlet(Log logger, IResourceManager resourceManager, IOseeCachingService cacheService) {
+   public AtsServlet(Log logger, IResourceManager resourceManager, TempCachingService cacheService) {
       super(logger);
       this.resourceManager = resourceManager;
       AtsService.IResourceProvider provider = new ResourceProvider();
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/DataServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/DataServlet.java
index 410b4a5f0fc..494148e44ef 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/DataServlet.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/DataServlet.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.exception.OseeNotFoundException;
 import org.eclipse.osee.framework.core.model.cache.BranchCache;
 import org.eclipse.osee.framework.core.server.UnsecuredOseeHttpServlet;
-import org.eclipse.osee.framework.core.services.IOseeCachingService;
+import org.eclipse.osee.framework.core.services.TempCachingService;
 import org.eclipse.osee.framework.core.util.Conditions;
 import org.eclipse.osee.framework.jdk.core.util.Lib;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
@@ -35,7 +35,7 @@ public class DataServlet extends UnsecuredOseeHttpServlet {
    private final IResourceManager resourceManager;
    private final BranchCache branchCache;
 
-   public DataServlet(Log logger, IResourceManager resourceManager, IOseeCachingService cacheService) {
+   public DataServlet(Log logger, IResourceManager resourceManager, TempCachingService cacheService) {
       super(logger);
       this.resourceManager = resourceManager;
       branchCache = cacheService.getBranchCache();
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java
index a75bbe18a02..1406b25f0aa 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java
@@ -15,16 +15,26 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.eclipse.osee.framework.core.data.IArtifactType;
+import org.eclipse.osee.framework.core.data.IAttributeType;
+import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.IRelationType;
 import org.eclipse.osee.framework.core.enums.CacheOperation;
 import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
 import org.eclipse.osee.framework.core.enums.OseeCacheEnum;
+import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
 import org.eclipse.osee.framework.core.enums.StorageState;
 import org.eclipse.osee.framework.core.exception.OseeArgumentException;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.exception.OseeExceptions;
 import org.eclipse.osee.framework.core.message.ArtifactTypeCacheUpdateResponse;
+import org.eclipse.osee.framework.core.message.ArtifactTypeCacheUpdateResponse.ArtifactTypeRow;
 import org.eclipse.osee.framework.core.message.AttributeTypeCacheUpdateResponse;
 import org.eclipse.osee.framework.core.message.BranchCacheStoreRequest;
 import org.eclipse.osee.framework.core.message.BranchCacheUpdateResponse;
@@ -32,21 +42,34 @@ import org.eclipse.osee.framework.core.message.BranchCacheUpdateUtil;
 import org.eclipse.osee.framework.core.message.CacheUpdateRequest;
 import org.eclipse.osee.framework.core.message.OseeEnumTypeCacheUpdateResponse;
 import org.eclipse.osee.framework.core.message.RelationTypeCacheUpdateResponse;
+import org.eclipse.osee.framework.core.message.RelationTypeCacheUpdateResponse.RelationTypeRow;
 import org.eclipse.osee.framework.core.message.TransactionCacheUpdateResponse;
 import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.core.model.TransactionRecord;
 import org.eclipse.osee.framework.core.model.cache.BranchCache;
 import org.eclipse.osee.framework.core.model.cache.TransactionCache;
+import org.eclipse.osee.framework.core.model.type.AttributeType;
 import org.eclipse.osee.framework.core.server.ISessionManager;
 import org.eclipse.osee.framework.core.server.UnsecuredOseeHttpServlet;
-import org.eclipse.osee.framework.core.services.IOseeCachingService;
 import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
+import org.eclipse.osee.framework.core.services.IdentityService;
+import org.eclipse.osee.framework.core.services.TempCachingService;
 import org.eclipse.osee.framework.core.translation.IDataTranslationService;
 import org.eclipse.osee.framework.core.translation.ITranslatorId;
-import org.eclipse.osee.framework.core.util.Conditions;
 import org.eclipse.osee.framework.jdk.core.type.Pair;
+import org.eclipse.osee.framework.jdk.core.type.Triplet;
 import org.eclipse.osee.framework.jdk.core.util.Lib;
+import org.eclipse.osee.framework.manager.servlet.internal.ApplicationContextFactory;
 import org.eclipse.osee.logger.Log;
+import org.eclipse.osee.orcs.ApplicationContext;
+import org.eclipse.osee.orcs.OrcsApi;
+import org.eclipse.osee.orcs.OrcsTypes;
+import org.eclipse.osee.orcs.data.ArtifactTypes;
+import org.eclipse.osee.orcs.data.AttributeTypes;
+import org.eclipse.osee.orcs.data.EnumEntry;
+import org.eclipse.osee.orcs.data.EnumType;
+import org.eclipse.osee.orcs.data.EnumTypes;
+import org.eclipse.osee.orcs.data.RelationTypes;
 
 /**
  * @author Roberto E. Escobar
@@ -55,33 +78,37 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet {
 
    private static final long serialVersionUID = 6693534844874109524L;
    private final IDataTranslationService translationService;
-   private final IOseeCachingService cachingService;
    private final IOseeModelFactoryService factoryService;
    private final ISessionManager sessionManager;
+   private final BranchCache branchCache;
+   private final TransactionCache txCache;
+   private final OrcsApi orcsApi;
+   private final IdentityService identityService;
+   private static final StorageState DEFAULT_STORAGE_STATE = StorageState.CREATED;
 
-   public OseeCacheServlet(Log logger, ISessionManager sessionManager, IDataTranslationService translationService, IOseeCachingService cachingService, IOseeModelFactoryService factoryService) {
+   public OseeCacheServlet(Log logger, ISessionManager sessionManager, IDataTranslationService translationService, TempCachingService cachingService, OrcsApi orcsApi, IOseeModelFactoryService factoryService, IdentityService identityService) {
       super(logger);
       this.sessionManager = sessionManager;
       this.translationService = translationService;
-      this.cachingService = cachingService;
+      this.branchCache = cachingService.getBranchCache();
+      this.txCache = cachingService.getTransactionCache();
+      this.orcsApi = orcsApi;
       this.factoryService = factoryService;
+      this.identityService = identityService;
    }
 
    public IDataTranslationService getTranslationService() {
       return translationService;
    }
 
-   public IOseeCachingService getCachingService() {
-      return cachingService;
-   }
-
    @Override
    protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
       OseeCacheEnum cacheId = OseeCacheEnum.valueOf(req.getParameter("cacheId"));
       try {
-         IOseeCachingService caching = getCachingService();
          IDataTranslationService service = getTranslationService();
-         Pair<Object, ITranslatorId> pair = createResponse(true, new CacheUpdateRequest(cacheId), caching);
+         ApplicationContext context = createAppContext(req);
+         OrcsTypes orcsTypes = orcsApi.getOrcsTypes(context);
+         Pair<Object, ITranslatorId> pair = createResponse(true, new CacheUpdateRequest(cacheId), orcsTypes);
          resp.setStatus(HttpServletResponse.SC_ACCEPTED);
          resp.setContentType("text/xml");
          resp.setCharacterEncoding("UTF-8");
@@ -103,7 +130,9 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet {
          CacheOperation operation = CacheOperation.fromString(req.getParameter("function"));
          switch (operation) {
             case UPDATE:
-               sendUpdates(isCompatible, req, resp);
+               ApplicationContext context = createAppContext(req);
+               OrcsTypes orcsTypes = orcsApi.getOrcsTypes(context);
+               sendUpdates(isCompatible, req, resp, orcsTypes);
                break;
             case STORE:
                storeUpdates(isCompatible, req, resp);
@@ -116,6 +145,11 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet {
       }
    }
 
+   private ApplicationContext createAppContext(HttpServletRequest req) {
+      String sessionId = req.getParameter("sessionId");
+      return ApplicationContextFactory.createContext(sessionId);
+   }
+
    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);
@@ -127,8 +161,6 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet {
 
    private void storeUpdates(boolean isCompatible, HttpServletRequest req, HttpServletResponse resp) throws OseeCoreException {
       IDataTranslationService service = getTranslationService();
-      IOseeCachingService caching = getCachingService();
-      TransactionCache txCache = caching.getTransactionCache();
 
       BranchCacheStoreRequest updateRequest = null;
       InputStream inputStream = null;
@@ -141,10 +173,8 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet {
          Lib.close(inputStream);
       }
       Collection<Branch> updated =
-         new BranchCacheUpdateUtil(factoryService.getBranchFactory(), txCache).updateCache(updateRequest,
-            caching.getBranchCache());
+         new BranchCacheUpdateUtil(factoryService.getBranchFactory(), txCache).updateCache(updateRequest, branchCache);
 
-      BranchCache cache = caching.getBranchCache();
       if (updateRequest.isServerUpdateMessage()) {
          for (Branch branch : updated) {
             if (branch.isCreated()) {
@@ -152,11 +182,11 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet {
             }
             branch.clearDirty();
             if (branch.isPurged()) {
-               cache.decache(branch);
+               branchCache.decache(branch);
             }
          }
       } else {
-         cache.storeItems(updated);
+         branchCache.storeItems(updated);
       }
       try {
          resp.setStatus(HttpServletResponse.SC_ACCEPTED);
@@ -168,9 +198,8 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet {
       }
    }
 
-   private void sendUpdates(boolean isCompatible, HttpServletRequest req, HttpServletResponse resp) throws OseeCoreException {
+   private void sendUpdates(boolean isCompatible, HttpServletRequest req, HttpServletResponse resp, OrcsTypes orcsTypes) throws OseeCoreException {
       IDataTranslationService service = getTranslationService();
-      IOseeCachingService caching = getCachingService();
 
       CacheUpdateRequest updateRequest = null;
       InputStream inputStream = null;
@@ -185,7 +214,7 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet {
 
       OutputStream outputStream = null;
       try {
-         Pair<Object, ITranslatorId> pair = createResponse(isCompatible, updateRequest, caching);
+         Pair<Object, ITranslatorId> pair = createResponse(isCompatible, updateRequest, orcsTypes);
 
          resp.setStatus(HttpServletResponse.SC_ACCEPTED);
          resp.setContentType("text/xml");
@@ -201,18 +230,16 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet {
       }
    }
 
-   private Pair<Object, ITranslatorId> createResponse(boolean isCompatible, CacheUpdateRequest updateRequest, IOseeCachingService caching) throws OseeCoreException {
-      Conditions.checkNotNull(caching, "caching service");
+   private Pair<Object, ITranslatorId> createResponse(boolean isCompatible, CacheUpdateRequest updateRequest, OrcsTypes orcsTypes) throws OseeCoreException {
       Object response = null;
       ITranslatorId transalatorId = null;
       switch (updateRequest.getCacheId()) {
          case BRANCH_CACHE:
-            response = BranchCacheUpdateResponse.fromCache(caching.getBranchCache(), caching.getBranchCache().getAll());
+            response = BranchCacheUpdateResponse.fromCache(branchCache, branchCache.getAll());
             transalatorId = CoreTranslatorId.BRANCH_CACHE_UPDATE_RESPONSE;
             break;
          case TRANSACTION_CACHE:
             Collection<TransactionRecord> record;
-            TransactionCache txCache = caching.getTransactionCache();
 
             if (updateRequest.getItemsIds().isEmpty()) {
                record = txCache.getAll();
@@ -223,26 +250,23 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet {
                }
             }
             response =
-               TransactionCacheUpdateResponse.fromCache(factoryService.getTransactionFactory(), record,
-                  caching.getBranchCache());
+               TransactionCacheUpdateResponse.fromCache(factoryService.getTransactionFactory(), record, branchCache);
             transalatorId = CoreTranslatorId.TX_CACHE_UPDATE_RESPONSE;
             break;
          case ARTIFACT_TYPE_CACHE:
-            response = ArtifactTypeCacheUpdateResponse.fromCache(caching.getArtifactTypeCache().getAll());
+            response = createArtifactTypeCacheUpdateResponse(orcsTypes);
             transalatorId = CoreTranslatorId.ARTIFACT_TYPE_CACHE_UPDATE_RESPONSE;
             break;
          case ATTRIBUTE_TYPE_CACHE:
-            response =
-               AttributeTypeCacheUpdateResponse.fromCache(factoryService.getAttributeTypeFactory(),
-                  caching.getAttributeTypeCache().getAll());
+            response = createAttributeTypeCacheUpdateResponse(orcsTypes);
             transalatorId = CoreTranslatorId.ATTRIBUTE_TYPE_CACHE_UPDATE_RESPONSE;
             break;
          case OSEE_ENUM_TYPE_CACHE:
-            response = OseeEnumTypeCacheUpdateResponse.fromCache(caching.getEnumTypeCache().getAll());
+            response = createOseeEnumTypeCacheUpdateResponse(orcsTypes);
             transalatorId = CoreTranslatorId.OSEE_ENUM_TYPE_CACHE_UPDATE_RESPONSE;
             break;
          case RELATION_TYPE_CACHE:
-            response = RelationTypeCacheUpdateResponse.fromCache(caching);
+            response = createRelationTypeCacheUpdateResponse(orcsTypes);
             transalatorId = CoreTranslatorId.RELATION_TYPE_CACHE_UPDATE_RESPONSE;
             break;
          default:
@@ -251,4 +275,114 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet {
       return new Pair<Object, ITranslatorId>(response, transalatorId);
    }
 
+   private ArtifactTypeCacheUpdateResponse createArtifactTypeCacheUpdateResponse(OrcsTypes orcsTypes) throws OseeCoreException {
+      List<ArtifactTypeRow> rows = new ArrayList<ArtifactTypeRow>();
+      Map<Integer, Integer[]> baseToSuper = new HashMap<Integer, Integer[]>();
+      List<Triplet<Long, String, Long>> artAttrs = new ArrayList<Triplet<Long, String, Long>>();
+      ArtifactTypes artTypes = orcsTypes.getArtifactTypes();
+      for (IArtifactType artType : artTypes.getAll()) {
+         int artTypeId = identityService.getLocalId(artType.getGuid());
+         boolean isAbstract = artTypes.isAbstract(artType);
+         rows.add(new ArtifactTypeRow(artTypeId, artType.getGuid(), artType.getName(), isAbstract,
+            DEFAULT_STORAGE_STATE));
+
+         Collection<? extends IArtifactType> superTypes = artTypes.getSuperArtifactTypes(artType);
+         if (!superTypes.isEmpty()) {
+            Integer[] intSuperTypes = new Integer[superTypes.size()];
+            int index = 0;
+            for (IArtifactType superType : superTypes) {
+               intSuperTypes[index++] = identityService.getLocalId(superType.getGuid());
+            }
+            baseToSuper.put(artTypeId, intSuperTypes);
+         }
+
+         Map<IOseeBranch, Collection<IAttributeType>> allTypes = artTypes.getAllAttributeTypes(artType);
+         for (Entry<IOseeBranch, Collection<IAttributeType>> entry : allTypes.entrySet()) {
+            IOseeBranch branch = entry.getKey();
+            Collection<IAttributeType> attrTypes = entry.getValue();
+            for (IAttributeType type : attrTypes) {
+               artAttrs.add(new Triplet<Long, String, Long>(artType.getGuid(), branch.getGuid(), type.getGuid()));
+            }
+
+         }
+      }
+      return new ArtifactTypeCacheUpdateResponse(rows, baseToSuper, artAttrs);
+   }
+
+   private AttributeTypeCacheUpdateResponse createAttributeTypeCacheUpdateResponse(OrcsTypes orcsTypes) throws OseeCoreException {
+      List<AttributeType> rows = new ArrayList<AttributeType>();
+      Map<Integer, Integer> attrToEnum = new HashMap<Integer, Integer>();
+      AttributeTypes attrTypes = orcsTypes.getAttributeTypes();
+      for (IAttributeType item : attrTypes.getAll()) {
+         String baseAttributeTypeId = attrTypes.getBaseAttributeTypeId(item);
+         String attributeProviderNameId = attrTypes.getAttributeProviderId(item);
+         String fileTypeExtension = attrTypes.getFileTypeExtension(item);
+         String defaultValue = attrTypes.getDefaultValue(item);
+         int minOccurrances = attrTypes.getMinOccurrences(item);
+         int maxOccurrences = attrTypes.getMaxOccurrences(item);
+         String description = attrTypes.getDescription(item);
+         String taggerId = attrTypes.getTaggerId(item);
+         String mediaType = attrTypes.getMediaType(item);
+         AttributeType type =
+            new AttributeType(item.getGuid(), item.getName(), baseAttributeTypeId, attributeProviderNameId,
+               fileTypeExtension, defaultValue, minOccurrances, maxOccurrences, description, taggerId, mediaType);
+
+         int localId = identityService.getLocalId(item);
+         type.setId(localId);
+         rows.add(type);
+
+         if (attrTypes.isEnumerated(item)) {
+            EnumType enumType = attrTypes.getEnumType(item);
+            int enumId = identityService.getLocalId(enumType);
+            attrToEnum.put(localId, enumId);
+         }
+
+      }
+      return new AttributeTypeCacheUpdateResponse(rows, attrToEnum);
+   }
+
+   private RelationTypeCacheUpdateResponse createRelationTypeCacheUpdateResponse(OrcsTypes orcsTypes) throws OseeCoreException {
+      List<RelationTypeRow> rows = new ArrayList<RelationTypeRow>();
+      RelationTypes relTypes = orcsTypes.getRelationTypes();
+      for (IRelationType item : relTypes.getAll()) {
+         IArtifactType sideAType = relTypes.getArtifactTypeSideA(item);
+         IArtifactType sideBType = relTypes.getArtifactTypeSideB(item);
+         int artifactTypeSideA = identityService.getLocalId(sideAType);
+         int artifactTypeSideB = identityService.getLocalId(sideBType);
+
+         int localId = identityService.getLocalId(item);
+
+         String sideAName = relTypes.getSideAName(item);
+         String sideBName = relTypes.getSideBName(item);
+         RelationTypeMultiplicity multiplicity = relTypes.getMultiplicity(item);
+         String defaultOrderTypeGuid = relTypes.getDefaultOrderTypeGuid(item);
+
+         rows.add(new RelationTypeRow(localId, item.getName(), item.getGuid(), DEFAULT_STORAGE_STATE, sideAName,
+            sideBName, artifactTypeSideA, artifactTypeSideB, multiplicity, defaultOrderTypeGuid));
+      }
+      return new RelationTypeCacheUpdateResponse(rows);
+   }
+
+   private OseeEnumTypeCacheUpdateResponse createOseeEnumTypeCacheUpdateResponse(OrcsTypes orcsTypes) throws OseeCoreException {
+      List<String[]> enumTypeRows = new ArrayList<String[]>();
+      List<String[]> enumEntryRows = new ArrayList<String[]>();
+      EnumTypes enumTypes = orcsTypes.getEnumTypes();
+      for (EnumType type : enumTypes.getAll()) {
+         int localId = identityService.getLocalId(type);
+         enumTypeRows.add(new String[] {
+            String.valueOf(localId),
+            DEFAULT_STORAGE_STATE.toString(),
+            String.valueOf(type.getGuid()),
+            type.getName()});
+         for (EnumEntry entry : type.values()) {
+            enumEntryRows.add(new String[] {
+               String.valueOf(type.getGuid()),
+               entry.getGuid(),
+               entry.getName(),
+               String.valueOf(entry.ordinal()),
+               entry.getDescription()});
+         }
+      }
+      return new OseeEnumTypeCacheUpdateResponse(enumTypeRows, enumEntryRows);
+   }
 }
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
index 989880e9dc2..6a925129316 100644
--- 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
@@ -16,6 +16,7 @@ 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;
@@ -86,9 +87,8 @@ public class OseeModelServlet extends SecureOseeHttpServlet {
    @Override
    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
       try {
-         IDataTranslationService service = dataTransalatorService;
          final OseeImportModelRequest modelRequest =
-            service.convert(req.getInputStream(), CoreTranslatorId.OSEE_IMPORT_MODEL_REQUEST);
+            dataTransalatorService.convert(req.getInputStream(), CoreTranslatorId.OSEE_IMPORT_MODEL_REQUEST);
 
          IResource resource = new IResource() {
 
@@ -105,6 +105,15 @@ public class OseeModelServlet extends SecureOseeHttpServlet {
 
             @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;
             }
 
@@ -124,11 +133,16 @@ public class OseeModelServlet extends SecureOseeHttpServlet {
 
          getOrcsTypes().loadTypes(resource, isInitializing(req)).call();
 
+         if (modelRequest.isPersistAllowed()) {
+            getOrcsTypes().save().call();
+         }
+
          resp.setStatus(HttpServletResponse.SC_ACCEPTED);
          resp.setContentType("text/xml");
          resp.setCharacterEncoding("UTF-8");
 
-         InputStream inputStream = service.convertToStream(modelResponse, CoreTranslatorId.OSEE_IMPORT_MODEL_RESPONSE);
+         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/ats/AtsService.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/AtsService.java
index 3b678515a08..03f643a2ad0 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/AtsService.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/AtsService.java
@@ -15,7 +15,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.model.cache.BranchCache;
-import org.eclipse.osee.framework.core.services.IOseeCachingService;
+import org.eclipse.osee.framework.core.services.TempCachingService;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.framework.manager.servlet.DataServlet;
 import org.eclipse.osee.framework.resource.management.IResource;
@@ -47,7 +47,7 @@ public class AtsService {
    private final IResourceManager resourceManager;
    private final BranchCache branchCache;
 
-   public AtsService(IResourceProvider resourceProvider, AtsXmlSearch xmlSearch, AtsXmlMessages messages, IResourceManager resourceManager, IOseeCachingService cacheService) {
+   public AtsService(IResourceProvider resourceProvider, AtsXmlSearch xmlSearch, AtsXmlMessages messages, IResourceManager resourceManager, TempCachingService cacheService) {
       this.xmlSearch = xmlSearch;
       this.messages = messages;
       this.resourceProvider = resourceProvider;
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 f70ad8c9625..a737e09f0a1 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
@@ -13,13 +13,15 @@ package org.eclipse.osee.framework.manager.servlet.internal;
 import java.util.HashSet;
 import java.util.Set;
 import org.eclipse.osee.framework.core.data.OseeServerContext;
+import org.eclipse.osee.framework.core.model.cache.BranchCache;
 import org.eclipse.osee.framework.core.server.IApplicationServerLookup;
 import org.eclipse.osee.framework.core.server.IApplicationServerManager;
 import org.eclipse.osee.framework.core.server.IAuthenticationManager;
 import org.eclipse.osee.framework.core.server.ISessionManager;
 import org.eclipse.osee.framework.core.server.OseeHttpServlet;
-import org.eclipse.osee.framework.core.services.IOseeCachingService;
 import org.eclipse.osee.framework.core.services.IOseeModelFactoryService;
+import org.eclipse.osee.framework.core.services.IdentityService;
+import org.eclipse.osee.framework.core.services.TempCachingService;
 import org.eclipse.osee.framework.core.translation.IDataTranslationService;
 import org.eclipse.osee.framework.manager.servlet.AdminServlet;
 import org.eclipse.osee.framework.manager.servlet.ArtifactFileServlet;
@@ -55,11 +57,12 @@ public class ServletRegistrationHandler {
    private IApplicationServerLookup serverLookup;
    private IApplicationServerManager appServerManager;
    private IDataTranslationService translationService;
-   private IOseeCachingService caching;
+   private TempCachingService caching;
    private IAuthenticationManager authenticationManager;
    private IOseeModelFactoryService factoryService;
    private IResourceManager resourceManager;
    private OrcsApi orcsApi;
+   private IdentityService identityService;
 
    private final Set<String> contexts = new HashSet<String>();
 
@@ -67,6 +70,10 @@ public class ServletRegistrationHandler {
       this.sessionManager = sessionManager;
    }
 
+   public void setIdentityService(IdentityService identityService) {
+      this.identityService = identityService;
+   }
+
    public void setServerLookup(IApplicationServerLookup serverLookup) {
       this.serverLookup = serverLookup;
    }
@@ -79,7 +86,7 @@ public class ServletRegistrationHandler {
       this.translationService = translationService;
    }
 
-   public void setCaching(IOseeCachingService caching) {
+   public void setCaching(TempCachingService caching) {
       this.caching = caching;
    }
 
@@ -123,11 +130,12 @@ public class ServletRegistrationHandler {
 
    private void registerServices(BundleContext context) {
       contexts.clear();
+      BranchCache branchCache = caching.getBranchCache();
       register(new SystemManagerServlet(logger, sessionManager), OseeServerContext.MANAGER_CONTEXT);
       register(new ResourceManagerServlet(logger, sessionManager, resourceManager), OseeServerContext.RESOURCE_CONTEXT);
-      register(new ArtifactFileServlet(logger, resourceManager, caching), OseeServerContext.PROCESS_CONTEXT);
-      register(new ArtifactFileServlet(logger, resourceManager, caching), OseeServerContext.ARTIFACT_CONTEXT);
-      register(new ArtifactFileServlet(logger, resourceManager, caching), "index");
+      register(new ArtifactFileServlet(logger, resourceManager, branchCache), OseeServerContext.PROCESS_CONTEXT);
+      register(new ArtifactFileServlet(logger, resourceManager, branchCache), OseeServerContext.ARTIFACT_CONTEXT);
+      register(new ArtifactFileServlet(logger, resourceManager, branchCache), "index");
       register(new BranchExchangeServlet(logger, sessionManager, resourceManager, orcsApi),
          OseeServerContext.BRANCH_EXCHANGE_CONTEXT);
       register(new BranchManagerServlet(logger, sessionManager, translationService, orcsApi),
@@ -139,8 +147,8 @@ public class ServletRegistrationHandler {
       register(new SessionManagementServlet(logger, sessionManager, authenticationManager),
          OseeServerContext.SESSION_CONTEXT);
       register(new SessionClientLoopbackServlet(logger, sessionManager), OseeServerContext.CLIENT_LOOPBACK_CONTEXT);
-      register(new OseeCacheServlet(logger, sessionManager, translationService, caching, factoryService),
-         OseeServerContext.CACHE_CONTEXT);
+      register(new OseeCacheServlet(logger, sessionManager, translationService, caching, orcsApi, factoryService,
+         identityService), OseeServerContext.CACHE_CONTEXT);
       register(new OseeModelServlet(logger, sessionManager, translationService, orcsApi),
          OseeServerContext.OSEE_MODEL_CONTEXT);
       register(new UnsubscribeServlet(logger, context, orcsApi), "osee/unsubscribe");