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/01/11 05:14:31 UTC
[1/2] stratos git commit: Updating stratos manager service stub wsdl
Repository: stratos
Updated Branches:
refs/heads/master c1517c504 -> 5d8f7d41e
Updating stratos manager service stub wsdl
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5549d884
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5549d884
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5549d884
Branch: refs/heads/master
Commit: 5549d884914ac27898f8ebebec5ef4dd7b723704
Parents: c1517c5
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Jan 11 09:20:53 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Jan 11 09:20:53 2015 +0530
----------------------------------------------------------------------
.../main/resources/StratosManagerService.wsdl | 79 ++++++++++----------
1 file changed, 40 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/5549d884/service-stubs/org.apache.stratos.manager.service.stub/src/main/resources/StratosManagerService.wsdl
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.manager.service.stub/src/main/resources/StratosManagerService.wsdl b/service-stubs/org.apache.stratos.manager.service.stub/src/main/resources/StratosManagerService.wsdl
index 9a88246..dc8c286 100644
--- a/service-stubs/org.apache.stratos.manager.service.stub/src/main/resources/StratosManagerService.wsdl
+++ b/service-stubs/org.apache.stratos.manager.service.stub/src/main/resources/StratosManagerService.wsdl
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ns="http://impl.services.manager.stratos.apache.org" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:ax23="http://signup.application.domain.messaging.stratos.apache.org/xsd" xmlns:ax24="http://mapping.domain.domain.messaging.stratos.apache.org/xsd" xmlns:ax21="http://exception.manager.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://impl.services.manager.stratos.apache.org">
+<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ns="http://impl.services.manager.stratos.apache.org" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:ax25="http://signup.application.domain.messaging.stratos.apache.org/xsd" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:ax23="http://mapping.domain.domain.messaging.stratos.apache.org/xsd" xmlns:ax21="http://exception.manager.stratos.apache.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://impl.services.manager.stratos.apache.org">
<wsdl:types>
- <xs:schema xmlns:ax25="http://mapping.domain.domain.messaging.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://signup.application.domain.messaging.stratos.apache.org/xsd">
+ <xs:schema xmlns:ax26="http://mapping.domain.domain.messaging.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://signup.application.domain.messaging.stratos.apache.org/xsd">
<xs:import namespace="http://mapping.domain.domain.messaging.stratos.apache.org/xsd"/>
<xs:complexType name="ApplicationSignUp">
<xs:sequence>
<xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="artifactRepositories" nillable="true" type="ax23:ArtifactRepository"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="domainMappings" nillable="true" type="ax25:DomainMapping"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="artifactRepositories" nillable="true" type="ax25:ArtifactRepository"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="clusterIds" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="domainMappings" nillable="true" type="ax26:DomainMapping"/>
<xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
@@ -33,33 +34,32 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
- <xs:schema xmlns:ax27="http://mapping.domain.domain.messaging.stratos.apache.org/xsd" xmlns:ax26="http://signup.application.domain.messaging.stratos.apache.org/xsd" xmlns:ax22="http://exception.manager.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.manager.stratos.apache.org">
+ <xs:schema xmlns:ax27="http://signup.application.domain.messaging.stratos.apache.org/xsd" xmlns:ax24="http://mapping.domain.domain.messaging.stratos.apache.org/xsd" xmlns:ax22="http://exception.manager.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.services.manager.stratos.apache.org">
<xs:import namespace="http://exception.manager.stratos.apache.org/xsd"/>
- <xs:import namespace="http://signup.application.domain.messaging.stratos.apache.org/xsd"/>
<xs:import namespace="http://mapping.domain.domain.messaging.stratos.apache.org/xsd"/>
- <xs:element name="StratosManagerServiceApplicationSignUpException">
+ <xs:import namespace="http://signup.application.domain.messaging.stratos.apache.org/xsd"/>
+ <xs:element name="StratosManagerServiceDomainMappingException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="ApplicationSignUpException" nillable="true" type="ax21:ApplicationSignUpException"/>
+ <xs:element minOccurs="0" name="DomainMappingException" nillable="true" type="ax21:DomainMappingException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addApplicationSignUp">
+ <xs:element name="addDomainMapping">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationSignUp" nillable="true" type="ax26:ApplicationSignUp"/>
+ <xs:element minOccurs="0" name="domainMapping" nillable="true" type="ax23:DomainMapping"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="removeApplicationSignUp">
+ <xs:element name="StratosManagerServiceArtifactDistributionCoordinatorException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
+ <xs:element minOccurs="0" name="ArtifactDistributionCoordinatorException" nillable="true" type="ax21:ArtifactDistributionCoordinatorException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationSignUp">
+ <xs:element name="notifyArtifactUpdatedEventForSignUp">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
@@ -67,98 +67,99 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationSignUpResponse">
+ <xs:element name="notifyArtifactUpdatedEventForRepository">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax26:ApplicationSignUp"/>
+ <xs:element minOccurs="0" name="repoUrl" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationSignUps">
+ <xs:element name="getDomainMappings">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getApplicationSignUpsResponse">
+ <xs:element name="getDomainMappingsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax26:ApplicationSignUp"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax23:DomainMapping"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="StratosManagerServiceDomainMappingException">
+ <xs:element name="removeDomainMapping">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="DomainMappingException" nillable="true" type="ax21:DomainMappingException"/>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
+ <xs:element minOccurs="0" name="domainName" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDomainMappings">
+ <xs:element name="StratosManagerServiceApplicationSignUpException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
+ <xs:element minOccurs="0" name="ApplicationSignUpException" nillable="true" type="ax21:ApplicationSignUpException"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDomainMappingsResponse">
+ <xs:element name="addApplicationSignUp">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:DomainMapping"/>
+ <xs:element minOccurs="0" name="applicationSignUp" nillable="true" type="ax27:ApplicationSignUp"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="removeDomainMapping">
+ <xs:element name="removeApplicationSignUp">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="tenantId" type="xs:int"/>
- <xs:element minOccurs="0" name="domainName" nillable="true" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="addDomainMapping">
+ <xs:element name="getApplicationSignUp">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="domainMapping" nillable="true" type="ax27:DomainMapping"/>
+ <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="StratosManagerServiceArtifactDistributionCoordinatorException">
+ <xs:element name="getApplicationSignUpResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="ArtifactDistributionCoordinatorException" nillable="true" type="ax21:ArtifactDistributionCoordinatorException"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax27:ApplicationSignUp"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="notifyArtifactUpdatedEventForSignUp">
+ <xs:element name="getApplicationSignUps">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="tenantId" type="xs:int"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="notifyArtifactUpdatedEventForRepository">
+ <xs:element name="getApplicationSignUpsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="repoUrl" nillable="true" type="xs:string"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax27:ApplicationSignUp"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.manager.stratos.apache.org/xsd">
- <xs:complexType name="ApplicationSignUpException">
- <xs:sequence/>
- </xs:complexType>
<xs:complexType name="DomainMappingException">
<xs:sequence/>
</xs:complexType>
<xs:complexType name="ArtifactDistributionCoordinatorException">
<xs:sequence/>
</xs:complexType>
+ <xs:complexType name="ApplicationSignUpException">
+ <xs:sequence/>
+ </xs:complexType>
</xs:schema>
</wsdl:types>
<wsdl:message name="getDomainMappingsRequest">
[2/2] stratos git commit: Removing applicationId from application
signup & application domain mappings beans
Posted by im...@apache.org.
Removing applicationId from application signup & application domain mappings beans
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5d8f7d41
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5d8f7d41
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5d8f7d41
Branch: refs/heads/master
Commit: 5d8f7d41eb66b5d82486106ad605c8d782e74d00
Parents: 5549d88
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Jan 11 09:44:08 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Jan 11 09:44:08 2015 +0530
----------------------------------------------------------------------
.../domain/mapping/ApplicationDomainMappingsBean.java | 9 ---------
.../beans/application/signup/ApplicationSignUpBean.java | 9 ---------
.../stratos/rest/endpoint/api/StratosApiV41Utils.java | 11 ++---------
.../rest/endpoint/util/converter/ObjectConverter.java | 2 --
4 files changed, 2 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/5d8f7d41/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/domain/mapping/ApplicationDomainMappingsBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/domain/mapping/ApplicationDomainMappingsBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/domain/mapping/ApplicationDomainMappingsBean.java
index de536f5..6d44cec 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/domain/mapping/ApplicationDomainMappingsBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/domain/mapping/ApplicationDomainMappingsBean.java
@@ -28,17 +28,8 @@ public class ApplicationDomainMappingsBean implements Serializable {
private static final long serialVersionUID = 8896916017135654616L;
- private String applicationId;
private List<DomainMappingBean> domainMappings;
- public String getApplicationId() {
- return applicationId;
- }
-
- public void setApplicationId(String applicationId) {
- this.applicationId = applicationId;
- }
-
public List<DomainMappingBean> getDomainMappings() {
return domainMappings;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5d8f7d41/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/signup/ApplicationSignUpBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/signup/ApplicationSignUpBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/signup/ApplicationSignUpBean.java
index 17ae826..c3b0d3b 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/signup/ApplicationSignUpBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/signup/ApplicationSignUpBean.java
@@ -33,17 +33,8 @@ public class ApplicationSignUpBean implements Serializable {
private static final long serialVersionUID = -3055522170914869018L;
- private String applicationId;
private List<ArtifactRepositoryBean> artifactRepositories;
- public String getApplicationId() {
- return applicationId;
- }
-
- public void setApplicationId(String applicationId) {
- this.applicationId = applicationId;
- }
-
public List<ArtifactRepositoryBean> getArtifactRepositories() {
return artifactRepositories;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5d8f7d41/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 5e44d0e..512c4c4 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
@@ -1354,14 +1354,6 @@ public class StratosApiV41Utils {
throw new RestAPIException("Application signup is null");
}
- if(StringUtils.isBlank(applicationSignUpBean.getApplicationId())) {
- throw new RestAPIException("Application id in applicationBean signup is null");
- }
-
- if(!applicationId.equals(applicationSignUpBean.getApplicationId())) {
- throw new RestAPIException("Application id does not match with applicationBean id in applicationBean signup");
- }
-
try {
if(log.isInfoEnabled()) {
log.info(String.format("Adding applicationBean signup: [application-id] %s", applicationId));
@@ -1370,6 +1362,7 @@ public class StratosApiV41Utils {
int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
ApplicationSignUp applicationSignUp = ObjectConverter.convertApplicationSignUpBeanToStubApplicationSignUp(applicationSignUpBean);
+ applicationSignUp.setApplicationId(applicationId);
applicationSignUp.setTenantId(tenantId);
// Encrypt artifact repository passwords
@@ -1522,8 +1515,8 @@ public class StratosApiV41Utils {
try {
int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
- StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance();
if(domainMapppingsBean.getDomainMappings() != null) {
+ StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance();
for(DomainMappingBean domainMappingBean : domainMapppingsBean.getDomainMappings()) {
ClusterDataHolder clusterDataHolder = findClusterDataHolder(applicationId, domainMappingBean.getCartridgeAlias());
http://git-wip-us.apache.org/repos/asf/stratos/blob/5d8f7d41/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 de0c1db..962cc4d 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
@@ -1639,7 +1639,6 @@ public class ObjectConverter {
public static ApplicationSignUp convertApplicationSignUpBeanToStubApplicationSignUp(ApplicationSignUpBean applicationSignUpBean) {
ApplicationSignUp applicationSignUp = new ApplicationSignUp();
- applicationSignUp.setApplicationId(applicationSignUpBean.getApplicationId());
if(applicationSignUpBean.getArtifactRepositories() != null) {
List<ArtifactRepository> artifactRepositoryList = new ArrayList<ArtifactRepository>();
@@ -1663,7 +1662,6 @@ public class ObjectConverter {
public static ApplicationSignUpBean convertStubApplicationSignUpToApplicationSignUpBean(ApplicationSignUp applicationSignUp) {
ApplicationSignUpBean applicationSignUpBean = new ApplicationSignUpBean();
- applicationSignUpBean.setApplicationId(applicationSignUp.getApplicationId());
if(applicationSignUp.getArtifactRepositories() != null) {
List<ArtifactRepositoryBean> artifactRepositoryBeanList = new ArrayList<ArtifactRepositoryBean>();