community
/
device-mgt-plugins
10
0
Fork 39
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changing cdm to mdm

Browse Source
merge-requests/1/head
Geeth Munasinghe 10 years ago
parent 5e3ebc141c
commit bc93ff08a4
16 changed files with 53 additions and 96 deletions
Show Stats Download Patch File Download Diff File

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

@ -33,7 +33,7 @@
<artifactId>device-mgt</artifactId> <artifactId>device-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Device Management Component</name> <name>WSO2 Carbon - Mobile Device Management Component</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<modules> <modules>

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

@ -33,64 +33,13 @@
<artifactId>key-mgt</artifactId> <artifactId>key-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Device Management Component</name> <name>WSO2 Carbon - Oauth Key Management Component</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<modules> <modules>
<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>2.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>
@ -111,9 +60,5 @@
</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>

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

@ -39,12 +39,10 @@
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId> <artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId> <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
@ -102,7 +100,7 @@
<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.device.mgt.server:${project.version} <importFeatureDef>org.wso2.carbon.device.mgt.server:${cdm.core.version}
</importFeatureDef> </importFeatureDef>
</importFeatures> </importFeatures>
</configuration> </configuration>

24
pom.xml
Unescape View File

@ -100,23 +100,29 @@
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.core</artifactId> <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
<version>${project.version}</version> <version>${cdm.core.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId> <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<version>${cdm.core.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.policy.mgt.common</artifactId> <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
<version>${project.version}</version> <version>${cdm.core.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.policy.mgt.core</artifactId> <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
<version>${project.version}</version> <version>${cdm.core.version}</version>
</dependency> </dependency>
@ -197,8 +203,18 @@
</dependencyManagement> </dependencyManagement>
<properties> <properties>
<testng.version>6.1.1</testng.version>
<!--Carbon kernel versions-->
<carbon.kernel.version>4.3.0</carbon.kernel.version> <carbon.kernel.version>4.3.0</carbon.kernel.version>
<carbon.kernel.version.range>[4.3.0, 4.4.0)</carbon.kernel.version.range>
<!--CDM versions-->
<cdm.core.version>1.0.0-SNAPSHOT</cdm.core.version>
<cdm.core.version.range>[1.0.0, 2.0.0)</cdm.core.version.range>
<testng.version>6.1.1</testng.version>
<carbon.platform.version>4.3.0-SNAPSHOT</carbon.platform.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>

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

@ -22,8 +22,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.mdmserver</groupId>
<artifactId>wso2cdmserver-product</artifactId> <artifactId>wso2mdmserver-product</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

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

@ -21,8 +21,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.mdmserver</groupId>
<artifactId>wso2cdmserver-product</artifactId> <artifactId>wso2mdmserver-product</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

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

@ -22,7 +22,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.mdmserver</groupId>
<artifactId>cdm-integration-tests-common</artifactId> <artifactId>cdm-integration-tests-common</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>

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

@ -22,7 +22,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.mdmserver</groupId>
<artifactId>cdm-integration-tests-common</artifactId> <artifactId>cdm-integration-tests-common</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>

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

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.mdmserver</groupId>
<artifactId>wso2cdm-integration</artifactId> <artifactId>wso2cdm-integration</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
@ -30,7 +30,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.mdmserver</groupId>
<artifactId>cdm-integration-tests-common</artifactId> <artifactId>cdm-integration-tests-common</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 CDM Integration Test Common</name> <name>WSO2 CDM Integration Test Common</name>

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

@ -22,7 +22,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.mdmserver</groupId>
<artifactId>cdm-integration-tests-common</artifactId> <artifactId>cdm-integration-tests-common</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>

4
product/modules/mobileservices/agents/android/jax-rs/pom.xml
Unescape View File

@ -21,8 +21,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.mdmserver</groupId>
<artifactId>wso2cdmserver-product-mobileservices</artifactId> <artifactId>wso2mdmserver-product-mobileservices</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath> <relativePath>../../../pom.xml</relativePath>
</parent> </parent>

6
product/modules/mobileservices/agents/windows/jax-rs/pom.xml
Unescape View File

@ -19,8 +19,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.mdmserver</groupId>
<artifactId>wso2cdmserver-product-mobileservices</artifactId> <artifactId>wso2mdmserver-product-mobileservices</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath> <relativePath>../../../pom.xml</relativePath>
</parent> </parent>
@ -152,13 +152,11 @@
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId> <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<version>2.0.0-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.core</artifactId> <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
<version>2.0.0-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

8
product/modules/mobileservices/pom.xml
Unescape View File

@ -3,15 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>wso2cdmserver-product</artifactId> <artifactId>wso2mdmserver-product</artifactId>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.mdmserver</groupId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-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.cdmserver</groupId> <groupId>org.wso2.mdmserver</groupId>
<artifactId>wso2cdmserver-product-mobileservices</artifactId> <artifactId>wso2mdmserver-product-mobileservices</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>agents/windows/jax-rs</module> <module>agents/windows/jax-rs</module>

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

@ -20,15 +20,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.mdmserver</groupId>
<artifactId>wso2cdmserver-product</artifactId> <artifactId>wso2mdmserver-product</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>wso2cdm-profile-gen</artifactId> <artifactId>wso2mdm-profile-gen</artifactId>
<name>WSO2 Connected Device Manager (CDM) - P2 Profile Gen</name> <name>WSO2 Mobile Device Manager (MDM) - P2 Profile Gen</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<build> <build>
@ -104,13 +104,13 @@
org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.platform.version}
</featureArtifactDef>--> </featureArtifactDef>-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.device.mgt.server.feature:${project.version} org.wso2.carbon:org.wso2.carbon.device.mgt.server.feature:${cdm.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.device.mgt.mobile.feature:${project.version} org.wso2.carbon:org.wso2.carbon.device.mgt.mobile.feature:${project.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.policy.mgt.server.feature:${project.version} org.wso2.carbon:org.wso2.carbon.policy.mgt.server.feature:${cdm.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.webapp.mgt.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.webapp.mgt.feature:${carbon.platform.version}
@ -251,7 +251,7 @@
</feature> </feature>
<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>${cdm.core.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.mobile.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.feature.group</id>
@ -259,7 +259,7 @@
</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>${cdm.core.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.webapp.mgt.feature.group</id> <id>org.wso2.carbon.webapp.mgt.feature.group</id>

4
product/modules/rest-api/pom.xml
Unescape View File

@ -1,8 +1,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.mdmserver</groupId>
<artifactId>wso2cdmserver-product</artifactId> <artifactId>wso2mdmserver-product</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

4
product/pom.xml
Unescape View File

@ -28,8 +28,8 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.mdmserver</groupId>
<artifactId>wso2cdmserver-product</artifactId> <artifactId>wso2mdmserver-product</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Connected Device Manager (CDM) - Parent</name> <name>WSO2 Connected Device Manager (CDM) - Parent</name>

Write Preview
Loading…
Cancel
Save