diff --git a/modules/distribution/src/analytics/plugins/pom.xml b/modules/distribution/src/analytics/samples/pom.xml similarity index 99% rename from modules/distribution/src/analytics/plugins/pom.xml rename to modules/distribution/src/analytics/samples/pom.xml index c8f3d8d5..509f552e 100644 --- a/modules/distribution/src/analytics/plugins/pom.xml +++ b/modules/distribution/src/analytics/samples/pom.xml @@ -29,7 +29,7 @@ analytics-devicetype-feature-installation 3.1.0-SNAPSHOT pom - Device Type Plugins - Analytics + Installing Virtual Fire Alarm, Raspberry Pi, Ardino Device Types - Analytics http://wso2.org diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/activity_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data.csv similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/activity_data.csv rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data.csv diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/audio_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data.csv similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/audio_data.csv rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data.csv diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/battery_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data.csv similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/battery_data.csv rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data.csv diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/call_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data.csv similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/call_data.csv rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data.csv diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/call_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data_streamConfiguration.xml similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/call_data_streamConfiguration.xml rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data_streamConfiguration.xml diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/location_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data.csv similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/location_data.csv rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data.csv diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/location_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data_streamConfiguration.xml similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/location_data_streamConfiguration.xml rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data_streamConfiguration.xml diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/network_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data.csv similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/network_data.csv rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data.csv diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/network_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data_streamConfiguration.xml similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/network_data_streamConfiguration.xml rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data_streamConfiguration.xml diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/screen_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data.csv similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/screen_data.csv rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data.csv diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/sms_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data.csv similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/sms_data.csv rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data.csv diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml similarity index 100% rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 1d6091a3..48219d8f 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -648,15 +648,6 @@ - - src/core/plugins - ${pom.artifactId}-${pom.version}/plugins - - */** - - true - - src/core/samples ${pom.artifactId}-${pom.version}/samples @@ -665,8 +656,9 @@ 644 - **/*samples-deployer.xml + **/*connectedcup-samples-deployer.xml **/*connectedcup/pom.xml + **/*device-plugins-deployer.xml @@ -924,8 +916,8 @@ - src/analytics/plugins - ${pom.artifactId}-${pom.version}/wso2/analytics/plugins + src/analytics/samples + ${pom.artifactId}-${pom.version}/wso2/analytics/samples true @@ -1631,6 +1623,24 @@ ${pom.artifactId}-${pom.version}/repository/resources/devicetypes/analytics/ 644 + + src/core/samples/connectedcup-samples-deployer.xml + ${pom.artifactId}-${pom.version}/samples/ + true + 644 + + + src/core/samples/device-plugins-deployer.xml + ${pom.artifactId}-${pom.version}/samples/ + true + 644 + + + src/core/samples/connectedcup/pom.xml + ${pom.artifactId}-${pom.version}/samples/connectedcup/ + true + 644 + @@ -1895,18 +1905,6 @@ ${pom.artifactId}-${pom.version}/wso2/broker/conf 644 - - src/core/samples/samples-deployer.xml - ${pom.artifactId}-${pom.version}/samples/ - true - 644 - - - src/core/samples/connectedcup/pom.xml - ${pom.artifactId}-${pom.version}/samples/connectedcup/ - true - 644 - diff --git a/modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties b/modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties index 78c42b0b..d730d644 100644 --- a/modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties +++ b/modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties @@ -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/* diff --git a/modules/distribution/src/core/samples/samples-deployer.xml b/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml similarity index 100% rename from modules/distribution/src/core/samples/samples-deployer.xml rename to modules/distribution/src/core/samples/connectedcup-samples-deployer.xml diff --git a/modules/distribution/src/core/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java b/modules/distribution/src/core/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java index 605b92cd..7b868612 100644 --- a/modules/distribution/src/core/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java +++ b/modules/distribution/src/core/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java @@ -50,7 +50,7 @@ import javax.ws.rs.core.Response; } ), tags = { - @Tag(name = "connectedcup", description = "") + @Tag(name = "connectedcup,device_management", description = "") } ) @Scopes( diff --git a/modules/distribution/src/core/plugins/plugins-deployer.xml b/modules/distribution/src/core/samples/device-plugins-deployer.xml similarity index 99% rename from modules/distribution/src/core/plugins/plugins-deployer.xml rename to modules/distribution/src/core/samples/device-plugins-deployer.xml index 5fe2d560..23b5509a 100644 --- a/modules/distribution/src/core/plugins/plugins-deployer.xml +++ b/modules/distribution/src/core/samples/device-plugins-deployer.xml @@ -29,11 +29,11 @@ iot-devicetype-feature-installation 3.1.0-SNAPSHOT pom - Device Type Plugins - IoT Core + Installing Virtual Fire Alarm, Raspberry Pi, Ardino Device Types - IoT Core http://wso2.org - ../wso2/analytics/plugins + ../wso2/analytics/samples diff --git a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java index b296eb5c..81938011 100644 --- a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java +++ b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java @@ -113,8 +113,8 @@ public class CustomTestServerManager { carbonHome = extractedDir; } // Deploy the plugins. - String[] cmdArray = new String[] { "mvn", "clean", "install", "-f", "plugins-deployer.xml"}; - Runtime.getRuntime().exec(cmdArray, null, new File(carbonHome + File.separator + "plugins")); + String[] cmdArray = new String[] { "mvn", "clean", "install", "-f", "device-plugins-deployer.xml"}; + Runtime.getRuntime().exec(cmdArray, null, new File(carbonHome + File.separator + "samples")); Thread.sleep(15000); } else if (server.equalsIgnoreCase("analytics") || server.equalsIgnoreCase("broker")) { if (extractedDir == null) { diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java index 1368e0b1..4aa77954 100644 --- a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java +++ b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java @@ -108,13 +108,13 @@ public class SampleInstallationTest extends IOTIntegrationUIBaseTestCase { log.info("CARBON_HOME: " + System.getProperty(Constants.CARBON_HOME)); File dir = new File(carbonHome); - log.info("Sample installation started : mvn clean install -f device-deployer.xml"); + log.info("Sample installation started : mvn clean install -f device-plugins-deployer.xml"); try { if (System.getProperty(Constants.OS_NAME).toLowerCase().contains("windows")) { - commands = new String[]{"cmd.exe", "/c", "mvn clean install -f device-deployer.xml"}; + commands = new String[]{"cmd.exe", "/c", "mvn clean install -f device-plugins-deployer.xml"}; tempProcess = Runtime.getRuntime().exec(commands, null, dir); } else { - commands = new String[]{"mvn", "clean", "install", "-f", "device-deployer.xml"}; + commands = new String[]{"mvn", "clean", "install", "-f", "device-plugins-deployer.xml"}; tempProcess = Runtime.getRuntime().exec(commands, null, dir); } boolean buildStatus = waitForMessage(tempProcess.getInputStream(), Constants.BUILD_SUCCESS_MSG); diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index e5084396..31c84b8e 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -167,6 +167,9 @@ org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature:${carbon.device.mgt.version} + + org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature:${carbon.device.mgt.version} + @@ -1001,6 +1004,10 @@ org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group ${carbon.device.mgt.version} + + org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group + ${carbon.device.mgt.version} + org.wso2.carbon.device.mgt.analytics.dashboard.feature.group ${carbon.device.mgt.version} @@ -2015,6 +2022,10 @@ org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group ${carbon.device.mgt.version} + + org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group + ${carbon.device.mgt.version} + org.wso2.carbon.device.mgt.mobile.android.feature.group ${carbon.device.mgt.plugin.version} @@ -2421,6 +2432,10 @@ org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group ${carbon.device.mgt.version} + + org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group + ${carbon.device.mgt.version} + org.wso2.carbon.device.mgt.mobile.android.feature.group ${carbon.device.mgt.plugin.version} @@ -2654,6 +2669,10 @@ org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group ${carbon.device.mgt.version} + + org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group + ${carbon.device.mgt.version} + org.wso2.carbon.device.mgt.mobile.android.feature.group ${carbon.device.mgt.plugin.version} @@ -3039,18 +3058,6 @@ ${carbon.device.mgt.version} - - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group - ${carbon.device.mgt.version} - - - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group - ${carbon.device.mgt.version} - org.wso2.carbon.device.mgt.mobile.android.feature.group ${carbon.device.mgt.plugin.version} diff --git a/pom.xml b/pom.xml index 86b3caae..135a085c 100644 --- a/pom.xml +++ b/pom.xml @@ -1512,7 +1512,7 @@ - 3.0.7 + 3.0.8 [3.0.0, 4.0.0) @@ -1520,10 +1520,10 @@ - 4.0.4 + 4.0.5 - 6.1.80 + 6.1.94 (6.0.0,7.0.0] @@ -1625,10 +1625,10 @@ 1.0.1 - 1.2.27 + 1.2.29 - 1.4.8 + 1.5.1 5.1.4