commenting out some yet-to-support operations
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3cc377d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3cc377d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3cc377d2 Branch: refs/heads/master Commit: 3cc377d280db199ff12ff46847d51daadee827e0 Parents: d526824 Author: Isuru <[email protected]> Authored: Fri Dec 6 20:26:39 2013 +0530 Committer: Isuru <[email protected]> Committed: Fri Dec 6 20:26:39 2013 +0530 ---------------------------------------------------------------------- .../adc/mgt/client/AutoscalerServiceClient.java | 17 ++++++++--------- .../rest/endpoint/services/ServiceUtils.java | 18 ++++++++---------- .../rest/endpoint/services/StratosAdmin.java | 15 ++++++++++----- 3 files changed, 26 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3cc377d2/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java index 16ccb56..26b80a8 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java @@ -25,7 +25,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.adc.mgt.internal.DataHolder; import org.apache.stratos.autoscaler.stub.AutoScalerServiceStub; -import org.apache.stratos.cloud.controller.deployment.partition.Partition; import java.rmi.RemoteException; @@ -78,7 +77,7 @@ public class AutoscalerServiceClient { return partitions; }*/ - public org.apache.stratos.cloud.controller.deployment.partition.Partition getPartition (String partitionId) + /*public org.apache.stratos.cloud.controller.deployment.partition.Partition getPartition (String partitionId) throws Exception{ org.apache.stratos.cloud.controller.deployment.partition.Partition partition; @@ -92,9 +91,9 @@ public class AutoscalerServiceClient { } return partition; - } + }*/ - public org.apache.stratos.cloud.controller.deployment.partition.Partition [] getPartitions (String deploymentPolicyId, + /*public org.apache.stratos.cloud.controller.deployment.partition.Partition [] getPartitions (String deploymentPolicyId, String partitionGroupId) throws Exception{ @@ -125,7 +124,7 @@ public class AutoscalerServiceClient { } return partitionGroups; - } + }*/ public org.apache.stratos.autoscaler.policy.model.AutoscalePolicy[] getAutoScalePolicies () throws Exception { @@ -143,7 +142,7 @@ public class AutoscalerServiceClient { return autoscalePolicies; } - public org.apache.stratos.autoscaler.policy.model.AutoscalePolicy getAutoScalePolicy (String autoscalingPolicyId) + /*public org.apache.stratos.autoscaler.policy.model.AutoscalePolicy getAutoScalePolicy (String autoscalingPolicyId) throws Exception { org.apache.stratos.autoscaler.policy.model.AutoscalePolicy autoscalePolicy; @@ -157,7 +156,7 @@ public class AutoscalerServiceClient { } return autoscalePolicy; - } + }*/ public org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy [] getDeploymentPolicies() throws Exception { @@ -191,7 +190,7 @@ public class AutoscalerServiceClient { return deploymentPolicies; } - public org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy getDeploymentPolicy (String deploymentPolicyId) + /*public org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy getDeploymentPolicy (String deploymentPolicyId) throws Exception { org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy deploymentPolicy; @@ -205,5 +204,5 @@ public class AutoscalerServiceClient { } return deploymentPolicy; - } + }*/ } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3cc377d2/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 a7f8225..db14171 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 @@ -37,8 +37,6 @@ import org.apache.stratos.adc.mgt.utils.PersistenceManager; import org.apache.stratos.adc.topology.mgt.service.TopologyManagementService; import org.apache.stratos.cloud.controller.pojo.CartridgeConfig; import org.apache.stratos.cloud.controller.pojo.CartridgeInfo; -import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.Partition; -import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.PartitionGroup; import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.AutoscalePolicy; import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.deployment.DeploymentPolicy; import org.apache.stratos.rest.endpoint.bean.cartridge.definition.CartridgeDefinitionBean; @@ -102,13 +100,13 @@ public class ServiceUtils { return null; } - /*public static Partition[] getAvailablePartitions () throws RestAPIException { + /* public static Partition[] getAvailablePartitions () throws RestAPIException { org.apache.stratos.cloud.controller.deployment.partition.Partition[] partitions = null; AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { try { - partitions = autoscalerServiceClient.getAvailablePartitions(); + partitions = autoscalerServiceClient.getPa; } catch (Exception e) { String errorMsg = "Error getting available partitions"; @@ -120,7 +118,7 @@ public class ServiceUtils { return PojoConverter.populatePartitionPojos(partitions); }*/ - public static Partition[] getPartitions (String deploymentPolicyId, + /*public static Partition[] getPartitions (String deploymentPolicyId, String partitionGroupId) throws RestAPIException { org.apache.stratos.cloud.controller.deployment.partition.Partition[] partitions = null; @@ -155,7 +153,7 @@ public class ServiceUtils { } return PojoConverter.populatePartitionPojo(partition); - } + }*/ private static AutoscalerServiceClient getAutoscalerServiceClient () { @@ -187,7 +185,7 @@ public class ServiceUtils { return PojoConverter.populateAutoscalePojos(autoscalePolicies); } - public static AutoscalePolicy getAutoScalePolicy (String autoscalePolicyId) throws RestAPIException { + /*public static AutoscalePolicy getAutoScalePolicy (String autoscalePolicyId) throws RestAPIException { org.apache.stratos.autoscaler.policy.model.AutoscalePolicy autoscalePolicy = null; AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); @@ -203,7 +201,7 @@ public class ServiceUtils { } return PojoConverter.populateAutoscalePojo(autoscalePolicy); - } + }*/ public static DeploymentPolicy[] getDeploymentPolicies () throws RestAPIException { @@ -241,7 +239,7 @@ public class ServiceUtils { return PojoConverter.populateDeploymentPolicyPojos(deploymentPolicies); } - public static DeploymentPolicy getDeploymentPolicy(String deploymentPolicyId) throws RestAPIException { + /*public static DeploymentPolicy getDeploymentPolicy(String deploymentPolicyId) throws RestAPIException { org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy deploymentPolicy = null; AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); @@ -276,7 +274,7 @@ public class ServiceUtils { } return PojoConverter.populatePartitionGroupPojos(partitionGroups); - } + }*/ static List<Cartridge> getAvailableCartridges(String cartridgeSearchString, Boolean multiTenant, ConfigurationContext configurationContext) throws ADCException { List<Cartridge> cartridges = new ArrayList<Cartridge>(); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3cc377d2/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java index 7ed26e6..0752b7b 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java @@ -108,7 +108,8 @@ public class StratosAdmin extends AbstractAdmin { @AuthorizationAction("/permission/protected/manage/monitor/tenants") public Partition getPartition (@PathParam("partitionId") String partitionId) throws RestAPIException { - return ServiceUtils.getPartition(partitionId); + //return ServiceUtils.getPartition(partitionId); + return null; } @GET @@ -119,7 +120,8 @@ public class StratosAdmin extends AbstractAdmin { public PartitionGroup[] getPartitionGroups (@PathParam("deploymentPolicyId") String deploymentPolicyId) throws RestAPIException { - return ServiceUtils.getPartitionGroups(deploymentPolicyId); + //return ServiceUtils.getPartitionGroups(deploymentPolicyId); + return null; } @GET @@ -130,7 +132,8 @@ public class StratosAdmin extends AbstractAdmin { public Partition [] getPartitions (@PathParam("deploymentPolicyId") String deploymentPolicyId, @PathParam("partitionGroupId") String partitionGroupId) throws RestAPIException { - return ServiceUtils.getPartitions(deploymentPolicyId, partitionGroupId); + //return ServiceUtils.getPartitions(deploymentPolicyId, partitionGroupId); + return null; } @GET @@ -151,7 +154,8 @@ public class StratosAdmin extends AbstractAdmin { public AutoscalePolicy getAutoscalePolicies (@PathParam("autoscalePolicyId") String autoscalePolicyId) throws RestAPIException { - return ServiceUtils.getAutoScalePolicy(autoscalePolicyId); + //return ServiceUtils.getAutoScalePolicy(autoscalePolicyId); + return null; } @GET @@ -172,7 +176,8 @@ public class StratosAdmin extends AbstractAdmin { public DeploymentPolicy getDeploymentPolicies (@PathParam("deploymentPolicyId") String deploymentPolicyId) throws RestAPIException { - return ServiceUtils.getDeploymentPolicy(deploymentPolicyId); + //return ServiceUtils.getDeploymentPolicy(deploymentPolicyId); + return null; } @GET
