You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/03/01 09:17:35 UTC
[11/13] git commit: fixing service implementations for
https://issues.apache.org/jira/browse/STRATOS-486
fixing service implementations for https://issues.apache.org/jira/browse/STRATOS-486
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ffe1bc63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ffe1bc63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ffe1bc63
Branch: refs/heads/master
Commit: ffe1bc63c570ba04ffd8df290f2d4f9bb1de7822
Parents: 127329d
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sat Mar 1 13:42:42 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sat Mar 1 13:42:42 2014 +0530
----------------------------------------------------------------------
.../manager/client/AutoscalerServiceClient.java | 268 ++++++-------------
.../client/CloudControllerServiceClient.java | 61 ++---
.../service/ServiceDeploymentManager.java | 5 +-
.../UnregisteredCartridgeException.java | 6 +
.../manager/CartridgeSubscriptionManager.java | 7 +-
5 files changed, 115 insertions(+), 232 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe1bc63/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 a43f39c..beb04fe 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
@@ -29,6 +29,8 @@ import org.apache.stratos.manager.internal.DataHolder;
import org.apache.stratos.manager.utils.CartridgeConstants;
import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy;
import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy;
+import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPartitionExceptionException;
+import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPolicyExceptionException;
import org.apache.stratos.autoscaler.stub.AutoScalerServiceNonExistingLBExceptionException;
import org.apache.stratos.autoscaler.stub.AutoScalerServiceStub;
import org.apache.stratos.cloud.controller.deployment.partition.Partition;
@@ -75,246 +77,130 @@ public class AutoscalerServiceClient {
return serviceClient;
}
- public org.apache.stratos.cloud.controller.deployment.partition.Partition[] getAvailablePartitions ()
- throws Exception {
+ public org.apache.stratos.cloud.controller.deployment.partition.Partition[] getAvailablePartitions () throws RemoteException {
- org.apache.stratos.cloud.controller.deployment.partition.Partition[] partitions;
- try {
- partitions = stub.getAllAvailablePartitions();
-
- } catch (AxisFault e) {
- String errorMsg = e.getMessage();
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available partitions";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
+ org.apache.stratos.cloud.controller.deployment.partition.Partition[] partitions;
+ partitions = stub.getAllAvailablePartitions();
- return partitions;
- }
+ return partitions;
+ }
- public org.apache.stratos.cloud.controller.deployment.partition.Partition getPartition (String partitionId)
- throws Exception{
+ public org.apache.stratos.cloud.controller.deployment.partition.Partition getPartition(
+ String partitionId) throws RemoteException {
- org.apache.stratos.cloud.controller.deployment.partition.Partition partition;
- try {
- partition = stub.getPartition(partitionId);
+ org.apache.stratos.cloud.controller.deployment.partition.Partition partition;
+ partition = stub.getPartition(partitionId);
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available partitions";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
+ return partition;
+ }
- return partition;
- }
+ public org.apache.stratos.cloud.controller.deployment.partition.Partition[] getPartitionsOfGroup(
+ String deploymentPolicyId, String partitionGroupId)
+ throws RemoteException {
- public org.apache.stratos.cloud.controller.deployment.partition.Partition [] getPartitionsOfGroup (String deploymentPolicyId,
- String partitionGroupId)
- throws Exception{
+ org.apache.stratos.cloud.controller.deployment.partition.Partition[] partitions;
+ partitions = stub.getPartitionsOfGroup(deploymentPolicyId,
+ partitionGroupId);
- org.apache.stratos.cloud.controller.deployment.partition.Partition[] partitions;
- try {
- partitions = stub.getPartitionsOfGroup(deploymentPolicyId, partitionGroupId);
-
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available partitions";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
-
- return partitions;
- }
+ return partitions;
+ }
public org.apache.stratos.cloud.controller.deployment.partition.Partition[]
- getPartitionsOfDeploymentPolicy(String deploymentPolicyId) throws Exception {
+ getPartitionsOfDeploymentPolicy(
+ String deploymentPolicyId) throws RemoteException {
- org.apache.stratos.cloud.controller.deployment.partition.Partition[] partitions;
- try {
- partitions = stub.getPartitionsOfDeploymentPolicy(deploymentPolicyId);
+ org.apache.stratos.cloud.controller.deployment.partition.Partition[] partitions;
+ partitions = stub.getPartitionsOfDeploymentPolicy(deploymentPolicyId);
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available partitions";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
+ return partitions;
+ }
- return partitions;
- }
+ public org.apache.stratos.autoscaler.partition.PartitionGroup[] getPartitionGroups(
+ String deploymentPolicyId) throws RemoteException {
- public org.apache.stratos.autoscaler.partition.PartitionGroup [] getPartitionGroups (String deploymentPolicyId)
- throws Exception{
+ org.apache.stratos.autoscaler.partition.PartitionGroup[] partitionGroups;
+ partitionGroups = stub.getPartitionGroups(deploymentPolicyId);
- org.apache.stratos.autoscaler.partition.PartitionGroup [] partitionGroups;
- try {
- partitionGroups = stub.getPartitionGroups(deploymentPolicyId);
+ return partitionGroups;
+ }
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available partitions";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
+ public org.apache.stratos.autoscaler.policy.model.AutoscalePolicy[] getAutoScalePolicies()
+ throws RemoteException {
- return partitionGroups;
- }
+ org.apache.stratos.autoscaler.policy.model.AutoscalePolicy[] autoscalePolicies;
+ autoscalePolicies = stub.getAllAutoScalingPolicy();
- public org.apache.stratos.autoscaler.policy.model.AutoscalePolicy[] getAutoScalePolicies ()
- throws Exception {
+ return autoscalePolicies;
+ }
- org.apache.stratos.autoscaler.policy.model.AutoscalePolicy[] autoscalePolicies;
- try {
- autoscalePolicies = stub.getAllAutoScalingPolicy();
-
- } catch (AxisFault e) {
- String errorMsg = e.getMessage();
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available partitions";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
+ public org.apache.stratos.autoscaler.policy.model.AutoscalePolicy getAutoScalePolicy(
+ String autoscalingPolicyId) throws RemoteException {
- return autoscalePolicies;
- }
+ org.apache.stratos.autoscaler.policy.model.AutoscalePolicy autoscalePolicy;
+ autoscalePolicy = stub.getAutoscalingPolicy(autoscalingPolicyId);
- public org.apache.stratos.autoscaler.policy.model.AutoscalePolicy getAutoScalePolicy (String autoscalingPolicyId)
- throws Exception {
+ return autoscalePolicy;
+ }
- org.apache.stratos.autoscaler.policy.model.AutoscalePolicy autoscalePolicy;
- try {
- autoscalePolicy = stub.getAutoscalingPolicy(autoscalingPolicyId);
+ public org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy[] getDeploymentPolicies()
+ throws RemoteException {
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available partitions";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
+ org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy[] deploymentPolicies;
+ deploymentPolicies = stub.getAllDeploymentPolicies();
- return autoscalePolicy;
- }
+ return deploymentPolicies;
+ }
- public org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy [] getDeploymentPolicies()
- throws Exception {
+ public org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy[] getDeploymentPolicies(
+ String cartridgeType) throws RemoteException {
- org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy[] deploymentPolicies;
- try {
- deploymentPolicies = stub.getAllDeploymentPolicies();
-
- } catch (AxisFault e) {
- String errorMsg = e.getMessage();
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available deployment policies";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
+ org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy[] deploymentPolicies;
+ deploymentPolicies = stub
+ .getValidDeploymentPoliciesforCartridge(cartridgeType);
- return deploymentPolicies;
- }
-
- public org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy [] getDeploymentPolicies(String cartridgeType)
- throws Exception {
-
- org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy[] deploymentPolicies;
- try {
- deploymentPolicies = stub.getValidDeploymentPoliciesforCartridge(cartridgeType);
-
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available deployment policies";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
-
- return deploymentPolicies;
- }
+ return deploymentPolicies;
+ }
- public void checkLBExistenceAgainstPolicy(String clusterId, String deploymentPolicyId) throws ADCException {
- try {
+ public void checkLBExistenceAgainstPolicy(String clusterId, String deploymentPolicyId) throws RemoteException,
+ AutoScalerServiceNonExistingLBExceptionException {
stub.checkLBExistenceAgainstPolicy(clusterId, deploymentPolicyId);
- } catch (RemoteException e) {
- String errorMsg = "Error connecting to Auto-scaler Service.";
- log.error(errorMsg, e);
- throw new ADCException(errorMsg, e);
- } catch (AutoScalerServiceNonExistingLBExceptionException e) {
- String errorMsg = "LB Cluster doesn't exist. Cluster id: "+clusterId;
- log.error(errorMsg, e);
- throw new ADCException(errorMsg, e);
- }
- }
-
- public boolean checkDefaultLBExistenceAgainstPolicy(String deploymentPolicyId) throws ADCException {
- try {
- return stub.checkDefaultLBExistenceAgainstPolicy(deploymentPolicyId);
- } catch (RemoteException e) {
- String errorMsg = "Error connecting to Auto-scaler Service.";
- log.error(errorMsg, e);
- throw new ADCException(errorMsg, e);
- }
}
- public boolean checkServiceLBExistenceAgainstPolicy(String serviceName, String deploymentPolicyId) throws ADCException {
- try {
+ public boolean checkDefaultLBExistenceAgainstPolicy(
+ String deploymentPolicyId) throws RemoteException {
+ return stub.checkDefaultLBExistenceAgainstPolicy(deploymentPolicyId);
+ }
+
+ public boolean checkServiceLBExistenceAgainstPolicy(String serviceName, String deploymentPolicyId) throws RemoteException {
return stub.checkServiceLBExistenceAgainstPolicy(serviceName, deploymentPolicyId);
- } catch (RemoteException e) {
- String errorMsg = "Error connecting to Auto-scaler Service.";
- log.error(errorMsg, e);
- throw new ADCException(errorMsg, e);
- }
}
- public org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy getDeploymentPolicy (String deploymentPolicyId)
- throws Exception {
-
- org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy deploymentPolicy;
- try {
- deploymentPolicy = stub.getDeploymentPolicy(deploymentPolicyId);
+ public org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy getDeploymentPolicy (String deploymentPolicyId) throws RemoteException {
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available deployment policies";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
+ org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy deploymentPolicy;
+ deploymentPolicy = stub.getDeploymentPolicy(deploymentPolicyId);
- return deploymentPolicy;
- }
+ return deploymentPolicy;
+ }
- public boolean deployDeploymentPolicy (DeploymentPolicy deploymentPolicy) throws Exception {
+ public boolean deployDeploymentPolicy (DeploymentPolicy deploymentPolicy) throws RemoteException,
+ AutoScalerServiceInvalidPolicyExceptionException {
- try {
return stub.addDeploymentPolicy(deploymentPolicy);
- } catch (RemoteException e) {
- String errorMsg = "Error in deploying new deployment policy definition";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
}
- public boolean deployAutoscalingPolicy (AutoscalePolicy autoScalePolicy) throws Exception {
+ public boolean deployAutoscalingPolicy (AutoscalePolicy autoScalePolicy) throws RemoteException,
+ AutoScalerServiceInvalidPolicyExceptionException {
- try {
return stub.addAutoScalingPolicy(autoScalePolicy);
- } catch (RemoteException e) {
- String errorMsg = "Error in deploying new autoscaling policy definition";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
}
- public boolean deployPartition (Partition partition) throws Exception {
+ public boolean deployPartition (Partition partition) throws RemoteException,
+ AutoScalerServiceInvalidPartitionExceptionException {
- try {
return stub.addPartition(partition);
- } catch (RemoteException e) {
- String errorMsg = "Error in deploying new partition definition";
- log.error(errorMsg, e);
- throw new Exception(e.getMessage(), e);
- }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe1bc63/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 1344d35..9167f6f 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
@@ -25,12 +25,16 @@ import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.pojo.*;
-import org.apache.stratos.manager.exception.UnregisteredCartridgeException;
import org.apache.stratos.manager.internal.DataHolder;
import org.apache.stratos.manager.utils.CartridgeConstants;
import org.apache.stratos.cloud.controller.stub.CloudControllerServiceIllegalArgumentExceptionException;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeDefinitionExceptionException;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeTypeExceptionException;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidClusterExceptionException;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidIaasProviderExceptionException;
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 java.rmi.RemoteException;
import java.util.Iterator;
@@ -75,38 +79,26 @@ public class CloudControllerServiceClient {
return serviceClient;
}
- public void deployCartridgeDefinition (CartridgeConfig cartridgeConfig)
- throws Exception {
+ public void deployCartridgeDefinition (CartridgeConfig cartridgeConfig)
+ throws RemoteException, CloudControllerServiceInvalidCartridgeDefinitionExceptionException,
+ CloudControllerServiceInvalidIaasProviderExceptionException, CloudControllerServiceIllegalArgumentExceptionException {
- try {
- stub.deployCartridgeDefinition(cartridgeConfig);
+ stub.deployCartridgeDefinition(cartridgeConfig);
- } catch (RemoteException e) {
- String errorMsg = "Error in deploying cartridge definition";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
- }
+ }
- public void unDeployCartridgeDefinition (String cartridgeType)
- throws Exception {
+ public void unDeployCartridgeDefinition (String cartridgeType) throws RemoteException, CloudControllerServiceInvalidCartridgeTypeExceptionException{
- try {
- stub.undeployCartridgeDefinition(cartridgeType);
+ stub.undeployCartridgeDefinition(cartridgeType);
- } catch (RemoteException e) {
- String errorMsg = "Error in deploying cartridge definition";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
- }
+ }
public boolean register(String clusterId, String cartridgeType,
String payload, String tenantRange,
String hostName, Properties properties,
- String autoscalorPolicyName, String deploymentPolicyName) throws RemoteException,
- CloudControllerServiceUnregisteredCartridgeExceptionException,
- CloudControllerServiceIllegalArgumentExceptionException {
+ String autoscalorPolicyName, String deploymentPolicyName) throws RemoteException,
+ CloudControllerServiceIllegalArgumentExceptionException,
+ CloudControllerServiceUnregisteredCartridgeExceptionException {
Registrant registrant = new Registrant();
registrant.setClusterId(clusterId);
registrant.setCartridgeType(cartridgeType);
@@ -127,7 +119,7 @@ public class CloudControllerServiceClient {
new org.apache.stratos.cloud.controller.pojo.Properties();
if (properties != null) {
- for (Iterator iterator = properties.keySet().iterator(); iterator.hasNext();) {
+ for (Iterator<Object> iterator = properties.keySet().iterator(); iterator.hasNext();) {
String key = (String) iterator.next();
String value = properties.getProperty(key);
@@ -142,25 +134,22 @@ public class CloudControllerServiceClient {
return props;
}
- public void terminateAllInstances(String clusterId) throws Exception {
+ public void terminateAllInstances(String clusterId) throws RemoteException,
+ CloudControllerServiceInvalidClusterExceptionException, CloudControllerServiceIllegalArgumentExceptionException {
stub.terminateAllInstances(clusterId);
}
- public String[] getRegisteredCartridges() throws Exception {
+ public String[] getRegisteredCartridges() throws RemoteException {
return stub.getRegisteredCartridges();
}
- public CartridgeInfo getCartridgeInfo(String cartridgeType) throws UnregisteredCartridgeException, Exception {
- try {
- return stub.getCartridgeInfo(cartridgeType);
- } catch (RemoteException e) {
- throw e;
- } catch (CloudControllerServiceUnregisteredCartridgeExceptionException e) {
- throw new UnregisteredCartridgeException("Not a registered cartridge " + cartridgeType, cartridgeType, e);
- }
+ public CartridgeInfo getCartridgeInfo(String cartridgeType) throws RemoteException,
+ CloudControllerServiceUnregisteredCartridgeExceptionException {
+ return stub.getCartridgeInfo(cartridgeType);
}
- public void unregisterService(String clusterId) throws Exception {
+ public void unregisterService(String clusterId) throws RemoteException,
+ CloudControllerServiceUnregisteredClusterExceptionException {
stub.unregisterService(clusterId);
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe1bc63/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 b5e3889..11e57a1 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
@@ -26,6 +26,7 @@ import org.apache.stratos.cloud.controller.pojo.CartridgeInfo;
import org.apache.stratos.cloud.controller.pojo.LoadbalancerConfig;
import org.apache.stratos.cloud.controller.pojo.Properties;
import org.apache.stratos.cloud.controller.pojo.Property;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException;
import org.apache.stratos.manager.client.AutoscalerServiceClient;
import org.apache.stratos.manager.client.CloudControllerServiceClient;
import org.apache.stratos.manager.deploy.service.multitenant.MultiTenantService;
@@ -74,10 +75,10 @@ public class ServiceDeploymentManager {
try {
cartridgeInfo = CloudControllerServiceClient.getServiceClient().getCartridgeInfo(type);
- } catch (UnregisteredCartridgeException e) {
+ } catch (CloudControllerServiceUnregisteredCartridgeExceptionException e) {
String message = type + " is not a valid cartridgeSubscription type. Please try again with a valid cartridgeSubscription type.";
log.error(message);
- throw e;
+ throw new ADCException(message, e);
} catch (Exception e) {
String message = "Error getting info for " + type;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe1bc63/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/UnregisteredCartridgeException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/UnregisteredCartridgeException.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/UnregisteredCartridgeException.java
index be33d21..a53f318 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/UnregisteredCartridgeException.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/UnregisteredCartridgeException.java
@@ -37,6 +37,12 @@ public class UnregisteredCartridgeException extends Exception {
this.message = message;
this.cartridgeType = cartridgeType;
}
+
+ public UnregisteredCartridgeException(String message, Throwable cause) {
+ super(message, cause);
+ this.cartridgeType = null;
+ this.message = message;
+ }
public String getMessage() {
return message;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe1bc63/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 ac4d8e6..cb27159 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
@@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.pojo.CartridgeInfo;
import org.apache.stratos.cloud.controller.pojo.Properties;
import org.apache.stratos.cloud.controller.pojo.Property;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException;
import org.apache.stratos.manager.client.CloudControllerServiceClient;
import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo;
import org.apache.stratos.manager.dto.SubscriptionInfo;
@@ -102,12 +103,12 @@ public class CartridgeSubscriptionManager {
}
*/
- } catch (UnregisteredCartridgeException e) {
+ } catch (CloudControllerServiceUnregisteredCartridgeExceptionException e) {
String message =
cartridgeType +
" is not a valid cartridgeSubscription type. Please try again with a valid cartridgeSubscription type.";
log.error(message);
- throw e;
+ throw new ADCException(message, e);
} catch (Exception e) {
String message = "Error getting info for " + cartridgeType;
@@ -252,7 +253,7 @@ public class CartridgeSubscriptionManager {
cartridgeSubscription.getCartridgeInfo().getType());
}
else {
- String errorMsg = "No cartridge subscription found with alias " + alias + " for tenant " + tenantDomain;
+ String errorMsg = "No cartridge subscription found with [alias] " + alias + " for [tenant] " + tenantDomain;
log.error(errorMsg);
throw new NotSubscribedException(errorMsg, alias);
}