From 583b562d8effd50d6e8928b04d1847abe7a9ae59 Mon Sep 17 00:00:00 2001
From: megala21 <ktumegala@yahoo.com>
Date: Fri, 28 Apr 2017 00:19:48 +0530
Subject: [PATCH] Removing the un-wanted copying of files

---
 modules/distribution/pom.xml                  | 36 -------------------
 modules/distribution/src/assembly/bin.xml     | 28 ---------------
 .../src/core/plugins/plugins-deployer.xml     |  2 +-
 .../NewAndroidDeviceManagementAPI.jmx         | 28 +++++++--------
 pom.xml                                       |  4 +--
 5 files changed, 17 insertions(+), 81 deletions(-)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 6d9ddcce..3f0f6dc2 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -673,36 +673,17 @@
 
 
 								<mkdir dir="${tempdir}" />
-								<mkdir dir="${tempdir}/api-application-registration" />
-								<mkdir dir="${tempdir}/api#certificate-mgt#v1.0" />
 								<mkdir dir="${tempdir}/api#identity#entitlement" />
-								<mkdir dir="${tempdir}/api#scep-mgt#v1.0" />
 								<mkdir dir="${tempdir}/authenticationendpoint" />
 								<mkdir dir="${tempdir}/client-registration#v0.11" />
 								<mkdir dir="${tempdir}/oauth2" />
-								<mkdir dir="${tempdir}/secured-websocket" />
 								<mkdir dir="${tempdir}/shindig" />
 
-								<unzip dest="${tempdir}/api-application-registration">
-									<fileset dir="${srcdir}">
-										<include name="api-application-registration.war" />
-									</fileset>
-								</unzip>
-								<unzip dest="${tempdir}/api#certificate-mgt#v1.0">
-									<fileset dir="${srcdir}">
-										<include name="api#certificate-mgt#v1.0.war" />
-									</fileset>
-								</unzip>
 								<unzip dest="${tempdir}/api#identity#entitlement">
 									<fileset dir="${srcdir}">
 										<include name="api#identity#entitlement.war" />
 									</fileset>
 								</unzip>
-								<unzip dest="${tempdir}/api#scep-mgt#v1.0">
-									<fileset dir="${srcdir}">
-										<include name="api#scep-mgt#v1.0.war" />
-									</fileset>
-								</unzip>
 								<unzip dest="${tempdir}/authenticationendpoint">
 									<fileset dir="${srcdir}">
 										<include name="authenticationendpoint.war" />
@@ -718,25 +699,16 @@
 										<include name="oauth2.war" />
 									</fileset>
 								</unzip>
-								<unzip dest="${tempdir}/secured-websocket">
-									<fileset dir="${srcdir}">
-										<include name="secured-websocket.war" />
-									</fileset>
-								</unzip>
 								<unzip dest="${tempdir}/shindig">
 									<fileset dir="${srcdir}">
 										<include name="shindig.war" />
 									</fileset>
 								</unzip>
 
-								<delete file="${tempdir}/api-application-registration/WEB-INF/web.xml" />
-								<delete file="${tempdir}/api#certificate-mgt#v1.0/WEB-INF/web.xml" />
 								<delete file="${tempdir}/api#identity#entitlement/WEB-INF/web.xml" />
-								<delete file="${tempdir}/api#scep-mgt#v1.0/WEB-INF/web.xml" />
 								<delete file="${tempdir}/authenticationendpoint/WEB-INF/web.xml" />
 								<delete file="${tempdir}/client-registration#v0.11/WEB-INF/web.xml" />
 								<delete file="${tempdir}/oauth2/WEB-INF/web.xml" />
-								<delete file="${tempdir}/secured-websocket/WEB-INF/web.xml" />
 								<delete file="${tempdir}/shindig/WEB-INF/web.xml" />
 
 								<!--<delete>-->
@@ -764,24 +736,16 @@
 									<!--<fileset dir="${tempdir}/shindig/WEB-INF/lib" includes="*" />-->
 								<!--</delete>-->
 
