merge after JAX-RS changes

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

@@ -34,7 +34,7 @@ public final class DeviceManagementConstants {
         public static final String SECURE_VAULT_NS = "http://org.wso2.securevault/configuration";
     }
 
-    public static class MobileDeviceTypes {
+    public static final class MobileDeviceTypes {
         private MobileDeviceTypes() {
             throw new AssertionError();
         }

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

@@ -118,7 +118,7 @@ public final class DeviceManagementDAOUtil {
         deviceBO.setOwnerId(device.getOwner());
         deviceBO.setOwnerShip(device.getOwnership());
         deviceBO.setTenantId(DeviceManagementDAOUtil.getTenantId());
-        deviceBO.setDeviceType(Integer.parseInt(device.getType()));
+        //deviceBO.setDeviceType(Integer.parseInt(device.getType()));
         return deviceBO;
     }
 

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml

@@ -74,10 +74,13 @@
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.logging</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.utils</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.osgi</groupId>
             <artifactId>org.eclipse.osgi.services</artifactId>
-            <version>3.2.0.v20090520-1800</version>
         </dependency>
     </dependencies>
 

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/DataSourceListener.java

@@ -13,13 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.wso2.carbon.policy.mgt.core.internal;
+package org.wso2.carbon.device.mgt.mobile.impl;
 
-import org.apache.commons.logging.Log;
+public interface DataSourceListener {
-import org.apache.commons.logging.LogFactory;
 
-public class PolicyMgtServiceComponent {
+    void notifyObserver();
-
-    private static Log log = LogFactory.getLog(PolicyMgtServiceComponent.class);
 
 }

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManagerService.java

@@ -86,4 +86,6 @@ public class AndroidDeviceManagerService implements DeviceManagerService {
 		return true;
 	}
 
+	//should implement equals and hashcode in all service bundles
+
 }

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/config/MobileDeviceConfigurationManager.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * Licensed 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.mobile.impl.config;
+
+import org.w3c.dom.Document;
+import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.mobile.impl.util.MobileDeviceManagerUtil;
+import org.wso2.carbon.device.mgt.mobile.impl.config.datasource.MobileDataSourceConfig;
+import org.wso2.carbon.utils.CarbonUtils;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Unmarshaller;
+import java.io.File;
+
+/**
+ * Class responsible for the mobile device manager configuration initialization
+ */
+public class MobileDeviceConfigurationManager {
+
+	private static final String MOBILE_DEVICE_CONFIG_XML_NAME = "mobile-config.xml";
+	private MobileDeviceManagementConfig currentMobileDeviceConfig;
+	private static MobileDeviceConfigurationManager mobileDeviceConfigManager;
+
+	private final String mobileDeviceMgtConfigXMLPath =
+			CarbonUtils.getCarbonConfigDirPath() + File.separator +
+			MOBILE_DEVICE_CONFIG_XML_NAME;
+
+	public static MobileDeviceConfigurationManager getInstance() {
+		if (mobileDeviceConfigManager == null) {
+			synchronized (MobileDeviceConfigurationManager.class) {
+				if (mobileDeviceConfigManager == null) {
+					mobileDeviceConfigManager = new MobileDeviceConfigurationManager();
+				}
+			}
+		}
+		return mobileDeviceConfigManager;
+	}
+
+	public synchronized void initConfig() throws DeviceManagementException {
+		try {
+			File mobileDeviceMgtConfig = new File(mobileDeviceMgtConfigXMLPath);
+			Document doc = MobileDeviceManagerUtil.convertToDocument(mobileDeviceMgtConfig);
+			JAXBContext mobileDeviceMgmtContext =
+					JAXBContext.newInstance(MobileDeviceManagementConfig.class);
+			Unmarshaller unmarshaller = mobileDeviceMgmtContext.createUnmarshaller();
+			this.currentMobileDeviceConfig =
+					(MobileDeviceManagementConfig) unmarshaller.unmarshal(doc);
+		} catch (Exception e) {
+			throw new DeviceManagementException(
+					"Error occurred while initializing Mobile Device Management config", e);
+		}
+	}
+
+	public MobileDeviceManagementConfig getMobileDeviceManagementConfig() {
+		return currentMobileDeviceConfig;
+	}
+
+	public MobileDataSourceConfig getMobileDataSourceConfig() {
+		return currentMobileDeviceConfig.getMobileDeviceMgtRepository().getMobileDataSourceConfig();
+	}
+
+}

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/config/MobileDeviceManagementConfig.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * Licensed 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.mobile.impl.config;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Represents Mobile Device Mgt configuration.
+ */
+@XmlRootElement(name = "MobileDeviceMgtConfiguration")
+public final class MobileDeviceManagementConfig {
+
+    private MobileDeviceManagementRepository mobileDeviceMgtRepository;
+
+    @XmlElement(name = "ManagementRepository", nillable = false)
+    public MobileDeviceManagementRepository getMobileDeviceMgtRepository() {
+        return mobileDeviceMgtRepository;
+    }
+
+    public void setMobileDeviceMgtRepository(
+            MobileDeviceManagementRepository mobileDeviceMgtRepository) {
+        this.mobileDeviceMgtRepository = mobileDeviceMgtRepository;
+    }
+
+}

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/config/MobileDeviceManagementRepository.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * Licensed 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.mobile.impl.config;
+
+import org.wso2.carbon.device.mgt.mobile.impl.config.datasource.MobileDataSourceConfig;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Class for holding management repository data
+ */
+@XmlRootElement(name = "ManagementRepository")
+public class MobileDeviceManagementRepository {
+
+	private MobileDataSourceConfig mobileDataSourceConfig;
+
+	@XmlElement(name = "DataSourceConfiguration", nillable = false)
+	public MobileDataSourceConfig getMobileDataSourceConfig() {
+		return mobileDataSourceConfig;
+	}
+
+	public void setMobileDataSourceConfig(MobileDataSourceConfig mobileDataSourceConfig) {
+		this.mobileDataSourceConfig = mobileDataSourceConfig;
+	}
+
+}

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/config/datasource/JNDILookupDefinition.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * Licensed 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.mobile.impl.config.datasource;
+
+import javax.xml.bind.annotation.*;
+import java.util.List;
+
+/**
+ * Class for hold JndiLookupDefinition of mobile-config.xml at parsing with JAXB
+ */
+@XmlRootElement(name = "JndiLookupDefinition")
+public class JNDILookupDefinition {
+
+	private String jndiName;
+	private List<JNDIProperty> jndiProperties;
+
+	@XmlElement(name = "Name", nillable = false)
+	public String getJndiName() {
+		return jndiName;
+	}
+
+	public void setJndiName(String jndiName) {
+		this.jndiName = jndiName;
+	}
+
+	@XmlElementWrapper(name = "Environment", nillable = false)
+	@XmlElement(name = "Property", nillable = false)
+	public List<JNDIProperty> getJndiProperties() {
+		return jndiProperties;
+	}
+
+	public void setJndiProperties(List<JNDIProperty> jndiProperties) {
+		this.jndiProperties = jndiProperties;
+	}
+
+	@XmlRootElement(name = "Property")
+	public static class JNDIProperty {
+
+		private String name;
+
+		private String value;
+
+		@XmlAttribute(name = "Name")
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		@XmlValue
+		public String getValue() {
+			return value;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+	}
+
+}
+

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/config/datasource/MobileDataSourceConfig.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * Licensed 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.mobile.impl.config.datasource;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Class for holding data source configuration in mobile-config.xml at parsing with JAXB
+ */
+@XmlRootElement(name = "DataSourceConfiguration")
+public class MobileDataSourceConfig {
+
+	private JNDILookupDefinition jndiLookupDefintion;
+
+	@XmlElement(name = "JndiLookupDefinition", nillable = true)
+	public JNDILookupDefinition getJndiLookupDefintion() {
+		return jndiLookupDefintion;
+	}
+
+	public void setJndiLookupDefintion(JNDILookupDefinition jndiLookupDefintion) {
+		this.jndiLookupDefintion = jndiLookupDefintion;
+	}
+
+}

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/dao/MobileDeviceDAO.java

@@ -19,7 +19,8 @@ package org.wso2.carbon.device.mgt.mobile.impl.dao;
 import org.wso2.carbon.device.mgt.mobile.impl.dto.MobileDevice;
 
 /**
- * This class represents the key operations associated with persisting mobile-device related information.
+ * This class represents the key operations associated with persisting mobile-device related
+ * information.
  */
 public interface MobileDeviceDAO {
 

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/dao/MobileDeviceDAOFactory.java

@@ -0,0 +1,57 @@
+/**
+ *  Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  Licensed 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.mobile.impl.dao;
+
+import org.wso2.carbon.device.mgt.mobile.impl.DataSourceListener;
+import org.wso2.carbon.device.mgt.mobile.impl.dao.impl.MobileDeviceDAOImpl;
+import org.wso2.carbon.device.mgt.mobile.impl.dao.impl.MobileDeviceModelDAOImpl;
+import org.wso2.carbon.device.mgt.mobile.impl.dao.impl.MobileDeviceVendorDAOImpl;
+import org.wso2.carbon.device.mgt.mobile.impl.dao.impl.MobileOSVersionDAOImpl;
+import org.wso2.carbon.device.mgt.mobile.impl.dao.util.MobileDeviceManagementDAOUtil;
+import org.wso2.carbon.device.mgt.mobile.impl.internal.MobileDeviceManagementBundleActivator;
+
+import javax.sql.DataSource;
+
+public class MobileDeviceDAOFactory implements DataSourceListener {
+
+    private static DataSource dataSource;
+
+    public MobileDeviceDAOFactory() {
+        MobileDeviceManagementBundleActivator.registerDataSourceListener(this);
+    }
+
+    @Override
+    public void notifyObserver() {
+        dataSource = MobileDeviceManagementDAOUtil.resolveDataSource();
+    }
+
+    public static MobileDeviceDAO getMobileDeviceDAO() {
+        return new MobileDeviceDAOImpl(dataSource);
+    }
+
+    public static MobileDeviceModelDAO getMobileDeviceModelDAO() {
+        return new MobileDeviceModelDAOImpl(dataSource);
+    }
+
+    public static MobileDeviceVendorDAO getMobileDeviceVendorDAO() {
+        return new MobileDeviceVendorDAOImpl(dataSource);
+    }
+
+    public static MobileOSVersionDAO getMobileOSVersionDAO() {
+        return new MobileOSVersionDAOImpl(dataSource);
+    }
+
+}

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/dao/MobileDeviceManagementDAOException.java

@@ -25,7 +25,8 @@ public class MobileDeviceManagementDAOException extends Exception {
 	private static final long serialVersionUID = 2021891706072918865L;
 
 	/**
-	 * Constructs a new exception with the specified detail message and nested exception.
+	 * Constructs a new MobileDeviceManagementDAOException with the specified detail message and
+	 * nested exception.
 	 *
 	 * @param message         error message
 	 * @param nestedException exception
@@ -36,7 +37,8 @@ public class MobileDeviceManagementDAOException extends Exception {
 	}
 
 	/**
-	 * Constructs a new exception with the specified detail message and cause.
+	 * Constructs a new MobileDeviceManagementDAOException with the specified detail message
+	 * and cause.
 	 *
 	 * @param message the detail message.
 	 * @param cause   the cause of this exception.
@@ -47,7 +49,7 @@ public class MobileDeviceManagementDAOException extends Exception {
 	}
 
 	/**
-	 * Constructs a new exception with the specified detail message
+	 * Constructs a new MobileDeviceManagementDAOException with the specified detail message
 	 *
 	 * @param message the detail message.
 	 */
@@ -57,7 +59,7 @@ public class MobileDeviceManagementDAOException extends Exception {
 	}
 
 	/**
-	 * Constructs a new exception with the specified and cause.
+	 * Constructs a new MobileDeviceManagementDAOException with the specified and cause.
 	 *
 	 * @param cause the cause of this exception.
 	 */

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/dao/MobileDeviceManagementDAOFactory.java

@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * Licensed 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.mobile.impl.dao;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.device.mgt.mobile.impl.config.datasource.MobileDataSourceConfig;
+import org.wso2.carbon.device.mgt.mobile.impl.config.datasource.JNDILookupDefinition;
+import org.wso2.carbon.device.mgt.mobile.impl.dao.impl.MobileDeviceDAOImpl;
+import org.wso2.carbon.device.mgt.mobile.impl.dao.impl.MobileDeviceModelDAOImpl;
+import org.wso2.carbon.device.mgt.mobile.impl.dao.impl.MobileDeviceVendorDAOImpl;
+import org.wso2.carbon.device.mgt.mobile.impl.dao.impl.MobileOSVersionDAOImpl;
+import org.wso2.carbon.device.mgt.mobile.impl.dao.util.MobileDeviceManagementDAOUtil;
+
+import javax.sql.DataSource;
+import java.util.Hashtable;
+import java.util.List;
+
+/**
+ * Factory class used to create MobileDeviceManagement related DAO objects.
+ */
+public class MobileDeviceManagementDAOFactory {
+
+	private static DataSource dataSource;
+	private static final Log log = LogFactory.getLog(MobileDeviceManagementDAOFactory.class);
+
+	public static MobileDeviceDAO getMobileDeviceDAO() {
+		return new MobileDeviceDAOImpl(dataSource);
+	}
+
+	public static MobileDeviceModelDAO getMobileDeviceModelDAO() {
+		return new MobileDeviceModelDAOImpl(dataSource);
+	}
+
+	public static MobileDeviceVendorDAO getMobileDeviceVendorDAO() {
+		return new MobileDeviceVendorDAOImpl(dataSource);
+	}
+
+	public static MobileOSVersionDAO getMobileOSVersionDAO() {
+		return new MobileOSVersionDAOImpl(dataSource);
+	}
+
+	public static void init(MobileDataSourceConfig config) {
+		dataSource = resolveDataSource(config);
+	}
+
+	public static void init(DataSource dtSource) {
+		dataSource = dtSource;
+	}
+
+	/**
+	 * Resolve data source from the data source definition
+	 *
+	 * @param config data source configuration
+	 * @return data source resolved from the data source definition
+	 */
+	private static DataSource resolveDataSource(MobileDataSourceConfig config) {
+		DataSource dataSource = null;
+		if (config == null) {
+			throw new RuntimeException("Device Management Repository data source configuration " +
+			                           "is null and thus, is not initialized");
+		}
+		JNDILookupDefinition jndiConfig = config.getJndiLookupDefintion();
+		if (jndiConfig != null) {
+			if (log.isDebugEnabled()) {
+				log.debug("Initializing Device Management Repository data source using the JNDI " +
+				          "Lookup Definition");
+			}
+			List<JNDILookupDefinition.JNDIProperty> jndiPropertyList =
+					jndiConfig.getJndiProperties();
+			if (jndiPropertyList != null) {
+				Hashtable<Object, Object> jndiProperties = new Hashtable<Object, Object>();
+				for (JNDILookupDefinition.JNDIProperty prop : jndiPropertyList) {
+					jndiProperties.put(prop.getName(), prop.getValue());
+				}
+				dataSource =
+						MobileDeviceManagementDAOUtil
+								.lookupDataSource(jndiConfig.getJndiName(), jndiProperties);
+			} else {
+				dataSource = MobileDeviceManagementDAOUtil
+						.lookupDataSource(jndiConfig.getJndiName(), null);
+			}
+		}
+		return dataSource;
+	}
+
+	public static DataSource getDataSource() {
+		return dataSource;
+	}
+}

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/dao/impl/MobileDeviceDAOImpl.java

@@ -16,14 +16,26 @@
 
 package org.wso2.carbon.device.mgt.mobile.impl.dao.impl;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.mobile.impl.dao.MobileDeviceDAO;
 import org.wso2.carbon.device.mgt.mobile.impl.dao.MobileDeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.mobile.impl.dto.MobileDevice;
 
+import javax.sql.DataSource;
+
 /**
  * Implementation of MobileDeviceDAO.
  */
 public class MobileDeviceDAOImpl implements MobileDeviceDAO {
+
+	private DataSource dataSource;
+	private static final Log log = LogFactory.getLog(MobileDeviceDAOImpl.class);
+
+	public MobileDeviceDAOImpl(DataSource dataSource) {
+		this.dataSource = dataSource;
+	}
+
 	@Override
 	public MobileDevice getDevice(String deviceId) throws MobileDeviceManagementDAOException {
 		return null;

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/dao/impl/MobileDeviceModelDAOImpl.java

@@ -16,14 +16,26 @@
 
 package org.wso2.carbon.device.mgt.mobile.impl.dao.impl;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.mobile.impl.dao.MobileDeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.mobile.impl.dao.MobileDeviceModelDAO;
 import org.wso2.carbon.device.mgt.mobile.impl.dto.MobileDeviceModel;
 
+import javax.sql.DataSource;
+
 /**
  * Implementation of MobileDeviceModel.
  */
-public class MobileDeviceModelImpl implements MobileDeviceModelDAO {
+public class MobileDeviceModelDAOImpl implements MobileDeviceModelDAO {
+
+	private DataSource dataSource;
+	private static final Log log = LogFactory.getLog(MobileDeviceModelDAOImpl.class);
+
+	public MobileDeviceModelDAOImpl(DataSource dataSource) {
+		this.dataSource = dataSource;
+	}
+
 	@Override
 	public MobileDeviceModel getDeviceModel(String modelId)
 			throws MobileDeviceManagementDAOException {

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/dao/impl/MobileDeviceVendorDAOImpl.java

@@ -16,14 +16,26 @@
 
 package org.wso2.carbon.device.mgt.mobile.impl.dao.impl;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.mobile.impl.dao.MobileDeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.mobile.impl.dao.MobileDeviceVendorDAO;
 import org.wso2.carbon.device.mgt.mobile.impl.dto.MobileDeviceVendor;
 
+import javax.sql.DataSource;
+
 /**
  * Implementation of MobileDeviceVendorDAO.
  */
 public class MobileDeviceVendorDAOImpl implements MobileDeviceVendorDAO {
+
+	private DataSource dataSource;
+	private static final Log log = LogFactory.getLog(MobileDeviceVendorDAOImpl.class);
+
+	public MobileDeviceVendorDAOImpl(DataSource dataSource) {
+		this.dataSource = dataSource;
+	}
+
 	@Override
 	public MobileDeviceVendor getDeviceModel(String vendorId)
 			throws MobileDeviceManagementDAOException {

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/dao/impl/MobileOSVersionDAOImpl.java

@@ -16,14 +16,26 @@
 
 package org.wso2.carbon.device.mgt.mobile.impl.dao.impl;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.mobile.impl.dao.MobileDeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.mobile.impl.dao.MobileOSVersionDAO;
 import org.wso2.carbon.device.mgt.mobile.impl.dto.MobileOSVersion;
 
+import javax.sql.DataSource;
+
 /**
  * Implementation of MobileOSVersionDAO.
  */
 public class MobileOSVersionDAOImpl implements MobileOSVersionDAO {
+
+	private DataSource dataSource;
+	private static final Log log = LogFactory.getLog(MobileOSVersionDAOImpl.class);
+
+	public MobileOSVersionDAOImpl(DataSource dataSource) {
+		this.dataSource = dataSource;
+	}
+
 	@Override public MobileOSVersion getMobileOSVersion(String versionId)
 			throws MobileDeviceManagementDAOException {
 		return null;

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/dao/util/MobileDeviceManagementDAOUtil.java

@@ -16,8 +16,75 @@
 
 package org.wso2.carbon.device.mgt.mobile.impl.dao.util;
 
+
+import javax.sql.DataSource;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.device.mgt.common.Device;
+import org.wso2.carbon.device.mgt.mobile.impl.dao.MobileDeviceManagementDAOException;
+import org.wso2.carbon.device.mgt.mobile.impl.dto.MobileDevice;
+
+import javax.naming.InitialContext;
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Hashtable;
+
 /**
  * Utility method required by MobileDeviceManagement DAO classes.
  */
 public class MobileDeviceManagementDAOUtil {
+
+    public static DataSource resolveDataSource() {
+        return null;
+    }
+
+	private static final Log log = LogFactory.getLog(MobileDeviceManagementDAOUtil.class);
+
+	public static void cleanupResources(Connection conn, PreparedStatement stmt, ResultSet rs) {
+		if (rs != null) {
+			try {
+				rs.close();
+			} catch (SQLException e) {
+				log.warn("Error occurred while closing result set", e);
+			}
+		}
+		if (stmt != null) {
+			try {
+				stmt.close();
+			} catch (SQLException e) {
+				log.warn("Error occurred while closing prepared statement", e);
+			}
+		}
+		if (conn != null) {
+			try {
+				conn.close();
+			} catch (SQLException e) {
+				log.warn("Error occurred while closing database connection", e);
+			}
+		}
+	}
+
+	public static DataSource lookupDataSource(String dataSourceName,
+	                                          final Hashtable<Object, Object> jndiProperties) {
+		try {
+			if (jndiProperties == null || jndiProperties.isEmpty()) {
+				return (DataSource) InitialContext.doLookup(dataSourceName);
+			}
+			final InitialContext context = new InitialContext(jndiProperties);
+			return (DataSource) context.doLookup(dataSourceName);
+		} catch (Exception e) {
+			throw new RuntimeException("Error in looking up data source: " + e.getMessage(), e);
+		}
+	}
+
+	public static MobileDevice convertToMobileDevice(Device device)
+			throws MobileDeviceManagementDAOException {
+		MobileDevice mobileDeviceBO = new MobileDevice();
+		return mobileDeviceBO;
+	}
+
 }

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/internal/MobileDeviceManagementBundleActivator.java

@@ -16,22 +16,31 @@
 
 package org.wso2.carbon.device.mgt.mobile.impl.internal;
 
-import org.apache.commons.logging.LogFactory;
 import org.apache.commons.logging.Log;
-import org.osgi.framework.BundleActivator;
+import org.apache.commons.logging.LogFactory;
-import org.osgi.framework.BundleContext;
+import org.osgi.framework.*;
-import org.osgi.framework.ServiceRegistration;
+import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagerService;
+import org.wso2.carbon.device.mgt.mobile.impl.DataSourceListener;
 import org.wso2.carbon.device.mgt.mobile.impl.android.AndroidDeviceManagerService;
+import org.wso2.carbon.device.mgt.mobile.impl.config.datasource.MobileDataSourceConfig;
+import org.wso2.carbon.device.mgt.mobile.impl.dao.MobileDeviceDAOFactory;
 import org.wso2.carbon.device.mgt.mobile.impl.ios.IOSDeviceManagerService;
+import org.wso2.carbon.device.mgt.mobile.impl.util.MobileDeviceManagementSchemaInitializer;
 import org.wso2.carbon.device.mgt.mobile.impl.windows.WindowsDeviceManagerService;
 
-public class MobileDeviceManagementBundleActivator implements BundleActivator {
+import java.util.ArrayList;
+import java.util.List;
+
+public class MobileDeviceManagementBundleActivator implements BundleActivator, BundleListener {
 
-	private static final Log log = LogFactory.getLog(MobileDeviceManagementBundleActivator.class);
     private ServiceRegistration androidServiceRegRef;
     private ServiceRegistration iOSServiceRegRef;
     private ServiceRegistration windowsServiceRegRef;
+    private static List<DataSourceListener> dataSourceListeners = new ArrayList<DataSourceListener>();
+
+    private static final Log log = LogFactory.getLog(MobileDeviceManagementBundleActivator.class);
+    private static final String SYMBOLIC_NAME_DATA_SOURCE_COMPONENT = "org.wso2.carbon.ndatasource.core";
 
     @Override
     public void start(BundleContext bundleContext) throws Exception {
@@ -39,6 +48,22 @@ public class MobileDeviceManagementBundleActivator implements BundleActivator {
             if (log.isDebugEnabled()) {
                 log.debug("Activating Mobile Device Management Service bundle");
             }
+            bundleContext.addBundleListener(this);
+
+            /* If -Dsetup option enabled then create device management database schema */
+            String setupOption = System.getProperty("setup");
+            if (setupOption != null) {
+                if (log.isDebugEnabled()) {
+                    log.debug(
+                            "-Dsetup is enabled. Mobile Device management repository schema initialization is about " +
+                                    "to begin");
+                }
+                setupMobileDeviceManagementSchema(null);
+            }
+
+            MobileDeviceDAOFactory daoFactory = new MobileDeviceDAOFactory();
+            //TODO Register this dao to an appropriate config file
+
             androidServiceRegRef =
                     bundleContext.registerService(DeviceManagerService.class.getName(),
                             new AndroidDeviceManagerService(), null);
@@ -64,6 +89,42 @@ public class MobileDeviceManagementBundleActivator implements BundleActivator {
         androidServiceRegRef.unregister();
         iOSServiceRegRef.unregister();
         windowsServiceRegRef.unregister();
+
+        bundleContext.removeBundleListener(this);
     }
 
+    @Override
+    public void bundleChanged(BundleEvent bundleEvent) {
+        int eventType = bundleEvent.getType();
+        String bundleSymbolicName = bundleEvent.getBundle().getSymbolicName();
+        if (SYMBOLIC_NAME_DATA_SOURCE_COMPONENT.equals(bundleSymbolicName) && eventType == BundleEvent.STARTED) {
+            for (DataSourceListener listener : this.getDataSourceListeners()) {
+                listener.notifyObserver();
+            }
+        }
+    }
+
+    public static void registerDataSourceListener(DataSourceListener listener) {
+        dataSourceListeners.add(listener);
+    }
+
+    private List<DataSourceListener> getDataSourceListeners() {
+        return dataSourceListeners;
+    }
+
+    private void setupMobileDeviceManagementSchema(MobileDataSourceConfig config) throws
+            DeviceManagementException {
+        MobileDeviceManagementSchemaInitializer initializer =
+                new MobileDeviceManagementSchemaInitializer(config);
+        log.info("Initializing mobile device management repository database schema");
+        try {
+            //initializer.createRegistryDatabase();
+        } catch (Exception e) {
+            throw new DeviceManagementException(
+                    "Error occurred while initializing Mobile Device Management " +
+                            "database schema", e);
+        }
+    }
+
+
 }

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/util/MobileDeviceManagementSchemaInitializer.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * Licensed 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.mobile.impl.util;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.device.mgt.mobile.impl.config.datasource.MobileDataSourceConfig;
+import org.wso2.carbon.utils.CarbonUtils;
+import org.wso2.carbon.utils.dbcreator.DatabaseCreator;
+
+import java.io.File;
+
+public final class MobileDeviceManagementSchemaInitializer extends DatabaseCreator {
+
+	private static final Log log = LogFactory.getLog(MobileDeviceManagementSchemaInitializer.class);
+	private static final String setupSQLScriptBaseLocation =
+			CarbonUtils.getCarbonHome() + File.separator + "dbscripts" + File.separator + "cdm" +
+			File.separator + "plugins";
+
+	public MobileDeviceManagementSchemaInitializer(MobileDataSourceConfig config) {
+		super(MobileDeviceManagerUtil.resolveDataSource(config));
+	}
+
+	protected String getDbScriptLocation(String databaseType) {
+		String scriptName = databaseType + ".sql";
+		if (log.isDebugEnabled()) {
+			log.debug("Loading database script from :" + scriptName);
+		}
+		return setupSQLScriptBaseLocation.replaceFirst("DBTYPE", databaseType) + scriptName;
+	}
+
+}

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/util/MobileDeviceManagerUtil.java

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * Licensed 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.mobile.impl.util;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.w3c.dom.Document;
+import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.mobile.impl.config.datasource.JNDILookupDefinition;
+import org.wso2.carbon.device.mgt.mobile.impl.config.datasource.MobileDataSourceConfig;
+import org.wso2.carbon.device.mgt.mobile.impl.dao.util.MobileDeviceManagementDAOUtil;
+
+import javax.sql.DataSource;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.File;
+import java.util.Hashtable;
+import java.util.List;
+
+/**
+ * Created by harshan on 12/15/14.
+ */
+public class MobileDeviceManagerUtil {
+
+	private static final Log log = LogFactory.getLog(MobileDeviceManagerUtil.class);
+
+	public static Document convertToDocument(File file) throws DeviceManagementException {
+		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		factory.setNamespaceAware(true);
+		try {
+			DocumentBuilder docBuilder = factory.newDocumentBuilder();
+			return docBuilder.parse(file);
+		} catch (Exception e) {
+			throw new DeviceManagementException(
+					"Error occurred while parsing file, while converting " +
+					"to a org.w3c.dom.Document : " + e.getMessage(), e);
+		}
+	}
+
+	/**
+	 * Resolve data source from the data source definition
+	 *
+	 * @param config data source configuration
+	 * @return data source resolved from the data source definition
+	 */
+	public static DataSource resolveDataSource(MobileDataSourceConfig config) {
+		DataSource dataSource = null;
+		if (config == null) {
+			throw new RuntimeException(
+					"Mobile Device Management Repository data source configuration " +
+					"is null and thus, is not initialized");
+		}
+		JNDILookupDefinition jndiConfig = config.getJndiLookupDefintion();
+		if (jndiConfig != null) {
+			if (log.isDebugEnabled()) {
+				log.debug(
+						"Initializing Mobile Device Management Repository data source using the JNDI " +
+						"Lookup Definition");
+			}
+			List<JNDILookupDefinition.JNDIProperty> jndiPropertyList =
+					jndiConfig.getJndiProperties();
+			if (jndiPropertyList != null) {
+				Hashtable<Object, Object> jndiProperties = new Hashtable<Object, Object>();
+				for (JNDILookupDefinition.JNDIProperty prop : jndiPropertyList) {
+					jndiProperties.put(prop.getName(), prop.getValue());
+				}
+				dataSource =
+						MobileDeviceManagementDAOUtil.lookupDataSource(jndiConfig.getJndiName(),
+						                                               jndiProperties);
+			} else {
+				dataSource = MobileDeviceManagementDAOUtil
+						.lookupDataSource(jndiConfig.getJndiName(), null);
+			}
+		}
+		return dataSource;
+	}
+}

components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/FeatureManagerService.java

@@ -17,7 +17,7 @@
 */
 
 
-package org.wso2.carbon.policy.mgt.common.spi;
+package org.wso2.carbon.policy.mgt.common;
 
 import org.wso2.carbon.policy.mgt.common.Feature;
 import org.wso2.carbon.policy.mgt.common.FeatureManagementException;

components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/PolicyManagerService.java

@@ -16,7 +16,7 @@
 * under the License.
 */
 
-package org.wso2.carbon.policy.mgt.common.spi;
+package org.wso2.carbon.policy.mgt.common;
 
 import org.wso2.carbon.policy.mgt.common.FeatureManagementException;
 import org.wso2.carbon.policy.mgt.common.Policy;

components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/impl/PolicyManagement.java

@@ -21,7 +21,7 @@ package org.wso2.carbon.policy.mgt.common.impl;
 import org.wso2.carbon.policy.mgt.common.FeatureManagementException;
 import org.wso2.carbon.policy.mgt.common.Policy;
 import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
-import org.wso2.carbon.policy.mgt.common.spi.PolicyManagerService;
+import org.wso2.carbon.policy.mgt.common.PolicyManagerService;
 
 public class PolicyManagement implements PolicyManagerService {
     @Override

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/config/PolicyConfigurationManager.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2014, 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.
+ * 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.policy.mgt.core.config;
+
+import org.w3c.dom.Document;
+import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
+import org.wso2.carbon.policy.mgt.core.config.datasource.DataSourceConfig;
+import org.wso2.carbon.policy.mgt.core.util.PolicyManagementConstants;
+import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
+import org.wso2.carbon.utils.CarbonUtils;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Unmarshaller;
+import java.io.File;
+
+/**
+ * Class responsible for the rss manager configuration initialization
+ */
+public class PolicyConfigurationManager {
+
+    private PolicyManagementConfig currentPolicyConfig;
+    private static PolicyConfigurationManager policyConfigurationManager;
+
+    private final String deviceMgtConfigXMLPath = CarbonUtils.getCarbonConfigDirPath() + File.separator  +
+            PolicyManagementConstants.DEVICE_CONFIG_XML_NAME;
+
+    public static PolicyConfigurationManager getInstance() {
+        if (policyConfigurationManager == null) {
+            synchronized (PolicyConfigurationManager.class) {
+                if (policyConfigurationManager == null) {
+                    policyConfigurationManager = new PolicyConfigurationManager();
+                }
+            }
+        }
+        return policyConfigurationManager;
+    }
+
+    public synchronized void initConfig() throws PolicyManagementException {
+        try {
+            File deviceMgtConfig = new File(deviceMgtConfigXMLPath);
+            Document doc = PolicyManagerUtil.convertToDocument(deviceMgtConfig);
+
+            /* Un-marshaling Device Management configuration */
+            JAXBContext rssContext = JAXBContext.newInstance(PolicyManagementConfig.class);
+            Unmarshaller unmarshaller = rssContext.createUnmarshaller();
+            this.currentPolicyConfig = (PolicyManagementConfig) unmarshaller.unmarshal(doc);
+        } catch (Exception e) {
+            throw new PolicyManagementException("Error occurred while initializing RSS config", e);
+        }
+    }
+
+    public PolicyManagementConfig getDeviceManagementConfig() {
+        return currentPolicyConfig;
+    }
+
+    public DataSourceConfig getDataSourceConfig() {
+        return currentPolicyConfig.getPolicyManagementRepository().getDataSourceConfig();
+    }
+
+
+}

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/config/PolicyManagementConfig.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2014, 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.
+ * 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.policy.mgt.core.config;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Represents Device Mgt configuration.
+ */
+@XmlRootElement(name = "DeviceMgtConfiguration")
+public final class PolicyManagementConfig {
+
+    private PolicyManagementRepository policyManagementRepository;
+
+    @XmlElement(name = "ManagementRepository", nillable = false)
+    public PolicyManagementRepository getPolicyManagementRepository() {
+        return policyManagementRepository;
+    }
+
+    public void setPolicyMgtRepository(PolicyManagementRepository policyManagementRepository) {
+        this.policyManagementRepository = policyManagementRepository;
+    }
+
+}

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/config/PolicyManagementRepository.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2014, 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.
+ * 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.policy.mgt.core.config;
+
+import org.wso2.carbon.policy.mgt.core.config.datasource.DataSourceConfig;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Class for holding management repository data
+ */
+@XmlRootElement(name = "ManagementRepository")
+public class PolicyManagementRepository {
+
+    private DataSourceConfig dataSourceConfig;
+
+	@XmlElement(name = "DataSourceConfiguration", nillable = false)
+	public DataSourceConfig getDataSourceConfig() {
+		return dataSourceConfig;
+	}
+
+	public void setDataSourceConfig(DataSourceConfig dataSourceConfig) {
+		this.dataSourceConfig = dataSourceConfig;
+	}
+
+}

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/internal/PolicyManagementServiceComponent.java

@@ -0,0 +1,84 @@
+/**
+ *  Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  Licensed 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.policy.mgt.core.internal;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.osgi.service.component.ComponentContext;
+import org.wso2.carbon.policy.mgt.core.config.PolicyConfigurationManager;
+import org.wso2.carbon.policy.mgt.core.config.PolicyManagementConfig;
+import org.wso2.carbon.policy.mgt.core.config.datasource.DataSourceConfig;
+import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
+import org.wso2.carbon.user.core.service.RealmService;
+
+/**
+ * @scr.component name="org.wso2.carbon.policy.manager" immediate="true"
+ * @scr.reference name="user.realmservice.default"
+ * interface="org.wso2.carbon.user.core.service.RealmService"
+ * cardinality="1..1"
+ * policy="dynamic"
+ * bind="setRealmService"
+ * unbind="unsetRealmService"
+ */
+
+public class PolicyManagementServiceComponent {
+
+    private static Log log = LogFactory.getLog(PolicyManagementServiceComponent.class);
+
+    protected void activate(ComponentContext componentContext) {
+
+        try {
+
+            PolicyConfigurationManager.getInstance().initConfig();
+
+            PolicyManagementConfig config = PolicyConfigurationManager.getInstance().getDeviceManagementConfig();
+
+            DataSourceConfig dsConfig = config.getPolicyManagementRepository().getDataSourceConfig();
+            PolicyManagementDAOFactory.init(dsConfig);
+
+
+        } catch (Throwable t) {
+
+        }
+    }
+
+
+    /**
+     * Sets Realm Service
+     *
+     * @param realmService An instance of RealmService
+     */
+    protected void setRealmService(RealmService realmService) {
+
+        if (log.isDebugEnabled()) {
+            log.debug("Setting Realm Service");
+        }
+        PolicyManagementDataHolder.getInstance().setRealmService(realmService);
+    }
+
+    /**
+     * Unsets Realm Service
+     *
+     * @param realmService An instance of RealmService
+     */
+    protected void unsetRealmService(RealmService realmService) {
+        if (log.isDebugEnabled()) {
+            log.debug("Unsetting Realm Service");
+        }
+        PolicyManagementDataHolder.getInstance().setRealmService(null);
+    }
+
+}

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/util/PolicyManagementConstants.java

@@ -0,0 +1,24 @@
+/*
+*  Copyright (c) 2014 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.policy.mgt.core.util;
+
+public final class PolicyManagementConstants {
+
+    public static final String DEVICE_CONFIG_XML_NAME = "cdm-config.xml";
+}

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/util/PolicyManagerUtil.java

@@ -0,0 +1,85 @@
+/*
+*  Copyright (c) 2014 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.policy.mgt.core.util;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.w3c.dom.Document;
+import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
+import org.wso2.carbon.policy.mgt.core.config.datasource.DataSourceConfig;
+import org.wso2.carbon.policy.mgt.core.config.datasource.JNDILookupDefinition;
+import org.wso2.carbon.policy.mgt.core.dao.util.PolicyManagementDAOUtil;
+
+import javax.sql.DataSource;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.File;
+import java.util.Hashtable;
+import java.util.List;
+
+public class PolicyManagerUtil {
+
+    private static final Log log = LogFactory.getLog(PolicyManagerUtil.class);
+
+    public static Document convertToDocument(File file) throws PolicyManagementException {
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setNamespaceAware(true);
+        try {
+            DocumentBuilder docBuilder = factory.newDocumentBuilder();
+            return docBuilder.parse(file);
+        } catch (Exception e) {
+            throw new PolicyManagementException("Error occurred while parsing file, while converting " +
+                    "to a org.w3c.dom.Document : " + e.getMessage(), e);
+        }
+    }
+
+    /**
+     * Resolve data source from the data source definition
+     *
+     * @param config data source configuration
+     * @return data source resolved from the data source definition
+     */
+    public static DataSource resolveDataSource(DataSourceConfig config) {
+        DataSource dataSource = null;
+        if (config == null) {
+            throw new RuntimeException("Device Management Repository data source configuration " +
+                    "is null and thus, is not initialized");
+        }
+        JNDILookupDefinition jndiConfig = config.getJndiLookupDefintion();
+        if (jndiConfig != null) {
+            if (log.isDebugEnabled()) {
+                log.debug("Initializing Device Management Repository data source using the JNDI " +
+                        "Lookup Definition");
+            }
+            List<JNDILookupDefinition.JNDIProperty> jndiPropertyList =
+                    jndiConfig.getJndiProperties();
+            if (jndiPropertyList != null) {
+                Hashtable<Object, Object> jndiProperties = new Hashtable<Object, Object>();
+                for (JNDILookupDefinition.JNDIProperty prop : jndiPropertyList) {
+                    jndiProperties.put(prop.getName(), prop.getValue());
+                }
+                dataSource =
+                        PolicyManagementDAOUtil.lookupDataSource(jndiConfig.getJndiName(), jndiProperties);
+            } else {
+                dataSource = PolicyManagementDAOUtil.lookupDataSource(jndiConfig.getJndiName(), null);
+            }
+        }
+        return dataSource;
+    }
+}

components/policy-mgt/pom.xml

@@ -62,4 +62,24 @@
         </dependencies>
     </dependencyManagement>
 
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-scr-plugin</artifactId>
+                    <version>1.7.2</version>
+                    <executions>
+                        <execution>
+                            <id>generate-scr-scrdescriptor</id>
+                            <goals>
+                                <goal>scr</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
 </project>

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

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ Licensed 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.
+  -->
+
+<MobileDeviceMgtConfiguration>
+    <ManagementRepository>
+        <DataSourceConfiguration>
+            <JndiLookupDefinition>
+                <Name>jdbc/WSO2MOBILE_DB</Name>
+            </JndiLookupDefinition>
+        </DataSourceConfiguration>
+    </ManagementRepository>
+</MobileDeviceMgtConfiguration>

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

@@ -0,0 +1,2 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile_${feature.version}/conf/mobile-config.xml,target:${installFolder}/../../conf/mobile-config.xml,overwrite:true);\

features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ Licensed 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.wso2.carbon</groupId>
+        <artifactId>policy-mgt-feature</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.policy.mgt.server.feature</artifactId>
+    <packaging>pom</packaging>
+    <version>2.0.0-SNAPSHOT</version>
+    <name>WSO2 Carbon - Policy Management Server Feature</name>
+    <url>http://wso2.org</url>
+    <description>This feature contains the core bundles required for Back-end Devvice Management functionality
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.eclipse.osgi</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.equinox</groupId>
+            <artifactId>org.eclipse.equinox.common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>src/main/resources</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>resources</directory>
+                                    <includes>
+                                        <include>build.properties</include>
+                                        <include>p2.inf</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>org.wso2.carbon.policy.mgt.server</id>
+                            <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
+                            <adviceFile>
+                                <properties>
+                                    <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
+                                    <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
+                                </properties>
+                            </adviceFile>
+                            <bundles>
+                                <bundleDef>org.wso2.carbon:org.wso2.carbon.policy.mgt.core:${project.version}
+                                </bundleDef>
+                                <bundleDef>org.wso2.carbon:org.wso2.carbon.policy.mgt.common:${project.version}
+                                </bundleDef>
+                            </bundles>
+                            <importFeatures>
+                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.platform.version}
+                                </importFeatureDef>
+                            </importFeatures>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/src/main/resources/build.properties

@@ -0,0 +1 @@
+custom = true

features/policy-mgt/pom.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+~ Copyright (c) 2014, 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>org.wso2.carbon</groupId>
+        <artifactId>wso2cdm-parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.wso2.carbon</groupId>
+    <artifactId>policy-mgt-feature</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>WSO2 Carbon - Policy Management Feature</name>
+    <url>http://wso2.org</url>
+
+    <modules>
+        <module>org.wso2.carbon.policy.mgt.server.feature</module>
+    </modules>
+
+</project>

pom.xml

@@ -40,6 +40,7 @@
         <module>components/device-mgt</module>
         <module>components/policy-mgt</module>
         <module>features/device-mgt</module>
+        <module>features/policy-mgt</module>
         <module>product</module>
     </modules>
 
@@ -121,6 +122,11 @@
                 <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
 
             <!--Osgi dependencies-->

product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Authentication.java

@@ -16,8 +16,6 @@
 
 package cdm.api.android;
 
-import com.google.gson.JsonObject;
-
 import javax.ws.rs.*;
 
 @Produces({ "application/json", "application/xml" })
@@ -29,16 +27,16 @@ public class Authentication {
     @Path("/device/")
     public String authenticateDevice(@FormParam("username") String username,
             @FormParam("password") String password) {
-        JsonObject result = new JsonObject();
+/*        JsonObject result = new JsonObject();
-        result.addProperty("senderId", "jwwfowrjwqporqwrpqworpq");
+        result.addProperty("senderId", "jwwfowrjwqporqwrpqworpq");*/
-        return result.toString();
+        return "";
     }
 
     @POST
     @Path("/device/license")
     public String getLicense() {
-        JsonObject result = new JsonObject();
+/*        JsonObject result = new JsonObject();
-        result.addProperty("licenseText", "License Agreement");
+        result.addProperty("licenseText", "License Agreement");*/
-        return result.toString();
+        return "";
     }
 }

product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Device.java

@@ -104,7 +104,7 @@ public class Device {
 
     @PUT
     @Path("{id}")
-    public Message updateDevice(@PathParam("id") String id, String jsonPayload) {
+    public Message updateDevice(@PathParam("id") String id, org.wso2.carbon.device.mgt.common.Device device) {
 
         boolean result = false;
         String msg = "";
@@ -116,8 +116,6 @@ public class Device {
         } finally {
             PrivilegedCarbonContext.endTenantFlow();
         }
-        org.wso2.carbon.device.mgt.common.Device device =
-                AndroidAPIUtils.convertToDeviceObject(jsonPayload);
         try {
             if (dmService != null) {
                 result = dmService.updateDeviceInfo(device);

product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/Enrollment.java

@@ -41,7 +41,7 @@ public class Enrollment {
     private static Log log = LogFactory.getLog(Enrollment.class);
 
     @POST
-    public Message enrollDevice(String jsonPayload) {
+    public Message enrollDevice(Device device) {
 
         boolean result = false;
         int status = 0;
@@ -54,7 +54,7 @@ public class Enrollment {
         } finally {
             PrivilegedCarbonContext.endTenantFlow();
         }
-        Device device = AndroidAPIUtils.convertToDeviceObject(jsonPayload);
+
         try {
             if (dmService != null) {
                 result = dmService.enrollDevice(device);
@@ -120,7 +120,7 @@ public class Enrollment {
 
     @PUT
     @Path("{id}")
-    public Message modifyEnrollment(@PathParam("id") String id, String jsonPayload) {
+    public Message modifyEnrollment(@PathParam("id") String id, Device device) {
         boolean result = false;
         String msg = "";
         DeviceManagementService dmService;
@@ -131,7 +131,7 @@ public class Enrollment {
         } finally {
             PrivilegedCarbonContext.endTenantFlow();
         }
-        Device device = AndroidAPIUtils.convertToDeviceObject(jsonPayload);
+
         try {
             if (dmService != null) {
                 result = dmService.modifyEnrollment(device);

product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/common/ErrorHandler.java

@@ -26,7 +26,7 @@ public class ErrorHandler implements ExceptionMapper {
     @Override public Response toResponse(Throwable throwable) {
         Response.Status status;
         status = Response.Status.INTERNAL_SERVER_ERROR;
-
+      //  return Response.status(status).header("exception", exception.getMessage()).build();
-        return Response.status(status).header("exception", exception.getMessage()).build();
+        return null;
     }
 }

product/modules/agents/android/jax-rs/src/main/java/cdm/api/android/util/AndroidAPIUtils.java

@@ -16,9 +16,6 @@
 
 package cdm.api.android.util;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.*;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementService;
@@ -31,82 +28,6 @@ import java.util.*;
  */
 public class AndroidAPIUtils {
 
-	public static Device convertToDeviceObject(String jsonString) {
-		JsonObject obj = new Gson().fromJson(jsonString, JsonObject.class);
-		Device device = new Device();
-		device.setType(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
-		if (obj.get(AndroidConstants.DeviceConstants.DEVICE_MAC_KEY) != null) {
-			device.setDeviceIdentifier(
-					obj.get(AndroidConstants.DeviceConstants.DEVICE_MAC_KEY).getAsString());
-		}
-		if (obj.get(AndroidConstants.DeviceConstants.DEVICE_DESCRIPTION_KEY) != null) {
-			device.setDescription(
-					obj.get(AndroidConstants.DeviceConstants.DEVICE_DESCRIPTION_KEY).getAsString());
-		}
-		if (obj.get(AndroidConstants.DeviceConstants.DEVICE_OWNERSHIP_KEY) != null) {
-			device.setOwnership(
-					obj.get(AndroidConstants.DeviceConstants.DEVICE_OWNERSHIP_KEY).getAsString());
-		}
-
-		if (obj.get(AndroidConstants.DeviceConstants.DEVICE_PROPERTIES_KEY) != null) {
-			JsonObject properties =
-					new Gson().fromJson(
-							obj.get(AndroidConstants.DeviceConstants.DEVICE_PROPERTIES_KEY)
-							, JsonObject.class);
-			if (properties.get(AndroidConstants.DeviceProperties.PROPERTY_USER_KEY) != null) {
-				device.setOwner(properties.get(AndroidConstants.DeviceProperties.PROPERTY_USER_KEY)
-				                          .getAsString());
-			}
-			if (properties.get(AndroidConstants.DeviceProperties.PROPERTY_DEVICE_KEY) != null) {
-				device.setName(properties.get(AndroidConstants.DeviceProperties.PROPERTY_DEVICE_KEY)
-				                         .getAsString());
-			}
-			device.setProperties(parseProperties(properties));
-		}else{
-			device.setProperties(new ArrayList<Device.Property>(0));
-		}
-
-		if (obj.get(AndroidConstants.DeviceConstants.DEVICE_FEATURES_KEY) != null) {
-			JsonObject features =
-					new Gson().fromJson(
-							obj.get(AndroidConstants.DeviceConstants.DEVICE_FEATURES_KEY),
-							JsonObject.class);
-			device.setFeatures(parseFeatures(features));
-		}else{
-			device.setFeatures(new ArrayList<Feature>(0));
-		}
-		return device;
-	}
-
-	private static List<Device.Property> parseProperties(JsonObject properties) {
-		List<Device.Property> propertyList = new ArrayList<Device.Property>(0);
-		for (Map.Entry<String, JsonElement> entry : properties.entrySet()) {
-			propertyList.add(parseProperty(entry.getKey(), entry.getValue()));
-		}
-		//		propertyList.add(parseProperty("regid", properties.get("regid").getAsString()));
-		//		propertyList.add(parseProperty("osversion", properties.get("osversion").getAsString()));
-		//		propertyList.add(parseProperty("vendor", properties.get("vendor").getAsString()));
-		//		propertyList.add(parseProperty("imei", properties.get("imei").getAsString()));
-		//		propertyList.add(parseProperty("imsi", properties.get("imsi").getAsString()));
-		//		propertyList.add(parseProperty("model", properties.get("model").getAsString()));
-		return propertyList;
-	}
-
-	private static List<Feature> parseFeatures(JsonObject features) {
-        return new ArrayList<Feature>(0);
-	}
-
-	private static Device.Property parseProperty(String property, JsonElement value) {
-        Device.Property prop = new Device.Property();
-		prop.setName(property);
-		prop.setValue(value.getAsString());
-		return prop;
-	}
-
-	private static Feature parseFeature(JsonElement featureElement) {
-        return new Feature();
-	}
-
 	public static DeviceIdentifier convertToDeviceIdentifierObject(String deviceId) {
 		DeviceIdentifier identifier = new DeviceIdentifier();
 		identifier.setId(deviceId);

product/modules/distribution/src/assembly/bin.xml

@@ -323,6 +323,15 @@
             <fileMode>644</fileMode>
         </file>
 
+        <!--cdm plugin config file-->
+        <file>
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/mobile-config.xml
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
+
 
         <file>
             <source>
@@ -333,14 +342,6 @@
             <fileMode>644</fileMode>
         </file>
 
-        <!-- nTask Component -->
-        <!--        <file>
-                    <source>
-                        ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/tasks-config.xml
-                    </source>
-                    <outputDirectory>wso2cdm-${project.version}/repository/conf/etc</outputDirectory>
-                </file>-->
 
-        <!-- End - nTask Component -->
     </files>
 </assembly>

product/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml

@@ -6,7 +6,7 @@
     <datasources>
         <datasource>
             <name>WSO2DEVICE_DB</name>
-            <description>The datasource used for EMM</description>
+            <description>The datasource used for CDM</description>
             <jndiConfig>
                 <name>jdbc/WSO2DEVICE_DB</name>
             </jndiConfig>
@@ -24,5 +24,25 @@
                 </configuration>
             </definition>
         </datasource>
+        <datasource>
+            <name>WSO2MOBILE_DB</name>
+            <description>The datasource used for CDM Mobile Device Management</description>
+            <jndiConfig>
+                <name>jdbc/WSO2MOBILE_DB</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/WSO2MOBILE_DB;DB_CLOSE_ON_EXIT=FALSE</url>
+                    <username>wso2carbon</username>
+                    <password>wso2carbon</password>
+                    <driverClassName>org.h2.Driver</driverClassName>
+                    <maxActive>50</maxActive>
+                    <maxWait>60000</maxWait>
+                    <testOnBorrow>true</testOnBorrow>
+                    <validationQuery>SELECT 1</validationQuery>
+                    <validationInterval>30000</validationInterval>
+                </configuration>
+            </definition>
+        </datasource>
     </datasources>
 </datasources-configuration>

product/modules/distribution/src/repository/dbscripts/cdm/plugins/h2.sql

@@ -0,0 +1,38 @@
+CREATE TABLE IF NOT EXISTS MBL_OS_VERSION
+(
+     VERSION_ID         INT NOT NULL AUTO_INCREMENT,
+     NAME               VARCHAR(45) NULL DEFAULT NULL,
+     PRIMARY KEY (VERSION_ID)
+);
+
+CREATE TABLE IF NOT EXISTS MBL_DEVICE_MODEL
+(
+     MODEL_ID         INT NOT NULL AUTO_INCREMENT,
+     MODEL            VARCHAR(45) NULL DEFAULT NULL,
+     PRIMARY KEY (MODEL_ID)
+);
+
+ CREATE TABLE IF NOT EXISTS MBL_VENDOR
+(
+     VENDOR_ID         INT NOT NULL AUTO_INCREMENT,
+     VENDOR            VARCHAR(45) NULL DEFAULT NULL,
+     PRIMARY KEY (VENDOR_ID)
+);
+
+CREATE TABLE IF NOT EXISTS MBL_DEVICE
+(
+     MOBILE_DEVICE_ID      VARCHAR(45) NOT NULL,
+     REG_ID                VARCHAR(45) NOT NULL,
+     IMEI                  VARCHAR(45) NOT NULL,
+     IMSI                  VARCHAR(45) NOT NULL,
+     OS_VERSION_ID         INT NOT NULL,
+     DEVICE_MODEL_ID       INT NOT NULL,
+     VENDOR_ID             INT NOT NULL,
+     PRIMARY KEY (MOBILE_DEVICE_ID),
+     CONSTRAINT fk_DEVICE_OS_VERSION1 FOREIGN KEY (OS_VERSION_ID )
+     REFERENCES MBL_OS_VERSION (VERSION_ID ) ON DELETE NO ACTION ON UPDATE NO ACTION,
+     CONSTRAINT fk_DEVICE_DEVICE_MODEL2 FOREIGN KEY (DEVICE_MODEL_ID )
+     REFERENCES MBL_DEVICE_MODEL (MODEL_ID ) ON DELETE NO ACTION ON UPDATE NO ACTION,
+     CONSTRAINT fk_DEVICE_VENDOR1 FOREIGN KEY (VENDOR_ID )
+     REFERENCES MBL_VENDOR (VENDOR_ID ) ON DELETE NO ACTION ON UPDATE NO ACTION
+);

product/modules/distribution/src/repository/dbscripts/cdm/plugins/mysql.sql

@@ -0,0 +1,63 @@
+-- -----------------------------------------------------
+-- Table `MBL_OS_VERSION`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `MBL_OS_VERSION` (
+  `VERSION_ID` INT NOT NULL AUTO_INCREMENT,
+  `VERSION` VARCHAR(45) NULL,
+  PRIMARY KEY (`VERSION_ID`))
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `MBL_DEVICE_MODEL`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `MBL_DEVICE_MODEL` (
+  `MODEL_ID` INT NOT NULL AUTO_INCREMENT,
+  `MODEL` VARCHAR(45) NULL,
+  PRIMARY KEY (`MODEL_ID`))
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `MBL_VENDOR`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `MBL_VENDOR` (
+  `VENDOR_ID` INT NOT NULL AUTO_INCREMENT,
+  `VENDOR` VARCHAR(45) NULL,
+  PRIMARY KEY (`VENDOR_ID`))
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `MBL_DEVICE`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `MBL_DEVICE` (
+  `MOBILE_DEVICE_ID` VARCHAR(45) NOT NULL,
+  `REG_ID` VARCHAR(45) NULL,
+  `IMEI` VARCHAR(45) NULL,
+  `IMSI` VARCHAR(45) NULL,
+  `OS_VERSION_ID` INT NOT NULL,
+  `DEVICE_MODEL_ID` INT NOT NULL,
+  `VENDOR_ID` INT NOT NULL,
+  PRIMARY KEY (`MOBILE_DEVICE_ID`),
+  INDEX `fk_DEVICE_OS_VERSION1_idx` (`OS_VERSION_ID` ASC),
+  INDEX `fk_DEVICE_DEVICE_MODEL2_idx` (`DEVICE_MODEL_ID` ASC),
+  INDEX `fk_DEVICE_VENDOR1_idx` (`VENDOR_ID` ASC),
+  CONSTRAINT `fk_DEVICE_OS_VERSION1`
+    FOREIGN KEY (`OS_VERSION_ID`)
+    REFERENCES `MBL_OS_VERSION` (`VERSION_ID`)
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION,
+  CONSTRAINT `fk_DEVICE_DEVICE_MODEL2`
+    FOREIGN KEY (`DEVICE_MODEL_ID`)
+    REFERENCES `MBL_DEVICE_MODEL` (`MODEL_ID`)
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION,
+  CONSTRAINT `fk_DEVICE_VENDOR1`
+    FOREIGN KEY (`VENDOR_ID`)
+    REFERENCES `MBL_VENDOR` (`VENDOR_ID`)
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION)
+ENGINE = InnoDB;
+
+

product/modules/p2-profile-gen/pom.xml

@@ -110,6 +110,12 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.device.mgt.mobile.feature:${project.version}
                                 </featureArtifactDef>
+
+
+                                <featureArtifactDef>
+                                    org.wso2.carbon:org.wso2.carbon.policy.mgt.server.feature:${project.version}
+                                </featureArtifactDef>
+
                                 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.webapp.mgt.feature:${carbon.platform.version}
                                 </featureArtifactDef>
@@ -168,6 +174,12 @@
                                     <id>org.wso2.carbon.device.mgt.mobile.feature.group</id>
                                     <version>${project.version}</version>
                                 </feature>
+
+                                <feature>
+                                    <id>org.wso2.carbon.policy.mgt.server.feature.group</id>
+                                    <version>${project.version}</version>
+                                </feature>
+
                                 <feature>
                                     <id>org.wso2.carbon.webapp.mgt.feature.group</id>
                                     <version>${carbon.platform.version}</version>