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

configure to enroll win10 on csr sigining step

Browse Source
revert-dabc3590
Hasunie 8 years ago
parent b9b5edc342
commit 9571d782c8
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File

10
components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/enrollment/impl/EnrollmentServiceImpl.java
Unescape View File

@ -91,7 +91,7 @@ public class EnrollmentServiceImpl implements EnrollmentService {
String nodeName = headerElement.getName().getLocalPart(); String nodeName = headerElement.getName().getLocalPart();
if (PluginConstants.SECURITY.equals(nodeName)) { if (PluginConstants.SECURITY.equals(nodeName)) {
Element element = (Element) headerElement.getObject(); Element element = (Element) headerElement.getObject();
headerBinarySecurityToken = element.getFirstChild().getNextSibling().getFirstChild().getTextContent(); headerBinarySecurityToken = element.getFirstChild().getFirstChild().getTextContent();
} }
if (PluginConstants.TO.equals(nodeName)) { if (PluginConstants.TO.equals(nodeName)) {
Element toElement = (Element) headerElement.getObject(); Element toElement = (Element) headerElement.getObject();
@ -130,7 +130,7 @@ public class EnrollmentServiceImpl implements EnrollmentService {
String[] splitDomain = email.split("(EnterpriseEnrollment.)"); String[] splitDomain = email.split("(EnterpriseEnrollment.)");
domain = splitDomain[PluginConstants.CertificateEnrolment.DOMAIN_SEGMENT]; domain = splitDomain[PluginConstants.CertificateEnrolment.DOMAIN_SEGMENT];
provisioningURL = PluginConstants.CertificateEnrolment.ENROLL_SUBDOMAIN + domain + provisioningURL = PluginConstants.CertificateEnrolment.ENROLL_SUBDOMAIN + domain +
PluginConstants.CertificateEnrolment.SYNCML_PROVISIONING_SERVICE_URL; PluginConstants.CertificateEnrolment.SYNCML_PROVISIONING_WIN10_SERVICE_URL;
List<ConfigurationEntry> tenantConfigurations; List<ConfigurationEntry> tenantConfigurations;
try { try {
@ -356,10 +356,6 @@ public class EnrollmentServiceImpl implements EnrollmentService {
org.wso2.carbon.device.mgt.common.Device generatedDevice = new org.wso2.carbon.device.mgt.common.Device(); org.wso2.carbon.device.mgt.common.Device generatedDevice = new org.wso2.carbon.device.mgt.common.Device();
org.wso2.carbon.device.mgt.common.Device.Property DeviceNameProperty = new org.wso2.carbon.device.mgt.common.Device.Property();
DeviceNameProperty.setName(PluginConstants.SyncML.DEVICE_NAME);
DeviceNameProperty.setValue(windowsDevice.getDeviceName());
org.wso2.carbon.device.mgt.common.Device.Property OSVersionProperty = new org.wso2.carbon.device.mgt.common.Device.Property(); org.wso2.carbon.device.mgt.common.Device.Property OSVersionProperty = new org.wso2.carbon.device.mgt.common.Device.Property();
OSVersionProperty.setName(PluginConstants.SyncML.OS_VERSION); OSVersionProperty.setName(PluginConstants.SyncML.OS_VERSION);
OSVersionProperty.setValue(windowsDevice.getOsVersion()); OSVersionProperty.setValue(windowsDevice.getOsVersion());
@ -376,7 +372,6 @@ public class EnrollmentServiceImpl implements EnrollmentService {
propertyList.add(OSVersionProperty); propertyList.add(OSVersionProperty);
propertyList.add(IMSEIProperty); propertyList.add(IMSEIProperty);
propertyList.add(IMEIProperty); propertyList.add(IMEIProperty);
propertyList.add(DeviceNameProperty);
EnrolmentInfo enrolmentInfo = new EnrolmentInfo(); EnrolmentInfo enrolmentInfo = new EnrolmentInfo();
enrolmentInfo.setOwner(windowsDevice.getUser()); enrolmentInfo.setOwner(windowsDevice.getUser());
@ -387,6 +382,7 @@ public class EnrollmentServiceImpl implements EnrollmentService {
generatedDevice.setDeviceIdentifier(windowsDevice.getDeviceId()); generatedDevice.setDeviceIdentifier(windowsDevice.getDeviceId());
generatedDevice.setProperties(propertyList); generatedDevice.setProperties(propertyList);
generatedDevice.setType(windowsDevice.getDeviceType()); generatedDevice.setType(windowsDevice.getDeviceType());
generatedDevice.setName(windowsDevice.getDeviceName());
return generatedDevice; return generatedDevice;
} }

Write Preview
Loading…
Cancel
Save