From 2992d9e0989cb3f140cf96d8601ce65ca05063cf Mon Sep 17 00:00:00 2001 From: sinthuja Date: Wed, 9 Nov 2016 17:55:24 +0530 Subject: [PATCH] adding samples to the root location. --- .../core/distribution/src/assembly/bin.xml | 6 - .../distribution/src/samples-deployer.xml | 220 ------------------ modules/distribution/src/assembly/dist.xml | 8 + .../resources/samples/samples-deployer.xml | 10 +- 4 files changed, 13 insertions(+), 231 deletions(-) delete mode 100644 modules/core/distribution/src/samples-deployer.xml diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml index 2175d4d5..4081713c 100644 --- a/modules/core/distribution/src/assembly/bin.xml +++ b/modules/core/distribution/src/assembly/bin.xml @@ -1328,12 +1328,6 @@ ${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps/ 644 - - - src/samples-deployer.xml - ${pom.artifactId}-${pom.version}/ - true - src/repository/conf/etc/webapp-publisher-config.xml diff --git a/modules/core/distribution/src/samples-deployer.xml b/modules/core/distribution/src/samples-deployer.xml deleted file mode 100644 index f86ac6ba..00000000 --- a/modules/core/distribution/src/samples-deployer.xml +++ /dev/null @@ -1,220 +0,0 @@ - - - - - org.wso2 - wso2 - 1 - - - 4.0.0 - org.wso2.iot.devicemgt-plugins - iot-devicetype-feature-installation - ${product.version} - pom - Creating custom distribution - http://wso2.org - - - - - org.wso2.maven - carbon-p2-plugin - 1.5.3 - - - 2-p2-repo-generation - package - - p2-repo-gen - - - file:\${basedir}/samples/p2-repo - file:\${basedir}/samples/p2-repo - true - true - - - - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.feature:${carbon.device.mgt.plugin.version} - - - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.feature:${carbon.device.mgt.plugin.version} - - - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.raspberrypi.feature:${carbon.device.mgt.plugin.version} - - - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature:${carbon.device.mgt.plugin.version} - - - - - - - - - - - - default-feature-install - package - - p2-profile-gen - - - default - file:\${basedir}/samples/p2-repo - file:\${basedir}/samples/p2-repo - repository/components - false - - - org.wso2.carbon.device.mgt.iot.androidsense.feature.group - ${carbon.device.mgt.plugin.version} - - - org.wso2.carbon.device.mgt.iot.arduino.feature.group - ${carbon.device.mgt.plugin.version} - - - org.wso2.carbon.device.mgt.iot.raspberrypi.feature.group - ${carbon.device.mgt.plugin.version} - - - org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature.group - ${carbon.device.mgt.plugin.version} - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.1 - - - default-feature-install - package - - - - - - - - - run - - - - - - - - - - wso2.releases - WSO2 internal Repository - http://maven.wso2.org/nexus/content/repositories/releases/ - - true - daily - ignore - - - - wso2.snapshots - Apache Snapshot Repository - http://maven.wso2.org/nexus/content/repositories/snapshots/ - - true - daily - - - false - - - - wso2-nexus - WSO2 internal Repository - http://maven.wso2.org/nexus/content/groups/wso2-public/ - - true - daily - ignore - - - - - - - - - wso2-nexus - WSO2 internal Repository - http://maven.wso2.org/nexus/content/groups/wso2-public/ - - true - daily - ignore - - - - wso2.releases - WSO2 internal Repository - http://maven.wso2.org/nexus/content/repositories/releases/ - - true - daily - ignore - - - - wso2.snapshots - WSO2 Snapshot Repository - http://maven.wso2.org/nexus/content/repositories/snapshots/ - - true - daily - - - false - - - - \ No newline at end of file diff --git a/modules/distribution/src/assembly/dist.xml b/modules/distribution/src/assembly/dist.xml index f51a89b6..1a5a22b2 100644 --- a/modules/distribution/src/assembly/dist.xml +++ b/modules/distribution/src/assembly/dist.xml @@ -53,5 +53,13 @@ 755 + + src/resources/samples + wso2iot-${product.iot.version}/samples + + */** + + 644 + diff --git a/modules/distribution/src/resources/samples/samples-deployer.xml b/modules/distribution/src/resources/samples/samples-deployer.xml index 125dba68..34d22b31 100644 --- a/modules/distribution/src/resources/samples/samples-deployer.xml +++ b/modules/distribution/src/resources/samples/samples-deployer.xml @@ -46,8 +46,8 @@ p2-repo-gen - file:\${basedir}/samples/p2-repo - file:\${basedir}/samples/p2-repo + file:${basedir}/p2-repo + file:${basedir}/p2-repo true true @@ -74,9 +74,9 @@ default - file:\${basedir}/samples/p2-repo - file:\${basedir}/samples/p2-repo - ../core/repository/components + file:${basedir}/p2-repo + file:${basedir}/p2-repo + ${basedir}/../core/repository/components false