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/05/08 15:12:00 UTC

[1/2] stratos git commit: Fixing typos in the REST API

Repository: stratos
Updated Branches:
  refs/heads/master fbf89b3c6 -> 695dfd820


Fixing typos in the REST API


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

Branch: refs/heads/master
Commit: fc72ad9f7477aaabfd2ea81bba996fe03893c14b
Parents: fbf89b3
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri May 8 18:40:45 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri May 8 18:40:45 2015 +0530

----------------------------------------------------------------------
 .../java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/fc72ad9f/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index 47da053..a6637fd 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
@@ -1624,7 +1624,7 @@ public class StratosApiV41 extends AbstractApi {
 
         StratosApiV41Utils.notifyArtifactUpdatedEvent(payload);
         return Response.ok().entity(new StatusResponseBean(Response.Status.OK.getStatusCode(),
-                String.format("Repository notificaton sent successfully"))).build();
+                String.format("Repository notification sent successfully"))).build();
     }
 
     // API methods for users
@@ -1832,7 +1832,7 @@ public class StratosApiV41 extends AbstractApi {
         KubernetesClusterBean[] availableKubernetesClusters = StratosApiV41Utils.getAvailableKubernetesClusters();
         if (availableKubernetesClusters == null || availableKubernetesClusters.length == 0) {
             return Response.status(Response.Status.NOT_FOUND).entity(new StatusResponseBean(
-                    Response.Status.NOT_FOUND.getStatusCode(), "Kubernetes cluster not found")).build();
+                    Response.Status.NOT_FOUND.getStatusCode(), "Kubernetes clusters not found")).build();
         }
 
         return Response.ok().entity(availableKubernetesClusters).build();


[2/2] stratos git commit: Fixing service object transformation in load balancer common module

Posted by im...@apache.org.
Fixing service object transformation in load balancer common module


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

Branch: refs/heads/master
Commit: 695dfd8201b4c1fe43396b953abb7c6d73dcf6fe
Parents: fc72ad9
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri May 8 18:41:53 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri May 8 18:41:53 2015 +0530

----------------------------------------------------------------------
 .../receivers/LoadBalancerCommonTopologyEventReceiver.java  | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/695dfd82/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java
index 4412d5c..b6c7b7a 100644
--- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java
+++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java
@@ -25,6 +25,10 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.common.domain.LoadBalancingIPType;
 import org.apache.stratos.load.balancer.common.topology.TopologyProvider;
 import org.apache.stratos.messaging.domain.topology.*;
+import org.apache.stratos.messaging.domain.topology.Cluster;
+import org.apache.stratos.messaging.domain.topology.Member;
+import org.apache.stratos.messaging.domain.topology.Port;
+import org.apache.stratos.messaging.domain.topology.Service;
 import org.apache.stratos.messaging.event.Event;
 import org.apache.stratos.messaging.event.topology.*;
 import org.apache.stratos.messaging.listener.topology.*;
@@ -363,6 +367,11 @@ public class LoadBalancerCommonTopologyEventReceiver extends TopologyEventReceiv
     private org.apache.stratos.load.balancer.common.domain.Service transformService(Service messagingService) {
         org.apache.stratos.load.balancer.common.domain.Service service =
                 new org.apache.stratos.load.balancer.common.domain.Service(messagingService.getServiceName());
+        if(messagingService.getPorts().size() > 0) {
+            for(Port messagingPort : messagingService.getPorts()) {
+                service.addPort(transformPort(messagingPort));
+            }
+        }
         return service;
     }