rajitha
/
product-iots
forked from community/product-iots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'wso2-master' into test-merge

Browse Source 
# Conflicts:
#	pom.xml
application-manager-new
sinthuja 8 years ago
parent 93f8acebb6 911d001aa6
commit 3e89a7564f
10 changed files with 115 additions and 43 deletions
Show Stats Download Patch File Download Diff File

30
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -664,6 +664,10 @@
<include>*/**</include>
</includes>
<fileMode>644</fileMode>
<excludes>
<exclude>**/*samples-deployer.xml</exclude>
<exclude>**/*connectedcup/pom.xml</exclude>
</excludes>
</fileSet>
<!-- ********************************* End of IoT Core Profile ********************************* -->
@ -941,6 +945,12 @@
</excludes>
</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 ********************************* -->
<!-- ********************************* Start of Broker Profile ********************************* -->
@ -1613,6 +1623,14 @@
${pom.artifactId}-${pom.version}/repository/resources/lifecycles
</outputDirectory>
</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>
<!-- ********************************* End of IoT Core Profile ********************************* -->
<!-- ********************************* Start of Analytics Profile ********************************* -->
@ -1877,6 +1895,18 @@
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/broker/conf</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>src/core/samples/samples-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 Broker Profile ********************************* -->
</files>
</assembly>

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

@ -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

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

@ -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
</Import-Package>

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

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

13
modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java
Unescape 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.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;
}
}

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

@ -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);\
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);\

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

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

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

@ -71,7 +71,7 @@
<profile>default</profile>
<metadataRepository>file:\${basedir}/p2-repo</metadataRepository>
<artifactRepository>file:\${basedir}/p2-repo</artifactRepository>
<destination>\${basedir}/../core/repository/components</destination>
<destination>\${basedir}/../wso2/components</destination>
<deleteOldProfileFiles>false</deleteOldProfileFiles>
<features>
<feature>
@ -94,11 +94,11 @@
<configuration>
<tasks>
<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"/>
</replace>
<copy todir="../analytics/repository/deployment/server/carbonapps">
<fileset dir="../core/repository/deployment/server/carbonapps">
<copy todir="../wso2/analytics/repository/deployment/server/carbonapps">
<fileset dir="../repository/deployment/server/carbonapps">
<include name="*.car"/>
</fileset>
</copy>
@ -189,7 +189,7 @@
</repository>
</repositories>
<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>
</properties>
</project>

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

@ -391,6 +391,10 @@
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
</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>
</configuration>
</execution>
@ -828,6 +832,12 @@
<id>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</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>
</configuration>
</execution>

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

@ -745,6 +745,11 @@
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version}
</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>
</configuration>
</execution>
@ -1607,6 +1612,13 @@
<id>org.wso2.carbon.device.mgt.cdmf.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</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>
</configuration>
</execution>
@ -2484,6 +2496,13 @@
<version>${identity.inbound.auth.saml.version}</version>
</feature>
<!-- 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>
</configuration>
</execution>
@ -3119,6 +3138,13 @@
<version>${carbon.device.mgt.version}</version>
</feature>
<!-- 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>
</configuration>
</execution>

Write Preview
Loading…
Cancel
Save