You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/11/06 10:48:02 UTC
stratos git commit: Fixes for STRATOS-1597
Repository: stratos
Updated Branches:
refs/heads/stratos-4.1.x 28a995e69 -> adc8576ad
Fixes for STRATOS-1597
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/adc8576a
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/adc8576a
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/adc8576a
Branch: refs/heads/stratos-4.1.x
Commit: adc8576adfff1ef2cd09d8058259dd59600de000
Parents: 28a995e
Author: gayangunarathne <ga...@wso2.com>
Authored: Fri Nov 6 14:55:40 2015 +0530
Committer: gayangunarathne <ga...@wso2.com>
Committed: Fri Nov 6 14:55:40 2015 +0530
----------------------------------------------------------------------
.../client/IdentityApplicationManagementServiceClient.java | 3 ++-
.../apache/stratos/autoscaler/client/OAuthAdminServiceClient.java | 2 +-
.../stratos/modules/distribution/src/main/conf/autoscaler.xml | 3 ++-
.../test-integration/src/test/resources/common/autoscaler.xml | 1 +
tools/stratos-installer/templates/autoscaler.xml | 1 +
5 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/adc8576a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/IdentityApplicationManagementServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/IdentityApplicationManagementServiceClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/IdentityApplicationManagementServiceClient.java
index a8fc2cd..badd1b9 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/IdentityApplicationManagementServiceClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/IdentityApplicationManagementServiceClient.java
@@ -72,7 +72,8 @@ public class IdentityApplicationManagementServiceClient {
stub = new IdentityApplicationManagementServiceStub(epr);
stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, autosclaerSocketTimeout);
stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT, autosclaerSocketTimeout);
- Utility.setAuthHeaders(stub._getServiceClient(), "admin");
+ String username = conf.getString("autoscaler.identity.adminUser", "admin");
+ Utility.setAuthHeaders(stub._getServiceClient(), username);
} catch (AxisFault axisFault) {
String msg = "Failed to initiate identity service client. " + axisFault.getMessage();
http://git-wip-us.apache.org/repos/asf/stratos/blob/adc8576a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/OAuthAdminServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/OAuthAdminServiceClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/OAuthAdminServiceClient.java
index 1fff70f..1a57ee3 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/OAuthAdminServiceClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/OAuthAdminServiceClient.java
@@ -61,7 +61,7 @@ public class OAuthAdminServiceClient {
//String username = CarbonContext.getThreadLocalCarbonContext().getUsername();
//TODO StratosAuthenticationHandler does not set to carbon context, thus user name becomes null.
// For the moment username is hardcoded since above is fixed.
- String username = "admin";
+ String username = conf.getString("autoscaler.identity.adminUser", "admin");
Utility.setAuthHeaders(stub._getServiceClient(), username);
} catch (AxisFault axisFault) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/adc8576a/products/stratos/modules/distribution/src/main/conf/autoscaler.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/autoscaler.xml b/products/stratos/modules/distribution/src/main/conf/autoscaler.xml
index 8c10e2e..4896187 100644
--- a/products/stratos/modules/distribution/src/main/conf/autoscaler.xml
+++ b/products/stratos/modules/distribution/src/main/conf/autoscaler.xml
@@ -31,10 +31,11 @@
<!-- SM client timeout in ms -->
<clientTimeout>300000</clientTimeout>
</stratosManager>
- <identity>
+ <identity>
<hostname>localhost</hostname>
<port>9443</port>
<clientTimeout>300000</clientTimeout>
+ <adminUser>admin</adminUser>
</identity>
<member>
<spinAfterTerminate>false</spinAfterTerminate>
http://git-wip-us.apache.org/repos/asf/stratos/blob/adc8576a/products/stratos/modules/integration/test-integration/src/test/resources/common/autoscaler.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/common/autoscaler.xml b/products/stratos/modules/integration/test-integration/src/test/resources/common/autoscaler.xml
index f4a40d1..7156110 100644
--- a/products/stratos/modules/integration/test-integration/src/test/resources/common/autoscaler.xml
+++ b/products/stratos/modules/integration/test-integration/src/test/resources/common/autoscaler.xml
@@ -35,6 +35,7 @@
<hostname>localhost</hostname>
<port>STRATOS_SECURE_DYNAMIC_PORT</port>
<clientTimeout>300000</clientTimeout>
+ <adminUser>admin</adminUser>
</identity>
<member>
<spinAfterTerminate>false</spinAfterTerminate>
http://git-wip-us.apache.org/repos/asf/stratos/blob/adc8576a/tools/stratos-installer/templates/autoscaler.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/templates/autoscaler.xml b/tools/stratos-installer/templates/autoscaler.xml
index fb3ab09..dcd99ea 100755
--- a/tools/stratos-installer/templates/autoscaler.xml
+++ b/tools/stratos-installer/templates/autoscaler.xml
@@ -35,6 +35,7 @@
<hostname>SM_HOSTNAME</hostname>
<port>SM_LISTEN_PORT</port>
<clientTimeout>300000</clientTimeout>
+ <adminUser>admin</adminUser>
</identity>
<member>
<!-- this is the maximum time(ms) a member can be in pending member state -->