From c2b573b32c1e9eb458e84c1aa2139c4c168248ab Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Fri, 16 Jun 2017 16:15:15 +0530 Subject: [PATCH 1/3] Adding geo fencing --- modules/distribution/src/assembly/bin.xml | 6 +++++ modules/p2-profile/analytics-profile/pom.xml | 10 ++++++++ modules/p2-profile/iot-core-profile/pom.xml | 26 ++++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 41361479..c0342a8d 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -941,6 +941,12 @@ + + + ../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/scripts + ${pom.artifactId}-${pom.version}/scripts + + diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml index b628623f..a1808ba5 100644 --- a/modules/p2-profile/analytics-profile/pom.xml +++ b/modules/p2-profile/analytics-profile/pom.xml @@ -391,6 +391,10 @@ org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version} + + + org.wso2.carbon.devicemgt-plugins:org.wso2.gpl.siddhi.extension.geo.script.feature:${carbon.device.mgt.plugin.version} + @@ -828,6 +832,12 @@ org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group ${carbon.device.mgt.plugin.version} + + + + org.wso2.gpl.siddhi.extension.geo.script.feature.group + ${carbon.device.mgt.plugin.version} + diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index c46b7ffb..e5084396 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -745,6 +745,11 @@ org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version} + + @@ -1607,6 +1612,13 @@ org.wso2.carbon.device.mgt.cdmf.analytics.feature.group ${carbon.device.mgt.plugin.version} + + + + org.wso2.carbon.iot.geo.dashboard.feature.group + ${carbon.device.mgt.plugin.version} + + @@ -2484,6 +2496,13 @@ ${identity.inbound.auth.saml.version} + + + + org.wso2.carbon.iot.geo.dashboard.feature.group + ${carbon.device.mgt.plugin.version} + + @@ -3119,6 +3138,13 @@ ${carbon.device.mgt.version} + + + + org.wso2.carbon.iot.geo.dashboard.feature.group + ${carbon.device.mgt.plugin.version} + + From d48b7d4939282c18350b9f0522aa0b164003b1b6 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Wed, 21 Jun 2017 14:52:25 +0530 Subject: [PATCH 2/3] Fixing org_wso2_carbon_iot_geo_dashboard-1.0.0.car not copied --- modules/distribution/src/assembly/bin.xml | 8 ++++++++ pom.xml | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index c0342a8d..3eb56ef3 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -1619,6 +1619,14 @@ ${pom.artifactId}-${pom.version}/repository/resources/lifecycles + + + + ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/carbonapps/org_wso2_carbon_iot_geo_dashboard-1.0.0.car + + ${pom.artifactId}-${pom.version}/repository/resources/devicetypes/analytics/ + 644 + diff --git a/pom.xml b/pom.xml index 93006361..da72c8da 100644 --- a/pom.xml +++ b/pom.xml @@ -1512,7 +1512,7 @@ - 3.0.1 + 3.0.7 [3.0.0, 4.0.0) @@ -1520,7 +1520,7 @@ - 4.0.1 + 4.0.4 6.1.80 From 0a7e33961a8b28d1e9e7c87b417c86a0454d9ebd Mon Sep 17 00:00:00 2001 From: Harshan Liyanage Date: Wed, 21 Jun 2017 18:33:39 +0530 Subject: [PATCH 3/3] Fixed sample-deployer issues which resolves wso2/product-iots#458 --- modules/distribution/src/assembly/bin.xml | 16 +++++++ .../src/assembly/filter.properties | 4 ++ .../connectedcup/component/plugin/pom.xml | 5 +-- .../plugin/impl/ConnectedCupManager.java | 1 - .../impl/ConnectedCupManagerService.java | 13 +++++- .../src/main/resources/p2.inf | 44 +++++++++---------- .../src/core/samples/connectedcup/pom.xml | 15 +++---- .../src/core/samples/samples-deployer.xml | 10 ++--- pom.xml | 6 +-- 9 files changed, 68 insertions(+), 46 deletions(-) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 41361479..254f11c5 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -664,6 +664,10 @@ */** 644 + + **/*samples-deployer.xml + **/*connectedcup/pom.xml + @@ -1877,6 +1881,18 @@ ${pom.artifactId}-${pom.version}/wso2/broker/conf 644 + + src/core/samples/samples-deployer.xml + ${pom.artifactId}-${pom.version}/samples/ + true + 644 + + + src/core/samples/connectedcup/pom.xml + ${pom.artifactId}-${pom.version}/samples/connectedcup/ + true + 644 + diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties index aeefa12d..b7a35d4f 100644 --- a/modules/distribution/src/assembly/filter.properties +++ b/modules/distribution/src/assembly/filter.properties @@ -29,3 +29,7 @@ cdmf.platform.role=CDMFPlatform cdmf.analytics.role=CDMFAnalytics geodashboard.role=GeoDashboard bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator +carbon-device-mgt-plugin-version=4.0.4 +carbon-device-mgt-version=3.0.7 +carbon-analytics-version=1.3.3 +carbon-kernel-version=4.4.14 diff --git a/modules/distribution/src/core/samples/connectedcup/component/plugin/pom.xml b/modules/distribution/src/core/samples/connectedcup/component/plugin/pom.xml index ac039084..37229f8a 100644 --- a/modules/distribution/src/core/samples/connectedcup/component/plugin/pom.xml +++ b/modules/distribution/src/core/samples/connectedcup/component/plugin/pom.xml @@ -68,13 +68,10 @@ javax.naming;resolution:=optional, javax.sql;resolution:=optional, javax.xml.bind.annotation.*;resolution:=optional, - javax.net;resolution:=optional, - javax.net.ssl;resolution:=optional, - org.w3c.dom;resolution:=optional, org.wso2.carbon.device.mgt.common.*, org.wso2.carbon.device.mgt.common, org.wso2.carbon.context.*, - org.wso2.carbon.ndatasource.core, + org.wso2.carbon.base.*, javax.xml.parsers.*;resolution:=optional diff --git a/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManager.java b/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManager.java index 80741f5e..9f7604b1 100644 --- a/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManager.java +++ b/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManager.java @@ -251,5 +251,4 @@ public class ConnectedCupManager implements DeviceManager { } return devices; } - } \ No newline at end of file diff --git a/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java b/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java index dfb5fded..cf080fa4 100644 --- a/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java +++ b/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java @@ -24,6 +24,8 @@ import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.common.DeviceManager; import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig; +import org.wso2.carbon.device.mgt.common.InitialOperationConfig; +import org.wso2.carbon.device.mgt.common.DeviceStatusTaskPluginConfig; import org.wso2.carbon.device.mgt.common.ProvisioningConfig; import org.wso2.carbon.device.mgt.common.app.mgt.Application; import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException; @@ -35,7 +37,7 @@ import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService; import java.util.List; -public class ConnectedCupManagerService implements DeviceManagementService{ +public class ConnectedCupManagerService implements DeviceManagementService { private DeviceManager deviceManager; @Override @@ -78,4 +80,13 @@ public class ConnectedCupManagerService implements DeviceManagementService{ return null; } + @Override + public DeviceStatusTaskPluginConfig getDeviceStatusTaskPluginConfig() { + return null; + } + + @Override + public InitialOperationConfig getInitialOperationConfig() { + return null; + } } diff --git a/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf b/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf index 68abddb2..91e01d56 100644 --- a/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf +++ b/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf @@ -1,27 +1,27 @@ instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/device-types/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/configs/,target:${installFolder}/../../conf/device-types/,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/carbonapps/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/carbonapps/,target:${installFolder}/../../deployment/server/carbonapps/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../conf/device-types/);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/configs/,target:${installFolder}/../../../conf/device-types/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/webapps/);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/webapps/,target:${installFolder}/../../../repository/deployment/server/webapps/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/carbonapps/);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/carbonapps/,target:${installFolder}/../../../repository/deployment/server/carbonapps/,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/connectedcup,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/datasources/,target:${installFolder}/../../conf/datasources/,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapps/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/jaggeryapps/,target:${installFolder}/../../deployment/server/jaggeryapps/,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../database/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/database/,target:${installFolder}/../../database/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/datasources/,target:${installFolder}/../../../conf/datasources/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/jaggeryapps/,target:${installFolder}/../../../repository/deployment/server/jaggeryapps/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/database/);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/database/,target:${installFolder}/../../../repository/database/,overwrite:true);\ instructions.unconfigure = \ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../conf/device-types/connectedcup.xml);\ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/webapps/connectedcup.war);\ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/webapps/connected-cup-agent.war);\ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/webapps/connectedcup);\ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/webapps/connected-cup-agent);\ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../conf/device-types/connectedcup.xml);\ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connectedcup.war);\ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connected-cup-agent.war);\ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connectedcup);\ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connected-cup-agent);\ org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../dbscripts/cdm/plugins/connectedcup);\ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../conf/datasources/connectedcup-datasources.xml);\ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../database/ConnectedCupDM_DB.h2.db);\ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view);\ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view);\ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view);\ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view);\ \ No newline at end of file +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../conf/datasources/connectedcup-datasources.xml);\ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/database/ConnectedCupDM_DB.h2.db);\ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view);\ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view);\ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view);\ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view);\ \ No newline at end of file diff --git a/modules/distribution/src/core/samples/connectedcup/pom.xml b/modules/distribution/src/core/samples/connectedcup/pom.xml index 560a610d..15def572 100644 --- a/modules/distribution/src/core/samples/connectedcup/pom.xml +++ b/modules/distribution/src/core/samples/connectedcup/pom.xml @@ -284,11 +284,6 @@ json ${commons-json.version} - - org.wso2.carbon.devicemgt - org.wso2.carbon.device.mgt.extensions - ${carbon.device.mgt.version} - org.wso2.carbon.devicemgt org.wso2.carbon.apimgt.application.extension @@ -364,13 +359,13 @@ - ${carbon.kernel.version} + @carbon-kernel-version@ 1.0.0 - ${carbon.device.mgt.version} - ${carbon.device.mgt.plugin.version} + @carbon-device-mgt-version@ + @carbon-device-mgt-plugin-version@ 1.0.2 3.0.0.wso2v1 @@ -384,8 +379,8 @@ 1.9.0 3.1.0.wso2v2 3.0.0.wso2v1 - ${eclipse.equinox.common.version} - ${carbon.analytics.version} + 3.6.100.v20120522-1841 + @carbon.analytics.version@ diff --git a/modules/distribution/src/core/samples/samples-deployer.xml b/modules/distribution/src/core/samples/samples-deployer.xml index 72b03a17..83b3dce8 100644 --- a/modules/distribution/src/core/samples/samples-deployer.xml +++ b/modules/distribution/src/core/samples/samples-deployer.xml @@ -71,7 +71,7 @@ default file:\${basedir}/p2-repo file:\${basedir}/p2-repo - \${basedir}/../core/repository/components + \${basedir}/../wso2/components false @@ -94,11 +94,11 @@ + dir="../wso2/components/default/configuration/org.eclipse.equinox.simpleconfigurator"> - - + + @@ -189,7 +189,7 @@ - ${carbon.device.mgt.plugin.version} + @carbon-device-mgt-plugin-version@ 1.0.0 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 93006361..39026811 100644 --- a/pom.xml +++ b/pom.xml @@ -1512,7 +1512,7 @@ - 3.0.1 + 3.0.7 [3.0.0, 4.0.0) @@ -1520,7 +1520,7 @@ - 4.0.1 + 4.0.4 6.1.80 @@ -1627,7 +1627,7 @@ 1.0.1 - 1.2.25 + 1.2.27 1.4.8