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 2014/10/31 14:58:56 UTC
[2/2] git commit: Updating cloud controller service stub bundle
exports
Updating cloud controller service stub bundle exports
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fe674def
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fe674def
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fe674def
Branch: refs/heads/docker-grouping-merge
Commit: fe674def54161db3f82e12b62eb0db81776456d7
Parents: 262f363
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri Oct 31 19:28:45 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Oct 31 19:28:45 2014 +0530
----------------------------------------------------------------------
.../interfaces/CloudControllerService.java | 24 +-
.../pojo/ApplicationClusterContext.java | 6 +-
.../pojo/application/ApplicationContext.java | 6 +-
.../pojo/application/ComponentContext.java | 6 +-
.../pojo/application/DependencyContext.java | 8 +-
.../pojo/application/GroupContext.java | 6 +-
.../pojo/application/SubscribableContext.java | 7 +-
.../application/SubscribableInfoContext.java | 6 +-
.../controller/pojo/payload/MetaDataHolder.java | 5 +-
.../pom.xml | 3 +-
.../main/resources/CloudControllerService.wsdl | 1460 +++++++++---------
11 files changed, 778 insertions(+), 759 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe674def/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
index 835cc09..1ea57e4 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
@@ -19,15 +19,6 @@
package org.apache.stratos.cloud.controller.interfaces;
import org.apache.stratos.cloud.controller.deployment.partition.Partition;
-import org.apache.stratos.cloud.controller.exception.InvalidCartridgeDefinitionException;
-import org.apache.stratos.cloud.controller.exception.InvalidCartridgeTypeException;
-import org.apache.stratos.cloud.controller.exception.InvalidClusterException;
-import org.apache.stratos.cloud.controller.exception.InvalidIaasProviderException;
-import org.apache.stratos.cloud.controller.exception.InvalidMemberException;
-import org.apache.stratos.cloud.controller.exception.InvalidPartitionException;
-import org.apache.stratos.cloud.controller.exception.MemberTerminationFailedException;
-import org.apache.stratos.cloud.controller.exception.UnregisteredCartridgeException;
-import org.apache.stratos.cloud.controller.exception.UnregisteredClusterException;
import org.apache.stratos.cloud.controller.exception.*;
import org.apache.stratos.cloud.controller.pojo.*;
import org.apache.stratos.cloud.controller.pojo.application.ApplicationContext;
@@ -46,7 +37,7 @@ public interface CloudControllerService {
* @throws InvalidIaasProviderException if the iaas providers configured are not valid.
* @throws IllegalArgumentException if the provided argument is not valid.
*/
- void deployCartridgeDefinition(CartridgeConfig cartridgeConfig)
+ void deployCartridgeDefinition(CartridgeConfig cartridgeConfig)
throws InvalidCartridgeDefinitionException, InvalidIaasProviderException;
/**
@@ -77,9 +68,9 @@ public interface CloudControllerService {
boolean validatePartition(Partition partition) throws InvalidPartitionException;
/**
- * Validate a given {@link DeploymentPolicy} against a Cartridge.
- * @param cartridgeType type of the cartridge that this policy is going to be attached to.
- * @param deploymentPolicy policy to be validated.
+ * Validate a given deployment policy.
+ * @param cartridgeType type of the cartridge
+ * @param partitions partitions
* @return whether the policy is a valid one against the given Cartridge.
* @throws InvalidPartitionException if the policy contains at least one invalid partition.
* @throws InvalidCartridgeTypeException if the given Cartridge type is not a valid one.
@@ -93,7 +84,7 @@ public interface CloudControllerService {
* present service cluster, if there is any. A service cluster is uniquely identified by its
* domain and sub domain combination.
* </p>
- * @param clusterContext information about the new subscription.
+ * @param registrant information about the new subscription.
* @return whether the registration is successful or not.
*
* @throws UnregisteredCartridgeException
@@ -107,7 +98,7 @@ public interface CloudControllerService {
* to the provided Cluster ID. Also note that the instance that is starting up
* belongs to the group whose name is derived from its Cluster ID, replacing <i>.</i>
* by a hyphen (<i>-</i>).
- * @param Member Context with cluster id, partition etc.
+ * @param member Context with cluster id, partition etc.
* @return updated {@link MemberContext}
* @throws UnregisteredCartridgeException if the requested Cartridge type is not a registered one.
* @throws InvalidIaasProviderException if the iaas requested is not valid.
@@ -127,9 +118,6 @@ public interface CloudControllerService {
*
* @param memberId
* member ID of the instance to be terminated.
- * @param partition
- * It contains the region, zone, network and host of a IaaS where
- * an instance need to be terminated..
* @return whether an instance terminated successfully or not.
*/
void terminateInstance(String memberId) throws InvalidMemberException, InvalidCartridgeTypeException;
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe674def/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java
index 8fa9fee..030a38a 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ApplicationClusterContext.java
@@ -19,7 +19,11 @@
package org.apache.stratos.cloud.controller.pojo;
-public class ApplicationClusterContext {
+import java.io.Serializable;
+
+public class ApplicationClusterContext implements Serializable {
+
+ private static final long serialVersionUID = 9040883765827407542L;
// cluster id
private String clusterId;
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe674def/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ApplicationContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ApplicationContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ApplicationContext.java
index 3a8af44..804babf 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ApplicationContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ApplicationContext.java
@@ -19,7 +19,11 @@
package org.apache.stratos.cloud.controller.pojo.application;
-public class ApplicationContext {
+import java.io.Serializable;
+
+public class ApplicationContext implements Serializable {
+
+ private static final long serialVersionUID = 6704036501869668646L;
private int tenantId;
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe674def/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ComponentContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ComponentContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ComponentContext.java
index d1a13a5..3831b26 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ComponentContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/ComponentContext.java
@@ -19,7 +19,11 @@
package org.apache.stratos.cloud.controller.pojo.application;
-public class ComponentContext {
+import java.io.Serializable;
+
+public class ComponentContext implements Serializable {
+
+ private static final long serialVersionUID = -3841830873207967496L;
private GroupContext[] groupContexts;
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe674def/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/DependencyContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/DependencyContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/DependencyContext.java
index 0459f36..bf79f53 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/DependencyContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/DependencyContext.java
@@ -20,8 +20,12 @@
package org.apache.stratos.cloud.controller.pojo.application;
-public class DependencyContext {
-
+import java.io.Serializable;
+
+public class DependencyContext implements Serializable {
+
+ private static final long serialVersionUID = 6211713487242343226L;
+
private String [] startupOrdersContexts;
private String killBehaviour;
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe674def/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/GroupContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/GroupContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/GroupContext.java
index fda4bec..e0504af 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/GroupContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/GroupContext.java
@@ -19,7 +19,11 @@
package org.apache.stratos.cloud.controller.pojo.application;
-public class GroupContext {
+import java.io.Serializable;
+
+public class GroupContext implements Serializable{
+
+ private static final long serialVersionUID = 1595266728968445926L;
private String name;
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe674def/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/SubscribableContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/SubscribableContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/SubscribableContext.java
index 6f7f4bc..88d8f75 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/SubscribableContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/SubscribableContext.java
@@ -19,13 +19,16 @@
package org.apache.stratos.cloud.controller.pojo.application;
-public class SubscribableContext {
+import java.io.Serializable;
+
+public class SubscribableContext implements Serializable {
+
+ private static final long serialVersionUID = 3853456523070318925L;
private String type;
private String alias;
-
public String getType() {
return type;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe674def/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/SubscribableInfoContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/SubscribableInfoContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/SubscribableInfoContext.java
index 5f75a7c..5c6bda8 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/SubscribableInfoContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/application/SubscribableInfoContext.java
@@ -19,7 +19,11 @@
package org.apache.stratos.cloud.controller.pojo.application;
-public class SubscribableInfoContext {
+import java.io.Serializable;
+
+public class SubscribableInfoContext implements Serializable {
+
+ private static final long serialVersionUID = -6874644941002783034L;
private String alias;
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe674def/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/payload/MetaDataHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/payload/MetaDataHolder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/payload/MetaDataHolder.java
index 3db9f71..662e481 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/payload/MetaDataHolder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/payload/MetaDataHolder.java
@@ -19,13 +19,16 @@
package org.apache.stratos.cloud.controller.pojo.payload;
+import java.io.Serializable;
import java.util.Properties;
/**
* Holds payload/meta data related to a cluster
*/
-public class MetaDataHolder {
+public class MetaDataHolder implements Serializable {
+
+ private static final long serialVersionUID = -3015788285718847360L;
private String appId;
http://git-wip-us.apache.org/repos/asf/stratos/blob/fe674def/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml b/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
index 8576d09..6f61083 100644
--- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
@@ -92,7 +92,8 @@
org.apache.stratos.cloud.controller.stub.deployment.partition.*; version=${project.version},
org.apache.stratos.cloud.controller.stub.pojo.*; version=${project.version},
org.apache.stratos.cloud.controller.stub.impl.*; version=${project.version},
- org.apache.stratos.cloud.controller.stub.*; version=${project.version}
+ org.apache.stratos.cloud.controller.stub.*; version=${project.version},
+ org.apache.stratos.cloud.controller.pojo.application.xsd.*; version=${project.version},
</Export-Package>
<Import-Package>
*;resolution:=optional