Making the plugin resolution optional for the core component

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

@@ -41,7 +41,7 @@ import org.wso2.carbon.user.core.service.RealmService;
  * unbind="unsetRealmService"
  * @scr.reference name="device.manager.service"
  * interface="org.wso2.carbon.device.mgt.common.spi.DeviceManagerService"
- * cardinality="1..n"
+ * cardinality="0..n"
  * policy="dynamic"
  * bind="setDeviceManagerService"
  * unbind="unsetDeviceManagerService"

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,73 @@
+/*
+ * 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.device.mgt.mobile.impl.config;
+
+import org.w3c.dom.Document;
+import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
+import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.core.config.datasource.DataSourceConfig;
+import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
+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 MobileDeviceManagementConfig currentDeviceConfig;
+    private static MobileDeviceConfigurationManager deviceConfigManager;
+
+    private final String deviceMgtConfigXMLPath = CarbonUtils.getCarbonConfigDirPath() + File.separator  +
+            DeviceManagementConstants.DataSourceProperties.DEVICE_CONFIG_XML_NAME;
+
+    public static MobileDeviceConfigurationManager getInstance() {
+        if (deviceConfigManager == null) {
+            synchronized (MobileDeviceConfigurationManager.class) {
+                if (deviceConfigManager == null) {
+                    deviceConfigManager = new MobileDeviceConfigurationManager();
+                }
+            }
+        }
+        return deviceConfigManager;
+    }
+
+    public synchronized void initConfig() throws DeviceManagementException {
+        try {
+            File deviceMgtConfig = new File(deviceMgtConfigXMLPath);
+            Document doc = DeviceManagerUtil.convertToDocument(deviceMgtConfig);
+
+            /* Un-marshaling Device Management configuration */
+            JAXBContext rssContext = JAXBContext.newInstance(MobileDeviceManagementConfig.class);
+            Unmarshaller unmarshaller = rssContext.createUnmarshaller();
+            this.currentDeviceConfig = (MobileDeviceManagementConfig) unmarshaller.unmarshal(doc);
+        } catch (Exception e) {
+            throw new DeviceManagementException("Error occurred while initializing RSS config", e);
+        }
+    }
+
+    public MobileDeviceManagementConfig getDeviceManagementConfig() {
+        return currentDeviceConfig;
+    }
+
+    public DataSourceConfig getDataSourceConfig() {
+        return currentDeviceConfig.getMobileDeviceMgtRepository().getDataSourceConfig();
+    }
+
+}

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,38 @@
+/*
+ * 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 Device Mgt configuration.
+ */
+@XmlRootElement(name = "MobileDeviceMgtConfiguration")
+public final class MobileDeviceManagementConfig {
+
+    private DeviceManagementRepository deviceMgtRepository;
+
+    @XmlElement(name = "ManagementRepository", nillable = false)
+    public DeviceManagementRepository getDeviceMgtRepository() {
+        return deviceMgtRepository;
+    }
+
+    public void setDeviceMgtRepository(DeviceManagementRepository deviceMgtRepository) {
+        this.deviceMgtRepository = deviceMgtRepository;
+    }
+
+}

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.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 MobileDeviceManagementRepository {
+
+    private DataSourceConfig dataSourceConfig;
+
+	@XmlElement(name = "DataSourceConfiguration", nillable = false)
+	public DataSourceConfig getDataSourceConfig() {
+		return dataSourceConfig;
+	}
+
+	public void setDataSourceConfig(DataSourceConfig dataSourceConfig) {
+		this.dataSourceConfig = dataSourceConfig;
+	}
+
+}

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,76 @@
+/*
+ * 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.device.mgt.mobile.impl.config.datasource;
+
+import javax.xml.bind.annotation.*;
+import java.util.List;
+
+/**
+ * Class for hold JndiLookupDefinition of rss-manager.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/MobileDeviceManagementDAOFactory.java

@@ -0,0 +1,7 @@
+package org.wso2.carbon.device.mgt.mobile.impl.dao;
+
+/**
+ * Created by harshan on 12/15/14.
+ */
+public class MobileDeviceManagementDAOFactory {
+}

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/util/MobileDeviceManagementSchemaInitializer.java

@@ -0,0 +1,44 @@
+/*
+ * 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.device.mgt.mobile.impl.util;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.device.mgt.core.config.datasource.DataSourceConfig;
+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(DeviceManagementSchemaInitializer.class);
+    private static final String setupSQLScriptBaseLocation =
+            CarbonUtils.getCarbonHome() + File.separator + "dbscripts" + File.separator + "cdm" + File.separator;
+
+    public MobileDeviceManagementSchemaInitializer(DataSourceConfig config) {
+        super(DeviceManagerUtil.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,7 @@
+package org.wso2.carbon.device.mgt.mobile.impl.util;
+
+/**
+ * Created by harshan on 12/15/14.
+ */
+public class MobileDeviceManagerUtil {
+}

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 `mydb`.`MBL_OS_VERSION` (`VERSION_ID`)
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION,
+  CONSTRAINT `fk_DEVICE_DEVICE_MODEL2`
+    FOREIGN KEY (`DEVICE_MODEL_ID`)
+    REFERENCES `mydb`.`MBL_DEVICE_MODEL` (`MODEL_ID`)
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION,
+  CONSTRAINT `fk_DEVICE_VENDOR1`
+    FOREIGN KEY (`VENDOR_ID`)
+    REFERENCES `mydb`.`MBL_VENDOR` (`VENDOR_ID`)
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION)
+ENGINE = InnoDB;
+
+