You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/12/17 07:54:15 UTC
[1/2] git commit: fixing a bug in payload creation
Updated Branches:
refs/heads/master dc11e3176 -> d5b9564aa
fixing a bug in payload creation
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/05f05d78
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/05f05d78
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/05f05d78
Branch: refs/heads/master
Commit: 05f05d788c54c831ad0bd19fc2e59b2af5a20742
Parents: c01173c
Author: Isuru <is...@wso2.com>
Authored: Tue Dec 17 12:23:48 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Tue Dec 17 12:23:48 2013 +0530
----------------------------------------------------------------------
.../adc/mgt/payload/BasicPayloadData.java | 36 ++++++++++++++++++--
.../stratos/adc/mgt/payload/PayloadData.java | 18 ++++++----
2 files changed, 45 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/05f05d78/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/BasicPayloadData.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/BasicPayloadData.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/BasicPayloadData.java
index 7f26c5e..f9905f6 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/BasicPayloadData.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/BasicPayloadData.java
@@ -50,6 +50,38 @@ public class BasicPayloadData implements Serializable {
public BasicPayloadData() {
payloadBuilder = new StringBuilder();
+ createBasicPayloadData();
+ }
+
+ private void createBasicPayloadData () {
+
+ payloadBuilder.append("SERVICE_NAME=" + getServiceName());
+ payloadBuilder.append(",");
+ payloadBuilder.append("HOST_NAME=" + getHostName());
+ payloadBuilder.append(",");
+ payloadBuilder.append("MULTITENANT=" + getMultitenant());
+ payloadBuilder.append(",");
+ payloadBuilder.append("TENANT_ID=" + getTenantId());
+ payloadBuilder.append(",");
+ payloadBuilder.append("TENANT_RANGE=" + getTenantRange());
+ payloadBuilder.append(",");
+ payloadBuilder.append("CARTRIDGE_ALIAS=" + getSubscriptionAlias());
+ payloadBuilder.append(",");
+ payloadBuilder.append("CLUSTER_ID=" + getClusterId());
+ payloadBuilder.append(",");
+ payloadBuilder.append("CARTRIDGE_KEY=" + getSubscriptionKey());
+ payloadBuilder.append(",");
+ payloadBuilder.append("DEPLOYMENT=" + getDeployment());
+ payloadBuilder.append(",");
+ payloadBuilder.append("APP_PATH=" + getApplicationPath());
+ payloadBuilder.append(",");
+ payloadBuilder.append("GIT_REPO=" + getGitRepositoryUrl());
+ payloadBuilder.append(",");
+ payloadBuilder.append("PORTS=" + getPortMappings());
+
+ //Payload Data exposed as system variables
+ payloadBuilder.append(",");
+ payloadBuilder.append("PUPPET_IP=" + System.getProperty(CartridgeConstants.PUPPET_IP));
}
public String getServiceName() {
@@ -126,7 +158,7 @@ public class BasicPayloadData implements Serializable {
public StringBuilder getPayloadData () {
- payloadBuilder.append("SERVICE_NAME=" + getServiceName());
+ /*payloadBuilder.append("SERVICE_NAME=" + getServiceName());
payloadBuilder.append(",");
payloadBuilder.append("HOST_NAME=" + getHostName());
payloadBuilder.append(",");
@@ -152,7 +184,7 @@ public class BasicPayloadData implements Serializable {
//Payload Data exposed as system variables
payloadBuilder.append(",");
- payloadBuilder.append("PUPPET_IP=" + System.getProperty(CartridgeConstants.PUPPET_IP));
+ payloadBuilder.append("PUPPET_IP=" + System.getProperty(CartridgeConstants.PUPPET_IP));*/
return payloadBuilder;
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/05f05d78/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadData.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadData.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadData.java
index 1601c21..af385ae 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadData.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadData.java
@@ -23,24 +23,26 @@ import java.io.Serializable;
public abstract class PayloadData implements Serializable {
- protected StringBuilder additionalPayloadDataBuilder;
+ //protected StringBuilder additionalPayloadDataBuilder;
//private Map<String, String> payloadDataMap;
private BasicPayloadData basicPayloadData;
+ private StringBuilder completePayloadDataBuilder;
public PayloadData(BasicPayloadData basicPayloadData) {
this.setBasicPayloadData(basicPayloadData);
- additionalPayloadDataBuilder = new StringBuilder();
+ //additionalPayloadDataBuilder = new StringBuilder();
+ completePayloadDataBuilder = new StringBuilder(basicPayloadData.getPayloadData());
//payloadDataMap = new HashMap<String, String>();
}
public void add (String payloadDataName, String payloadDataValue) {
- if(additionalPayloadDataBuilder.length() > 0) {
- additionalPayloadDataBuilder.append(",");
+ if(completePayloadDataBuilder.length() > 0) {
+ completePayloadDataBuilder.append(",");
}
//payloadDataMap.put(payloadDataName, payloadDataValue);
- additionalPayloadDataBuilder.append(payloadDataName + "=" + payloadDataValue);
+ completePayloadDataBuilder.append(payloadDataName + "=" + payloadDataValue);
}
/*public String getPayloadDataValue (String payloadDataName) {
@@ -49,11 +51,13 @@ public abstract class PayloadData implements Serializable {
public StringBuilder getCompletePayloadData () {
- if(additionalPayloadDataBuilder.length() > 0) {
+ /*if(additionalPayloadDataBuilder.length() > 0) {
return getBasicPayloadData().getPayloadData().append(",").append(additionalPayloadDataBuilder);
} else {
return getBasicPayloadData().getPayloadData();
- }
+ }*/
+
+ return completePayloadDataBuilder;
}
public BasicPayloadData getBasicPayloadData() {
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by is...@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/d5b9564a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d5b9564a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d5b9564a
Branch: refs/heads/master
Commit: d5b9564aa6ee4e5ca9a650fbdb1819020d83ec80
Parents: 05f05d7 dc11e31
Author: Isuru <is...@wso2.com>
Authored: Tue Dec 17 12:23:59 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Tue Dec 17 12:23:59 2013 +0530
----------------------------------------------------------------------
.../org/apache/stratos/rest/endpoint/Utils.java | 40 ++++++++++++
.../endpoint/exception/RestAPIException.java | 20 ++++++
.../handlers/CustomExceptionMapper.java | 37 +++++++++++
.../handlers/StratosAuthenticationHandler.java | 19 ++++--
.../handlers/StratosAuthorizingHandler.java | 14 ++++-
.../rest/endpoint/services/StratosAdmin.java | 2 +-
.../src/main/webapp/WEB-INF/cxf-servlet.xml | 2 +
.../src/main/webapp/WEB-INF/web.xml | 4 +-
.../FaultMessageEventFormatter.xml | 2 +-
.../execution-plans/AverageHeathRequest.xml | 6 +-
.../execution-plans/GradientOfHealthRequest.xml | 7 ++-
.../stream-manager-config.xml | 6 +-
.../src/main/bin/health-publisher.sh | 2 +-
.../agent/health/publisher/HealthPublisher.java | 8 ++-
tools/stratos-installer/setup.sh | 65 ++++++++++++++++++--
15 files changed, 209 insertions(+), 25 deletions(-)
----------------------------------------------------------------------