From 85fc1adc79c713e8aba7ea7f4f3fd56491492e5e Mon Sep 17 00:00:00 2001 From: Geeth Munasinghe Date: Fri, 5 Dec 2014 12:05:48 +0530 Subject: [PATCH] Adding featurs for the device mgt --- .../org.wso2.carbon.policy.mgt.common/pom.xml | 5 - .../pom.xml | 124 ++++++++++++++++++ .../src/main/resources/build.properties | 1 + .../src/main/resources/p2.inf | 0 features/device-mgt/pom.xml | 43 ++++++ pom.xml | 46 +++++-- product/modules/p2-profile-gen/pom.xml | 8 +- 7 files changed, 211 insertions(+), 16 deletions(-) create mode 100644 features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml create mode 100644 features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/build.properties create mode 100644 features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf create mode 100644 features/device-mgt/pom.xml diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml index f39fe3df81..da740f2c43 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml @@ -78,11 +78,6 @@ org.wso2.carbon org.wso2.carbon.logging - - org.wso2.carbon - org.wso2.carbon.logging - ${carbon.kernel.version} - diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml new file mode 100644 index 0000000000..ab9bf942f2 --- /dev/null +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml @@ -0,0 +1,124 @@ + + + + + + + org.wso2.carbon + device-mgt-feature + 2.0.0-SNAPSHOT + ../pom.xml + + + 4.0.0 + org.wso2.carbon.device.mgt.server.feature + pom + 2.0.0-SNAPSHOT + WSO2 Carbon - Device Management Server Feature + http://wso2.org + This feature contains the core bundles required for Back-end Devvice Management functionality + + + + + org.eclipse.osgi + org.eclipse.osgi + + + org.eclipse.equinox + org.eclipse.equinox.common + + + org.wso2.carbon + org.wso2.carbon.logging + + + org.wso2.carbon + org.wso2.carbon.device.mgt.core + + + org.wso2.carbon + org.wso2.carbon.device.mgt.common + + + + + + + maven-resources-plugin + 2.6 + + + copy-resources + generate-resources + + copy-resources + + + src/main/resources + + + resources + + build.properties + p2.inf + + + + + + + + + org.wso2.maven + carbon-p2-plugin + ${carbon.p2.plugin.version} + + + p2-feature-generation + package + + p2-feature-gen + + + org.wso2.carbon.device.mgt.server + ../../../features/etc/feature.properties + + + org.wso2.carbon.p2.category.type:server + org.eclipse.equinox.p2.type.group:false + + + + org.wso2.carbon:org.wso2.carbon.device.mgt.core:${project.version} + + org.wso2.carbon:org.wso2.carbon.device.mgt.common:${project.version} + + + + org.wso2.carbon.core.server:${carbon.platform.version} + + + + + + + + + diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/build.properties b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/build.properties new file mode 100644 index 0000000000..9c86577d76 --- /dev/null +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/build.properties @@ -0,0 +1 @@ +custom = true diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..e69de29bb2 diff --git a/features/device-mgt/pom.xml b/features/device-mgt/pom.xml new file mode 100644 index 0000000000..44b6951806 --- /dev/null +++ b/features/device-mgt/pom.xml @@ -0,0 +1,43 @@ + + + + + + + org.wso2.carbon + wso2cdm-parent + 2.0.0-SNAPSHOT + ../../pom.xml + + + 4.0.0 + org.wso2.carbon + device-mgt-feature + 2.0.0-SNAPSHOT + pom + WSO2 Carbon - Device Management Feature + http://wso2.org + + + org.wso2.carbon.device.mgt.server.feature + + + diff --git a/pom.xml b/pom.xml index 07e6b80b30..e9c30ba26d 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,6 @@ http://wso2.org WSO2 Connected Device Manager - org.wso2 wso2 @@ -40,22 +39,15 @@ components/device-mgt components/policy-mgt + features/device-mgt product/modules/p2-profile-gen product/modules/distribution product/modules/integration - - - org.wso2.carbon.automation org.wso2.carbon.automation.engine @@ -91,21 +83,55 @@ ${stub.version} test + + org.wso2.carbon + org.wso2.carbon.logging + ${carbon.kernel.version} + + + org.wso2.carbon + org.wso2.carbon.device.mgt.core + ${project.version} + + + org.wso2.carbon + org.wso2.carbon.device.mgt.common + ${project.version} + + + + + org.eclipse.osgi + org.eclipse.osgi + ${eclipse.osgi.version} + + + org.eclipse.equinox + org.eclipse.equinox.common + ${eclipse.equinox.common.version} + + 4.3.0-SNAPSHOT - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT 1.5.4 1.3 [1.6.1.wso2v11, 1.7.0) + 1.5.4 4.3.1 6.8 4.3.0-SNAPSHOT 1.1.0 + + + 3.6.100.v20120522-1841 + 3.8.1.v20120830-144521 + \ No newline at end of file diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml index 9d70de4249..7883a73640 100644 --- a/product/modules/p2-profile-gen/pom.xml +++ b/product/modules/p2-profile-gen/pom.xml @@ -104,6 +104,9 @@ org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.kernel.version} + + org.wso2.carbon:org.wso2.carbon.device.mgt.server.feature:${project.version} + @@ -129,11 +132,14 @@ org.wso2.carbon.ndatasource.feature.group ${carbon.kernel.version} - org.wso2.carbon.ndatasource.ui.feature.group ${carbon.kernel.version} + + org.wso2.carbon.device.mgt.server.feature.group + ${project.version} +