community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0

Browse Source
This commit is contained in:
ayyoob 2017-06-23 04:12:26 +05:30
commit 8c4f13ee48
33 changed files with 154 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/distribution/src/analytics/plugins/pom.xml → modules/distribution/src/analytics/samples/pom.xml
View File

@ -29,7 +29,7 @@
<artifactId>analytics-devicetype-feature-installation</artifactId> <artifactId>analytics-devicetype-feature-installation</artifactId>
<version>3.1.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Device Type Plugins - Analytics</name> <name>Installing Virtual Fire Alarm, Raspberry Pi, Ardino Device Types - Analytics</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/activity_data.csv → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data.csv
View File

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml
View File

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/audio_data.csv → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data.csv
View File

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml
View File

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/battery_data.csv → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data.csv
View File

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml
View File

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/call_data.csv → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data.csv
View File

Can't render this file because it is too large.

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/call_data_streamConfiguration.xml → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data_streamConfiguration.xml
View File

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/location_data.csv → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data.csv
View File

Can't render this file because it is too large.

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/location_data_streamConfiguration.xml → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data_streamConfiguration.xml
View File

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/network_data.csv → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data.csv
View File

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/network_data_streamConfiguration.xml → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data_streamConfiguration.xml
View File

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/screen_data.csv → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data.csv
View File

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml
View File

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/sms_data.csv → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data.csv
View File

Can't render this file because it is too large.

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml
View File

50
modules/distribution/src/assembly/bin.xml
View File

@ -653,15 +653,6 @@
</excludes> </excludes>
</fileSet> </fileSet>
<fileSet>
<directory>src/core/plugins</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/plugins</outputDirectory>
<includes>
<include>*/**</include>
</includes>
<filtered>true</filtered>
</fileSet>
<fileSet> <fileSet>
<directory>src/core/samples</directory> <directory>src/core/samples</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/samples</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/samples</outputDirectory>
@ -669,6 +660,11 @@
<include>*/**</include> <include>*/**</include>
</includes> </includes>
<fileMode>644</fileMode> <fileMode>644</fileMode>
<excludes>
<exclude>**/*connectedcup-samples-deployer.xml</exclude>
<exclude>**/*connectedcup/pom.xml</exclude>
<exclude>**/*device-plugins-deployer.xml</exclude>
</excludes>
</fileSet> </fileSet>
<!-- ********************************* End of IoT Core Profile ********************************* --> <!-- ********************************* End of IoT Core Profile ********************************* -->
@ -926,8 +922,8 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>src/analytics/plugins</directory> <directory>src/analytics/samples</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/plugins</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/samples</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
</fileSet> </fileSet>
@ -947,6 +943,12 @@
</excludes> </excludes>
</fileSet> </fileSet>
<!-- GPL Siddhi Extension Script for Geo Fencing -->
<fileSet>
<directory>../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/scripts</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/scripts</outputDirectory>
</fileSet>
<!-- ********************************* End of Analytics Profile ********************************* --> <!-- ********************************* End of Analytics Profile ********************************* -->
<!-- ********************************* Start of Broker Profile ********************************* --> <!-- ********************************* Start of Broker Profile ********************************* -->
@ -1620,6 +1622,32 @@
${pom.artifactId}-${pom.version}/repository/resources/lifecycles ${pom.artifactId}-${pom.version}/repository/resources/lifecycles
</outputDirectory> </outputDirectory>
</file> </file>
<!-- Adding Geo Dashboard CApp -->
<file>
<source>
../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
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/devicetypes/analytics/</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>src/core/samples/connectedcup-samples-deployer.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/samples/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>src/core/samples/device-plugins-deployer.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/samples/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>src/core/samples/connectedcup/pom.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/samples/connectedcup/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<!-- ********************************* End of IoT Core Profile ********************************* --> <!-- ********************************* End of IoT Core Profile ********************************* -->
<!-- ********************************* Start of Analytics Profile ********************************* --> <!-- ********************************* Start of Analytics Profile ********************************* -->

