From 0f5cf86d04da6b0ed34a89eafcc9a2797efcd7a6 Mon Sep 17 00:00:00 2001
From: prabathabey <prabathabey@git.com>
Date: Thu, 26 May 2016 18:00:45 +0530
Subject: [PATCH] Adding the base path to be included in the swagger docs and
 appending the proper version to the webapp name

---
 components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml | 2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml                  | 2 +-
 .../src/main/webapp/WEB-INF/web.xml                          | 5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
index b058109588..dcb22d993a 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
@@ -46,7 +46,7 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
                     <packagingExcludes>WEB-INF/lib/*cxf*.jar</packagingExcludes>
-                    <warName>api#device-mgt#v2.1</warName>
+                    <warName>api#device-mgt#v1.1</warName>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
index 1cabcadff0..d78576f689 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -55,7 +55,7 @@
         <property name="resourcePackage" value="org.wso2.carbon.device.mgt.jaxrs"/>
         <property name="version" value="1.0.0"/>
         <property name="host" value="localhost:9443"/>
-        <property name="basePath" value="/"/>
+        <property name="basePath" value="/api/device-mgt/admin/v1.1"/>
         <property name="title" value="Device Management Admin Service API Definitions"/>
         <property name="contact" value="dev@wso2.org"/>
         <property name="license" value="Apache 2.0"/>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/web.xml b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/web.xml
index 406c03fac7..5c476494d9 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/web.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/web.xml
@@ -25,11 +25,6 @@
         <servlet-class>
             org.apache.cxf.transport.servlet.CXFServlet
         </servlet-class>
-        <!--<init-param>-->
-            <!--<param-name>swagger.api.basepath</param-name>-->
-            <!--<param-value>http://localhost:9763/test</param-value>-->
-        <!--</init-param>-->
-
         <!-- configure a security filter -->
         <init-param>
             <param-name>swagger.security.filter</param-name>