Disabled IoT device types based features temporally.

merge-requests/1/head
charithag 9 years ago
parent 8f60317a4f
commit 4cfa5f60ea

@ -744,6 +744,17 @@
<fileMode>755</fileMode> <fileMode>755</fileMode>
</file> </file>
<!-- End of "portal" app specific modifications --> <!-- End of "portal" app specific modifications -->
<!-- Copying email-sender-config.xml -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/email-sender-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file> <file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-android-agent.war ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-android-agent.war
@ -768,26 +779,26 @@
</outputDirectory> </outputDirectory>
<destName>devicemgt_admin.war</destName> <destName>devicemgt_admin.war</destName>
</file> </file>
<file> <!--<file>-->
<source> <!--<source>-->
../tools/mdm-android-agent-archetype/target/mdm-android-agent-archetype-${mdm.android.agent.archetype.version}.jar <!--../tools/mdm-android-agent-archetype/target/mdm-android-agent-archetype-${mdm.android.agent.archetype.version}.jar-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/tools <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/tools-->
</outputDirectory> <!--</outputDirectory>-->
<fileMode>755</fileMode> <!--<fileMode>755</fileMode>-->
</file> <!--</file>-->
<file> <!--<file>-->
<source>../tools/mdm-android-agent-archetype/README.txt</source> <!--<source>../tools/mdm-android-agent-archetype/README.txt</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/tools <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/tools-->
</outputDirectory> <!--</outputDirectory>-->
<fileMode>755</fileMode> <!--<fileMode>755</fileMode>-->
</file> <!--</file>-->
<file> <!--<file>-->
<source>../tools/mdm-android-agent-archetype/android-agent.sh</source> <!--<source>../tools/mdm-android-agent-archetype/android-agent.sh</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/tools <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/tools-->
</outputDirectory> <!--</outputDirectory>-->
<fileMode>755</fileMode> <!--<fileMode>755</fileMode>-->
</file> <!--</file>-->
<!-- Copying synapse.properties file --> <!-- Copying synapse.properties file -->
<file> <file>
<source>src/repository/conf/synapse.properties</source> <source>src/repository/conf/synapse.properties</source>
@ -1037,14 +1048,14 @@
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!--Notification Config File--> <!--Notification Config File-->
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/notification-messages.xml <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/notification-messages.xml-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>-->
<filtered>true</filtered> <!--<filtered>true</filtered>-->
<fileMode>644</fileMode> <!--<fileMode>644</fileMode>-->
</file> <!--</file>-->
<!-- Copying the modified registry.xml file--> <!-- Copying the modified registry.xml file-->
<file> <file>
<source> <source>
@ -1102,59 +1113,59 @@
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- Copying ANDROID SENSE H2 database --> <!-- Copying ANDROID SENSE H2 database -->
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/AndroidSenseDM_DB.h2.db <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/AndroidSenseDM_DB.h2.db-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
<destName>AndroidSenseDM_DB.h2.db</destName> <!--<destName>AndroidSenseDM_DB.h2.db</destName>-->
<fileMode>644</fileMode> <!--<fileMode>644</fileMode>-->
</file> <!--</file>-->
<!-- Copying ARDUINO H2 database --> <!--&lt;!&ndash; Copying ARDUINO H2 database &ndash;&gt;-->
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/ArduinoDM_DB.h2.db <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/ArduinoDM_DB.h2.db-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
<destName>ArduinoDM_DB.h2.db</destName> <!--<destName>ArduinoDM_DB.h2.db</destName>-->
<fileMode>644</fileMode> <!--<fileMode>644</fileMode>-->
</file> <!--</file>-->
<!-- Copying DIGITAL DISPLAY H2 database --> <!--&lt;!&ndash; Copying DIGITAL DISPLAY H2 database &ndash;&gt;-->
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/DigitalDisplayDM_DB.h2.db <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/DigitalDisplayDM_DB.h2.db-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
<destName>DigitalDisplayDM_DB.h2.db</destName> <!--<destName>DigitalDisplayDM_DB.h2.db</destName>-->
<fileMode>644</fileMode> <!--<fileMode>644</fileMode>-->
</file> <!--</file>-->
<!-- Copying DRONE ANALYZER H2 database --> <!--&lt;!&ndash; Copying DRONE ANALYZER H2 database &ndash;&gt;-->
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/DroneAnalyzerDM_DB.h2.db <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/DroneAnalyzerDM_DB.h2.db-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
<destName>DroneAnalyzerDM_DB.h2.db</destName> <!--<destName>DroneAnalyzerDM_DB.h2.db</destName>-->
<fileMode>644</fileMode> <!--<fileMode>644</fileMode>-->
</file> <!--</file>-->
<!-- Copying RASPBERRY-PI H2 database --> <!--&lt;!&ndash; Copying RASPBERRY-PI H2 database &ndash;&gt;-->
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/RaspberryPiDM_DB.h2.db <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/RaspberryPiDM_DB.h2.db-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
<destName>RaspberryPiDM_DB.h2.db</destName> <!--<destName>RaspberryPiDM_DB.h2.db</destName>-->
<fileMode>644</fileMode> <!--<fileMode>644</fileMode>-->
</file> <!--</file>-->
<!-- Copying VIRTUAL-FIREALARM H2 database --> <!--&lt;!&ndash; Copying VIRTUAL-FIREALARM H2 database &ndash;&gt;-->
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/VirtualFireAlarmDM_DB.h2.db <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/VirtualFireAlarmDM_DB.h2.db-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
<destName>VirtualFireAlarmDM_DB.h2.db</destName> <!--<destName>VirtualFireAlarmDM_DB.h2.db</destName>-->
<fileMode>644</fileMode> <!--<fileMode>644</fileMode>-->
</file> <!--</file>-->
<!-- Copying MOBILE-ANDROID H2 database --> <!-- Copying MOBILE-ANDROID H2 database -->
<file> <file>
<source> <source>