-								<copy file="src/core/resources/web-apps/web-xml/api-application-registration/web.xml" tofile="${tempdir}/api-application-registration/WEB-INF/web.xml" />
-								<copy file="src/core/resources/web-apps/web-xml/api#certificate-mgt#v1.0/web.xml" tofile="${tempdir}/api#certificate-mgt#v1.0/WEB-INF/web.xml" />
 								<copy file="src/core/resources/web-apps/web-xml/api#identity#entitlement/web.xml" tofile="${tempdir}/api#identity#entitlement/WEB-INF/web.xml" />
-								<copy file="src/core/resources/web-apps/web-xml/api#scep-mgt#v1.0/web.xml" tofile="${tempdir}/api#scep-mgt#v1.0/WEB-INF/web.xml" />
 								<copy file="src/core/resources/web-apps/web-xml/authenticationendpoint/web.xml" tofile="${tempdir}/authenticationendpoint/WEB-INF/web.xml" />
 								<copy file="src/core/resources/web-apps/web-xml/client-registration#v0.11/web.xml" tofile="${tempdir}/client-registration#v0.11/WEB-INF/web.xml" />
 								<copy file="src/core/resources/web-apps/web-xml/oauth2/web.xml" tofile="${tempdir}/oauth2/WEB-INF/web.xml" />
-								<copy file="src/core/resources/web-apps/web-xml/secured-websocket/web.xml" tofile="${tempdir}/secured-websocket/WEB-INF/web.xml" />
 								<copy file="src/core/resources/web-apps/web-xml/shindig/web.xml" tofile="${tempdir}/shindig/WEB-INF/web.xml" />
 
-								<zip destfile="${tempdir}/api-application-registration.war" basedir="${tempdir}/api-application-registration" />
-								<zip destfile="${tempdir}/api#certificate-mgt#v1.0.war" basedir="${tempdir}/api#certificate-mgt#v1.0" />
 								<zip destfile="${tempdir}/api#identity#entitlement.war" basedir="${tempdir}/api#identity#entitlement" />
-								<zip destfile="${tempdir}/api#scep-mgt#v1.0.war" basedir="${tempdir}/api#scep-mgt#v1.0" />
 								<zip destfile="${tempdir}/authenticationendpoint.war" basedir="${tempdir}/authenticationendpoint" />
 								<zip destfile="${tempdir}/client-registration#v0.11.war" basedir="${tempdir}/client-registration#v0.11" />
 								<zip destfile="${tempdir}/oauth2.war" basedir="${tempdir}/oauth2" />
-								<zip destfile="${tempdir}/secured-websocket.war" basedir="${tempdir}/secured-websocket" />
 								<zip destfile="${tempdir}/shindig.war" basedir="${tempdir}/shindig" />
 
 								<mkdir dir="${tempdir}/registry"/>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 3cf301e7..e9ab4f3f 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -1485,20 +1485,6 @@
             <fileMode>755</fileMode>
         </file>
 
-        <file>
-            <source>target/webapp-temp/api-application-registration.war</source>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
-            </outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>target/webapp-temp/api#scep-mgt#v1.0.war</source>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
-            </outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
         <file>
             <source>target/webapp-temp/client-registration#v0.11.war</source>
             <outputDirectory>
@@ -1506,20 +1492,6 @@
             </outputDirectory>
             <fileMode>755</fileMode>
         </file>
-        <file>
-            <source>target/webapp-temp/secured-websocket.war</source>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
-            </outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>target/webapp-temp/api#certificate-mgt#v1.0.war</source>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
-            </outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
         <file>
             <source>target/webapp-temp/api#identity#entitlement.war</source>
             <outputDirectory>
diff --git a/modules/distribution/src/core/plugins/plugins-deployer.xml b/modules/distribution/src/core/plugins/plugins-deployer.xml
index e4a8534d..0324d334 100644
--- a/modules/distribution/src/core/plugins/plugins-deployer.xml
+++ b/modules/distribution/src/core/plugins/plugins-deployer.xml
@@ -207,6 +207,6 @@
         </repository>
     </repositories>
     <properties>
