From b02bb795612689ca1ee9a304bf9d0ae4b9fd00d7 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Mon, 12 Jun 2017 11:40:24 +0530
Subject: [PATCH] removed unused files

---
 .../pom.xml                                   |  7 ---
 .../src/main/resources/p2.inf                 |  3 +-
 .../main/resources/websocket-validation.xml   | 50 -------------------
 pom.xml                                       |  2 +-
 4 files changed, 2 insertions(+), 60 deletions(-)
 delete mode 100644 features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/src/main/resources/websocket-validation.xml

diff --git a/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml b/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml
index 0ba2b296d..25cdd0681 100644
--- a/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml
+++ b/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml
@@ -52,10 +52,6 @@
             <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
             <artifactId>org.wso2.carbon.device.mgt.input.adapter.extension</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.input.adapter.http</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
             <artifactId>org.wso2.carbon.device.mgt.input.adapter.mqtt</artifactId>
@@ -176,9 +172,6 @@
                                 <bundleDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.input.adapter.extension:${carbon.devicemgt.plugins.version}
                                 </bundleDef>
-                                <bundleDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.input.adapter.http:${carbon.devicemgt.plugins.version}
-                                </bundleDef>
                                 <bundleDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.input.adapter.mqtt:${carbon.devicemgt.plugins.version}
                                 </bundleDef>
diff --git a/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/src/main/resources/p2.inf b/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/src/main/resources/p2.inf
index f9b3d0c5b..e47305ada 100644
--- a/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/src/main/resources/p2.inf
+++ b/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/src/main/resources/p2.inf
@@ -1,4 +1,3 @@
 instructions.configure = \
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.adapter_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.adapter_${feature.version}/websocket-validation.xml,target:${installFolder}/../../conf/etc/websocket-validation.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.adapter_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
\ No newline at end of file
diff --git a/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/src/main/resources/websocket-validation.xml b/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/src/main/resources/websocket-validation.xml
deleted file mode 100644
index b8c789dc7..000000000
--- a/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/src/main/resources/websocket-validation.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ you may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<!--
-        This configuration file represents the configuration that are needed
-        for websocket connection validation
--->
-<WebsocketValidationConfigs>
-
-	<!--Authenticator is holds the information of authticator that is used for websocket-->
-	<Authenticator class="org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.OAuthAuthenticator">
-		<Properties>
-			<Property name="tokenValidationEndpoint">https://localhost:9443/services/OAuth2TokenValidationService</Property>
-			<Property name="username">admin</Property>
-			<Property name="password">admin</Property>
-			<Property name="maximumHttpConnectionPerHost">2</Property>
-			<Property name="maximumTotalHttpConnection">100</Property>
-		</Properties>
-	</Authenticator>
-
-	<!--Authorizer holds the information of the authorizer that is used authorize a connection.-->
-	<Authorizer class="org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.DeviceAuthorizer">
-		<Properties>
-			<!--websocket connection permissions which are validated for grouping (can have multiple permission.)-->
-			<Property name="statsPermission">/permission/device-mgt/user/groups/device_monitor</Property>
-			<Property name="username">admin</Property>
-			<Property name="password">admin</Property>
-			<Property name="tokenEndpoint">https://localhost:9443/oauth2</Property>
-			<!--offset time from expiry time to trigger refresh call (in seconds)-->
-			<Property name="tokenRefreshTimeOffset">100</Property>
-			<Property name="deviceMgtServerUrl">https://localhost:9443</Property>
-		</Properties>
-	</Authorizer>
-</WebsocketValidationConfigs>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 29f8d7a61..6f8ce060e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1157,7 +1157,7 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Device Management -->
-        <carbon.devicemgt.version>2.0.72-SNAPSHOT</carbon.devicemgt.version>
+        <carbon.devicemgt.version>2.0.74-SNAPSHOT</carbon.devicemgt.version>
 
         <carbon.devicemgt.version.range>[2.0.0, 3.0.0)</carbon.devicemgt.version.range>