community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
charithag 2016-02-26 11:12:28 +05:30
commit 6dba086760
10 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/tools/cdmf-devicetype-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
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
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
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
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
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
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
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
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
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
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>