community
/
device-mgt-core
12
0
Fork 47
Code Issues Pull Requests 27 Packages Projects Releases Wiki Activity

Refactoring the poms to remove SNAPSHOT versions of certain dependencies and test clean up

Browse Source
merge-requests/7/head
prabathabey 10 years ago
parent 28746cf764
commit 5d9fb3b803
17 changed files with 576 additions and 314 deletions
Show Stats Download Patch File Download Diff File

4
components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
Unescape View File

@ -31,13 +31,9 @@
<Bundle-Version>${project.version}</Bundle-Version> <Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Description>Device Management Common Bundle</Bundle-Description> <Bundle-Description>Device Management Common Bundle</Bundle-Description>
<Private-Package>org.wso2.carbon.device.mgt.common</Private-Package> <Private-Package>org.wso2.carbon.device.mgt.common</Private-Package>
<Import-Package>
org.apache.commons.logging
</Import-Package>
<Export-Package> <Export-Package>
org.wso2.carbon.device.mgt.common.* org.wso2.carbon.device.mgt.common.*
</Export-Package> </Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>

32
components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
Unescape View File

@ -58,13 +58,27 @@
org.osgi.framework, org.osgi.framework,
org.osgi.service.component, org.osgi.service.component,
org.apache.commons.logging, org.apache.commons.logging,
javax.xml.bind.*,
javax.naming,
javax.sql,
javax.xml.parsers,
javax.transaction.*, 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
</Import-Package> </Import-Package>
<Export-Package> <Export-Package>
!org.wso2.carbon.device.mgt.core.internal, !org.wso2.carbon.device.mgt.core.internal,
org.wso2.carbon.device.mgt.core.* org.wso2.carbon.device.mgt.core.*
</Export-Package> </Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>
@ -128,6 +142,22 @@
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.governance.api</artifactId> <artifactId>org.wso2.carbon.governance.api</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.api</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat.wso2</groupId>
<artifactId>jdbc-pool</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.base</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementRepository.java
Unescape View File

@ -29,7 +29,7 @@ public class DeviceManagementRepository {
private DataSourceConfig dataSourceConfig; private DataSourceConfig dataSourceConfig;
@XmlElement(name = "DataSourceConfiguration", required = false) @XmlElement(name = "DataSourceConfiguration", required = true)
public DataSourceConfig getDataSourceConfig() { public DataSourceConfig getDataSourceConfig() {
return dataSourceConfig; return dataSourceConfig;
} }

10
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/datasource/DataSourceConfig.java
Unescape View File

@ -26,15 +26,15 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "DataSourceConfiguration") @XmlRootElement(name = "DataSourceConfiguration")
public class DataSourceConfig { public class DataSourceConfig {
private JNDILookupDefinition jndiLookupDefintion; private JNDILookupDefinition jndiLookupDefinition;
@XmlElement(name = "JndiLookupDefinition", required = true) @XmlElement(name = "JndiLookupDefinition", required = true)
public JNDILookupDefinition getJndiLookupDefintion() { public JNDILookupDefinition getJndiLookupDefinition() {
return jndiLookupDefintion; return jndiLookupDefinition;
} }
public void setJndiLookupDefintion(JNDILookupDefinition jndiLookupDefintion) { public void setJndiLookupDefinition(JNDILookupDefinition jndiLookupDefinition) {
this.jndiLookupDefintion = jndiLookupDefintion; this.jndiLookupDefinition = jndiLookupDefinition;
} }
} }

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOFactory.java
Unescape View File

@ -62,7 +62,7 @@ public class DeviceManagementDAOFactory {
throw new RuntimeException("Device Management Repository data source configuration " + "is null and " + throw new RuntimeException("Device Management Repository data source configuration " + "is null and " +
"thus, is not initialized"); "thus, is not initialized");
} }
JNDILookupDefinition jndiConfig = config.getJndiLookupDefintion(); JNDILookupDefinition jndiConfig = config.getJndiLookupDefinition();
if (jndiConfig != null) { if (jndiConfig != null) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Initializing Device Management Repository data source using the JNDI " + log.debug("Initializing Device Management Repository data source using the JNDI " +

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
Unescape View File

@ -65,7 +65,7 @@ public final class DeviceManagerUtil {
throw new RuntimeException( throw new RuntimeException(
"Device Management Repository data source configuration " + "is null and thus, is not initialized"); "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 (jndiConfig != null) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug( log.debug(

8
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/DeviceManagementConfigTests.java
Unescape View File

@ -22,6 +22,7 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import org.wso2.carbon.device.mgt.core.config.DeviceManagementConfig; import org.wso2.carbon.device.mgt.core.config.DeviceManagementConfig;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import javax.xml.XMLConstants; import javax.xml.XMLConstants;
import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBContext;
@ -83,7 +84,12 @@ public class DeviceManagementConfigTests {
um.unmarshal(malformedConfig); um.unmarshal(malformedConfig);
Assert.assertTrue(false); Assert.assertTrue(false);
} catch (JAXBException e) { } 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); Assert.assertTrue(true);
} }
} }

95
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOTests.java
Unescape View File