4
modules/distribution/src/assembly/filter.properties
View File

@ -29,3 +29,7 @@ cdmf.platform.role=CDMFPlatform
cdmf.analytics.role=CDMFAnalytics cdmf.analytics.role=CDMFAnalytics
geodashboard.role=GeoDashboard geodashboard.role=GeoDashboard
bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator 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

6
modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties
View File

@ -469,16 +469,16 @@ org.owasp.csrfguard.unprotected.publisherAcs=%servletContext%/publisher/acs
org.owasp.csrfguard.unprotected.publisherApi=%servletContext%/publisher/api org.owasp.csrfguard.unprotected.publisherApi=%servletContext%/publisher/api
org.owasp.csrfguard.unprotected.storeAcs=%servletContext%/store/acs org.owasp.csrfguard.unprotected.storeAcs=%servletContext%/store/acs
org.owasp.csrfguard.unprotected.apiStoreAcs=%servletContext%/api-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.portalAcs=%servletContext%/portal/acs
org.owasp.csrfguard.unprotected.portalApis=%servletContext%/portal/apis/* org.owasp.csrfguard.unprotected.portalApis=%servletContext%/portal/apis/*
org.owasp.csrfguard.unprotected.socialAcs=%servletContext%/social/acs 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.appStoreDevices=%servletContext%/store/apps/devices/*
org.owasp.csrfguard.unprotected.appStoreApis=%servletContext%/store/apis/* org.owasp.csrfguard.unprotected.appStoreApis=%servletContext%/store/apis/*
org.owasp.csrfguard.unprotected.appPortalClient=%servletContext%/portal/apis/* org.owasp.csrfguard.unprotected.appPortalClient=%servletContext%/portal/apis/*
org.owasp.csrfguard.unprotected.connectedcupAgent=%servletContext%/connected-cup-agent/*
#carbon #carbon
org.owasp.csrfguard.unprotected.Services=%servletContext%/services/* org.owasp.csrfguard.unprotected.Services=%servletContext%/services/*

10
modules/distribution/src/core/samples/samples-deployer.xml → modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
View File

@ -71,7 +71,7 @@
<profile>default</profile> <profile>default</profile>
<metadataRepository>file:\${basedir}/p2-repo</metadataRepository> <metadataRepository>file:\${basedir}/p2-repo</metadataRepository>
<artifactRepository>file:\${basedir}/p2-repo</artifactRepository> <artifactRepository>file:\${basedir}/p2-repo</artifactRepository>
<destination>\${basedir}/../core/repository/components</destination> <destination>\${basedir}/../wso2/components</destination>
<deleteOldProfileFiles>false</deleteOldProfileFiles> <deleteOldProfileFiles>false</deleteOldProfileFiles>
<features> <features>
<feature> <feature>
@ -94,11 +94,11 @@
<configuration> <configuration>
<tasks> <tasks>
<replace token="false" value="true" <replace token="false" value="true"
dir="../core/repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator"> dir="../wso2/components/default/configuration/org.eclipse.equinox.simpleconfigurator">
<include name="**/bundles.info"/> <include name="**/bundles.info"/>
</replace> </replace>
<copy todir="../analytics/repository/deployment/server/carbonapps"> <copy todir="../wso2/analytics/repository/deployment/server/carbonapps">
<fileset dir="../core/repository/deployment/server/carbonapps"> <fileset dir="../repository/deployment/server/carbonapps">
<include name="*.car"/> <include name="*.car"/>
</fileset> </fileset>
</copy> </copy>
@ -189,7 +189,7 @@
</repository> </repository>
</repositories> </repositories>
<properties> <properties>
<carbon.device.mgt.plugin.version>${carbon.device.mgt.plugin.version}</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>@carbon-device-mgt-plugin-version@</carbon.device.mgt.plugin.version>
<org.coffeeking.version>1.0.0</org.coffeeking.version> <org.coffeeking.version>1.0.0</org.coffeeking.version>
</properties> </properties>
</project> </project>

