Fixing more feature management related changes

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

@@ -71,4 +71,10 @@ public final class DeviceManagementConstants {
         public static final String LICENSE_REGISTRY_KEY = "license";
     }
 
+    public static final class NotificationProperties {
+        private NotificationProperties() {
+            throw new AssertionError();
+        }
+        public static final String NOTIFICATION_CONFIG_FILE = "notification-messages.xml";
+    }
 }

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

@@ -18,21 +18,24 @@
 package org.wso2.carbon.device.mgt.core;
 
 import org.wso2.carbon.device.mgt.common.*;
-import org.wso2.carbon.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.spi.DeviceManager;
 import org.wso2.carbon.device.mgt.common.license.mgt.License;
+import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
+import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManager;
+import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
+import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManager;
+import org.wso2.carbon.device.mgt.common.spi.DeviceManager;
+import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
+import org.wso2.carbon.device.mgt.core.config.EnrolmentNotifications;
 import org.wso2.carbon.device.mgt.core.dao.DeviceDAO;
 import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.dao.DeviceTypeDAO;
 import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil;
-import org.wso2.carbon.device.mgt.core.dto.*;
+import org.wso2.carbon.device.mgt.core.dto.DeviceType;
-import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
+import org.wso2.carbon.device.mgt.core.dto.Status;
-import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManager;
+import org.wso2.carbon.device.mgt.core.internal.EmailServiceDataHolder;
 import org.wso2.carbon.device.mgt.core.license.mgt.LicenseManagerImpl;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManager;
 import org.wso2.carbon.device.mgt.core.operation.mgt.OperationManagerImpl;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementService;
 import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
@@ -61,6 +64,11 @@ public class DeviceManagementServiceProviderImpl implements DeviceManagementServ
         return null;
     }
 
+    @Override
+    public FeatureManager getFeatureManager() {
+        return null;
+    }
+
     @Override
     public FeatureManager getFeatureManager(String type) {
         DeviceManager dms =
@@ -189,7 +197,8 @@ public class DeviceManagementServiceProviderImpl implements DeviceManagementServ
         List<Device> devicesOfUser = new ArrayList<Device>();
         try {
             int tenantId = DeviceManagerUtil.getTenantId();
-            List<org.wso2.carbon.device.mgt.core.dto.Device> devicesList = this.deviceDAO.getDeviceListOfUser(username, tenantId);
+            List<org.wso2.carbon.device.mgt.core.dto.Device> devicesList = this.deviceDAO
+                    .getDeviceListOfUser(username, tenantId);
             for (int x = 0; x < devicesList.size(); x++) {
                 org.wso2.carbon.device.mgt.core.dto.Device device = devicesList.get(x);
                 device.setDeviceType(deviceTypeDAO.getDeviceType(device.getDeviceTypeId()));
@@ -208,11 +217,24 @@ public class DeviceManagementServiceProviderImpl implements DeviceManagementServ
             }
         } catch (DeviceManagementDAOException e) {
             throw new DeviceManagementException("Error occurred while obtaining devices for user " +
-                                                "'" + username + "'", e);
+                    "'" + username + "'", e);
         }
         return devicesOfUser;
     }
 
