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

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

@@ -73,6 +73,9 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.18</version>
                 <configuration>
+		    <systemPropertyVariables>
+                         <log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration>
+                    </systemPropertyVariables>
                     <suiteXmlFiles>
                         <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
                     </suiteXmlFiles>

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

@@ -0,0 +1,84 @@
+/**
+ *  Copyright (c) 2012, 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;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.apimgt.api.APIManagementException;
+import org.wso2.carbon.apimgt.api.APIProvider;
+import org.wso2.carbon.apimgt.impl.APIManagerFactory;
+import org.wso2.carbon.core.ServerStartupObserver;
+import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.mobile.config.APIConfig;
+import org.wso2.carbon.device.mgt.mobile.config.MobileDeviceConfigurationManager;
+import org.wso2.carbon.device.mgt.mobile.util.DeviceManagementAPIPublisherUtil;
+
+import java.util.List;
+
+public class MobileDeviceManagementStartupObserver implements ServerStartupObserver {
+
+    private static final Log log = LogFactory.getLog(MobileDeviceManagementStartupObserver.class);
+
+    public void completingServerStartup() {
+
+    }
+
+    public void completedServerStartup() {
+        try {
+            this.initAPIConfigs();
+	        /* Publish all mobile device management related JAX-RS services as APIs */
+            this.publishAPIs();
+        } catch (DeviceManagementException e) {
+            log.error("Error occurred while publishing Mobile Device Management related APIs", e);
+        }
+    }
+
+    private void initAPIConfigs() throws DeviceManagementException {
+        if (log.isDebugEnabled()) {
+            log.debug("Initializing Mobile Device Management related APIs");
+        }
+        List<APIConfig> apiConfigs =
+                MobileDeviceConfigurationManager.getInstance().getMobileDeviceManagementConfig().
+                        getApiPublisherConfig().getAPIs();
+        for (APIConfig apiConfig : apiConfigs) {
+            try {
+                APIProvider provider =
+                        APIManagerFactory.getInstance().getAPIProvider(apiConfig.getOwner());
+                apiConfig.init(provider);
+            } catch (APIManagementException e) {
+                throw new DeviceManagementException("Error occurred while initializing API Config '" +
+                        apiConfig.getName() + "'", e);
+            }
+        }
+    }
+
+    private void publishAPIs() throws DeviceManagementException {
+        if (log.isDebugEnabled()) {
+            log.debug("Publishing Mobile Device Management related APIs");
+        }
+        List<APIConfig> apiConfigs =
+                MobileDeviceConfigurationManager.getInstance().getMobileDeviceManagementConfig().
+                        getApiPublisherConfig().getAPIs();
+        for (APIConfig apiConfig : apiConfigs) {
+            DeviceManagementAPIPublisherUtil.publishAPI(apiConfig);
+            if (log.isDebugEnabled()) {
+                log.debug("Successfully published API '" + apiConfig.getName() + "' with the context '" +
+                        apiConfig.getContext() + "' and version '" + apiConfig.getVersion() + "'");
+            }
+        }
+    }
+
+}

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

@@ -24,8 +24,11 @@ import org.wso2.carbon.apimgt.api.APIManagementException;
 import org.wso2.carbon.apimgt.api.APIProvider;
 import org.wso2.carbon.apimgt.impl.APIManagerConfigurationService;
 import org.wso2.carbon.apimgt.impl.APIManagerFactory;
+import org.wso2.carbon.apimgt.impl.utils.APIMgtDBUtil;
+import org.wso2.carbon.core.ServerStartupObserver;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagerService;
+import org.wso2.carbon.device.mgt.mobile.MobileDeviceManagementStartupObserver;
 import org.wso2.carbon.device.mgt.mobile.config.APIConfig;
 import org.wso2.carbon.device.mgt.mobile.config.MobileDeviceConfigurationManager;
 import org.wso2.carbon.device.mgt.mobile.config.MobileDeviceManagementConfig;
