From fbd7ba2afbd5f2144fa991ac99fb21fdb0e56b03 Mon Sep 17 00:00:00 2001 From: geethkokila Date: Mon, 12 Mar 2018 09:24:53 +0530 Subject: [PATCH] Changing the carbon commons versions and api-registration endpoint --- .../src/main/resources/iot-api-config.xml | 2 +- .../carbon/apimgt/handlers/IOTServerConfigurationTest.java | 4 ++-- .../repository/conf/iot-api-config-invalid-xml.xml | 2 +- .../carbon-home/repository/conf/iot-api-config-invalid.xml | 2 +- .../carbon-home/repository/conf/iot-api-config.xml | 2 +- .../carbon/device/mgt/core/task/TestTaskManagerImpl.java | 6 ++++++ .../carbon/policy/mgt/core/task/TestTaskManagerImpl.java | 6 ++++++ .../src/main/resources/conf/iot-api-config.xml | 2 +- .../src/main/resources/conf/apim-integration.xml | 2 +- pom.xml | 2 +- 10 files changed, 21 insertions(+), 9 deletions(-) diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/resources/iot-api-config.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/resources/iot-api-config.xml index ed61a4a115..bb8e00495d 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/resources/iot-api-config.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/resources/iot-api-config.xml @@ -29,7 +29,7 @@ admin - https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register + https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.12/register https://${iot.keymanager.host}:${iot.keymanager.https.port}/oauth2/token diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/test/java/org/wso2/carbon/apimgt/handlers/IOTServerConfigurationTest.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/test/java/org/wso2/carbon/apimgt/handlers/IOTServerConfigurationTest.java index 84ebc86365..1b7a88dd3b 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/test/java/org/wso2/carbon/apimgt/handlers/IOTServerConfigurationTest.java +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/test/java/org/wso2/carbon/apimgt/handlers/IOTServerConfigurationTest.java @@ -47,7 +47,7 @@ public class IOTServerConfigurationTest extends BaseAPIHandlerTest { Assert.assertEquals(serverConfiguration.getUsername(), "testuser"); Assert.assertEquals(serverConfiguration.getPassword(), "testuserpwd"); Assert.assertEquals(serverConfiguration.getDynamicClientRegistrationEndpoint(), - "https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register"); + "https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.12/register"); Assert.assertEquals(serverConfiguration.getOauthTokenEndpoint(), "https://${iot.keymanager.host}:${iot.keymanager.https.port}/oauth2/token"); Assert.assertEquals(serverConfiguration.getApis().size(), 1); @@ -87,7 +87,7 @@ public class IOTServerConfigurationTest extends BaseAPIHandlerTest { Assert.assertEquals(serverConfiguration.getPassword(), "testuserpwd"); Assert.assertEquals(serverConfiguration.getDynamicClientRegistrationEndpoint(), "https://" + TestUtils.IOT_KEYMANAGER_HOST + ":" + TestUtils.IOT_KEYMANAGER_PORT - + "/client-registration/v0.11/register"); + + "/client-registration/v0.12/register"); Assert.assertEquals(serverConfiguration.getOauthTokenEndpoint(), "https://" + TestUtils.IOT_KEYMANAGER_HOST + ":" + TestUtils.IOT_KEYMANAGER_PORT + "/oauth2/token"); diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/test/resources/carbon-home/repository/conf/iot-api-config-invalid-xml.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/test/resources/carbon-home/repository/conf/iot-api-config-invalid-xml.xml index b7519e99ac..25110b26a6 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/test/resources/carbon-home/repository/conf/iot-api-config-invalid-xml.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/test/resources/carbon-home/repository/conf/iot-api-config-invalid-xml.xml @@ -29,7 +29,7 @@ testuserpwd - https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register + https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.12/register https://${iot.keymanager.host}:${iot.keymanager.https.port}/oauth2/token diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/test/resources/carbon-home/repository/conf/iot-api-config-invalid.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/test/resources/carbon-home/repository/conf/iot-api-config-invalid.xml index 9951e7b98e..67ffc7fd8c 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/test/resources/carbon-home/repository/conf/iot-api-config-invalid.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/test/resources/carbon-home/repository/conf/iot-api-config-invalid.xml @@ -29,7 +29,7 @@ testuserpwd - https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register + https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.12/register https://${iot.keymanager.host}:${iot.keymanager.https.port}/oauth2/token diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/test/resources/carbon-home/repository/conf/iot-api-config.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/test/resources/carbon-home/repository/conf/iot-api-config.xml index fcb53bd009..73af43c45f 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/test/resources/carbon-home/repository/conf/iot-api-config.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/test/resources/carbon-home/repository/conf/iot-api-config.xml @@ -29,7 +29,7 @@ testuserpwd - https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register + https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.12/register https://${iot.keymanager.host}:${iot.keymanager.https.port}/oauth2/token diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/task/TestTaskManagerImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/task/TestTaskManagerImpl.java index 6eda125c3f..c673c584b0 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/task/TestTaskManagerImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/task/TestTaskManagerImpl.java @@ -20,6 +20,7 @@ package org.wso2.carbon.device.mgt.core.task; import org.wso2.carbon.ntask.common.TaskException; import org.wso2.carbon.ntask.core.TaskInfo; import org.wso2.carbon.ntask.core.TaskManager; +import org.wso2.carbon.ntask.core.impl.LocalTaskActionListener; import java.util.ArrayList; import java.util.List; @@ -96,4 +97,9 @@ public class TestTaskManagerImpl implements TaskManager { public boolean isTaskScheduled(String taskName) throws TaskException { return this.registeredTasks.size() > 0; } + + @Override + public void registerLocalTaskActionListener(LocalTaskActionListener localTaskActionListener, String s) { + + } } diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/task/TestTaskManagerImpl.java b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/task/TestTaskManagerImpl.java index cf15c76b0a..3d3f40c0ec 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/task/TestTaskManagerImpl.java +++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/task/TestTaskManagerImpl.java @@ -21,6 +21,7 @@ package org.wso2.carbon.policy.mgt.core.task; import org.wso2.carbon.ntask.common.TaskException; import org.wso2.carbon.ntask.core.TaskInfo; import org.wso2.carbon.ntask.core.TaskManager; +import org.wso2.carbon.ntask.core.impl.LocalTaskActionListener; import java.util.ArrayList; import java.util.List; @@ -97,4 +98,9 @@ public class TestTaskManagerImpl implements TaskManager { public boolean isTaskScheduled(String taskName) throws TaskException { return this.registeredTasks.size() > 0; } + + @Override + public void registerLocalTaskActionListener(LocalTaskActionListener localTaskActionListener, String s) { + + } } diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/src/main/resources/conf/iot-api-config.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/src/main/resources/conf/iot-api-config.xml index ed61a4a115..bb8e00495d 100644 --- a/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/src/main/resources/conf/iot-api-config.xml +++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/src/main/resources/conf/iot-api-config.xml @@ -29,7 +29,7 @@ admin - https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register + https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.12/register https://${iot.keymanager.host}:${iot.keymanager.https.port}/oauth2/token diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/src/main/resources/conf/apim-integration.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/src/main/resources/conf/apim-integration.xml index dfabaf24f5..d6f08a2853 100644 --- a/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/src/main/resources/conf/apim-integration.xml +++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/src/main/resources/conf/apim-integration.xml @@ -19,7 +19,7 @@ --> - https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register + https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.12/register https://${iot.gateway.host}:${iot.gateway.https.port}/token https://${iot.apimpublisher.host}:${iot.apimpublisher.https.port}/api/am/publisher/v0.11 https://${iot.apimstore.host}:${iot.apimstore.https.port}/api/am/store/v0.11 diff --git a/pom.xml b/pom.xml index 63f6a96f0d..0e426b3fec 100644 --- a/pom.xml +++ b/pom.xml @@ -1930,7 +1930,7 @@ 3.0.242-SNAPSHOT - 4.6.0 + 4.6.21 1.4.0.wso2v1 [1.4.0,2.0.0) 2.4.0.wso2v1