community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove xml data adaptor

Browse Source
This commit is contained in:
manoj 2015-02-13 15:01:42 +05:30
parent 1736d5db3e
commit 4d87e3f605
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/license/License.java
View File

@ -20,12 +20,8 @@
package org.wso2.carbon.device.mgt.core.config.license; package org.wso2.carbon.device.mgt.core.config.license;
import org.wso2.carbon.device.mgt.core.util.DateAdapter;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.util.Date;
@XmlRootElement(name = "License") @XmlRootElement(name = "License")
public class License { public class License {
@ -34,8 +30,9 @@ public class License {
private String name; private String name;
private String version; private String version;
private String language; private String language;
private Date validFrom;
private Date validTo; private String validFrom;
private String validTo;
private String license; private String license;
@XmlElement(name = "provider") @XmlElement(name = "provider")
@ -74,24 +71,6 @@ public class License {
this.language = language; this.language = language;
} }
@XmlJavaTypeAdapter(DateAdapter.class)
public Date getValidFrom() {
return validFrom;
}
public void setValidFrom(Date validFrom) {
this.validFrom = validFrom;
}
@XmlJavaTypeAdapter(DateAdapter.class)
public Date getValidTo() {
return validTo;
}
public void setValidTo(Date validTo) {
this.validTo = validTo;
}
@XmlElement(name = "license") @XmlElement(name = "license")
public String getLicense() { public String getLicense() {
return license; return license;
@ -101,4 +80,21 @@ public class License {
this.license = license; this.license = license;
} }
@XmlElement(name = "validFrom")
public String getValidFrom() {
return validFrom;
}
public void setValidFrom(String validFrom) {
this.validFrom = validFrom;
}
@XmlElement(name = "validTo")
public String getValidTo() {
return validTo;
}
public void setValidTo(String validTo) {
this.validTo = validTo;
}
} }

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

@ -124,9 +124,9 @@ public class LicenseManagementServiceComponent {
artifact.setAttribute(DeviceManagementConstants.LicenseProperties.OVERVIEW_PROVIDER, artifact.setAttribute(DeviceManagementConstants.LicenseProperties.OVERVIEW_PROVIDER,
license.getProvider()); license.getProvider());
artifact.setAttribute(DeviceManagementConstants.LicenseProperties.VALID_TO, artifact.setAttribute(DeviceManagementConstants.LicenseProperties.VALID_TO,
license.getValidTo().toString()); license.getValidTo());
artifact.setAttribute(DeviceManagementConstants.LicenseProperties.VALID_FROM, artifact.setAttribute(DeviceManagementConstants.LicenseProperties.VALID_FROM,
license.getValidFrom().toString()); license.getValidFrom());
artifact.setAttribute(DeviceManagementConstants.LicenseProperties.LICENSE,license.getLicense()); artifact.setAttribute(DeviceManagementConstants.LicenseProperties.LICENSE,license.getLicense());
artifactManager.addGenericArtifact(artifact); artifactManager.addGenericArtifact(artifact);
} }