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

Merge pull request #1038 from sinthuja/test-merge

Browse Source 
Fixing the repo versions and merging the plugins dir with samples dir.
application-manager-new
Geeth 7 years ago committed by GitHub
parent 911d001aa6 c04b8e7872
commit 63f952386e
26 changed files with 56 additions and 50 deletions
Show Stats Download Patch File Download Diff File

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

@ -29,7 +29,7 @@
<artifactId>analytics-devicetype-feature-installation</artifactId>
<version>3.1.0-SNAPSHOT</version>
<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>

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/activity_data.csv → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data.csv
Unescape 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
Unescape View File

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/audio_data.csv → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data.csv
Unescape 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
Unescape View File

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/battery_data.csv → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data.csv
Unescape 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
Unescape View File

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/call_data.csv → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data.csv
Unescape 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
Unescape View File

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/location_data.csv → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data.csv
Unescape 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
Unescape View File

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/network_data.csv → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data.csv
Unescape 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
Unescape View File

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/screen_data.csv → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data.csv
Unescape 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
Unescape View File

0
modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/sms_data.csv → modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data.csv
Unescape 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
Unescape View File

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

@ -648,15 +648,6 @@
</excludes>
</fileSet>
<fileSet>
<directory>src/core/plugins</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/plugins</outputDirectory>
<includes>
<include>*/**</include>
</includes>
<filtered>true</filtered>
</fileSet>
<fileSet>
<directory>src/core/samples</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/samples</outputDirectory>
@ -665,8 +656,9 @@
</includes>
<fileMode>644</fileMode>
<excludes>
<exclude>**/*samples-deployer.xml</exclude>
<exclude>**/*connectedcup-samples-deployer.xml</exclude>
<exclude>**/*connectedcup/pom.xml</exclude>
<exclude>**/*device-plugins-deployer.xml</exclude>
</excludes>
</fileSet>
<!-- ********************************* End of IoT Core Profile ********************************* -->
@ -924,8 +916,8 @@
</fileSet>
<fileSet>
<directory>src/analytics/plugins</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/plugins</outputDirectory>
<directory>src/analytics/samples</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/samples</outputDirectory>
<filtered>true</filtered>
</fileSet>
@ -1631,6 +1623,24 @@
<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 ********************************* -->
<!-- ********************************* Start of Analytics Profile ********************************* -->
@ -1895,18 +1905,6 @@
<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>

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

@ -477,6 +477,7 @@ 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/*

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

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

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

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

@ -29,11 +29,11 @@
<artifactId>iot-devicetype-feature-installation</artifactId>
<version>3.1.0-SNAPSHOT</version>
<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>
<modules>
<module>../wso2/analytics/plugins</module>
<module>../wso2/analytics/samples</module>
</modules>
<build>

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

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

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

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

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

@ -167,6 +167,9 @@
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature:${carbon.device.mgt.version}
</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 -->
<!-- Device Management Plugin Features -->
@ -1001,6 +1004,10 @@
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.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.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version>
@ -2015,6 +2022,10 @@
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.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.mobile.android.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
@ -2421,6 +2432,10 @@
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.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.mobile.android.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
@ -2654,6 +2669,10 @@
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.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.mobile.android.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
@ -3039,18 +3058,6 @@
<version>${carbon.device.mgt.version}</version>
</feature>
<!--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.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>
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>

10
pom.xml
Unescape View File

@ -1512,7 +1512,7 @@
<!-- Carbon Device Management -->
<carbon.device.mgt.version>3.0.7</carbon.device.mgt.version>
<carbon.device.mgt.version>3.0.8</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management -->
@ -1520,10 +1520,10 @@
<!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>4.0.4</carbon.device.mgt.plugin.version>
<carbon.device.mgt.plugin.version>4.0.5</carbon.device.mgt.plugin.version>
<!-- 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 Mediation -->
@ -1625,10 +1625,10 @@
<caramel.version>1.0.1</caramel.version>
<!-- App manager version-->
<appmgt.feature.version>1.2.27</appmgt.feature.version>
<appmgt.feature.version>1.2.29</appmgt.feature.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.um.ws.version>5.1.4</carbon.um.ws.version>

Write Preview
Loading…
Cancel
Save