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

Added device types - Digital Display, Sensebot, Raspberrypi

Browse Source
merge-requests/1/head
ayyoob 10 years ago
parent e857a7aa5d
commit a51990351e
5 changed files with 179 additions and 66 deletions
Show Stats Download Patch File Download Diff File

94
modules/distribution/pom.xml
Unescape View File

@ -260,8 +260,8 @@
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<!-- Creating API Management schema --> <!-- Creating IOT Management schema -->
<id>create-dc-schema</id> <id>create-firealarm-schema</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
@ -286,6 +286,96 @@
</tasks> </tasks>
</configuration> </configuration>
</execution> </execution>
<execution>
<!-- Creating IOT Management schema -->
<id>create-sensebot-schema</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo message="########### Device Cloud H2 Schema ###########" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/SensebotDM_DB;DB_CLOSE_ON_EXIT=FALSE" />
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
<classpath refid="maven.dependency.classpath" />
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />
<!--fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_raspberry.sql" /-->
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_sensebot.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
</configuration>
</execution>
<execution>
<!-- Creating IOT Management schema -->
<id>create-raspberrypi-schema</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo message="########### Device Cloud H2 Schema ###########" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/RaspberrypiDM_DB;DB_CLOSE_ON_EXIT=FALSE" />
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
<classpath refid="maven.dependency.classpath" />
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />
<!--fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_raspberry.sql" /-->
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_raspberrypi.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
</configuration>
</execution>
<execution>
<!-- Creating IOT Management schema -->
<id>create-digitaldisply-schema</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo message="########### Device Cloud H2 Schema ###########" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/DigitalDisplayDM_DB;DB_CLOSE_ON_EXIT=FALSE" />
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
<classpath refid="maven.dependency.classpath" />
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />
<!--fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_raspberry.sql" /-->
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_digitaldisplay.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
</configuration>
</execution>
<execution> <execution>
<id>3-extract-docs-from-components</id> <id>3-extract-docs-from-components</id>
<phase>package</phase> <phase>package</phase>

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

@ -280,6 +280,8 @@
<include>devicecloud.war</include> <include>devicecloud.war</include>
<include>firealarm.war</include> <include>firealarm.war</include>
<include>sensebot.war</include> <include>sensebot.war</include>
<include>raspberrypi.war</include>
<include>digitaldisplay.war</include>
</includes> </includes>
</fileSet> </fileSet>

61
modules/distribution/src/repository/conf/datasources/cdm-datasources.xml
Unescape View File

@ -24,66 +24,7 @@
</configuration> </configuration>
</definition> </definition>
</datasource> </datasource>
<datasource>
<name>MobileIOSDM_DS</name>
<description>The datasource used for CDM Mobile Device Management</description>
<jndiConfig>
<name>jdbc/MobileIOSDM_DS</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/WSO2MobileIOS_DB;DB_CLOSE_ON_EXIT=FALSE</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
<validationInterval>30000</validationInterval>
</configuration>
</definition>
</datasource>
<datasource>
<name>MobileAndroidDM_DS</name>
<description>The datasource used for CDM Mobile Device Management</description>
<jndiConfig>
<name>jdbc/MobileAndroidDM_DS</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/WSO2MobileAndroid_DB;DB_CLOSE_ON_EXIT=FALSE</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
<validationInterval>30000</validationInterval>
</configuration>
</definition>
</datasource>
<datasource>
<name>MobileWindowsDM_DS</name>
<description>The datasource used for CDM Mobile Device Management</description>
<jndiConfig>
<name>jdbc/MobileWindowsDM_DS</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/WSO2MobileWindows_DB;DB_CLOSE_ON_EXIT=FALSE</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
<validationInterval>30000</validationInterval>
</configuration>
</definition>
</datasource>
<datasource> <datasource>
<name>WSO2AM_DS</name> <name>WSO2AM_DS</name>

65
modules/distribution/src/repository/conf/datasources/master-datasources.xml
Unescape View File

@ -100,7 +100,7 @@
<datasource> <datasource>
<name>FireAlarmDM_DS</name> <name>FireAlarmDM_DS</name>
<description>The datasource used for API Manager database</description> <description>The datasource used for Firealarm database</description>
<jndiConfig> <jndiConfig>
<name>jdbc/FireAlarmDM_DB</name> <name>jdbc/FireAlarmDM_DB</name>
</jndiConfig> </jndiConfig>
@ -119,6 +119,69 @@
</definition> </definition>
</datasource> </datasource>
<datasource>
<name>SensebotDM_DS</name>
<description>The datasource used for Sensebot database</description>
<jndiConfig>
<name>jdbc/SensebotDM_DB</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/SensebotDM_DB;DB_CLOSE_ON_EXIT=FALSE</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
<validationInterval>30000</validationInterval>
</configuration>
</definition>
</datasource>
<datasource>
<name>DigitalDisplayDM_DS</name>
<description>The datasource used for Digital Display database</description>
<jndiConfig>
<name>jdbc/FireAlarmDM_DB</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/DigitalDisplayDM_DB;DB_CLOSE_ON_EXIT=FALSE</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
<validationInterval>30000</validationInterval>
</configuration>
</definition>
</datasource>
<datasource>
<name>RaspberrypiDM_DS</name>
<description>The datasource used for Raspberrypi database</description>
<jndiConfig>
<name>jdbc/RaspberrypiDM_DB</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/RaspberrypiDM_DB;DB_CLOSE_ON_EXIT=FALSE</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
<validationInterval>30000</validationInterval>
</configuration>
</definition>
</datasource>
<datasource> <datasource>
<name>JAGH2</name> <name>JAGH2</name>
<description>The datasource used for by the Jaggery Storage Manager</description> <description>The datasource used for by the Jaggery Storage Manager</description>

21
pom.xml
Unescape View File

@ -354,15 +354,32 @@
</dependency> </dependency>
<!--IOT dependencies--> <!--IOT dependencies-->
<dependency> <dependency>
<groupId>org.wso2.carbon.iot</groupId> <groupId>org.wso2.carbon.iot</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot.firealarm.impl</artifactId> <artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
<version>${carbon.iot.device.mgt.version}</version> <version>${carbon.iot.device.mgt.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.iot</groupId> <groupId>org.wso2.carbon.iot</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId> <artifactId>org.wso2.carbon.device.mgt.iot.firealarm.impl</artifactId>
<version>${carbon.iot.device.mgt.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.iot</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot.digitaldisplay.impl</artifactId>
<version>${carbon.iot.device.mgt.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.iot</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot.sensebot.impl</artifactId>
<version>${carbon.iot.device.mgt.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.iot</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot.raspberrypi.impl</artifactId>
<version>${carbon.iot.device.mgt.version}</version> <version>${carbon.iot.device.mgt.version}</version>
</dependency> </dependency>

Write Preview
Loading…
Cancel
Save