prathabanKavin
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging the changes of the release-1.0.0 branch, then this branch will be removed

Browse Source 
Merge branch 'release-1.0.0'
revert-70aa11f8
Geeth Munasinghe 10 years ago
parent 071618fb5e ed538551e2
commit dee5dcd8b8
24 changed files with 198 additions and 321 deletions
Show Stats Download Patch File Download Diff File

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

@ -3,13 +3,13 @@
<parent> <parent>
<artifactId>device-mgt</artifactId> <artifactId>device-mgt</artifactId>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId> <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Device Management Commons</name> <name>WSO2 Carbon - Device Management Commons</name>
<description>WSO2 Carbon - Device Management Commons</description> <description>WSO2 Carbon - Device Management Commons</description>
@ -26,7 +26,7 @@
<instructions> <instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-Version>${project.version}</Bundle-Version> <Bundle-Version>${carbon.cdm.version}</Bundle-Version>
<Bundle-Description>Device Management Common Bundle</Bundle-Description> <Bundle-Description>Device Management Common Bundle</Bundle-Description>
<Export-Package> <Export-Package>
org.wso2.carbon.device.mgt.common.* org.wso2.carbon.device.mgt.common.*

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

@ -21,14 +21,14 @@
<parent> <parent>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>device-mgt</artifactId> <artifactId>device-mgt</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<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>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Device Management Core</name> <name>WSO2 Carbon - Device Management Core</name>
<description>WSO2 Carbon - Device Management Core</description> <description>WSO2 Carbon - Device Management Core</description>
@ -49,7 +49,7 @@
<instructions> <instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-Version>${project.version}</Bundle-Version> <Bundle-Version>${carbon.cdm.version}</Bundle-Version>
<Bundle-Description>Device Management Core Bundle</Bundle-Description> <Bundle-Description>Device Management Core Bundle</Bundle-Description>
<Private-Package>org.wso2.carbon.device.mgt.core.internal</Private-Package> <Private-Package>org.wso2.carbon.device.mgt.core.internal</Private-Package>
<Import-Package> <Import-Package>

4
components/device-mgt/pom.xml
Unescape View File

@ -22,14 +22,14 @@
<parent> <parent>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>device-mgt</artifactId> <artifactId>device-mgt</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Device Management Component</name> <name>WSO2 Carbon - Device Management Component</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

57
components/key-mgt/pom.xml
Unescape View File

