From 4cfa5f60eae28ecff0e3329e1acfc1660c8ef692 Mon Sep 17 00:00:00 2001 From: charithag Date: Wed, 30 Mar 2016 02:07:35 +0530 Subject: [PATCH] Disabled IoT device types based features temporally. --- modules/distribution/src/assembly/bin.xml | 173 ++++++++++-------- .../org.wso2.iot.styles.feature/pom.xml | 4 +- modules/features/pom.xml | 2 +- modules/p2-profile-gen/pom.xml | 124 ++++++------- pom.xml | 4 +- 5 files changed, 152 insertions(+), 155 deletions(-) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 5376d9a3..4c2b42ce 100644 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -744,6 +744,17 @@ 755 + + + + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/email-sender-config.xml + + ${pom.artifactId}-${pom.version}/repository/conf/etc + true + 644 + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-android-agent.war @@ -768,26 +779,26 @@ devicemgt_admin.war - - - ../tools/mdm-android-agent-archetype/target/mdm-android-agent-archetype-${mdm.android.agent.archetype.version}.jar - - ${pom.artifactId}-${pom.version}/repository/tools - - 755 - - - ../tools/mdm-android-agent-archetype/README.txt - ${pom.artifactId}-${pom.version}/repository/tools - - 755 - - - ../tools/mdm-android-agent-archetype/android-agent.sh - ${pom.artifactId}-${pom.version}/repository/tools - - 755 - + + + + + + + + + + + + + + + + + + + + src/repository/conf/synapse.properties @@ -1037,14 +1048,14 @@ 644 - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/notification-messages.xml - - ${pom.artifactId}-${pom.version}/repository/conf - true - 644 - + + + + + + + + @@ -1102,59 +1113,59 @@ 644 - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/AndroidSenseDM_DB.h2.db - - ${pom.artifactId}-${pom.version}/repository/database - AndroidSenseDM_DB.h2.db - 644 - - - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/ArduinoDM_DB.h2.db - - ${pom.artifactId}-${pom.version}/repository/database - ArduinoDM_DB.h2.db - 644 - - - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/DigitalDisplayDM_DB.h2.db - - ${pom.artifactId}-${pom.version}/repository/database - DigitalDisplayDM_DB.h2.db - 644 - - - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/DroneAnalyzerDM_DB.h2.db - - ${pom.artifactId}-${pom.version}/repository/database - DroneAnalyzerDM_DB.h2.db - 644 - - - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/RaspberryPiDM_DB.h2.db - - ${pom.artifactId}-${pom.version}/repository/database - RaspberryPiDM_DB.h2.db - 644 - - - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/VirtualFireAlarmDM_DB.h2.db - - ${pom.artifactId}-${pom.version}/repository/database - VirtualFireAlarmDM_DB.h2.db - 644 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/features/org.wso2.iot.styles.feature/pom.xml b/modules/features/org.wso2.iot.styles.feature/pom.xml index 81018e4d..520bfaa2 100644 --- a/modules/features/org.wso2.iot.styles.feature/pom.xml +++ b/modules/features/org.wso2.iot.styles.feature/pom.xml @@ -24,13 +24,13 @@ org.wso2.iot wso2iot-features - 2.0.4-SNAPSHOT + 2.1.0-SNAPSHOT ../pom.xml 4.0.0 org.wso2.iot.styles.feature - 2.0.4-SNAPSHOT + 2.1.0-SNAPSHOT pom WSO2 IoT Server Styles Feature http://wso2.org diff --git a/modules/features/pom.xml b/modules/features/pom.xml index aa969738..02d18bca 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -30,7 +30,7 @@ 4.0.0 wso2iot-features - 2.0.4-SNAPSHOT + 2.1.0-SNAPSHOT pom WSO2 IoT Server UI Features http://wso2.org diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index 754a1f4d..85dedfb3 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -112,10 +112,7 @@ - org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.server.feature:${carbon.device.mgt.version} - - - org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.group.server.feature:${carbon.device.mgt.version} + org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.feature:${carbon.device.mgt.version} @@ -139,13 +136,10 @@ org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.webapp.publisher.feature:${carbon.device.mgt.version} - org.wso2.carbon.devicemgt:org.wso2.carbon.devicemgt.ui.feature:${carbon.device.mgt.version} + org.wso2.carbon.devicemgt:org.wso2.carbon.identity.jwt.client.extension.feature:${carbon.device.mgt.version} - org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.server.feature:${carbon.device.mgt.version} - - - org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.jwt.client.extension.feature:${carbon.device.mgt.version} + org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version} @@ -159,33 +153,33 @@ org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version} - - org.wso2.carbon.devicemgt-plugins:org.wso2.mdm.mdmmgt.server.feature:${carbon.device.mgt.plugin.version} - + + + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.feature:${carbon.device.mgt.plugin.version} - - 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.digitaldisplay.feature:${carbon.device.mgt.plugin.version} - - - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.droneanalyzer.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} - + + + + + + + + + + + + + + + + + + @@ -840,11 +834,7 @@ - org.wso2.carbon.device.mgt.server.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.device.mgt.group.server.feature.group + org.wso2.carbon.device.mgt.feature.group ${carbon.device.mgt.version} @@ -876,21 +866,17 @@ ${carbon.device.mgt.version} - org.wso2.carbon.device.mgt.jwt.client.extension.feature.group + org.wso2.carbon.email.sender.feature.group ${carbon.device.mgt.version} - org.wso2.carbon.devicemgt.ui.feature.group + org.wso2.carbon.identity.jwt.client.extension.feature.group ${carbon.device.mgt.version} - - org.wso2.carbon.device.mgt.analytics.server.feature.group - ${carbon.device.mgt.version} - @@ -905,39 +891,39 @@ org.wso2.carbon.device.mgt.mobile.windows.feature.group ${carbon.device.mgt.plugin.version} - - org.wso2.mdm.mdmmgt.server.feature.group - ${carbon.device.mgt.plugin.version} - + + + + org.wso2.carbon.device.mgt.iot.feature.group ${carbon.device.mgt.plugin.version} - - 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.digitaldisplay.feature.group - ${carbon.device.mgt.plugin.version} - - - org.wso2.carbon.device.mgt.iot.droneanalyzer.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} - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 97e971e5..b5601326 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ modules/features modules/p2-profile-gen modules/distribution - modules/integration + @@ -1049,7 +1049,7 @@ 1.0.0-SNAPSHOT - 2.0.4-SNAPSHOT + 2.1.0-SNAPSHOT 2.0.0-SNAPSHOT