From 329f956f3d612d07feb8429de91bdfbc3704fb02 Mon Sep 17 00:00:00 2001
From: manoj <manojg@wwso2.com>
Date: Fri, 23 Jan 2015 18:19:21 +0530
Subject: [PATCH] License Management

---
 .../src/repository/resources/rxts/license.rxt     | 15 ++++++++++++---
 .../cdmserver/mobileservices/android/Device.java  |  4 +---
 .../impl/CertificateEnrollmentServiceImpl.java    | 15 +++++++++------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/product/modules/distribution/src/repository/resources/rxts/license.rxt b/product/modules/distribution/src/repository/resources/rxts/license.rxt
index 72f5c2618a..2fc84c6db9 100644
--- a/product/modules/distribution/src/repository/resources/rxts/license.rxt
+++ b/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>
diff --git a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Device.java b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Device.java
index 0a9e01ffce..20af913fff 100644
--- a/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Device.java
+++ b/product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Device.java
@@ -131,10 +131,9 @@ public class Device {
     }
 
     @GET
-    @Path("/device/license")
+    @Path("/license")
     @Produces("text/plain")
     public String getLicense() {
-        //TODO: need to implement fetch license from core
         License license = null;
         try {
             try {
@@ -147,7 +146,6 @@ public class Device {
         }catch(DeviceManagementServiceException deviceMgtEx){
             deviceMgtEx.printStackTrace();
         }
-
         return license.getLicenseText();
     }
 }
diff --git a/product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/wstep/impl/CertificateEnrollmentServiceImpl.java b/product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/wstep/impl/CertificateEnrollmentServiceImpl.java
index 32f8c35dcb..ca41e7394d 100644
--- a/product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/wstep/impl/CertificateEnrollmentServiceImpl.java
+++ b/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())));
+*/