stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From im...@apache.org
Subject [2/2] stratos git commit: Fixing UI issue on iaas provider and CLI list-application-policies
Date Fri, 12 Jun 2015 09:46:12 GMT
Fixing UI issue on iaas provider and CLI list-application-policies


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/abe684d8
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/abe684d8
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/abe684d8

Branch: refs/heads/master
Commit: abe684d815df3c56f40f18e8a5022a0f1e901497
Parents: c38da53
Author: Pubudu Gunatilaka <pubudu538@gmail.com>
Authored: Thu Jun 11 17:28:02 2015 +0530
Committer: Imesh Gunaratne <imesh@apache.org>
Committed: Fri Jun 12 15:16:07 2015 +0530

----------------------------------------------------------------------
 .../stratos/rest/endpoint/util/converter/ObjectConverter.java       | 1 +
 .../src/main/webapp/api/WEB-INF/cxf-servlet.xml                     | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/abe684d8/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index 1ec0179..e74d578 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -451,6 +451,7 @@ public class ObjectConverter {
 
         NetworkPartitionBean networkPartition = new NetworkPartitionBean();
         networkPartition.setId(stubNetworkPartition.getId());
+        networkPartition.setProvider(stubNetworkPartition.getProvider());
         if (stubNetworkPartition.getPartitions() != null) {
             List<PartitionBean> partitionList = new ArrayList<PartitionBean>();
             for (org.apache.stratos.cloud.controller.stub.domain.Partition stubPartition
: stubNetworkPartition.getPartitions()) {

http://git-wip-us.apache.org/repos/asf/stratos/blob/abe684d8/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 f22eb1d..0e04305 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
@@ -115,6 +115,7 @@
             <list>
                 <value>partitions</value>
                 <value>property</value>
+                <value>properties</value>
                 <value>hostNames</value>
                 <value>memberMap</value>
                 <value>portMapping</value>


Mime
View raw message