Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/102c997d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/102c997d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/102c997d Branch: refs/heads/master Commit: 102c997df98466c219e6452fc4022f880b11bfb3 Parents: 1c9ad1c 1f615a1 Author: Imesh Gunaratne <[email protected]> Authored: Tue Mar 4 00:10:36 2014 -0500 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Mar 4 00:10:36 2014 -0500 ---------------------------------------------------------------------- .../cloud/controller/CloudControllerClient.java | 69 +- .../exception/InvalidPartitionException.java | 8 + .../exception/InvalidPolicyException.java | 8 +- .../exception/NonExistingLBException.java | 13 +- .../exception/PartitionValidationException.java | 18 +- .../exception/PolicyValidationException.java | 14 +- .../autoscaler/exception/SpawningException.java | 13 +- .../exception/TerminationException.java | 12 +- .../autoscaler/partition/PartitionManager.java | 8 +- .../stratos/cli/RestCommandLineService.java | 44 +- .../InvalidCartridgeDefinitionException.java | 13 +- .../InvalidCartridgeTypeException.java | 13 +- .../exception/InvalidClusterException.java | 13 +- .../exception/InvalidHostException.java | 13 +- .../exception/InvalidIaasProviderException.java | 13 +- .../exception/InvalidMemberException.java | 13 +- .../exception/InvalidPartitionException.java | 11 +- .../exception/InvalidRegionException.java | 11 + .../exception/InvalidXMLException.java | 11 + .../exception/InvalidZoneException.java | 11 + .../MalformedConfigurationFileException.java | 10 + .../exception/NoInstanceFoundException.java | 11 + .../exception/SerializationException.java | 11 + .../UnregisteredCartridgeException.java | 11 + .../exception/UnregisteredClusterException.java | 10 + .../cloud/controller/iaases/AWSEC2Iaas.java | 10 +- .../impl/CloudControllerServiceImpl.java | 233 +------ .../interfaces/CloudControllerService.java | 21 +- .../util/CloudControllerConstants.java | 1 + .../validate/AWSEC2PartitionValidator.java | 2 +- .../OpenstackNovaPartitionValidator.java | 2 +- .../manager/client/AutoscalerServiceClient.java | 268 +++----- .../client/CloudControllerServiceClient.java | 61 +- .../service/ServiceDeploymentManager.java | 5 +- .../UnregisteredCartridgeException.java | 6 + .../manager/CartridgeSubscriptionManager.java | 7 +- .../rest/endpoint/services/ServiceUtils.java | 407 +++++++---- .../src/main/resources/AutoScalerService.wsdl | 678 ++++++++++--------- .../pom.xml | 2 +- .../main/resources/CloudControllerService.wsdl | 96 ++- tools/puppet3-agent/config.sh | 3 +- 41 files changed, 1188 insertions(+), 996 deletions(-) ----------------------------------------------------------------------
