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 2014/12/13 14:10:04 UTC
stratos git commit: Updating application deployment successful log
and adding deployment policy id
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test 81431df92 -> 1b1444203
Updating application deployment successful log and adding deployment policy id
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1b144420
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1b144420
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1b144420
Branch: refs/heads/4.1.0-test
Commit: 1b1444203bd04d72cb58d50a5450e30a6346cd66
Parents: 81431df
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sat Dec 13 18:39:53 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Dec 13 18:39:53 2014 +0530
----------------------------------------------------------------------
.../org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 3 ++-
.../bean/autoscaler/policy/deployment/DeploymentPolicy.java | 2 ++
.../stratos/rest/endpoint/bean/util/converter/PojoConverter.java | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/1b144420/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index 809ba36..4084426 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -1003,7 +1003,8 @@ public class StratosApiV41Utils {
throw new RestAPIException(message, e);
}
- log.info(String.format("Deployed application deployment policy: [Application id] %s", deploymentPolicy.getApplicationId()));
+ log.info(String.format("Application deployed: [application-id] %s [deployment-policy-id] %s",
+ deploymentPolicy.getApplicationId(), deploymentPolicy.getId()));
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/1b144420/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/DeploymentPolicy.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/DeploymentPolicy.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/DeploymentPolicy.java
index 9b5c70f..758e279 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/DeploymentPolicy.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/DeploymentPolicy.java
@@ -29,6 +29,8 @@ import java.util.List;
@XmlRootElement
public class DeploymentPolicy {
+ public String id;
+
public String description;
public boolean isPublic;
http://git-wip-us.apache.org/repos/asf/stratos/blob/1b144420/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
index 9649fb7..c9a8df8 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
@@ -431,6 +431,7 @@ public class PojoConverter {
org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy deploymentPolicy =
new org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy();
+ deploymentPolicy.setId(deploymentPolicyBean.id);
deploymentPolicy.setDescription(deploymentPolicyBean.description);
deploymentPolicy.setIsPublic(deploymentPolicyBean.isPublic);
if (deploymentPolicyBean.applicationPolicy != null