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 2015/01/03 12:32:03 UTC
[3/3] stratos git commit: Renaming payload parameter APP_ID to
APPLICATION_ID
Renaming payload parameter APP_ID to APPLICATION_ID
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0fdef65e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0fdef65e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0fdef65e
Branch: refs/heads/master
Commit: 0fdef65eac1ae8bdacae9cd69a2916db90f6950b
Parents: 278382c
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sat Jan 3 13:09:59 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Jan 3 17:01:50 2015 +0530
----------------------------------------------------------------------
.../parser/DefaultApplicationParser.java | 16 +++++++---------
.../applications/payload/BasicPayloadData.java | 15 +++++++--------
.../autoscaler/client/CloudControllerClient.java | 2 +-
3 files changed, 15 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/0fdef65e/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 f377743..1aede3b 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
@@ -240,11 +240,12 @@ public class DefaultApplicationParser implements ApplicationParser {
String alias;
Properties properties = new Properties();
- for (SubscribableInfoContext value : subscribableInfoCtxts.values()) {
- alias = value.getAlias();
- String username = value.getRepoUsername();
- String password = value.getRepoPassword();
- String repoUrl = value.getRepoUrl();
+ for (SubscribableInfoContext subscribableInfoContext : subscribableInfoCtxts.values()) {
+ alias = subscribableInfoContext.getAlias();
+ String username = subscribableInfoContext.getRepoUsername();
+ String password = subscribableInfoContext.getRepoPassword();
+ String repoUrl = subscribableInfoContext.getRepoUrl();
+
List<Property> propertyList = new ArrayList<Property>();
if (StringUtils.isNotEmpty(username)) {
Property property = new Property();
@@ -258,24 +259,21 @@ public class DefaultApplicationParser implements ApplicationParser {
Property property = new Property();
property.setName("REPO_PASSWORD");
property.setValue(encryptedPassword);
- //properties.addProperties(property);
propertyList.add(property);
-
}
if (StringUtils.isNotEmpty(repoUrl)) {
Property property = new Property();
property.setName("REPO_URL");
property.setValue(repoUrl);
- //properties.addProperties(property);
propertyList.add(property);
}
+
if(propertyList.size() > 0 ) {
Property[] properties1 = new Property[propertyList.size()];
properties.setProperties(propertyList.toArray(properties1));
this.addProperties(alias, properties);
}
-
}
if(log.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/0fdef65e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java
index b0e4588..d4feb29 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java
@@ -62,7 +62,7 @@ public class BasicPayloadData implements Serializable {
payloadBuilder = new StringBuilder();
- payloadBuilder.append("APP_ID=" + getAppId());
+ payloadBuilder.append("APPLICATION_ID=" + getAppId());
payloadBuilder.append(",");
payloadBuilder.append("GROUP_NAME=" + getGroupName());
payloadBuilder.append(",");
@@ -82,17 +82,17 @@ public class BasicPayloadData implements Serializable {
payloadBuilder.append(",");
payloadBuilder.append("CARTRIDGE_KEY=" + getSubscriptionKey());
payloadBuilder.append(",");
- //payloadBuilder.append("DEPLOYMENT=" + getDeployment());
- //payloadBuilder.append(",");
- //payloadBuilder.append("APP_PATH=" + getApplicationPath());
- //payloadBuilder.append(",");
+ payloadBuilder.append("DEPLOYMENT=" + getDeployment());
+ payloadBuilder.append(",");
+ payloadBuilder.append("APPLICATION_PATH=" + getApplicationPath());
+ payloadBuilder.append(",");
payloadBuilder.append("REPO_URL=" + getGitRepositoryUrl());
payloadBuilder.append(",");
payloadBuilder.append("PORTS=" + getPortMappings());
payloadBuilder.append(",");
payloadBuilder.append("PROVIDER=" + getProvider());
- //Payload Data exposed as system variables
+ //Payload data exposed as system variables
payloadBuilder.append(",");
payloadBuilder.append("PUPPET_IP=" + System.getProperty("puppet.ip"));
payloadBuilder.append(",");
@@ -103,13 +103,12 @@ public class BasicPayloadData implements Serializable {
payloadBuilder.append("PUPPET_ENV=" + System.getProperty("puppet.dns.available"));
payloadBuilder.append(",");
if(getDependencyAliasesPayloadString() != null){
- payloadBuilder.append("DEPENDECNY_ALIASES=" + getDependencyAliasesPayloadString());
+ payloadBuilder.append("DEPENDENCY_ALIASES=" + getDependencyAliasesPayloadString());
}
payloadBuilder.append(",");
if(getExportingPropertiesPayloadString() != null){
payloadBuilder.append("EXPORTING_PROPERTIES=" + getExportingPropertiesPayloadString());
}
-
}
public String getServiceName() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/0fdef65e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
index d1d9ca7..f7b0de4 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java
@@ -177,7 +177,7 @@ public class CloudControllerClient {
XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration();
long expiryTime = conf.getLong(StratosConstants.OBSOLETED_VM_MEMBER_EXPIRY_TIMEOUT, 86400000);
if (log.isDebugEnabled()) {
- log.debug("Member Obsolete Expiry Time is set to: " + expiryTime);
+ log.debug("Member obsolete expiry time is set to: " + expiryTime);
}
InstanceContext instanceContext = new InstanceContext();