Repository: stratos Updated Branches: refs/heads/tenant-isolation-feature 4d7491f15 -> 71a5ec1c3
http://git-wip-us.apache.org/repos/asf/stratos/blob/8e5cba6f/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java index 321b095..050aa5a 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java @@ -19,6 +19,7 @@ package org.apache.stratos.manager.client; +import org.apache.axiom.om.impl.llom.util.AXIOMUtil; import org.apache.axis2.AxisFault; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.transport.http.HTTPConstants; @@ -31,11 +32,15 @@ import org.apache.stratos.autoscaler.stub.kubernetes.KubernetesHost; import org.apache.stratos.autoscaler.stub.kubernetes.KubernetesMaster; import org.apache.stratos.autoscaler.stub.policy.model.AutoscalePolicy; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.manager.internal.DataHolder; import org.apache.stratos.manager.utils.CartridgeConstants; +import org.wso2.carbon.context.CarbonContext; import java.rmi.RemoteException; +import javax.xml.stream.XMLStreamException; + public class AutoscalerServiceClient { private AutoScalerServiceStub stub; @@ -44,8 +49,6 @@ public class AutoscalerServiceClient { private static volatile AutoscalerServiceClient serviceClient; public AutoscalerServiceClient(String epr) throws AxisFault { - - String autosclaerSocketTimeout = System.getProperty(CartridgeConstants.AUTOSCALER_SOCKET_TIMEOUT) == null ? "300000" : System.getProperty(CartridgeConstants.AUTOSCALER_SOCKET_TIMEOUT); String autosclaerConnectionTimeout = @@ -64,7 +67,7 @@ public class AutoscalerServiceClient { } } - public static AutoscalerServiceClient getServiceClient() throws AxisFault { + private static AutoscalerServiceClient getServiceClient() throws AxisFault { if (serviceClient == null) { synchronized (AutoscalerServiceClient.class) { if (serviceClient == null) { @@ -74,6 +77,39 @@ public class AutoscalerServiceClient { } return serviceClient; } + + private void setMutualAuthHeader() { + String userName=CarbonContext.getThreadLocalCarbonContext().getUsername(); + String tenantDomain=CarbonContext.getThreadLocalCarbonContext().getTenantDomain(); + String fullUserName = userName+"@"+tenantDomain; + + String mutualAuthHeader = "<tns:UserName xmlns:tns=\""+ StratosConstants.MUTUAL_AUTH_URL+ "\">" + fullUserName + "</tns:UserName> "; + try { + // Need to remove headers since this is a stateless client and this is a new request + stub._getServiceClient().removeHeaders(); + stub._getServiceClient().addHeader(AXIOMUtil.stringToOM(mutualAuthHeader)); + } catch (XMLStreamException e) { + log.error("Failed to set mutualAuth Header to stub:" + stub, e); + } + } + + /** + * Gets the client with mutual auth header set. + * + * @return the client with mutual auth header set + * @throws AxisFault the axis fault + */ + public static AutoscalerServiceClient getClientWithMutualAuthHeaderSet() throws AxisFault{ + try { + AutoscalerServiceClient client = AutoscalerServiceClient.getServiceClient(); + // Set mutual auth header for communication between Autoscalar and Cloud controller + client.setMutualAuthHeader(); + return client; + + } catch (AxisFault axisFault) { + throw axisFault; + } + } public Partition[] getAvailablePartitions() throws RemoteException { http://git-wip-us.apache.org/repos/asf/stratos/blob/8e5cba6f/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java index 1cc2338..b3ac90f 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java @@ -19,6 +19,7 @@ package org.apache.stratos.manager.client; +import org.apache.axiom.om.impl.llom.util.AXIOMUtil; import org.apache.axis2.AxisFault; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.transport.http.HTTPConstants; @@ -34,8 +35,13 @@ import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidIaa import org.apache.stratos.cloud.controller.stub.CloudControllerServiceStub; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException; import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredClusterExceptionException; +import org.apache.stratos.common.constants.StratosConstants; +import org.wso2.carbon.context.CarbonContext; import java.rmi.RemoteException; + +import javax.xml.stream.XMLStreamException; + import java.util.Iterator; public class CloudControllerServiceClient { @@ -66,7 +72,7 @@ public class CloudControllerServiceClient { } - public static CloudControllerServiceClient getServiceClient() throws AxisFault { + private static CloudControllerServiceClient getServiceClient() throws AxisFault { if (serviceClient == null) { synchronized (CloudControllerServiceClient.class) { if (serviceClient == null) { @@ -78,6 +84,39 @@ public class CloudControllerServiceClient { return serviceClient; } + private void setMutualAuthHeader() { + String userName=CarbonContext.getThreadLocalCarbonContext().getUsername(); + String tenantDomain=CarbonContext.getThreadLocalCarbonContext().getTenantDomain(); + String fullUserName = userName+"@"+tenantDomain; + + String mutualAuthHeader = "<tns:UserName xmlns:tns=\""+ StratosConstants.MUTUAL_AUTH_URL+ "\">" + fullUserName + "</tns:UserName> "; + try { + // Need to remove headers since this is a stateless client and this is a new request + stub._getServiceClient().removeHeaders(); + stub._getServiceClient().addHeader(AXIOMUtil.stringToOM(mutualAuthHeader)); + } catch (XMLStreamException e) { + log.error("Failed to set mutualAuth Header to stub:" + stub, e); + } + } + + /** + * Gets the client with mutual auth header set. + * + * @return the client with mutual auth header set + * @throws AxisFault the axis fault + */ + public static CloudControllerServiceClient getClientWithMutualAuthHeaderSet() throws AxisFault{ + try { + CloudControllerServiceClient client = CloudControllerServiceClient.getServiceClient(); + // Set mutual auth header for communication between StratosManager and Autoscalar + client.setMutualAuthHeader(); + return client; + + } catch (AxisFault axisFault) { + throw axisFault; + } + } + public void deployCartridgeDefinition (CartridgeConfig cartridgeConfig) throws RemoteException, CloudControllerServiceInvalidCartridgeDefinitionExceptionException, CloudControllerServiceInvalidIaasProviderExceptionException { http://git-wip-us.apache.org/repos/asf/stratos/blob/8e5cba6f/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/DefaultCartridgeDeployer.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/DefaultCartridgeDeployer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/DefaultCartridgeDeployer.java index 1865c19..477a265 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/DefaultCartridgeDeployer.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/DefaultCartridgeDeployer.java @@ -42,7 +42,7 @@ public class DefaultCartridgeDeployer extends CartridgeDeployer{ @Override protected void deployCartridge(CartridgeConfig cartridgeConfig) throws ADCException { try { - CloudControllerServiceClient cloudControllerServiceClient = CloudControllerServiceClient.getServiceClient(); + CloudControllerServiceClient cloudControllerServiceClient = CloudControllerServiceClient.getClientWithMutualAuthHeaderSet(); cloudControllerServiceClient.deployCartridgeDefinition(cartridgeConfig); } catch (Exception e) { String msg = "Exception in deploying the cartridge. "; http://git-wip-us.apache.org/repos/asf/stratos/blob/8e5cba6f/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java index c5921b6..6f55bd3 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java @@ -72,7 +72,7 @@ public class ServiceDeploymentManager { //get deployed Cartridge Definition information CartridgeInfo cartridgeInfo; try { - cartridgeInfo = CloudControllerServiceClient.getServiceClient().getCartridgeInfo(type); + cartridgeInfo = CloudControllerServiceClient.getClientWithMutualAuthHeaderSet().getCartridgeInfo(type); } catch (CloudControllerServiceUnregisteredCartridgeExceptionException e) { String message = type + " is not a valid cartridgeSubscription type. Please try again with a valid cartridgeSubscription type."; @@ -142,7 +142,7 @@ public class ServiceDeploymentManager { // for (String clusterId : clusterIds) { // // try { -// AutoscalerServiceClient.getServiceClient().checkLBExistenceAgainstPolicy(clusterId, +// AutoscalerServiceClient.getClientWithMutualAuthHeaderSet().checkLBExistenceAgainstPolicy(clusterId, // deploymentPolicyName); // } catch (Exception ex) { // // we don't need to throw the error here. @@ -163,7 +163,7 @@ public class ServiceDeploymentManager { // String lbCartridgeType = lbConfig.getType(); // try { // // retrieve lb Cartridge info -// lbCartridgeInfo = CloudControllerServiceClient.getServiceClient().getCartridgeInfo(lbCartridgeType); +// lbCartridgeInfo = CloudControllerServiceClient.getClientWithMutualAuthHeaderSet().getCartridgeInfo(lbCartridgeType); // } catch (Exception e) { // String msg = "Cannot get cartridge info: " + type; // log.error(msg, e); @@ -179,13 +179,13 @@ public class ServiceDeploymentManager { // try { // // get the valid policies for lb cartridge // DeploymentPolicy[] lbCartridgeDepPolicies = -// AutoscalerServiceClient.getServiceClient().getDeploymentPolicies(lbCartridgeType); +// AutoscalerServiceClient.getClientWithMutualAuthHeaderSet().getDeploymentPolicies(lbCartridgeType); // // traverse deployment policies of lb cartridge // for (DeploymentPolicy policy : lbCartridgeDepPolicies) { // // check existence of the subscribed policy // if (deploymentPolicyName.equals(policy.getId())) { // -// if (!AutoscalerServiceClient.getServiceClient().checkDefaultLBExistenceAgainstPolicy(deploymentPolicyName)) { +// if (!AutoscalerServiceClient.getClientWithMutualAuthHeaderSet().checkDefaultLBExistenceAgainstPolicy(deploymentPolicyName)) { // // // if lb cluster doesn't exist // lbService = new LBService(lbCartridgeType, @@ -229,7 +229,7 @@ public class ServiceDeploymentManager { // String lbCartridgeType = lbConfig.getType(); // try { // // retrieve lb Cartridge info -// lbCartridgeInfo = CloudControllerServiceClient.getServiceClient().getCartridgeInfo(lbCartridgeType); +// lbCartridgeInfo = CloudControllerServiceClient.getClientWithMutualAuthHeaderSet().getCartridgeInfo(lbCartridgeType); // } catch (Exception e) { // String msg = "Cannot get cartridge info: " + type; // log.error(msg, e); @@ -251,14 +251,14 @@ public class ServiceDeploymentManager { // // // get the valid policies for lb cartridge // DeploymentPolicy[] lbCartridgeDepPolicies = -// AutoscalerServiceClient.getServiceClient().getDeploymentPolicies(lbCartridgeType); +// AutoscalerServiceClient.getClientWithMutualAuthHeaderSet().getDeploymentPolicies(lbCartridgeType); // // traverse deployment policies of lb cartridge // for (DeploymentPolicy policy : lbCartridgeDepPolicies) { // // // check existence of the subscribed policy // if (deploymentPolicyName.equals(policy.getId())) { // -// if (!AutoscalerServiceClient.getServiceClient().checkServiceLBExistenceAgainstPolicy(type, +// if (!AutoscalerServiceClient.getClientWithMutualAuthHeaderSet().checkServiceLBExistenceAgainstPolicy(type, // deploymentPolicyName)) { // // lbCartridgeInfo.addProperties(property); http://git-wip-us.apache.org/repos/asf/stratos/blob/8e5cba6f/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java index 982535a..7cd39e2 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java @@ -56,7 +56,7 @@ public class DefaultLBService extends LBService { // call the relevant method to get the cluster id, using deployment policy String clusterId = null; try { - clusterId = AutoscalerServiceClient.getServiceClient().getDefaultLBClusterId(getDeploymentPolicyName()); + clusterId = AutoscalerServiceClient.getClientWithMutualAuthHeaderSet().getDefaultLBClusterId(getDeploymentPolicyName()); } catch (Exception e) { log.error("Error occurred in retrieving default LB cluster id" + e.getMessage()); throw new ADCException(e); @@ -73,7 +73,7 @@ public class DefaultLBService extends LBService { //get the hostname for this cluster and set it ClusterContext clusterContext; try { - clusterContext = CloudControllerServiceClient.getServiceClient().getClusterContext(clusterId); + clusterContext = CloudControllerServiceClient.getClientWithMutualAuthHeaderSet().getClusterContext(clusterId); } catch (RemoteException e) { log.error("Error occurred in retrieving Cluster Context for default LB ", e); http://git-wip-us.apache.org/repos/asf/stratos/blob/8e5cba6f/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java index 4f4cae7..2894c45 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java @@ -60,7 +60,7 @@ public class ServiceAwareLBService extends LBService { String clusterId = null; try { - clusterId = AutoscalerServiceClient.getServiceClient().getServiceLBClusterId(getLoadBalancedServiceType(), getDeploymentPolicyName()); + clusterId = AutoscalerServiceClient.getClientWithMutualAuthHeaderSet().getServiceLBClusterId(getLoadBalancedServiceType(), getDeploymentPolicyName()); } catch (Exception e) { log.error("Error occurred in retrieving Service LB cluster id" + e.getMessage()); @@ -79,7 +79,7 @@ public class ServiceAwareLBService extends LBService { //get the hostname for this cluster and set it ClusterContext clusterContext; try { - clusterContext = CloudControllerServiceClient.getServiceClient().getClusterContext(clusterId); + clusterContext = CloudControllerServiceClient.getClientWithMutualAuthHeaderSet().getClusterContext(clusterId); } catch (RemoteException e) { log.error("Error occurred in retrieving Cluster Context for Service LB ", e); http://git-wip-us.apache.org/repos/asf/stratos/blob/8e5cba6f/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/DefaultLoadBalancerCategory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/DefaultLoadBalancerCategory.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/DefaultLoadBalancerCategory.java index 75f6856..c84cc08 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/DefaultLoadBalancerCategory.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/DefaultLoadBalancerCategory.java @@ -51,7 +51,7 @@ public class DefaultLoadBalancerCategory extends LoadBalancerCategory { // call the relevant method to get the cluster id, using deployment policy String clusterId = null; try { - clusterId = AutoscalerServiceClient.getServiceClient().getDefaultLBClusterId(getDeploymentPolicyName()); + clusterId = AutoscalerServiceClient.getClientWithMutualAuthHeaderSet().getDefaultLBClusterId(getDeploymentPolicyName()); } catch (Exception e) { log.error("Error occurred in retrieving default LB cluster id" + e.getMessage()); throw new ADCException(e); @@ -68,7 +68,7 @@ public class DefaultLoadBalancerCategory extends LoadBalancerCategory { //get the hostname for this cluster and set it ClusterContext clusterContext; try { - clusterContext = CloudControllerServiceClient.getServiceClient().getClusterContext(clusterId); + clusterContext = CloudControllerServiceClient.getClientWithMutualAuthHeaderSet().getClusterContext(clusterId); } catch (RemoteException e) { log.error("Error occurred in retrieving Cluster Context for default LB ", e); http://git-wip-us.apache.org/repos/asf/stratos/blob/8e5cba6f/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ServiceLevelLoadBalancerCategory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ServiceLevelLoadBalancerCategory.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ServiceLevelLoadBalancerCategory.java index b69ef6a..83fdc82 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ServiceLevelLoadBalancerCategory.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ServiceLevelLoadBalancerCategory.java @@ -52,7 +52,7 @@ public class ServiceLevelLoadBalancerCategory extends LoadBalancerCategory { String clusterId = null; try { - clusterId = AutoscalerServiceClient.getServiceClient().getServiceLBClusterId(getLoadBalancedServiceType(), getDeploymentPolicyName()); + clusterId = AutoscalerServiceClient.getClientWithMutualAuthHeaderSet().getServiceLBClusterId(getLoadBalancedServiceType(), getDeploymentPolicyName()); } catch (Exception e) { log.error("Error occurred in retrieving Service LB cluster id" + e.getMessage()); @@ -71,7 +71,7 @@ public class ServiceLevelLoadBalancerCategory extends LoadBalancerCategory { //get the hostname for this cluster and set it ClusterContext clusterContext; try { - clusterContext = CloudControllerServiceClient.getServiceClient().getClusterContext(clusterId); + clusterContext = CloudControllerServiceClient.getClientWithMutualAuthHeaderSet().getClusterContext(clusterId); } catch (RemoteException e) { log.error("Error occurred in retrieving Cluster Context for Service LB ", e); http://git-wip-us.apache.org/repos/asf/stratos/blob/8e5cba6f/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java index 539c983..6e42cfe 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java @@ -83,7 +83,7 @@ public class CartridgeSubscriptionManager { CartridgeInfo cartridgeInfo; try { - cartridgeInfo = CloudControllerServiceClient.getServiceClient().getCartridgeInfo(subscriptionData.getCartridgeType()); + cartridgeInfo = CloudControllerServiceClient.getClientWithMutualAuthHeaderSet().getCartridgeInfo(subscriptionData.getCartridgeType()); } catch (CloudControllerServiceUnregisteredCartridgeExceptionException e) { String message = subscriptionData.getCartridgeType() + " is not a valid cartridgeSubscription type. Please try again with a valid cartridgeSubscription type."; http://git-wip-us.apache.org/repos/asf/stratos/blob/8e5cba6f/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java index 6a45995..f880d81 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java @@ -297,7 +297,7 @@ public class CartridgeSubscriptionUtils { for (String clusterId : clusterIds) { try { - AutoscalerServiceClient.getServiceClient().checkLBExistenceAgainstPolicy(clusterId, deploymentPolicyName); + AutoscalerServiceClient.getClientWithMutualAuthHeaderSet().checkLBExistenceAgainstPolicy(clusterId, deploymentPolicyName); } catch (Exception ex) { // we don't need to throw the error here. log.error(ex.getMessage(), ex); @@ -319,7 +319,7 @@ public class CartridgeSubscriptionUtils { CartridgeInfo lbCartridgeInfo; try { - lbCartridgeInfo = CloudControllerServiceClient.getServiceClient().getCartridgeInfo(lbCartridgeType); + lbCartridgeInfo = CloudControllerServiceClient.getClientWithMutualAuthHeaderSet().getCartridgeInfo(lbCartridgeType); } catch (Exception e) { String message = "Error getting info for " + lbCartridgeType; @@ -396,7 +396,7 @@ public class CartridgeSubscriptionUtils { CartridgeInfo lbCartridgeInfo; try { - lbCartridgeInfo = CloudControllerServiceClient.getServiceClient().getCartridgeInfo(lbCartridgeType); + lbCartridgeInfo = CloudControllerServiceClient.getClientWithMutualAuthHeaderSet().getCartridgeInfo(lbCartridgeType); } catch (Exception e) { String message = "Error getting info for " + lbCartridgeType; @@ -475,7 +475,7 @@ public class CartridgeSubscriptionUtils { private static AutoscalerServiceClient getAutoscalerServiceClient() throws ADCException { try { - return AutoscalerServiceClient.getServiceClient(); + return AutoscalerServiceClient.getClientWithMutualAuthHeaderSet(); } catch (AxisFault axisFault) { String errorMsg = "Error in getting AutoscalerServiceClient instance"; http://git-wip-us.apache.org/repos/asf/stratos/blob/8e5cba6f/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java index 7282253..b9b9b76 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java @@ -254,7 +254,7 @@ public class ApplicationManagementUtil { throws ADCException, UnregisteredCartridgeException { log.info("Register service.."); try { - CloudControllerServiceClient.getServiceClient().register(domain, cartridgeType, payload.toString(), tenantRange, + CloudControllerServiceClient.getClientWithMutualAuthHeaderSet().register(domain, cartridgeType, payload.toString(), tenantRange, hostName, properties, autoscalingPoliyName, deploymentPolicyName, persistence ); } catch (CloudControllerServiceUnregisteredCartridgeExceptionException e) { String msg = "Exception is occurred in register service operation. Reason :" + e.getMessage(); http://git-wip-us.apache.org/repos/asf/stratos/blob/8e5cba6f/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java index ef1157b..b80e3fd 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java @@ -230,7 +230,7 @@ public class ServiceUtils { private static CloudControllerServiceClient getCloudControllerServiceClient() throws RestAPIException { try { - return CloudControllerServiceClient.getServiceClient(); + return CloudControllerServiceClient.getClientWithMutualAuthHeaderSet(); } catch (AxisFault axisFault) { String errorMsg = "Error while getting CloudControllerServiceClient instance to connect to the " @@ -321,7 +321,7 @@ public class ServiceUtils { private static AutoscalerServiceClient getAutoscalerServiceClient() throws RestAPIException { try { - return AutoscalerServiceClient.getServiceClient(); + return AutoscalerServiceClient.getClientWithMutualAuthHeaderSet(); } catch (AxisFault axisFault) { String errorMsg = "Error while getting AutoscalerServiceClient instance to connect to the " @@ -503,13 +503,13 @@ public class ServiceUtils { try { Pattern searchPattern = getSearchStringPattern(cartridgeSearchString); - String[] availableCartridges = CloudControllerServiceClient.getServiceClient().getRegisteredCartridges(); + String[] availableCartridges = getCloudControllerServiceClient().getRegisteredCartridges(); if (availableCartridges != null) { for (String cartridgeType : availableCartridges) { CartridgeInfo cartridgeInfo = null; try { - cartridgeInfo = CloudControllerServiceClient.getServiceClient().getCartridgeInfo(cartridgeType); + cartridgeInfo = getCloudControllerServiceClient().getCartridgeInfo(cartridgeType); } catch (Exception e) { if (log.isWarnEnabled()) { log.warn("Error when calling getCartridgeInfo for " + cartridgeType + ", Error: " http://git-wip-us.apache.org/repos/asf/stratos/blob/8e5cba6f/products/stratos/modules/distribution/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/assembly/bin.xml b/products/stratos/modules/distribution/src/assembly/bin.xml index e244ea4..2249469 100755 --- a/products/stratos/modules/distribution/src/assembly/bin.xml +++ b/products/stratos/modules/distribution/src/assembly/bin.xml @@ -84,6 +84,14 @@ <exclude>**/jboss-transaction-api_1.1_spec-1.0.0.Final.jar</exclude> </excludes> </fileSet> + + <fileSet> + <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat</directory> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory> + <excludes> + <exclude>**/catalina-server.xml</exclude> + </excludes> + </fileSet> <fileSet> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps</directory> @@ -749,6 +757,12 @@ <filtered>true</filtered> <fileMode>644</fileMode> </file> + <file> + <source>../../conf/tomcat/catalina-server.xml</source> + <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory> + <filtered>true</filtered> + <fileMode>644</fileMode> + </file> <file> <source>${project.basedir}/README.txt</source> <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory> http://git-wip-us.apache.org/repos/asf/stratos/blob/8e5cba6f/products/stratos/modules/distribution/src/bin/stratos.bat ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/bin/stratos.bat b/products/stratos/modules/distribution/src/bin/stratos.bat index 05a8e87..5445198 100644 --- a/products/stratos/modules/distribution/src/bin/stratos.bat +++ b/products/stratos/modules/distribution/src/bin/stratos.bat @@ -155,7 +155,7 @@ set CARBON_CLASSPATH=.\lib;%CARBON_CLASSPATH% set JAVA_ENDORSED=".\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed" -set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof" -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dcatalina.base="%CARBON_HOME%\lib\tomcat" -Dwso2.carbon.xml=%CARBON_HOME%\repository\conf\carbon.xml -Dwso2.registry.xml="%CARBON_HOME%\repository\conf\registry.xml" -Dwso2.user.mgt.xml="%CARBON_HOME%\repository\conf\user-mgt.xml" -Dwso2.transports.xml="%CARBON_HOME%\repository\conf\mgt-transports.xml" -Djava.util.logging.config.file="%CARBON_HOME%\repository\conf\log4j.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\repository\ conf" -Djndi.properties.dir="%CARBON_HOME%/repository/conf" -Dcarbon.logs.path="%CARBON_HOME%\repository\logs" -Dcomponents.repo="%CARBON_HOME%\repository\components" -Dconf.location="%CARBON_HOME%\repository\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path="true" -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -Dloadbalancer.conf="%CARBON_HOME%\repository\conf\loadbalancer.conf" +set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof" -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dcatalina.base="%CARBON_HOME%\lib\tomcat" -Dwso2.carbon.xml=%CARBON_HOME%\repository\conf\carbon.xml -Dwso2.registry.xml="%CARBON_HOME%\repository\conf\registry.xml" -Dwso2.user.mgt.xml="%CARBON_HOME%\repository\conf\user-mgt.xml" -Dwso2.transports.xml="%CARBON_HOME%\repository\conf\mgt-transports.xml" -Djava.util.logging.config.file="%CARBON_HOME%\repository\conf\log4j.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\repository\ conf" -Djndi.properties.dir="%CARBON_HOME%/repository/conf" -Dcarbon.logs.path="%CARBON_HOME%\repository\logs" -Dcomponents.repo="%CARBON_HOME%\repository\components" -Dconf.location="%CARBON_HOME%\repository\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path="true" -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -Dloadbalancer.conf="%CARBON_HOME%\repository\conf\loadbalancer.conf" -Djavax.net.ssl.keyStore="%CARBON_HOME%\repository\resources\security\wso2carbon.jks" -Djavax.net.ssl.keyStorePassword="wso2carbon" :runJava echo JAVA_HOME environment variable is set to %JAVA_HOME% http://git-wip-us.apache.org/repos/asf/stratos/blob/8e5cba6f/products/stratos/modules/distribution/src/bin/stratos.sh ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/bin/stratos.sh b/products/stratos/modules/distribution/src/bin/stratos.sh index 644b8a6..731d6b4 100755 --- a/products/stratos/modules/distribution/src/bin/stratos.sh +++ b/products/stratos/modules/distribution/src/bin/stratos.sh @@ -299,6 +299,8 @@ do -Djava.security.egd=file:/dev/./urandom \ -Dfile.encoding=UTF8 \ -Ddisable.cassandra.server.startup=true \ + -Djavax.net.ssl.keyStore="$CARBON_HOME/repository/resources/security/wso2carbon.jks" \ + -Djavax.net.ssl.keyStorePassword="wso2carbon" \ -Djndi.properties.dir="$CARBON_HOME/repository/conf" \ org.wso2.carbon.bootstrap.Bootstrap $* status=$?