2
modules/distribution/src/core/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java
View File

@ -50,7 +50,7 @@ import javax.ws.rs.core.Response;
} }
), ),
tags = { tags = {
@Tag(name = "connectedcup", description = "") @Tag(name = "connectedcup,device_management", description = "")
} }
) )
@Scopes( @Scopes(

5
modules/distribution/src/core/samples/connectedcup/component/plugin/pom.xml
View File

@ -68,13 +68,10 @@
javax.naming;resolution:=optional, javax.naming;resolution:=optional,
javax.sql;resolution:=optional, javax.sql;resolution:=optional,
javax.xml.bind.annotation.*;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.device.mgt.common, org.wso2.carbon.device.mgt.common,
org.wso2.carbon.context.*, org.wso2.carbon.context.*,
org.wso2.carbon.ndatasource.core, org.wso2.carbon.base.*,
javax.xml.parsers.*;resolution:=optional javax.xml.parsers.*;resolution:=optional
</Import-Package> </Import-Package>

1
modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManager.java
View File

@ -251,5 +251,4 @@ public class ConnectedCupManager implements DeviceManager {
} }
return devices; return devices;
} }
} }

13
modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java
View File

@ -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.DeviceManagementException;
import org.wso2.carbon.device.mgt.common.DeviceManager; import org.wso2.carbon.device.mgt.common.DeviceManager;
import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig; 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.ProvisioningConfig;
import org.wso2.carbon.device.mgt.common.app.mgt.Application; import org.wso2.carbon.device.mgt.common.app.mgt.Application;
import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException; 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; import java.util.List;
public class ConnectedCupManagerService implements DeviceManagementService{ public class ConnectedCupManagerService implements DeviceManagementService {
private DeviceManager deviceManager; private DeviceManager deviceManager;
@Override @Override
@ -78,4 +80,13 @@ public class ConnectedCupManagerService implements DeviceManagementService{
return null; return null;
} }
@Override
public DeviceStatusTaskPluginConfig getDeviceStatusTaskPluginConfig() {
return null;
}
@Override
public InitialOperationConfig getInitialOperationConfig() {
return null;
}
} }

44
modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf
View File

@ -1,27 +1,27 @@
instructions.configure = \ instructions.configure = \
org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/device-types/);\ 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.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.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}/../../deployment/server/webapps/,overwrite:true);\ 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}/../../deployment/server/carbonapps/);\ 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}/../../deployment/server/carbonapps/,overwrite:true);\ 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}/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.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.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}/../../deployment/server/jaggeryapps/,overwrite:true);\ 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}/../../database/);\ 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}/../../database/,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/database/,target:${installFolder}/../../../repository/database/,overwrite:true);\
instructions.unconfigure = \ 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}/../../../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}/../../../repository/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}/../../../repository/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}/../../../repository/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}/../../../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}/../../../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}/../../../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}/../../../repository/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}/../../../repository/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}/../../../repository/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}/../../../repository/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);\ org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view);\

15
modules/distribution/src/core/samples/connectedcup/pom.xml
View File

