From 2871af5c3817d0ea349fba73bbcd548a8acb8a6e Mon Sep 17 00:00:00 2001 From: prabathabey Date: Wed, 14 Jan 2015 15:09:40 +0530 Subject: [PATCH] cleaning up poms, removing unused dependencies from pom, declaring missing dependencies --- .../org.wso2.carbon.device.mgt.core/pom.xml | 16 +------- .../dao/util/DeviceManagementDAOUtil.java | 4 -- .../internal/DeviceManagementDataHolder.java | 4 +- .../pom.xml | 8 +--- .../mobile/impl/dao/FeatureDAOTestSuite.java | 2 - pom.xml | 39 ------------------- 6 files changed, 5 insertions(+), 68 deletions(-) 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 91e0fc50bd..f5406926b3 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 @@ -88,10 +88,6 @@ org.eclipse.osgi org.eclipse.osgi - - org.eclipse.equinox - org.eclipse.equinox.common - org.wso2.carbon org.wso2.carbon.device.mgt.common @@ -108,14 +104,6 @@ org.wso2.carbon org.wso2.carbon.core - - org.wso2.carbon - org.wso2.carbon.ndatasource.core - - - org.wso2.carbon - org.wso2.carbon.ndatasource.rdbms - com.h2database.wso2 h2-database-engine @@ -127,11 +115,11 @@ org.wso2.carbon - org.wso2.carbon.tomcat.ext + org.wso2.carbon.user.core org.wso2.carbon - org.wso2.carbon.tomcat + org.wso2.carbon.user.api diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java index dc38a96d41..20fa5e2354 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java @@ -20,7 +20,6 @@ import org.apache.commons.logging.LogFactory; import org.wso2.carbon.context.CarbonContext; import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException; import org.wso2.carbon.device.mgt.core.dto.Device; -import org.wso2.carbon.device.mgt.core.dto.DeviceType; import org.wso2.carbon.device.mgt.core.dto.Status; import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder; import org.wso2.carbon.user.api.UserStoreException; @@ -61,9 +60,6 @@ public final class DeviceManagementDAOUtil { log.warn("Error occurred while closing database connection", e); } } - rs = null; - stmt = null; - conn = null; } /** diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java index 552302bdbf..8c8bf62bca 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementDataHolder.java @@ -20,7 +20,6 @@ package org.wso2.carbon.device.mgt.core.internal; import org.wso2.carbon.device.mgt.core.DeviceManager; -import org.wso2.carbon.device.mgt.core.DeviceManagerImpl; import org.wso2.carbon.user.core.service.RealmService; import org.wso2.carbon.user.core.tenant.TenantManager; @@ -31,7 +30,8 @@ public class DeviceManagementDataHolder { private DeviceManager deviceManager; private static DeviceManagementDataHolder thisInstance = new DeviceManagementDataHolder(); - private DeviceManagementDataHolder() {} + private DeviceManagementDataHolder() { + } public static DeviceManagementDataHolder getInstance() { return thisInstance; 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 807464e493..6e47829721 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 @@ -107,12 +107,6 @@ org.testng testng - - commons-dbcp - commons-dbcp - 1.2.2 - test - - \ No newline at end of file + diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/org/wso2/carbon/device/mgt/mobile/impl/dao/FeatureDAOTestSuite.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/org/wso2/carbon/device/mgt/mobile/impl/dao/FeatureDAOTestSuite.java index 8bc07619ba..e90733b30c 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/org/wso2/carbon/device/mgt/mobile/impl/dao/FeatureDAOTestSuite.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/test/org/wso2/carbon/device/mgt/mobile/impl/dao/FeatureDAOTestSuite.java @@ -18,8 +18,6 @@ package org.wso2.carbon.device.mgt.mobile.impl.dao; - -import org.apache.commons.dbcp.BasicDataSource; import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Parameters; diff --git a/pom.xml b/pom.xml index 44542484c2..8996113c01 100644 --- a/pom.xml +++ b/pom.xml @@ -94,13 +94,6 @@ org.wso2.carbon.user.api ${carbon.kernel.version} - - - org.wso2.carbon - org.wso2.carbon.utils - ${carbon.kernel.version} - - org.wso2.carbon org.wso2.carbon.logging @@ -174,38 +167,6 @@ org.wso2.carbon.ndatasource.rdbms ${carbon.kernel.version} - - org.wso2.carbon - org.wso2.carbon.transaction.manager - ${carbon.platform.version} - - - org.jboss.spec.javax.transaction - jboss-transaction-api_1.1_spec - ${jboss-transaction-api.version} - - - - - org.eclipse.osgi - org.eclipse.osgi - 3.8.1.v20120830-144521 - - - org.eclipse.equinox - org.eclipse.equinox.common - 3.6.100.v20120522-1841 - - - org.wso2.carbon - org.wso2.carbon.logging - ${carbon.kernel.version} - - - org.wso2.carbon - org.wso2.carbon.device.mgt.common - ${cdm.version} - org.eclipse.osgi org.eclipse.osgi.services