From 0c337cc4b4f86a1341974831d502f3a59fed0fc3 Mon Sep 17 00:00:00 2001
From: Anja Kleebaum <Anja.Kleebaum@informatik.uni-heidelberg.de>
Date: Thu, 3 May 2018 16:56:16 +0200
Subject: [PATCH] ConDec-26: Unify REST API of plug-in: all REST methods are
 available under "/rest/decisions/latest/"

---
 src/main/resources/atlassian-plugin.xml     | 10 ----------
 src/main/resources/js/decdoc.rest.client.js |  4 ++--
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/atlassian-plugin.xml b/src/main/resources/atlassian-plugin.xml
index dc90252c99..aac54afdcd 100644
--- a/src/main/resources/atlassian-plugin.xml
+++ b/src/main/resources/atlassian-plugin.xml
@@ -110,16 +110,6 @@
 		<description>Provides the administration page.</description>
 		<url-pattern>/adminservlet</url-pattern>
 	</servlet>
-	<rest key="admin-rest" name="Adminstration REST" path="/admin" version="1.0">
-		<description>
-			Provides REST resources for the administration.
-		</description>
-	</rest>
-	<rest key="config" name="Configuration REST" path="/config" version="1.0">
-		<description>
-			Provides REST resources to configure the DecDoc plug-in.
-		</description>
-	</rest>
 
 	<!-- Active Objects -->
 	<ao key="ao-module" name="Active Objects Service">
diff --git a/src/main/resources/js/decdoc.rest.client.js b/src/main/resources/js/decdoc.rest.client.js
index e48bdc9191..4d2f869014 100644
--- a/src/main/resources/js/decdoc.rest.client.js
+++ b/src/main/resources/js/decdoc.rest.client.js
@@ -216,7 +216,7 @@ function getTreeViewer(callback) {
 }
 
 function setActivated(isActivated, projectKey) {
-	postJSON(AJS.contextPath() + "/rest/admin/1.0/config/setActivated.json?projectKey=" + projectKey + "&isActivated=" + isActivated,
+	postJSON(AJS.contextPath() + "/rest/decisions/latest/config/setActivated.json?projectKey=" + projectKey + "&isActivated=" + isActivated,
 		function(error, response) {
 			if (error == null) {
 				showFlag("success", "Plug-in activation for project has been changed.");
@@ -227,7 +227,7 @@ function setActivated(isActivated, projectKey) {
 }
 
 function setIssueStrategy(isIssueStrategy, projectKey) {
-	postJSON(AJS.contextPath() + "/rest/admin/1.0/config/setIssueStrategy.json?projectKey=" + projectKey + "&isIssueStrategy="
+	postJSON(AJS.contextPath() + "/rest/decisions/latest/config/setIssueStrategy.json?projectKey=" + projectKey + "&isIssueStrategy="
 			+ isIssueStrategy, function(error, response) {
 		if (error == null) {
 			showFlag("success", "Strategy has been selected.");