diff --git a/modules/samples/firealarm/sketch/firealarm-virtual-agent-1.0-SNAPSHOT-jar-with-dependencies.jar.zip b/modules/samples/firealarm/sketch/firealarm-virtual-agent-1.0-SNAPSHOT-jar-with-dependencies.jar.zip deleted file mode 100644 index f67e38e0..00000000 Binary files a/modules/samples/firealarm/sketch/firealarm-virtual-agent-1.0-SNAPSHOT-jar-with-dependencies.jar.zip and /dev/null differ diff --git a/modules/samples/firealarm/sketch/startservice.sh b/modules/samples/firealarm/sketch/startservice.sh index b324e9d0..59262911 100644 --- a/modules/samples/firealarm/sketch/startservice.sh +++ b/modules/samples/firealarm/sketch/startservice.sh @@ -2,48 +2,11 @@ echo "----------------------------------------------------------------" echo "| WSO2 IOT Sample " -echo "| Virtual RaspiAlarm " +echo "| RaspiAlarm " echo "| ---------------- " echo "| ....initializing startup-script " 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 - - if [ $interface -eq $interface 2>/dev/null ] - then - echo "Setting the network-interface to " $interface - sed s/^network-interface=.*/network-interface=$interface/ deviceConfig.properties > myTmp - mv -f myTmp deviceConfig.properties - rm myTmp - break; - else - echo "Please select an appropriate interface from those which are listed on ifconfig." - fi -done - -while true; do - read -p "Whats the time-interval (in seconds) between successive Data-Pushes to the WSO2-IoT-Server (ex: '60' indicates 1 minute) > " interval - - if [ $interval -eq $interval 2>/dev/null ] - then - echo "Setting data-push interval to " $interval " seconds." - sed s/^push-interval=.*/push-interval=$interval/ deviceConfig.properties > myTmp - mv -f myTmp deviceConfig.properties - rm myTmp - break; - else - echo "Input needs to be an integer indicating the number seconds between successive data-pushes." - fi -done - - -java -jar firealarm-virtual-agent-1.0-SNAPSHOT-jar-with-dependencies.jar - - #while true; do # read -p "Do you wish to run 'apt-get update' and continue? [Yes/No] " yn # case $yn in @@ -108,94 +71,94 @@ java -jar firealarm-virtual-agent-1.0-SNAPSHOT-jar-with-dependencies.jar # exit; #fi -#sudo killall -9 python -# -#for f in ./RaspberryAgent.zip; do -# ## Check if the glob gets expanded to existing files. -# ## If not, f here will be exactly the pattern above -# ## and the exists test will evaluate to false. -# # [ -e "$f" ] && echo "'wso2-raspi-alarm_1.0_armhf.deb' file found and installing" || echo "'wso2-raspi-alarm_1.0_armhf.deb' file does not exist in current path"; exit; -# if [ -e "$f" ]; then -# echo "Agent files found......" -# sudo rm -rf /usr/local/src/RaspberryAgent -# sudo unzip RaspberryAgent.zip -d /usr/local/src/ -# else -# echo "'RaspberryAgent.zip' file does not exist in current path. \nInstalling without upgrading agent..."; -# fi -# ## This is all we needed to know, so we can break after the first iteration -# break -#done -# -#for f in /usr/local/src/RaspberryAgent/rc.local; do -# ## Check if the glob gets expanded to existing files. -# ## If not, f here will be exactly the pattern above -# ## and the exists test will evaluate to false. -# if [ -e "$f" ]; then -# echo "Copying boot script" -# sudo mv /usr/local/src/RaspberryAgent/rc.local /etc/rc.local -# sudo chmod +x /etc/rc.local -# else -# echo "Unable to set agent statup on boot"; -# fi -# ## This is all we needed to know, so we can break after the first iteration -# break -#done -# -#for f in ./deviceConfigs.cfg; do -# ## Check if the glob gets expanded to existing files. -# ## If not, f here will be exactly the pattern above -# ## and the exists test will evaluate to false. -# if [ -e "$f" ]; then -# echo "Configuration file found......" -# else -# echo "'deviceConfigs.cfg' file does not exist in current path. \nExiting installation..."; -# exit; -# fi -# ## This is all we needed to know, so we can break after the first iteration -# break -#done -# -#echo "Altering Configuration file" -#sed -i 's|[/,]||g' deviceConfigs.cfg -# -#echo "Copying configurations file to /usr/local/src/RaspberryAgent" -#sudo cp ./deviceConfigs.cfg /usr/local/src/RaspberryAgent/ -# -#if [ $? -ne 0 ]; then -# echo "Copying configuration file failed...." -# exit; -#fi -# -#while true; do -# read -p "Whats the time-interval (in seconds) between successive Data-Pushes to the WSO2-DC (ex: '60' indicates 1 minute) > " input -# -# if [ $input -eq $input 2>/dev/null ] -# then -# echo "Setting data-push interval to $input seconds." -# echo $input > /usr/local/src/RaspberryAgent/time-interval -# break; -# else -# echo "Input needs to be an integer indicating the number seconds between successive data-pushes." -# fi -#done -# -#cd /usr/local/src/RaspberryAgent/ -#sudo chmod +x RaspberryStats.py -#sudo nohup ./RaspberryStats.py -i $input " input + + if [ $input -eq $input 2>/dev/null ] + then + echo "Setting data-push interval to $input seconds." + echo $input > /usr/local/src/RaspberryAgent/time-interval + break; + else + echo "Input needs to be an integer indicating the number seconds between successive data-pushes." + fi +done + +cd /usr/local/src/RaspberryAgent/ +sudo chmod +x RaspberryStats.py +sudo nohup ./RaspberryStats.py -i $input " interface - if [ $interface -eq $interface 2>/dev/null ] - then - echo "Setting the network-interface to " $interface - sed s/^network-interface=.*/network-interface=$interface/ deviceConfig.properties > myTmp - mv -f myTmp deviceConfig.properties - rm myTmp - break; - else - echo "Please select an appropriate interface from those which are listed on ifconfig." - fi + echo "Setting the network-interface to " $interface + sed s/^network-interface=.*/network-interface=$interface/ deviceConfig.properties > myTmp + mv -f myTmp deviceConfig.properties + break; done while true; do @@ -33,7 +27,6 @@ while true; do echo "Setting data-push interval to " $interval " seconds." sed s/^push-interval=.*/push-interval=$interval/ deviceConfig.properties > myTmp mv -f myTmp deviceConfig.properties - rm myTmp break; else echo "Input needs to be an integer indicating the number seconds between successive data-pushes." @@ -43,7 +36,6 @@ done java -jar firealarm-virtual-agent-1.0-SNAPSHOT-jar-with-dependencies.jar - #while true; do # read -p "Do you wish to run 'apt-get update' and continue? [Yes/No] " yn # case $yn in 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/VirtualFireAlarmManagerService.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/VirtualFireAlarmManagerService.java index 48a1a1b5..c75937cc 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/VirtualFireAlarmManagerService.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/VirtualFireAlarmManagerService.java @@ -292,7 +292,7 @@ public class VirtualFireAlarmManagerService { //create new device id String deviceId = shortUUID(); - TokenClient accessTokenClient = new TokenClient(VirtualFireAlarmConstants.DEVICE_TYPE); + TokenClient accessTokenClient = new TokenClient("firealarm"); AccessTokenInfo accessTokenInfo = null; accessTokenInfo = accessTokenClient.getAccessToken(owner, deviceId);