Merge pull request #12 from charithag/master

Deploy firealarm-webapp with virtual-firealarm sample
application-manager-new
Charitha Goonetilleke 9 years ago
commit 4ae7f221c5

@ -581,15 +581,15 @@
<!-- Dashboard portal Jaggery app. Should be copied to <DAS_HOME>/repository/deployment/server/jaggeryapps --> <!-- Dashboard portal Jaggery app. Should be copied to <DAS_HOME>/repository/deployment/server/jaggeryapps -->
<fileSet> <!--<fileSet>-->
<directory> <!--<directory>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/portal <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/portal-->
</directory> <!--</directory>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal</outputDirectory>-->
<includes> <!--<includes>-->
<include>**/*</include> <!--<include>**/*</include>-->
</includes> <!--</includes>-->
</fileSet> <!--</fileSet>-->
<!-- END UES related dashboard artifacts --> <!-- END UES related dashboard artifacts -->

@ -1,6 +1,7 @@
<project> <project>
<property name="lib.dir" value="../../repository/components/plugins"/> <property name="lib.dir" value="../../repository/components/plugins"/>
<property name="iot.conf" value="../../repository/conf/iot/iot-config.xml"/> <property name="iot.conf.dir" value="../../repository/conf/iot"/>
<property name="iot.conf" value="${iot.conf.dir}/iot-config.xml"/>
<property name="datasources.conf" value="../../repository/conf/datasources/master-datasources.xml"/> <property name="datasources.conf" value="../../repository/conf/datasources/master-datasources.xml"/>
<property name="target.db.dir" value="../../repository/database"/> <property name="target.db.dir" value="../../repository/database"/>
<property name="target.dropins.dir" value="../../repository/components/dropins"/> <property name="target.dropins.dir" value="../../repository/components/dropins"/>

@ -75,7 +75,20 @@
<copy file="FireAlarmVirtualAgent/target/wso2-firealarm-virtual-agent.jar" todir="sketch"/> <copy file="FireAlarmVirtualAgent/target/wso2-firealarm-virtual-agent.jar" todir="sketch"/>
</target> </target>
<target name="deploy" depends="create-db,build-agent,build"> <target name="build-api">
<echo message="Downloading api source...."/>
<exec dir="." executable="sh">
<arg line="-c 'svn checkout https://github.com/wso2-incubator/iot-server-appliances/trunk/firealarm-webapp --non-interactive --trust-server-cert'"/>
</exec>
<echo message="building api from source"/>
<exec dir="firealarm-webapp" executable="sh">
<arg line="-c 'mvn clean install'"/>
</exec>
<copy file="firealarm-webapp/target/firealarm-webapp.war" todir="${target.webapp.dir}"/>
<copy file="firealarm-webapp/src/main/resources/firealarmApp.properties" todir="${iot.conf.dir}"/>
</target>
<target name="deploy" depends="create-db,build-agent,build-api,build">
<copy toDir="${target.sketch.dir}/${sample_type}"> <copy toDir="${target.sketch.dir}/${sample_type}">
<fileset dir="sketch"/> <fileset dir="sketch"/>
</copy> </copy>
@ -99,6 +112,10 @@
<delete dir="${target.unit.dir}/${sample_type}"/> <delete dir="${target.unit.dir}/${sample_type}"/>
<delete file="${target.page.dir}/${sample_type}.hbs"/> <delete file="${target.page.dir}/${sample_type}.hbs"/>
<delete dir="${target.unit.dir}/${sample_type}"/> <delete dir="${target.unit.dir}/${sample_type}"/>
<delete dir="${target.webapp.dir}/${sample_type}"/>
<delete file="${target.webapp.dir}/${sample_type}.war"/>
<delete dir="${target.webapp.dir}/firealarm-webapp"/>
<delete file="${target.webapp.dir}/firealarm-webapp.war"/>
<xmltask source="${iot.conf}" dest="${iot.conf}" report="true"> <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
<remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/> <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
</xmltask> </xmltask>

Loading…
Cancel
Save