@ -284,11 +284,6 @@
<artifactId>json</artifactId> <artifactId>json</artifactId>
<version>${commons-json.version}</version> <version>${commons-json.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.extensions</artifactId>
<version>${carbon.device.mgt.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.apimgt.application.extension</artifactId> <artifactId>org.wso2.carbon.apimgt.application.extension</artifactId>
@ -364,13 +359,13 @@
<properties> <properties>
<carbon.kernel.version>${carbon.kernel.version}</carbon.kernel.version> <carbon.kernel.version>@carbon-kernel-version@</carbon.kernel.version>
<org.coffeeking.version>1.0.0</org.coffeeking.version> <org.coffeeking.version>1.0.0</org.coffeeking.version>
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<carbon.device.mgt.version>${carbon.device.mgt.version}</carbon.device.mgt.version> <carbon.device.mgt.version>@carbon-device-mgt-version@</carbon.device.mgt.version>
<carbon.device.mgt.plugin.version>${carbon.device.mgt.plugin.version}</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>@carbon-device-mgt-plugin-version@</carbon.device.mgt.plugin.version>
<paho.mqtt.version>1.0.2</paho.mqtt.version> <paho.mqtt.version>1.0.2</paho.mqtt.version>
<commons-json.version>3.0.0.wso2v1</commons-json.version> <commons-json.version>3.0.0.wso2v1</commons-json.version>
@ -384,8 +379,8 @@
<jackson.version>1.9.0</jackson.version> <jackson.version>1.9.0</jackson.version>
<commons-httpclient.orbit.version>3.1.0.wso2v2</commons-httpclient.orbit.version> <commons-httpclient.orbit.version>3.1.0.wso2v2</commons-httpclient.orbit.version>
<commons-json.version>3.0.0.wso2v1</commons-json.version> <commons-json.version>3.0.0.wso2v1</commons-json.version>
<eclipse.equinox.common.version>${eclipse.equinox.common.version}</eclipse.equinox.common.version> <eclipse.equinox.common.version>3.6.100.v20120522-1841</eclipse.equinox.common.version>
<analytics.version>${carbon.analytics.version}</analytics.version> <analytics.version>@carbon.analytics.version@</analytics.version>
</properties> </properties>
</project> </project>

4
modules/distribution/src/core/plugins/plugins-deployer.xml → modules/distribution/src/core/samples/device-plugins-deployer.xml
View File

@ -29,11 +29,11 @@
<artifactId>iot-devicetype-feature-installation</artifactId> <artifactId>iot-devicetype-feature-installation</artifactId>
<version>3.1.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Device Type Plugins - IoT Core</name> <name>Installing Virtual Fire Alarm, Raspberry Pi, Ardino Device Types - IoT Core</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<modules> <modules>
<module>../wso2/analytics/plugins</module> <module>../wso2/analytics/samples</module>
</modules> </modules>
<build> <build>

4
modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java
View File

@ -113,8 +113,8 @@ public class CustomTestServerManager {
carbonHome = extractedDir; carbonHome = extractedDir;
} }
// Deploy the plugins. // Deploy the plugins.
String[] cmdArray = new String[] { "mvn", "clean", "install", "-f", "plugins-deployer.xml"}; String[] cmdArray = new String[] { "mvn", "clean", "install", "-f", "device-plugins-deployer.xml"};
Runtime.getRuntime().exec(cmdArray, null, new File(carbonHome + File.separator + "plugins")); Runtime.getRuntime().exec(cmdArray, null, new File(carbonHome + File.separator + "samples"));
Thread.sleep(15000); Thread.sleep(15000);
} else if (server.equalsIgnoreCase("analytics") || server.equalsIgnoreCase("broker")) { } else if (server.equalsIgnoreCase("analytics") || server.equalsIgnoreCase("broker")) {
if (extractedDir == null) { if (extractedDir == null) {

6
modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java
View File

@ -108,13 +108,13 @@ public class SampleInstallationTest extends IOTIntegrationUIBaseTestCase {
log.info("CARBON_HOME: " + System.getProperty(Constants.CARBON_HOME)); log.info("CARBON_HOME: " + System.getProperty(Constants.CARBON_HOME));
File dir = new File(carbonHome); 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 { try {
if (System.getProperty(Constants.OS_NAME).toLowerCase().contains("windows")) { 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); tempProcess = Runtime.getRuntime().exec(commands, null, dir);
} else { } 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); tempProcess = Runtime.getRuntime().exec(commands, null, dir);
} }
boolean buildStatus = waitForMessage(tempProcess.getInputStream(), Constants.BUILD_SUCCESS_MSG); boolean buildStatus = waitForMessage(tempProcess.getInputStream(), Constants.BUILD_SUCCESS_MSG);

10
modules/p2-profile/analytics-profile/pom.xml
View File

@ -391,6 +391,10 @@
<featureArtifactDef> <featureArtifactDef>
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.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<!-- GPL Siddhi Extension Script for Geo Fencing -->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.gpl.siddhi.extension.geo.script.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
</execution> </execution>
@ -828,6 +832,12 @@
<id>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group</id> <id>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- GPL Siddhi Extension Script for Geo Fencing -->
<feature>
<id>org.wso2.gpl.siddhi.extension.geo.script.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
</features> </features>
</configuration> </configuration>
</execution> </execution>

69
modules/p2-profile/iot-core-profile/pom.xml
View File

@ -170,6 +170,9 @@
<featureArtifactDef> <featureArtifactDef>
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.xmpp.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<!-- End of Device Management Features --> <!-- End of Device Management Features -->
<!-- Device Management Plugin Features --> <!-- Device Management Plugin Features -->
@ -751,6 +754,11 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<!-- Geo Dashboard feature -->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<!-- End of Geo Dashboard feature -->
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
</execution> </execution>
@ -1625,6 +1633,13 @@
<id>org.wso2.carbon.device.mgt.cdmf.analytics.feature.group</id> <id>org.wso2.carbon.device.mgt.cdmf.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- Geo Dashboard Feature -->
<feature>
<id>org.wso2.carbon.iot.geo.dashboard.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- End of Geo Dashboard Feature -->
</features> </features>
</configuration> </configuration>
</execution> </execution>
@ -2013,10 +2028,6 @@
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
@ -2025,6 +2036,10 @@
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
@ -2427,10 +2442,6 @@
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
@ -2439,6 +2450,10 @@
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
@ -2514,6 +2529,13 @@
<version>${identity.inbound.auth.saml.version}</version> <version>${identity.inbound.auth.saml.version}</version>
</feature> </feature>
<!-- SSO Fix--> <!-- SSO Fix-->
<!-- Geo Dashboard Feature -->
<feature>
<id>org.wso2.carbon.iot.geo.dashboard.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- End of Geo Dashboard Feature -->
</features> </features>
</configuration> </configuration>
</execution> </execution>
@ -2657,10 +2679,6 @@
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
@ -2669,6 +2687,10 @@
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
@ -3058,22 +3080,6 @@
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!--end required for context.xml--> <!--end required for context.xml-->
<feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
@ -3161,6 +3167,13 @@
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!-- SSO Fix--> <!-- SSO Fix-->
<!-- Geo Dashboard Feature -->
<feature>
<id>org.wso2.carbon.iot.geo.dashboard.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- End of Geo Dashboard Feature -->
</features> </features>
</configuration> </configuration>
</execution> </execution>

6
pom.xml
View File

@ -1521,7 +1521,7 @@
<carbon.device.mgt.plugin.version>4.0.5</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>4.0.5</carbon.device.mgt.plugin.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>6.1.80</carbon.api.mgt.version> <carbon.api.mgt.version>6.1.94</carbon.api.mgt.version>
<carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range> <carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
<!-- Carbon Mediation --> <!-- Carbon Mediation -->
@ -1623,10 +1623,10 @@
<caramel.version>1.0.1</caramel.version> <caramel.version>1.0.1</caramel.version>
<!-- App manager version--> <!-- App manager version-->
<appmgt.feature.version>1.2.25</appmgt.feature.version> <appmgt.feature.version>1.2.29</appmgt.feature.version>
<!-- Carbon Store version--> <!-- Carbon Store version-->
<carbon.store.version>1.4.8</carbon.store.version> <carbon.store.version>1.5.1</carbon.store.version>
<!-- Carbon Remote User Management version --> <!-- Carbon Remote User Management version -->
<carbon.um.ws.version>5.1.4</carbon.um.ws.version> <carbon.um.ws.version>5.1.4</carbon.um.ws.version>