feature[ats_ATS146069]: Remove BranchManagerServlet

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

10 files changed, 0 insertions, 610 deletions

diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchManagerServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchManagerServlet.java
deleted file mode 100644
index 11337cd4f1b..00000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchManagerServlet.java
+++ /dev/null
@@ -1,108 +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.IOException;
-import java.net.HttpURLConnection;
-import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.framework.core.enums.Function;
-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.util.Lib;
-import org.eclipse.osee.framework.manager.servlet.branch.AbstractBranchCallable;
-import org.eclipse.osee.framework.manager.servlet.branch.ArchiveBranchCallable;
-import org.eclipse.osee.framework.manager.servlet.branch.ChangeBranchStateCallable;
-import org.eclipse.osee.framework.manager.servlet.branch.ChangeBranchTypeCallable;
-import org.eclipse.osee.framework.manager.servlet.branch.CommitBranchCallable;
-import org.eclipse.osee.framework.manager.servlet.branch.CompareBranchCallable;
-import org.eclipse.osee.framework.manager.servlet.branch.CreateBranchCallable;
-import org.eclipse.osee.framework.manager.servlet.branch.PurgeBranchCallable;
-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;
-
-/**
- * @author Andrew M. Finkbeiner
- */
-public class BranchManagerServlet extends SecureOseeHttpServlet {
-
-   private static final long serialVersionUID = 226986283540461526L;
-
-   private final OrcsApi orcsApi;
-   private final IDataTranslationService translationService;
-
-   public BranchManagerServlet(Log logger, ISessionManager sessionManager, IDataTranslationService translationService, OrcsApi orcsApi) {
-      super(logger, sessionManager);
-      this.translationService = translationService;
-      this.orcsApi = orcsApi;
-   }
-
-   @Override
-   protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-      try {
-         Callable<?> callable = createCallable(req, resp);
-         if (callable != null) {
-            callable.call();
-         }
-      } catch (Exception ex) {
-         getLogger().error(ex, "Branch servlet request error: [%s]", req.toString());
-         resp.setStatus(HttpURLConnection.HTTP_INTERNAL_ERROR);
-         resp.setContentType("text/plain");
-         resp.getWriter().write(Lib.exceptionToString(ex));
-         resp.getWriter().flush();
-         resp.getWriter().close();
-      }
-   }
-
-   private ApplicationContext getContext(HttpServletRequest req) {
-      return ApplicationContextFactory.createContext(getSessionId(req));
-   }
-
-   private Callable<?> createCallable(HttpServletRequest req, HttpServletResponse resp) throws Exception {
-      String rawFunction = req.getParameter("function");
-      Function function = Function.fromString(rawFunction);
-
-      ApplicationContext applicationContext = getContext(req);
-
-      AbstractBranchCallable<?, ?> callable = null;
-      switch (function) {
-         case BRANCH_COMMIT:
-            callable = new CommitBranchCallable(applicationContext, req, resp, translationService, orcsApi);
-            break;
-         case CREATE_BRANCH:
-            callable = new CreateBranchCallable(applicationContext, req, resp, translationService, orcsApi);
-            break;
-         case CHANGE_REPORT:
-            callable = new CompareBranchCallable(applicationContext, req, resp, translationService, orcsApi);
-            break;
-         case PURGE_BRANCH:
-            callable = new PurgeBranchCallable(applicationContext, req, resp, translationService, orcsApi);
-            break;
-         case UPDATE_ARCHIVE_STATE:
-            callable = new ArchiveBranchCallable(applicationContext, req, resp, translationService, orcsApi);
-            break;
-         case UPDATE_BRANCH_TYPE:
-            callable = new ChangeBranchTypeCallable(applicationContext, req, resp, translationService, orcsApi);
-            break;
-         case UPDATE_BRANCH_STATE:
-            callable = new ChangeBranchStateCallable(applicationContext, req, resp, translationService, orcsApi);
-            break;
-         default:
-            throw new UnsupportedOperationException();
-      }
-      return callable;
-   }
-}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/AbstractBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/AbstractBranchCallable.java
deleted file mode 100644
index 34edc93b6c0..00000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/AbstractBranchCallable.java
+++ /dev/null
@@ -1,143 +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.manager.servlet.branch;
-
-import java.io.InputStream;
-import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.executor.admin.CancellableCallable;
-import org.eclipse.osee.framework.core.enums.CoreBranches;
-import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
-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.orcs.ApplicationContext;
-import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.OrcsBranch;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.data.BranchReadable;
-import org.eclipse.osee.orcs.search.BranchQuery;
-import org.eclipse.osee.orcs.search.QueryFactory;
-import org.eclipse.osee.orcs.search.TransactionQuery;
-
-/**
- * @author Roberto E. Escobar
- */
-public abstract class AbstractBranchCallable<REQ_TYPE, RESP_TYPE> extends CancellableCallable<RESP_TYPE> {
-
-   private final ApplicationContext context;
-   private final HttpServletRequest req;
-   private final HttpServletResponse resp;
-   private final IDataTranslationService translationService;
-   private final OrcsApi orcsApi;
-   private final String mediaType;
-   private final CoreTranslatorId reqType;
-   private final CoreTranslatorId respType;
-   private Callable<?> innerWorker;
-   private final OrcsBranch branchOps;
-
-   public AbstractBranchCallable(ApplicationContext context, HttpServletRequest req, HttpServletResponse resp, IDataTranslationService translationService, OrcsApi orcsApi, String mediaType, CoreTranslatorId reqType, CoreTranslatorId respType) {
-      super();
-      this.context = context;
-      this.req = req;
-      this.resp = resp;
-      this.translationService = translationService;
-      this.orcsApi = orcsApi;
-      this.mediaType = mediaType;
-      this.reqType = reqType;
-      this.respType = respType;
-      this.branchOps = getOrcsApi().getBranchOps(context);
-   }
-
-   @Override
-   public final RESP_TYPE call() throws Exception {
-      REQ_TYPE request = translationService.convert(req.getInputStream(), reqType);
-      RESP_TYPE response = executeCall(request);
-
-      resp.setStatus(HttpServletResponse.SC_ACCEPTED);
-      resp.setContentType(mediaType);
-      resp.setCharacterEncoding("UTF-8");
-
-      if (response != null && respType != null) {
-         InputStream inputStream = translationService.convertToStream(response, respType);
-         Lib.inputStreamToOutputStream(inputStream, resp.getOutputStream());
-      } else {
-         resp.getWriter().flush();
-      }
-      return response;
-   }
-
-   protected abstract RESP_TYPE executeCall(REQ_TYPE request) throws Exception;
-
-   protected <K> K callAndCheckForCancel(Callable<K> callable) throws Exception {
-      checkForCancelled();
-      setInnerWorker(callable);
-      K result = callable.call();
-      setInnerWorker(null);
-      return result;
-   }
-
-   private synchronized void setInnerWorker(Callable<?> callable) {
-      innerWorker = callable;
-   }
-
-   @Override
-   public void setCancel(boolean isCancelled) {
-      super.setCancel(isCancelled);
-      final Callable<?> inner = innerWorker;
-      if (inner != null) {
-         synchronized (inner) {
-            if (inner instanceof CancellableCallable) {
-               ((CancellableCallable<?>) inner).setCancel(isCancelled);
-            }
-         }
-      }
-   }
-
-   private OrcsApi getOrcsApi() {
-      return orcsApi;
-   }
-
-   protected OrcsBranch getBranchOps() {
-      return branchOps;
-   }
-
-   protected QueryFactory getQueryFactory() {
-      return orcsApi.getQueryFactory(getContext());
-   }
-
-   protected BranchReadable getBranchFromUuid(long uuid) {
-      BranchQuery branchQuery = orcsApi.getQueryFactory(getContext()).branchQuery();
-      branchQuery.andUuids(uuid);
-      return branchQuery.getResults().getExactlyOne();
-   }
-
-   protected ApplicationContext getContext() {
-      return context;
-   }
-
-   protected ArtifactReadable getArtifactById(int id) throws OseeCoreException {
-      ArtifactReadable artifact = null;
-      if (id > 0) {
-         QueryFactory factory = getOrcsApi().getQueryFactory(getContext());
-         artifact = factory.fromBranch(CoreBranches.COMMON).andLocalId(id).getResults().getExactlyOne();
-      }
-      return artifact;
-   }
-
-   protected Long getBranchUuidFromTxId(int tx) {
-      TransactionQuery txQuery = getQueryFactory().transactionQuery();
-      Long branchId = txQuery.andTxId(tx).getResults().getExactlyOne().getBranchId();
-      return branchId;
-   }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ArchiveBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ArchiveBranchCallable.java
deleted file mode 100644
index b3a42a1501d..00000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ArchiveBranchCallable.java
+++ /dev/null
@@ -1,46 +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.manager.servlet.branch;
-
-import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
-import org.eclipse.osee.framework.core.message.ChangeBranchArchiveStateRequest;
-import org.eclipse.osee.framework.core.translation.IDataTranslationService;
-import org.eclipse.osee.orcs.ApplicationContext;
-import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.data.ArchiveOperation;
-
-/**
- * @author Roberto E. Escobar
- */
-public class ArchiveBranchCallable extends AbstractBranchCallable<ChangeBranchArchiveStateRequest, Object> {
-
-   public ArchiveBranchCallable(ApplicationContext context, HttpServletRequest req, HttpServletResponse resp, IDataTranslationService translationService, OrcsApi orcsApi) {
-      super(context, req, resp, translationService, orcsApi, "text/plain",
-         CoreTranslatorId.CHANGE_BRANCH_ARCHIVE_STATE, null);
-   }
-
-   @Override
-   protected Object executeCall(ChangeBranchArchiveStateRequest request) throws Exception {
-      IOseeBranch toArchive = getBranchFromUuid(request.getBranchId());
-      ArchiveOperation archiveOp =
-         request.getState().isArchived() ? ArchiveOperation.ARCHIVE : ArchiveOperation.UNARCHIVE;
-
-      Callable<Void> callable = getBranchOps().archiveUnarchiveBranch(toArchive, archiveOp);
-      callAndCheckForCancel(callable);
-
-      return Boolean.TRUE;
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchStateCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchStateCallable.java
deleted file mode 100644
index c5931e0e685..00000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchStateCallable.java
+++ /dev/null
@@ -1,42 +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.manager.servlet.branch;
-
-import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.enums.BranchState;
-import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
-import org.eclipse.osee.framework.core.message.ChangeBranchStateRequest;
-import org.eclipse.osee.framework.core.translation.IDataTranslationService;
-import org.eclipse.osee.orcs.ApplicationContext;
-import org.eclipse.osee.orcs.OrcsApi;
-
-/**
- * @author Roberto E. Escobar
- */
-public class ChangeBranchStateCallable extends AbstractBranchCallable<ChangeBranchStateRequest, Object> {
-
-   public ChangeBranchStateCallable(ApplicationContext context, HttpServletRequest req, HttpServletResponse resp, IDataTranslationService translationService, OrcsApi orcsApi) {
-      super(context, req, resp, translationService, orcsApi, "text/plain", CoreTranslatorId.CHANGE_BRANCH_STATE, null);
-   }
-
-   @Override
-   protected Object executeCall(ChangeBranchStateRequest request) throws Exception {
-      IOseeBranch toModify = getBranchFromUuid(request.getBranchId());
-      BranchState newBranchState = request.getState();
-
-      Callable<Void> callable = getBranchOps().changeBranchState(toModify, newBranchState);
-      callAndCheckForCancel(callable);
-      return Boolean.TRUE;
-   }
-}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchTypeCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchTypeCallable.java
deleted file mode 100644
index 39f87f24d29..00000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchTypeCallable.java
+++ /dev/null
@@ -1,43 +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.manager.servlet.branch;
-
-import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
-import org.eclipse.osee.framework.core.message.ChangeBranchTypeRequest;
-import org.eclipse.osee.framework.core.translation.IDataTranslationService;
-import org.eclipse.osee.orcs.ApplicationContext;
-import org.eclipse.osee.orcs.OrcsApi;
-
-/**
- * @author Roberto E. Escobar
- */
-public class ChangeBranchTypeCallable extends AbstractBranchCallable<ChangeBranchTypeRequest, Object> {
-
-   public ChangeBranchTypeCallable(ApplicationContext context, HttpServletRequest req, HttpServletResponse resp, IDataTranslationService translationService, OrcsApi orcsApi) {
-      super(context, req, resp, translationService, orcsApi, "text/plain", CoreTranslatorId.CHANGE_BRANCH_TYPE, null);
-   }
-
-   @Override
-   protected Object executeCall(ChangeBranchTypeRequest request) throws Exception {
-      IOseeBranch toModify = getBranchFromUuid(request.getBranchId());
-      BranchType newBranchType = request.getType();
-
-      Callable<Void> callable = getBranchOps().changeBranchType(toModify, newBranchType);
-      callAndCheckForCancel(callable);
-      return Boolean.TRUE;
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CommitBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CommitBranchCallable.java
deleted file mode 100644
index f5a896c614a..00000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CommitBranchCallable.java
+++ /dev/null
@@ -1,57 +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.manager.servlet.branch;
-
-import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
-import org.eclipse.osee.framework.core.message.BranchCommitRequest;
-import org.eclipse.osee.framework.core.message.BranchCommitResponse;
-import org.eclipse.osee.framework.core.translation.IDataTranslationService;
-import org.eclipse.osee.orcs.ApplicationContext;
-import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.data.ArchiveOperation;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.data.TransactionReadable;
-
-/**
- * @author Roberto E. Escobar
- */
-public class CommitBranchCallable extends AbstractBranchCallable<BranchCommitRequest, BranchCommitResponse> {
-
-   public CommitBranchCallable(ApplicationContext context, HttpServletRequest req, HttpServletResponse resp, IDataTranslationService translationService, OrcsApi orcsApi) {
-      super(context, req, resp, translationService, orcsApi, "text/xml", CoreTranslatorId.BRANCH_COMMIT_REQUEST,
-         CoreTranslatorId.BRANCH_COMMIT_RESPONSE);
-   }
-
-   @Override
-   protected BranchCommitResponse executeCall(BranchCommitRequest request) throws Exception {
-      IOseeBranch source = getBranchFromUuid(request.getSourceBranchId());
-      IOseeBranch destination = getBranchFromUuid(request.getDestinationBranchId());
-
-      ArtifactReadable committer = getArtifactById(request.getUserArtId());
-
-      Callable<TransactionReadable> callable = getBranchOps().commitBranch(committer, source, destination);
-      TransactionReadable transactionRecord = callAndCheckForCancel(callable);
-
-      BranchCommitResponse responseData = new BranchCommitResponse();
-      responseData.setTransactionId(transactionRecord.getGuid());
-
-      if (request.isArchiveAllowed()) {
-         Callable<Void> archiveCallable = getBranchOps().archiveUnarchiveBranch(source, ArchiveOperation.ARCHIVE);
-         callAndCheckForCancel(archiveCallable);
-      }
-      return responseData;
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CompareBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CompareBranchCallable.java
deleted file mode 100644
index 3c5b2db30fc..00000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CompareBranchCallable.java
+++ /dev/null
@@ -1,53 +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.manager.servlet.branch;
-
-import java.util.List;
-import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
-import org.eclipse.osee.framework.core.message.ChangeReportRequest;
-import org.eclipse.osee.framework.core.message.ChangeReportResponse;
-import org.eclipse.osee.framework.core.model.change.ChangeItem;
-import org.eclipse.osee.framework.core.translation.IDataTranslationService;
-import org.eclipse.osee.orcs.ApplicationContext;
-import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.data.TransactionReadable;
-import org.eclipse.osee.orcs.search.QueryFactory;
-
-/**
- * @author Roberto E. Escobar
- */
-public class CompareBranchCallable extends AbstractBranchCallable<ChangeReportRequest, ChangeReportResponse> {
-
-   public CompareBranchCallable(ApplicationContext context, HttpServletRequest req, HttpServletResponse resp, IDataTranslationService translationService, OrcsApi orcsApi) {
-      super(context, req, resp, translationService, orcsApi, "text/xml", CoreTranslatorId.CHANGE_REPORT_REQUEST,
-         CoreTranslatorId.CHANGE_REPORT_RESPONSE);
-   }
-
-   @Override
-   protected ChangeReportResponse executeCall(ChangeReportRequest request) throws Exception {
-      QueryFactory queryFactory = getQueryFactory();
-      TransactionReadable sourceTx =
-         queryFactory.transactionQuery().andTxId(request.getSourceTx()).getResults().getExactlyOne();
-      TransactionReadable destinationTx =
-         queryFactory.transactionQuery().andTxId(request.getDestinationTx()).getResults().getExactlyOne();
-
-      Callable<List<ChangeItem>> callable = getBranchOps().compareBranch(sourceTx, destinationTx);
-      List<ChangeItem> items = callAndCheckForCancel(callable);
-
-      ChangeReportResponse response = new ChangeReportResponse();
-      response.setChangeItems(items);
-
-      return response;
-   }
-}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java
deleted file mode 100644
index 103b3369f99..00000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java
+++ /dev/null
@@ -1,72 +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.manager.servlet.branch;
-
-import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.framework.core.data.TokenFactory;
-import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
-import org.eclipse.osee.framework.core.message.BranchCreationRequest;
-import org.eclipse.osee.framework.core.message.BranchCreationResponse;
-import org.eclipse.osee.framework.core.translation.IDataTranslationService;
-import org.eclipse.osee.orcs.ApplicationContext;
-import org.eclipse.osee.orcs.OrcsApi;
-import org.eclipse.osee.orcs.data.ArtifactReadable;
-import org.eclipse.osee.orcs.data.BranchReadable;
-import org.eclipse.osee.orcs.data.CreateBranchData;
-
-/**
- * @author Roberto E. Escobar
- */
-public class CreateBranchCallable extends AbstractBranchCallable<BranchCreationRequest, BranchCreationResponse> {
-
-   public CreateBranchCallable(ApplicationContext context, HttpServletRequest req, HttpServletResponse resp, IDataTranslationService translationService, OrcsApi orcsApi) {
-      super(context, req, resp, translationService, orcsApi, "text/xml", CoreTranslatorId.BRANCH_CREATION_REQUEST,
-         CoreTranslatorId.BRANCH_CREATION_RESPONSE);
-   }
-
-   @Override
-   protected BranchCreationResponse executeCall(BranchCreationRequest request) throws Exception {
-      CreateBranchData createData = new CreateBranchData();
-
-      createData.setUuid(request.getBranchUuid());
-      createData.setName(request.getBranchName());
-      if (Long.valueOf(request.getBranchUuid()) > 0) {
-         createData.setUuid(request.getBranchUuid());
-      }
-      createData.setBranchType(request.getBranchType());
-      createData.setCreationComment(request.getCreationComment());
-
-      createData.setFromTransaction(TokenFactory.createTransaction(request.getSourceTransactionId()));
-
-      ArtifactReadable createdBy = getArtifactById(request.getAuthorId());
-      ArtifactReadable associatedWith = getArtifactById(request.getAssociatedArtifactId());
-
-      createData.setUserArtifact(createdBy);
-      createData.setAssociatedArtifact(associatedWith);
-
-      createData.setMergeDestinationBranchId(request.getMergeDestinationBranchId());
-      Long parentBranch = getBranchUuidFromTxId(request.getSourceTransactionId());
-      createData.setParentBranchUuid(parentBranch);
-      createData.setMergeAddressingQueryId(request.getMergeAddressingQueryId());
-      createData.setTxCopyBranchType(request.txIsCopied());
-      Callable<BranchReadable> callable;
-
-      callable = getBranchOps().createBranch(createData);
-
-      BranchReadable newBranch = callAndCheckForCancel(callable);
-
-      BranchCreationResponse creationResponse = new BranchCreationResponse(newBranch.getUuid());
-      return creationResponse;
-   }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/PurgeBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/PurgeBranchCallable.java
deleted file mode 100644
index 19b853acae2..00000000000
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/PurgeBranchCallable.java
+++ /dev/null
@@ -1,43 +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.manager.servlet.branch;
-
-import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
-import org.eclipse.osee.framework.core.message.PurgeBranchRequest;
-import org.eclipse.osee.framework.core.translation.IDataTranslationService;
-import org.eclipse.osee.orcs.ApplicationContext;
-import org.eclipse.osee.orcs.OrcsApi;
-
-/**
- * @author Roberto E. Escobar
- */
-public class PurgeBranchCallable extends AbstractBranchCallable<PurgeBranchRequest, Object> {
-
-   public PurgeBranchCallable(ApplicationContext context, HttpServletRequest req, HttpServletResponse resp, IDataTranslationService translationService, OrcsApi orcsApi) {
-      super(context, req, resp, translationService, orcsApi, "text/plain", CoreTranslatorId.PURGE_BRANCH_REQUEST, null);
-   }
-
-   @Override
-   public Object executeCall(PurgeBranchRequest request) throws Exception {
-      IOseeBranch toPurge = getBranchFromUuid(request.getBranchId());
-      boolean recurse = request.isRecursive();
-
-      Callable<?> callable = getBranchOps().purgeBranch(toPurge, recurse);
-      callAndCheckForCancel(callable);
-
-      return Boolean.TRUE;
-   }
-
-}
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 c7f4428a9e7..523265b583c 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
@@ -23,7 +23,6 @@ import org.eclipse.osee.framework.manager.servlet.AdminServlet;
 import org.eclipse.osee.framework.manager.servlet.ArtifactFileServlet;
 import org.eclipse.osee.framework.manager.servlet.AtsServlet;
 import org.eclipse.osee.framework.manager.servlet.BranchExchangeServlet;
-import org.eclipse.osee.framework.manager.servlet.BranchManagerServlet;
 import org.eclipse.osee.framework.manager.servlet.ConfigurationServlet;
 import org.eclipse.osee.framework.manager.servlet.DataServlet;
 import org.eclipse.osee.framework.manager.servlet.OseeCacheServlet;
@@ -120,8 +119,6 @@ public class ServletRegistrationHandler {
       register(new ArtifactFileServlet(logger, resourceManager, orcsApi, jdbcClient), "index");
       register(new BranchExchangeServlet(logger, sessionManager, resourceManager, orcsApi),
          OseeServerContext.BRANCH_EXCHANGE_CONTEXT);
-      register(new BranchManagerServlet(logger, sessionManager, translationService, orcsApi),
-         OseeServerContext.BRANCH_CONTEXT);
       register(new SearchEngineTaggerServlet(logger, sessionManager, orcsApi), OseeServerContext.SEARCH_TAGGING_CONTEXT);
       register(new SessionManagementServlet(logger, sessionManager, authenticationManager, activityLog),
          OseeServerContext.SESSION_CONTEXT);