resolved app connector build slowness issue

components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/pom.xml

@@ -27,28 +27,6 @@
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - App Manager WSO2 MDM REST Connector Component</name>
     <url>http://maven.apache.org</url>
-    <repositories>
-        <repository>
-            <id>wso2-maven2-repository</id>
-            <name>WSO2 Maven2 Repository</name>
-            <url>http://dist.wso2.org/maven2/</url>
-        </repository>
-        <repository>
-            <id>wso2-maven2-snapshot-repository</id>
-            <name>WSO2 Maven2 Snapshot Repository</name>
-            <url>http://dist.wso2.org/snapshots/maven2/</url>
-        </repository>
-        <repository>
-            <id>wso2-nexus</id>
-            <name>WSO2 internal Repository</name>
-            <url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </releases>
-        </repository>
-    </repositories>
 
     <build>
         <plugins>
@@ -74,6 +52,8 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Private-Package>org.wso2.carbon.appmgt.mdm.restconnector.internal</Private-Package>
                         <Import-Package>
+							org.osgi.framework,
+							org.osgi.service.component,
                             org.wso2.carbon.appmgt.mobile.utils.*,
                             org.wso2.carbon.appmgt.mobile.mdm.*,
                             org.wso2.carbon.appmgt.mobile.interfaces.*,
@@ -85,7 +65,9 @@
                             feign.auth,
                             feign.codec,
                             feign.gson,
-                            *;resolution:=optional
+							org.json.simple.*,
+							org.wso2.carbon.appmgt.mobile.beans,
+							org.wso2.carbon.context
                         </Import-Package>
                         <Export-Package>
                             !org.wso2.carbon.appmgt.mdm.restconnector.internal,
@@ -93,8 +75,7 @@
                         </Export-Package>
                         <Embed-Dependency>
                             jsr311-api,
-                            feign-jaxrs,
+                            feign-jaxrs
-                            org.wso2.carbon.device.mgt.common
                         </Embed-Dependency>
                     </instructions>
                 </configuration>
@@ -103,38 +84,14 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>commons-io.wso2</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.googlecode.json-simple.wso2</groupId>
             <artifactId>json-simple</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.googlecode.plist</groupId>
-            <artifactId>dd-plist</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.logging</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.governance</groupId>
-            <artifactId>org.wso2.carbon.governance.api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.appmgt</groupId>
-            <artifactId>org.wso2.carbon.appmgt.mobile</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
@@ -159,21 +116,10 @@
             <groupId>io.swagger</groupId>
             <artifactId>swagger-jaxrs</artifactId>
         </dependency>
-        <dependency>
+		<dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
+			<groupId>org.wso2.carbon.appmgt</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
+			<artifactId>org.wso2.carbon.appmgt.mobile</artifactId>
-            <exclusions>
+		</dependency>
-                <exclusion>
-                    <groupId>org.apache.ws.commons.axiom</groupId>
-                    <artifactId>axiom-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.ws.commons.axiom</groupId>
-                    <artifactId>axiom-impl</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
     </dependencies>
 
 </project>

components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/src/main/java/org/wso2/carbon/appmgt/mdm/restconnector/ApplicationOperationsImpl.java

@@ -27,6 +27,7 @@ import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 import org.wso2.carbon.appmgt.mdm.restconnector.authorization.client.OAuthRequestInterceptor;
+import org.wso2.carbon.appmgt.mdm.restconnector.authorization.client.dto.Activity;
 import org.wso2.carbon.appmgt.mdm.restconnector.authorization.client.dto.ApplicationManagementAdminService;
 import org.wso2.carbon.appmgt.mdm.restconnector.authorization.client.dto.ApplicationWrapper;
 import org.wso2.carbon.appmgt.mdm.restconnector.authorization.client.dto.DeviceManagementAdminService;
@@ -42,7 +43,6 @@ import org.wso2.carbon.appmgt.mobile.mdm.Device;
 import org.wso2.carbon.appmgt.mobile.utils.MobileApplicationException;
 import org.wso2.carbon.appmgt.mobile.utils.MobileConfigurations;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
 
 import java.util.ArrayList;
 import java.util.HashMap;

components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/src/main/java/org/wso2/carbon/appmgt/mdm/restconnector/authorization/client/dto/Activity.java

