diff --git a/modules/distribution/src/analytics/plugins/pom.xml b/modules/distribution/src/analytics/samples/pom.xml similarity index 99% rename from modules/distribution/src/analytics/plugins/pom.xml rename to modules/distribution/src/analytics/samples/pom.xml index c8f3d8d5..509f552e 100644 --- a/modules/distribution/src/analytics/plugins/pom.xml +++ b/modules/distribution/src/analytics/samples/pom.xml @@ -29,7 +29,7 @@ analytics-devicetype-feature-installation 3.1.0-SNAPSHOT pom - Device Type Plugins - Analytics + Installing Virtual Fire Alarm, Raspberry Pi, Ardino Device Types - Analytics http://wso2.org diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/activity_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data.csv similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/activity_data.csv rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data.csv diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/audio_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data.csv similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/audio_data.csv rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data.csv diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/battery_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data.csv similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/battery_data.csv rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data.csv diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/call_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data.csv similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/call_data.csv rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data.csv diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/call_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data_streamConfiguration.xml similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/call_data_streamConfiguration.xml rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data_streamConfiguration.xml diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/location_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data.csv similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/location_data.csv rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data.csv diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/location_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data_streamConfiguration.xml similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/location_data_streamConfiguration.xml rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data_streamConfiguration.xml diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/network_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data.csv similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/network_data.csv rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data.csv diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/network_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data_streamConfiguration.xml similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/network_data_streamConfiguration.xml rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data_streamConfiguration.xml diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/screen_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data.csv similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/screen_data.csv rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data.csv diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/sms_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data.csv similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/sms_data.csv rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data.csv diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 6d32d878..00d9372a 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -653,15 +653,6 @@ - - src/core/plugins - ${pom.artifactId}-${pom.version}/plugins - - */** - - true - - src/core/samples ${pom.artifactId}-${pom.version}/samples @@ -669,6 +660,11 @@ */** 644 + + **/*connectedcup-samples-deployer.xml + **/*connectedcup/pom.xml + **/*device-plugins-deployer.xml + @@ -926,8 +922,8 @@ - src/analytics/plugins - ${pom.artifactId}-${pom.version}/wso2/analytics/plugins + src/analytics/samples + ${pom.artifactId}-${pom.version}/wso2/analytics/samples true @@ -947,6 +943,12 @@ + + + ../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/scripts + ${pom.artifactId}-${pom.version}/scripts + + @@ -1620,6 +1622,32 @@ ${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 + + + src/core/samples/connectedcup-samples-deployer.xml + ${pom.artifactId}-${pom.version}/samples/ + true + 644 + + + src/core/samples/device-plugins-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 e27e6d46..c409ccff 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/conf/security/Owasp.CsrfGuard.Carbon.properties b/modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties index 345a112a..d730d644 100644 --- a/modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties +++ b/modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties @@ -469,16 +469,16 @@ org.owasp.csrfguard.unprotected.publisherAcs=%servletContext%/publisher/acs org.owasp.csrfguard.unprotected.publisherApi=%servletContext%/publisher/api org.owasp.csrfguard.unprotected.storeAcs=%servletContext%/store/acs org.owasp.csrfguard.unprotected.apiStoreAcs=%servletContext%/api-store/acs -org.owasp.csrfguard.unprotected.apiStoreApis=%servletContext%/api-store/apis +org.owasp.csrfguard.unprotected.apiStoreApis=%servletContext%/api-store/apis/* org.owasp.csrfguard.unprotected.portalAcs=%servletContext%/portal/acs org.owasp.csrfguard.unprotected.portalApis=%servletContext%/portal/apis/* org.owasp.csrfguard.unprotected.socialAcs=%servletContext%/social/acs -org.owasp.csrfguard.unprotected.socialApis=%servletContext%/social/apis +org.owasp.csrfguard.unprotected.socialApis=%servletContext%/social/apis/* org.owasp.csrfguard.unprotected.appStoreDevices=%servletContext%/store/apps/devices/* org.owasp.csrfguard.unprotected.appStoreApis=%servletContext%/store/apis/* org.owasp.csrfguard.unprotected.appPortalClient=%servletContext%/portal/apis/* +org.owasp.csrfguard.unprotected.connectedcupAgent=%servletContext%/connected-cup-agent/* - #carbon org.owasp.csrfguard.unprotected.Services=%servletContext%/services/* diff --git a/modules/distribution/src/core/samples/samples-deployer.xml b/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml similarity index 93% rename from modules/distribution/src/core/samples/samples-deployer.xml rename to modules/distribution/src/core/samples/connectedcup-samples-deployer.xml index 72b03a17..83b3dce8 100644 --- a/modules/distribution/src/core/samples/samples-deployer.xml +++ b/modules/distribution/src/core/samples/connectedcup-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/modules/distribution/src/core/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java b/modules/distribution/src/core/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java index 605b92cd..7b868612 100644 --- a/modules/distribution/src/core/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java +++ b/modules/distribution/src/core/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java @@ -50,7 +50,7 @@ import javax.ws.rs.core.Response; } ), tags = { - @Tag(name = "connectedcup", description = "") + @Tag(name = "connectedcup,device_management", description = "") } ) @Scopes( 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/plugins/plugins-deployer.xml b/modules/distribution/src/core/samples/device-plugins-deployer.xml similarity index 99% rename from modules/distribution/src/core/plugins/plugins-deployer.xml rename to modules/distribution/src/core/samples/device-plugins-deployer.xml index 5fe2d560..23b5509a 100644 --- a/modules/distribution/src/core/plugins/plugins-deployer.xml +++ b/modules/distribution/src/core/samples/device-plugins-deployer.xml @@ -29,11 +29,11 @@ iot-devicetype-feature-installation 3.1.0-SNAPSHOT pom - Device Type Plugins - IoT Core + Installing Virtual Fire Alarm, Raspberry Pi, Ardino Device Types - IoT Core http://wso2.org - ../wso2/analytics/plugins + ../wso2/analytics/samples diff --git a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java index b296eb5c..81938011 100644 --- a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java +++ b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java @@ -113,8 +113,8 @@ public class CustomTestServerManager { carbonHome = extractedDir; } // Deploy the plugins. - String[] cmdArray = new String[] { "mvn", "clean", "install", "-f", "plugins-deployer.xml"}; - Runtime.getRuntime().exec(cmdArray, null, new File(carbonHome + File.separator + "plugins")); + String[] cmdArray = new String[] { "mvn", "clean", "install", "-f", "device-plugins-deployer.xml"}; + Runtime.getRuntime().exec(cmdArray, null, new File(carbonHome + File.separator + "samples")); Thread.sleep(15000); } else if (server.equalsIgnoreCase("analytics") || server.equalsIgnoreCase("broker")) { if (extractedDir == null) { diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java index 1368e0b1..4aa77954 100644 --- a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java +++ b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java @@ -108,13 +108,13 @@ public class SampleInstallationTest extends IOTIntegrationUIBaseTestCase { log.info("CARBON_HOME: " + System.getProperty(Constants.CARBON_HOME)); File dir = new File(carbonHome); - log.info("Sample installation started : mvn clean install -f device-deployer.xml"); + log.info("Sample installation started : mvn clean install -f device-plugins-deployer.xml"); try { if (System.getProperty(Constants.OS_NAME).toLowerCase().contains("windows")) { - commands = new String[]{"cmd.exe", "/c", "mvn clean install -f device-deployer.xml"}; + commands = new String[]{"cmd.exe", "/c", "mvn clean install -f device-plugins-deployer.xml"}; tempProcess = Runtime.getRuntime().exec(commands, null, dir); } else { - commands = new String[]{"mvn", "clean", "install", "-f", "device-deployer.xml"}; + commands = new String[]{"mvn", "clean", "install", "-f", "device-plugins-deployer.xml"}; tempProcess = Runtime.getRuntime().exec(commands, null, dir); } boolean buildStatus = waitForMessage(tempProcess.getInputStream(), Constants.BUILD_SUCCESS_MSG); 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 5bfa279e..0dbfd1e9 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -170,6 +170,9 @@ org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature:${carbon.device.mgt.version} + + org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature:${carbon.device.mgt.version} + @@ -751,6 +754,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} + + @@ -1625,6 +1633,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} + + @@ -2013,10 +2028,6 @@ org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group ${carbon.device.mgt.version} - - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group - ${carbon.device.mgt.version} - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group ${carbon.device.mgt.version} @@ -2025,6 +2036,10 @@ org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group ${carbon.device.mgt.version} + + org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group + ${carbon.device.mgt.version} + org.wso2.carbon.device.mgt.mobile.android.feature.group ${carbon.device.mgt.plugin.version} @@ -2427,10 +2442,6 @@ org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group ${carbon.device.mgt.version} - - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group - ${carbon.device.mgt.version} - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group ${carbon.device.mgt.version} @@ -2439,6 +2450,10 @@ org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group ${carbon.device.mgt.version} + + org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group + ${carbon.device.mgt.version} + org.wso2.carbon.device.mgt.mobile.android.feature.group ${carbon.device.mgt.plugin.version} @@ -2514,6 +2529,13 @@ ${identity.inbound.auth.saml.version} + + + + org.wso2.carbon.iot.geo.dashboard.feature.group + ${carbon.device.mgt.plugin.version} + + @@ -2657,10 +2679,6 @@ org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group ${carbon.device.mgt.version} - - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group - ${carbon.device.mgt.version} - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group ${carbon.device.mgt.version} @@ -2669,6 +2687,10 @@ org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group ${carbon.device.mgt.version} + + org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group + ${carbon.device.mgt.version} + org.wso2.carbon.device.mgt.mobile.android.feature.group ${carbon.device.mgt.plugin.version} @@ -3058,22 +3080,6 @@ ${carbon.device.mgt.version} - - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group - ${carbon.device.mgt.version} - org.wso2.carbon.device.mgt.mobile.android.feature.group ${carbon.device.mgt.plugin.version} @@ -3161,6 +3167,13 @@ ${carbon.device.mgt.version} + + + + org.wso2.carbon.iot.geo.dashboard.feature.group + ${carbon.device.mgt.plugin.version} + + diff --git a/pom.xml b/pom.xml index 26856625..6adab1c6 100644 --- a/pom.xml +++ b/pom.xml @@ -1521,7 +1521,7 @@ 4.0.5 - 6.1.80 + 6.1.94 (6.0.0,7.0.0] @@ -1623,10 +1623,10 @@ 1.0.1 - 1.2.25 + 1.2.29 - 1.4.8 + 1.5.1 5.1.4