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/02/16 06:52:43 UTC
[2/2] git commit: fixing conflicts
fixing conflicts
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/dfd32f23
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/dfd32f23
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/dfd32f23
Branch: refs/heads/master
Commit: dfd32f23a43192ec8f9cc855e9a7608d442b5234
Parents: d4b3335 98edba2
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sun Feb 16 11:21:01 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sun Feb 16 11:21:01 2014 +0530
----------------------------------------------------------------------
.../console/controllers/wizardSubmit.jag | 19 ++-
.../theme1/renderers/configure_stratos.js | 1 -
.../renderers/configure_stratos_wizard.js | 5 +-
.../console/util/utility.jag | 14 +-
.../behaviour/CartridgeMgtBehaviour.java | 46 ++++++
.../subscription/CartridgeSubscription.java | 26 ++--
.../subscription/DataCartridgeSubscription.java | 3 +-
.../manager/subscription/SubscriptionData.java | 8 --
.../ServiceDeploymentMultiTenantBehaviour.java | 109 --------------
.../SubscriptionMultiTenantBehaviour.java | 50 ++++---
.../SubscriptionSingleTenantBehaviour.java | 67 +++++----
.../tenancy/SubscriptionTenancyBehaviour.java | 20 ++-
.../utils/CartridgeSubscriptionUtils.java | 36 ++---
.../rest/endpoint/bean/CartridgeInfoBean.java | 8 +-
.../rest/endpoint/services/ServiceUtils.java | 104 ++++++++------
.../rest/endpoint/services/StratosAdmin.java | 142 +++++++++++++++----
16 files changed, 352 insertions(+), 306 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/dfd32f23/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/DataCartridgeSubscription.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/DataCartridgeSubscription.java
index 3a1ba3b,d77a38b..80c95f4
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/DataCartridgeSubscription.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/DataCartridgeSubscription.java
@@@ -57,7 -57,10 +57,8 @@@ public class DataCartridgeSubscription
public CartridgeSubscriptionInfo registerSubscription(Properties properties) throws ADCException,
UnregisteredCartridgeException {
- getSubscriptionTenancyBehaviour().registerSubscription(this, properties);
- //Properties props = new Properties();
- //props.setProperties(getCartridgeInfo().getProperties());
+ getSubscriptionTenancyBehaviour().register (getCartridgeInfo(), getCluster(), getPayloadData(), getAutoscalingPolicyName(),
+ getDeploymentPolicyName(), properties);
DataCartridge dataCartridge = new DataCartridge();
dataCartridge.setUserName(getDBUsername());