From 14a3429a19d8a7a58783c78c9e7351aee0b1b976 Mon Sep 17 00:00:00 2001 From: Geeth Munasinghe Date: Wed, 10 Dec 2014 18:04:29 +0530 Subject: [PATCH] Fixing cdm-config file adding --- .../src/main/resources/p2.inf | 3 +++ product/modules/distribution/src/assembly/bin.xml | 12 +++++++++++- product/modules/p2-profile-gen/pom.xml | 4 ++-- product/pom.xml | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) 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 index e69de29bb2..b5222094b3 100644 --- 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 @@ -0,0 +1,3 @@ +instructions.configure = \ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/cdm-config.xml,target:${installFolder}/../../conf/cdm-config.xml,overwrite:true);\ + diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml index eee52239eb..cb4ffc670f 100644 --- a/product/modules/distribution/src/assembly/bin.xml +++ b/product/modules/distribution/src/assembly/bin.xml @@ -153,7 +153,7 @@ **/api-manager.xml **/sso-idp-config.xml - **/emm-config.xml + @@ -358,6 +358,16 @@ true 644 + + + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cdm-config.xml + ${pom.artifactId}-${pom.version}/repository/conf + true + 644 + + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml ${pom.artifactId}-${pom.version}/repository/conf/tomcat diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml index 97d4a18cdd..5418904a50 100644 --- a/product/modules/p2-profile-gen/pom.xml +++ b/product/modules/p2-profile-gen/pom.xml @@ -107,7 +107,7 @@ org.wso2.carbon:org.wso2.carbon.device.mgt.server.feature:${project.version} - + org.wso2.carbon:org.wso2.carbon.device.mgt.mobile.feature:${project.version} @@ -164,7 +164,7 @@ org.wso2.carbon.device.mgt.server.feature.group ${project.version} - + org.wso2.carbon.device.mgt.mobile.feature.group ${project.version} diff --git a/product/pom.xml b/product/pom.xml index c9fbafc3d0..3c38159663 100644 --- a/product/pom.xml +++ b/product/pom.xml @@ -34,7 +34,7 @@ WSO2 Connected Device Manager (CDM) - Parent - + modules/agents/android/jax-rs modules/p2-profile-gen modules/distribution modules/integration