+    @Override
+    public void sendEnrollInvitation(String emailAddress) throws DeviceManagementException {
+        EmailMessageProperties emailMessageProperties = new EmailMessageProperties();
+        EnrolmentNotifications enrolmentNotifications = DeviceConfigurationManager.getInstance()
+                .getNotificationMessagesConfig()
+                .getEnrolmentNotifications();
+
+        emailMessageProperties.setMailTo(new String[]{emailAddress});
+        emailMessageProperties.setSubject(enrolmentNotifications.getSubject());
+        emailMessageProperties.setMessageBody(enrolmentNotifications.getMessage());
+        EmailServiceDataHolder.getInstance().getEmailServiceProvider().sendEmail(emailMessageProperties);
+    }
+
     @Override
     public Device getDevice(DeviceIdentifier deviceId) throws DeviceManagementException {
         DeviceManager dms =
@@ -282,7 +304,7 @@ public class DeviceManagementServiceProviderImpl implements DeviceManagementServ
 
     @Override
     public boolean addOperation(Operation operation,
-                                List<DeviceIdentifier> devices) throws OperationManagementException {
+            List<DeviceIdentifier> devices) throws OperationManagementException {
         return operationManager.addOperation(operation, devices);
     }
 

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

@@ -25,6 +25,7 @@ import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
 import org.wso2.carbon.utils.CarbonUtils;
 
 import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 import java.io.File;
 
@@ -33,42 +34,64 @@ import java.io.File;
  */
 public class DeviceConfigurationManager {
 
-	private DeviceManagementConfig currentDeviceConfig;
+    private DeviceManagementConfig currentDeviceConfig;
-	private static DeviceConfigurationManager deviceConfigManager;
+    private NotificationMessagesConfig notificationMessagesConfig;
+    private static DeviceConfigurationManager deviceConfigManager;
 
-	private static final String deviceMgtConfigXMLPath =
+    private static final String deviceMgtConfigXMLPath =
-			CarbonUtils.getCarbonConfigDirPath() + File.separator +
+            CarbonUtils.getCarbonConfigDirPath() + File.separator +
-			DeviceManagementConstants.DataSourceProperties.DEVICE_CONFIG_XML_NAME;
+                    DeviceManagementConstants.DataSourceProperties.DEVICE_CONFIG_XML_NAME;
+    private static final String notificationMessagesConfigXMLPath =
+            CarbonUtils.getCarbonConfigDirPath() + File.separator +
+                    DeviceManagementConstants.NotificationProperties.NOTIFICATION_CONFIG_FILE;
 
-	public static DeviceConfigurationManager getInstance() {
+    public static DeviceConfigurationManager getInstance() {
-		if (deviceConfigManager == null) {
+        if (deviceConfigManager == null) {
-			synchronized (DeviceConfigurationManager.class) {
+            synchronized (DeviceConfigurationManager.class) {
-				if (deviceConfigManager == null) {
+                if (deviceConfigManager == null) {
-					deviceConfigManager = new DeviceConfigurationManager();
+                    deviceConfigManager = new DeviceConfigurationManager();
-				}
+                }
-			}
+            }
-		}
+        }
-		return deviceConfigManager;
+        return deviceConfigManager;
-	}
+    }
 
-	public synchronized void initConfig() throws DeviceManagementException {
+    public synchronized void initConfig() throws DeviceManagementException {
 
-		//catch generic exception.if any exception occurs wrap and throw DeviceManagementException
+        //catch generic exception.if any exception occurs wrap and throw DeviceManagementException
-		try {
+        try {
-			File deviceMgtConfig = new File(deviceMgtConfigXMLPath);
+            File deviceMgtConfig = new File(deviceMgtConfigXMLPath);
-			Document doc = DeviceManagerUtil.convertToDocument(deviceMgtConfig);
+            Document doc = DeviceManagerUtil.convertToDocument(deviceMgtConfig);
 
             /* Un-marshaling Device Management configuration */
-			JAXBContext cdmContext = JAXBContext.newInstance(DeviceManagementConfig.class);
+            JAXBContext cdmContext = JAXBContext.newInstance(DeviceManagementConfig.class);
-			Unmarshaller unmarshaller = cdmContext.createUnmarshaller();
+            Unmarshaller unmarshaller = cdmContext.createUnmarshaller();
-			this.currentDeviceConfig = (DeviceManagementConfig) unmarshaller.unmarshal(doc);
+            this.currentDeviceConfig = (DeviceManagementConfig) unmarshaller.unmarshal(doc);
-		} catch (Exception e) {
+        } catch (JAXBException jaxbEx) {
-			throw new DeviceManagementException("Error occurred while initializing RSS config", e);
+            throw new DeviceManagementException("Error occurred while initializing Data Source config", jaxbEx);
-		}
+        }
-	}
+
-
+        try {
-	public DeviceManagementConfig getDeviceManagementConfig() {
+            File notificationConfig = new File(notificationMessagesConfigXMLPath);
-		return currentDeviceConfig;
+            Document doc = DeviceManagerUtil.convertToDocument(notificationConfig);
-	}
+
+            /* Un-marshaling Notifications Management configuration */
+            JAXBContext notificationContext = JAXBContext.newInstance(NotificationMessagesConfig.class);
+            Unmarshaller unmarshaller = notificationContext.createUnmarshaller();
+            this.notificationMessagesConfig = (NotificationMessagesConfig) unmarshaller.unmarshal(doc);
+        }catch(JAXBException jaxbEx){
+            throw new DeviceManagementException("Error occurred while initializing Notification settings config",
+                    jaxbEx);
+        }
+
+    }
+
+    public DeviceManagementConfig getDeviceManagementConfig() {
+        return currentDeviceConfig;
+    }
+
+    public NotificationMessagesConfig getNotificationMessagesConfig() {
+        return notificationMessagesConfig;
+    }
 
 }

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

@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+package org.wso2.carbon.device.mgt.core.config;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "EnrolmentNotifications")
+public class EnrolmentNotifications {
+
+    private String message;
+    private String subject;
+
+    @XmlElement(name = "message", required = true)
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    @XmlElement(name = "subject", required = true)
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+}

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

