You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/13 13:41:10 UTC
[1/2] git commit: Fixed array length issue in cloud controller util
Updated Branches:
refs/heads/master 0e2aaba49 -> c32219df0
Fixed array length issue in cloud controller util
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8a6ad74f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8a6ad74f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8a6ad74f
Branch: refs/heads/master
Commit: 8a6ad74f655531852984b8ae3b5cebd1436749ce
Parents: da8730c
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri Dec 13 18:10:47 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Dec 13 18:10:47 2013 +0530
----------------------------------------------------------------------
.../apache/stratos/cloud/controller/util/CloudControllerUtil.java | 2 +-
products/stratos-controller/conf/jndi.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a6ad74f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
index b905404..9d4d5c0 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
@@ -61,7 +61,7 @@ public class CloudControllerUtil {
cartridge.setDescription(config.getDescription());
cartridge.setHostName(config.getHostName());
String[] deploymentDirs = config.getDeploymentDirs();
- if(deploymentDirs != null) {
+ if((deploymentDirs != null) && (deploymentDirs.length > 0)) {
cartridge.setDeploymentDirs(Arrays.asList(deploymentDirs));
}
cartridge.setProvider(config.getProvider());
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a6ad74f/products/stratos-controller/conf/jndi.properties
----------------------------------------------------------------------
diff --git a/products/stratos-controller/conf/jndi.properties b/products/stratos-controller/conf/jndi.properties
index 137079f..425c2b7 100644
--- a/products/stratos-controller/conf/jndi.properties
+++ b/products/stratos-controller/conf/jndi.properties
@@ -1,4 +1,4 @@
connectionfactoryName=topicConnectionfactory
connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://localhost:5677'
java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory
-java.naming.provider.url=repository/conf/jndi.properties
+#java.naming.provider.url=repository/conf/jndi.properties
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c32219df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c32219df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c32219df
Branch: refs/heads/master
Commit: c32219df00762aa7dd450e654323550a8980de2e
Parents: 8a6ad74 0e2aaba
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri Dec 13 18:11:03 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Dec 13 18:11:03 2013 +0530
----------------------------------------------------------------------
.../autoscaler/api/AutoScalerServiceImpl.java | 76 +++++++++-----------
.../autoscaler/partition/PartitionManager.java | 22 +++---
.../partition/deployers/PartitionDeployer.java | 2 +-
.../autoscaler/policy/PolicyManager.java | 6 --
.../topology/AutoscalerTopologyReceiver.java | 12 +---
5 files changed, 50 insertions(+), 68 deletions(-)
----------------------------------------------------------------------