Updated Branches: refs/heads/master 9dc67d977 -> 43833f006
supporting all kind of cartridges via the subscription(fixed the hard coded cartridges) Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f9fc4ec7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f9fc4ec7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f9fc4ec7 Branch: refs/heads/master Commit: f9fc4ec799abd6320cb8dae9a0a2116e6d16700f Parents: 9dc67d9 Author: rekathiru <[email protected]> Authored: Wed Nov 13 19:12:43 2013 -0700 Committer: rekathiru <[email protected]> Committed: Wed Nov 13 19:12:43 2013 -0700 ---------------------------------------------------------------------- .../subscription/factory/CartridgeSubscriptionFactory.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f9fc4ec7/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/factory/CartridgeSubscriptionFactory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/factory/CartridgeSubscriptionFactory.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/factory/CartridgeSubscriptionFactory.java index a6eb032..70be3ef 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/factory/CartridgeSubscriptionFactory.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/factory/CartridgeSubscriptionFactory.java @@ -44,17 +44,16 @@ public class CartridgeSubscriptionFactory { cartridgeSubscription = new MultiTenantCartridgeSubscription(cartridgeInfo); } else { - if(cartridgeInfo.getType().equals(CartridgeConstants.MYSQL_CARTRIDGE_NAME)) { + if(cartridgeInfo.getProvider().equals(CartridgeConstants.DATA_CARTRIDGE_PROVIDER)) { cartridgeSubscription = new DataCartridgeSubscription(cartridgeInfo); } - else if (cartridgeInfo.getType().equals(CartridgeConstants.PHP_CARTRIDGE_NAME)) { - cartridgeSubscription = new SingleTenantCartridgeSubscription(cartridgeInfo); - } - else if (cartridgeInfo.getType().equals(CartridgeConstants.TOMCAT_CARTRIDGE_NAME)) { + else { cartridgeSubscription = new SingleTenantCartridgeSubscription(cartridgeInfo); } } + + if(cartridgeSubscription == null) { throw new ADCException("Unable to create a CartridgeSubscription subscription for " + cartridgeInfo);