@@ -55,10 +58,10 @@ import java.util.List;
  */
 public class MobileDeviceManagementServiceComponent {
 
-	private static final String SETUP_COMMAND = "setup";
     private ServiceRegistration androidServiceRegRef;
     private ServiceRegistration iOSServiceRegRef;
     private ServiceRegistration windowsServiceRegRef;
+    private ServiceRegistration serverStartupObserverRef;
 
     private static final Log log = LogFactory.getLog(MobileDeviceManagementServiceComponent.class);
 
@@ -78,7 +81,7 @@ public class MobileDeviceManagementServiceComponent {
 
             MobileDeviceManagementDAOFactory.setMobileDataSourceConfig(dsConfig);
             MobileDeviceManagementDAOFactory.init();
-			String setupOption = System.getProperty(SETUP_COMMAND);
+            String setupOption = System.getProperty("setup");
             if (setupOption != null) {
                 if (log.isDebugEnabled()) {
                     log.debug(
@@ -89,9 +92,7 @@ public class MobileDeviceManagementServiceComponent {
                     MobileDeviceManagementDAOUtil.setupMobileDeviceManagementSchema(
                             MobileDeviceManagementDAOFactory.getDataSource());
                 } catch (DeviceManagementException e) {
-					log.error(
+                    log.error("Exception occurred while initializing mobile device management database schema", e);
-							"Exception occurred while initializing mobile device management database schema",
-							e);
                 }
             }
 
@@ -105,18 +106,13 @@ public class MobileDeviceManagementServiceComponent {
                     bundleContext.registerService(DeviceManagerService.class.getName(),
                             new WindowsDeviceManagerService(), null);
 
-            /* Initialize all API configurations with corresponding API Providers */
+            serverStartupObserverRef = bundleContext.registerService(ServerStartupObserver.class,
-			this.initAPIConfigs();
+                    new MobileDeviceManagementStartupObserver(), null);
-	        /* Publish all mobile device management related JAX-RS services as APIs */
-			this.publishAPIs();
-
             if (log.isDebugEnabled()) {
-				log.debug(
+                log.debug("Mobile Device Management Service Component has been successfully activated");
-						"Mobile Device Management Service Component has been successfully activated");
             }
         } catch (Throwable e) {
-			log.error("Error occurred while activating Mobile Device Management Service Component",
+            log.error("Error occurred while activating Mobile Device Management Service Component", e);
-			          e);
         }
     }
 
@@ -125,11 +121,10 @@ public class MobileDeviceManagementServiceComponent {
             log.debug("De-activating Mobile Device Management Service Component");
         }
         try {
-			BundleContext bundleContext = ctx.getBundleContext();
-
             androidServiceRegRef.unregister();
             iOSServiceRegRef.unregister();
             windowsServiceRegRef.unregister();
+            serverStartupObserverRef.unregister();
 
             /* Removing all APIs published upon start-up for mobile device management related JAX-RS
                services */
@@ -143,32 +138,6 @@ public class MobileDeviceManagementServiceComponent {
         }
     }
 
-	private void initAPIConfigs() throws DeviceManagementException {
-		List<APIConfig> apiConfigs =
-				MobileDeviceConfigurationManager.getInstance().getMobileDeviceManagementConfig().
-						getApiPublisherConfig().getAPIs();
-		for (APIConfig apiConfig : apiConfigs) {
-			try {
-				APIProvider provider =
-						APIManagerFactory.getInstance().getAPIProvider(apiConfig.getOwner());
-				apiConfig.init(provider);
-			} catch (APIManagementException e) {
-				throw new DeviceManagementException(
-						"Error occurred while initializing API Config '" +
-						apiConfig.getName() + "'", e);
-			}
-		}
-	}
-
-	private void publishAPIs() throws DeviceManagementException {
-		List<APIConfig> apiConfigs =
-				MobileDeviceConfigurationManager.getInstance().getMobileDeviceManagementConfig().
-						getApiPublisherConfig().getAPIs();
-		for (APIConfig apiConfig : apiConfigs) {
-			DeviceManagementAPIPublisherUtil.publishAPI(apiConfig);
-		}
-	}
-
     private void removeAPIs() throws DeviceManagementException {
         List<APIConfig> apiConfigs =
                 MobileDeviceConfigurationManager.getInstance().getMobileDeviceManagementConfig().

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/java/org/wso2/carbon/device/mgt/mobile/impl/dao/MobileFeatureDAOTestSuite.java

@@ -19,6 +19,8 @@
 package org.wso2.carbon.device.mgt.mobile.impl.dao;
 
 import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Parameters;
@@ -44,6 +46,7 @@ import java.util.List;
 
 public class MobileFeatureDAOTestSuite {
 
+	private static final Log log = LogFactory.getLog(MobileFeatureDAOTestSuite.class);
 	public static final String MBL_FEATURE_NAME = "Camera";
 	private static final String MBL_FEATURE_CODE = "500A";
 	public static final String MBL_FEATURE_DESCRIPTION = "Camera enable or disable";
@@ -139,6 +142,7 @@ public class MobileFeatureDAOTestSuite {
 			}
 			conn.close();
 		} catch (SQLException e) {
+			log.error("Error in retrieving Mobile Feature data ", e);
 			throw new MobileDeviceManagementDAOException("Error in retrieving Mobile Feature data ",
 			                                             e);
 		} finally {
@@ -182,6 +186,7 @@ public class MobileFeatureDAOTestSuite {
 			}
 			conn.close();
 		} catch (SQLException e) {
+			log.error("Error in deleting Mobile Feature data ", e);
 			throw new MobileDeviceManagementDAOException("Error in deleting Mobile Feature data ",
 			                                             e);
 		} finally {
@@ -228,6 +233,7 @@ public class MobileFeatureDAOTestSuite {
 			}
 			conn.close();
 		} catch (SQLException e) {
+			log.error("Error in deleting Mobile Feature data ", e);
 			throw new MobileDeviceManagementDAOException("Error in deleting Mobile Feature data ",
 			                                             e);
 		} finally {
@@ -252,8 +258,8 @@ public class MobileFeatureDAOTestSuite {
 			stmt = conn.createStatement();
 			ResultSet resultSet = stmt
 					.executeQuery(
-							"SELECT FEATURE_ID, CODE, NAME, DESCRIPTION FROM MBL_FEATURE WHERE CODE = " +
+							"SELECT FEATURE_ID, CODE, NAME, DESCRIPTION FROM MBL_FEATURE WHERE CODE = '" +
-							MBL_FEATURE_UPDATED_CODE);
+							MBL_FEATURE_UPDATED_CODE + "'");
 			while (resultSet.next()) {
 				testMblFeature.setId(resultSet.getInt(1));
 				testMblFeature.setCode(resultSet.getString(2));
@@ -262,6 +268,7 @@ public class MobileFeatureDAOTestSuite {
 			}
 			conn.close();
 		} catch (SQLException e) {
+			log.error("Error in updating Mobile Feature data ", e);
 			throw new MobileDeviceManagementDAOException("Error in updating Mobile Feature data ",
 			                                             e);
 		} finally {

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/resources/log4j.properties

@@ -0,0 +1,32 @@
+#
+# Copyright 2009 WSO2, Inc. (http://wso2.com)
+#
+# 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.
+#
+
+#
+# This is the log4j configuration file used by WSO2 Carbon
+#
+# IMPORTANT : Please do not remove or change the names of any
+# of the Appenders defined here. The layout pattern & log file
+# can be changed using the WSO2 Carbon Management Console, and those
+# settings will override the settings in this file.
+#
+
+log4j.rootLogger=DEBUG, STD_OUT
+ 
+# Redirect log messages to console
+log4j.appender.STD_OUT=org.apache.log4j.ConsoleAppender
+log4j.appender.STD_OUT.Target=System.out
+log4j.appender.STD_OUT.layout=org.apache.log4j.PatternLayout
+log4j.appender.STD_OUT.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n

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

@@ -210,7 +210,7 @@
 
         <!-- Copying Device Management related dbscripts -->
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm</directory>
+            <directory>../distribution/src/repository/dbscripts/cdm</directory>
             <outputDirectory>wso2mdm-${project.version}/dbscripts/cdm</outputDirectory>
             <includes>
                 <include>*/**</include>
@@ -470,5 +470,11 @@
             <fileMode>644</fileMode>
         </file>
 
+	<file>
+            <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
+            <filtered>true</filtered>
+        </file>
+
     </files>
 </assembly>

product/modules/mobileservices/agents/android/jax-rs/src/main/java/Licenses.java

@@ -1,45 +0,0 @@
-/*
- *
- *  * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *  *
- *  * WSO2 Inc. licenses this file to you under the Apache License,
- *  * Version 2.0 (the "License"); you may not use this file except
- *  * in compliance with the License.
- *  * You may obtain a copy of the License at
- *  *
- *  * http://www.apache.org/licenses/LICENSE-2.0
- *  *
- *  * Unless required by applicable law or agreed to in writing,
- *  * software distributed under the License is distributed on an
- *  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  * KIND, either express or implied.  See the License for the
- *  * specific language governing permissions and limitations
- *  * under the License.
- * /
- */
-
-import org.wso2.cdmserver.mobileservices.android.common.AndroidAgentException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.License;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-
-/**
- * License Management related JAX RS APIs
- */
-
-@Produces({ "application/json", "application/xml" })
-@Consumes({ "application/json", "application/xml" })
-public class Licenses {
-
-    private static Log log = LogFactory.getLog(Licenses.class);
-
-    @GET
-    public License getLicense(String deviceType) throws AndroidAgentException {
-        return null;
-    }
-
-}

product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Test.java

@@ -1,35 +0,0 @@
-package org.wso2.cdmserver.mobileservices.android;
-
-import org.wso2.carbon.device.mgt.common.*;
-import org.wso2.carbon.device.mgt.common.Device;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * This is a Test class
- */
-@Produces({"application/json", "application/xml"})
-@Consumes({"application/json", "application/xml"})
-public class Test {
-
-    @GET
-    public List<org.wso2.carbon.device.mgt.common.Device> getAllDevices() throws DeviceManagementException{
-
-        Device dev = new Device();
-        dev.setName("test1");
-        dev.setDateOfEnrolment(11111111L);
-        dev.setDateOfLastUpdate(992093209L);
-        dev.setDescription("sassasaas");
-
-        ArrayList<Device> listdevices = new ArrayList<Device>();
-        listdevices.add(dev);
-        throw new DeviceManagementException("test ex");
-
-   }
-}