community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed device type features and added mqtt profile

Browse Source
merge-requests/1/head
ayyoob 9 years ago
parent d8d29fdaef
commit 47e6331c93
4 changed files with 339 additions and 73 deletions
Show Stats Download Patch File Download Diff File

86
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -1051,41 +1051,41 @@
<fileMode>644</fileMode>
</file>
<!-- Copying ANDROID SENSE H2 database -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/AndroidSenseDM_DB.h2.db
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
<destName>AndroidSenseDM_DB.h2.db</destName>
<fileMode>644</fileMode>
</file>
<!-- Copying ARDUINO H2 database -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/ArduinoDM_DB.h2.db
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
<destName>ArduinoDM_DB.h2.db</destName>
<fileMode>644</fileMode>
</file>
<!-- Copying RASPBERRY-PI H2 database -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/RaspberryPiDM_DB.h2.db
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
<destName>RaspberryPiDM_DB.h2.db</destName>
<fileMode>644</fileMode>
</file>
<!-- Copying VIRTUAL-FIREALARM H2 database -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/VirtualFireAlarmDM_DB.h2.db
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
<destName>VirtualFireAlarmDM_DB.h2.db</destName>
<fileMode>644</fileMode>
</file>
<!--<file>-->
<!--<source>-->
<!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/AndroidSenseDM_DB.h2.db-->
<!--</source>-->
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
<!--<destName>AndroidSenseDM_DB.h2.db</destName>-->
<!--<fileMode>644</fileMode>-->
<!--</file>-->
<!--&lt;!&ndash; Copying ARDUINO H2 database &ndash;&gt;-->
<!--<file>-->
<!--<source>-->
<!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/ArduinoDM_DB.h2.db-->
<!--</source>-->
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
<!--<destName>ArduinoDM_DB.h2.db</destName>-->
<!--<fileMode>644</fileMode>-->
<!--</file>-->
<!--&lt;!&ndash; Copying RASPBERRY-PI H2 database &ndash;&gt;-->
<!--<file>-->
<!--<source>-->
<!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/RaspberryPiDM_DB.h2.db-->
<!--</source>-->
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
<!--<destName>RaspberryPiDM_DB.h2.db</destName>-->
<!--<fileMode>644</fileMode>-->
<!--</file>-->
<!--&lt;!&ndash; Copying VIRTUAL-FIREALARM H2 database &ndash;&gt;-->
<!--<file>-->
<!--<source>-->
<!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/VirtualFireAlarmDM_DB.h2.db-->
<!--</source>-->
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
<!--<destName>VirtualFireAlarmDM_DB.h2.db</destName>-->
<!--<fileMode>644</fileMode>-->
<!--</file>-->
<file>
<source>src/repository/conf/carbon.xml
</source>
@ -1327,13 +1327,13 @@
</file>
<!-- Copying virtual-fire-alarm-config.xml -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/device-mgt-plugins/virtual-fire-alarm/virtual-fire-alarm-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/device-mgt-plugins/virtual-fire-alarm</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<!--<file>-->
<!--<source>-->
<!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/device-mgt-plugins/virtual-fire-alarm/virtual-fire-alarm-config.xml-->
<!--</source>-->
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/device-mgt-plugins/virtual-fire-alarm</outputDirectory>-->
<!--<filtered>true</filtered>-->
<!--<fileMode>644</fileMode>-->
<!--</file>-->
</files>
</assembly>

2
modules/distribution/src/assembly/filter.properties
Unescape View File

@ -17,7 +17,7 @@
#
product.name=WSO2 IoT Server
product.version=1.0.0-ALPHA
product.version=1.0.0-SNAPSHOT
product.key=IOT
hotdeployment=true
hotupdate=true

