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

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java

@@ -59,21 +59,11 @@ public final class DeviceManagementConstants {
         public final static String LANGUAGE_CODE_ENGLISH_UK = "en-uk";
     }
 
-    public static final class DefaultLicences {
-
-        private DefaultLicences() {
-            throw new AssertionError();
-        }
-
-        public static final String DEFAULT_LICENSE_CONFIG_XML_NAME = "DefaultLicense.xml";
-    }
-
     public static final class LicenseProperties {
 
         private LicenseProperties() {
             throw new AssertionError();
         }
-
         public static final String OVERVIEW_PROVIDER = "overview_provider";
         public static final String OVERVIEW_NAME = "overview_name";
         public static final String OVERVIEW_LANGUAGE = "overview_language";

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/LicenseManagerImpl.java

@@ -68,7 +68,8 @@ public class LicenseManagerImpl implements LicenseManager {
 
         try {
             GovernanceUtils.loadGovernanceArtifacts((UserRegistry) registry);
-            GenericArtifactManager artifactManager = new GenericArtifactManager(registry, "license");
+            GenericArtifactManager artifactManager = new GenericArtifactManager(registry,
+                    DeviceManagementConstants.LicenseProperties.LICENSE_REGISTRY_KEY);
 
             filteredArtifacts = artifactManager.findGenericArtifacts(
                     new GenericArtifactFilter() {

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

@@ -68,7 +68,7 @@ public class LicenseManagementServiceComponent {
             LicenseManager licenseManager = new LicenseManagerImpl();
             LicenseManagementDataHolder.getInstance().setLicenseManager(licenseManager);
 
-                        /* If -Dsetup option enabled then create creates default license management */
+            /* If -Dsetup option enabled then create creates default license management */
             String setupOption = System.getProperty(
                     org.wso2.carbon.device.mgt.core.DeviceManagementConstants.Common.PROPERTY_SETUP);
 
@@ -81,7 +81,6 @@ public class LicenseManagementServiceComponent {
                         .getLicenseMgtConfig();
                 addDefaultLicenses(licenseManagementConfig);
             }
-
             if (log.isDebugEnabled()) {
                 log.debug("Registering OSGi service LicenseManagementService");
             }

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/DefaultLicense.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~
+  ~   Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~   WSO2 Inc. licenses this file to you under the Apache License,
+  ~   Version 2.0 (the "License"); you may not use this file except
+  ~   in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing,
+  ~   software distributed under the License is distributed on an
+  ~   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~   KIND, either express or implied.  See the License for the
+  ~   specific language governing permissions and limitations
+  ~   under the License.
+  ~
+  -->
+
+<DefaultLicense>
+    <License>
+        <provider>wso2</provider>
+        <name>android</name>
+        <version>1.0.0</version>
+        <language>1.0.0</language>
+        <validFrom>01-01-2014</validFrom>
+        <validTo>31-12-2035</validTo>
+        <license><![CDATA[Test License]]></license>
+    </License>
+    <License>
+        <provider>wso2</provider>
+        <name>ios</name>
+        <version>1.0.0</version>
+        <language>1.0.0</language>
+        <validFrom>01-01-2014</validFrom>
+        <validTo>31-12-2035</validTo>
+        <license><![CDATA[IOS License]]></license>
+    </License>
+    <License>
+        <provider>wso2</provider>
+        <name>windows</name>
+        <version>1.0.0</version>
+        <language>1.0.0</language>
+        <validFrom>01-01-2014</validFrom>
+        <validTo>31-12-2035</validTo>
+        <license><![CDATA[Windows License]]></license>
+    </License>
+</DefaultLicense>