From 701228810bd06ee47a7a0ca934957b19ea21cd2a Mon Sep 17 00:00:00 2001
From: prabathabey <prabathabey@git.com>
Date: Thu, 23 Jul 2015 14:35:25 +0530
Subject: [PATCH] Removing user-api-publisher-config.xml and making JAX-RS
 services get auto-published as APIs depending on parameters configured in
 web.xml of each corresponding web applications

---
 .../conf/user-api-publisher-config.xml        | 46 -------------------
 .../src/main/resources/p2.inf                 |  1 -
 2 files changed, 47 deletions(-)
 delete mode 100644 features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml

diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml
deleted file mode 100644
index 6307629e04..0000000000
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ Copyright (c) 2015, 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.
--->
-<APIPublisherConfig>
-    <APIs>
-        <API>
-            <Name>AppManagerController</Name>
-            <Owner>admin</Owner>
-            <Context>appmanager</Context>
-            <Version>1.0.0</Version>
-            <Endpoint>http://localhost:9763/appmanager</Endpoint>
-            <Transports>http,https</Transports>
-        </API>
-        <API>
-            <Name>AndroidAgent</Name>
-            <Owner>admin</Owner>
-            <Context>mdm-android-agent</Context>
-            <Version>1.0.0</Version>
-            <Endpoint>http://localhost:9763/mdm-android-agent</Endpoint>
-            <Transports>http,https</Transports>
-        </API>
-        <API>
-            <Name>MDMAdmin</Name>
-            <Owner>admin</Owner>
-            <Context>mdm-admin</Context>
-            <Version>1.0.0</Version>
-            <Endpoint>http://localhost:9763/mdm-admin</Endpoint>
-            <Transports>http,https</Transports>
-        </API>
-    </APIs>
-</APIPublisherConfig>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf
index 465b3b8ea7..8da383c571 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf
@@ -2,7 +2,6 @@ instructions.configure = \
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/cdm-config.xml,target:${installFolder}/../../conf/cdm-config.xml,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/notification-messages.xml,target:${installFolder}/../../conf/notification-messages.xml,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/license-config.xml,target:${installFolder}/../../conf/etc/license-config.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/user-api-publisher-config.xml,target:${installFolder}/../../conf/etc/user-api-publisher-config.xml,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/app-management-config.xml,target:${installFolder}/../../conf/etc/app-management-config.xml,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/dbscripts/cdm,target:${installFolder}/../../../dbscripts/cdm,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/rxts/license.rxt,target:${installFolder}/../../../repository/resources/rxts/license.rxt,overwrite:true);\
\ No newline at end of file