@ -40,58 +40,6 @@
<module>org.wso2.carbon.key.mgt.handler.valve</module> <module>org.wso2.carbon.key.mgt.handler.valve</module>
</modules> </modules>
<!--
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>3.8.1.v20120830-144521</version>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.6.100.v20120522-1841</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
<version>4.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
<version>3.3.100.v20120522-1822</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.apimgt.core</artifactId>
<version>${apim.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.apimgt.impl</artifactId>
<version>${apim.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.wso2</groupId>
<artifactId>tomcat</artifactId>
<version>${orbit.version.tomcat}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.tomcat.ext</artifactId>
<version>4.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
-->
<build> <build>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
@ -111,9 +59,4 @@
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
<!-- <properties>
<orbit.version.h2.engine>1.2.140.wso2v3</orbit.version.h2.engine>
<apim.version>1.2.1</apim.version>
<orbit.version.tomcat>7.0.52.wso2v5</orbit.version.tomcat>
</properties>-->
</project> </project>

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

@ -20,14 +20,14 @@
<parent> <parent>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>policy-mgt</artifactId> <artifactId>policy-mgt</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<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>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Policy Decision Point</name> <name>WSO2 Carbon - Policy Decision Point</name>
<description>WSO2 Carbon - Policy Decision Point</description> <description>WSO2 Carbon - Policy Decision Point</description>
@ -48,7 +48,7 @@
<instructions> <instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-Version>${project.version}</Bundle-Version> <Bundle-Version>${carbon.cdm.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>
<Export-Package> <Export-Package>

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

@ -20,14 +20,14 @@
<parent> <parent>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>policy-mgt</artifactId> <artifactId>policy-mgt</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<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>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Policy Management Common</name> <name>WSO2 Carbon - Policy Management Common</name>
<description>WSO2 Carbon - Policy Management Common</description> <description>WSO2 Carbon - Policy Management Common</description>
@ -48,7 +48,7 @@
<instructions> <instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-Version>${project.version}</Bundle-Version> <Bundle-Version>${carbon.cdm.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.mgt.common.internal</Private-Package> <Private-Package>org.wso2.carbon.policy.mgt.common.internal</Private-Package>
<Import-Package> <Import-Package>

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

@ -20,14 +20,14 @@
<parent> <parent>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>policy-mgt</artifactId> <artifactId>policy-mgt</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<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>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Policy Management Core</name> <name>WSO2 Carbon - Policy Management Core</name>
<description>WSO2 Carbon - Policy Management Core</description> <description>WSO2 Carbon - Policy Management Core</description>
@ -48,7 +48,7 @@
<instructions> <instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-Version>${project.version}</Bundle-Version> <Bundle-Version>${carbon.cdm.version}</Bundle-Version>
<Bundle-Description>Policy Management Core Bundle</Bundle-Description> <Bundle-Description>Policy Management Core Bundle</Bundle-Description>
<Private-Package>org.wso2.carbon.policy.mgt.core.internal</Private-Package> <Private-Package>org.wso2.carbon.policy.mgt.core.internal</Private-Package>
<Import-Package> <Import-Package>

23
components/policy-mgt/pom.xml
Unescape View File

@ -21,14 +21,14 @@
<parent> <parent>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>policy-mgt</artifactId> <artifactId>policy-mgt</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Policy Management Component</name> <name>WSO2 Carbon - Policy Management Component</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
@ -39,25 +39,6 @@
<module>org.wso2.carbon.policy.evalutor</module> <module>org.wso2.carbon.policy.evalutor</module>
</modules> </modules>
<!-- <dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>3.8.1.v20120830-144521</version>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.6.100.v20120522-1841</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
<version>4.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>-->
<build> <build>
<pluginManagement> <pluginManagement>

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

@ -20,14 +20,14 @@
<parent> <parent>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>device-mgt-feature</artifactId> <artifactId>device-mgt-feature</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.device.mgt.server.feature</artifactId> <artifactId>org.wso2.carbon.device.mgt.server.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<name>WSO2 Carbon - Device Management Server Feature</name> <name>WSO2 Carbon - Device Management Server Feature</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<description>This feature contains the core bundles required for Back-end Devvice Management functionality <description>This feature contains the core bundles required for Back-end Devvice Management functionality

4
features/device-mgt/pom.xml
Unescape View File

@ -22,14 +22,14 @@
<parent> <parent>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>device-mgt-feature</artifactId> <artifactId>device-mgt-feature</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Device Management Feature</name> <name>WSO2 Carbon - Device Management Feature</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

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

@ -21,14 +21,14 @@
<parent> <parent>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>policy-mgt-feature</artifactId> <artifactId>policy-mgt-feature</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.policy.mgt.server.feature</artifactId> <artifactId>org.wso2.carbon.policy.mgt.server.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<name>WSO2 Carbon - Policy Management Server Feature</name> <name>WSO2 Carbon - Policy Management Server Feature</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<description>This feature contains the core bundles required for Back-end Devvice Management functionality <description>This feature contains the core bundles required for Back-end Devvice Management functionality

4
features/policy-mgt/pom.xml
Unescape View File

@ -21,14 +21,14 @@
<parent> <parent>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>policy-mgt-feature</artifactId> <artifactId>policy-mgt-feature</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Policy Management Feature</name> <name>WSO2 Carbon - Policy Management Feature</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

38
pom.xml
Unescape View File

@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<name>WSO2 CDM - Parent</name> <name>WSO2 CDM - Parent</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<description>WSO2 Connected Device Manager</description> <description>WSO2 Connected Device Manager</description>
@ -544,31 +544,22 @@
</dependency> </dependency>
<!-- End of Carbon Kernel dependencies --> <!-- End of Carbon Kernel dependencies -->
<!-- Orbit dependencies -->
<dependency> <dependency>
<groupId>com.h2database.wso2</groupId> <groupId>com.h2database.wso2</groupId>
<artifactId>h2-database-engine</artifactId> <artifactId>h2-database-engine</artifactId>
<version>${orbit.version.h2.engine}</version> <version>${orbit.version.h2.engine}</version>
</dependency> </dependency>
<!-- API Manager dependencies -->
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.apimgt.core</artifactId>
<version>${apim.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.apimgt.impl</artifactId>
<version>${apim.version}</version>
</dependency>
<!-- End of API Manager dependencies -->
<dependency> <dependency>
<groupId>org.apache.tomcat.wso2</groupId> <groupId>org.apache.tomcat.wso2</groupId>
<artifactId>jdbc-pool</artifactId> <artifactId>jdbc-pool</artifactId>
<version>${tomcat.jdbc.pooling.version}</version> <version>${tomcat.jdbc.pooling.version}</version>
</dependency> </dependency>
<!-- End of Orbit dependencies -->
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -757,26 +748,19 @@
<enabled>false</enabled> <enabled>false</enabled>
</releases> </releases>
</repository> </repository>
<repository>
<id>nexus-releases</id>
<name>WSO2 Release Distribution Repository</name>
<url>http://maven.wso2.org/nexus/service/local/staging/deploy/maven2/</url>
</repository>
</repositories> </repositories>
<properties> <properties>
<testng.version>6.1.1</testng.version> <testng.version>6.1.1</testng.version>
<carbon.kernel.version>4.3.0</carbon.kernel.version> <carbon.kernel.version>4.3.0</carbon.kernel.version>
<carbon.platform.version>4.3.0-SNAPSHOT</carbon.platform.version>
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version> <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
<maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version> <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
<axis2.osgi.version.range>[1.6.1.wso2v11, 1.7.0)</axis2.osgi.version.range> <axis2.osgi.version.range>[1.6.1.wso2v11, 1.7.0)</axis2.osgi.version.range>
<jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version> <jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version>
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version> <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
<cdm.version>1.0.0-SNAPSHOT</cdm.version>
<!--Jaggery --> <!--Jaggery -->
<jaggery.version>0.9.0.ALPHA6</jaggery.version> <jaggery.version>0.9.0</jaggery.version>
<jaggery.extensions.version>1.0.0</jaggery.extensions.version> <jaggery.extensions.version>1.0.0</jaggery.extensions.version>
<jaggery.extensions.sso.version>1.2.0</jaggery.extensions.sso.version> <jaggery.extensions.sso.version>1.2.0</jaggery.extensions.sso.version>
<jaggery.extensions.carbon.version>1.1.0</jaggery.extensions.carbon.version> <jaggery.extensions.carbon.version>1.1.0</jaggery.extensions.carbon.version>
@ -796,9 +780,6 @@
<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> <tomcat.jdbc.pooling.version>7.0.34.wso2v2</tomcat.jdbc.pooling.version>
<!-- API Manager -->
<apim.version>1.2.4</apim.version>
<!-- Carbon Commons --> <!-- Carbon Commons -->
<carbon.commons.version>4.3.4</carbon.commons.version> <carbon.commons.version>4.3.4</carbon.commons.version>
@ -806,7 +787,7 @@
<carbon.deployment.version>4.3.1</carbon.deployment.version> <carbon.deployment.version>4.3.1</carbon.deployment.version>
<!-- Identity --> <!-- Identity -->
<carbon.identity.version>4.3.2</carbon.identity.version> <carbon.identity.version>4.3.3</carbon.identity.version>
<!-- Multi-tenancy --> <!-- Multi-tenancy -->
<carbon.multitenancy.version>4.3.3</carbon.multitenancy.version> <carbon.multitenancy.version>4.3.3</carbon.multitenancy.version>
@ -818,7 +799,10 @@
<carbon.governance.version>4.3.0</carbon.governance.version> <carbon.governance.version>4.3.0</carbon.governance.version>
<!-- Device Management --> <!-- Device Management -->
<carbon.device.mgt.version>1.0.0-SNAPSHOT</carbon.device.mgt.version> <carbon.device.mgt.version>1.0.1-SNAPSHOT</carbon.device.mgt.version>
<!--CDM version-->
<carbon.cdm.version>${carbon.device.mgt.version}</carbon.cdm.version>
</properties> </properties>

36
product/modules/distribution/pom.xml
Unescape View File

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>wso2cdmserver-product</artifactId> <artifactId>wso2cdmserver-product</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
@ -139,8 +139,7 @@
<property name="password" value="wso2carbon" /> <property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE" /> <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE" />
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
autocommit="true" onerror="continue">
<classpath refid="maven.dependency.classpath" /> <classpath refid="maven.dependency.classpath" />
<classpath refid="maven.compile.classpath" /> <classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" /> <classpath refid="maven.runtime.classpath" />
@ -167,8 +166,7 @@
<property name="password" value="wso2carbon" /> <property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2AM_DB;DB_CLOSE_ON_EXIT=FALSE" /> <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2AM_DB;DB_CLOSE_ON_EXIT=FALSE" />
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
autocommit="true" onerror="continue">
<classpath refid="maven.dependency.classpath" /> <classpath refid="maven.dependency.classpath" />
<classpath refid="maven.compile.classpath" /> <classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" /> <classpath refid="maven.runtime.classpath" />
@ -192,16 +190,16 @@
<!--<property name="shindig.version" value="2.5.0-beta5" />--> <!--<property name="shindig.version" value="2.5.0-beta5" />-->
<mkdir dir="${tempdir}" /> <mkdir dir="${tempdir}" />
<mkdir dir="${tempdir}/wso2cdm-${project.version}/repository/components" /> <mkdir dir="${tempdir}/wso2cdm-${carbon.cdm.version}/repository/components" />
<mkdir dir="${tempdir}/wso2cdm-${project.version}/repository/deployment/server" /> <mkdir dir="${tempdir}/wso2cdm-${carbon.cdm.version}/repository/deployment/server" />
<mkdir dir="${tempdir}/wso2cdm-${project.version}/repository/deployment/server/webapps" /> <mkdir dir="${tempdir}/wso2cdm-${carbon.cdm.version}/repository/deployment/server/webapps" />
<unzip dest="${tempdir}"> <unzip dest="${tempdir}">
<fileset dir="target"> <fileset dir="target">
<include name="wso2cdm-${project.version}.zip" /> <include name="wso2cdm-${carbon.cdm.version}.zip" />
</fileset> </fileset>
</unzip> </unzip>
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components" overwrite="true"> <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components" overwrite="true">
<fileset dir="${tempdir}/wso2cdm-${project.version}/repository/components" /> <fileset dir="${tempdir}/wso2cdm-${carbon.cdm.version}/repository/components" />
</copy> </copy>
<!--testing --> <!--testing -->
<!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}"> <!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}">
@ -221,7 +219,7 @@
og4j.logger.net.sf.ehcache=ERROR og4j.logger.net.sf.ehcache=ERROR
</concat> </concat>
<delete file="target/wso2cdm-${project.version}.zip" /> <delete file="target/wso2cdm-${carbon.cdm.version}.zip" />
<delete dir="${tempdir}" /> <delete dir="${tempdir}" />
</tasks> </tasks>
</configuration> </configuration>
@ -262,7 +260,7 @@
<delete dir="target/maven-archiver" /> <delete dir="target/maven-archiver" />
<delete dir="target/wso2carbon-core-${carbon.kernel.version}" /> <delete dir="target/wso2carbon-core-${carbon.kernel.version}" />
<delete dir="target/wso2carbon-core-${carbon.kernel.version}" /> <delete dir="target/wso2carbon-core-${carbon.kernel.version}" />
<delete file="target/wso2cdm-${project.version}.jar" /> <delete file="target/wso2cdm-${carbon.cdm.version}.jar" />
<delete dir="target/sources" /> <delete dir="target/sources" />
<delete dir="target/site" /> <delete dir="target/site" />
<delete dir="target/antrun" /> <delete dir="target/antrun" />
@ -319,20 +317,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<executions>
<execution>
<id>auto-clean</id>
<phase>initialize</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>-->
</plugins> </plugins>
</build> </build>

257
product/modules/distribution/src/assembly/bin.xml
Unescape View File

@ -8,35 +8,39 @@
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>target/wso2carbon-core-${carbon.kernel.version}</directory> <directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
<outputDirectory>wso2cdm-${pom.version}</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}</outputDirectory>
<!-- <excludes> <excludes>
<exclude>**/*.sh</exclude> <exclude>**/*.sh</exclude>
<exclude>**/README*</exclude> <exclude>**/README*</exclude>
<exclude>**/LICENSE*</exclude> <exclude>**/LICENSE*</exclude>
<exclude>**/INSTALL*</exclude> <exclude>**/INSTALL*</exclude>
<exclude>**/release-notes.html</exclude> <exclude>**/release-notes.html</exclude>
<exclude>**/axis2services/sample01.aar</exclude> <exclude>**/axis2services/sample01.aar</exclude>
<exclude>**/axis2services/echo/**</exclude> <exclude>**/axis2services/echo/**</exclude>
<exclude>**/axis2services/version/**</exclude> <exclude>**/axis2services/version/**</exclude>
<exclude>**/pom.xml</exclude> <exclude>**/pom.xml</exclude>
<exclude>**/version.txt</exclude> <exclude>**/version.txt</exclude>
<exclude>**/axis2/axis2.xml</exclude> <!--<exclude>**/axis2/axis2.xml</exclude>-->
<exclude>**/master-datasources.xml</exclude> <exclude>**/master-datasources.xml</exclude>
</excludes>--> <exclude>**/carbon.xml</exclude>
<exclude>**/database/WSO2DM_DB.h2.db</exclude>
<exclude>**/client-truststore.jks</exclude>
<exclude>**/wso2carbon.jks</exclude>
</excludes>
</fileSet> </fileSet>
<!--copying runtimes--> <!--copying runtimes-->
<fileSet> <fileSet>
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes
</directory> </directory>
<outputDirectory>wso2cdm-${pom.version}/lib/runtimes/</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/lib/runtimes/</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>target/wso2carbon-core-${carbon.kernel.version}</directory> <directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
<outputDirectory>wso2cdm-${pom.version}</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}</outputDirectory>
<includes> <includes>
<include>**/*.sh</include> <include>**/*.sh</include>
</includes> </includes>
@ -48,7 +52,7 @@
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
</directory> </directory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/multitenancy <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/multitenancy
</outputDirectory> </outputDirectory>
<includes> <includes>
<include>**/stratos.xml</include> <include>**/stratos.xml</include>
@ -62,7 +66,7 @@
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
</directory> </directory>
<outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf</outputDirectory>
<includes> <includes>
<include>**/tenant-mgt.xml</include> <include>**/tenant-mgt.xml</include>
</includes> </includes>
@ -70,7 +74,7 @@
<fileSet> <fileSet>
<directory>src/repository/resources/styles/css</directory> <directory>src/repository/resources/styles/css</directory>
<outputDirectory>wso2cdm-${project.version}/resources/allthemes/Default/admin <outputDirectory>wso2cdm-${carbon.cdm.version}/resources/allthemes/Default/admin
</outputDirectory> </outputDirectory>
<includes> <includes>
<include>**/**.css</include> <include>**/**.css</include>
@ -78,7 +82,7 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>src/repository/resources/styles/images</directory> <directory>src/repository/resources/styles/images</directory>
<outputDirectory>wso2cdm-${project.version}/resources/allthemes/Default/images <outputDirectory>wso2cdm-${carbon.cdm.version}/resources/allthemes/Default/images
</outputDirectory> </outputDirectory>
<includes> <includes>
<include>**/**.gif</include> <include>**/**.gif</include>
@ -89,19 +93,19 @@
<!-- copy documentation --> <!-- copy documentation -->
<fileSet> <fileSet>
<directory>target/site</directory> <directory>target/site</directory>
<outputDirectory>wso2cdm-${project.version}/docs</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/docs</outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</fileSet> </fileSet>
<!-- copy the landing page webapp --> <!-- copy the landing page webapp -->
<!-- <fileSet> <!-- <fileSet>
<directory>src/repository/resources/stratos_root</directory> <directory>src/repository/resources/stratos_root</directory>
<outputDirectory>wso2cdm-${project.version}/repository/deployment/server/webapps/STRATOS_ROOT</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/deployment/server/webapps/STRATOS_ROOT</outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</fileSet>--> </fileSet>-->
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules
</directory> </directory>
<outputDirectory>${pom.artifactId}-${project.version}/modules/</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/modules/</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
@ -109,7 +113,7 @@
<fileSet> <fileSet>
<directory>src/repository/conf</directory> <directory>src/repository/conf</directory>
<outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf</outputDirectory>
<includes> <includes>
<include>**/api-manager.xml</include> <include>**/api-manager.xml</include>
<include>**/sso-idp-config.xml</include> <include>**/sso-idp-config.xml</include>
@ -120,7 +124,7 @@
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/
</directory> </directory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/security/</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/security/</outputDirectory>
<includes> <includes>
<include>**/entitlement.properties</include> <include>**/entitlement.properties</include>
<include>**/trusted-idp-config.xml</include> <include>**/trusted-idp-config.xml</include>
@ -128,7 +132,7 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>src/repository/conf/datasources</directory> <directory>src/repository/conf/datasources</directory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/datasources <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/datasources
</outputDirectory> </outputDirectory>
<includes> <includes>
<include>**/master-datasources.xml</include> <include>**/master-datasources.xml</include>
@ -137,7 +141,7 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>src/repository/resources</directory> <directory>src/repository/resources</directory>
<outputDirectory>wso2cdm-${project.version}/repository/resources</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/resources</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
@ -145,24 +149,15 @@
<!--data-bridge configuration--> <!--data-bridge configuration-->
<fileSet> <fileSet>
<directory>src/repository/conf/data-bridge</directory> <directory>src/repository/conf/data-bridge</directory>
<outputDirectory>wso2cdm-${project.version}/repository/conf/data-bridge <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/data-bridge
</outputDirectory> </outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</fileSet> </fileSet>
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes
</directory>
<outputDirectory>wso2cdm-${project.version}/lib/runtimes/</outputDirectory>
<includes>
<include>*/**</include>
</includes>
</fileSet>
<fileSet> <fileSet>
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider
</directory> </directory>
<outputDirectory>wso2cdm-${project.version}/dbscripts/service-provider</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/dbscripts/service-provider</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
@ -173,18 +168,18 @@
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity
</directory> </directory>
<outputDirectory>wso2cdm-${project.version}/dbscripts/identity</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/dbscripts/identity</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
</fileSet> </fileSet>
<!-- Copying API management related dbscripts --> <!-- Copying API management related dbscripts -->
<fileSet> <fileSet>
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt
</directory> </directory>
<outputDirectory>wso2cdm-${project.version}/dbscripts/apimgt</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/dbscripts/apimgt</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
@ -194,7 +189,7 @@
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules
</directory> </directory>
<outputDirectory>wso2cdm-${project.version}/modules/</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/modules/</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
@ -203,7 +198,7 @@
<!-- Copying Device Management related dbscripts --> <!-- Copying Device Management related dbscripts -->
<fileSet> <fileSet>
<directory>../distribution/src/repository/dbscripts/cdm</directory> <directory>../distribution/src/repository/dbscripts/cdm</directory>
<outputDirectory>wso2cdm-${project.version}/dbscripts/cdm</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/dbscripts/cdm</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
@ -212,29 +207,29 @@
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources
</directory> </directory>
<outputDirectory>${project.artifactId}-${project.version}/repository/resources <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/resources
</outputDirectory> </outputDirectory>
</fileSet> </fileSet>
<!-- copy cdm jaggery app <!-- copy cdm jaggery app
Commented the section since the repo was moved to MDM Commented the section since the repo was moved to MDM
--> -->
<!--<fileSet>--> <!--<fileSet>-->
<!--<directory>src/repository/jaggeryapps</directory>--> <!--<directory>src/repository/jaggeryapps</directory>-->
<!--<outputDirectory>wso2cdm-${project.version}/repository/deployment/server/jaggeryapps--> <!--<outputDirectory>wso2cdm-${carbon.cdm.version}/repository/deployment/server/jaggeryapps-->
<!--</outputDirectory>--> <!--</outputDirectory>-->
<!--<fileMode>755</fileMode>--> <!--<fileMode>755</fileMode>-->
<!--</fileSet>--> <!--</fileSet>-->
</fileSets> </fileSets>
<dependencySets> <dependencySets>
<dependencySet> <dependencySet>
<outputDirectory>wso2cdm-${project.version}/lib/endorsed</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/lib/endorsed</outputDirectory>
<includes> <includes>
<include>javax.el:el-api:jar</include> <include>javax.el:el-api:jar</include>
</includes> </includes>
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>
<outputDirectory>wso2cdm-${project.version}/repository/deployment/client/modules <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/deployment/client/modules
</outputDirectory> </outputDirectory>
<includes> <includes>
<include>org.hibernate.wso2:hibernate:jar</include> <include>org.hibernate.wso2:hibernate:jar</include>
@ -244,23 +239,23 @@
</dependencySets> </dependencySets>
<files> <files>
<!-- <file> <!-- <file>
<source>../mobileservices/agents/android/jax-rs/target/cdm-android-api.war</source> <source>../mobileservices/agents/android/jax-rs/target/cdm-android-api.war</source>
<outputDirectory>wso2cdm-${pom.version}/repository/deployment/server/webapps <outputDirectory>wso2cdm-${pom.version}/repository/deployment/server/webapps
</outputDirectory> </outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</file> </file>
<file> <file>
<source>../rest-api/target/wso2cdm-api.war</source> <source>../rest-api/target/wso2cdm-api.war</source>
<outputDirectory>wso2cdm-${pom.version}/repository/deployment/server/webapps <outputDirectory>wso2cdm-${pom.version}/repository/deployment/server/webapps
</outputDirectory> </outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</file>--> </file>-->
<!-- <file> <!-- <file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml
</source> </source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/tomcat</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/tomcat</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
@ -268,57 +263,57 @@
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml
</source> </source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/tomcat</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/tomcat</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file>--> </file>-->
<file> <file>
<source>src/repository/conf/tomcat/context.xml</source> <source>src/repository/conf/tomcat/context.xml</source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/tomcat</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/tomcat</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- <file> <!-- <file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
</source> </source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file>--> </file>-->
<file> <file>
<source>INSTALL.txt</source> <source>INSTALL.txt</source>
<outputDirectory>wso2cdm-${project.version}</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>README.txt</source> <source>README.txt</source>
<outputDirectory>wso2cdm-${project.version}</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>LICENSE.txt</source> <source>LICENSE.txt</source>
<outputDirectory>wso2cdm-${project.version}</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>release-notes.html</source> <source>release-notes.html</source>
<outputDirectory>wso2cdm-${project.version}</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source> <source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source>
<outputDirectory>wso2cdm-${project.version}/bin/</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/bin/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source> <source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source>
<outputDirectory>wso2cdm-${project.version}/bin/</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/bin/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
@ -328,7 +323,7 @@
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml
</source> </source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/etc</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/etc</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
@ -338,60 +333,60 @@
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
</source> </source>
<outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- Copying application-authentication.xml --> <!-- Copying application-authentication.xml -->
<!-- <!--
<file> <file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/application-authentication.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/application-authentication.xml
</source> </source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/security</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/security</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
--> -->
<!-- Copying thrift-authentication.xml --> <!-- Copying thrift-authentication.xml -->
<!-- <file> <!-- <file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml
</source> </source>
<outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file>--> </file>-->
<file> <file>
<source>src/repository/conf/multitenancy/cloud-services-desc.xml</source> <source>src/repository/conf/multitenancy/cloud-services-desc.xml</source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/multitenancy/ <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/multitenancy/
</outputDirectory> </outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
</file> </file>
<!--<file> <!--<file>
<source>src/repository/conf/axis2/axis2.xml</source> <source>src/repository/conf/axis2/axis2.xml</source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/axis2/</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/axis2/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file>--> </file>-->
<file> <file>
<source>src/repository/conf/application-authenticators.xml</source> <source>src/repository/conf/application-authenticators.xml</source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/security/</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/security/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README</source> <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README</source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>src/repository/conf/identity.xml</source> <source>src/repository/conf/identity.xml</source>
<outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf</outputDirectory>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
@ -399,7 +394,7 @@
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/tomcat
</outputDirectory> </outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
@ -410,65 +405,65 @@
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cdm-config.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cdm-config.xml
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!--cdm plugin config file--> <!--cdm plugin config file-->
<!-- <file> <!-- <file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/mobile-config.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/mobile-config.xml
</source> </source>
<outputDirectory> <outputDirectory>
${pom.artifactId}-${pom.version}/repository/conf/etc/device-mgt-plugin-configs/mobile ${wso2cdm}-${carbon.cdm.version}/repository/conf/etc/device-mgt-plugin-configs/mobile
</outputDirectory> </outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file>--> </file>-->
<file> <file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/tomcat
</outputDirectory> </outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- Copying H2 database related files corresponding to default API management repository schema --> <!-- Copying H2 database related files corresponding to default API management repository schema -->
<!-- <file> <!-- <file>
<source> <source>
target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2AM_DB.h2.db target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2AM_DB.h2.db
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory> <outputDirectory>${pom.artifactId}-${carbon.cdm.version}/repository/database</outputDirectory>
<destName>WSO2AM_DB.h2.db</destName> <destName>WSO2AM_DB.h2.db</destName>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file>--> </file>-->
<!-- Copying H2 database related files corresponding to default Device management repository schema --> <!-- Copying H2 database related files corresponding to default Device management repository schema -->
<file> <file>
<source> <source>
target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2DM_DB.h2.db target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2DM_DB.h2.db
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/database</outputDirectory>
<destName>WSO2DM_DB.h2.db</destName> <destName>WSO2DM_DB.h2.db</destName>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- Copying H2 database related files corresponding to default Mobile Device management repository schema --> <!-- Copying H2 database related files corresponding to default Mobile Device management repository schema -->
<!-- <file> <!-- <file>
<source> <source>
../distribution/src/repository/database/WSO2MobileDM_DB.h2.db ../distribution/src/repository/database/WSO2MobileDM_DB.h2.db
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory> <outputDirectory>${pom.artifactId}-${carbon.cdm.version}/repository/database</outputDirectory>
<destName>WSO2MobileDM_DB.h2.db</destName> <destName>WSO2MobileDM_DB.h2.db</destName>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> --> </file> -->
<file> <file>
<source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml</source> <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/conf/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
</file> </file>

2
product/modules/distribution/src/assembly/dist.xml
Unescape View File

@ -26,7 +26,7 @@
<!-- Copying p2 profile and osgi bundles--> <!-- Copying p2 profile and osgi bundles-->
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
<outputDirectory>wso2cdm-${project.version}/repository/components</outputDirectory> <outputDirectory>wso2cdm-${carbon.cdm.version}/repository/components</outputDirectory>
<excludes> <excludes>
<exclude>**/eclipse.ini</exclude> <exclude>**/eclipse.ini</exclude>
<exclude>**/*.lock</exclude> <exclude>**/*.lock</exclude>

6
product/modules/integration/pom.xml
Unescape View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>wso2cdmserver-product</artifactId> <artifactId>wso2cdmserver-product</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -34,7 +34,7 @@
</modules> </modules>
<build> <build>
<plugins> <plugins>
<plugin> <!--<plugin>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>
<version>2.4.1</version> <version>2.4.1</version>
<executions> <executions>
@ -46,7 +46,7 @@
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>-->
</plugins> </plugins>
</build> </build>
</project> </project>

2
product/modules/integration/tests-common/admin-clients/pom.xml
Unescape View File

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>cdm-integration-tests-common</artifactId> <artifactId>cdm-integration-tests-common</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
product/modules/integration/tests-common/integration-test-utils/pom.xml
Unescape View File

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>cdm-integration-tests-common</artifactId> <artifactId>cdm-integration-tests-common</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

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

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>wso2cdm-integration</artifactId> <artifactId>wso2cdm-integration</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

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

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>cdm-integration-tests-common</artifactId> <artifactId>cdm-integration-tests-common</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

12
product/modules/integration/tests-ui-integration/pom.xml
Unescape View File

@ -62,7 +62,7 @@
<property> <property>
<name>carbon.zip</name> <name>carbon.zip</name>
<value> <value>
${basedir}/../../distribution/target/wso2emm-${project.version}.zip ${basedir}/../../distribution/target/wso2emm-${carbon.cdm.version}.zip
</value> </value>
</property> </property>
<property> <property>
@ -132,7 +132,7 @@
<artifactItem> <artifactItem>
<groupId>org.wso2.emm</groupId> <groupId>org.wso2.emm</groupId>
<artifactId>wso2emm</artifactId> <artifactId>wso2emm</artifactId>
<version>${project.version}</version> <version>${carbon.cdm.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
<outputDirectory>${basedir}/target/tobeCopied/</outputDirectory> <outputDirectory>${basedir}/target/tobeCopied/</outputDirectory>
@ -171,7 +171,7 @@
<resources> <resources>
<resource> <resource>
<directory> <directory>
${basedir}/target/tobeCopied/wso2emm-${project.version}/repository/resources/security/ ${basedir}/target/tobeCopied/wso2emm-${carbon.cdm.version}/repository/resources/security/
</directory> </directory>
<includes> <includes>
<include>**/*.jks</include> <include>**/*.jks</include>
@ -192,7 +192,7 @@
<resources> <resources>
<resource> <resource>
<directory> <directory>
${basedir}/target/tobeCopied/wso2emm-${project.version}/repository/resources/security/ ${basedir}/target/tobeCopied/wso2emm-${carbon.cdm.version}/repository/resources/security/
</directory> </directory>
<includes> <includes>
<include>**/*.jks</include> <include>**/*.jks</include>
@ -213,7 +213,7 @@
<resources> <resources>
<resource> <resource>
<directory> <directory>
${basedir}/target/tobeCopied/wso2emm-${project.version}/repository/conf/axis2/ ${basedir}/target/tobeCopied/wso2emm-${carbon.cdm.version}/repository/conf/axis2/
</directory> </directory>
<includes> <includes>
<include>**/*.xml</include> <include>**/*.xml</include>
@ -234,7 +234,7 @@
<resources> <resources>
<resource> <resource>
<directory> <directory>
${basedir}/target/tobeCopied/wso2emm-${project.version}/repository/deployment/client/modules ${basedir}/target/tobeCopied/wso2emm-${carbon.cdm.version}/repository/deployment/client/modules
</directory> </directory>
<includes> <includes>
<include>**/*.mar</include> <include>**/*.mar</include>

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

@ -20,7 +20,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>wso2cdmserver-product</artifactId> <artifactId>wso2cdmserver-product</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
@ -166,9 +166,9 @@
--> -->
<!-- Multitenancy Features --> <!-- Multitenancy Features -->
<!--featureArtifactDef> <!-- <featureArtifactDef>
org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.common.server.feature:${carbon.multitenancy.version} org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.common.server.feature:${carbon.multitenancy.version}
</featureArtifactDef--> </featureArtifactDef>-->
<!-- End of Multitenancy Features --> <!-- End of Multitenancy Features -->
<!-- Identity Features --> <!-- Identity Features -->
@ -271,10 +271,7 @@
</destination> </destination>
<deleteOldProfileFiles>true</deleteOldProfileFiles> <deleteOldProfileFiles>true</deleteOldProfileFiles>
<features> <features>
<!--<feature>
<id>org.wso2.carbon.apimgt.core.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>-->
<!-- Device Management Features --> <!-- Device Management Features -->
<feature> <feature>
@ -323,10 +320,10 @@
<id>org.wso2.carbon.webapp.mgt.feature.group</id> <id>org.wso2.carbon.webapp.mgt.feature.group</id>
<version>${carbon.deployment.version}</version> <version>${carbon.deployment.version}</version>
</feature> </feature>
<feature> <!--<feature>
<id>org.wso2.carbon.webapp.mgt.server.feature.group</id> <id>org.wso2.carbon.webapp.mgt.server.feature.group</id>
<version>${carbon.deployment.version}</version> <version>${carbon.deployment.version}</version>
</feature> </feature>-->
<feature> <feature>
<id>org.wso2.carbon.as.runtimes.cxf.feature.group</id> <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
<version>${carbon.deployment.version}</version> <version>${carbon.deployment.version}</version>
@ -351,18 +348,11 @@
</feature> </feature>
<!--End of Carbon Commons Features--> <!--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 --> <!-- Carbon Multitenancy Features -->
<!--feature> <!--<feature>
<id>org.wso2.carbon.tenant.common.server.feature.group</id> <id>org.wso2.carbon.tenant.common.server.feature.group</id>
<version>${carbon.multitenancy.version}</version> <version>${carbon.multitenancy.version}</version>
</feature--> </feature>-->
<!-- End of Carbon Multitenancy Features --> <!-- End of Carbon Multitenancy Features -->
<!-- Identity Features --> <!-- Identity Features -->

2
product/pom.xml
Unescape View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.wso2.carbon.cdm</groupId> <groupId>org.wso2.carbon.cdm</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

Write Preview
Loading…
Cancel
Save