You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/04/22 10:55:00 UTC
[5/6] stratos git commit: Merge branch 'instances'
Merge branch 'instances'
Conflicts:
service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/3448ce7d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3448ce7d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3448ce7d
Branch: refs/heads/master
Commit: 3448ce7db0f2eba13aaf546f96cc1d48a7349345
Parents: dda2bbe 6e78131
Author: reka <rt...@gmail.com>
Authored: Wed Apr 22 14:18:56 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Wed Apr 22 14:18:56 2015 +0530
----------------------------------------------------------------------
.../monitor/component/ApplicationMonitor.java | 6 +-
.../monitor/component/GroupMonitor.java | 29 +-
.../component/ParentComponentMonitor.java | 10 +-
.../autoscaler/services/AutoscalerService.java | 9 +
.../services/impl/AutoscalerServiceImpl.java | 49 ++
.../stratos/autoscaler/util/AutoscalerUtil.java | 156 ++++-
.../common/client/AutoscalerServiceClient.java | 8 +-
.../domain/application/ParentComponent.java | 34 +
.../rest/endpoint/api/StratosApiV41.java | 29 +
.../rest/endpoint/api/StratosApiV41Utils.java | 48 ++
.../single-group-v3/artifacts/application.json | 4 +-
.../src/main/resources/AutoscalerService.wsdl | 666 ++++++++++---------
12 files changed, 707 insertions(+), 341 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/3448ce7d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/3448ce7d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/3448ce7d/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/3448ce7d/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index 4df702f,f1f4dfe..e023ab9
--- 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
@@@ -627,16 -598,37 +627,45 @@@ public class StratosApiV41 extends Abst
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/addApplication")
public Response addApplication(ApplicationBean applicationDefinition) throws RestAPIException {
- StratosApiV41Utils.addApplication(applicationDefinition, getConfigContext(), getUsername(), getTenantDomain());
+ try {
+ StratosApiV41Utils.addApplication(applicationDefinition, getConfigContext(), getUsername(), getTenantDomain());
- URI url = uriInfo.getAbsolutePathBuilder().path(applicationDefinition.getApplicationId()).build();
- return Response.created(url).entity(new SuccessResponseBean(Response.Status.CREATED.getStatusCode(),
- String.format("Application added successfully: [application] %s",
- applicationDefinition.getApplicationId()))).build();
+ URI url = uriInfo.getAbsolutePathBuilder().path(applicationDefinition.getApplicationId()).build();
+ return Response.created(url).entity(new SuccessResponseBean(Response.Status.CREATED.getStatusCode(),
+ String.format("Application added successfully: [application] %s",
+ applicationDefinition.getApplicationId()))).build();
+ } catch (RestAPIException e) {
+ if (e.getMessage().contains("already exists")) {
+ return Response.status(Response.Status.CONFLICT).build();
++ } else {
++ throw e;
++ }
++ }
+ }
+
+ /**
+ * Add application
+ *
+ * @param applicationDefinition Application Definition
+ * @return 201 if application is successfully added
+ * @throws RestAPIException
+ */
+ @PUT
+ @Path("/applications")
+ @Produces("application/json")
+ @Consumes("application/json")
+ @AuthorizationAction("/permission/protected/manage/addApplication")
+ public Response updateApplication(ApplicationBean applicationDefinition) throws RestAPIException {
+ try {
+ StratosApiV41Utils.updateApplication(applicationDefinition, getConfigContext(), getUsername(), getTenantDomain());
+
+ URI url = uriInfo.getAbsolutePathBuilder().path(applicationDefinition.getApplicationId()).build();
+ return Response.created(url).entity(new SuccessResponseBean(Response.Status.CREATED.getStatusCode(),
+ String.format("Application added successfully: [application] %s",
+ applicationDefinition.getApplicationId()))).build();
+ } catch (RestAPIException e) {
+ if (e.getMessage().contains("already exists")) {
+ return Response.status(Response.Status.CONFLICT).build();
} else {
throw e;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/3448ce7d/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/3448ce7d/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl
----------------------------------------------------------------------
diff --cc service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl
index 1159c70,649f3cb..9d52f7a
--- a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl
+++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl
@@@ -196,10 -197,10 +197,10 @@@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="getDeploymentPolicy">
- <xs:element name="updateDeployementPolicy">
++ <xs:element name="updateDeploymentPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicyID" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="deploymentPolicy" nillable="true" type="ax29:DeploymentPolicy"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@@ -1197,15 -1212,24 +1212,6 @@@
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="removeDeployementPolicy">
- <soap:operation soapAction="urn:removeDeployementPolicy" style="document"/>
- <wsdl:operation name="updateDeployementPolicy">
- <soap:operation soapAction="urn:updateDeployementPolicy" style="document"/>
-- <wsdl:input>
-- <soap:body use="literal"/>
-- </wsdl:input>
- <wsdl:fault name="AutoscalerServiceInvalidPolicyException">
- <soap:fault use="literal" name="AutoscalerServiceInvalidPolicyException"/>
- </wsdl:fault>
- <wsdl:fault name="AutoscalerServiceRemoteException">
- <soap:fault use="literal" name="AutoscalerServiceRemoteException"/>
- </wsdl:fault>
-- <wsdl:fault name="AutoscalerServiceDeploymentPolicyNotExistsException">
-- <soap:fault use="literal" name="AutoscalerServiceDeploymentPolicyNotExistsException"/>
- </wsdl:fault>
- <wsdl:fault name="AutoscalerServiceInvalidDeploymentPolicyException">
- <soap:fault use="literal" name="AutoscalerServiceInvalidDeploymentPolicyException"/>
-- </wsdl:fault>
-- </wsdl:operation>
<wsdl:operation name="updateAutoScalingPolicy">
<soap:operation soapAction="urn:updateAutoScalingPolicy" style="document"/>
<wsdl:input>
@@@ -1263,26 -1296,14 +1278,32 @@@
<soap:fault use="literal" name="AutoscalerServiceInvalidArgumentException"/>
</wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="undeployApplication">
+ <soap:operation soapAction="urn:undeployApplication" style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ </wsdl:operation>
+ <wsdl:operation name="updateDeploymentPolicy">
+ <soap:operation soapAction="urn:updateDeploymentPolicy" style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:fault name="AutoscalerServiceInvalidPolicyException">
+ <soap:fault use="literal" name="AutoscalerServiceInvalidPolicyException"/>
+ </wsdl:fault>
+ <wsdl:fault name="AutoscalerServiceRemoteException">
+ <soap:fault use="literal" name="AutoscalerServiceRemoteException"/>
+ </wsdl:fault>
+ <wsdl:fault name="AutoscalerServiceDeploymentPolicyNotExistsException">
+ <soap:fault use="literal" name="AutoscalerServiceDeploymentPolicyNotExistsException"/>
+ </wsdl:fault>
+ <wsdl:fault name="AutoscalerServiceInvalidDeploymentPolicyException">
+ <soap:fault use="literal" name="AutoscalerServiceInvalidDeploymentPolicyException"/>
+ </wsdl:fault>
+ </wsdl:operation>
- <wsdl:operation name="undeployApplication">
- <soap:operation soapAction="urn:undeployApplication" style="document"/>
+ <wsdl:operation name="removeServiceGroup">
+ <soap:operation soapAction="urn:removeServiceGroup" style="document"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
@@@ -1509,15 -1533,24 +1533,6 @@@
<soap12:body use="literal"/>
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="removeDeployementPolicy">
- <soap12:operation soapAction="urn:removeDeployementPolicy" style="document"/>
- <wsdl:operation name="updateDeployementPolicy">
- <soap12:operation soapAction="urn:updateDeployementPolicy" style="document"/>
-- <wsdl:input>
-- <soap12:body use="literal"/>
-- </wsdl:input>
- <wsdl:fault name="AutoscalerServiceInvalidPolicyException">
- <soap12:fault use="literal" name="AutoscalerServiceInvalidPolicyException"/>
- </wsdl:fault>
- <wsdl:fault name="AutoscalerServiceRemoteException">
- <soap12:fault use="literal" name="AutoscalerServiceRemoteException"/>
- </wsdl:fault>
-- <wsdl:fault name="AutoscalerServiceDeploymentPolicyNotExistsException">
-- <soap12:fault use="literal" name="AutoscalerServiceDeploymentPolicyNotExistsException"/>
- </wsdl:fault>
- <wsdl:fault name="AutoscalerServiceInvalidDeploymentPolicyException">
- <soap12:fault use="literal" name="AutoscalerServiceInvalidDeploymentPolicyException"/>
-- </wsdl:fault>
-- </wsdl:operation>
<wsdl:operation name="updateAutoScalingPolicy">
<soap12:operation soapAction="urn:updateAutoScalingPolicy" style="document"/>
<wsdl:input>
@@@ -1575,26 -1617,14 +1599,32 @@@
<soap12:fault use="literal" name="AutoscalerServiceInvalidArgumentException"/>
</wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="undeployApplication">
+ <soap12:operation soapAction="urn:undeployApplication" style="document"/>
+ <wsdl:input>
+ <soap12:body use="literal"/>
+ </wsdl:input>
+ </wsdl:operation>
+ <wsdl:operation name="updateDeploymentPolicy">
+ <soap12:operation soapAction="urn:updateDeploymentPolicy" style="document"/>
+ <wsdl:input>
+ <soap12:body use="literal"/>
+ </wsdl:input>
+ <wsdl:fault name="AutoscalerServiceInvalidPolicyException">
+ <soap12:fault use="literal" name="AutoscalerServiceInvalidPolicyException"/>
+ </wsdl:fault>
+ <wsdl:fault name="AutoscalerServiceRemoteException">
+ <soap12:fault use="literal" name="AutoscalerServiceRemoteException"/>
+ </wsdl:fault>
+ <wsdl:fault name="AutoscalerServiceDeploymentPolicyNotExistsException">
+ <soap12:fault use="literal" name="AutoscalerServiceDeploymentPolicyNotExistsException"/>
+ </wsdl:fault>
+ <wsdl:fault name="AutoscalerServiceInvalidDeploymentPolicyException">
+ <soap12:fault use="literal" name="AutoscalerServiceInvalidDeploymentPolicyException"/>
+ </wsdl:fault>
+ </wsdl:operation>
- <wsdl:operation name="undeployApplication">
- <soap12:operation soapAction="urn:undeployApplication" style="document"/>
+ <wsdl:operation name="removeServiceGroup">
+ <soap12:operation soapAction="urn:removeServiceGroup" style="document"/>
<wsdl:input>
<soap12:body use="literal"/>
</wsdl:input>
@@@ -1770,12 -1803,12 +1803,6 @@@
<mime:content type="text/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
- <wsdl:operation name="removeDeployementPolicy">
- <http:operation location="removeDeployementPolicy"/>
- <wsdl:operation name="updateDeployementPolicy">
- <http:operation location="updateDeployementPolicy"/>
-- <wsdl:input>
-- <mime:content type="text/xml" part="parameters"/>
-- </wsdl:input>
-- </wsdl:operation>
<wsdl:operation name="updateAutoScalingPolicy">
<http:operation location="updateAutoScalingPolicy"/>
<wsdl:input>
@@@ -1827,12 -1866,6 +1860,12 @@@
<mime:content type="text/xml" part="parameters"/>
</wsdl:input>
</wsdl:operation>
- <wsdl:operation name="undeployApplication">
- <http:operation location="undeployApplication"/>
++ <wsdl:operation name="updateDeploymentPolicy">
++ <http:operation location="updateDeploymentPolicy"/>
+ <wsdl:input>
+ <mime:content type="text/xml" part="parameters"/>
+ </wsdl:input>
+ </wsdl:operation>
<wsdl:operation name="removeServiceGroup">
<http:operation location="removeServiceGroup"/>
<wsdl:input>