From 0b6acdc92926070d30fb8d84e84dba77492f7fcb Mon Sep 17 00:00:00 2001 From: ayyoob Date: Sun, 8 May 2016 02:44:24 +0530 Subject: [PATCH 1/5] Added file seperator --- .../identity/jwt/client/extension/util/JWTClientUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/util/JWTClientUtil.java b/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/util/JWTClientUtil.java index 352e8177aa..cbfa846c21 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/util/JWTClientUtil.java +++ b/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/main/java/org/wso2/carbon/identity/jwt/client/extension/util/JWTClientUtil.java @@ -73,7 +73,7 @@ public class JWTClientUtil { private static final Log log = LogFactory.getLog(JWTClientUtil.class); private static final String HTTPS_PROTOCOL = "https"; - private static final String TENANT_JWT_CONFIG_LOCATION = "/jwt-config/jwt.properties"; + private static final String TENANT_JWT_CONFIG_LOCATION = File.separator + "jwt-config" + File.separator + "jwt.properties"; private static final String JWT_CONFIG_FILE_NAME = "jwt.properties"; private static final String SUPERTENANT_JWT_CONFIG_LOCATION = CarbonUtils.getEtcCarbonConfigDirPath() + File.separator + JWT_CONFIG_FILE_NAME; From c165156dcd79f3af867e5b00230a4bd245fefc00 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Mon, 9 May 2016 01:05:08 +0530 Subject: [PATCH 2/5] remove imports --- .../org.wso2.carbon.device.mgt.server.feature/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml index ec7962494d..9dfce99e2b 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml @@ -123,8 +123,6 @@ org.wso2.carbon.core.server:${carbon.kernel.version} - org.wso2.carbon.apimgt.core:${carbon.api.mgt.version} - org.wso2.carbon.device.mgt.extensions:${carbon.device.mgt.version} org.wso2.carbon.email.sender:${carbon.device.mgt.version} From ac587c3353b26009a9323d043f47df924d6d8d8d Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 12 May 2016 02:42:29 +0530 Subject: [PATCH 3/5] fixes after testing --- .../mgt/analytics/data/publisher/DeviceDataPublisher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/src/main/java/org/wso2/carbon/device/mgt/analytics/data/publisher/DeviceDataPublisher.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/src/main/java/org/wso2/carbon/device/mgt/analytics/data/publisher/DeviceDataPublisher.java index bcf51ebdae..04f9030760 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/src/main/java/org/wso2/carbon/device/mgt/analytics/data/publisher/DeviceDataPublisher.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/src/main/java/org/wso2/carbon/device/mgt/analytics/data/publisher/DeviceDataPublisher.java @@ -83,7 +83,7 @@ public class DeviceDataPublisher { * */ public DataPublisher getDataPublisher() throws DataPublisherConfigurationException { - String tenantDomain = CarbonContext.getThreadLocalCarbonContext().getTenantDomain(); + String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain(true); //Get LoadBalancingDataPublisher which has been registered for the tenant. DataPublisher dataPublisher = getDataPublisher(tenantDomain); //If a LoadBalancingDataPublisher had not been registered for the tenant. From df473e42845065ac2bdcb3902a6f25812ec56bb5 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 12 May 2016 13:49:32 +0530 Subject: [PATCH 4/5] revert back --- .../org.wso2.carbon.device.mgt.server.feature/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml index 9dfce99e2b..ec7962494d 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml @@ -123,6 +123,8 @@ org.wso2.carbon.core.server:${carbon.kernel.version} + org.wso2.carbon.apimgt.core:${carbon.api.mgt.version} + org.wso2.carbon.device.mgt.extensions:${carbon.device.mgt.version} org.wso2.carbon.email.sender:${carbon.device.mgt.version} From 42dde2c8eb35ba14c3ee53c406677f134dfd1f14 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 12 May 2016 19:17:31 +0530 Subject: [PATCH 5/5] updated property --- .../src/main/resources/jwt.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/src/main/resources/jwt.properties b/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/src/main/resources/jwt.properties index 6649b50d1c..2b22f91475 100644 --- a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/src/main/resources/jwt.properties +++ b/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/src/main/resources/jwt.properties @@ -19,7 +19,7 @@ #issuer of the JWT iss=CDMF_DEFAULT_IDP -TokenEndpoint=https://${server.host}:${mgt.transport.https.port}/oauth2/token +TokenEndpoint=https://localhost:${carbon.https.port}/oauth2/token #audience of JWT claim #comma seperated values