@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+package org.wso2.carbon.device.mgt.core.config;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "Notifications")
+public class NotificationMessagesConfig {
+
+    private EnrolmentNotifications enrolmentNotifications;
+
+    @XmlElement(name = "EnrolmentNotifications", required = true)
+    public EnrolmentNotifications getEnrolmentNotifications() {
+        return enrolmentNotifications;
+    }
+
+    public void setEnrolmentNotifications(EnrolmentNotifications enrolmentNotifications) {
+        this.enrolmentNotifications = enrolmentNotifications;
+    }
+
+}

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

@@ -20,6 +20,7 @@ package org.wso2.carbon.device.mgt.core.service;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.EmailMessageProperties;
+import org.wso2.carbon.device.mgt.common.FeatureManager;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManager;
 import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManager;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManager;
@@ -38,6 +39,8 @@ public interface DeviceManagementService extends DeviceManager, LicenseManager,
 
     List<Device> getDeviceListOfUser(String username) throws DeviceManagementException;
 
+    FeatureManager getFeatureManager(String type) throws DeviceManagementException;
 
+    void sendEnrollInvitation(String emailAddress) throws DeviceManagementException;
 
 }

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

@@ -26,6 +26,7 @@ import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
+import org.wso2.carbon.device.mgt.core.internal.EmailServiceDataHolder;
 
 import java.util.List;
 
@@ -85,6 +86,16 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
         return DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().getDeviceListOfUser(username);
     }
 
+    @Override
+    public FeatureManager getFeatureManager(String type) throws DeviceManagementException {
+        return null;
+    }
+
+    @Override
+    public void sendEnrollInvitation(String emailAddress) throws DeviceManagementException {
+        DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().sendEnrollInvitation(emailAddress);
+    }
+
     @Override
     public org.wso2.carbon.device.mgt.common.Device getDevice(DeviceIdentifier deviceId)
             throws DeviceManagementException {

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

@@ -146,5 +146,5 @@ public final class DeviceManagerUtil {
         PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
         return ctx.getTenantId();
     }
-    
+
 }

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