@ -24,13 +24,13 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-features</artifactId> <artifactId>wso2iot-features</artifactId>
<version>2.0.4-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.iot.styles.feature</artifactId> <artifactId>org.wso2.iot.styles.feature</artifactId>
<version>2.0.4-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 IoT Server Styles Feature</name> <name>WSO2 IoT Server Styles Feature</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

@ -30,7 +30,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>wso2iot-features</artifactId> <artifactId>wso2iot-features</artifactId>
<version>2.0.4-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 IoT Server UI Features</name> <name>WSO2 IoT Server UI Features</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

@ -112,10 +112,7 @@
<!-- Device Management Features --> <!-- Device Management Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.server.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.group.server.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.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.apimgt.webapp.publisher.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
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}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.server.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.jwt.client.extension.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Device Management Features --> <!-- End of Device Management Features -->
@ -159,33 +153,33 @@
<featureArtifactDef> <featureArtifactDef>
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.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <!--<featureArtifactDef>-->
org.wso2.carbon.devicemgt-plugins:org.wso2.mdm.mdmmgt.server.feature:${carbon.device.mgt.plugin.version} <!--org.wso2.carbon.devicemgt-plugins:org.wso2.mdm.mdmmgt.server.feature:${carbon.device.mgt.plugin.version}-->
</featureArtifactDef> <!--</featureArtifactDef>-->
<!-- Mobile Device Management Features --> <!-- Mobile Device Management Features -->
<!-- IoT Device Management Features --> <!-- IoT Device Management Features -->
<featureArtifactDef> <featureArtifactDef>
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.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <!--<featureArtifactDef>-->
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.androidsense.feature:${carbon.device.mgt.plugin.version}-->
</featureArtifactDef> <!--</featureArtifactDef>-->
<featureArtifactDef> <!--<featureArtifactDef>-->
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.arduino.feature:${carbon.device.mgt.plugin.version}-->
</featureArtifactDef> <!--</featureArtifactDef>-->
<featureArtifactDef> <!--<featureArtifactDef>-->
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.digitaldisplay.feature:${carbon.device.mgt.plugin.version}-->
</featureArtifactDef> <!--</featureArtifactDef>-->
<featureArtifactDef> <!--<featureArtifactDef>-->
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.droneanalyzer.feature:${carbon.device.mgt.plugin.version}-->
</featureArtifactDef> <!--</featureArtifactDef>-->
<featureArtifactDef> <!--<featureArtifactDef>-->
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.raspberrypi.feature:${carbon.device.mgt.plugin.version}-->
</featureArtifactDef> <!--</featureArtifactDef>-->
<featureArtifactDef> <!--<featureArtifactDef>-->
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature:${carbon.device.mgt.plugin.version} <!--org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature:${carbon.device.mgt.plugin.version}-->
</featureArtifactDef> <!--</featureArtifactDef>-->
<!-- IoT Device Management Features --> <!-- IoT Device Management Features -->
<!-- Carbon Deployment Features --> <!-- Carbon Deployment Features -->
@ -840,11 +834,7 @@
<!-- Device Management Features --> <!-- Device Management Features -->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.server.feature.group</id> <id>org.wso2.carbon.device.mgt.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.group.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
@ -876,21 +866,17 @@
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.jwt.client.extension.feature.group</id> <id>org.wso2.carbon.email.sender.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.devicemgt.ui.feature.group</id> <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!--<feature>--> <!--<feature>-->
<!--<id>org.wso2.carbon.device.mgt.common.api.feature.group</id>--> <!--<id>org.wso2.carbon.device.mgt.common.api.feature.group</id>-->
<!--<version>${carbon.device.mgt.version}</version>--> <!--<version>${carbon.device.mgt.version}</version>-->
<!--</feature>--> <!--</feature>-->
<feature>
<id>org.wso2.carbon.device.mgt.analytics.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<!-- End of Device Management Features --> <!-- End of Device Management Features -->
<feature> <feature>
@ -905,39 +891,39 @@
<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature> <!--<feature>-->
<id>org.wso2.mdm.mdmmgt.server.feature.group</id> <!--<id>org.wso2.mdm.mdmmgt.server.feature.group</id>-->
<version>${carbon.device.mgt.plugin.version}</version> <!--<version>${carbon.device.mgt.plugin.version}</version>-->
</feature> <!--</feature>-->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.iot.feature.group</id> <id>org.wso2.carbon.device.mgt.iot.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature> <!--<feature>-->
<id>org.wso2.carbon.device.mgt.iot.androidsense.feature.group</id> <!--<id>org.wso2.carbon.device.mgt.iot.androidsense.feature.group</id>-->
<version>${carbon.device.mgt.plugin.version}</version> <!--<version>${carbon.device.mgt.plugin.version}</version>-->
</feature> <!--</feature>-->
<feature> <!--<feature>-->
<id>org.wso2.carbon.device.mgt.iot.arduino.feature.group</id> <!--<id>org.wso2.carbon.device.mgt.iot.arduino.feature.group</id>-->
<version>${carbon.device.mgt.plugin.version}</version> <!--<version>${carbon.device.mgt.plugin.version}</version>-->
</feature> <!--</feature>-->
<feature> <!--<feature>-->
<id>org.wso2.carbon.device.mgt.iot.digitaldisplay.feature.group</id> <!--<id>org.wso2.carbon.device.mgt.iot.digitaldisplay.feature.group</id>-->
<version>${carbon.device.mgt.plugin.version}</version> <!--<version>${carbon.device.mgt.plugin.version}</version>-->
</feature> <!--</feature>-->
<feature> <!--<feature>-->
<id>org.wso2.carbon.device.mgt.iot.droneanalyzer.feature.group</id> <!--<id>org.wso2.carbon.device.mgt.iot.droneanalyzer.feature.group</id>-->
<version>${carbon.device.mgt.plugin.version}</version> <!--<version>${carbon.device.mgt.plugin.version}</version>-->
</feature> <!--</feature>-->
<feature> <!--<feature>-->
<id>org.wso2.carbon.device.mgt.iot.raspberrypi.feature.group</id> <!--<id>org.wso2.carbon.device.mgt.iot.raspberrypi.feature.group</id>-->
<version>${carbon.device.mgt.plugin.version}</version> <!--<version>${carbon.device.mgt.plugin.version}</version>-->
</feature> <!--</feature>-->
<feature> <!--<feature>-->
<id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature.group</id> <!--<id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature.group</id>-->
<version>${carbon.device.mgt.plugin.version}</version> <!--<version>${carbon.device.mgt.plugin.version}</version>-->
</feature> <!--</feature>-->
<!-- Carbon Deployment Features --> <!-- Carbon Deployment Features -->
<feature> <feature>

@ -42,7 +42,7 @@
<module>modules/features</module> <module>modules/features</module>
<module>modules/p2-profile-gen</module> <module>modules/p2-profile-gen</module>
<module>modules/distribution</module> <module>modules/distribution</module>
<module>modules/integration</module> <!--<module>modules/integration</module>-->
</modules> </modules>
<dependencyManagement> <dependencyManagement>
@ -1049,7 +1049,7 @@
<carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version> <carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version>
<!-- Carbon Device Management Plugins--> <!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>2.0.4-SNAPSHOT</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>2.1.0-SNAPSHOT</carbon.device.mgt.plugin.version>
<mdm.version>2.0.0-SNAPSHOT</mdm.version> <mdm.version>2.0.0-SNAPSHOT</mdm.version>
<!-- API Management --> <!-- API Management -->

Loading…
Cancel
Save