diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 78b795cf..65ea1096 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -292,6 +292,11 @@ ../../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/datasources/master-datasources.xml src/analytics/conf/datasource_config_change.xml + + ${basedir}/../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/cdm-config.xml + ../../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/cdm-config.xml + src/analytics/conf/cdm_config_change.xml + diff --git a/modules/distribution/src/analytics/conf/cdm_config_change.xml b/modules/distribution/src/analytics/conf/cdm_config_change.xml new file mode 100644 index 00000000..1dd2d11b --- /dev/null +++ b/modules/distribution/src/analytics/conf/cdm_config_change.xml @@ -0,0 +1,12 @@ + + + + //DeviceMgtConfiguration/PushNotificationConfiguration/PushNotificationProviders + + + + + //DeviceMgtConfiguration/PushNotificationConfiguration + src/analytics/conf/push_notification_config.xml + + \ No newline at end of file diff --git a/modules/distribution/src/analytics/conf/datasources/cdm-datasources.xml b/modules/distribution/src/analytics/conf/datasources/cdm-datasources.xml new file mode 100644 index 00000000..15e7e407 --- /dev/null +++ b/modules/distribution/src/analytics/conf/datasources/cdm-datasources.xml @@ -0,0 +1,45 @@ + + + + + org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader + + + + DM_DS + The datasource used for CDM + + jdbc/DM_DS + + + + jdbc:h2:../../repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;LOCK_TIMEOUT=60000 + wso2carbon + wso2carbon + org.h2.Driver + 50 + 60000 + true + SELECT 1 + 30000 + + + + + diff --git a/modules/distribution/src/analytics/conf/output-adapter-change.xml b/modules/distribution/src/analytics/conf/output-adapter-change.xml index 89d97b19..b1d69837 100644 --- a/modules/distribution/src/analytics/conf/output-adapter-change.xml +++ b/modules/distribution/src/analytics/conf/output-adapter-change.xml @@ -2,7 +2,21 @@ /outputEventAdaptersConfig/adapterConfig[@type="websocket"] - + + + 8 + 100 + 20000 + 10000 + 60 + https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register + https://${iot.gateway.host}:${iot.gateway.https.port}/token + tcp://${mqtt.broker.host}:${mqtt.broker.port} + admin + admin + + + 8 100 diff --git a/modules/distribution/src/analytics/conf/push_notification_config.xml b/modules/distribution/src/analytics/conf/push_notification_config.xml new file mode 100644 index 00000000..cfa47cb2 --- /dev/null +++ b/modules/distribution/src/analytics/conf/push_notification_config.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 514d928a..7ab1f3fb 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -711,6 +711,13 @@ + + + src/analytics/conf/datasources + + ${pom.artifactId}-${pom.version}/wso2/analytics/conf/datasources + + src/analytics/conf/analytics/spark @@ -1226,6 +1233,13 @@ true 644 + + src/core/conf/etc/device-analytics-config.xml + ${pom.artifactId}-${pom.version}/wso2/analytics/conf/etc + device-analytics-config.xml + true + 644 + src/core/conf/synapse-handlers.xml diff --git a/modules/distribution/src/core/conf/datasources/cdm-datasources.xml b/modules/distribution/src/core/conf/datasources/cdm-datasources.xml index 8a4bb660..80e14ca9 100755 --- a/modules/distribution/src/core/conf/datasources/cdm-datasources.xml +++ b/modules/distribution/src/core/conf/datasources/cdm-datasources.xml @@ -29,7 +29,27 @@ - jdbc:h2:repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000 + jdbc:h2:repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;LOCK_TIMEOUT=60000 + wso2carbon + wso2carbon + org.h2.Driver + 50 + 60000 + true + SELECT 1 + 30000 + + + + + DM_ARCHIVAL_DS + The archival datasource used for CDM + + jdbc/DM_ARCHIVAL_DS + + + + jdbc:h2:repository/database/WSO2DM_ARCHIVAL_DS;DB_CLOSE_ON_EXIT=FALSE wso2carbon wso2carbon org.h2.Driver diff --git a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/AnalyticsServerExtension.java b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/AnalyticsServerExtension.java index 3f9693a0..7d629c4a 100644 --- a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/AnalyticsServerExtension.java +++ b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/AnalyticsServerExtension.java @@ -23,7 +23,6 @@ import org.wso2.carbon.automation.engine.annotations.ExecutionEnvironment; import org.wso2.carbon.automation.engine.context.AutomationContext; import org.wso2.carbon.automation.engine.context.ContextXpathConstants; import org.wso2.carbon.automation.engine.context.TestUserMode; -import org.wso2.carbon.automation.engine.exceptions.AutomationFrameworkException; import org.wso2.carbon.automation.engine.extensions.ExecutionListenerExtension; import org.wso2.carbon.automation.extensions.ExtensionConstants; import org.wso2.carbon.automation.extensions.servers.carbonserver.CarbonServerExtension; @@ -40,48 +39,43 @@ public class AnalyticsServerExtension extends ExecutionListenerExtension { private static final Log log = LogFactory.getLog(CarbonServerExtension.class); private String executionEnvironment; private AutomationContext automationContext; - + private final String ANALYTICS_PORT_OFFSET = "2"; @Override - public void initiate() throws AutomationFrameworkException { + public void initiate() { try { automationContext = new AutomationContext("IOT", TestUserMode.SUPER_TENANT_USER); - if(getParameters().get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND) == null) { - getParameters().put(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND, "2"); + if (getParameters().get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND) == null) { + getParameters().put(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND, ANALYTICS_PORT_OFFSET); } serverManager = new CustomTestServerManager(getAutomationContext(), null, getParameters()); executionEnvironment = automationContext.getConfigurationValue(ContextXpathConstants.EXECUTION_ENVIRONMENT); } catch (XPathExpressionException e) { - handleException("Error while initiating test environment", e); + throw new RuntimeException("Error while initiating test environment", e); } } @Override - public void onExecutionStart() throws AutomationFrameworkException { + public void onExecutionStart() { try { if (executionEnvironment.equalsIgnoreCase(ExecutionEnvironment.STANDALONE.name())) { String carbonHome = serverManager.startServer("analytics"); } } catch (Exception e) { - handleException("Fail to start carbon server ", e); + throw new RuntimeException("Fail to start carbon server ", e); } } @Override - public void onExecutionFinish() throws AutomationFrameworkException { + public void onExecutionFinish() { try { if (executionEnvironment.equalsIgnoreCase(ExecutionEnvironment.STANDALONE.name())) { serverManager.stopServer(); } } catch (Exception e) { - handleException("Fail to stop carbon server ", e); + throw new RuntimeException("Fail to stop carbon server ", e); } } - - private static void handleException(String msg, Exception e) { - log.error(msg, e); - throw new RuntimeException(msg, e); - } } diff --git a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/BrokerServerExtension.java b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/BrokerServerExtension.java index 881323b6..ef2ba48c 100644 --- a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/BrokerServerExtension.java +++ b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/BrokerServerExtension.java @@ -23,7 +23,6 @@ import org.wso2.carbon.automation.engine.annotations.ExecutionEnvironment; import org.wso2.carbon.automation.engine.context.AutomationContext; import org.wso2.carbon.automation.engine.context.ContextXpathConstants; import org.wso2.carbon.automation.engine.context.TestUserMode; -import org.wso2.carbon.automation.engine.exceptions.AutomationFrameworkException; import org.wso2.carbon.automation.engine.extensions.ExecutionListenerExtension; import org.wso2.carbon.automation.extensions.ExtensionConstants; import org.wso2.carbon.automation.extensions.servers.carbonserver.CarbonServerExtension; @@ -40,26 +39,26 @@ public class BrokerServerExtension extends ExecutionListenerExtension { private static final Log log = LogFactory.getLog(CarbonServerExtension.class); private String executionEnvironment; private AutomationContext automationContext; - + private final String BROKER_PORT_OFFSET = "3"; @Override - public void initiate() throws AutomationFrameworkException { + public void initiate() { try { automationContext = new AutomationContext("IOT", TestUserMode.SUPER_TENANT_USER); - if(getParameters().get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND) == null) { - getParameters().put(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND, "3"); + if (getParameters().get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND) == null) { + getParameters().put(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND, BROKER_PORT_OFFSET); } serverManager = new CustomTestServerManager(getAutomationContext(), null, getParameters()); executionEnvironment = automationContext.getConfigurationValue(ContextXpathConstants.EXECUTION_ENVIRONMENT); } catch (XPathExpressionException e) { - handleException("Error while initiating test environment", e); + throw new RuntimeException("Error while initiating test environment", e); } } @Override - public void onExecutionStart() throws AutomationFrameworkException { + public void onExecutionStart() { try { if (executionEnvironment.equalsIgnoreCase(ExecutionEnvironment.STANDALONE.name())) { String carbonHome = serverManager.startServer("broker"); @@ -67,23 +66,18 @@ public class BrokerServerExtension extends ExecutionListenerExtension { System.setProperty(ExtensionConstants.CARBON_HOME, carbonHome); } } catch (Exception e) { - handleException("Fail to start carbon server ", e); + throw new RuntimeException("Fail to start carbon server ", e); } } @Override - public void onExecutionFinish() throws AutomationFrameworkException { + public void onExecutionFinish() { try { if (executionEnvironment.equalsIgnoreCase(ExecutionEnvironment.STANDALONE.name())) { serverManager.stopServer(); } } catch (Exception e) { - handleException("Fail to stop carbon server ", e); + throw new RuntimeException("Fail to stop carbon server ", e); } } - - private static void handleException(String msg, Exception e) { - log.error(msg, e); - throw new RuntimeException(msg, e); - } } 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 81938011..f641d227 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 @@ -80,7 +80,6 @@ public class CustomTestServerManager { } - public Map getCommands() { return commandMap; } @@ -181,6 +180,4 @@ public class CustomTestServerManager { public void stopServer() throws AutomationFrameworkException { carbonServer.serverShutdown(portOffset); } - - } diff --git a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/IOTServerExtension.java b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/IOTServerExtension.java index 8c85eb48..be8a0129 100644 --- a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/IOTServerExtension.java +++ b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/IOTServerExtension.java @@ -23,7 +23,6 @@ import org.wso2.carbon.automation.engine.annotations.ExecutionEnvironment; import org.wso2.carbon.automation.engine.context.AutomationContext; import org.wso2.carbon.automation.engine.context.ContextXpathConstants; import org.wso2.carbon.automation.engine.context.TestUserMode; -import org.wso2.carbon.automation.engine.exceptions.AutomationFrameworkException; import org.wso2.carbon.automation.engine.extensions.ExecutionListenerExtension; import org.wso2.carbon.automation.extensions.ExtensionConstants; import org.wso2.carbon.automation.extensions.servers.carbonserver.CarbonServerExtension; @@ -40,26 +39,26 @@ public class IOTServerExtension extends ExecutionListenerExtension { private static final Log log = LogFactory.getLog(CarbonServerExtension.class); private String executionEnvironment; private AutomationContext automationContext; - + private final String IOT_CORE_PORT_OFFSET = "0"; @Override - public void initiate() throws AutomationFrameworkException { + public void initiate() { try { automationContext = new AutomationContext("IOT", TestUserMode.SUPER_TENANT_USER); - if(getParameters().get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND) == null) { - getParameters().put(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND, "0"); + if (getParameters().get(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND) == null) { + getParameters().put(ExtensionConstants.SERVER_STARTUP_PORT_OFFSET_COMMAND, IOT_CORE_PORT_OFFSET); } serverManager = new CustomTestServerManager(getAutomationContext(), null, getParameters()); executionEnvironment = automationContext.getConfigurationValue(ContextXpathConstants.EXECUTION_ENVIRONMENT); } catch (XPathExpressionException e) { - handleException("Error while initiating test environment", e); + throw new RuntimeException("Error while initiating test environment", e); } } @Override - public void onExecutionStart() throws AutomationFrameworkException { + public void onExecutionStart() { try { if (executionEnvironment.equalsIgnoreCase(ExecutionEnvironment.STANDALONE.name())) { String carbonHome = serverManager.startServer("core"); @@ -70,23 +69,18 @@ public class IOTServerExtension extends ExecutionListenerExtension { Thread.sleep(30000); } } catch (Exception e) { - handleException("Fail to start carbon server ", e); + throw new RuntimeException("Fail to start carbon server ", e); } } @Override - public void onExecutionFinish() throws AutomationFrameworkException { + public void onExecutionFinish() { try { if (executionEnvironment.equalsIgnoreCase(ExecutionEnvironment.STANDALONE.name())) { serverManager.stopServer(); } } catch (Exception e) { - handleException("Fail to stop carbon server ", e); + throw new RuntimeException("Fail to stop carbon server ", e); } } - - private static void handleException(String msg, Exception e) { - log.error(msg, e); - throw new RuntimeException(msg, e); - } } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIUtils.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIUtils.java index 09346afb..d256cecf 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIUtils.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIUtils.java @@ -45,5 +45,4 @@ public class UIUtils { } } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/DevicesPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/DevicesPage.java index c87dafa3..41ac7dd7 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/DevicesPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/DevicesPage.java @@ -80,11 +80,11 @@ public class DevicesPage { */ public ConnectedCupDeviceViewPage viewDevice(String deviceName) throws IOException { WebElement deviceTable = driver.findElement(By.xpath(uiElementMapper.getElement("iot.devices.table.xpath"))); - List data = deviceTable.findElements(By.cssSelector("a")); - for (WebElement e : data) { - String s = getLink(e, "/device/connectedcup?id="); - if (s != null) { - driver.get(s); + List anchors = deviceTable.findElements(By.cssSelector("a")); + for (WebElement element : anchors) { + String connectedCupLink = getLink(element, "/device/connectedcup?id="); + if (connectedCupLink != null) { + driver.get(connectedCupLink); return new ConnectedCupDeviceViewPage(driver, deviceName); } } @@ -100,12 +100,11 @@ public class DevicesPage { private String getLink(WebElement element, String... lookupText) { String link = element.getAttribute("href"); boolean check = true; - for (String s : lookupText) { - if (!link.contains(s)) { + for (String text : lookupText) { + if (!link.contains(text)) { check = false; } } return check ? link : null; } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/EnrollDevicePage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/EnrollDevicePage.java index a6c55025..a7f74639 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/EnrollDevicePage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/EnrollDevicePage.java @@ -81,9 +81,8 @@ public class EnrollDevicePage { tryBtn.click(); return new ConnectedCupDeviceTypeViewPage(driver); } else { - log.error("Element not found..........................."); + log.error("Element not found!"); return null; } } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/error/IOTErrorPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/error/IOTErrorPage.java index da402c96..eadcf229 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/error/IOTErrorPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/error/IOTErrorPage.java @@ -1,3 +1,20 @@ +/* + * 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. + */ package org.wso2.iot.integration.ui.pages.error; import org.openqa.selenium.WebDriver; @@ -24,7 +41,6 @@ public class IOTErrorPage { throw new IllegalStateException("This is not the Error page"); } } - public boolean isErrorPresent() { return this.isErrorPage; } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/Graph.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/Graph.java index 1058f2f6..18faacb4 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/Graph.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/Graph.java @@ -60,5 +60,4 @@ public class Graph { return String.format("The graph for graph id : %s, X - axis : %s, Y - axis : %s, legend : %s ", graphId, xAxis, yAxis, legend); } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceAddGroupPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceAddGroupPage.java index b80d0efb..cdcca5fd 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceAddGroupPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceAddGroupPage.java @@ -47,7 +47,6 @@ public class DeviceAddGroupPage { } } - /** * This method performs creation of a new device group. * @param name : The group name that is need to be created. @@ -91,5 +90,4 @@ public class DeviceAddGroupPage { return driver.findElement(By.xpath( uiElementMapper.getElement("iot.device.groups.add.emptyfrom.error"))).getText(); } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceGroupsPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceGroupsPage.java index becb12fa..19c8387d 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceGroupsPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceGroupsPage.java @@ -73,5 +73,4 @@ public class DeviceGroupsPage { } return false; } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTAdminDashboard.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTAdminDashboard.java index 828e582b..f0ed3a50 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTAdminDashboard.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTAdminDashboard.java @@ -132,6 +132,5 @@ public class IOTAdminDashboard { driver.findElement(By.xpath(uiElementMapper.getElement("iot.admin.device.viewBtn.xpath"))).click(); return new DevicesPage(driver); } - //ToDo : Need to add policy methods } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTHomePage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTHomePage.java index 58b929e9..28ef791a 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTHomePage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTHomePage.java @@ -57,7 +57,6 @@ public class IOTHomePage { return name.contains(uiElementMapper.getElement("iot.user.login.username")); } - /** * Performs the logout function. * @return : IOT login page. @@ -90,7 +89,5 @@ public class IOTHomePage { driver.findElement(By.xpath("iot.device.viewGroup.empty.addGroup.xpath")).click(); return new DeviceAddGroupPage(driver); } - //ToDo : To add policies - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/LoginPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/LoginPage.java index 91fb30c6..8e2cffc1 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/LoginPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/LoginPage.java @@ -101,5 +101,4 @@ public class LoginPage { registerLink.click(); return new NewUserRegisterPage(driver); } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceInterface.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceInterface.java index 2ea11f7a..6477686b 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceInterface.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceInterface.java @@ -110,5 +110,4 @@ public class ConnectedCupDeviceInterface { Action action = move.dragAndDropBy(slider, 0, val).build(); action.perform(); } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceTypeViewPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceTypeViewPage.java index 2fa4e605..879d8ed0 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceTypeViewPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceTypeViewPage.java @@ -17,7 +17,6 @@ */ package org.wso2.iot.integration.ui.pages.samples; - import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; @@ -79,5 +78,4 @@ public class ConnectedCupDeviceTypeViewPage { return driver.findElement(By.xpath( uiElementMapper.getElement("iot.sample.connectedcup.page.title"))).getText().contains("Connected Cup"); } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceViewPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceViewPage.java index 5631a564..0681a141 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceViewPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceViewPage.java @@ -170,5 +170,4 @@ public class ConnectedCupDeviceViewPage { return false; } } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/AddUserPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/AddUserPage.java index 3305fbda..78d5b451 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/AddUserPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/AddUserPage.java @@ -27,7 +27,6 @@ import org.wso2.iot.integration.ui.pages.UIElementMapper; import java.io.IOException; - /** * This class represents the add user page of the IOT server. */ @@ -76,5 +75,4 @@ public class AddUserPage { return new UserAddedConfirmationPage(driver); } - } \ No newline at end of file diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/EditUserPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/EditUserPage.java index dcba72e6..6141e2a8 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/EditUserPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/EditUserPage.java @@ -48,5 +48,4 @@ public class EditUserPage { public void editUser(String password, String firstName, String lastName) { driver.findElement(By.xpath(uiElementMapper.getElement("iot.user.add.input.password.xpath"))); } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/NewUserRegisterPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/NewUserRegisterPage.java index b40dfe51..baa1e8c7 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/NewUserRegisterPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/NewUserRegisterPage.java @@ -127,5 +127,4 @@ public class NewUserRegisterPage { passwordField.clear(); passwordConfirmationField.clear(); } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserAddedConfirmationPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserAddedConfirmationPage.java index a32087e4..6e5d55a0 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserAddedConfirmationPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserAddedConfirmationPage.java @@ -33,5 +33,4 @@ public class UserAddedConfirmationPage { driver.findElement(By.xpath(uiElementMapper.getElement("iot.admin.addUser.view.btn.xpath"))).click(); } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java index 7d6fe4e1..fd4c96a4 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java @@ -64,5 +64,4 @@ public class UserListingPage { return new UserListingPage(driver); } - } diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/ViewUserPage.java b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/ViewUserPage.java index a4d3964e..c2b57eaa 100644 --- a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/ViewUserPage.java +++ b/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/ViewUserPage.java @@ -43,5 +43,4 @@ public class ViewUserPage { throw new IllegalStateException("This is not the User view page"); } } - } diff --git a/modules/integration/tests-integration/src/test/resources/jmeter-scripts/AppManagerTest.jmx b/modules/integration/tests-integration/src/test/resources/jmeter-scripts/AppManagerTest.jmx index 06077374..a8a60a15 100644 --- a/modules/integration/tests-integration/src/test/resources/jmeter-scripts/AppManagerTest.jmx +++ b/modules/integration/tests-integration/src/test/resources/jmeter-scripts/AppManagerTest.jmx @@ -1,5 +1,5 @@ - + @@ -115,7 +115,7 @@ rfc2109 - + @@ -137,9 +137,9 @@ urn:login true false - + - + @@ -157,7 +157,7 @@ urn:getTenant true false - + undefined @@ -167,6 +167,7 @@ false true tenant_exists + -1 @@ -182,7 +183,7 @@ false - + @@ -221,10 +222,10 @@ urn:addTenant true false - + - + @@ -239,7 +240,7 @@ urn:logout true false - + @@ -303,7 +304,7 @@ false - import org.apache.jmeter.services.FileServer; + import org.apache.jmeter.services.FileServer; String basePath = FileServer.getFileServer().getBaseDir() + File.separator; vars.put("script-path", basePath); @@ -338,8 +339,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https publisher @@ -348,8 +347,9 @@ vars.put("encoded", encoded); false true false - false + + @@ -359,6 +359,7 @@ vars.put("encoded", encoded); false true false + -1 @@ -368,6 +369,7 @@ vars.put("encoded", encoded); false true false + -1 @@ -377,6 +379,7 @@ vars.put("encoded", encoded); false true false + -1 @@ -408,8 +411,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https samlsso @@ -418,9 +419,10 @@ vars.put("encoded", encoded); false true false - HttpClient4 - false + HttpClient4 + + @@ -431,6 +433,7 @@ vars.put("encoded", encoded); true false all + -1 @@ -469,8 +472,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https commonauth @@ -479,8 +480,9 @@ vars.put("encoded", encoded); false true false - false + + @@ -490,6 +492,7 @@ vars.put("encoded", encoded); false true false + -1 @@ -499,6 +502,7 @@ vars.put("encoded", encoded); false true false + -1 @@ -532,8 +536,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https publisher/acs @@ -542,8 +544,9 @@ vars.put("encoded", encoded); false true false - false + + @@ -560,8 +563,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https /publisher/csrf.js @@ -570,8 +571,9 @@ vars.put("encoded", encoded); false true false - false + + @@ -580,8 +582,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https /publisher/csrf.js @@ -590,8 +590,9 @@ vars.put("encoded", encoded); false true false - false + + @@ -628,8 +629,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/mobileapp/upload @@ -638,8 +637,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -680,8 +680,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/mobile/isexist?name=${mobile-app} @@ -690,8 +688,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -820,8 +819,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/asset/mobileapp @@ -830,8 +827,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -960,8 +958,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/asset/mobileapp @@ -970,8 +966,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -1012,8 +1009,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/lifecycle/${encoded}/mobileapp/${id} @@ -1022,8 +1017,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -1064,8 +1060,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/lifecycle/Approve/mobileapp/${id} @@ -1074,8 +1068,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -1107,8 +1102,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/lifecycle/${encoded}/mobileapp/${id} @@ -1117,8 +1110,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -1159,8 +1153,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/lifecycle/Publish/mobileapp/${id} @@ -1169,8 +1161,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -1202,8 +1195,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/lifecycle/Deprecate/mobileapp/${id} @@ -1212,8 +1203,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -1245,8 +1237,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/lifecycle/Retire/mobileapp/${id} @@ -1255,8 +1245,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -1385,8 +1376,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/asset/mobileapp @@ -1395,8 +1384,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -1428,8 +1418,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/mobile/delete/${id} @@ -1438,8 +1426,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -1471,8 +1460,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/mobileapp/upload @@ -1481,8 +1468,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -1620,8 +1608,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/asset/mobileapp @@ -1630,8 +1616,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -1672,8 +1659,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/lifecycle/${encoded}/mobileapp/${id} @@ -1682,8 +1667,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -1724,8 +1710,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/mobile/delete/${id} @@ -1734,8 +1718,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -1767,8 +1752,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/mobileapp/upload @@ -1777,8 +1760,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -1916,8 +1900,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/asset/mobileapp @@ -1926,8 +1908,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -1968,8 +1951,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/asset/mobileapp/${id} @@ -1978,8 +1959,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -2011,8 +1993,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/mobile/delete/${id} @@ -2021,8 +2001,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -2054,8 +2035,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/mobileapp/upload @@ -2064,8 +2043,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -2203,8 +2183,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/asset/mobileapp @@ -2213,8 +2191,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -2255,8 +2234,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/asset/mobileapp/${id} @@ -2265,8 +2242,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -2298,8 +2276,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/mobile/delete/${id} @@ -2308,8 +2284,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -2326,14 +2303,72 @@ vars.put("encoded", encoded); - + + + + + ${script-path}test1.apk + file + application/vnd.android.package-archive,.apk + + + ${server} ${port} + https + UTF-8 + publisher/api/mobileapp/upload + POST + true + false + true + true + + + + + + + X-CSRF-Token + ${X-CSRF-Token} + + + X-Requested-With + XmlHttpRequest + + + + + + false + response + (?s)(^.*) + $1$ + + 1 + + + + + "package" : "agent.androidtv.wso2.org.agent2", "version" : "1.0" + + Assertion.response_data + false + 16 + + + + + + + + ${server} + ${port} https UTF-8 publisher/logout @@ -2342,8 +2377,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -2489,7 +2525,7 @@ vars.put("encoded", encoded); false - import org.apache.jmeter.services.FileServer; + import org.apache.jmeter.services.FileServer; String basePath = FileServer.getFileServer().getBaseDir() + File.separator; vars.put("script-path", basePath); @@ -2524,8 +2560,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https publisher @@ -2534,8 +2568,9 @@ vars.put("encoded", encoded); false true false - false + + @@ -2545,6 +2580,7 @@ vars.put("encoded", encoded); false true false + -1 @@ -2554,6 +2590,7 @@ vars.put("encoded", encoded); false true false + -1 @@ -2563,6 +2600,7 @@ vars.put("encoded", encoded); false true false + -1 @@ -2594,8 +2632,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https samlsso @@ -2604,9 +2640,10 @@ vars.put("encoded", encoded); false true false - HttpClient4 - false + HttpClient4 + + @@ -2617,6 +2654,7 @@ vars.put("encoded", encoded); true false all + -1 @@ -2655,8 +2693,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https commonauth @@ -2665,8 +2701,9 @@ vars.put("encoded", encoded); false true false - false + + @@ -2676,6 +2713,7 @@ vars.put("encoded", encoded); false true false + -1 @@ -2685,6 +2723,7 @@ vars.put("encoded", encoded); false true false + -1 @@ -2718,8 +2757,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https publisher/acs @@ -2728,8 +2765,9 @@ vars.put("encoded", encoded); false true false - false + + @@ -2746,8 +2784,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https /publisher/csrf.js @@ -2756,8 +2792,9 @@ vars.put("encoded", encoded); false true false - false + + @@ -2766,8 +2803,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https /publisher/csrf.js @@ -2776,8 +2811,9 @@ vars.put("encoded", encoded); false true false - false + + @@ -2814,8 +2850,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/mobileapp/upload @@ -2824,8 +2858,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -2866,8 +2901,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/mobile/isexist?name=${mobile-app} @@ -2876,8 +2909,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -3006,8 +3040,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/asset/mobileapp @@ -3016,8 +3048,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -3146,8 +3179,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/asset/mobileapp @@ -3156,8 +3187,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -3198,8 +3230,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/lifecycle/${encoded}/mobileapp/${id} @@ -3208,8 +3238,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -3250,8 +3281,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/lifecycle/Approve/mobileapp/${id} @@ -3260,8 +3289,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -3293,8 +3323,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/lifecycle/${encoded}/mobileapp/${id} @@ -3303,8 +3331,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -3345,8 +3374,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/lifecycle/Publish/mobileapp/${id} @@ -3355,8 +3382,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -3388,8 +3416,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/lifecycle/Deprecate/mobileapp/${id} @@ -3398,8 +3424,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -3431,8 +3458,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/lifecycle/Retire/mobileapp/${id} @@ -3441,8 +3466,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -3571,8 +3597,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/asset/mobileapp @@ -3581,8 +3605,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -3614,8 +3639,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/mobile/delete/${id} @@ -3624,8 +3647,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -3657,8 +3681,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/mobileapp/upload @@ -3667,8 +3689,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -3806,8 +3829,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/asset/mobileapp @@ -3816,8 +3837,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -3858,8 +3880,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/lifecycle/${encoded}/mobileapp/${id} @@ -3868,8 +3888,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -3910,8 +3931,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/api/mobile/delete/${id} @@ -3920,8 +3939,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -3944,8 +3964,6 @@ vars.put("encoded", encoded); ${server} ${port} - - https UTF-8 publisher/logout @@ -3954,8 +3972,9 @@ vars.put("encoded", encoded); false true true - false + + @@ -4091,5 +4110,9 @@ vars.put("encoded", encoded); + + true + + diff --git a/modules/integration/tests-integration/src/test/resources/jmeter-scripts/NewAndroidDeviceManagementAPI.jmx b/modules/integration/tests-integration/src/test/resources/jmeter-scripts/NewAndroidDeviceManagementAPI.jmx index f6f6147a..b20a2c3d 100644 --- a/modules/integration/tests-integration/src/test/resources/jmeter-scripts/NewAndroidDeviceManagementAPI.jmx +++ b/modules/integration/tests-integration/src/test/resources/jmeter-scripts/NewAndroidDeviceManagementAPI.jmx @@ -817,7 +817,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", https - /api/certificate-mgt/v1.0/admin/certificates/18022362098305316308 + /api/certificate-mgt/v1.0/admin/certificates/qwe12-23fdf-2s332-53fv3-sfs338 GET false false @@ -852,7 +852,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", https - /api/certificate-mgt/v1.0/admin/certificates/18022362098305316308 + /api/certificate-mgt/v1.0/admin/certificates/qwe12-23fdf-2s332-53fv3-sfs33 DELETE false false @@ -5005,7 +5005,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", https - /api/certificate-mgt/v1.0/admin/certificates/18022362098305316308 + /api/certificate-mgt/v1.0/admin/certificates/qwe12-23fdf-2s332-53fv3-sfs33 GET false false @@ -5119,7 +5119,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", https - /api/certificate-mgt/v1.0/admin/certificates/18022362098305316308 + /api/certificate-mgt/v1.0/admin/certificates/qwe12-23fdf-2s332-53fv3-sfs33 DELETE false false diff --git a/modules/integration/tests-integration/src/test/resources/jmeter-scripts/test1.apk b/modules/integration/tests-integration/src/test/resources/jmeter-scripts/test1.apk new file mode 100644 index 00000000..83c44a98 Binary files /dev/null and b/modules/integration/tests-integration/src/test/resources/jmeter-scripts/test1.apk differ diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml index 460aeb0a..697676a8 100644 --- a/modules/p2-profile/analytics-profile/pom.xml +++ b/modules/p2-profile/analytics-profile/pom.xml @@ -94,6 +94,15 @@ true true + + org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.basics.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version} + + + org.apache.axis2.transport:org.apache.axis2.transport.mail.feature:${axis2-transports.wso2.version} + org.wso2.carbon.analytics:org.wso2.carbon.analytics.core.feature:${carbon.analytics.das.version} @@ -388,9 +397,15 @@ org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.execution.json.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} - + + org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.device.feature:${carbon.device.mgt.plugin.version} + + + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.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} + org.wso2.carbon.devicemgt-plugins:org.wso2.gpl.siddhi.extension.geo.script.feature:${carbon.device.mgt.plugin.version} @@ -443,6 +458,18 @@ true + + org.wso2.carbon.device.mgt.basics.feature.group + ${carbon.device.mgt.version} + + + org.wso2.carbon.email.sender.feature.group + ${carbon.device.mgt.version} + + + org.apache.axis2.transport.mail.feature.group + ${axis2-transports.wso2.version} + org.wso2.carbon.analytics.core.feature.group @@ -826,13 +853,20 @@ org.wso2.extension.siddhi.execution.json.feature.group ${carbon.device.mgt.plugin.version} + + org.wso2.extension.siddhi.device.feature.group + ${carbon.device.mgt.plugin.version} + + + org.wso2.carbon.device.mgt.iot.analytics.feature.group + ${carbon.device.mgt.plugin.version} + org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group ${carbon.device.mgt.plugin.version} - org.wso2.gpl.siddhi.extension.geo.script.feature.group diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index c6ab8583..bf010f83 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -749,6 +749,12 @@ + + + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.remote.session.feature:${carbon.device.mgt.plugin.version} + + + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.andes.extensions.device.mgt.api.feature:${carbon.device.mgt.plugin.version} @@ -1629,12 +1635,18 @@ ${carbon.device.mgt.plugin.version} + + + org.wso2.carbon.device.mgt.remote.session.feature.group + ${carbon.device.mgt.plugin.version} + + + org.wso2.carbon.andes.extensions.device.mgt.api.feature.group ${carbon.device.mgt.plugin.version} - @@ -2495,6 +2507,13 @@ ${carbon.device.mgt.plugin.version} + + + org.wso2.carbon.device.mgt.remote.session.feature.group + ${carbon.device.mgt.plugin.version} + + + org.wso2.carbon.andes.extensions.device.mgt.api.feature.group @@ -3122,6 +3141,12 @@ ${carbon.device.mgt.plugin.version} + + + org.wso2.carbon.device.mgt.remote.session.feature.group + ${carbon.device.mgt.plugin.version} + + org.wso2.carbon.andes.extensions.device.mgt.api.feature.group diff --git a/pom.xml b/pom.xml index 4e8d7143..0fe329af 100644 --- a/pom.xml +++ b/pom.xml @@ -1517,14 +1517,14 @@ 4.7.8 - 3.0.144 + 3.0.184 [3.0.0, 4.0.0) ${project.version} - 4.0.88 + 4.0.101 6.1.109 @@ -1629,7 +1629,7 @@ 1.0.1 - 1.2.40 + 1.2.43 1.5.1