You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/01/17 09:44:03 UTC
[1/2] git commit: fixing STRATOS-367
Updated Branches:
refs/heads/master 69ccd8803 -> fc9eb2ab6
fixing STRATOS-367
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8157baad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8157baad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8157baad
Branch: refs/heads/master
Commit: 8157baad3cf9264f9a1e44d3cca4145037135226
Parents: af0b54d
Author: rekathiru <rt...@gmail.com>
Authored: Fri Jan 17 14:13:32 2014 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Fri Jan 17 14:13:32 2014 +0530
----------------------------------------------------------------------
.../manager/manager/CartridgeSubscriptionManager.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8157baad/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 7e00740..e9ea9ea 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
@@ -20,6 +20,7 @@
package org.apache.stratos.manager.manager;
import org.apache.axis2.AxisFault;
+import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.pojo.CartridgeInfo;
@@ -41,6 +42,7 @@ import org.apache.stratos.manager.utils.ApplicationManagementUtil;
import org.apache.stratos.manager.utils.CartridgeConstants;
import org.wso2.carbon.context.CarbonContext;
+import java.util.Arrays;
import java.util.Collection;
/**
@@ -121,8 +123,12 @@ public class CartridgeSubscriptionManager {
CloudControllerServiceClient.getServiceClient().getCartridgeInfo(cartridgeType);
if (props != null) {
// TODO: temp fix, need to do a proper fix
- for (Property property : props)
- cartridgeInfo.addProperties(property);
+ Property[] cartridgeInfoProperties = cartridgeInfo.getProperties();
+ int length = cartridgeInfoProperties.length + props.length;
+ Property[] combined = new Property[length];
+ System.arraycopy(cartridgeInfoProperties, 0, combined, 0, cartridgeInfoProperties.length);
+ System.arraycopy(props, 0, combined, cartridgeInfoProperties.length, props.length);
+ cartridgeInfo.setProperties(combined);
}
} catch (UnregisteredCartridgeException e) {
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by re...@apache.org.
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 <rt...@gmail.com>
Authored: Fri Jan 17 14:14:10 2014 +0530
Committer: rekathiru <rt...@gmail.com>
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;
/**