Merge branch 'master' of github.com:wso2/product-mdm

product/modules/distribution/src/repository/resources/rxts/license.rxt

@@ -1,16 +1,19 @@
 <?xml version="1.0"?>
 <artifactType type="application/vnd.wso2-license+xml" shortName="license" singularLabel="License" pluralLabel="Licenses"
               hasNamespace="false" iconSet="10">
-    <storagePath>/license/@{overview_provider}/@{overview_name}/@{overview_version}</storagePath>
+    <storagePath>/license/@{overview_provider}/@{overview_name}/@{overview_language}/@{overview_version}</storagePath>
     <nameAttribute>overview_name</nameAttribute>
     <ui>
         <list>
-            <column name="Provider">
+            <column name="Device Type">
                 <data type="path" value="overview_provider" href="@{storagePath}"/>
             </column>
             <column name="Name">
                 <data type="path" value="overview_name" href="@{storagePath}"/>
             </column>
+            <column name="Language">
+                <data type="path" value="overview_language" href="@{storagePath}"/>
+            </column>
             <column name="Version">
                 <data type="path" value="overview_version" href="@{storagePath}"/>
             </column>
@@ -24,11 +27,17 @@
             <field type="text" required="true">
                 <name>Name</name>
             </field>
+            <field type="text" required="true">
+                <name>Language</name>
+            </field>
             <field type="text" required="true">
                 <name>Version</name>
             </field>
             <field type="text">
-                <name>Createdtime</name>
+                <name>Validity From</name>
+            </field>
+            <field type="text">
+                <name>Validity To</name>
             </field>
             <field type="text-area">
                 <name>License</name>

product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Device.java

@@ -17,15 +17,13 @@
  */
 package org.wso2.cdmserver.mobileservices.android;
 
+import org.wso2.carbon.device.mgt.common.*;
 import org.wso2.cdmserver.mobileservices.android.common.AndroidAgentException;
 import org.wso2.cdmserver.mobileservices.android.util.AndroidAPIUtils;
 import org.wso2.cdmserver.mobileservices.android.util.Message;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.DeviceManagementServiceException;
+
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import java.util.List;
@@ -132,11 +130,22 @@ public class Device {
         }
     }
 
-    @POST
-    @Path("/device/license")
+    @GET
+    @Path("/license")
     @Produces("text/plain")
     public String getLicense() {
-        //TODO: need to implement fetch license from core
-        return "License Agreement";
+        License license = null;
+        try {
+            try {
+                license = AndroidAPIUtils.getLicenseManagerService().getLicense(DeviceManagementConstants
+                        .MobileDeviceTypes
+                        .MOBILE_DEVICE_TYPE_ANDROID, DeviceManagementConstants.LanguageCodes.LANGUAGE_CODE_ENGLISH_US);
+            } catch (LicenseManagementException e) {
+                e.printStackTrace();
+            }
+        }catch(DeviceManagementServiceException deviceMgtEx){
+            deviceMgtEx.printStackTrace();
+        }
+        return license.getLicenseText();
     }
 }

product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Operation.java

@@ -79,6 +79,8 @@ public class Operation {
 		Message responseMsg = new Message();
 		try {
 			dmService = AndroidAPIUtils.getDeviceManagementService();
+
+            //TODO: need to complete getOperation logic
 			boolean result = dmService.getOperationManager("").addOperation(null, null);
 			if (result) {
 				Response.status(HttpStatus.SC_OK);

product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidAPIUtils.java

@@ -20,6 +20,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.*;
+import org.wso2.carbon.device.mgt.core.service.LicenseManagementService;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementService;
 import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
 
@@ -56,4 +57,24 @@ public class AndroidAPIUtils {
         PrivilegedCarbonContext.endTenantFlow();
 		return dmService;
 	}
+
+    public static LicenseManagementService getLicenseManagerService() throws DeviceManagementServiceException{
+
+        //TODO: complete login change super tenent context
+        LicenseManagementService licenseManagementService;
+        PrivilegedCarbonContext.startTenantFlow();
+        PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+        ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
+        ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
+        licenseManagementService = (LicenseManagementService) ctx.getOSGiService(LicenseManagementService.class, null);
+
+        if (licenseManagementService == null){
+            String msg = "License management service not initialized";
+            log.error(msg);
+            throw new DeviceManagementServiceException(msg);
+        }
+        PrivilegedCarbonContext.endTenantFlow();
+        return licenseManagementService;
+    }
+
 }

product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/wstep/impl/CertificateEnrollmentServiceImpl.java

@@ -69,7 +69,8 @@ public class CertificateEnrollmentServiceImpl implements CertificateEnrollmentSe
 	String wapProvisioningXmlFile;
 	DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
 
-	@Override public void RequestSecurityToken(String TokenType, String RequestType,
+	//@Override
+    public void RequestSecurityToken(String TokenType, String RequestType,
 	                                           String BinarySecurityToken,
 	                                           AdditionalContext AdditionalContext,
 	                                           Holder<RequestSecurityTokenResponse> response) {
@@ -109,18 +110,20 @@ public class CertificateEnrollmentServiceImpl implements CertificateEnrollmentSe
 
 			NodeList wapParm = dDoc.getElementsByTagName("parm");
 			/////////
-			wapParm.item(0).getParentNode().getAttributes().getNamedItem("type").setTextContent(String.valueOf(
+		/*	wapParm.item(0).getParentNode().getAttributes().getNamedItem("type").setTextContent(String.valueOf(
 					DigestUtils.sha1Hex(rooCACertificate.getEncoded())));
-			/////////
+		*/	/////////
 			NamedNodeMap rootCertAttributes = wapParm.item(0).getAttributes();
 			Node b64Encoded = rootCertAttributes.getNamedItem("value");
 			rootCertEncodedString=rootCertEncodedString.replaceAll("\n","");
 			b64Encoded.setTextContent(rootCertEncodedString);
 			System.out.println("COPY_ROOT_CERT:"+rootCertEncodedString);
 
-			/////////
-			wapParm.item(1).getParentNode().getAttributes().getNamedItem("type").setTextContent(String.valueOf(DigestUtils.sha1Hex(signedCert.getEncoded())));
-			/////////
+            /////////
+            /////////
+/*
+            wapParm.item(1).getParentNode().getAttributes().getNamedItem("type").setTextContent(String.valueOf(DigestUtils.sha1Hex(signedCert.getEncoded())));
+*/