From f69c1ba0c7bdb56710abb6ecf8c14effafb16360 Mon Sep 17 00:00:00 2001 From: charitha Date: Fri, 19 Oct 2018 23:30:11 +0530 Subject: [PATCH 1/3] Bump devicemgt version --- .../DeviceManagementProviderServiceMock.java | 15 +++++++++++++++ .../DeviceManagementProviderServiceMock.java | 15 +++++++++++++++ pom.xml | 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java index 0129f6f0fc..1ca5cd950a 100644 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java @@ -412,6 +412,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv return null; } + @Override + public Operation getNextPendingOperation(DeviceIdentifier deviceIdentifier, long l) throws OperationManagementException { + return null; + } + @Override public void updateOperation(DeviceIdentifier deviceIdentifier, Operation operation) throws OperationManagementException { @@ -471,11 +476,21 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv return 0; } + @Override + public List getActivitiesUpdatedAfterByUser(long l, String s, int i, int i1) throws OperationManagementException { + return null; + } + @Override public int getActivityCountUpdatedAfter(long l) throws OperationManagementException { return 0; } + @Override + public int getActivityCountUpdatedAfterByUser(long l, String s) throws OperationManagementException { + return 0; + } + @Override public List getMonitoringOperationList(String s) { return null; diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java index 0129f6f0fc..1ca5cd950a 100644 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java @@ -412,6 +412,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv return null; } + @Override + public Operation getNextPendingOperation(DeviceIdentifier deviceIdentifier, long l) throws OperationManagementException { + return null; + } + @Override public void updateOperation(DeviceIdentifier deviceIdentifier, Operation operation) throws OperationManagementException { @@ -471,11 +476,21 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv return 0; } + @Override + public List getActivitiesUpdatedAfterByUser(long l, String s, int i, int i1) throws OperationManagementException { + return null; + } + @Override public int getActivityCountUpdatedAfter(long l) throws OperationManagementException { return 0; } + @Override + public int getActivityCountUpdatedAfterByUser(long l, String s) throws OperationManagementException { + return 0; + } + @Override public List getMonitoringOperationList(String s) { return null; diff --git a/pom.xml b/pom.xml index 1b22111d42..b7f93454e3 100644 --- a/pom.xml +++ b/pom.xml @@ -1230,7 +1230,7 @@ 1.1.1 - 3.1.34 + 3.1.45 [3.1.0, 4.0.0) From 896443620f89001434ddf55581f51902d50d6cd7 Mon Sep 17 00:00:00 2001 From: charitha Date: Mon, 22 Oct 2018 19:24:49 +0530 Subject: [PATCH 2/3] Fix twisted username and password fields in remote session --- .../authentication/oauth/OAuthTokenValidatorStubFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session/src/main/java/org/wso2/carbon/device/mgt/extensions/remote.session/authentication/oauth/OAuthTokenValidatorStubFactory.java b/components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session/src/main/java/org/wso2/carbon/device/mgt/extensions/remote.session/authentication/oauth/OAuthTokenValidatorStubFactory.java index 15723a2c89..93a49160b2 100644 --- a/components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session/src/main/java/org/wso2/carbon/device/mgt/extensions/remote.session/authentication/oauth/OAuthTokenValidatorStubFactory.java +++ b/components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session/src/main/java/org/wso2/carbon/device/mgt/extensions/remote.session/authentication/oauth/OAuthTokenValidatorStubFactory.java @@ -107,8 +107,8 @@ public class OAuthTokenValidatorStubFactory extends BasePoolableObjectFactory { auth.setPreemptiveAuthentication(true); String username = tokenValidationProperties.get(RemoteSessionConstants.USERNAME); String password = tokenValidationProperties.get(RemoteSessionConstants.PASSWORD); - auth.setPassword(username); - auth.setUsername(password); + auth.setUsername(username); + auth.setPassword(password); Options options = client.getOptions(); options.setProperty(HTTPConstants.AUTHENTICATE, auth); options.setProperty(HTTPConstants.REUSE_HTTP_CLIENT, Constants.VALUE_TRUE); From a4f43e578cf4d00b57b72ca303d4aef1101549ad Mon Sep 17 00:00:00 2001 From: charitha Date: Tue, 23 Oct 2018 11:55:19 +0530 Subject: [PATCH 3/3] Bump devicemgt version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f511246caa..d7327bc614 100644 --- a/pom.xml +++ b/pom.xml @@ -1230,7 +1230,7 @@ 1.1.1 - 3.1.45 + 3.1.47 [3.1.0, 4.0.0)