34
modules/p2-profile-gen/carbon.product
Unescape View File

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.3" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
<launcherArgs>
</launcherArgs>
<plugins>
</plugins>
<features>
<feature id="org.wso2.carbon.core.runtime" version="4.4.3"/>
</features>
<configurations>
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
<!-- Disable update manager. It seems as if this could be achieved by the first line, but in
fact the second line sets reconcile to false (see org.eclipse.equinox.p2.publisher.eclipse.ConfigCUsAction#publishBundleCUs) -->
<property name="org.eclipse.update.reconcile" value="false" />
<plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="4"/>
<property name="org.eclipse.equinox.simpleconfigurator.useReference" value="true" />
</configurations>
</product>

290
modules/p2-profile-gen/pom.xml
Unescape View File

@ -270,10 +270,7 @@
org.wso2.carbon.identity:org.wso2.carbon.security.mgt.feature:${carbon.identity.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.client.feature:${carbon.identity.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.server.feature:${carbon.identity.version}
org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.feature:${carbon.identity.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.feature:${carbon.identity.version}
@ -714,6 +711,38 @@
</featureArtifacts>
</configuration>
</execution>
<execution>
<id>publishing product</id>
<phase>package</phase>
<goals>
<goal>publish-product</goal>
</goals>
<configuration>
<productConfigurationFile>${basedir}/carbon.product
</productConfigurationFile>
<executable>
${basedir}/target/org.eclipse.equinox.executable_3.5.0.v20110530-7P7NFUFFLWUl76mart
</executable>
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
</configuration>
</execution>
<execution>
<id>p2-profile-generation-mqtt-profile</id>
<phase>package</phase>
<goals>
<goal>materialize-product</goal>
</goals>
<configuration>
<productConfigurationFile>${basedir}/carbon.product</productConfigurationFile>
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<targetPath>
file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
</targetPath>
<profile>mqtt-gateway</profile>
</configuration>
</execution>
<execution>
<id>3-p2-profile-generation</id>
<phase>package</phase>
@ -815,26 +844,26 @@
<id>org.wso2.carbon.device.mgt.iot.adapter.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.androidsense.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.arduino.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.raspberrypi.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.devicetypes.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!--<feature>-->
<!--<id>org.wso2.carbon.device.mgt.iot.androidsense.feature.group</id>-->
<!--<version>${carbon.device.mgt.plugin.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.device.mgt.iot.arduino.feature.group</id>-->
<!--<version>${carbon.device.mgt.plugin.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.device.mgt.iot.raspberrypi.feature.group</id>-->
<!--<version>${carbon.device.mgt.plugin.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature.group</id>-->
<!--<version>${carbon.device.mgt.plugin.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.device.mgt.iot.devicetypes.feature.group</id>-->
<!--<version>${carbon.device.mgt.plugin.version}</version>-->
<!--</feature>-->
<!-- Carbon Deployment Features -->
<feature>
<id>org.wso2.carbon.webapp.mgt.feature.group</id>
@ -956,11 +985,7 @@
<version>${carbon.identity.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.um.ws.service.client.feature.group</id>
<version>${carbon.identity.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.um.ws.service.server.feature.group</id>
<id>org.wso2.carbon.um.ws.service.feature.group</id>
<version>${carbon.identity.version}</version>
</feature>
<feature>
@ -1491,6 +1516,213 @@
</features>
</configuration>
</execution>
<!--MQTT profile-->
<execution>
<id>4-p2-profile-generation</id>
<phase>package</phase>
<goals>
<goal>p2-profile-gen</goal>
</goals>
<configuration>
<profile>mqtt-gateway</profile>
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<destination>
${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
</destination>
<deleteOldProfileFiles>true</deleteOldProfileFiles>
<features>
<feature>
<id>org.wso2.carbon.logging.mgt.feature.group</id>
<version>${carbon.commons.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature.group</id>
<version>${carbon.iot.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.andes.server.feature.group</id>
<version>${carbon.messaging.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.metrics.feature.group</id>
<version>${carbon.metrics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.registry.contentsearch.feature.group</id>
<version>${carbon.registry.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.registry.core.feature.group</id>
<version>${carbon.registry.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.registry.ui.menu.feature.group</id>
<version>${carbon.registry.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.registry.resource.properties.feature.group</id>
<version>${carbon.registry.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.registry.core.ui.feature.group</id>
<version>${carbon.registry.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.um.ws.service.feature.group</id>
<version>${carbon.identity.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.user.mgt.feature.group</id>
<version>${carbon.identity.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.core.feature.group</id>
<version>${carbon.identity.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.core.ui.feature.group</id>
<version>${carbon.identity.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.registry.ws.feature.group</id>
<version>${carbon.registry.version}</version>
</feature>
<!--required for context.xml-->
<feature>
<id>org.wso2.carbon.webapp.mgt.feature.group</id>
<version>${carbon.deployment.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.extensions.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.dynamic.client.registration.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<!--end required for context.xml-->
<!-- Features required for axis2.xml-->
<feature>
<id>org.apache.synapse.wso2.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature>
<feature>
<id>org.apache.synapse.transport.nhttp.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.mediation.initializer.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.mediation.ntask.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.inbound.endpoints.server.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.mediators.server.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.mediation.admin.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.task.server.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.mediation.ui.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.application.mgt.synapse.server.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.application.deployer.synapse.feature.group
</id>
<version>${carbon.mediation.version}</version>
</feature>
<!-- TCP transport Synapse -->
<feature>
<id>org.apache.axis2.transport.tcp.feature.group</id>
<version>${axis2-transports.wso2.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.relay.server.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.mediation.configadmin.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature>
<!-- End of Mediation Features -->
<feature>
<id>org.wso2.carbon.tenant.common.feature.group</id>
<version>${carbon.multitenancy.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.apimgt.gateway.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.policy.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.core.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.datasource.rdbms.server.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
</features>
</configuration>
</execution>
</executions>
</plugin>
<plugin>

Write Preview
Loading…
Cancel
Save