@ -18,7 +18,9 @@
package org.wso2.carbon.device.mgt.core.dao; 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.Assert;
import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeClass;
import org.testng.annotations.Parameters; 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.dto.Status;
import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil; import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
import javax.sql.DataSource;
import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException; import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller; import javax.xml.bind.Unmarshaller;
@ -44,6 +47,9 @@ import java.util.Date;
public class DeviceManagementDAOTests { public class DeviceManagementDAOTests {
private DataSource dataSource;
private static final Log log = LogFactory.getLog(DeviceManagementDAOTests.class);
@BeforeClass @BeforeClass
@Parameters("dbType") @Parameters("dbType")
public void setUpDB(String dbTypeStr) throws Exception { public void setUpDB(String dbTypeStr) throws Exception {
@ -51,15 +57,16 @@ public class DeviceManagementDAOTests {
TestDBConfiguration dbConfig = getTestDBConfiguration(dbType); TestDBConfiguration dbConfig = getTestDBConfiguration(dbType);
switch (dbType) { switch (dbType) {
case H2: case H2:
createH2DB(dbConfig); PoolProperties properties = new PoolProperties();
BasicDataSource testDataSource = new BasicDataSource(); properties.setUrl(dbConfig.getConnectionUrl());
testDataSource.setDriverClassName(dbConfig.getDriverClass()); properties.setDriverClassName(dbConfig.getDriverClass());
testDataSource.setUrl(dbConfig.getConnectionUrl()); properties.setUsername(dbConfig.getUserName());
testDataSource.setUsername(dbConfig.getUserName()); properties.setPassword(dbConfig.getPwd());
testDataSource.setPassword(dbConfig.getPwd()); dataSource = new org.apache.tomcat.jdbc.pool.DataSource(properties);
DeviceManagementDAOFactory.init(testDataSource); this.initSQLScript();
default: DeviceManagementDAOFactory.init(dataSource);
default:
} }
} }
@ -70,7 +77,7 @@ public class DeviceManagementDAOTests {
TestDBConfigurations dbConfigs; TestDBConfigurations dbConfigs;
doc = DeviceManagerUtil.convertToDocument(deviceMgtConfig); doc = DeviceManagerUtil.convertToDocument(deviceMgtConfig);
JAXBContext testDBContext = null; JAXBContext testDBContext;
try { try {
testDBContext = JAXBContext.newInstance(TestDBConfigurations.class); testDBContext = JAXBContext.newInstance(TestDBConfigurations.class);
@ -79,7 +86,6 @@ public class DeviceManagementDAOTests {
} catch (JAXBException e) { } catch (JAXBException e) {
throw new DeviceManagementDAOException("Error parsing test db configurations", e); throw new DeviceManagementDAOException("Error parsing test db configurations", e);
} }
for (TestDBConfiguration config : dbConfigs.getDbTypesList()) { for (TestDBConfiguration config : dbConfigs.getDbTypesList()) {
if (config.getDbType().equals(dbType.toString())) { if (config.getDbType().equals(dbType.toString())) {
return config; return config;
@ -88,12 +94,11 @@ public class DeviceManagementDAOTests {
return null; return null;
} }
private void createH2DB(TestDBConfiguration testDBConf) throws Exception { private void initSQLScript() throws Exception {
Connection conn = null; Connection conn = null;
Statement stmt = null; Statement stmt = null;
try { try {
Class.forName(testDBConf.getDriverClass()); conn = this.getDataSource().getConnection();
conn = DriverManager.getConnection(testDBConf.getConnectionUrl());
stmt = conn.createStatement(); stmt = conn.createStatement();
stmt.executeUpdate("RUNSCRIPT FROM './src/test/resources/sql/CreateH2TestDB.sql'"); stmt.executeUpdate("RUNSCRIPT FROM './src/test/resources/sql/CreateH2TestDB.sql'");
} finally { } finally {
@ -107,33 +112,30 @@ public class DeviceManagementDAOTests {
DeviceType deviceType = new DeviceType(); DeviceType deviceType = new DeviceType();
deviceType.setName("IOS"); deviceType.setName("IOS");
deviceTypeMgtDAO.addDeviceType(deviceType); deviceTypeMgtDAO.addDeviceType(deviceType);
Long deviceTypeId = null;
Long id = null;
Connection conn = 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 { try {
conn = DeviceManagementDAOFactory.getDataSource().getConnection(); conn = this.getDataSource().getConnection();
stmt = conn.createStatement(); stmt = conn.prepareStatement(sql);
ResultSet resultSet = ResultSet rs = stmt.executeQuery();
stmt.executeQuery("SELECT ID,NAME from DM_DEVICE_TYPE DType where DType.NAME='IOS'");
while (resultSet.next()) { if (rs.next()) {
deviceTypeId = resultSet.getLong(1); id = rs.getLong("ID");
} }
} catch (SQLException sqlEx) { } catch (SQLException e) {
throw new DeviceManagementDAOException("error in fetch device type by name IOS", sqlEx); throw new DeviceManagementDAOException("error in fetch device type by name IOS", e);
} finally { } finally {
TestUtils.cleanupResources(conn, stmt, null); TestUtils.cleanupResources(conn, stmt, null);
} }
Assert.assertNotNull(id, "Device Type Id is null");
Assert.assertNotNull(deviceTypeId, "Device Type Id is null"); deviceType.setId(id);
deviceType.setId(deviceTypeId);
} }
@Test(dependsOnMethods = { "addDeviceTypeTest" }) @Test(dependsOnMethods = {"addDeviceTypeTest"})
public void addDeviceTest() throws DeviceManagementDAOException, DeviceManagementException { public void addDeviceTest() throws DeviceManagementDAOException, DeviceManagementException {
DeviceDAO deviceMgtDAO = DeviceManagementDAOFactory.getDeviceDAO(); DeviceDAO deviceMgtDAO = DeviceManagementDAOFactory.getDeviceDAO();
@ -153,30 +155,35 @@ public class DeviceManagementDAOTests {
device.setTenantId(-1234); device.setTenantId(-1234);
deviceMgtDAO.addDevice(device); deviceMgtDAO.addDevice(device);
Long deviceId = null;
Connection conn = null; Connection conn = null;
PreparedStatement stmt = null; PreparedStatement stmt = null;
ResultSet rs = null; ResultSet rs = null;
String deviceStatus = null;
Long id = null;
String status = null;
try { try {
conn = DeviceManagementDAOFactory.getDataSource().getConnection(); conn = this.getDataSource().getConnection();
stmt = conn.prepareStatement( String sql = "SELECT ID, STATUS from DM_DEVICE DEVICE where DEVICE.DEVICE_IDENTIFICATION = ?";
"SELECT ID,STATUS from DM_DEVICE DEVICE where DEVICE.DEVICE_IDENTIFICATION=?"); stmt = conn.prepareStatement(sql);
stmt.setString(1,"111"); stmt.setString(1, "111");
rs = stmt.executeQuery();
while (rs.next()) { rs = stmt.executeQuery();
deviceId = rs.getLong(1); if (rs.next()) {
deviceStatus = rs.getString(2); id = rs.getLong("ID");
status = rs.getString("STATUS");
} }
} catch (SQLException e) { } catch (SQLException e) {
throw new DeviceManagementDAOException("Error in fetch device by device identification id", e); throw new DeviceManagementDAOException("Error in fetch device by device identification id", e);
} finally { } finally {
TestUtils.cleanupResources(conn, stmt, rs); TestUtils.cleanupResources(conn, stmt, rs);
} }
Assert.assertNotNull(deviceId, "Device Id is null"); Assert.assertNotNull(id, "Device Id is null");
Assert.assertNotNull(deviceStatus, "Device status is null"); Assert.assertNotNull(status, "Device status is null");
Assert.assertEquals(deviceStatus, "ACTIVE", "Enroll device status should active"); Assert.assertEquals(status, "ACTIVE", "Enroll device status should active");
}
private DataSource getDataSource() {
return dataSource;
} }
} }

0
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/malformed-cdm-config-no-jndi.config.xml → components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/malformed-cdm-config-no-jndi-config.xml
Unescape View File

4
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testdbconfig.xml
Unescape View File

@ -18,7 +18,7 @@
<DBType typeName="H2"> <DBType typeName="H2">
<connectionurl>jdbc:h2:mem:cdm-test-db;DB_CLOSE_DELAY=-1</connectionurl> <connectionurl>jdbc:h2:mem:cdm-test-db;DB_CLOSE_DELAY=-1</connectionurl>
<driverclass>org.h2.Driver</driverclass> <driverclass>org.h2.Driver</driverclass>
<userName></userName> <userName>wso2carbon</userName>
<pwd></pwd> <pwd>wso2carbon</pwd>
</DBType> </DBType>
</DeviceMgtTestDBConfigurations> </DeviceMgtTestDBConfigurations>

4
components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml
Unescape View File

@ -52,13 +52,9 @@
<Bundle-Version>${project.version}</Bundle-Version> <Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Description>Policy Management Common Bundle</Bundle-Description> <Bundle-Description>Policy Management Common Bundle</Bundle-Description>
<Private-Package>org.wso2.carbon.policy.evaluator</Private-Package> <Private-Package>org.wso2.carbon.policy.evaluator</Private-Package>
<Import-Package>
org.apache.commons.logging
</Import-Package>
<Export-Package> <Export-Package>
org.wso2.carbon.policy.evaluator.* org.wso2.carbon.policy.evaluator.*
</Export-Package> </Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>

1
components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
Unescape View File

@ -58,7 +58,6 @@
<Export-Package> <Export-Package>
org.wso2.carbon.policy.mgt.common.* org.wso2.carbon.policy.mgt.common.*
</Export-Package> </Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>

13
components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
Unescape View File

@ -58,12 +58,19 @@
org.osgi.framework, org.osgi.framework,
org.osgi.service.component, org.osgi.service.component,
org.apache.commons.logging, 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
</Import-Package> </Import-Package>
<Export-Package> <Export-Package>
!org.wso2.carbon.policy.mgt.core.internal, !org.wso2.carbon.policy.mgt.core.internal,
org.wso2.carbon.policy.mgt.core.* org.wso2.carbon.policy.mgt.core.*
</Export-Package> </Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>
@ -99,10 +106,6 @@
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ndatasource.rdbms</artifactId> <artifactId>org.wso2.carbon.ndatasource.rdbms</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
<!-- Policy Management Dependencies--> <!-- Policy Management Dependencies-->
<dependency> <dependency>

20
features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
Unescape View File

@ -36,18 +36,6 @@
</description> </description>
<dependencies> <dependencies>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.device.mgt.core</artifactId> <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
@ -106,14 +94,14 @@
</properties> </properties>
</adviceFile> </adviceFile>
<bundles> <bundles>
<bundleDef>org.wso2.carbon.cdm:org.wso2.carbon.device.mgt.core:${project.version} <bundleDef>org.wso2.carbon.cdm:org.wso2.carbon.device.mgt.core:${carbon.device.mgt.version}
</bundleDef> </bundleDef>
<bundleDef>org.wso2.carbon.cdm:org.wso2.carbon.device.mgt.common:${project.version} <bundleDef>org.wso2.carbon.cdm:org.wso2.carbon.device.mgt.common:${carbon.device.mgt.version}
</bundleDef> </bundleDef>
</bundles> </bundles>
<importFeatures> <importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version} <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>
</importFeatureDef> <importFeatureDef>org.wso2.carbon.governance.server:${carbon.kernel.version}</importFeatureDef>
</importFeatures> </importFeatures>
</configuration> </configuration>
</execution> </execution>

12
features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
Unescape View File

@ -37,18 +37,6 @@
</description> </description>
<dependencies> <dependencies>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.policy.mgt.core</artifactId> <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>

280
pom.xml
Unescape View File

@ -124,9 +124,9 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- End of Carbon Automation Framework dependencies --> <!-- End of Carbon Automation Framework dependencies -->
<!-- Carbon Automation Utils dependencies --> <!-- Carbon Automation Utils dependencies -->
<dependency> <dependency>
<groupId>org.wso2.carbon.automationutils</groupId> <groupId>org.wso2.carbon.automationutils</groupId>
<artifactId>org.wso2.carbon.integration.common.extensions</artifactId> <artifactId>org.wso2.carbon.integration.common.extensions</artifactId>
@ -229,35 +229,96 @@
<dependency> <dependency>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.device.mgt.core</artifactId> <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
<version>${project.version}</version> <version>${carbon.device.mgt.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId> <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<version>${project.version}</version> <version>${carbon.device.mgt.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.policy.mgt.common</artifactId> <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
<version>${project.version}</version> <version>${carbon.device.mgt.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.policy.mgt.core</artifactId> <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
<version>${project.version}</version> <version>${carbon.device.mgt.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.policy.evaluator</artifactId> <artifactId>org.wso2.carbon.policy.evaluator</artifactId>
<version>${project.version}</version> <version>${carbon.device.mgt.version}</version>
</dependency> </dependency>
<!-- Device Management dependencies --> <!-- Device Management dependencies -->
<!-- Governance dependencies --> <!-- Governance dependencies -->
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.api</artifactId>
<version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.core</artifactId>
<version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.base</artifactId>
<version>${carbon.kernel.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.governance.api</artifactId> <artifactId>org.wso2.carbon.governance.api</artifactId>
<version>${governance.version}</version> <version>${carbon.governance.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.juddi.wso2</groupId>
<artifactId>juddi</artifactId>
</exclusion>
<exclusion>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.common</artifactId>
</exclusion>
<exclusion>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.core</artifactId>
</exclusion>
<exclusion>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.admin.api</artifactId>
</exclusion>
<exclusion>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.indexing</artifactId>
</exclusion>
<exclusion>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.registry</artifactId>
</exclusion>
<exclusion>
<groupId>eclipse</groupId>
<artifactId>validateutility</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
</exclusion>
<exclusion>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.extensions</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- End of Governance dependencies --> <!-- End of Governance dependencies -->
@ -284,6 +345,12 @@
<artifactId>testng</artifactId> <artifactId>testng</artifactId>
<version>${testng.version}</version> <version>${testng.version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- Carbon Kernel dependencies --> <!-- Carbon Kernel dependencies -->
@ -291,11 +358,115 @@
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId> <artifactId>org.wso2.carbon.utils</artifactId>
<version>${carbon.kernel.version}</version> <version>${carbon.kernel.version}</version>
<exclusions>
<exclusion>
<groupId>org.bouncycastle.wso2</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
<exclusion>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.queuing</artifactId>
</exclusion>
<exclusion>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.base</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.axis2.wso2</groupId>
<artifactId>axis2</artifactId>
</exclusion>
<exclusion>
<groupId>org.igniterealtime.smack.wso2</groupId>
<artifactId>smack</artifactId>
</exclusion>
<exclusion>
<groupId>org.igniterealtime.smack.wso2</groupId>
<artifactId>smackx</artifactId>
</exclusion>
<exclusion>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
</exclusion>
<exclusion>
<groupId>commons-fileupload.wso2</groupId>
<artifactId>commons-fileupload</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.ant.wso2</groupId>
<artifactId>ant</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.equinox</groupId>
<artifactId>javax.servlet</artifactId>
</exclusion>
<exclusion>
<groupId>commons-httpclient.wso2</groupId>
<artifactId>commons-httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>commons-httpclient.wso2</groupId>
<artifactId>commons-httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.api</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId> <artifactId>org.wso2.carbon.core</artifactId>
<version>${carbon.kernel.version}</version> <version>${carbon.kernel.version}</version>
<exclusions>
<exclusion>
<groupId>com.hazelcast.wso2</groupId>
<artifactId>hazelcast</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.http.helper</artifactId>
</exclusion>
<exclusion>
<groupId>org.wso2.carbon</groupId>
<artifactId>javax.cache.wso2</artifactId>
</exclusion>
<exclusion>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.core</artifactId>
</exclusion>
<exclusion>
<groupId>commons-collections.wso2</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.neethi.wso2</groupId>
<artifactId>neethi</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents.wso2</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina-ha</artifactId>
</exclusion>
<exclusion>
<groupId>wsdl4j.wso2</groupId>
<artifactId>wsdl4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle.wso2</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.axis2.wso2</groupId>
<artifactId>axis2</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -331,12 +502,42 @@
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>javax.servlet</artifactId> <artifactId>javax.servlet</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.wso2.carbon</groupId>
<artifactId>javax.cache.wso2</artifactId>
</exclusion>
<exclusion>
<groupId>commons-dbcp.wso2</groupId>
<artifactId>commons-dbcp</artifactId>
</exclusion>
<exclusion>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ndatasource.rdbms</artifactId>
</exclusion>
<exclusion>
<groupId>org.wso2.securevault</groupId>
<artifactId>org.wso2.securevault</artifactId>
</exclusion>
<exclusion>
<groupId>commons-collections.wso2</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.user.api</artifactId> <artifactId>org.wso2.carbon.user.api</artifactId>
<version>${carbon.kernel.version}</version> <version>${carbon.kernel.version}</version>
<exclusions>
<exclusion>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.base</artifactId>
</exclusion>
<exclusion>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -364,6 +565,12 @@
</dependency> </dependency>
<!-- End of API Manager dependencies --> <!-- End of API Manager dependencies -->
<dependency>
<groupId>org.apache.tomcat.wso2</groupId>
<artifactId>jdbc-pool</artifactId>
<version>${tomcat.jdbc.pooling.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -398,14 +605,14 @@
</executions> </executions>
</plugin> </plugin>
<!--<plugin>--> <!--<plugin>-->
<!--<groupId>org.apache.maven.plugins</groupId>--> <!--<groupId>org.apache.maven.plugins</groupId>-->
<!--<artifactId>maven-compiler-plugin</artifactId>--> <!--<artifactId>maven-compiler-plugin</artifactId>-->
<!--<version>2.3.1</version>--> <!--<version>2.3.1</version>-->
<!--<configuration>--> <!--<configuration>-->
<!--<encoding>UTF-8</encoding>--> <!--<encoding>UTF-8</encoding>-->
<!--<source>1.6</source>--> <!--<source>1.6</source>-->
<!--<target>1.6</target>--> <!--<target>1.6</target>-->
<!--</configuration>--> <!--</configuration>-->
<!--</plugin>--> <!--</plugin>-->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -571,16 +778,13 @@
<cdm.version>1.0.0-SNAPSHOT</cdm.version> <cdm.version>1.0.0-SNAPSHOT</cdm.version>
<!--Jaggery --> <!--Jaggery -->
<jaggery.feature.version>0.9.0-SNAPSHOT</jaggery.feature.version> <jaggery.version>0.9.0.ALPHA6</jaggery.version>
<carbon.feature.version>1.1.0</carbon.feature.version> <jaggery.extensions.version>1.0.0</jaggery.extensions.version>
<process.feature.version>1.0.0</process.feature.version> <jaggery.extensions.sso.version>1.1.0-SNAPSHOT</jaggery.extensions.sso.version>
<uuid.feature.version>1.0.0</uuid.feature.version>
<sso.feature.version>1.1.0-SNAPSHOT</sso.feature.version>
<jaggery-test.feature.version>1.1.0</jaggery-test.feature.version>
<!--Testing --> <!--Testing -->
<automation.test.framework.version>4.3.1</automation.test.framework.version> <automation.test.framework.version>4.3.1</automation.test.framework.version>
<automation.utils.version>4.3.0-SNAPSHOT</automation.utils.version> <automation.utils.version>4.3.0-SNAPSHOT</automation.utils.version>
<testng.version>6.8</testng.version> <testng.version>6.8</testng.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>
@ -590,12 +794,38 @@
<orbit.version.h2.engine>1.2.140.wso2v3</orbit.version.h2.engine> <orbit.version.h2.engine>1.2.140.wso2v3</orbit.version.h2.engine>
<orbit.version.tomcat>7.0.52.wso2v5</orbit.version.tomcat> <orbit.version.tomcat>7.0.52.wso2v5</orbit.version.tomcat>
<tomcat.jdbc.pooling.version>7.0.34.wso2v2</tomcat.jdbc.pooling.version>
<!-- API Manager --> <!-- API Manager -->
<apim.version>1.2.4</apim.version> <apim.version>1.2.4</apim.version>
<!-- Carbon Commons -->
<carbon.commons.version>4.3.1</carbon.commons.version>
<!-- Carbon Utils -->
<carbon.utils.version>4.3.0-SNAPSHOT</carbon.utils.version>
<!-- Carbon Deployment -->
<carbon.deployment.version>4.3.0-SNAPSHOT</carbon.deployment.version>
<!-- Identity -->
<carbon.identity.version>4.3.0-SNAPSHOT</carbon.identity.version>
<!-- Multi-tenancy -->
<carbon.multitenancy.version>4.3.0</carbon.multitenancy.version>
<!-- Registry -->
<carbon.registry.version>4.3.0</carbon.registry.version>
<!-- Governance --> <!-- Governance -->
<governance.version>4.3.0-SNAPSHOT</governance.version> <carbon.governance.version>4.3.0-SNAPSHOT</carbon.governance.version>
<!-- Transport Management -->
<carbon.transport.mgt.version>4.3.0-SNAPSHOT</carbon.transport.mgt.version>
<!-- Device Management -->
<carbon.device.mgt.version>1.0.0-SNAPSHOT</carbon.device.mgt.version>
</properties> </properties>
</project> </project>

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

@ -57,7 +57,6 @@
</artifactItems> </artifactItems>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>unpack-equinox-executable</id> <id>unpack-equinox-executable</id>
<phase>test</phase> <phase>test</phase>
@ -100,143 +99,165 @@
<publishArtifactRepository>true</publishArtifactRepository> <publishArtifactRepository>true</publishArtifactRepository>
<featureArtifacts> <featureArtifacts>
<!--<featureArtifactDef> <!--featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.platform.version}
</featureArtifactDef>--> </featureArtifactDef-->
<!-- Device Management Features -->
<featureArtifactDef> <featureArtifactDef>
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}
</featureArtifactDef> </featureArtifactDef>
<!--<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.device.mgt.mobile.feature:${project.version}
</featureArtifactDef>-->
<featureArtifactDef> <featureArtifactDef>
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}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Device Management Features -->
<!-- Jaggery Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.webapp.mgt.feature:${carbon.platform.version} org.jaggeryjs:org.jaggeryjs.feature:${jaggery.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs:org.jaggeryjs.feature:${jaggery.feature.version} org.jaggeryjs.modules:carbon.feature:${jaggery.extensions.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:carbon.feature:${carbon.feature.version} org.jaggeryjs.modules:process.feature:${jaggery.extensions.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:process.feature:${process.feature.version} org.jaggeryjs.modules:uuid.feature:${jaggery.extensions.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:uuid.feature:${uuid.feature.version} org.jaggeryjs.modules:sso.feature:${jaggery.extensions.sso.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:sso.feature:${sso.feature.version} org.jaggeryjs.modules:jaggery-test.feature:${jaggery.extensions.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Jaggery Features -->
<!-- Carbon Deployment Features -->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon:org.wso2.carbon.module.mgt.feature:${carbon.deployment.version}-->
<!--</featureArtifactDef>-->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon:org.wso2.carbon.webapp.mgt.feature:${carbon.deployment.version}-->
<!--</featureArtifactDef>-->
<!-- End of Carbon Deployment Features -->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.platform.version}-->
<!--</featureArtifactDef>-->
<!-- Carbon Utils Features -->
<!-- End of Carbon Utils Features -->
<!-- Carbon Commons Features -->
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:jaggery-test.feature:${jaggery-test.feature.version} org.wso2.carbon.commons:org.wso2.carbon.databridge.datapublisher.feature:${carbon.commons.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
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}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
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}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
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}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <!--<featureArtifactDef>-->
org.wso2.carbon:org.wso2.carbon.security.mgt.feature:${carbon.platform.version} <!--org.wso2.carbon.commons:org.wso2.carbon.transport.mgt.feature:${carbon.transport.mgt.version}-->
<!--</featureArtifactDef>-->
<!-- End of Carbon Commons Features -->
<!-- API Manager related features -->
<!--<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.apimgt.core.feature:${carbon.platform.version}
</featureArtifactDef> </featureArtifactDef>
-->
<!-- Multitenancy Features -->
<!--featureArtifactDef>
org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.common.server.feature:${carbon.multitenancy.version}
</featureArtifactDef-->
<!-- End of Multitenancy Features -->
<!-- Identity Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.module.mgt.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.security.mgt.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <!--featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.logging.mgt.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.user.mgt.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.databridge.datapublisher.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
<!--<featureArtifactDef> org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.common.feature:${carbon.identity.version}
org.wso2.carbon:org.wso2.carbon.dbconsole.ui.feature:${carbon.platform.version}
</featureArtifactDef>-->
<!-- API Manager related features -->
<!-- <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.apimgt.core.feature:${carbon.platform.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.um.ws.service.server.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.identity.provider.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.user.mgt.server.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.identity.thrift.authentication.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.oauth.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.identity.core.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.oauth.common.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.identity.application.authentication.framework.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.provider.server.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.idp.mgt.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.thrift.authentication.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.identity.user.profile.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.core.server.feature:${carbon.platform.version} org.wso2.carbon.identity:org.wso2.carbon.identity.relying.party.server.feature:${carbon.identity.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.server.feature:${carbon.identity.version}
</featureArtifactDef-->
<!-- End of Identity Features -->
<!-- Registry features -->
<featureArtifactDef> <featureArtifactDef>
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}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
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}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
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}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
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}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
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}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
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}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
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}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.server.feature:${carbon.platform.version} org.wso2.carbon.registry:org.wso2.carbon.registry.ui.menu.governance.feature:${carbon.registry.version}
</featureArtifactDef>-->
<!-- registry features -->
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.event.server.feature:${carbon.platform.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Registry Features -->
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.platform.version}</featureArtifactDef> <!-- Governance Features -->
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.core.server.feature:${carbon.platform.version}</featureArtifactDef> <!--<featureArtifactDef>-->
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.ui.menu.feature:${carbon.platform.version}</featureArtifactDef> <!--org.wso2.carbon:org.wso2.carbon.governance.metadata.feature:${carbon.governance.version}-->
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.resource.properties.feature:${carbon.platform.version}</featureArtifactDef> <!--</featureArtifactDef>-->
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.associations.dependencies.feature:${carbon.platform.version}</featureArtifactDef> <!--<featureArtifactDef>-->
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.community.features.feature:${carbon.platform.version}</featureArtifactDef> <!--org.wso2.carbon:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.governance.version}-->
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.community.features.server.feature:${carbon.platform.version}</featureArtifactDef> <!--</featureArtifactDef>-->
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.extensions.feature:${carbon.platform.version}</featureArtifactDef> <!--<featureArtifactDef>-->
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.ws.feature:${carbon.platform.version}</featureArtifactDef> <!--org.wso2.carbon:org.wso2.carbon.registry.extensions.feature:${carbon.governance.version}-->
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.ui.menu.governance.feature:${carbon.platform.version}</featureArtifactDef> <!--</featureArtifactDef>-->
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.contentsearch.feature:${carbon.platform.version}</featureArtifactDef>
<!--Governance Feature-->
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.governance.metadata.feature:${carbon.platform.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.platform.version}</featureArtifactDef>
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
</execution> </execution>
@ -259,207 +280,205 @@
<id>org.wso2.carbon.apimgt.core.feature.group</id> <id>org.wso2.carbon.apimgt.core.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.platform.version}</version>
</feature>--> </feature>-->
<!-- Device Management Features -->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.server.feature.group</id> <id>org.wso2.carbon.device.mgt.server.feature.group</id>
<version>${project.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.policy.mgt.server.feature.group</id> <id>org.wso2.carbon.policy.mgt.server.feature.group</id>
<version>${project.version}</version> <version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.webapp.mgt.feature.group</id>
<version>${carbon.platform.version}</version>
</feature> </feature>
<!-- End of Device Management Features -->
<!-- Jaggery Features -->
<feature> <feature>
<id>org.jaggeryjs.feature.group</id> <id>org.jaggeryjs.feature.group</id>
<version>${jaggery.feature.version}</version> <version>${jaggery.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.carbon.feature.group</id> <id>org.jaggeryjs.modules.carbon.feature.group</id>
<version>${carbon.feature.version}</version> <version>${jaggery.extensions.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.process.feature.group</id> <id>org.jaggeryjs.modules.process.feature.group</id>
<version>${process.feature.version}</version> <version>${jaggery.extensions.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.uuid.feature.group</id> <id>org.jaggeryjs.modules.uuid.feature.group</id>
<version>${uuid.feature.version}</version> <version>${jaggery.extensions.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.sso.feature.group</id> <id>org.jaggeryjs.modules.sso.feature.group</id>
<version>${sso.feature.version}</version> <version>${jaggery.extensions.sso.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.jaggery-test.feature.group</id> <id>org.jaggeryjs.modules.jaggery-test.feature.group</id>
<version>${jaggery-test.feature.version}</version> <version>${jaggery.extensions.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.transport.mgt.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.service.mgt.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.security.mgt.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.module.mgt.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
<version>${carbon.platform.version}</version>
</feature> </feature>
<!-- End of Jaggery Features -->
<feature> <!-- Carbon Deployment Features -->
<id>org.wso2.carbon.logging.mgt.feature.group</id> <!--<feature>-->
<version>${carbon.platform.version}</version> <!--<id>org.wso2.carbon.module.mgt.feature.group</id>-->
</feature> <!--<version>${carbon.deployment.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.webapp.mgt.feature.group</id>-->
<!--<version>${carbon.deployment.version}</version>-->
<!--</feature>-->
<!-- End of Carbon Deployment Features -->
<feature> <!--<feature>-->
<id>org.wso2.carbon.databridge.datapublisher.feature.group</id> <!--<id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>-->
<version>${carbon.platform.version}</version> <!--<version>${carbon.platform.version}</version>-->
</feature> <!--</feature>-->
<!-- API Manager related features --> <!-- Carbon Utils Features -->
<!--<feature> <!-- End of Carbon Utils Features -->
<id>org.wso2.carbon.um.ws.service.server.feature.group</id>
<version>${carbon.platform.version}</version> <!-- Carbon Commons Features -->
</feature>
<feature>
<id>org.wso2.carbon.user.mgt.server.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.oauth.server.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.identity.oauth.common.feature.group</id> <id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.commons.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.provider.server.feature.group</id> <id>org.wso2.carbon.event.server.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.commons.version}</version>
</feature> </feature>
<feature> <feature>
<id> <id>org.wso2.carbon.event.common.feature.group</id>
org.wso2.carbon.identity.thrift.authentication.feature.group <version>${carbon.commons.version}</version>
</id>
<version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.core.server.feature.group</id> <id>org.wso2.carbon.logging.mgt.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.commons.version}</version>
</feature> </feature>
<!--<feature>-->
<!--<id>org.wso2.carbon.transport.mgt.feature.group</id>-->
<!--<version>${carbon.transport.mgt.version}</version>-->
<!--</feature>-->
<!--End of Carbon Commons Features-->
<!-- API Manager Features -->
<!--<feature>-->
<!--<id>org.wso2.carbon.apimgt.core.feature.group</id>-->
<!--<version>${carbon.platform.version}</version>-->
<!--</feature>-->
<!-- End of API Manager Features -->
<!-- Carbon Multitenancy Features -->
<!--feature>
<id>org.wso2.carbon.tenant.common.server.feature.group</id>
<version>${carbon.multitenancy.version}</version>
</feature-->
<!-- End of Carbon Multitenancy Features -->
<!-- Identity Features -->
<feature> <feature>
<id>org.wso2.carbon.registry.extensions.server.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.event.server.feature.group</id> <id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.event.common.feature.group</id> <id>org.wso2.carbon.idp.mgt.server.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.databridge.datapublisher.feature.group</id> <id>org.wso2.carbon.identity.user.profile.server.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id> <id>org.wso2.carbon.identity.relying.party.server.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.idp.mgt.server.feature.group</id> <id>org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature-->
<!--<feature>
<id>org.wso2.carbon.um.ws.service.server.feature.group</id>
<version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.user.profile.server.feature.group</id> <id>org.wso2.carbon.user.mgt.server.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.relying.party.server.feature.group</id> <id>org.wso2.carbon.identity.oauth.server.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.tenant.common.server.feature.group</id> <id>org.wso2.carbon.identity.oauth.common.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group</id> <id>org.wso2.carbon.identity.provider.server.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
-->
<!-- registry features -->
<feature> <feature>
<id>org.wso2.carbon.event.server.feature.group</id> <id>org.wso2.carbon.identity.thrift.authentication.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.identity.core.server.feature.group</id>
<version>${carbon.identity.version}</version>
</feature-->
<!-- End of Identity Features -->
<!-- Registry Features -->
<feature> <feature>
<id>org.wso2.carbon.registry.core.feature.group</id> <id>org.wso2.carbon.registry.core.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.registry.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.registry.core.server.feature.group</id>
<version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.registry.ui.menu.feature.group</id> <id>org.wso2.carbon.registry.ui.menu.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.registry.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.registry.resource.properties.feature.group</id> <id>org.wso2.carbon.registry.resource.properties.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.registry.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.registry.associations.dependencies.feature.group</id> <id>org.wso2.carbon.registry.associations.dependencies.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.registry.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.registry.community.features.server.feature.group</id> <id>org.wso2.carbon.registry.community.features.server.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.registry.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.registry.ws.feature.group</id> <id>org.wso2.carbon.registry.ws.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.registry.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.registry.extensions.feature.group</id>
<version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.registry.contentsearch.feature.group</id> <id>org.wso2.carbon.registry.contentsearch.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.registry.version}</version>
</feature>
<!-- governance feature -->
<feature>
<id>org.wso2.carbon.governance.metadata.feature.group</id>
<version>${carbon.platform.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.registry.ui.menu.governance.feature.group</id> <id>org.wso2.carbon.registry.ui.menu.governance.feature.group</id>
<version>${carbon.platform.version}</version> <version>${carbon.registry.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.governance.lifecycle.management.feature.group</id>
<version>${carbon.platform.version}</version>
</feature> </feature>
<!-- End of Registry Features -->
<!-- Governance features -->
<!--<feature>-->
<!--<id>org.wso2.carbon.governance.metadata.feature.group</id>-->
<!--<version>${carbon.governance.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.governance.lifecycle.management.feature.group</id>-->
<!--<version>${carbon.governance.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.registry.extensions.feature.group</id>-->
<!--<version>${carbon.governance.version}</version>-->
<!--</feature>-->
<!-- End of Governance Features -->
</features> </features>
</configuration> </configuration>
</execution> </execution>

Write Preview
Loading…
Cancel
Save