Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/fc9eb2ab Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/fc9eb2ab Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/fc9eb2ab Branch: refs/heads/master Commit: fc9eb2ab60c28c33c369a2aee74896cb820967a9 Parents: 8157baa 69ccd88 Author: rekathiru <[email protected]> Authored: Fri Jan 17 14:14:10 2014 +0530 Committer: rekathiru <[email protected]> Committed: Fri Jan 17 14:14:10 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/NetworkPartitionContext.java | 19 + .../git/impl/GitBasedArtifactRepository.java | 41 +- .../console/console.iws | 805 ------------------- .../console/controllers/lbDefinitionSubmit.jag | 9 + .../controllers/partitionDefinitionSubmit.jag | 4 +- .../controllers/policyDefinitionSubmit.jag | 2 +- .../console/themes/theme1/partials/header.hbs | 12 +- .../console/themes/theme1/partials/lbs.hbs | 40 +- .../theme1/partials/partition_deployments.hbs | 42 +- .../theme1/partials/policy_deployments.hbs | 40 +- .../console/themes/theme1/renderers/index.js | 6 +- .../console/themes/theme1/theme.js | 43 +- .../console/util/utility.jag | 15 +- .../manager/CartridgeSubscriptionManager.java | 10 +- .../distribution/src/main/conf/scaling.drl | 95 ++- 15 files changed, 249 insertions(+), 934 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fc9eb2ab/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java index e9ea9ea,d81e5cc..fd75771 --- 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 @@@ -40,9 -39,9 +40,10 @@@ import org.apache.stratos.manager.subsc import org.apache.stratos.manager.subscription.utils.CartridgeSubscriptionUtils; import org.apache.stratos.manager.utils.ApplicationManagementUtil; import org.apache.stratos.manager.utils.CartridgeConstants; + import org.apache.stratos.manager.utils.RepoPasswordMgtUtil; import org.wso2.carbon.context.CarbonContext; +import java.util.Arrays; import java.util.Collection; /**
