diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml index 2434dbdc6f2..db2b794303a 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml @@ -31,13 +31,9 @@ ${project.version} Device Management Common Bundle org.wso2.carbon.device.mgt.common - - org.apache.commons.logging - org.wso2.carbon.device.mgt.common.* - * 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 9513a12c8a2..1d426a62197 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 @@ -58,13 +58,27 @@ org.osgi.framework, org.osgi.service.component, org.apache.commons.logging, + javax.xml.bind.*, + javax.naming, + javax.sql, + javax.xml.parsers, javax.transaction.*, + org.wso2.carbon.governance.api.*, + org.wso2.carbon.base, + org.wso2.carbon.context, + org.wso2.carbon.core, + org.wso2.carbon.utils.*, + org.wso2.carbon.registry.api, + org.wso2.carbon.registry.core.*, + org.wso2.carbon.device.mgt.common.*, + org.wso2.carbon.user.api, + org.wso2.carbon.user.core.*, + org.w3c.dom !org.wso2.carbon.device.mgt.core.internal, org.wso2.carbon.device.mgt.core.* - * @@ -128,6 +142,22 @@ org.wso2.carbon org.wso2.carbon.governance.api + + org.wso2.carbon + org.wso2.carbon.registry.api + + + org.wso2.carbon + org.wso2.carbon.registry.core + + + org.apache.tomcat.wso2 + jdbc-pool + + + org.wso2.carbon + org.wso2.carbon.base + diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementRepository.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementRepository.java index a6bd91a519d..134eec6969b 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementRepository.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementRepository.java @@ -29,7 +29,7 @@ public class DeviceManagementRepository { private DataSourceConfig dataSourceConfig; - @XmlElement(name = "DataSourceConfiguration", required = false) + @XmlElement(name = "DataSourceConfiguration", required = true) public DataSourceConfig getDataSourceConfig() { return dataSourceConfig; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/datasource/DataSourceConfig.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/datasource/DataSourceConfig.java index bc7f98e9255..bb1c06ab1af 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/datasource/DataSourceConfig.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/datasource/DataSourceConfig.java @@ -26,15 +26,15 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "DataSourceConfiguration") public class DataSourceConfig { - private JNDILookupDefinition jndiLookupDefintion; + private JNDILookupDefinition jndiLookupDefinition; @XmlElement(name = "JndiLookupDefinition", required = true) - public JNDILookupDefinition getJndiLookupDefintion() { - return jndiLookupDefintion; + public JNDILookupDefinition getJndiLookupDefinition() { + return jndiLookupDefinition; } - public void setJndiLookupDefintion(JNDILookupDefinition jndiLookupDefintion) { - this.jndiLookupDefintion = jndiLookupDefintion; + public void setJndiLookupDefinition(JNDILookupDefinition jndiLookupDefinition) { + this.jndiLookupDefinition = jndiLookupDefinition; } } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOFactory.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOFactory.java index ae12417d62e..53b9fd119e9 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOFactory.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOFactory.java @@ -62,7 +62,7 @@ public class DeviceManagementDAOFactory { throw new RuntimeException("Device Management Repository data source configuration " + "is null and " + "thus, is not initialized"); } - JNDILookupDefinition jndiConfig = config.getJndiLookupDefintion(); + JNDILookupDefinition jndiConfig = config.getJndiLookupDefinition(); if (jndiConfig != null) { if (log.isDebugEnabled()) { log.debug("Initializing Device Management Repository data source using the JNDI " + diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java index 1f0c936e30e..3af77dba46e 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java @@ -65,7 +65,7 @@ public final class DeviceManagerUtil { throw new RuntimeException( "Device Management Repository data source configuration " + "is null and thus, is not initialized"); } - JNDILookupDefinition jndiConfig = config.getJndiLookupDefintion(); + JNDILookupDefinition jndiConfig = config.getJndiLookupDefinition(); if (jndiConfig != null) { if (log.isDebugEnabled()) { log.debug( diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/DeviceManagementConfigTests.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/DeviceManagementConfigTests.java index 15a6b5ccd95..153f01d64c7 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/DeviceManagementConfigTests.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/DeviceManagementConfigTests.java @@ -22,6 +22,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.wso2.carbon.device.mgt.core.config.DeviceManagementConfig; import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; import javax.xml.XMLConstants; import javax.xml.bind.JAXBContext; @@ -83,7 +84,12 @@ public class DeviceManagementConfigTests { um.unmarshal(malformedConfig); Assert.assertTrue(false); } catch (JAXBException e) { - log.error("Error occurred while unmarsharlling device management config", e); + Throwable linkedException = e.getLinkedException(); + if (!(linkedException instanceof SAXParseException)) { + log.error("Unexpected error occurred while unmarshalling device management config", e); + Assert.assertTrue(false); + } + log.error("JAXB parser occurred while unmarsharlling device management config", e); Assert.assertTrue(true); } } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOTests.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOTests.java index 6f1b1a58491..7ccc88d3436 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOTests.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOTests.java @@ -18,7 +18,9 @@ package org.wso2.carbon.device.mgt.core.dao; -import org.apache.commons.dbcp.BasicDataSource; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.tomcat.jdbc.pool.PoolProperties; import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Parameters; @@ -35,6 +37,7 @@ import org.wso2.carbon.device.mgt.core.dto.OwnerShip; import org.wso2.carbon.device.mgt.core.dto.Status; import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil; +import javax.sql.DataSource; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; @@ -44,6 +47,9 @@ import java.util.Date; public class DeviceManagementDAOTests { + private DataSource dataSource; + private static final Log log = LogFactory.getLog(DeviceManagementDAOTests.class); + @BeforeClass @Parameters("dbType") public void setUpDB(String dbTypeStr) throws Exception { @@ -51,15 +57,16 @@ public class DeviceManagementDAOTests { TestDBConfiguration dbConfig = getTestDBConfiguration(dbType); switch (dbType) { - case H2: - createH2DB(dbConfig); - BasicDataSource testDataSource = new BasicDataSource(); - testDataSource.setDriverClassName(dbConfig.getDriverClass()); - testDataSource.setUrl(dbConfig.getConnectionUrl()); - testDataSource.setUsername(dbConfig.getUserName()); - testDataSource.setPassword(dbConfig.getPwd()); - DeviceManagementDAOFactory.init(testDataSource); - default: + case H2: + PoolProperties properties = new PoolProperties(); + properties.setUrl(dbConfig.getConnectionUrl()); + properties.setDriverClassName(dbConfig.getDriverClass()); + properties.setUsername(dbConfig.getUserName()); + properties.setPassword(dbConfig.getPwd()); + dataSource = new org.apache.tomcat.jdbc.pool.DataSource(properties); + this.initSQLScript(); + DeviceManagementDAOFactory.init(dataSource); + default: } } @@ -70,7 +77,7 @@ public class DeviceManagementDAOTests { TestDBConfigurations dbConfigs; doc = DeviceManagerUtil.convertToDocument(deviceMgtConfig); - JAXBContext testDBContext = null; + JAXBContext testDBContext; try { testDBContext = JAXBContext.newInstance(TestDBConfigurations.class); @@ -79,7 +86,6 @@ public class DeviceManagementDAOTests { } catch (JAXBException e) { throw new DeviceManagementDAOException("Error parsing test db configurations", e); } - for (TestDBConfiguration config : dbConfigs.getDbTypesList()) { if (config.getDbType().equals(dbType.toString())) { return config; @@ -88,12 +94,11 @@ public class DeviceManagementDAOTests { return null; } - private void createH2DB(TestDBConfiguration testDBConf) throws Exception { + private void initSQLScript() throws Exception { Connection conn = null; Statement stmt = null; try { - Class.forName(testDBConf.getDriverClass()); - conn = DriverManager.getConnection(testDBConf.getConnectionUrl()); + conn = this.getDataSource().getConnection(); stmt = conn.createStatement(); stmt.executeUpdate("RUNSCRIPT FROM './src/test/resources/sql/CreateH2TestDB.sql'"); } finally { @@ -107,33 +112,30 @@ public class DeviceManagementDAOTests { DeviceType deviceType = new DeviceType(); deviceType.setName("IOS"); - deviceTypeMgtDAO.addDeviceType(deviceType); - Long deviceTypeId = null; + Long id = null; Connection conn = null; - Statement stmt = null; + PreparedStatement stmt = null; + String sql = "SELECT ID, NAME from DM_DEVICE_TYPE DType where DType.NAME='IOS'"; try { - conn = DeviceManagementDAOFactory.getDataSource().getConnection(); - stmt = conn.createStatement(); - ResultSet resultSet = - stmt.executeQuery("SELECT ID,NAME from DM_DEVICE_TYPE DType where DType.NAME='IOS'"); + conn = this.getDataSource().getConnection(); + stmt = conn.prepareStatement(sql); + ResultSet rs = stmt.executeQuery(); - while (resultSet.next()) { - deviceTypeId = resultSet.getLong(1); + if (rs.next()) { + id = rs.getLong("ID"); } - } catch (SQLException sqlEx) { - throw new DeviceManagementDAOException("error in fetch device type by name IOS", sqlEx); + } catch (SQLException e) { + throw new DeviceManagementDAOException("error in fetch device type by name IOS", e); } finally { TestUtils.cleanupResources(conn, stmt, null); } - - Assert.assertNotNull(deviceTypeId, "Device Type Id is null"); - deviceType.setId(deviceTypeId); - + Assert.assertNotNull(id, "Device Type Id is null"); + deviceType.setId(id); } - @Test(dependsOnMethods = { "addDeviceTypeTest" }) + @Test(dependsOnMethods = {"addDeviceTypeTest"}) public void addDeviceTest() throws DeviceManagementDAOException, DeviceManagementException { DeviceDAO deviceMgtDAO = DeviceManagementDAOFactory.getDeviceDAO(); @@ -153,30 +155,35 @@ public class DeviceManagementDAOTests { device.setTenantId(-1234); deviceMgtDAO.addDevice(device); - Long deviceId = null; Connection conn = null; PreparedStatement stmt = null; ResultSet rs = null; - String deviceStatus = null; + + Long id = null; + String status = null; try { - conn = DeviceManagementDAOFactory.getDataSource().getConnection(); - stmt = conn.prepareStatement( - "SELECT ID,STATUS from DM_DEVICE DEVICE where DEVICE.DEVICE_IDENTIFICATION=?"); - stmt.setString(1,"111"); - rs = stmt.executeQuery(); + conn = this.getDataSource().getConnection(); + String sql = "SELECT ID, STATUS from DM_DEVICE DEVICE where DEVICE.DEVICE_IDENTIFICATION = ?"; + stmt = conn.prepareStatement(sql); + stmt.setString(1, "111"); - while (rs.next()) { - deviceId = rs.getLong(1); - deviceStatus = rs.getString(2); + rs = stmt.executeQuery(); + if (rs.next()) { + id = rs.getLong("ID"); + status = rs.getString("STATUS"); } } catch (SQLException e) { throw new DeviceManagementDAOException("Error in fetch device by device identification id", e); } finally { TestUtils.cleanupResources(conn, stmt, rs); } - Assert.assertNotNull(deviceId, "Device Id is null"); - Assert.assertNotNull(deviceStatus, "Device status is null"); - Assert.assertEquals(deviceStatus, "ACTIVE", "Enroll device status should active"); + Assert.assertNotNull(id, "Device Id is null"); + Assert.assertNotNull(status, "Device status is null"); + Assert.assertEquals(status, "ACTIVE", "Enroll device status should active"); + } + + private DataSource getDataSource() { + return dataSource; } } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/malformed-cdm-config-no-jndi.config.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/malformed-cdm-config-no-jndi-config.xml similarity index 100% rename from components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/malformed-cdm-config-no-jndi.config.xml rename to components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/malformed-cdm-config-no-jndi-config.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testdbconfig.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testdbconfig.xml index 34e89a1392f..98da123037f 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testdbconfig.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testdbconfig.xml @@ -18,7 +18,7 @@ jdbc:h2:mem:cdm-test-db;DB_CLOSE_DELAY=-1 org.h2.Driver - - + wso2carbon + wso2carbon diff --git a/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml index 999a7d71fcd..970248a0258 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml @@ -52,13 +52,9 @@ ${project.version} Policy Management Common Bundle org.wso2.carbon.policy.evaluator - - org.apache.commons.logging - org.wso2.carbon.policy.evaluator.* - * diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml index 6056d324432..896da05d1f7 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml @@ -58,7 +58,6 @@ org.wso2.carbon.policy.mgt.common.* - * diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml index 43527ead7ba..694e8f2a1d6 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml @@ -58,12 +58,19 @@ org.osgi.framework, org.osgi.service.component, org.apache.commons.logging, + javax.sql, + javax.naming, + javax.xml.bind.*, + javax.xml.parsers.*, + org.w3c.dom, + org.wso2.carbon.policy.mgt.common.*, + org.wso2.carbon.user.core.*, + org.wso2.carbon.utils !org.wso2.carbon.policy.mgt.core.internal, org.wso2.carbon.policy.mgt.core.* - * @@ -99,10 +106,6 @@ org.wso2.carbon org.wso2.carbon.ndatasource.rdbms - - org.wso2.carbon - org.wso2.carbon.logging - diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml index 0c14d19abc6..16cbd95f5b4 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml @@ -36,18 +36,6 @@ - - org.eclipse.osgi - org.eclipse.osgi - - - org.eclipse.equinox - org.eclipse.equinox.common - - - org.wso2.carbon - org.wso2.carbon.logging - org.wso2.carbon.cdm org.wso2.carbon.device.mgt.core @@ -106,14 +94,14 @@ - org.wso2.carbon.cdm:org.wso2.carbon.device.mgt.core:${project.version} + org.wso2.carbon.cdm:org.wso2.carbon.device.mgt.core:${carbon.device.mgt.version} - org.wso2.carbon.cdm:org.wso2.carbon.device.mgt.common:${project.version} + org.wso2.carbon.cdm:org.wso2.carbon.device.mgt.common:${carbon.device.mgt.version} - org.wso2.carbon.core.server:${carbon.kernel.version} - + org.wso2.carbon.core.server:${carbon.kernel.version} + org.wso2.carbon.governance.server:${carbon.kernel.version} diff --git a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml index 2304236c525..37083af062b 100644 --- a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml +++ b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml @@ -37,18 +37,6 @@ - - org.eclipse.osgi - org.eclipse.osgi - - - org.eclipse.equinox - org.eclipse.equinox.common - - - org.wso2.carbon - org.wso2.carbon.logging - org.wso2.carbon.cdm org.wso2.carbon.policy.mgt.core diff --git a/pom.xml b/pom.xml index 089a3f0bf78..b14ee615081 100644 --- a/pom.xml +++ b/pom.xml @@ -124,9 +124,9 @@ - - - + + + org.wso2.carbon.automationutils org.wso2.carbon.integration.common.extensions @@ -229,35 +229,96 @@ org.wso2.carbon.cdm org.wso2.carbon.device.mgt.core - ${project.version} + ${carbon.device.mgt.version} org.wso2.carbon.cdm org.wso2.carbon.device.mgt.common - ${project.version} + ${carbon.device.mgt.version} org.wso2.carbon.cdm org.wso2.carbon.policy.mgt.common - ${project.version} + ${carbon.device.mgt.version} org.wso2.carbon.cdm org.wso2.carbon.policy.mgt.core - ${project.version} + ${carbon.device.mgt.version} org.wso2.carbon.cdm org.wso2.carbon.policy.evaluator - ${project.version} + ${carbon.device.mgt.version} + + org.wso2.carbon + org.wso2.carbon.registry.api + ${carbon.kernel.version} + + + org.wso2.carbon + org.wso2.carbon.registry.core + ${carbon.kernel.version} + + + org.wso2.carbon + org.wso2.carbon.base + ${carbon.kernel.version} + org.wso2.carbon org.wso2.carbon.governance.api - ${governance.version} + ${carbon.governance.version} + + + org.apache.juddi.wso2 + juddi + + + org.wso2.carbon + org.wso2.carbon.registry.common + + + org.wso2.carbon + org.wso2.carbon.registry.core + + + org.wso2.carbon + org.wso2.carbon.registry.admin.api + + + org.wso2.carbon + org.wso2.carbon.registry.indexing + + + com.ibm.icu + icu4j + + + org.eclipse.equinox + org.eclipse.equinox.registry + + + eclipse + validateutility + + + org.apache.ws.commons.axiom + axiom-api + + + org.apache.ws.commons.axiom + axiom-impl + + + org.wso2.carbon + org.wso2.carbon.registry.extensions + + @@ -284,6 +345,12 @@ testng ${testng.version} test + + + junit + junit + + @@ -291,11 +358,115 @@ org.wso2.carbon org.wso2.carbon.utils ${carbon.kernel.version} + + + org.bouncycastle.wso2 + bcprov-jdk15on + + + org.wso2.carbon + org.wso2.carbon.queuing + + + org.wso2.carbon + org.wso2.carbon.base + + + org.apache.axis2.wso2 + axis2 + + + org.igniterealtime.smack.wso2 + smack + + + org.igniterealtime.smack.wso2 + smackx + + + jaxen + jaxen + + + commons-fileupload.wso2 + commons-fileupload + + + org.apache.ant.wso2 + ant + + + org.eclipse.equinox + javax.servlet + + + commons-httpclient.wso2 + commons-httpclient + + + commons-httpclient.wso2 + commons-httpclient + + + org.wso2.carbon + org.wso2.carbon.registry.api + + org.wso2.carbon org.wso2.carbon.core ${carbon.kernel.version} + + + com.hazelcast.wso2 + hazelcast + + + org.eclipse.osgi + org.eclipse.osgi.services + + + org.eclipse.equinox + org.eclipse.equinox.http.helper + + + org.wso2.carbon + javax.cache.wso2 + + + org.wso2.carbon + org.wso2.carbon.registry.core + + + commons-collections.wso2 + commons-collections + + + org.apache.neethi.wso2 + neethi + + + org.apache.httpcomponents.wso2 + httpcore + + + org.apache.tomcat + tomcat-catalina-ha + + + wsdl4j.wso2 + wsdl4j + + + org.bouncycastle.wso2 + bcprov-jdk15on + + + org.apache.axis2.wso2 + axis2 + + org.wso2.carbon @@ -331,12 +502,42 @@ org.apache.felix javax.servlet + + org.wso2.carbon + javax.cache.wso2 + + + commons-dbcp.wso2 + commons-dbcp + + + org.wso2.carbon + org.wso2.carbon.ndatasource.rdbms + + + org.wso2.securevault + org.wso2.securevault + + + commons-collections.wso2 + commons-collections + org.wso2.carbon org.wso2.carbon.user.api ${carbon.kernel.version} + + + org.wso2.carbon + org.wso2.carbon.base + + + org.wso2.carbon + org.wso2.carbon.registry.core + + org.wso2.carbon @@ -364,6 +565,12 @@ + + org.apache.tomcat.wso2 + jdbc-pool + ${tomcat.jdbc.pooling.version} + + @@ -398,14 +605,14 @@ - - - - - - - - + + + + + + + + org.apache.maven.plugins @@ -571,16 +778,13 @@ 1.0.0-SNAPSHOT - 0.9.0-SNAPSHOT - 1.1.0 - 1.0.0 - 1.0.0 - 1.1.0-SNAPSHOT - 1.1.0 + 0.9.0.ALPHA6 + 1.0.0 + 1.1.0-SNAPSHOT 4.3.1 - 4.3.0-SNAPSHOT + 4.3.0-SNAPSHOT 6.8 1.1.0 @@ -590,12 +794,38 @@ 1.2.140.wso2v3 7.0.52.wso2v5 + 7.0.34.wso2v2 1.2.4 + + 4.3.1 + + + 4.3.0-SNAPSHOT + + + 4.3.0-SNAPSHOT + + + 4.3.0-SNAPSHOT + + + 4.3.0 + + + 4.3.0 + - 4.3.0-SNAPSHOT + 4.3.0-SNAPSHOT + + + 4.3.0-SNAPSHOT + + + 1.0.0-SNAPSHOT + diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml index b9a20154e70..0ae9f388780 100644 --- a/product/modules/p2-profile-gen/pom.xml +++ b/product/modules/p2-profile-gen/pom.xml @@ -57,7 +57,6 @@ - unpack-equinox-executable test @@ -100,143 +99,165 @@ true - + + + - org.wso2.carbon.cdm:org.wso2.carbon.device.mgt.server.feature:${project.version} + org.wso2.carbon.cdm:org.wso2.carbon.device.mgt.server.feature:${carbon.device.mgt.version} - - org.wso2.carbon.cdm:org.wso2.carbon.policy.mgt.server.feature:${project.version} + org.wso2.carbon.cdm:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version} + + + - org.wso2.carbon:org.wso2.carbon.webapp.mgt.feature:${carbon.platform.version} + org.jaggeryjs:org.jaggeryjs.feature:${jaggery.version} - org.jaggeryjs:org.jaggeryjs.feature:${jaggery.feature.version} + org.jaggeryjs.modules:carbon.feature:${jaggery.extensions.version} - org.jaggeryjs.modules:carbon.feature:${carbon.feature.version} + org.jaggeryjs.modules:process.feature:${jaggery.extensions.version} - org.jaggeryjs.modules:process.feature:${process.feature.version} + org.jaggeryjs.modules:uuid.feature:${jaggery.extensions.version} - org.jaggeryjs.modules:uuid.feature:${uuid.feature.version} + org.jaggeryjs.modules:sso.feature:${jaggery.extensions.sso.version} - org.jaggeryjs.modules:sso.feature:${sso.feature.version} + org.jaggeryjs.modules:jaggery-test.feature:${jaggery.extensions.version} + + + + + + + + + + + + + + + + + + + - org.jaggeryjs.modules:jaggery-test.feature:${jaggery-test.feature.version} + org.wso2.carbon.commons:org.wso2.carbon.databridge.datapublisher.feature:${carbon.commons.version} - org.wso2.carbon:org.wso2.carbon.transport.mgt.feature:${carbon.platform.version} + org.wso2.carbon.commons:org.wso2.carbon.event.server.feature:${carbon.commons.version} - org.wso2.carbon:org.wso2.carbon.service.mgt.feature:${carbon.platform.version} + org.wso2.carbon.commons:org.wso2.carbon.event.common.feature:${carbon.commons.version} - org.wso2.carbon:org.wso2.carbon.security.mgt.server.feature:${carbon.platform.version} + org.wso2.carbon.commons:org.wso2.carbon.logging.mgt.feature:${carbon.commons.version} - - org.wso2.carbon:org.wso2.carbon.security.mgt.feature:${carbon.platform.version} + + + + + + + + + + + + + - org.wso2.carbon:org.wso2.carbon.module.mgt.feature:${carbon.platform.version} + org.wso2.carbon:org.wso2.carbon.security.mgt.feature:${carbon.identity.version} - - org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.platform.version} + - - - + + - org.wso2.carbon:org.wso2.carbon.event.server.feature:${carbon.platform.version} + org.wso2.carbon.registry:org.wso2.carbon.registry.core.feature:${carbon.registry.version} - org.wso2.carbon:org.wso2.carbon.event.common.feature:${carbon.platform.version} + org.wso2.carbon.registry:org.wso2.carbon.registry.ui.menu.feature:${carbon.registry.version} - - org.wso2.carbon:org.wso2.carbon.identity.application.authentication.framework.server.feature:${carbon.platform.version} + org.wso2.carbon.registry:org.wso2.carbon.registry.resource.properties.feature:${carbon.registry.version} - org.wso2.carbon:org.wso2.carbon.idp.mgt.server.feature:${carbon.platform.version} + org.wso2.carbon.registry:org.wso2.carbon.registry.associations.dependencies.feature:${carbon.registry.version} - org.wso2.carbon:org.wso2.carbon.identity.user.profile.server.feature:${carbon.platform.version} + org.wso2.carbon.registry:org.wso2.carbon.registry.community.features.server.feature:${carbon.registry.version} - org.wso2.carbon:org.wso2.carbon.identity.relying.party.server.feature:${carbon.platform.version} + org.wso2.carbon.registry:org.wso2.carbon.registry.ws.feature:${carbon.registry.version} - org.wso2.carbon:org.wso2.carbon.tenant.common.server.feature:${carbon.platform.version} + org.wso2.carbon.registry:org.wso2.carbon.registry.contentsearch.feature:${carbon.registry.version} - org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.server.feature:${carbon.platform.version} - --> - - - - - org.wso2.carbon:org.wso2.carbon.event.server.feature:${carbon.platform.version} + org.wso2.carbon.registry:org.wso2.carbon.registry.ui.menu.governance.feature:${carbon.registry.version} + - org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.platform.version} - org.wso2.carbon:org.wso2.carbon.registry.core.server.feature:${carbon.platform.version} - org.wso2.carbon:org.wso2.carbon.registry.ui.menu.feature:${carbon.platform.version} - org.wso2.carbon:org.wso2.carbon.registry.resource.properties.feature:${carbon.platform.version} - org.wso2.carbon:org.wso2.carbon.registry.associations.dependencies.feature:${carbon.platform.version} - org.wso2.carbon:org.wso2.carbon.registry.community.features.feature:${carbon.platform.version} - org.wso2.carbon:org.wso2.carbon.registry.community.features.server.feature:${carbon.platform.version} - org.wso2.carbon:org.wso2.carbon.registry.extensions.feature:${carbon.platform.version} - org.wso2.carbon:org.wso2.carbon.registry.ws.feature:${carbon.platform.version} - org.wso2.carbon:org.wso2.carbon.registry.ui.menu.governance.feature:${carbon.platform.version} - org.wso2.carbon:org.wso2.carbon.registry.contentsearch.feature:${carbon.platform.version} - - org.wso2.carbon:org.wso2.carbon.governance.metadata.feature:${carbon.platform.version} - org.wso2.carbon:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.platform.version} + + + + + + + + + + @@ -259,207 +280,205 @@ org.wso2.carbon.apimgt.core.feature.group ${carbon.platform.version} --> + + org.wso2.carbon.device.mgt.server.feature.group - ${project.version} + ${carbon.device.mgt.version} org.wso2.carbon.policy.mgt.server.feature.group - ${project.version} - - - org.wso2.carbon.webapp.mgt.feature.group - ${carbon.platform.version} + ${carbon.device.mgt.version} + + + org.jaggeryjs.feature.group - ${jaggery.feature.version} + ${jaggery.version} org.jaggeryjs.modules.carbon.feature.group - ${carbon.feature.version} + ${jaggery.extensions.version} org.jaggeryjs.modules.process.feature.group - ${process.feature.version} + ${jaggery.extensions.version} org.jaggeryjs.modules.uuid.feature.group - ${uuid.feature.version} + ${jaggery.extensions.version} org.jaggeryjs.modules.sso.feature.group - ${sso.feature.version} + ${jaggery.extensions.sso.version} org.jaggeryjs.modules.jaggery-test.feature.group - ${jaggery-test.feature.version} - - - org.wso2.carbon.transport.mgt.feature.group - ${carbon.platform.version} - - - org.wso2.carbon.service.mgt.feature.group - ${carbon.platform.version} - - - org.wso2.carbon.security.mgt.feature.group - ${carbon.platform.version} - - - org.wso2.carbon.module.mgt.feature.group - ${carbon.platform.version} - - - org.wso2.carbon.as.runtimes.cxf.feature.group - ${carbon.platform.version} + ${jaggery.extensions.version} + - - org.wso2.carbon.logging.mgt.feature.group - ${carbon.platform.version} - + + + + + + + + + + - - org.wso2.carbon.databridge.datapublisher.feature.group - ${carbon.platform.version} - + + + + - - + + + - org.wso2.carbon.identity.oauth.common.feature.group - ${carbon.platform.version} + org.wso2.carbon.databridge.datapublisher.feature.group + ${carbon.commons.version} - org.wso2.carbon.identity.provider.server.feature.group - ${carbon.platform.version} + org.wso2.carbon.event.server.feature.group + ${carbon.commons.version} - - org.wso2.carbon.identity.thrift.authentication.feature.group - - ${carbon.platform.version} + org.wso2.carbon.event.common.feature.group + ${carbon.commons.version} - org.wso2.carbon.identity.core.server.feature.group - ${carbon.platform.version} + org.wso2.carbon.logging.mgt.feature.group + ${carbon.commons.version} + + + + + + + + + + + + + + + + + - org.wso2.carbon.registry.extensions.server.feature.group - ${carbon.platform.version} + org.wso2.carbon.security.mgt.feature.group + ${carbon.identity.version} - - org.wso2.carbon.event.server.feature.group - ${carbon.platform.version} + + - - - org.wso2.carbon.event.server.feature.group - ${carbon.platform.version} + org.wso2.carbon.identity.thrift.authentication.feature.group + ${carbon.identity.version} + + org.wso2.carbon.identity.core.server.feature.group + ${carbon.identity.version} + + + org.wso2.carbon.registry.core.feature.group - ${carbon.platform.version} - - - org.wso2.carbon.registry.core.server.feature.group - ${carbon.platform.version} + ${carbon.registry.version} org.wso2.carbon.registry.ui.menu.feature.group - ${carbon.platform.version} + ${carbon.registry.version} - org.wso2.carbon.registry.resource.properties.feature.group - ${carbon.platform.version} + ${carbon.registry.version} - org.wso2.carbon.registry.associations.dependencies.feature.group - ${carbon.platform.version} + ${carbon.registry.version} org.wso2.carbon.registry.community.features.server.feature.group - ${carbon.platform.version} + ${carbon.registry.version} org.wso2.carbon.registry.ws.feature.group - ${carbon.platform.version} - - - - org.wso2.carbon.registry.extensions.feature.group - ${carbon.platform.version} + ${carbon.registry.version} org.wso2.carbon.registry.contentsearch.feature.group - ${carbon.platform.version} - - - - - org.wso2.carbon.governance.metadata.feature.group - ${carbon.platform.version} + ${carbon.registry.version} org.wso2.carbon.registry.ui.menu.governance.feature.group - ${carbon.platform.version} - - - org.wso2.carbon.governance.lifecycle.management.feature.group - ${carbon.platform.version} + ${carbon.registry.version} + + + + + + + + + + + + + + + +