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

Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server

Browse Source
merge-requests/1/head
Menaka Madushanka 9 years ago
parent 28879b416f bfb844800b
commit b99001ae8d
13 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File

7
modules/samples/installer/device-deployer.xml
Unescape View File

@ -32,7 +32,7 @@
<url>http://wso2.org</url>
<modules>
<!-- maven module of your device-type -->
<!-- STEP#1 ADD THE LOCATION OF YOUR DEVICE-TYPE -->
<module>samples/connectedcup</module>
<module>samples/currentsensor</module>
</modules>
@ -43,7 +43,6 @@
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<version>1.5.3</version>
<executions>
<execution>
<id>2-p2-repo-generation</id>
@ -59,7 +58,7 @@
<featureArtifacts>
<featureArtifactDef>
<!-- STEP#1. ADD YOUR DEVICE TYPE FEATURE HERE "< GROUP_ID:ARTIFACT_ID:VERSION >" -->
<!-- STEP#2. ADD YOUR DEVICE TYPE FEATURE HERE "< GROUP_ID:ARTIFACT_ID:VERSION >" -->
org.wso2.carbon.devicemgt-plugins:org.coffeeking.connectedcup.feature:2.0.4-SNAPSHOT
</featureArtifactDef>
<featureArtifactDef>
@ -89,7 +88,7 @@
<destination>repository/components</destination>
<deleteOldProfileFiles>true</deleteOldProfileFiles>
<features>
<!-- STEP#2. ADD YOUR DEVICE TYPE FEATURE GROUP HERE "<ARTIFACT_ID>.group" -->
<!-- STEP#3. ADD YOUR DEVICE TYPE FEATURE GROUP HERE "<ARTIFACT_ID>.group" -->
<feature>
<id>org.coffeeking.connectedcup.feature.group</id>
<version>2.0.4-SNAPSHOT</version>

26
modules/tools/cdmf-devicetype-archetype/README.md
Unescape View File

@ -1,16 +1,18 @@
# cdmf-devicetype-archetype
To install this maven archetype
go to this folder cdmf-devicetype-archetype
go to this folder `cdmf-devicetype-archetype`
mvn clean install
To create new project
go to this folder /wso2iots-1.0.0-SNAPSHOT/samples
go to this folder `/wso2iots-1.0.0-SNAPSHOT/samples`
mvn archetype:generate -DarchetypeCatalog=local
Then select the cdmf.devicetype:cdmf-devicetype-archetype as new archetype. Then you need to provide groupId, artifactId,
Then select the `cdmf.devicetype:cdmf-devicetype-archetype` as new archetype. Then you need to provide groupId, artifactId,
version, packaging, name of your device type and name for sensor as shown bellow.
Choose a number or apply filter (format: [groupId:]artifactId, case sensitive contains): : 3
@ -30,20 +32,28 @@ version, packaging, name of your device type and name for sensor as shown bellow
To install sample app into IOTS
open '`device-deployer.xml` which is located in wso2iots-1.0.0-SNAPSHOT directory
Under featureArtifacts tag add feature artifact definition as below
open `device-deployer.xml` which is located in wso2iots-1.0.0-SNAPSHOT directory
Under modules tag add name of sample which you created as module
<module>samples/safeLocker</module>
Under featureArtifacts tag add feature artifact definition as below
<featureArtifactDef>
org.homeautomation:org.homeautomation.safeLocker.feature:1.0.0-SNAPSHOT
</featureArtifactDef>
Under features tag add feature group definition as below
Under features tag add feature group definition as below
<feature>
<id>org.homeautomation.safeLocker.feature.group</id>
<version>1.0.0-SNAPSHOT</version>
</feature>
mvn clean install -f device-deployer.xml
Finally to deploy sample device type into IoT Server
mvn clean install -f device-deployer.xml
Note: This command should be executed place where `device-deployer.xml` is located

4
modules/tools/cdmf-devicetype-archetype/pom.xml
Unescape View File

@ -28,8 +28,8 @@
<groupId>cdmf.devicetype</groupId>
<artifactId>cdmf-devicetype-archetype</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>Archetype of WSO2 CDMF Device Type</name>
<description>Archetype of WSO2 CDMF Device Type</description>
<name>WSO2 CDMF Device Type Archetype</name>
<description>WSO2 CDMF Device Type Archetype</description>
<packaging>maven-archetype</packaging>
<organization>
<name>WSO2 Inc.</name>

4
modules/tools/cdmf-devicetype-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
Unescape View File

