diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 544fd8d7..fdb98b9d 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -343,6 +343,8 @@
toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml.disable"/>
+
diff --git a/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml
index cbe014c7..75620dcb 100644
--- a/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml
+++ b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml
@@ -103,12 +103,10 @@
org.wso2.carbon.devicemgt
org.wso2.carbon.policy.mgt.core
- provided
org.wso2.carbon.devicemgt
org.wso2.carbon.policy.mgt.common
- provided
diff --git a/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
index e7bf5580..183d0ec0 100644
--- a/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
+++ b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
@@ -62,6 +62,7 @@
org.wso2.carbon.device.mgt.iot.server.sample
org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl
+ ${carbon.iot.device.mgt.version}
provided
diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml
index 17040df8..7aacf6fd 100644
--- a/modules/samples/pom.xml
+++ b/modules/samples/pom.xml
@@ -471,9 +471,6 @@
-
-
-
diff --git a/modules/samples/sample_pom.xml b/modules/samples/sample_pom.xml
index 20b641a5..63193c3d 100644
--- a/modules/samples/sample_pom.xml
+++ b/modules/samples/sample_pom.xml
@@ -99,6 +99,13 @@
system
${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.analytics_0.9.2.SNAPSHOT.jar
+
+ org.wso2.carbon.devicemgt
+ org.wso2.carbon.policy.mgt.core
+ ${carbon.device.mgt.version}
+ system
+ ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.policy.mgt.core_0.9.2.SNAPSHOT.jar
+
org.wso2.carbon.devicemgt
org.wso2.carbon.policy.mgt.common
@@ -197,13 +204,12 @@
war
-
- org.eclipse.paho
- mqtt-client
- ${eclipse.paho.version}
- system
- ${basedir}/../../../../repository/components/lib/mqtt-push-1.0-SNAPSHOT-jar-with-dependencies.jar
-
+
+ org.eclipse.paho
+ mqtt-client
+ ${paho.mqtt.version}
+ provided
+
javax
javaee-web-api
@@ -401,75 +407,84 @@
com.google.code.gson
gson
${google.gson.version}
- system
- ${basedir}/../../../../repository/components/plugins/com.google.gson_2.3.1.jar
+
+
+ org.igniterealtime.smack.wso2
+ smack
+ ${smack.wso2.version}
+ system
+ ${basedir}/../../../../repository/components/plugins/smack_3.0.4.wso2v1.jar
+
+
+ org.igniterealtime.smack.wso2
+ smackx
+ ${smackx.wso2.version}
+ system
+ ${basedir}/../../../../repository/components/plugins/smackx_3.0.4.wso2v1.jar
+
-
-
-
-
- 1.0.0
-
-
-
- 4.4.0
- [4.4.0, 4.5.0)
-
-
-
- 1.3
-
-
- 4.3.1
- 6.8
-
-
- 3.6.100.v20120522-1841
- 3.8.1.v20120830-144521
-
-
- 1.2.140.wso2v3
- 7.0.52.wso2v5
- 7.0.34.wso2v2
-
- 0.4.0
+
+
+
+ 1.0.0
-
- 2.6.1
- 1.9.0
- 1.1.1
+
+ 4.4.0
+ [4.4.0, 4.5.0)
+
+
+ 1.3
-
+
+ 4.3.1
+ 6.8
- 0.9.2-SNAPSHOT
- [0.8.0, 2.0.0)
+
+ 3.6.100.v20120522-1841
+ 3.8.1.v20120830-144521
-
- 1.0.0-SNAPSHOT
+
+ 1.2.140.wso2v3
+ 7.0.52.wso2v5
+ 7.0.34.wso2v2
+ 2.2.4
- 3.1.0.wso2v2
- 2.0.0.wso2v1
- 2.3.1
+
+ 2.6.1
+ 1.9.0
+ 1.1.1
+
+ 0.9.2-SNAPSHOT
+ [0.8.0, 2.0.0)
-
- 1.7
- 1.7
- 1.0.3
+
+ 1.0.0-SNAPSHOT
-
+ 3.1.0.wso2v2
+ 3.0.0.wso2v1
+ 2.6.1
+
+ 1.7
+ 1.7
+ 1.0.3
+
+ 3.0.4.wso2v1
+ 3.0.4.wso2v1
+ 0.4.0
+
diff --git a/modules/samples/virtual_firealarm/artifact/deviceType.json b/modules/samples/virtual_firealarm/artifact/deviceType.json
index d9f36153..c9176222 100644
--- a/modules/samples/virtual_firealarm/artifact/deviceType.json
+++ b/modules/samples/virtual_firealarm/artifact/deviceType.json
@@ -8,8 +8,8 @@
"overview_version":"1.0.0",
"overview_name":"virtual_firealarm",
"overview_url":"http://www.google.lk",
- "setupGuide_guideImage":"undefined",
- "overview_actionLabel":"Download Agent",
+ "setupGuide_guideImage":"virtual_firealarm/guide.png",
+ "overview_actionLabel":"Download a virtual device",
"sketches_Sketches":"virtual_firealarm",
"ingredients_ingredients":[
"Virtual Agent that simulates an actual firealarm"
diff --git a/modules/samples/virtual_firealarm/artifact/guide.png b/modules/samples/virtual_firealarm/artifact/guide.png
new file mode 100644
index 00000000..7fbc6c18
Binary files /dev/null and b/modules/samples/virtual_firealarm/artifact/guide.png differ
diff --git a/modules/samples/virtual_firealarm/sketch/startservice.sh b/modules/samples/virtual_firealarm/sketch/startservice.sh
old mode 100644
new mode 100755
index 2cb211ef..699e9d50
--- a/modules/samples/virtual_firealarm/sketch/startservice.sh
+++ b/modules/samples/virtual_firealarm/sketch/startservice.sh
@@ -11,7 +11,7 @@ echo "----------------------------------------------------------------"
unzip firealarm-virtual-agent-1.0-SNAPSHOT-jar-with-dependencies.jar.zip
while true; do
- read -p "What is the network-interface of your PC that the Agent should use (find from ifconfig. ex: wlan0,en0,eth0..) > " interface
+ read -p "What is the network-interface of your device that the Agent should use (find from ifconfig. ex: wlan0,en0,eth0..) > " interface
echo "Setting the network-interface to " $interface
sed s/^network-interface=.*/network-interface=$interface/ deviceConfig.properties > myTmp
diff --git a/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/VirtualFireAlarmService.java b/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/VirtualFireAlarmService.java
index 9b891606..fb24456b 100644
--- a/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/VirtualFireAlarmService.java
+++ b/modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/VirtualFireAlarmService.java
@@ -304,8 +304,8 @@ public class VirtualFireAlarmService {
public Response downloadSketch(@QueryParam("owner") String owner,
@QueryParam("deviceName") String customDeviceName,
@PathParam("sketch_type") String sketchType) {
-
- ZipArchive zipFile = null;
+ //TODO:: null check customDeviceName at UI level
+ ZipArchive zipFile = null;
try {
zipFile = createDownloadFile(owner, customDeviceName, sketchType);
Response.ResponseBuilder rb = Response.ok(zipFile.getZipFile());
@@ -391,8 +391,7 @@ public class VirtualFireAlarmService {
//Register the device with CDMF
String deviceName = customDeviceName + "_" + deviceId;
status = register(deviceId, deviceName, owner);
-// status = register(deviceId, owner + "s_" + sketchType + "_" + deviceId.substring(0, 3),
-// owner);
+
if (!status) {
String msg = "Error occurred while registering the device with " + "id: " + deviceId
+ " owner:" + owner;