-        <carbon.device.mgt.plugin.version>3.0.27</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>3.0.28</carbon.device.mgt.plugin.version>
     </properties>
 </project>
diff --git a/modules/integration/tests-integration/src/test/resources/jmeter-scripts/NewAndroidDeviceManagementAPI.jmx b/modules/integration/tests-integration/src/test/resources/jmeter-scripts/NewAndroidDeviceManagementAPI.jmx
index cb2f0694..46e6d06a 100644
--- a/modules/integration/tests-integration/src/test/resources/jmeter-scripts/NewAndroidDeviceManagementAPI.jmx
+++ b/modules/integration/tests-integration/src/test/resources/jmeter-scripts/NewAndroidDeviceManagementAPI.jmx
@@ -4801,7 +4801,7 @@ vars.put(&quot;base64encodedId&quot;,new String(encryptedId));</stringProp>
           </HeaderManager>
           <hashTree/>
         </hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Certificate Management - GET" enabled="false">
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Certificate Management - GET" enabled="true">
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments">
               <elementProp name="offset" elementType="HTTPArgument">
@@ -4851,7 +4851,7 @@ vars.put(&quot;base64encodedId&quot;,new String(encryptedId));</stringProp>
           </HeaderManager>
           <hashTree/>
         </hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Certificate Management - POST" enabled="false">
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Certificate Management - POST" enabled="true">
           <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
             <collectionProp name="Arguments.arguments">
@@ -4868,12 +4868,12 @@ FDASBgNVBAMTC1dTTzIgUmFkaXVzMB4XDTEzMDYyNzAzMzA0NFoXDTIzMDYyNTAz&#xd;
 MzA0NFowfDELMAkGA1UEBhMCU0wxEDAOBgNVBAgTB0NvbG9tYm8xEDAOBgNVBAcT&#xd;
 B0NvbG9tYm8xEjAQBgNVBAoTCVdTTzIgSW5jLjEfMB0GCSqGSIb3DQEJARYQdGVj&#xd;
 aG9wc0B3c28yLmNvbTEUMBIGA1UEAxMLV1NPMiBSYWRpdXMwggEiMA0GCSqGSIb3&#xd;
-DQEBAQUAA4IBDwAwggEKAoIBAQDNmhw12cF0H2UGE/XtWVt238oGxn19 n/HkM2B&#xd;
-cDNQgnStqI g/K2HBtjmvVPBh17Mt dU2BIathn06amza LI hHgeLUSv30jutv4&#xd;
-L5zD2laAU9A/I0Wtrxu5FlsevRPSiY7buLjTbjP7IMn9vdwb 9nBQCGxVpO6AK2A&#xd;
-gsFJ5udnp7L jNsHmHFt36AYZouihgD /RGVLBAhtPoU6XFB1JoGFM 4qxklJLPh&#xd;
+DQEBAQUAA4IBDwAwggEKAoIBAQDNmhw12cF0H2UGE/XtWVt238oGxn19+n/HkM2B&#xd;
+cDNQgnStqI+g/K2HBtjmvVPBh17Mt+dU2BIathn06amza+LI+hHgeLUSv30jutv4&#xd;
+L5zD2laAU9A/I0Wtrxu5FlsevRPSiY7buLjTbjP7IMn9vdwb+9nBQCGxVpO6AK2A&#xd;
+gsFJ5udnp7L+jNsHmHFt36AYZouihgD+/RGVLBAhtPoU6XFB1JoGFM+4qxklJLPh&#xd;
 k86WollG4cFvHXSbO1P95n6Jb/V3hfM0PvwFZswRPVnW8ngqm889C/JEk5rK4FHy&#xd;
