Merge branch 'android-sense-feature'

application-manager-new
sinthuja 8 years ago
commit c4bb4fc544

@ -62,5 +62,8 @@
"hostname": "localhost", "hostname": "localhost",
"port": "", "port": "",
"protocol": "" "protocol": ""
},
"queryParameters" : {
"passBetweenPages" : ["shared"]
} }
} }

@ -391,6 +391,10 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics.shared:org.wso2.carbon.analytics.shared.spark.common.udf.feature:${analytics.shared.version} org.wso2.carbon.analytics.shared:org.wso2.carbon.analytics.shared.spark.common.udf.feature:${analytics.shared.version}
</featureArtifactDef> </featureArtifactDef>
<!-- Siddhi extension feature -->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.execution.json.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
</execution> </execution>
@ -796,6 +800,12 @@
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- End of Geo Dashboard Feature --> <!-- End of Geo Dashboard Feature -->
<!-- Siddhi extension Feature -->
<feature>
<id>org.wso2.extension.siddhi.execution.json.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
</features> </features>
</configuration> </configuration>
</execution> </execution>

@ -76,5 +76,8 @@
"hostname": "localhost", "hostname": "localhost",
"port": "", "port": "",
"protocol": "" "protocol": ""
},
"queryParameters" : {
"passBetweenPages" : ["shared"]
} }
} }
Loading…
Cancel
Save