Fixing conflicts issue

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/spi/DeviceManagerService.java

@@ -65,7 +65,7 @@ public interface DeviceManagerService {
      * @return          Status of enrollment
      * @throws DeviceManagementException If some unusual behaviour is observed while enrolling a device
      */
-    boolean isRegistered(DeviceIdentifier deviceId) throws DeviceManagementException;
+    boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException;
 
     /**
      * Method to retrieve the status of a particular device.

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManager.java

@@ -84,10 +84,10 @@ public class DeviceManager implements DeviceManagerService {
     }
 
     @Override
-    public boolean isRegistered(DeviceIdentifier deviceId) throws DeviceManagementException {
+    public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException {
         DeviceManagerService dms =
                 this.getPluginRepository().getDeviceManagementProvider(deviceId.getType());
-        return dms.isRegistered(deviceId);
+        return dms.isEnrolled(deviceId);
     }
 
     @Override

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementService.java

@@ -46,8 +46,8 @@ public class DeviceManagementService implements DeviceManagerService {
     }
 
     @Override
-    public boolean isRegistered(DeviceIdentifier deviceId) throws DeviceManagementException {
-        return DeviceManagementDataHolder.getInstance().getDeviceManager().isRegistered(deviceId);
+    public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException {
+        return DeviceManagementDataHolder.getInstance().getDeviceManager().isEnrolled(deviceId);
     }
 
     @Override

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManagerService.java

@@ -50,7 +50,7 @@ public class AndroidDeviceManagerService implements DeviceManagerService {
 	}
 
 	@Override
-	public boolean isRegistered(DeviceIdentifier deviceId) throws DeviceManagementException {
+	public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException {
 		return true;
 	}
 

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/ios/IOSDeviceManagerService.java

@@ -50,7 +50,7 @@ public class IOSDeviceManagerService implements DeviceManagerService {
     }
 
     @Override
-    public boolean isRegistered(DeviceIdentifier deviceId) throws DeviceManagementException {
+    public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException {
         return true;
     }
 

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManagerService.java

@@ -50,7 +50,7 @@ public class WindowsDeviceManagerService implements DeviceManagerService {
     }
 
     @Override
-    public boolean isRegistered(DeviceIdentifier deviceId) throws DeviceManagementException {
+    public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException {
         return true;
     }
 

product/modules/agents/android/jax-rs/pom.xml

@@ -22,7 +22,7 @@
         <groupId>org.wso2.cdmserver</groupId>
         <artifactId>wso2cdmserver-product</artifactId>
         <version>2.0.0-SNAPSHOT</version>
-        <relativePath>../../../../pom.xml</relativePath>
+        <relativePath>../../../../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -72,7 +72,8 @@
                                 </goals>
                                 <configuration>
                                     <tasks>
-                                        <copy todir="${basedir}/../../../repository/deployment/server/webapps" overwrite="true">
+                                        <copy todir="${basedir}/../../../repository/deployment/server/webapps"
+                                              overwrite="true">
                                             <fileset dir="${basedir}/target">
                                                 <include name="${project.artifactId}.war"/>
                                             </fileset>
@@ -135,11 +136,13 @@
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
             <version>3.1</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
             <version>1.1.1</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
@@ -149,20 +152,24 @@
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.utils</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
             <version>2.0.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
             <version>2.0.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.logging</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
     <properties>

product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Enrollment.java

@@ -36,62 +36,124 @@ import javax.ws.rs.core.Response;
 public class Enrollment {
 
 	private static Log log = LogFactory.getLog(Enrollment.class);
+
 	@POST
 	public Response enrollDevice() {
-		JsonObject result = new JsonObject();
-		result.addProperty("senderId","jwwfowrjwqporqwrpqworpq");
+		boolean result = false;
+		int status = 0;
+		String msg = "";
 		CarbonContext context = CarbonContext.getThreadLocalCarbonContext();
-		DeviceManagementService dmService = (DeviceManagementService) context.getOSGiService(DeviceManagementService.class,null);
-		Device device = AndroidAPIUtil.convertToDeviceObject(result);
+		DeviceManagementService dmService = (DeviceManagementService) context
+				.getOSGiService(DeviceManagementService.class, null);
+		Device device = AndroidAPIUtil.convertToDeviceObject(null);
 		try {
-			dmService.enrollDevice(device);
+			result = dmService.enrollDevice(device);
+			status = 1;
 		} catch (DeviceManagementException e) {
-			String msg = "Error occurred while enrolling the device";
+			msg = "Error occurred while enrolling the device";
 			log.error(msg, e);
+			status = -1;
 		}
+		switch (status) {
+			case 1:
+				if (result) {
 					return Response.status(201).entity("Registration Successful").build();
 				}
+				break;
+			case -1:
+				return Response.status(500).entity(msg).build();
+		}
+		return Response.status(400).entity("Registration Failed").build();
+	}
 
 	@GET
 	@Path("{id}")
 	public Response isEnrolled(@PathParam("id") String id) {
-		boolean status = false;
+		boolean result = false;
+		int status = 0;
+		String msg = "";
 		CarbonContext context = CarbonContext.getThreadLocalCarbonContext();
-		DeviceManagementService dmService = (DeviceManagementService) context.getOSGiService(DeviceManagementService.class,null);
+		DeviceManagementService dmService = (DeviceManagementService) context
+				.getOSGiService(DeviceManagementService.class, null);
 		try {
 			DeviceIdentifier deviceIdentifier = AndroidAPIUtil.convertToDeviceIdentifierObject(id);
-			status = dmService.isRegistered(deviceIdentifier);
+			result = dmService.isEnrolled(deviceIdentifier);
+			status = 1;
 		} catch (DeviceManagementException e) {
-			String msg = "Error occurred while checking enrollment of the device";
+			msg = "Error occurred while checking enrollment of the device";
 			log.error(msg, e);
+			status = -1;
+		}
+		switch (status) {
+			case 1:
+				if (result) {
+					return Response.status(200).entity(result).build();
 				}
-		return Response.status(200).entity(status).build();
+				break;
+			case -1:
+				return Response.status(500).entity(msg).build();
+		}
+		return Response.status(404).entity(result).build();
 	}
 
 	@PUT
 	@Consumes("application/json")
 	@Path("{id}")
 	public Response modifyEnrollment(@PathParam("id") String id) {
+		boolean result = false;
+		int status = 0;
+		String msg = "";
 		CarbonContext context = CarbonContext.getThreadLocalCarbonContext();
-		DeviceManagementService dmService = (DeviceManagementService) context.getOSGiService(DeviceManagementService.class,null);
+		DeviceManagementService dmService = (DeviceManagementService) context
+				.getOSGiService(DeviceManagementService.class, null);
+		Device device = AndroidAPIUtil.convertToDeviceObject(null);
 		try {
-			dmService.isRegistered(null);
+			result = dmService.modifyEnrollment(device);
+			status = 1;
 		} catch (DeviceManagementException e) {
-			e.printStackTrace();
+			msg = "Error occurred while modifying enrollment of the device";
+			log.error(msg, e);
+			status = -1;
 		}
-		return Response.status(201).entity("Registration Successful").build();
+		switch (status) {
+			case 1:
+				if (result) {
+					return Response.status(200).entity("Device information modified").build();
+				}
+				break;
+			case -1:
+				return Response.status(500).entity(msg).build();
+		}
+		return Response.status(400).entity("Update enrollment failed").build();
 	}
 
 	@DELETE
 	@Path("{id}")
 	public Response disenrollDevice(@PathParam("id") String id) {
+		boolean result = false;
+		int status = 0;
+		String msg = "";
 		CarbonContext context = CarbonContext.getThreadLocalCarbonContext();
-		DeviceManagementService dmService = (DeviceManagementService) context.getOSGiService(DeviceManagementService.class,null);
+		DeviceManagementService dmService = (DeviceManagementService) context
+				.getOSGiService(DeviceManagementService.class, null);
 		try {
-			dmService.isRegistered(null);
+			DeviceIdentifier deviceIdentifier = AndroidAPIUtil.convertToDeviceIdentifierObject(id);
+			result = dmService.disenrollDevice(deviceIdentifier);
+			status = 1;
 		} catch (DeviceManagementException e) {
-			e.printStackTrace();
+			msg = "Error occurred while disenrolling the device";
+			log.error(msg, e);
+			status = -1;
 		}
-		return Response.status(201).entity("Registration Successful").build();
+		switch (status) {
+			case 1:
+				if (result) {
+					return Response.status(200).entity(result).build();
+				}
+				break;
+			case -1:
+				return Response.status(500).entity(msg).build();
+		}
+		return Response.status(404).entity("Device not found").build();
 	}
 }