From 03e9bd341e34b20e4e0eda3288c58571283ded6e Mon Sep 17 00:00:00 2001 From: prabathabey Date: Tue, 6 Jan 2015 19:38:55 +0530 Subject: [PATCH] Code cleanup --- .../wso2/carbon/device/mgt/common/Device.java | 3 ++- .../device/mgt/common/OperationFactory.java | 2 +- .../org.wso2.carbon.device.mgt.core/pom.xml | 21 ++----------------- .../pom.xml | 4 ---- ...MobileDeviceManagementBundleActivator.java | 2 +- 5 files changed, 6 insertions(+), 26 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Device.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Device.java index b71a27071de..5d24754ab80 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Device.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Device.java @@ -18,6 +18,7 @@ package org.wso2.carbon.device.mgt.common; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import java.util.List; + @XmlRootElement public class Device { @@ -45,7 +46,7 @@ public class Device { private List features; - private List properties; + private List properties; @XmlElement public int getId() { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/OperationFactory.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/OperationFactory.java index ae8d0bb688a..0c29aac79b8 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/OperationFactory.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/OperationFactory.java @@ -18,7 +18,7 @@ package org.wso2.carbon.device.mgt.common; public class OperationFactory { public static Operation getOperation(String type) { - return new DefaultOperation(); + return null; } } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml index f1ceacf062a..4adbd0c4c0f 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml @@ -69,7 +69,7 @@ - + @@ -116,32 +116,15 @@ org.wso2.carbon org.wso2.carbon.ndatasource.rdbms - - org.wso2.carbon - org.wso2.carbon.transaction.manager - - - org.jboss.spec.javax.transaction - jboss-transaction-api_1.1_spec - - - commons-dbcp - commons-dbcp - 1.2.2 - test - - com.h2database.wso2 h2-database-engine test - org.testng testng - org.wso2.carbon org.wso2.carbon.tomcat.ext diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml index aabc554c47a..20dcd918572 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml @@ -87,10 +87,6 @@ org.wso2.carbon org.wso2.carbon.device.mgt.common - - org.wso2.carbon - org.wso2.carbon.logging - org.wso2.carbon org.wso2.carbon.utils diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementBundleActivator.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementBundleActivator.java index 612be86b81e..e6eed7b7711 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementBundleActivator.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementBundleActivator.java @@ -46,7 +46,7 @@ public class MobileDeviceManagementBundleActivator implements BundleActivator, B private static List dataSourceListeners = new ArrayList(); - private static final String SYMBOLIC_NAME_DATA_SOURCE_COMPONENT = "org.eclipse.osgi"; + private static final String SYMBOLIC_NAME_DATA_SOURCE_COMPONENT = "org.wso2.carbon.ndatasource.core"; private static final Log log = LogFactory.getLog(MobileDeviceManagementBundleActivator.class); @Override