@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+package org.wso2.carbon.appmgt.mdm.restconnector.authorization.client.dto;
+
+
+public class Activity {
+
+    public enum Type {
+        CONFIG, MESSAGE, INFO, COMMAND, PROFILE, POLICY
+    }
+    private String activityId;
+    private String code;
+    private Type type;
+    private String createdTimeStamp;
+
+    public String getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(String activityId) {
+        this.activityId = activityId;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    public void setType(Type type) {
+        this.type = type;
+    }
+
+    public String getCreatedTimeStamp() {
+        return createdTimeStamp;
+    }
+
+    public void setCreatedTimeStamp(String createdTimeStamp) {
+        this.createdTimeStamp = createdTimeStamp;
+    }
+}
+

components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/src/main/java/org/wso2/carbon/appmgt/mdm/restconnector/authorization/client/dto/ApplicationManagementAdminService.java

@@ -17,7 +17,6 @@
  */
 package org.wso2.carbon.appmgt.mdm.restconnector.authorization.client.dto;
 
-import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;

components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/src/main/java/org/wso2/carbon/appmgt/mdm/restconnector/authorization/client/dto/BasePaginatedResult.java

@@ -1,39 +0,0 @@
-/*
- *   Copyright (c) 2017, 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.
- *
- */
-package org.wso2.carbon.appmgt.mdm.restconnector.authorization.client.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * Number of Resources.
- */
-public class BasePaginatedResult {
-    @ApiModelProperty(value = "Number of total resources.", example = "2")
-    @JsonProperty("count")
-    private int count;
-
-    public int getCount() {
-        return count;
-    }
-
-    public void setCount(int count) {
-        this.count = count;
-    }
-}

components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/src/main/java/org/wso2/carbon/appmgt/mdm/restconnector/authorization/client/dto/Device.java

@@ -17,10 +17,7 @@
  */
 package org.wso2.carbon.appmgt.mdm.restconnector.authorization.client.dto;
 
-import org.wso2.carbon.device.mgt.common.Feature;
-
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * The DTO class of device.
@@ -37,15 +34,6 @@ public class Device implements Serializable {
     public Device() {
     }
 
-    public Device(String name, String type, String description, String deviceId, EnrolmentInfo enrolmentInfo,
-                  List<Feature> features, List<Property> properties) {
-        this.name = name;
-        this.type = type;
-        this.description = description;
-        this.deviceIdentifier = deviceId;
-        this.enrolmentInfo = enrolmentInfo;
-    }
-
     public int getId() {
         return id;
     }
@@ -130,22 +118,4 @@ public class Device implements Serializable {
                 "]" +
                 "]";
     }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof org.wso2.carbon.device.mgt.common.Device))
-            return false;
-
-        org.wso2.carbon.device.mgt.common.Device device = (org.wso2.carbon.device.mgt.common.Device) o;
-
-        return getDeviceIdentifier().equals(device.getDeviceIdentifier());
-
-    }
-
-    @Override
-    public int hashCode() {
-        return getDeviceIdentifier().hashCode();
-    }
 }

components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/src/main/java/org/wso2/carbon/appmgt/mdm/restconnector/authorization/client/dto/DeviceList.java

@@ -17,17 +17,21 @@
  */
 package org.wso2.carbon.appmgt.mdm.restconnector.authorization.client.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
-
 import java.util.ArrayList;
 import java.util.List;
 
-public class DeviceList extends BasePaginatedResult {
+public class DeviceList {
     private List<Device> devices = new ArrayList<>();
+    private int count;
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
 
-    @ApiModelProperty(value = "List of devices returned")
-    @JsonProperty("devices")
     public List<Device> getList() {
         return devices;
     }

pom.xml

@@ -528,6 +528,16 @@
                 <groupId>org.wso2.carbon.appmgt</groupId>
                 <artifactId>org.wso2.carbon.appmgt.mobile</artifactId>
                 <version>${carbon.appmgt.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.apache.ws.commons.axiom</groupId>
+						<artifactId>axiom-api</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.apache.ws.commons.axiom</groupId>
+						<artifactId>axiom-impl</artifactId>
+					</exclusion>
+				</exclusions>
             </dependency>
 
             <!--Osgi dependencies-->