@ -21,7 +21,7 @@
<requiredProperty key="nameOfTheSensor"></requiredProperty>
</requiredProperties>
<modules>
<module id="component" dir="component" name="component">
<module id="${rootArtifactId}-component" dir="component" name="${rootArtifactId}-component">
<modules>
<module id="${groupId}.${rootArtifactId}.plugin" dir="plugin"
name="${groupId}.${rootArtifactId}.plugin">
@ -149,7 +149,7 @@
</module>
</modules>
</module>
<module id="feature" dir="feature" name="feature">
<module id="${rootArtifactId}-feature" dir="feature" name="${rootArtifactId}-feature">
<modules>
<module id="${groupId}.${rootArtifactId}.feature" dir="feature"
name="${groupId}.${rootArtifactId}.feature">

2
modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/pom.xml
Unescape View File

@ -19,7 +19,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>${groupId}</groupId>
<artifactId>component</artifactId>
<artifactId>${rootArtifactId}-component</artifactId>
<version>${version}</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/controller/pom.xml
Unescape View File

@ -19,7 +19,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>${groupId}</groupId>
<artifactId>component</artifactId>
<artifactId>${rootArtifactId}-component</artifactId>
<version>${version}</version>
<relativePath>../pom.xml</relativePath>
</parent>

12
modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/controller/src/main/java/__groupId__/__rootArtifactId__/controller/api/ControllerService.java
Unescape View File

@ -142,15 +142,10 @@ public class ControllerService {
@POST
@Consumes(MediaType.APPLICATION_JSON)
public void pushData(final DeviceJSON agentInfo, @Context HttpServletResponse response) {
String owner = agentInfo.owner;
String deviceId = agentInfo.deviceId;
float pinData = agentInfo.sensorValue;
log.warn(pinData);
log.warn(String.valueOf(pinData));
if (!ServiceUtils.publishToDASSensorValue(agentInfo.owner, agentInfo.deviceId, pinData)) {
if (!ServiceUtils.publishToDASSensorValue(agentInfo.owner, agentInfo.deviceId, agentInfo.sensorValue)) {
response.setStatus(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode());
log.warn("An error occurred whilst trying to publish pin data of go Data with ID [" + deviceId +
"] of owner [" + owner + "]");
log.warn("An error occurred whilst trying to publish pin data of go Data with ID [" + agentInfo.deviceId +
"] of owner [" + agentInfo.owner + "]");
}
}
@ -170,7 +165,6 @@ public class ControllerService {
@Context HttpServletResponse response) {
try {
mqttConnector.sendCommandViaMQTT(owner, deviceId, "Sensor:", state.toUpperCase());
response.setStatus(Response.Status.OK.getStatusCode());
} catch (DeviceManagementException e) {
log.error(e);

2
modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/manager/pom.xml
Unescape View File

@ -19,7 +19,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>${groupId}</groupId>
<artifactId>component</artifactId>
<artifactId>${rootArtifactId}-component</artifactId>
<version>${version}</version>
<relativePath>../pom.xml</relativePath>
</parent>

8
modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/pom.xml
Unescape View File

@ -19,7 +19,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>${groupId}</groupId>
<artifactId>component</artifactId>
<artifactId>${rootArtifactId}-component</artifactId>
<version>${version}</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -56,7 +56,7 @@
<Bundle-Name>${artifactId}</Bundle-Name>
<Bundle-Version>${version}</Bundle-Version>
<Bundle-Description>IoT Server Impl Bundle</Bundle-Description>
<Private-Package>${groupId}.${rootArtifactId}.plugin.internal</Private-Package>
<Private-Package>${project-base-package}.plugin.internal</Private-Package>
<Import-Package>
org.osgi.framework,
org.osgi.service.component,
@ -73,8 +73,8 @@
org.wso2.carbon.device.mgt.iot.*,
</Import-Package>
<Export-Package>
!${groupId}.${rootArtifactId}.plugin.internal,
${groupId}.${rootArtifactId}.plugin.*
!${project-base-package}.plugin.internal,
${project-base-package}.plugin.*
</Export-Package>
</instructions>
</configuration>

2
modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/pom.xml
Unescape View File

@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<version>${version}</version>
<artifactId>${artifactId}</artifactId>
<artifactId>${rootArtifactId}-component</artifactId>
<packaging>pom</packaging>
<build>
<pluginManagement>

2
modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/pom.xml
Unescape View File

@ -21,7 +21,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>${groupId}</groupId>
<artifactId>component</artifactId>
<artifactId>${rootArtifactId}-component</artifactId>
<version>${version}</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/pom.xml
Unescape View File

@ -19,7 +19,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>${groupId}</groupId>
<artifactId>feature</artifactId>
<artifactId>${rootArtifactId}-feature</artifactId>
<version>${version}</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/pom.xml
Unescape View File

@ -23,7 +23,7 @@
<version>${version}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>${artifactId}</artifactId>
<artifactId>${rootArtifactId}-feature</artifactId>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<version>${version}</version>

Write Preview
Loading…
Cancel
Save