diff --git a/modules/samples/firealarm/sketch/deviceConfig.properties b/modules/samples/firealarm/sketch/deviceConfig.properties new file mode 100644 index 00000000..4af8602c --- /dev/null +++ b/modules/samples/firealarm/sketch/deviceConfig.properties @@ -0,0 +1,32 @@ +# +# Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# + +#[Device-Configurations] +owner=${DEVICE_OWNER} +deviceId=${DEVICE_ID} +server-ep=${SERVER_EP} +service-ep=${SERVICE_EP} +apim-ep=${APIM_EP} +mqtt-ep=${MQTT_EP} +xmpp-ep=${XMPP_EP} +auth-method=token +auth-token=${DEVICE_TOKEN} +refresh-token=${DEVICE_REFRESH_TOKEN} +network-interface=wlan0 +push-interval=15 + + diff --git a/modules/samples/firealarm/sketch/deviceConfigs.cfg b/modules/samples/firealarm/sketch/deviceConfigs.cfg deleted file mode 100644 index 837b7df7..00000000 --- a/modules/samples/firealarm/sketch/deviceConfigs.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[Device-Configurations] -owner = ${DEVICE_OWNER} -deviceId = ${DEVICE_ID} -server-ep = ${SERVER_EP} -mqtt-ep = ${MQTT_EP} -xmpp-ep = ${XMPP_EP} -auth-method = token -auth-token = ${DEVICE_TOKEN} -refresh-token = ${DEVICE_REFRESH_TOKEN} 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 new file mode 100644 index 00000000..f67e38e0 Binary files /dev/null and b/modules/samples/firealarm/sketch/firealarm-virtual-agent-1.0-SNAPSHOT-jar-with-dependencies.jar.zip differ diff --git a/modules/samples/firealarm/sketch/sketch.properties b/modules/samples/firealarm/sketch/sketch.properties index 0816afb3..2a2a2f91 100644 --- a/modules/samples/firealarm/sketch/sketch.properties +++ b/modules/samples/firealarm/sketch/sketch.properties @@ -1,2 +1,2 @@ -templates=deviceConfigs.cfg +templates=deviceConfig.properties zipfilename=FireAlarmAgent.zip diff --git a/modules/samples/firealarm/sketch/startservice.sh b/modules/samples/firealarm/sketch/startservice.sh index 59262911..7019a368 100644 --- a/modules/samples/firealarm/sketch/startservice.sh +++ b/modules/samples/firealarm/sketch/startservice.sh @@ -7,6 +7,11 @@ echo "| ---------------- " echo "| ....initializing startup-script " echo "----------------------------------------------------------------" + +unzip firealarm-virtual-agent-1.0-SNAPSHOT-jar-with-dependencies.jar.zip +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 @@ -71,94 +76,94 @@ echo "----------------------------------------------------------------" # 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