arshana790
/
device-mgt-plugins-fork
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/geethkokila/product-cdm

Browse Source
revert-dabc3590
prabathabey 10 years ago
parent 4c727c6a53 efdaf6e7a5
commit 6082f1eaae
10 changed files with 107 additions and 37 deletions
Show Stats Download Patch File Download Diff File

2
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/spi/DeviceManagerService.java
Unescape View File

@ -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.

4
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManager.java
Unescape View File

@ -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

4
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementService.java
Unescape View File

@ -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

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

@ -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;
}

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

@ -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;
}

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

@ -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;
}

8
product/modules/agents/android/jax-rs/pom.xml
Unescape View File

@ -19,10 +19,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.wso2.carbon</groupId>
<artifactId>wso2cdm-parent</artifactId>
<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>
@ -47,7 +47,7 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.2</version>
<configuration>
<!--<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>-->
<packagingExcludes>WEB-INF/lib/*cxf*.jar</packagingExcludes>
<warName>${project.artifactId}</warName>
</configuration>
</plugin>

113
product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Enrollment.java
Unescape View File

@ -21,10 +21,12 @@ import com.google.gson.JsonObject;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.context.CarbonContext;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.device.mgt.common.Device;
import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
import org.wso2.carbon.device.mgt.common.DeviceManagementException;
import org.wso2.carbon.device.mgt.core.service.DeviceManagementService;
import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
import javax.ws.rs.*;
import javax.ws.rs.core.Response;
@ -36,66 +38,133 @@ 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");
CarbonContext context = CarbonContext.getThreadLocalCarbonContext();
DeviceManagementService dmService = (DeviceManagementService) context.getOSGiService(DeviceManagementService.class,null);
Device device = AndroidAPIUtil.convertToDeviceObject(result);
boolean result = false;
int status = 0;
String msg = "";
DeviceManagementService dmService;
try {
dmService.enrollDevice(device);
PrivilegedCarbonContext.startTenantFlow();
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
dmService = (DeviceManagementService) ctx
.getOSGiService(DeviceManagementService.class, null);
} finally {
PrivilegedCarbonContext.endTenantFlow();
}
Device device = AndroidAPIUtil.convertToDeviceObject(null);
try {
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;
}
return Response.status(200).entity(status).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(result).build();
}
@PUT
@Consumes("application/json")
@Path("{id}")
public Response modifyEnrollment(@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);
Device device = AndroidAPIUtil.convertToDeviceObject(null);
try {
status = dmService.isRegistered(null);
result = dmService.modifyEnrollment(device);
status = 1;
} catch (DeviceManagementException e) {
String msg = "Error occurred while modifying enrollment of the device";
msg = "Error occurred while modifying enrollment of the device";
log.error(msg, e);
status = -1;
}
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(201).entity(status).build();
return Response.status(400).entity("Update enrollment failed").build();
}
@DELETE
@Path("{id}")
public Response disenrollDevice(@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 {
status = dmService.isRegistered(null);
DeviceIdentifier deviceIdentifier = AndroidAPIUtil.convertToDeviceIdentifierObject(id);
result = dmService.disenrollDevice(deviceIdentifier);
status = 1;
} catch (DeviceManagementException e) {
String msg = "Error occurred while disenrolling the device";
msg = "Error occurred while disenrolling the device";
log.error(msg, e);
status = -1;
}
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(201).entity(status).build();
return Response.status(404).entity("Device not found").build();
}
}

4
product/modules/distribution/src/assembly/bin.xml
Unescape View File

@ -323,12 +323,12 @@
<outputDirectory>wso2cdm-${project.version}/repository/conf/multitenancy/</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<!--<file>
<source>src/repository/conf/axis2/axis2.xml</source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/axis2/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
</file>-->
<file>
<source>src/repository/conf/application-authenticators.xml</source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/security/</outputDirectory>

1
product/pom.xml
Unescape View File

@ -34,6 +34,7 @@
<name>WSO2 Connected Device Manager (CDM) - Parent</name>
<modules>
<!--<module>modules/agents/android/jax-rs</module>-->
<module>modules/p2-profile-gen</module>
<module>modules/distribution</module>
<module>modules/integration</module>

Write Preview
Loading…
Cancel
Save