@@ -24,6 +24,29 @@ public class User {
 
     private String userName;
     private String roleName;
+    private String firstName;
+    private String email;
+    private String lastName;
+    private String streatAddress;
+    private String locality;
+    private String region;
+    private String postalCode;
+    private String country;
+    private String hone;
+    private String im;
+    private String organization;
+    private String url;
+    private String title;
+    private String mobile;
+    private String nickName;
+    private String dateOfBirth;
+    private String gender;
+    private String accountStatus;
+    private String challengeQuestion;
+    private String identityClaimUri;
+    private String tempEmailAddress;
+
+
     private ArrayList<Claims> claimList;
 
     public User(String userName) {
@@ -58,4 +81,172 @@ public class User {
     public void setClaimList(ArrayList<Claims> claimList) {
         this.claimList = claimList;
     }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getStreatAddress() {
+        return streatAddress;
+    }
+
+    public void setStreatAddress(String streatAddress) {
+        this.streatAddress = streatAddress;
+    }
+
+    public String getLocality() {
+        return locality;
+    }
+
+    public void setLocality(String locality) {
+        this.locality = locality;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public String getPostalCode() {
+        return postalCode;
+    }
+
+    public void setPostalCode(String postalCode) {
+        this.postalCode = postalCode;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getHone() {
+        return hone;
+    }
+
+    public void setHone(String hone) {
+        this.hone = hone;
+    }
+
+    public String getIm() {
+        return im;
+    }
+
+    public void setIm(String im) {
+        this.im = im;
+    }
+
+    public String getOrganization() {
+        return organization;
+    }
+
+    public void setOrganization(String organization) {
+        this.organization = organization;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getDateOfBirth() {
+        return dateOfBirth;
+    }
+
+    public void setDateOfBirth(String dateOfBirth) {
+        this.dateOfBirth = dateOfBirth;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public String getAccountStatus() {
+        return accountStatus;
+    }
+
+    public void setAccountStatus(String accountStatus) {
+        this.accountStatus = accountStatus;
+    }
+
+    public String getChallengeQuestion() {
+        return challengeQuestion;
+    }
+
+    public void setChallengeQuestion(String challengeQuestion) {
+        this.challengeQuestion = challengeQuestion;
+    }
+
+    public String getIdentityClaimUri() {
+        return identityClaimUri;
+    }
+
+    public void setIdentityClaimUri(String identityClaimUri) {
+        this.identityClaimUri = identityClaimUri;
+    }
+
+    public String getTempEmailAddress() {
+        return tempEmailAddress;
+    }
+
+    public void setTempEmailAddress(String tempEmailAddress) {
+        this.tempEmailAddress = tempEmailAddress;
+    }
 }

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

@@ -28,14 +28,45 @@ import org.wso2.carbon.device.mgt.user.core.internal.DeviceMgtUserDataHolder;
 import org.wso2.carbon.user.api.Claim;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.user.api.UserStoreManager;
+import org.wso2.carbon.user.core.UserCoreConstants;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class UserManagerImpl implements UserManager {
 
     private static Log log = LogFactory.getLog(UserManagerImpl.class);
 
+    public static final String GIVEN_NAME = UserCoreConstants.ClaimTypeURIs.GIVEN_NAME;
+    public static final String EMAIL_ADDRESS = UserCoreConstants.ClaimTypeURIs.EMAIL_ADDRESS;
+    public static final String SURNAME = UserCoreConstants.ClaimTypeURIs.SURNAME;
+    public static final String STREET_ADDRESS = UserCoreConstants.ClaimTypeURIs.STREET_ADDRESS;
+    public static final String LOCALITY = UserCoreConstants.ClaimTypeURIs.LOCALITY;
+    public static final String REGION = UserCoreConstants.ClaimTypeURIs.REGION;
+    public static final String POSTAL_CODE = UserCoreConstants.ClaimTypeURIs.POSTAL_CODE;
+    public static final String COUNTRY = UserCoreConstants.ClaimTypeURIs.COUNTRY;
+    public static final String HONE = UserCoreConstants.ClaimTypeURIs.HONE;
+    public static final String IM = UserCoreConstants.ClaimTypeURIs.IM;
+    public static final String ORGANIZATION = UserCoreConstants.ClaimTypeURIs.ORGANIZATION;
+    public static final String URL = UserCoreConstants.ClaimTypeURIs.URL;
+    public static final String TITLE = UserCoreConstants.ClaimTypeURIs.TITLE;
+    public static final String ROLE = UserCoreConstants.ClaimTypeURIs.ROLE;
+    public static final String MOBILE = UserCoreConstants.ClaimTypeURIs.MOBILE;
+    public static final String NICKNAME = UserCoreConstants.ClaimTypeURIs.NICKNAME;
+    public static final String DATE_OF_BIRTH = UserCoreConstants.ClaimTypeURIs.DATE_OF_BIRTH;
+    public static final String GENDER = UserCoreConstants.ClaimTypeURIs.GENDER;
+    public static final String ACCOUNT_STATUS = UserCoreConstants.ClaimTypeURIs.ACCOUNT_STATUS;
+    public static final String CHALLENGE_QUESTION_URI = UserCoreConstants.ClaimTypeURIs.CHALLENGE_QUESTION_URI;
+    public static final String IDENTITY_CLAIM_URI = UserCoreConstants.ClaimTypeURIs.IDENTITY_CLAIM_URI;
+    public static final String TEMPORARY_EMAIL_ADDRESS = UserCoreConstants.ClaimTypeURIs.TEMPORARY_EMAIL_ADDRESS;
+
+    public static final String[] DEFAULT_CLAIM_ARR = new String[]{GIVEN_NAME,EMAIL_ADDRESS,SURNAME,STREET_ADDRESS,
+            LOCALITY,REGION,REGION,POSTAL_CODE,COUNTRY,HONE,IM,ORGANIZATION,URL,TITLE,ROLE,MOBILE,NICKNAME,
+            DATE_OF_BIRTH,GENDER,ACCOUNT_STATUS,CHALLENGE_QUESTION_URI,IDENTITY_CLAIM_URI,TEMPORARY_EMAIL_ADDRESS};
+
+  //  private static final String CLAIM_URL_
+
     @Override
     public List<User> getUsersForTenantAndRole(int tenantId, String roleName) throws UserManagementException {
 
@@ -51,7 +82,8 @@ public class UserManagerImpl implements UserManager {
             User newUser;
             for (String userName : userNames) {
                 newUser = new User(userName);
-                setUserClaims(newUser, userStoreManager.getUserClaimValues(userName, null));
+                setUserClaims(newUser, userStoreManager.getUserClaimValues(userName, DEFAULT_CLAIM_ARR,
+                        UserCoreConstants.DEFAULT_PROFILE));
                 usersList.add(newUser);
             }
         } catch (UserStoreException userStoreEx) {
@@ -103,7 +135,8 @@ public class UserManagerImpl implements UserManager {
             User newUser;
             for (String userName : userNames) {
                 newUser = new User(userName);
-                setUserClaims(newUser, userStoreManager.getUserClaimValues(userName, null));
+                setUserClaims(newUser, userStoreManager.getUserClaimValues(userName, DEFAULT_CLAIM_ARR,
+                        UserCoreConstants.DEFAULT_PROFILE));
                 usersList.add(newUser);
             }
         } catch (UserStoreException userStoreEx) {
@@ -115,19 +148,30 @@ public class UserManagerImpl implements UserManager {
         return usersList;
     }
 
-    private void setUserClaims(User newUser, Claim[] userClaimValues) {
+    private void setUserClaims(User newUser, Map<String, String> claimMap) {
-
+
-        Claims userClaims;
+        newUser.setRoleName(UserCoreConstants.ClaimTypeURIs.ROLE);
-        ArrayList<Claims> claimsList = new ArrayList<Claims>();
+        newUser.setAccountStatus(claimMap.get(ACCOUNT_STATUS));
-        for (Claim claim : userClaimValues) {
+        newUser.setChallengeQuestion(claimMap.get(CHALLENGE_QUESTION_URI));
-            userClaims = new Claims();
+        newUser.setCountry(claimMap.get(COUNTRY));
-            userClaims.setClaimUrl(claim.getClaimUri());
+        newUser.setDateOfBirth(claimMap.get(DATE_OF_BIRTH));
-            userClaims.setDescription(claim.getDescription());
+        newUser.setEmail(claimMap.get(EMAIL_ADDRESS));
-            userClaims.setDialectUrl(claim.getDialectURI());
+        newUser.setFirstName(claimMap.get(GIVEN_NAME));
-            userClaims.setValue(claim.getValue());
+        newUser.setGender(claimMap.get(GENDER));
-            claimsList.add(userClaims);
+        newUser.setHone(claimMap.get(HONE));
-        }
+        newUser.setIm(claimMap.get(IM));
-        newUser.setClaimList(claimsList);
+        newUser.setIdentityClaimUri(claimMap.get(IDENTITY_CLAIM_URI));
+        newUser.setLastName(claimMap.get(SURNAME));
+        newUser.setLocality(claimMap.get(LOCALITY));
+        newUser.setEmail(claimMap.get(EMAIL_ADDRESS));
+        newUser.setMobile(claimMap.get(MOBILE));
+        newUser.setNickName(claimMap.get(NICKNAME));
+        newUser.setOrganization(claimMap.get(ORGANIZATION));
+        newUser.setPostalCode(claimMap.get(POSTAL_CODE));
+        newUser.setRegion(claimMap.get(REGION));
+        newUser.setStreatAddress(claimMap.get(STREET_ADDRESS));
+        newUser.setTitle(claimMap.get(TITLE));
+        newUser.setTempEmailAddress(claimMap.get(TEMPORARY_EMAIL_ADDRESS));
     }
 
 }

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/license-config.xml

@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
-  ~   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
-  ~   WSO2 Inc. licenses this file to you under the Apache License,
+  ~ in compliance with the License.
-  ~   Version 2.0 (the "License"); you may not use this file except
+  ~ you may obtain a copy of the License at
-  ~   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,
+  ~ Unless required by applicable law or agreed to in writing,
-  ~   software distributed under the License is distributed on an
+  ~ software distributed under the License is distributed on an
-  ~   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~   KIND, either express or implied.  See the License for the
+  ~ KIND, either express or implied.  See the License for the
-  ~   specific language governing permissions and limitations
+  ~ specific language governing permissions and limitations
-  ~   under the License.
+  ~ under the License.
-  ~
   -->
 
 <LicenseConfig>

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/notification-messages.xml

@@ -0,0 +1,26 @@
+<?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.
+-->
+
+<Notifications>
+    <EnrolmentNotifications>
+            <message>Please enroll your device</message>
+            <subject>Enroll your device</subject>
+    </EnrolmentNotifications>
+</Notifications>

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf

@@ -1,5 +1,6 @@
 instructions.configure = \
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/cdm-config.xml,target:${installFolder}/../../conf/cdm-config.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/notification-messages.xml,target:${installFolder}/../../conf/notification-messages.xml,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/license-config.xml,target:${installFolder}/../../conf/etc/license-config.xml,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/dbscripts/cdm,target:${installFolder}/../../../dbscripts/cdm,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/rxts/license.rxt,target:${installFolder}/../../../repository/resources/rxts/license.rxt,overwrite:true);\