amalka.subasinghe
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored the source & modified the build

Browse Source
revert-dabc3590
harshanL 10 years ago
parent b543337371
commit 2b52e3ccd2
4 changed files with 131 additions and 62 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,4 +1,3 @@
/* /*
* Copyright (c) 2015, WSO2 Inc. (http:www.wso2.org) All Rights Reserved. * Copyright (c) 2015, WSO2 Inc. (http:www.wso2.org) All Rights Reserved.
* *
@ -227,6 +226,9 @@ public class MobileFeatureDAOTestSuite {
@Test(dependsOnMethods = {"addMobileFeatureTest"}) @Test(dependsOnMethods = {"addMobileFeatureTest"})
public void deleteMobileFeatureByIdTest() public void deleteMobileFeatureByIdTest()
throws MobileDeviceManagementDAOException { throws MobileDeviceManagementDAOException {
Connection conn = null;
Statement stmt = null;
boolean status = mblFeatureDAO.deleteMobileFeatureById(mblFeatureId); boolean status = mblFeatureDAO.deleteMobileFeatureById(mblFeatureId);
try { try {
conn = DriverManager.getConnection(testDBConfiguration.getConnectionURL()); conn = DriverManager.getConnection(testDBConfiguration.getConnectionURL());
@ -237,7 +239,6 @@ public class MobileFeatureDAOTestSuite {
while (resultSet.next()) { while (resultSet.next()) {
status = false; status = false;
} }
conn.close();
} catch (SQLException e) { } catch (SQLException e) {
log.error("Error in deleting Mobile Feature data ", e); log.error("Error in deleting Mobile Feature data ", e);
throw new MobileDeviceManagementDAOException("Error in deleting Mobile Feature data ", throw new MobileDeviceManagementDAOException("Error in deleting Mobile Feature data ",
@ -252,6 +253,9 @@ public class MobileFeatureDAOTestSuite {
public void updateMobileFeatureTest() public void updateMobileFeatureTest()
throws MobileDeviceManagementDAOException { throws MobileDeviceManagementDAOException {
Connection conn = null;
Statement stmt = null;
MobileFeature mobileFeature = new MobileFeature(); MobileFeature mobileFeature = new MobileFeature();
MobileFeature testMblFeature = new MobileFeature(); MobileFeature testMblFeature = new MobileFeature();
mobileFeature.setCode(MBL_FEATURE_UPDATED_CODE); mobileFeature.setCode(MBL_FEATURE_UPDATED_CODE);
@ -272,7 +276,6 @@ public class MobileFeatureDAOTestSuite {
testMblFeature.setName(resultSet.getString(3)); testMblFeature.setName(resultSet.getString(3));
testMblFeature.setDescription(resultSet.getString(4)); testMblFeature.setDescription(resultSet.getString(4));
} }
conn.close();
} catch (SQLException e) { } catch (SQLException e) {
log.error("Error in updating Mobile Feature data ", e); log.error("Error in updating Mobile Feature data ", e);
throw new MobileDeviceManagementDAOException("Error in updating Mobile Feature data ", throw new MobileDeviceManagementDAOException("Error in updating Mobile Feature data ",

123
pom.xml
Unescape View File

@ -26,9 +26,9 @@
<artifactId>wso2mdm-parent</artifactId> <artifactId>wso2mdm-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<name>WSO2 CDM - Parent</name> <name>WSO2 MDM - Parent</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<description>WSO2 Connected Device Manager</description> <description>WSO2 Mobile Device Manager</description>
<parent> <parent>
<groupId>org.wso2</groupId> <groupId>org.wso2</groupId>
@ -64,16 +64,100 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon.automationutils</groupId>
<artifactId>org.wso2.carbon.integration.common.extensions</artifactId> <artifactId>org.wso2.carbon.integration.common.extensions</artifactId>
<version>${test.framework.version}</version> <version>${automation.utils.version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftpserver-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.ws.wso2</groupId>
<artifactId>spring.framework</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
</exclusion>
<exclusion>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
</exclusion>
<exclusion>
<groupId>com.opera</groupId>
<artifactId>operadriver</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.jmeter</groupId>
<artifactId>ApacheJMeter_core</artifactId>
</exclusion>
<exclusion>
<groupId>com.saucelabs.selenium</groupId>
<artifactId>sauce-ondemand-driver</artifactId>
</exclusion>
<exclusion>
<groupId>com.saucelabs.selenium</groupId>
<artifactId>selenium-client-factory</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.axis2.wso2</groupId>
<artifactId>axis2</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.ws.commons.axiom.wso2</groupId>
<artifactId>axiom</artifactId>
</exclusion>
<exclusion>
<groupId>net.lingala.zip4j</groupId>
<artifactId>zip4j</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon.automationutils</groupId>
<artifactId>org.wso2.carbon.integration.common.admin.client</artifactId> <artifactId>org.wso2.carbon.integration.common.admin.client</artifactId>
<version>${test.automation.stub.version}</version> <version>${automation.utils.version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.wso2.carbon.commons</groupId>
<artifactId>org.wso2.carbon.user.mgt.stub</artifactId>
</exclusion>
<exclusion>
<groupId>org.wso2.carbon.commons</groupId>
<artifactId>org.wso2.carbon.logging.view.stub</artifactId>
</exclusion>
<exclusion>
<groupId>org.wso2.carbon.commons</groupId>
<artifactId>org.wso2.carbon.ndatasource.stub</artifactId>
</exclusion>
<exclusion>
<groupId>org.wso2.carbon.commons</groupId>
<artifactId>org.wso2.carbon.authenticator.stub</artifactId>
</exclusion>
<exclusion>
<groupId>org.wso2.carbon.commons</groupId>
<artifactId>org.wso2.carbon.authenticator.stub</artifactId>
</exclusion>
<exclusion>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!--Carbon Kernel Dependencies--> <!--Carbon Kernel Dependencies-->
@ -364,7 +448,7 @@
<artifactId>org.wso2.carbon.user.core</artifactId> <artifactId>org.wso2.carbon.user.core</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon.governance</groupId>
<artifactId>org.wso2.carbon.governance.api</artifactId> <artifactId>org.wso2.carbon.governance.api</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
@ -542,12 +626,14 @@
<!--Jaggery --> <!--Jaggery -->
<jaggery.version>0.9.0.ALPHA6</jaggery.version> <jaggery.version>0.9.0.ALPHA6</jaggery.version>
<jaggery.extensions.version>1.0.0</jaggery.extensions.version> <jaggery.extensions.version>1.0.0</jaggery.extensions.version>
<jaggery.extensions.sso.version>1.1.0-SNAPSHOT</jaggery.extensions.sso.version> <jaggery.extensions.sso.version>1.2.0</jaggery.extensions.sso.version>
<jaggery.extensions.carbon.version>1.1.0</jaggery.extensions.carbon.version>
<jaggery.extensions.test.version>1.1.0</jaggery.extensions.test.version>
<!--Testing --> <!--Testing -->
<test.framework.version>4.3.1</test.framework.version> <test.framework.version>4.3.1</test.framework.version>
<testng.version>6.8</testng.version> <testng.version>6.8</testng.version>
<test.automation.stub.version>4.3.0-SNAPSHOT</test.automation.stub.version> <automation.utils.version>4.3.0</automation.utils.version>
<test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version> <test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version>
<!--Eclipse Osgi--> <!--Eclipse Osgi-->
@ -574,25 +660,25 @@
<javax.ws.rs.version>1.1.1</javax.ws.rs.version> <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
<!-- Carbon Commons --> <!-- Carbon Commons -->
<carbon.commons.version>4.3.2</carbon.commons.version> <carbon.commons.version>4.3.4</carbon.commons.version>
<!-- Carbon Utils --> <!-- Carbon Utils -->
<carbon.utils.version>4.3.0-SNAPSHOT</carbon.utils.version> <carbon.utils.version>4.3.0-SNAPSHOT</carbon.utils.version>
<!-- Carbon Deployment --> <!-- Carbon Deployment -->
<carbon.deployment.version>4.3.0</carbon.deployment.version> <carbon.deployment.version>4.3.1</carbon.deployment.version>
<!-- Identity --> <!-- Identity -->
<carbon.identity.version>4.3.0</carbon.identity.version> <carbon.identity.version>4.3.2</carbon.identity.version>
<!-- Multi-tenancy --> <!-- Multi-tenancy -->
<carbon.multitenancy.version>4.3.0</carbon.multitenancy.version> <carbon.multitenancy.version>4.3.3</carbon.multitenancy.version>
<!-- Registry --> <!-- Registry -->
<carbon.registry.version>4.3.0</carbon.registry.version> <carbon.registry.version>4.3.0</carbon.registry.version>
<!-- Governance --> <!-- Governance -->
<carbon.governance.version>4.3.0-SNAPSHOT</carbon.governance.version> <carbon.governance.version>4.3.0</carbon.governance.version>
<!-- Transport Management --> <!-- Transport Management -->
<carbon.transport.mgt.version>4.3.0-SNAPSHOT</carbon.transport.mgt.version> <carbon.transport.mgt.version>4.3.0-SNAPSHOT</carbon.transport.mgt.version>
@ -606,19 +692,12 @@
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>4.3.0-SNAPSHOT</carbon.api.mgt.version> <carbon.api.mgt.version>4.3.0-SNAPSHOT</carbon.api.mgt.version>
<!-- Spongycastle Management--> <!-- Third Party Dependencies-->
<spongycastle.version>1.51.0.0</spongycastle.version> <spongycastle.version>1.51.0.0</spongycastle.version>
<!-- Bouncycastle Management-->
<bouncycastle.version>1.49</bouncycastle.version> <bouncycastle.version>1.49</bouncycastle.version>
<!-- Apache wss4j Management-->
<apache.wss4j.version>2.0.0</apache.wss4j.version> <apache.wss4j.version>2.0.0</apache.wss4j.version>
<!-- Codehaus Plexus Management-->
<codehaus.plexus.version>3.0.21</codehaus.plexus.version> <codehaus.plexus.version>3.0.21</codehaus.plexus.version>
</properties> </properties>
<scm> <scm>

2
product/modules/integration/tests-common/ui-pages/pom.xml
Unescape View File

@ -36,7 +36,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon.automationutils</groupId>
<artifactId>org.wso2.carbon.integration.common.admin.client</artifactId> <artifactId>org.wso2.carbon.integration.common.admin.client</artifactId>
<scope>compile</scope> <scope>compile</scope>
<exclusions> <exclusions>

59
product/modules/p2-profile-gen/pom.xml
Unescape View File

@ -126,6 +126,9 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.deployment:org.wso2.carbon.module.mgt.feature:${carbon.deployment.version} org.wso2.carbon.deployment:org.wso2.carbon.module.mgt.feature:${carbon.deployment.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.deployment:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.deployment.version}
</featureArtifactDef>
<!-- End of Carbon Deployment Features --> <!-- End of Carbon Deployment Features -->
<!-- Jaggery Features --> <!-- Jaggery Features -->
@ -133,7 +136,7 @@
org.jaggeryjs:org.jaggeryjs.feature:${jaggery.version} org.jaggeryjs:org.jaggeryjs.feature:${jaggery.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:carbon.feature:${jaggery.extensions.version} org.jaggeryjs.modules:carbon.feature:${jaggery.extensions.carbon.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:process.feature:${jaggery.extensions.version} org.jaggeryjs.modules:process.feature:${jaggery.extensions.version}
@ -148,19 +151,10 @@
org.jaggeryjs.modules:i18n.feature:${jaggery.extensions.version} org.jaggeryjs.modules:i18n.feature:${jaggery.extensions.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:jaggery-test.feature:${jaggery.extensions.version} org.jaggeryjs.modules:jaggery-test.feature:${jaggery.extensions.test.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Jaggery Features --> <!-- End of Jaggery Features -->
<!-- Misc Features -->
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.transport.mgt.feature:${carbon.transport.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.platform.version}
</featureArtifactDef>
<!-- End of Misc Features -->
<!-- API Management Features --> <!-- API Management Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.apimgt.core.feature:${carbon.api.mgt.version} org.wso2.carbon:org.wso2.carbon.apimgt.core.feature:${carbon.api.mgt.version}
@ -189,14 +183,14 @@
<!-- End of Carbon Commons Features --> <!-- End of Carbon Commons Features -->
<!-- Carbon Multi-tenancy Features --> <!-- Carbon Multi-tenancy Features -->
<!--<featureArtifactDef>--> <featureArtifactDef>
<!--org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.common.server.feature:${carbon.multitenancy.version}--> org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.common.server.feature:${carbon.multitenancy.version}
<!--</featureArtifactDef>--> </featureArtifactDef>
<!-- End of Carbon Multi-tenancy Features --> <!-- End of Carbon Multi-tenancy Features -->
<!-- Identity Features --> <!-- Identity Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.security.mgt.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.security.mgt.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.client.feature:${carbon.identity.version} org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.client.feature:${carbon.identity.version}
@ -284,13 +278,13 @@
<!-- Governance Features --> <!-- Governance Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.governance.metadata.feature:${carbon.governance.version} org.wso2.carbon.governance:org.wso2.carbon.governance.metadata.feature:${carbon.governance.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.governance.version} org.wso2.carbon.governance:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.governance.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.extensions.feature:${carbon.governance.version} org.wso2.carbon.governance:org.wso2.carbon.registry.extensions.feature:${carbon.governance.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Governance Features --> <!-- End of Governance Features -->
@ -336,6 +330,10 @@
<id>org.wso2.carbon.module.mgt.feature.group</id> <id>org.wso2.carbon.module.mgt.feature.group</id>
<version>${carbon.deployment.version}</version> <version>${carbon.deployment.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
<version>${carbon.deployment.version}</version>
</feature>
<!-- End of Carbon Deployment Features --> <!-- End of Carbon Deployment Features -->
<!-- Jaggery Features --> <!-- Jaggery Features -->
@ -345,7 +343,7 @@
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.carbon.feature.group</id> <id>org.jaggeryjs.modules.carbon.feature.group</id>
<version>${jaggery.extensions.version}</version> <version>${jaggery.extensions.carbon.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.process.feature.group</id> <id>org.jaggeryjs.modules.process.feature.group</id>
@ -365,21 +363,10 @@
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.jaggery-test.feature.group</id> <id>org.jaggeryjs.modules.jaggery-test.feature.group</id>
<version>${jaggery.extensions.version}</version> <version>${jaggery.extensions.test.version}</version>
</feature> </feature>
<!-- End of Jaggery Features --> <!-- End of Jaggery Features -->
<!-- Misc Features -->
<feature>
<id>org.wso2.carbon.transport.mgt.feature.group</id>
<version>${carbon.transport.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<!-- End of Misc Features -->
<!-- API Management Features --> <!-- API Management Features -->
<feature> <feature>
<id>org.wso2.carbon.apimgt.core.feature.group</id> <id>org.wso2.carbon.apimgt.core.feature.group</id>
@ -416,16 +403,16 @@
<!-- End of Carbon Commons Features --> <!-- End of Carbon Commons Features -->
<!-- Carbon Multi-tenancy Features --> <!-- Carbon Multi-tenancy Features -->
<!--<feature>--> <feature>
<!--<id>org.wso2.carbon.tenant.common.server.feature.group</id>--> <id>org.wso2.carbon.tenant.common.server.feature.group</id>
<!--<version>${carbon.multitenancy.version}</version>--> <version>${carbon.multitenancy.version}</version>
<!--</feature>--> </feature>
<!-- End of Carbon Multi-tenancy Features --> <!-- End of Carbon Multi-tenancy Features -->
<!-- Identity Features --> <!-- Identity Features -->
<feature> <feature>
<id>org.wso2.carbon.security.mgt.feature.group</id> <id>org.wso2.carbon.security.mgt.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.um.ws.service.client.feature.group</id> <id>org.wso2.carbon.um.ws.service.client.feature.group</id>

Write Preview
Loading…
Cancel
Save