Merge branch 'master' into 'master'

Remove iot device types

See merge request entgra/product-iots!51
357-notification-for-kiosk-mode
Saad Sahibjan 5 years ago
commit c664bf8d7a

@ -1,165 +0,0 @@
<!--
~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.wso2</groupId>
<artifactId>wso2</artifactId>
<version>1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.iot.devicemgt-plugins</groupId>
<artifactId>iot-devicetype-analytics-samples</artifactId>
<version>1.0.0</version>
<packaging>pom</packaging>
<name>Install Connected Cup Device Types - Analytics</name>
<url>http://wso2.org</url>
<build>
<plugins>
<plugin>
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<version>1.5.4</version>
<executions>
<execution>
<id>2-p2-repo-generation</id>
<phase>package</phase>
<goals>
<goal>p2-repo-gen</goal>
</goals>
<configuration>
<metadataRepository>file:\${project.basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:\${project.basedir}/target/p2-repo</artifactRepository>
<publishArtifacts>true</publishArtifacts>
<publishArtifactRepository>true</publishArtifactRepository>
<featureArtifacts>
<featureArtifactDef>
org.coffeeking:org.coffeeking.connectedcup.analytics.feature:\${org.coffeeking.version}
</featureArtifactDef>
</featureArtifacts>
</configuration>
</execution>
<execution>
<id>default-feature-install</id>
<phase>package</phase>
<goals>
<goal>p2-profile-gen</goal>
</goals>
<configuration>
<profile>analytics-default</profile>
<metadataRepository>file:\${project.basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:\${project.basedir}/target/p2-repo</artifactRepository>
<destination>\${project.basedir}/../../../components</destination>
<deleteOldProfileFiles>false</deleteOldProfileFiles>
<features>
<!-- Connected Cup Features -->
<feature>
<id>org.coffeeking.connectedcup.analytics.feature.group</id>
<version>\${org.coffeeking.version}</version>
</feature>
</features>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<pluginRepositories>
<pluginRepository>
<id>wso2.releases</id>
<name>WSO2 internal Repository</name>
<url>http://maven.wso2.org/nexus/content/repositories/releases/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</pluginRepository>
<pluginRepository>
<id>wso2.snapshots</id>
<name>Apache Snapshot Repository</name>
<url>http://maven.wso2.org/nexus/content/repositories/snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</pluginRepository>
<pluginRepository>
<id>wso2-nexus</id>
<name>WSO2 internal Repository</name>
<url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</pluginRepository>
</pluginRepositories>
<repositories>
<!-- Before adding ANYTHING in here, please start a discussion on the dev list.
Ideally the Axis2 build should only use Maven central (which is available
by default) and nothing else. We had troubles with other repositories in
the past. Therefore configuring additional repositories here should be
considered very carefully. -->
<repository>
<id>wso2-nexus</id>
<name>WSO2 internal Repository</name>
<url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
<repository>
<id>wso2.releases</id>
<name>WSO2 internal Repository</name>
<url>http://maven.wso2.org/nexus/content/repositories/releases/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
<repository>
<id>wso2.snapshots</id>
<name>WSO2 Snapshot Repository</name>
<url>http://maven.wso2.org/nexus/content/repositories/snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>
<properties>
<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>

@ -1,248 +0,0 @@
<!--
~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.wso2</groupId>
<artifactId>wso2</artifactId>
<version>1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.iot.analytics.devicemgt-plugins</groupId>
<artifactId>analytics-devicetype-feature-installation</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Install Virtual Fire Alarm, Raspberry Pi, Arduino, Android Sense Device Types - Analytics</name>
<url>http://wso2.org</url>
<build>
<plugins>
<plugin>
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<version>1.5.3</version>
<executions>
<execution>
<id>2-p2-repo-generation</id>
<phase>package</phase>
<goals>
<goal>p2-repo-gen</goal>
</goals>
<configuration>
<metadataRepository>file:\${project.basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:\${project.basedir}/target/p2-repo</artifactRepository>
<publishArtifacts>true</publishArtifacts>
<publishArtifactRepository>true</publishArtifactRepository>
<featureArtifacts>
<!-- Ardino Device Type Features -->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.analytics.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<!-- Raspberry Device Type Features -->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<!-- Virtual Fire Alarm Device Type Features -->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<!-- Android Sense Device Type Features -->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
</featureArtifacts>
</configuration>
</execution>
<execution>
<id>analytics-feature-install</id>
<phase>package</phase>
<goals>
<goal>p2-profile-gen</goal>
</goals>
<configuration>
<profile>analytics-default</profile>
<metadataRepository>file:\${project.basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:\${project.basedir}/target/p2-repo</artifactRepository>
<destination>\${project.basedir}/../../../components</destination>
<deleteOldProfileFiles>false</deleteOldProfileFiles>
<features>
<feature>
<id>org.wso2.carbon.device.mgt.iot.arduino.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
</features>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.1</version>
<executions>
<execution>
<id>default-feature-install</id>
<phase>package</phase>
<configuration>
<tasks>
<copy todir="../repository/deployment/server/">
<fileset dir="resources/">
<include name="**/*"/>
</fileset>
</copy>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<pluginRepositories>
<pluginRepository>
<id>wso2.releases</id>
<name>WSO2 internal Repository</name>
<url>http://maven.wso2.org/nexus/content/repositories/releases/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</pluginRepository>
<pluginRepository>
<id>wso2.snapshots</id>
<name>Apache Snapshot Repository</name>
<url>http://maven.wso2.org/nexus/content/repositories/snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</pluginRepository>
<pluginRepository>
<id>wso2-nexus</id>
<name>WSO2 internal Repository</name>
<url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</pluginRepository>
</pluginRepositories>
<repositories>
<!-- Before adding ANYTHING in here, please start a discussion on the dev list.
Ideally the Axis2 build should only use Maven central (which is available
by default) and nothing else. We had troubles with other repositories in
the past. Therefore configuring additional repositories here should be
considered very carefully. -->
<repository>
<id>wso2-nexus</id>
<name>WSO2 internal Repository</name>
<url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
<repository>
<id>wso2.releases</id>
<name>WSO2 internal Repository</name>
<url>http://maven.wso2.org/nexus/content/repositories/releases/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
<repository>
<id>wso2.snapshots</id>
<name>WSO2 Snapshot Repository</name>
<url>http://maven.wso2.org/nexus/content/repositories/snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
<repository>
<id>entgra-nexus</id>
<name>Entgra internal Repository</name>
<url>http://nexus.entgra.io/repository/maven-public/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
<repository>
<id>entgra.releases</id>
<name>Entgra internal Repository</name>
<url>http://nexus.entgra.io/repository/maven-releases/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
<repository>
<id>entgra.snapshots</id>
<name>Entgra Snapshot Repository</name>
<url>http://nexus.entgra.io/repository/maven-snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>
<properties>
<carbon.device.mgt.plugin.version>${carbon.device.mgt.plugin.version}</carbon.device.mgt.plugin.version>
</properties>
</project>

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<streamConfiguration type="csv">
<file>activity_data.csv</file>
<streamID>org.wso2.iot.android.activity:1.0.0</streamID>
<separateChar>,</separateChar>
<delayBetweenEventsInMilies>1</delayBetweenEventsInMilies>
</streamConfiguration>

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<streamConfiguration type="csv">
<file>audio_data.csv</file>
<streamID>org.wso2.iot.android.audio:1.0.0</streamID>
<separateChar>,</separateChar>
<delayBetweenEventsInMilies>1000</delayBetweenEventsInMilies>
</streamConfiguration>

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<streamConfiguration type="csv">
<file>battery_data.csv</file>
<streamID>org.wso2.iot.android.battery:1.0.0</streamID>
<separateChar>,</separateChar>
<delayBetweenEventsInMilies>1000</delayBetweenEventsInMilies>
</streamConfiguration>

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<streamConfiguration type="csv">
<file>call_data.csv</file>
<streamID>org.wso2.iot.android.call:1.0.0</streamID>
<separateChar>,</separateChar>
<delayBetweenEventsInMilies>1000</delayBetweenEventsInMilies>
</streamConfiguration>

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<streamConfiguration type="csv">
<file>location_data.csv</file>
<streamID>org.wso2.iot.android.location:1.0.0</streamID>
<separateChar>,</separateChar>
<delayBetweenEventsInMilies>1000</delayBetweenEventsInMilies>
</streamConfiguration>

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<streamConfiguration type="csv">
<file>network_data.csv</file>
<streamID>org.wso2.iot.android.data:1.0.0</streamID>
<separateChar>,</separateChar>
<delayBetweenEventsInMilies>1</delayBetweenEventsInMilies>
</streamConfiguration>

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<streamConfiguration type="csv">
<file>screen_data.csv</file>
<streamID>org.wso2.iot.android.screen:1.0.0</streamID>
<separateChar>,</separateChar>
<delayBetweenEventsInMilies>1000</delayBetweenEventsInMilies>
</streamConfiguration>

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<streamConfiguration type="csv">
<file>sms_data.csv</file>
<streamID>org.wso2.iot.android.sms:1.0.0</streamID>
<separateChar>,</separateChar>
<delayBetweenEventsInMilies>1000</delayBetweenEventsInMilies>
</streamConfiguration>

@ -548,20 +548,6 @@
</includes> </includes>
</fileSet> </fileSet>
<!-- Files required to mobile-qsg -->
<fileSet>
<directory>../scripts/mobile-qsg/resources</directory>
<outputDirectory>
${pom.artifactId}-${pom.version}/samples/mobile-qsg
</outputDirectory>
<includes>
<include>**/**</include>
</includes>
<excludes>
<exclude>**/*.sh*</exclude>
</excludes>
</fileSet>
<!-- Files required to mobile-qsg --> <!-- Files required to mobile-qsg -->
<fileSet> <fileSet>
@ -639,22 +625,6 @@
</excludes> </excludes>
</fileSet> </fileSet>
<fileSet>
<directory>src/core/samples</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/samples</outputDirectory>
<includes>
<include>*/**</include>
</includes>
<fileMode>644</fileMode>
<excludes>
<exclude>**/*connectedcup-samples-deployer.xml</exclude>
<exclude>**/*connectedcup/pom.xml</exclude>
<exclude>**/*sampledevice/pom.xml</exclude>
<exclude>**/*sampledevice-deployer.xml</exclude>
<exclude>**/*device-plugins-deployer.xml</exclude>
</excludes>
</fileSet>
<!-- Copying forget me tool --> <!-- Copying forget me tool -->
<fileSet> <fileSet>
<directory>target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/</directory> <directory>target/forget-me/identity-anonymization-tool-${forgetme.tool.version}/</directory>
@ -950,12 +920,6 @@
<fileMode>755</fileMode> <fileMode>755</fileMode>
</fileSet> </fileSet>
<fileSet>
<directory>src/analytics/samples</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/samples</outputDirectory>
<filtered>true</filtered>
</fileSet>
<fileSet> <fileSet>
<directory>../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/components <directory>../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/components
</directory> </directory>
@ -1635,21 +1599,6 @@
</outputDirectory> </outputDirectory>
</file> </file>
<!-- Copying mobile-qsg jar -->
<file>
<source>../scripts/mobile-qsg/target/mobile-qsg.jar</source>
<outputDirectory>
${pom.artifactId}-${pom.version}/samples/mobile-qsg
</outputDirectory>
</file>
<file>
<source>../scripts/mobile-qsg/resources/mobile-qsg.sh</source>
<outputDirectory>
${pom.artifactId}-${pom.version}/samples/mobile-qsg
</outputDirectory>
<fileMode>755</fileMode>
</file>
<!-- copying server scripts --> <!-- copying server scripts -->
<file> <file>
<source>../scripts/change-ip.sh</source> <source>../scripts/change-ip.sh</source>
@ -1690,44 +1639,6 @@
${pom.artifactId}-${pom.version}/conf/identity ${pom.artifactId}-${pom.version}/conf/identity
</outputDirectory> </outputDirectory>
</file> </file>
<!--<file>-->
<!--<source>-->
<!--../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources/lifecycles/MobileAppLifeCycle.xml-->
<!--</source>-->
<!--<outputDirectory>-->
<!--${pom.artifactId}-${pom.version}/repository/resources/lifecycles-->
<!--</outputDirectory>-->
<!--</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/sampledevice-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>
<file>
<source>src/core/samples/sampledevice/pom.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/samples/sampledevice/</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 ********************************* -->

@ -1528,7 +1528,7 @@
<carbon.governance.version>4.7.23</carbon.governance.version> <carbon.governance.version>4.7.23</carbon.governance.version>
<!-- Carbon Device Management--> <!-- Carbon Device Management-->
<carbon.device.mgt.version>4.1.6</carbon.device.mgt.version> <carbon.device.mgt.version>4.1.7-SNAPSHOT</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[4.0.0, 5.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[4.0.0, 5.0.0)</carbon.device.mgt.version.range>
@ -1536,7 +1536,7 @@
<product.iot.version>${project.version}</product.iot.version> <product.iot.version>${project.version}</product.iot.version>
<!-- Carbon Device Management Plugins--> <!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>5.0.6</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>5.0.7-SNAPSHOT</carbon.device.mgt.plugin.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>6.2.201</carbon.api.mgt.version> <carbon.api.mgt.version>6.2.201</carbon.api.mgt.version>

Loading…
Cancel
Save