-xk9MgeFRW6zA 3rVnyPdhy6/q4EerBLMfBEWpzFHyHDKMGanAgMBAAGjgeIwgd8w&#xd;
+xk9MgeFRW6zA+3rVnyPdhy6/q4EerBLMfBEWpzFHyHDKMGanAgMBAAGjgeIwgd8w&#xd;
 HQYDVR0OBBYEFKRxtF0CWPwL7jRvA4NSIzploUgrMIGvBgNVHSMEgacwgaSAFKRx&#xd;
 tF0CWPwL7jRvA4NSIzploUgroYGApH4wfDELMAkGA1UEBhMCU0wxEDAOBgNVBAgT&#xd;
 B0NvbG9tYm8xEDAOBgNVBAcTB0NvbG9tYm8xEjAQBgNVBAoTCVdTTzIgSW5jLjEf&#xd;
@@ -4881,10 +4881,10 @@ MB0GCSqGSIb3DQEJARYQdGVjaG9wc0B3c28yLmNvbTEUMBIGA1UEAxMLV1NPMiBS&#xd;
 YWRpdXOCCQD6HErXgvO11DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB&#xd;
 AQCDQV9wy8rfuFp4uByqYhnrQjzBN75VbNcgpdYocOxQPLnjWRM5qdJHELrt4FEl&#xd;
 rDMGd1BpP7QMAEYJUIcpDHPbs9HVCeEV6hdOrLgGxNDB0YVa2Fr5k2U8gsNIgKZo&#xd;
-fKxscx0w5OM71IQbuppAgIHK29DBVBVppO zduIbVtSoBo/gcVIqVGXQXf8TFtoV&#xd;
+fKxscx0w5OM71IQbuppAgIHK29DBVBVppO+zduIbVtSoBo/gcVIqVGXQXf8TFtoV&#xd;
 xyfGUTYdBDP4fT4p8uLASXmdaFyegQOhkjSuchVPGSJOZD6TvOjE6ZvBu9eC7sqh&#xd;
-oTPY56Ld0GscWJmAuj 8vmWGu0md8MnM2DE0SIYE3bo/sPp3yEIbCAnHmcveG8hn&#xd;
-GEL4ZNjZ jnwSkzwBU5vh/QS&quot;,&#xd;
+oTPY56Ld0GscWJmAuj+8vmWGu0md8MnM2DE0SIYE3bo/sPp3yEIbCAnHmcveG8hn&#xd;
+GEL4ZNjZ+jnwSkzwBU5vh/QS&quot;,&#xd;
     &quot;tenantId&quot;: 0&#xd;
   }&#xd;
 ]</stringProp>
@@ -4923,7 +4923,7 @@ GEL4ZNjZ jnwSkzwBU5vh/QS&quot;,&#xd;
           </HeaderManager>
           <hashTree/>
         </hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Certificate Management - GET" enabled="false">
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Certificate Management - GET" enabled="true">
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments">
               <elementProp name="offset" elementType="HTTPArgument">
@@ -4973,7 +4973,7 @@ GEL4ZNjZ jnwSkzwBU5vh/QS&quot;,&#xd;
           </HeaderManager>
           <hashTree/>
         </hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Certificate Management - GET with serial" enabled="false">
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Certificate Management - GET with serial" enabled="true">
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -5008,7 +5008,7 @@ GEL4ZNjZ jnwSkzwBU5vh/QS&quot;,&#xd;
           </HeaderManager>
           <hashTree/>
         </hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Certificate Management - DELETE" enabled="false">
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Certificate Management - DELETE" enabled="true">
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
@@ -5043,7 +5043,7 @@ GEL4ZNjZ jnwSkzwBU5vh/QS&quot;,&#xd;
           </HeaderManager>
           <hashTree/>
         </hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Certificate Management - GET all" enabled="false">
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Certificate Management - GET all" enabled="true">
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
diff --git a/pom.xml b/pom.xml
index cf274a08..bf587ab0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1513,7 +1513,7 @@
 
         <!-- Carbon Device Management -->
 
-        <carbon.device.mgt.version>2.0.52</carbon.device.mgt.version>
+        <carbon.device.mgt.version>2.0.53</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
@@ -1521,7 +1521,7 @@
 
         <!-- Carbon Device Management Plugins-->
 
-        <carbon.device.mgt.plugin.version>3.0.27</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>3.0.28</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.80</carbon.api.mgt.version>