revert-70aa11f8
Geeth Munasinghe 10 years ago
commit 137023aa8b

@ -0,0 +1,22 @@
/**
* 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;
public interface DataSourceListener {
void notifyObserver();
}

@ -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);
}
}

@ -16,6 +16,9 @@
package org.wso2.carbon.device.mgt.mobile.impl.dao.util; 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.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.Device;
@ -35,6 +38,10 @@ import java.util.Hashtable;
*/ */
public class MobileDeviceManagementDAOUtil { public class MobileDeviceManagementDAOUtil {
public static DataSource resolveDataSource() {
return null;
}
private static final Log log = LogFactory.getLog(MobileDeviceManagementDAOUtil.class); private static final Log log = LogFactory.getLog(MobileDeviceManagementDAOUtil.class);
public static void cleanupResources(Connection conn, PreparedStatement stmt, ResultSet rs) { public static void cleanupResources(Connection conn, PreparedStatement stmt, ResultSet rs) {
@ -79,4 +86,5 @@ public class MobileDeviceManagementDAOUtil {
MobileDevice mobileDeviceBO = new MobileDevice(); MobileDevice mobileDeviceBO = new MobileDevice();
return mobileDeviceBO; return mobileDeviceBO;
} }
} }

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

Loading…
Cancel
Save