You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/05/19 13:33:06 UTC
stratos git commit: Remove Kubs endpoint from Kub master objects at
client side
Repository: stratos
Updated Branches:
refs/heads/master 55cd65292 -> 4a6beb849
Remove Kubs endpoint from Kub master objects at client side
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4a6beb84
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4a6beb84
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4a6beb84
Branch: refs/heads/master
Commit: 4a6beb84984a9945ae57bd7c3be988279003ad43
Parents: 55cd652
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue May 19 16:53:21 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue May 19 16:59:33 2015 +0530
----------------------------------------------------------------------
.../common/beans/kubernetes/KubernetesMasterBean.java | 8 --------
.../rest/endpoint/util/converter/ObjectConverter.java | 2 --
.../src/main/resources/CloudControllerService.wsdl | 4 +---
3 files changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/4a6beb84/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesMasterBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesMasterBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesMasterBean.java
index a26affb..bc698f0 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesMasterBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/kubernetes/KubernetesMasterBean.java
@@ -33,7 +33,6 @@ public class KubernetesMasterBean {
private String hostname;
private String privateIPAddress;
private String publicIPAddress;
- private String endpoint;
private List<PropertyBean> property;
public String getHostId() {
@@ -76,11 +75,4 @@ public class KubernetesMasterBean {
this.property = property;
}
- public String getEndpoint() {
- return endpoint;
- }
-
- public void setEndpoint(String endpoint) {
- this.endpoint = endpoint;
- }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4a6beb84/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 33a71ee..c99b77f 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
@@ -975,7 +975,6 @@ public class ObjectConverter {
kubernetesMaster.setPrivateIPAddress(kubernetesMasterBean.getPrivateIPAddress());
kubernetesMaster.setPublicIPAddress(kubernetesMasterBean.getPublicIPAddress());
kubernetesMaster.setHostname(kubernetesMasterBean.getHostname());
- kubernetesMaster.setEndpoint(kubernetesMasterBean.getEndpoint());
kubernetesMaster.setProperties(convertPropertyBeansToCCStubProperties(kubernetesMasterBean.getProperty()));
return kubernetesMaster;
@@ -1021,7 +1020,6 @@ public class ObjectConverter {
kubernetesMasterBean.setPrivateIPAddress(kubernetesMaster.getPrivateIPAddress());
kubernetesMasterBean.setPublicIPAddress(kubernetesMaster.getPublicIPAddress());
kubernetesMasterBean.setProperty(convertCCStubPropertiesToPropertyBeans(kubernetesMaster.getProperties()));
- kubernetesMasterBean.setEndpoint(kubernetesMaster.getEndpoint());
return kubernetesMasterBean;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4a6beb84/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
index c4555e3..2a095bb 100644
--- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
+++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
@@ -908,9 +908,7 @@
<xs:complexType name="KubernetesMaster">
<xs:complexContent>
<xs:extension base="ax27:KubernetesHost">
- <xs:sequence>
- <xs:element minOccurs="0" name="endpoint" nillable="true" type="xs:string"/>
- </xs:sequence>
+ <xs:sequence/>
</xs:extension>
</xs:complexContent>
</xs:complexType>