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/06/29 06:47:55 UTC
[1/3] stratos git commit: This closes #379 on GitHub
Repository: stratos
Updated Branches:
refs/heads/master ff7ed099c -> 4fc475f9f
This closes #379 on GitHub
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4fc475f9
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4fc475f9
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4fc475f9
Branch: refs/heads/master
Commit: 4fc475f9fa94ea4ffd180ad68fd6b9bc7814e53b
Parents: 997a44e
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Jun 29 10:17:50 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Jun 29 10:17:50 2015 +0530
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/3] stratos git commit: fixed listing cartridge groups in cli
Posted by im...@apache.org.
fixed listing cartridge groups in cli
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a2d112cd
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a2d112cd
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a2d112cd
Branch: refs/heads/master
Commit: a2d112cd7da7f5e04e330023fb64d914fb45bc00
Parents: ff7ed09
Author: Pubudu Gunatilaka <pu...@gmail.com>
Authored: Mon Jun 29 09:07:19 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Jun 29 10:17:50 2015 +0530
----------------------------------------------------------------------
.../stratos/rest/endpoint/api/StratosApiV41Utils.java | 11 ++++++-----
.../src/main/webapp/api/WEB-INF/cxf-servlet.xml | 1 +
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/a2d112cd/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 0d685bf..b213fdb 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
@@ -127,10 +127,10 @@ public class StratosApiV41Utils {
cartridgeBean.getType()));
}
- for(PortMappingBean portMapping : cartridgeBean.getPortMapping()) {
- if(StringUtils.isBlank(portMapping.getName())) {
+ for (PortMappingBean portMapping : cartridgeBean.getPortMapping()) {
+ if (StringUtils.isBlank(portMapping.getName())) {
portMapping.setName(portMapping.getProtocol() + "-" + portMapping.getPort());
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info(String.format("Port mapping name not found, default value generated: " +
"[cartridge-type] %s [port-mapping-name] %s",
cartridgeBean.getType(), portMapping.getName()));
@@ -2722,8 +2722,9 @@ public class StratosApiV41Utils {
if (networkPartitions != null) {
for (int i = 0; i < networkPartitions.length; i++) {
if (networkPartitions[i].equals(networkPartitionId)) {
- String message = String.format("Cannot remove the network partition %s, since" +
- " it is used in application %s", networkPartitionId,
+ String message = String.format("Cannot remove the network partition " +
+ "[network-partition-id] %s, since it is used in application " +
+ "[application-id] %s", networkPartitionId,
applicationContext.getApplicationId());
log.error(message);
throw new RestAPIException(message);
http://git-wip-us.apache.org/repos/asf/stratos/blob/a2d112cd/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
index 0e04305..08b440a 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
@@ -149,6 +149,7 @@
<value>networkInterfaces</value>
<value>iaasProvider</value>
<value>floatingNetworks</value>
+ <value>scalingDependents</value>
</list>
</property>
</bean>
[2/3] stratos git commit: fixed error message minor issue
Posted by im...@apache.org.
fixed error message minor issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/997a44e4
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/997a44e4
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/997a44e4
Branch: refs/heads/master
Commit: 997a44e42154f46f0726893e129b8478ff9bab28
Parents: a2d112c
Author: Pubudu Gunatilaka <pu...@gmail.com>
Authored: Mon Jun 29 09:12:02 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Jun 29 10:17:50 2015 +0530
----------------------------------------------------------------------
.../org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/997a44e4/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 b213fdb..5dd0bbc 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
@@ -1644,7 +1644,7 @@ public class StratosApiV41Utils {
if (group.getDeploymentPolicy() != null) {
if (hasDeploymentPolicy) {
- String message = "Parent Group has a deployment policy. Remove deployment policy from the" +
+ String message = "Parent group has a deployment policy. Remove deployment policy from the" +
" group: [group-alias] " + group.getAlias();
throw new RestAPIException(message);
} else {