mirror of
https://repository.entgra.net/community/device-mgt-plugins.git
synced 2025-09-16 23:42:15 +00:00
fixed build issues after restructuring
This commit is contained in:
parent
f01f56b13c
commit
8f588b25d0
@ -59,7 +59,7 @@
|
||||
<descriptorRefs>
|
||||
<descriptorRef>jar-with-dependencies</descriptorRef>
|
||||
</descriptorRefs>
|
||||
<finalName>wso2-firealarm-virtual-agent</finalName>
|
||||
<finalName>firealarm-virtual-agent</finalName>
|
||||
<appendAssemblyId>false</appendAssemblyId>
|
||||
</configuration>
|
||||
<executions>
|
||||
|
||||
@ -86,7 +86,7 @@ public class AgentUtilOperations {
|
||||
|
||||
if (path != null) {
|
||||
log.info(AgentConstants.LOG_APPENDER + path);
|
||||
rootPath = path.getPath().replace("wso2-firealarm-virtual-agent.jar!/deviceConfig.properties", "")
|
||||
rootPath = path.getPath().replace("firealarm-virtual-agent.jar!/deviceConfig.properties", "")
|
||||
.replace("jar:", "").replace("file:", "");
|
||||
|
||||
rootPath = URLDecoder.decode(rootPath, StandardCharsets.UTF_8.toString());
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
|
||||
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
|
||||
<group>
|
||||
<file>file:/home/lahiru/WSO2IOT/carbon-device-mgt-plugins/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/VirtualAgentUI.java</file>
|
||||
<file>file:/home/lahiru/WSO2IOT/carbon-device-mgt-plugins/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.iot.virtualfirealarm.agent.impl/src/main/ui/src/org/wso2/carbon/device/mgt/iot/agent/virtual/VirtualAgentUI.java</file>
|
||||
</group>
|
||||
</open-files>
|
||||
</project-private>
|
||||
|
||||
@ -53,7 +53,7 @@ javadoc.splitindex=true
|
||||
javadoc.use=true
|
||||
javadoc.version=false
|
||||
javadoc.windowtitle=
|
||||
main.class=org.wso2.carbon.device.mgt.iot.agent.virtual.VirtualAgentUI
|
||||
main.class=io.entgra.device.mgt.plugins.iot.agent.virtual.VirtualAgentUI
|
||||
manifest.file=manifest.mf
|
||||
meta.inf.dir=${src.dir}/META-INF
|
||||
mkdist.disabled=false
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
package org.wso2.carbon.device.mgt.iot.agent.virtual;
|
||||
package io.entgra.device.mgt.plugins.iot.agent.virtual;
|
||||
|
||||
import javax.swing.UIManager;
|
||||
import javax.swing.UnsupportedLookAndFeelException;
|
||||
import org.wso2.carbon.device.mgt.iot.agent.virtual.ui.AgentUI;
|
||||
import io.entgra.device.mgt.plugins.iot.agent.virtual.ui.AgentUI;
|
||||
|
||||
/**
|
||||
*
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
package org.wso2.carbon.device.mgt.iot.agent.virtual.ui;
|
||||
package io.entgra.device.mgt.plugins.iot.agent.virtual.ui;
|
||||
|
||||
/**
|
||||
*
|
||||
|
||||
@ -262,7 +262,7 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService {
|
||||
status = XmppServerClient.createAccount(newXmppAccount);
|
||||
if (!status) {
|
||||
String msg = "XMPP Account was not created for device - " + deviceId + " of owner - " + owner +
|
||||
".XMPP might have been disabled in org.wso2.carbon.device.mgt.iot" +
|
||||
".XMPP might have been disabled in io.entgra.device.mgt.plugins.iot" +
|
||||
".common.config.server.configs";
|
||||
throw new DeviceManagementException(msg);
|
||||
}
|
||||
|
||||
@ -34,7 +34,7 @@ import java.util.ResourceBundle;
|
||||
public class HTTPEventAdapterFactory extends InputEventAdapterFactory {
|
||||
|
||||
private ResourceBundle resourceBundle =
|
||||
ResourceBundle.getBundle("org.wso2.carbon.device.mgt.input.adapter.http.i18n.Resources", Locale.getDefault());
|
||||
ResourceBundle.getBundle("io.entgra.device.mgt.plugins.input.adapter.http.i18n.Resources", Locale.getDefault());
|
||||
private int httpPort;
|
||||
private int httpsPort;
|
||||
|
||||
|
||||
@ -28,7 +28,7 @@ import java.util.*;
|
||||
public class MQTTEventAdapterFactory extends InputEventAdapterFactory {
|
||||
|
||||
private ResourceBundle resourceBundle = ResourceBundle.getBundle
|
||||
("org.wso2.carbon.device.mgt.input.adapter.mqtt.i18n.Resources", Locale.getDefault());
|
||||
("io.entgra.device.mgt.plugins.input.adapter.mqtt.i18n.Resources", Locale.getDefault());
|
||||
|
||||
@Override
|
||||
public String getType() {
|
||||
|
||||
@ -36,7 +36,7 @@ import java.util.ResourceBundle;
|
||||
public class XMPPEventAdapterFactory extends InputEventAdapterFactory {
|
||||
|
||||
private ResourceBundle resourceBundle = ResourceBundle.getBundle
|
||||
("org.wso2.carbon.device.mgt.input.adapter.xmpp.i18n.Resources", Locale.getDefault());
|
||||
("io.entgra.device.mgt.plugins.input.adapter.xmpp.i18n.Resources", Locale.getDefault());
|
||||
|
||||
@Override
|
||||
public String getType() {
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
<packaging>bundle</packaging>
|
||||
<name>WSO2 Carbon - Device Management Output HTTP adapter Module</name>
|
||||
<description>
|
||||
org.wso2.carbon.device.mgt.output.adapter.http provides the back-end functionality of oauth http event adapter
|
||||
io.entgra.device.mgt.plugins.output.adapter.http provides the back-end functionality of oauth http event adapter
|
||||
</description>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -99,7 +99,7 @@
|
||||
<Export-Package>
|
||||
!io.entgra.device.mgt.plugins.output.adapter.http.internal,
|
||||
!io.entgra.device.mgt.plugins.output.adapter.http.internal.*,
|
||||
org.wso2.carbon.device.mgt.output.adapter.http.*
|
||||
io.entgra.device.mgt.plugins.output.adapter.http.*
|
||||
</Export-Package>
|
||||
<Import-Package>
|
||||
org.wso2.carbon.event.output.adapter.core,
|
||||
|
||||
@ -35,7 +35,7 @@ import java.util.ResourceBundle;
|
||||
*/
|
||||
public class HTTPEventAdapterFactory extends OutputEventAdapterFactory {
|
||||
private ResourceBundle resourceBundle =
|
||||
ResourceBundle.getBundle("org.wso2.carbon.device.mgt.output.adapter.http.i18n.Resources", Locale.getDefault());
|
||||
ResourceBundle.getBundle("io.entgra.device.mgt.plugins.output.adapter.http.i18n.Resources", Locale.getDefault());
|
||||
|
||||
@Override
|
||||
public String getType() {
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
|
||||
<packaging>bundle</packaging>
|
||||
<name>WSO2 Carbon - Device Mgt Output MQTT Adaptor Module</name>
|
||||
<description>org.wso2.carbon.device.mgt.output.adapter.mqtt provides the back-end functionality of mqtt adaptor
|
||||
<description>io.entgra.device.mgt.plugins.output.adapter.mqtt provides the back-end functionality of mqtt adaptor
|
||||
</description>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -112,7 +112,7 @@
|
||||
<Export-Package>
|
||||
!io.entgra.device.mgt.plugins.output.adapter.mqtt.internal,
|
||||
!io.entgra.device.mgt.plugins.output.adapter.mqtt.internal.*,
|
||||
org.wso2.carbon.device.mgt.output.adapter.mqtt.*,
|
||||
io.entgra.device.mgt.plugins.output.adapter.mqtt.*,
|
||||
</Export-Package>
|
||||
<Import-Package>
|
||||
org.wso2.carbon.event.output.adapter.core,
|
||||
|
||||
@ -27,7 +27,7 @@ import java.util.*;
|
||||
*/
|
||||
public class MQTTEventAdapterFactory extends OutputEventAdapterFactory {
|
||||
private ResourceBundle resourceBundle =
|
||||
ResourceBundle.getBundle("org.wso2.carbon.device.mgt.output.adapter.mqtt.i18n.Resources", Locale.getDefault());
|
||||
ResourceBundle.getBundle("io.entgra.device.mgt.plugins.output.adapter.mqtt.i18n.Resources", Locale.getDefault());
|
||||
|
||||
@Override
|
||||
public String getType() {
|
||||
|
||||
@ -43,7 +43,7 @@ import java.util.ResourceBundle;
|
||||
*/
|
||||
public class WebsocketEventAdapterFactory extends OutputEventAdapterFactory {
|
||||
|
||||
private ResourceBundle resourceBundle = ResourceBundle.getBundle("org.wso2.carbon.device.mgt.output.adapter.websocket.i18n" +
|
||||
private ResourceBundle resourceBundle = ResourceBundle.getBundle("io.entgra.device.mgt.plugins.output.adapter.websocket.i18n" +
|
||||
".Resources", Locale.getDefault());
|
||||
private BundleContext bundleContext;
|
||||
private boolean isAuthInitialized = false;
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
|
||||
<packaging>bundle</packaging>
|
||||
<name>WSO2 Carbon - Device Mgt Output XMPP Adaptor Module</name>
|
||||
<description>org.wso2.carbon.device.mgt.output.adapter.xmpp provides the back-end functionality of xmpp adaptor
|
||||
<description>io.entgra.device.mgt.plugins.output.adapter.xmpp provides the back-end functionality of xmpp adaptor
|
||||
</description>
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
@ -89,7 +89,7 @@
|
||||
<Export-Package>
|
||||
!io.entgra.device.mgt.plugins.output.adapter.xmpp.internal,
|
||||
!io.entgra.device.mgt.plugins.output.adapter.xmpp.internal.*,
|
||||
org.wso2.carbon.device.mgt.output.adapter.xmpp.*,
|
||||
io.entgra.device.mgt.plugins.output.adapter.xmpp.*,
|
||||
</Export-Package>
|
||||
<Import-Package>
|
||||
org.wso2.carbon.event.output.adapter.core,
|
||||
|
||||
@ -27,7 +27,7 @@ import java.util.*;
|
||||
*/
|
||||
public class XMPPEventAdapterFactory extends OutputEventAdapterFactory {
|
||||
private ResourceBundle resourceBundle =
|
||||
ResourceBundle.getBundle("org.wso2.carbon.device.mgt.output.adapter.xmpp.i18n.Resources", Locale.getDefault());
|
||||
ResourceBundle.getBundle("io.entgra.device.mgt.plugins.output.adapter.xmpp.i18n.Resources", Locale.getDefault());
|
||||
|
||||
@Override
|
||||
public String getType() {
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
<bean id="swaggerResource" class="io.swagger.jaxrs.listing.ApiListingResource"/>
|
||||
|
||||
<bean id="swaggerConfig" class="io.swagger.jaxrs.config.BeanConfig">
|
||||
<property name="resourcePackage" value="org.wso2.carbon.device.mgt.jaxrs"/>
|
||||
<property name="resourcePackage" value="io.entgra.device.mgt.plugins.jaxrs"/>
|
||||
<property name="version" value="1.0"/>
|
||||
<property name="host" value="localhost:9443"/>
|
||||
<property name="schemes" value="https"/>
|
||||
|
||||
@ -83,7 +83,7 @@
|
||||
<Bundle-Description>MQTT Pull Notification Provider Bundle</Bundle-Description>
|
||||
<Export-Package>
|
||||
!io.entgra.device.mgt.plugins.mqtt.notification.listener.internal,
|
||||
org.wso2.carbon.device.mgt.mqtt.notification.listener.*
|
||||
io.entgra.device.mgt.plugins.mqtt.notification.listener.*
|
||||
</Export-Package>
|
||||
<Import-Package>
|
||||
org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
|
||||
|
||||
@ -185,7 +185,7 @@
|
||||
org.wso2.siddhi.query.api.*,
|
||||
io.entgra.device.mgt.core.device.mgt.core.*,
|
||||
io.entgra.device.mgt.core.device.mgt.common.*,
|
||||
org.wso2.carbon.identity.jwt.client.*,
|
||||
io.entgra.device.mgt.core.identity.jwt.client.*,
|
||||
org.apache.commons.logging,
|
||||
org.wso2.carbon.context,
|
||||
android.util;resolution:=optional,
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
<SchedulerTaskEnabled>true</SchedulerTaskEnabled>
|
||||
<PushNotificationProviders>
|
||||
<Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
|
||||
<!--<Provider>org.wso2.carbon.device.mgt.mobile.impl.ios.apns.APNSBasedPushNotificationProvider</Provider>-->
|
||||
<!--<Provider>io.entgra.device.mgt.plugins.mobile.impl.ios.apns.APNSBasedPushNotificationProvider</Provider>-->
|
||||
<Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
|
||||
<Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
|
||||
<Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
|
||||
|
||||
@ -43,31 +43,31 @@
|
||||
<!-- cdmf-transport adapters-->
|
||||
<cdmf.adapters>${extensions}/cdmf-transport-adapters</cdmf.adapters>
|
||||
<input.extension>
|
||||
${basedir}/../${cdmf.adapters}/input/org.wso2.carbon.device.mgt.input.adapter.extension
|
||||
${basedir}/../${cdmf.adapters}/input/io.entgra.device.mgt.plugins.input.adapter.extension
|
||||
</input.extension>
|
||||
<input.http>
|
||||
${basedir}/../${cdmf.adapters}/input/org.wso2.carbon.device.mgt.input.adapter.http
|
||||
${basedir}/../${cdmf.adapters}/input/io.entgra.device.mgt.plugins.input.adapter.http
|
||||
</input.http>
|
||||
<input.mqtt>
|
||||
${basedir}/../${cdmf.adapters}/input/org.wso2.carbon.device.mgt.input.adapter.mqtt
|
||||
${basedir}/../${cdmf.adapters}/input/io.entgra.device.mgt.plugins.input.adapter.mqtt
|
||||
</input.mqtt>
|
||||
<input.thrift>
|
||||
${basedir}/../${cdmf.adapters}/input/org.wso2.carbon.device.mgt.input.adapter.thrift
|
||||
${basedir}/../${cdmf.adapters}/input/io.entgra.device.mgt.plugins.input.adapter.thrift
|
||||
</input.thrift>
|
||||
<input.xmpp>
|
||||
${basedir}/../${cdmf.adapters}/input/org.wso2.carbon.device.mgt.input.adapter.xmpp
|
||||
${basedir}/../${cdmf.adapters}/input/io.entgra.device.mgt.plugins.input.adapter.xmpp
|
||||
</input.xmpp>
|
||||
<output.mqtt>
|
||||
${basedir}/../${cdmf.adapters}/output/org.wso2.carbon.device.mgt.output.adapter.mqtt
|
||||
${basedir}/../${cdmf.adapters}/output/io.entgra.device.mgt.plugins.output.adapter.mqtt
|
||||
</output.mqtt>
|
||||
<output.websocket>
|
||||
${basedir}/../${cdmf.adapters}/output/org.wso2.carbon.device.mgt.output.adapter.websocket
|
||||
${basedir}/../${cdmf.adapters}/output/io.entgra.device.mgt.plugins.output.adapter.websocket
|
||||
</output.websocket>
|
||||
<output.websocket.endpoint>
|
||||
${basedir}/../${cdmf.adapters}/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint
|
||||
${basedir}/../${cdmf.adapters}/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint
|
||||
</output.websocket.endpoint>
|
||||
<output.xmpp>
|
||||
${basedir}/../${cdmf.adapters}/output/org.wso2.carbon.device.mgt.output.adapter.xmpp
|
||||
${basedir}/../${cdmf.adapters}/output/io.entgra.device.mgt.plugins.output.adapter.xmpp
|
||||
</output.xmpp>
|
||||
|
||||
<mb.extensions>${extensions}/mb-extensions</mb.extensions>
|
||||
@ -77,14 +77,14 @@
|
||||
</mb.authorization>
|
||||
|
||||
<pull.notification.listener>
|
||||
${basedir}/../${extensions}/pull-notification-listeners/org.wso2.carbon.device.mgt.mqtt.notification.listener
|
||||
${basedir}/../${extensions}/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener
|
||||
</pull.notification.listener>
|
||||
|
||||
<!-- mobile-plugins component -->
|
||||
<mobile.plugins>mobile-plugins</mobile.plugins>
|
||||
<android.plugin>${mobile.plugins}/android-plugin</android.plugin>
|
||||
<android.mobile>${basedir}/../${android.plugin}/org.wso2.carbon.device.mgt.mobile.android</android.mobile>
|
||||
<android.api>${basedir}/../${android.plugin}/org.wso2.carbon.device.mgt.mobile.android.api</android.api>
|
||||
<android.mobile>${basedir}/../${android.plugin}/io.entgra.device.mgt.plugins.mobile.android</android.mobile>
|
||||
<android.api>${basedir}/../${android.plugin}/io.entgra.device.mgt.plugins.mobile.android.api</android.api>
|
||||
</properties>
|
||||
|
||||
<build>
|
||||
@ -123,7 +123,7 @@
|
||||
<group name="extensions">
|
||||
<group name="cdmf-transport-adapters">
|
||||
<group name="input">
|
||||
<group name="org.wso2.carbon.device.mgt.input.adapter.extension">
|
||||
<group name="io.entgra.device.mgt.plugins.input.adapter.extension">
|
||||
<classfiles>
|
||||
<fileset dir="${input.extension}/${target}/${classes}" />
|
||||
</classfiles>
|
||||
@ -131,7 +131,7 @@
|
||||
<fileset dir="${input.extension}/${source}" />
|
||||
</sourcefiles>
|
||||
</group>
|
||||
<group name="org.wso2.carbon.device.mgt.input.adapter.http">
|
||||
<group name="io.entgra.device.mgt.plugins.input.adapter.http">
|
||||
<classfiles>
|
||||
<fileset dir="${input.http}/${target}/${classes}" />
|
||||
</classfiles>
|
||||
@ -139,7 +139,7 @@
|
||||
<fileset dir="${input.http}/${source}" />
|
||||
</sourcefiles>
|
||||
</group>
|
||||
<group name="org.wso2.carbon.device.mgt.input.adapter.mqtt">
|
||||
<group name="io.entgra.device.mgt.plugins.input.adapter.mqtt">
|
||||
<classfiles>
|
||||
<fileset dir="${input.mqtt}/${target}/${classes}" />
|
||||
</classfiles>
|
||||
@ -147,7 +147,7 @@
|
||||
<fileset dir="${input.mqtt}/${source}" />
|
||||
</sourcefiles>
|
||||
</group>
|
||||
<group name="org.wso2.carbon.device.mgt.input.adapter.thrift">
|
||||
<group name="io.entgra.device.mgt.plugins.input.adapter.thrift">
|
||||
<classfiles>
|
||||
<fileset dir="${input.thrift}/${target}/${classes}" />
|
||||
</classfiles>
|
||||
@ -158,7 +158,7 @@
|
||||
</group>
|
||||
|
||||
<group name="output">
|
||||
<group name="org.wso2.carbon.device.mgt.output.adapter.mqtt">
|
||||
<group name="io.entgra.device.mgt.plugins.output.adapter.mqtt">
|
||||
<classfiles>
|
||||
<fileset dir="${output.mqtt}/${target}/${classes}" />
|
||||
</classfiles>
|
||||
@ -166,7 +166,7 @@
|
||||
<fileset dir="${output.mqtt}/${source}" />
|
||||
</sourcefiles>
|
||||
</group>
|
||||
<group name="org.wso2.carbon.device.mgt.output.adapter.websocket">
|
||||
<group name="io.entgra.device.mgt.plugins.output.adapter.websocket">
|
||||
<classfiles>
|
||||
<fileset dir="${output.websocket}/${target}/${classes}" />
|
||||
</classfiles>
|
||||
@ -174,7 +174,7 @@
|
||||
<fileset dir="${output.websocket}/${source}" />
|
||||
</sourcefiles>
|
||||
</group>
|
||||
<group name="org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint">
|
||||
<group name="io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint">
|
||||
<classfiles>
|
||||
<fileset dir="${output.websocket.endpoint}/${target}/${classes}" />
|
||||
</classfiles>
|
||||
@ -182,7 +182,7 @@
|
||||
<fileset dir="${output.websocket.endpoint}/${source}" />
|
||||
</sourcefiles>
|
||||
</group>
|
||||
<group name="org.wso2.carbon.device.mgt.output.adapter.xmpp">
|
||||
<group name="io.entgra.device.mgt.plugins.output.adapter.xmpp">
|
||||
<classfiles>
|
||||
<fileset dir="${output.xmpp}/${target}/${classes}" />
|
||||
</classfiles>
|
||||
@ -221,7 +221,7 @@
|
||||
</group>
|
||||
<group name="mobile-plugins">
|
||||
<group name="android-plugin">
|
||||
<group name="org.wso2.carbon.device.mgt.mobile.android">
|
||||
<group name="io.entgra.device.mgt.plugins.mobile.android">
|
||||
<classfiles>
|
||||
<fileset dir="${android.mobile}/${target}/${classes}" />
|
||||
</classfiles>
|
||||
@ -229,7 +229,7 @@
|
||||
<fileset dir="${android.mobile}/${source}" />
|
||||
</sourcefiles>
|
||||
</group>
|
||||
<group name="org.wso2.carbon.device.mgt.mobile.android.api">
|
||||
<group name="io.entgra.device.mgt.plugins.mobile.android.api">
|
||||
<classfiles>
|
||||
<fileset dir="${android.api}/${target}/${classes}" />
|
||||
</classfiles>
|
||||
|
||||
@ -50,7 +50,7 @@
|
||||
<!-- <artifactItems>-->
|
||||
<!-- <artifactItem>-->
|
||||
<!-- <groupId>io.entgra.device.mgt.plugins</groupId>-->
|
||||
<!-- <artifactId>org.wso2.carbon.device.mgt.iot.analytics</artifactId>-->
|
||||
<!-- <artifactId>io.entgra.device.mgt.plugins.iot.analytics</artifactId>-->
|
||||
<!-- <version>${project.version}</version>-->
|
||||
<!-- <type>zip</type>-->
|
||||
<!-- <overWrite>true</overWrite>-->
|
||||
|
||||
@ -17,10 +17,10 @@
|
||||
~ under the License.
|
||||
-->
|
||||
|
||||
<eventReceiver name="WSO2IoT-DeviceInfo-Receiver" xmlns="http://wso2.org/carbon/eventreceiver">
|
||||
<eventReceiver name="Iot-DeviceInfo-Receiver" xmlns="http://wso2.org/carbon/eventreceiver">
|
||||
<from eventAdapterType="iot-event">
|
||||
<property name="events.duplicated.in.cluster">false</property>
|
||||
</from>
|
||||
<mapping customMapping="disable" type="wso2event"/>
|
||||
<to streamName="org.wso2.iot.DeviceInfoStream" version="1.0.0"/>
|
||||
<to streamName="io.entgra.iot.DeviceInfoStream" version="1.0.0"/>
|
||||
</eventReceiver>
|
||||
@ -17,10 +17,10 @@
|
||||
~ under the License.
|
||||
-->
|
||||
|
||||
<eventReceiver name="WSO2IoT-OperationResponse-Receiver" xmlns="http://wso2.org/carbon/eventreceiver">
|
||||
<eventReceiver name="IoT-OperationResponse-Receiver" xmlns="http://wso2.org/carbon/eventreceiver">
|
||||
<from eventAdapterType="iot-event">
|
||||
<property name="events.duplicated.in.cluster">false</property>
|
||||
</from>
|
||||
<mapping customMapping="disable" type="wso2event"/>
|
||||
<to streamName="org.wso2.iot.OperationResponseStream" version="1.0.0"/>
|
||||
<to streamName="io.entgra.iot.OperationResponseStream" version="1.0.0"/>
|
||||
</eventReceiver>
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"name": "org.wso2.iot.DeviceInfoStream",
|
||||
"name": "io.entgra.iot.DeviceInfoStream",
|
||||
"version": "1.0.0",
|
||||
"nickName": "",
|
||||
"description": "IoT Server Device Info Stream",
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"name": "org.wso2.iot.OperationResponseStream",
|
||||
"name": "io.entgra.iot.OperationResponseStream",
|
||||
"version": "1.0.0",
|
||||
"nickName": "",
|
||||
"description": "IoT Server Operation Response Stream",
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"name": "org.wso2.iot.operation",
|
||||
"name": "io.entgra.iot.operation",
|
||||
"version": "1.0.0",
|
||||
"nickName": "Operation Stream",
|
||||
"description": "Operation stream for Entgra IoT Devices",
|
||||
@ -1,14 +1,14 @@
|
||||
/* Enter a unique ExecutionPlan */
|
||||
@Plan:name('WSO2IoT-Operation-ExecutionPlan')
|
||||
@Plan:name('IoT-Operation-ExecutionPlan')
|
||||
|
||||
/* Enter a unique description for ExecutionPlan */
|
||||
@Plan:description('Publish operations to devices coming from org.wso2.iot.operation stream')
|
||||
@Plan:description('Publish operations to devices coming from io.entgra.iot.operation stream')
|
||||
|
||||
/* define streams/tables and write queries here ... */
|
||||
|
||||
@Plan:trace('false')
|
||||
|
||||
@Import('org.wso2.iot.operation:1.0.0')
|
||||
@Import('io.entgra.iot.operation:1.0.0')
|
||||
define stream dataIn (meta_deviceIdentifiers string, meta_deviceType string, code string, type string, isEnabled bool, payLoad string);
|
||||
|
||||
from dataIn#device:addOperation(meta_deviceIdentifiers, meta_deviceType, code, type, isEnabled, payLoad)
|
||||
@ -1,16 +1,16 @@
|
||||
instructions.configure = \
|
||||
org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/carbonapps/);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventreceivers/WSO2IoT-DeviceInfo-Receiver_1.0.0.xml,target:${installFolder}/../../deployment/server/eventreceivers/WSO2IoT-DeviceInfo-Receiver_1.0.0.xml,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventreceivers/WSO2IoT-OperationResponse-Receiver_1.0.0.xml,target:${installFolder}/../../deployment/server/eventreceivers/WSO2IoT-OperationResponse-Receiver_1.0.0.xml,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventstreams/org.wso2.iot.DeviceInfoStream_1.0.0.json,target:${installFolder}/../../deployment/server/eventstreams/org.wso2.iot.DeviceInfoStream_1.0.0.json,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventstreams/org.wso2.iot.operation_1.0.0.json,target:${installFolder}/../../deployment/server/eventstreams/org.wso2.iot.operation_1.0.0.json,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventstreams/org.wso2.iot.OperationResponseStream_1.0.0.json,target:${installFolder}/../../deployment/server/eventstreams/org.wso2.iot.OperationResponseStream_1.0.0.json,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/executionplans/WSO2IoT-Operation-ExecutionPlan.siddhiql,target:${installFolder}/../../deployment/server/executionplans/WSO2IoT-Operation-ExecutionPlan.siddhiql,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventreceivers/IoT-DeviceInfo-Receiver_1.0.0.xml,target:${installFolder}/../../deployment/server/eventreceivers/IoT-DeviceInfo-Receiver_1.0.0.xml,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventreceivers/IoT-OperationResponse-Receiver_1.0.0.xml,target:${installFolder}/../../deployment/server/eventreceivers/IoT-OperationResponse-Receiver_1.0.0.xml,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventstreams/io.entgra.iot.DeviceInfoStream_1.0.0.json,target:${installFolder}/../../deployment/server/eventstreams/io.entgra.iot.DeviceInfoStream_1.0.0.json,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventstreams/io.entgra.iot.operation_1.0.0.json,target:${installFolder}/../../deployment/server/eventstreams/io.entgra.iot.operation_1.0.0.json,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/eventstreams/io.entgra.iot.OperationResponseStream_1.0.0.json,target:${installFolder}/../../deployment/server/eventstreams/io.entgra.iot.OperationResponseStream_1.0.0.json,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.plugins.analytics_${feature.version}/deployment/server/executionplans/IoT-Operation-ExecutionPlan.siddhiql,target:${installFolder}/../../deployment/server/executionplans/IoT-Operation-ExecutionPlan.siddhiql,overwrite:true);\
|
||||
|
||||
instructions.uninstall = \
|
||||
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventreceivers/WSO2IoT-DeviceInfo-Receiver_1.0.0.xml,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventreceivers/WSO2IoT-OperationResponse-Receiver_1.0.0.xml,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventstreams/org.wso2.iot.DeviceInfoStream_1.0.0.json,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventstreams/org.wso2.iot.operation_1.0.0.json,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventstreams/org.wso2.iot.OperationResponseStream_1.0.0.json,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/executionplans/WSO2IoT-Operation-ExecutionPlan.siddhiql,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventreceivers/IoT-DeviceInfo-Receiver_1.0.0.xml,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventreceivers/IoT-OperationResponse-Receiver_1.0.0.xml,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventstreams/io.entgra.iot.DeviceInfoStream_1.0.0.json,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventstreams/io.entgra.iot.operation_1.0.0.json,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventstreams/io.entgra.iot.OperationResponseStream_1.0.0.json,overwrite:true);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/executionplans/IoT-Operation-ExecutionPlan.siddhiql,overwrite:true);\
|
||||
|
||||
@ -119,7 +119,7 @@
|
||||
</artifactId>
|
||||
<overWrite>true</overWrite>
|
||||
<outputDirectory>${project.build.directory}/maven-shared-archive-resources/agent/</outputDirectory>
|
||||
<destFileName>wso2-firealarm-virtual-agent.jar</destFileName>
|
||||
<destFileName>firealarm-virtual-agent.jar</destFileName>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
@echo off
|
||||
echo.
|
||||
echo.WSO2 IOT Sample
|
||||
echo.Entgra IOT Sample
|
||||
echo.Virtual Fire Alarm
|
||||
echo.initializing agent
|
||||
echo.
|
||||
java -jar wso2-firealarm-virtual-agent.jar
|
||||
java -jar firealarm-virtual-agent.jar
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
echo "----------------------------------------------------------------"
|
||||
echo "| WSO2 IOT Sample "
|
||||
echo "| Entgra IOT Sample "
|
||||
echo "| Virtual RaspiAlarm "
|
||||
echo "| ---------------- "
|
||||
echo "| ....initializing startup-script "
|
||||
@ -17,7 +17,7 @@ echo "----------------------------------------------------------------"
|
||||
#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
|
||||
# read -p "Whats the time-interval (in seconds) between successive Data-Pushes to the IoT-Server (ex: '60' indicates 1 minute) > " interval
|
||||
#
|
||||
# if [ $interval -eq $interval 2>/dev/null ]
|
||||
# then
|
||||
@ -31,7 +31,7 @@ echo "----------------------------------------------------------------"
|
||||
#done
|
||||
|
||||
|
||||
java -jar wso2-firealarm-virtual-agent.jar
|
||||
java -jar firealarm-virtual-agent.jar
|
||||
|
||||
#while true; do
|
||||
# read -p "Do you wish to run 'apt-get update' and continue? [Yes/No] " yn
|
||||
|
||||
@ -45,7 +45,7 @@
|
||||
<{{property_name}}>{{property_value}}</{{property_name}}>
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
<url>jdbc:h2:./repository/database/WSO2MobileAndroid_DB;DB_CLOSE_ON_EXIT=FALSE</url>
|
||||
<url>jdbc:h2:./repository/database/MobileAndroid_DB;DB_CLOSE_ON_EXIT=FALSE</url>
|
||||
<username>wso2carbon</username>
|
||||
<password>wso2carbon</password>
|
||||
<driverClassName>org.h2.Driver</driverClassName>
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
</jndiConfig>
|
||||
<definition type="RDBMS">
|
||||
<configuration>
|
||||
<url>jdbc:h2:./repository/database/WSO2MobileAndroid_DB;DB_CLOSE_ON_EXIT=FALSE</url>
|
||||
<url>jdbc:h2:./repository/database/MobileAndroid_DB;DB_CLOSE_ON_EXIT=FALSE</url>
|
||||
<username>wso2carbon</username>
|
||||
<password>wso2carbon</password>
|
||||
<driverClassName>org.h2.Driver</driverClassName>
|
||||
|
||||
@ -29,5 +29,5 @@ org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../dep
|
||||
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-mod);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.remove(path:$${installFolder}/../../../repository/resources/email-templates/android-enrollment-invitation.vm);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../dbscripts/cdm/plugins/android);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../database/WSO2MobileAndroid_DB.h2.db);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../database/MobileAndroid_DB.h2.db);\
|
||||
org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/devicetypes/android.xml);\
|
||||
8
pom.xml
8
pom.xml
@ -434,7 +434,7 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.plugins</groupId>
|
||||
<artifactId>org.wso2.carbon.device.mgt.iot.api</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.plugins.iot.api</artifactId>
|
||||
<version>${io.entgra.device.mgt.plugins.version}</version>
|
||||
<type>war</type>
|
||||
</dependency>
|
||||
@ -457,17 +457,17 @@
|
||||
<!--MDM dependencies-->
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.plugins</groupId>
|
||||
<artifactId>org.wso2.carbon.device.mgt.mobile</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.plugins.mobile</artifactId>
|
||||
<version>${io.entgra.device.mgt.plugins.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.plugins</groupId>
|
||||
<artifactId>org.wso2.carbon.device.mgt.mobile.api</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.plugins.mobile.api</artifactId>
|
||||
<version>${io.entgra.device.mgt.plugins.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.plugins</groupId>
|
||||
<artifactId>org.wso2.carbon.device.mgt.mobile.url.printer</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.plugins.mobile.url.printer</artifactId>
|
||||
<version>${io.entgra.device.mgt.plugins.version}</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user