You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/11/05 11:35:31 UTC
[09/50] [abbrv] git commit: fixing properties issue when publishing
to metadata service
fixing properties issue when publishing to metadata service
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/736ab44e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/736ab44e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/736ab44e
Branch: refs/heads/docker-grouping-merge-wip
Commit: 736ab44e15947c485d9433f91f3741432f04d70d
Parents: 8d96abe
Author: reka <rt...@gmail.com>
Authored: Wed Nov 5 11:11:18 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Wed Nov 5 11:23:23 2014 +0530
----------------------------------------------------------------------
.../parser/DefaultApplicationParser.java | 16 ++++++++++------
.../utils/CartridgeSubscriptionUtils.java | 2 +-
2 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/736ab44e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
index 7c73d58..d6339f9 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
@@ -282,7 +282,7 @@ public class DefaultApplicationParser implements ApplicationParser {
String [] startupOrders = appCtxt.getComponents().getDependencyContext().getStartupOrdersContexts();
if (startupOrders != null) {
if (log.isDebugEnabled()) {
- log.debug("parsing application ... buildCompositeAppStructure: startupOrders != null for app alias: " +
+ log.debug("parsing application ... buildCompositeAppStructure: startupOrders != null for app alias: " +
appCtxt.getAlias() + " #: " + startupOrders.length);
}
appDependencyOrder.setStartupOrders(ParserUtils.convert(startupOrders));
@@ -306,12 +306,12 @@ public class DefaultApplicationParser implements ApplicationParser {
String username = value.getRepoUsername();
String password = value.getRepoPassword();
String repoUrl = value.getRepoUrl();
-
+ List<Property> propertyList = new ArrayList<Property>();
if (StringUtils.isNotEmpty(username)) {
Property property = new Property();
property.setName("REPO_USERNAME");
property.setValue(username);
- properties.addProperties(property);
+ propertyList.add(property);
}
if (StringUtils.isNotEmpty(password)) {
@@ -319,16 +319,20 @@ public class DefaultApplicationParser implements ApplicationParser {
Property property = new Property();
property.setName("REPO_PASSWORD");
property.setValue(encryptedPassword);
- properties.addProperties(property);
+ //properties.addProperties(property);
+ propertyList.add(property);
+
}
if (StringUtils.isNotEmpty(repoUrl)) {
Property property = new Property();
property.setName("REPO_URL");
property.setValue(repoUrl);
- properties.addProperties(property);
+ //properties.addProperties(property);
+ propertyList.add(property);
}
-
+ Property[] properties1 = new Property[propertyList.size()];
+ properties.setProperties(propertyList.toArray(properties1));
this.addProperties(alias, properties);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/736ab44e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java
index 6a45995..ef735a2 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/utils/CartridgeSubscriptionUtils.java
@@ -23,7 +23,7 @@ import org.apache.axis2.AxisFault;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy;
+import org.apache.stratos.autoscaler.stub.policy.model.DeploymentPolicy;
import org.apache.stratos.cloud.controller.stub.pojo.*;
import org.apache.stratos.manager.client.AutoscalerServiceClient;
import org.apache.stratos.manager.client.CloudControllerServiceClient;