You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by me...@apache.org on 2014/06/26 22:31:49 UTC

[1/7] initial grouping code to develop cartridge grouping feature

Repository: stratos
Updated Branches:
  refs/heads/4.0.0-grouping [created] 67e868eb6


http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/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 ac16821..f528064 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
@@ -1,960 +1,1081 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ax220="http://partition.deployment.controller.cloud.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ax221="http://pojo.controller.cloud.stratos.apache.org/xsd" xmlns:ns="http://impl.controller.cloud.stratos.apache.org" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax218="http://exception.controller.cloud.stratos.apache.org/xsd" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://impl.controller.cloud.stratos.apache.org">
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ax220="http://exception.controller.cloud.stratos.apache.org/xsd" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ns="http://impl.controller.cloud.stratos.apache.org" xmlns:ax222="http://partition.deployment.controller.cloud.stratos.apache.org/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ax218="http://pojo.controller.cloud.stratos.apache.org/xsd" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://impl.controller.cloud.stratos.apache.org">
     <wsdl:documentation>CloudControllerService</wsdl:documentation>
     <wsdl:types>
         <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.controller.cloud.stratos.apache.org/xsd">
-            <xs:complexType name="InvalidPartitionException">
+            <xs:complexType name="InvalidCartridgeDefinitionException">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="UnregisteredClusterException">
+            <xs:complexType name="InvalidIaasProviderException">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="UnregisteredCartridgeException">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="InvalidCartridgeDefinitionException">
+            <xs:complexType name="InvalidCompositeApplicationDefinitionException">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="InvalidIaasProviderException">
+            <xs:complexType name="InvalidPartitionException">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="InvalidCartridgeTypeException">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="InvalidMemberException">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="InvalidClusterException">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
+                </xs:sequence>
+            </xs:complexType>
+            <xs:complexType name="UnregisteredClusterException">
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
         </xs:schema>
-        <xs:schema xmlns:ax219="http://exception.controller.cloud.stratos.apache.org/xsd" xmlns:ax223="http://partition.deployment.controller.cloud.stratos.apache.org/xsd" xmlns:ax224="http://pojo.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.controller.cloud.stratos.apache.org">
-            <xs:import namespace="http://exception.controller.cloud.stratos.apache.org/xsd"/>
-            <xs:import namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"/>
-            <xs:import namespace="http://pojo.controller.cloud.stratos.apache.org/xsd"/>
-            <xs:element name="CloudControllerServiceInvalidPartitionException">
+        <xs:schema xmlns:ax219="http://pojo.controller.cloud.stratos.apache.org/xsd" xmlns:ax221="http://exception.controller.cloud.stratos.apache.org/xsd" xmlns:ax224="http://partition.deployment.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.controller.cloud.stratos.apache.org">
+            <xs:import namespace="http://pojo.controller.cloud.stratos.apache.org/xsd"></xs:import>
+            <xs:import namespace="http://exception.controller.cloud.stratos.apache.org/xsd"></xs:import>
+            <xs:import namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"></xs:import>
+            <xs:element name="getClusterContext">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax219:InvalidPartitionException"/>
+                        <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="validatePartition">
+            <xs:element name="getClusterContextResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="partition" nillable="true" type="ax220:Partition"/>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ax219:ClusterContext"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="validatePartitionResponse">
+            <xs:element name="CloudControllerServiceInvalidCartridgeDefinitionException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+                        <xs:element minOccurs="0" name="InvalidCartridgeDefinitionException" nillable="true" type="ax220:InvalidCartridgeDefinitionException"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="CloudControllerServiceUnregisteredClusterException">
+            <xs:element name="CloudControllerServiceInvalidIaasProviderException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="UnregisteredClusterException" nillable="true" type="ax219:UnregisteredClusterException"/>
+                        <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax220:InvalidIaasProviderException"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="unregisterService">
+            <xs:element name="deployCartridgeDefinition">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax219:CartridgeConfig"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="CloudControllerServiceUnregisteredCartridgeException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="UnregisteredCartridgeException" nillable="true" type="ax219:UnregisteredCartridgeException"/>
+                        <xs:element minOccurs="0" name="UnregisteredCartridgeException" nillable="true" type="ax220:UnregisteredCartridgeException"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="getCartridgeInfo">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="getCartridgeInfoResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="ax221:CartridgeInfo"/>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ax219:CartridgeInfo"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="CloudControllerServiceInvalidCartridgeDefinitionException">
+            <xs:element name="CloudControllerServiceInvalidCompositeApplicationDefinitionException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="InvalidCartridgeDefinitionException" nillable="true" type="ax219:InvalidCartridgeDefinitionException"/>
+                        <xs:element minOccurs="0" name="InvalidCompositeApplicationDefinitionException" nillable="true" type="ax220:InvalidCompositeApplicationDefinitionException"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="CloudControllerServiceInvalidIaasProviderException">
+            <xs:element name="deployCompositeApplicationDefinition">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax219:InvalidIaasProviderException"/>
+                        <xs:element minOccurs="0" name="compositeApplicationDefinition" nillable="true" type="ax219:CompositeApplicationDefinition"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="deployCartridgeDefinition">
+            <xs:element name="CloudControllerServiceInvalidPartitionException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="cartridgeConfig" nillable="true" type="ax221:CartridgeConfig"/>
+                        <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax220:InvalidPartitionException"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="CloudControllerServiceInvalidCartridgeTypeException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax219:InvalidCartridgeTypeException"/>
+                        <xs:element minOccurs="0" name="InvalidCartridgeTypeException" nillable="true" type="ax220:InvalidCartridgeTypeException"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="validateDeploymentPolicy">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax220:Partition"/>
+                        <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax222:Partition"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="validateDeploymentPolicyResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+                        <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="unDeployCompositeApplicationDefinition">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="appAlias" nillable="true" type="xs:string"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="undeployCartridgeDefinition">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="startInstance">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="memberContext" nillable="true" type="ax221:MemberContext"/>
+                        <xs:element minOccurs="0" name="memberContext" nillable="true" type="ax219:MemberContext"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="startInstanceResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="ax221:MemberContext"/>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="ax219:MemberContext"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="CloudControllerServiceInvalidMemberException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax219:InvalidMemberException"/>
+                        <xs:element minOccurs="0" name="InvalidMemberException" nillable="true" type="ax220:InvalidMemberException"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="terminateInstance">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="CloudControllerServiceInvalidClusterException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax219:InvalidClusterException"/>
+                        <xs:element minOccurs="0" name="InvalidClusterException" nillable="true" type="ax220:InvalidClusterException"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="terminateAllInstances">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="getRegisteredCartridges">
                 <xs:complexType>
-                    <xs:sequence/>
+                    <xs:sequence></xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="getRegisteredCartridgesResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"/>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="xs:string"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getClusterContext">
+            <xs:element name="CloudControllerServiceUnregisteredClusterException">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="UnregisteredClusterException" nillable="true" type="ax220:UnregisteredClusterException"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="getClusterContextResponse">
+            <xs:element name="unregisterService">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="validatePartition">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" nillable="true" type="ax221:ClusterContext"/>
+                        <xs:element minOccurs="0" name="partition" nillable="true" type="ax222:Partition"></xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="validatePartitionResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="registerService">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="registrant" nillable="true" type="ax221:Registrant"/>
+                        <xs:element minOccurs="0" name="registrant" nillable="true" type="ax219:Registrant"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
             <xs:element name="registerServiceResponse">
                 <xs:complexType>
                     <xs:sequence>
-                        <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+                        <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
         </xs:schema>
+        <xs:schema xmlns:ax223="http://pojo.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd">
+            <xs:import namespace="http://pojo.controller.cloud.stratos.apache.org/xsd"></xs:import>
+            <xs:complexType name="Partition">
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="partitionMax" type="xs:int"></xs:element>
+                    <xs:element minOccurs="0" name="partitionMin" type="xs:int"></xs:element>
+                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax218:Properties"></xs:element>
+                    <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element>
+                </xs:sequence>
+            </xs:complexType>
+        </xs:schema>
         <xs:schema xmlns:ax225="http://partition.deployment.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.controller.cloud.stratos.apache.org/xsd">
-            <xs:import namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"/>
-            <xs:complexType name="Properties">
+            <xs:import namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"></xs:import>
+            <xs:complexType name="ClusterContext">
                 <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax221:Property"/>
+                    <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"></xs:element>
+                    <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="timeoutInMillis" type="xs:long"></xs:element>
+                    <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax218:Volume"></xs:element>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="Property">
+            <xs:complexType name="Volume">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="device" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="iaasType" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="mappingPath" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="removeOntermination" type="xs:boolean"></xs:element>
+                    <xs:element minOccurs="0" name="size" type="xs:int"></xs:element>
+                    <xs:element minOccurs="0" name="snapshotId" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="volumeId" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="CartridgeInfo">
+            <xs:complexType name="CartridgeConfig">
                 <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax221:AppType"/>
-                    <xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="defaultAutoscalingPolicy" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="defaultDeploymentPolicy" nillable="true" type="xs:string"/>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="deploymentDirs" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax221:LoadbalancerConfig"/>
-                    <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"/>
-                    <xs:element minOccurs="0" name="persistence" nillable="true" type="ax221:Persistence"/>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax221:PortMapping"/>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax221:Property"/>
-                    <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="version" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="defaultAutoscalingPolicy" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="defaultDeploymentPolicy" nillable="true" type="xs:string"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="deploymentDirs" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="iaasConfigs" nillable="true" type="ax218:IaasConfig"></xs:element>
+                    <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax218:LoadbalancerConfig"></xs:element>
+                    <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"></xs:element>
+                    <xs:element minOccurs="0" name="persistence" nillable="true" type="ax218:Persistence"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax218:PortMapping"></xs:element>
+                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax218:Properties"></xs:element>
+                    <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="serviceGroup" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="version" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="AppType">
+            <xs:complexType name="IaasConfig">
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="className" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="credential" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="identity" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="imageId" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="maxInstanceLimit" type="xs:int"></xs:element>
+                    <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="networkInterfaces" nillable="true" type="ax218:NetworkInterfaces"></xs:element>
+                    <xs:element minOccurs="0" name="payload" nillable="true" type="xs:base64Binary"></xs:element>
+                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax218:Properties"></xs:element>
+                    <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element>
+                </xs:sequence>
+            </xs:complexType>
+            <xs:complexType name="NetworkInterfaces">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="appSpecificMapping" type="xs:boolean"/>
-                    <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="networkInterfaces" nillable="true" type="ax218:NetworkInterface"></xs:element>
+                </xs:sequence>
+            </xs:complexType>
+            <xs:complexType name="NetworkInterface">
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="fixedIp" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="networkUuid" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="portUuid" nillable="true" type="xs:string"></xs:element>
+                </xs:sequence>
+            </xs:complexType>
+            <xs:complexType name="Properties">
+                <xs:sequence>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax218:Property"></xs:element>
+                </xs:sequence>
+            </xs:complexType>
+            <xs:complexType name="Property">
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="LoadbalancerConfig">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax221:Properties"/>
-                    <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax218:Properties"></xs:element>
+                    <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
             <xs:complexType name="Persistence">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="persistanceRequired" type="xs:boolean"/>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax221:Volume"/>
+                    <xs:element minOccurs="0" name="persistanceRequired" type="xs:boolean"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax218:Volume"></xs:element>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="Volume">
+            <xs:complexType name="PortMapping">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="device" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="iaasType" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="mappingPath" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="removeOntermination" type="xs:boolean"/>
-                    <xs:element minOccurs="0" name="size" type="xs:int"/>
+                    <xs:element minOccurs="0" name="port" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="protocol" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="proxyPort" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="PortMapping">
+            <xs:complexType name="CartridgeInfo">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="port" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="protocol" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="proxyPort" nillable="true" type="xs:string"/>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="appTypes" nillable="true" type="ax218:AppType"></xs:element>
+                    <xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="defaultAutoscalingPolicy" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="defaultDeploymentPolicy" nillable="true" type="xs:string"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="deploymentDirs" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax218:LoadbalancerConfig"></xs:element>
+                    <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"></xs:element>
+                    <xs:element minOccurs="0" name="persistence" nillable="true" type="ax218:Persistence"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax218:PortMapping"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax218:Property"></xs:element>
+                    <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="version" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="CartridgeConfig">
+            <xs:complexType name="AppType">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="baseDir" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="defaultAutoscalingPolicy" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="defaultDeploymentPolicy" nillable="true" type="xs:string"/>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="deploymentDirs" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="iaasConfigs" nillable="true" type="ax221:IaasConfig"/>
-                    <xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax221:LoadbalancerConfig"/>
-                    <xs:element minOccurs="0" name="multiTenant" type="xs:boolean"/>
-                    <xs:element minOccurs="0" name="persistence" nillable="true" type="ax221:Persistence"/>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="portMappings" nillable="true" type="ax221:PortMapping"/>
-                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax221:Properties"/>
-                    <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="serviceGroup" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="version" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="appSpecificMapping" type="xs:boolean"></xs:element>
+                    <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="IaasConfig">
+            <xs:complexType name="CompositeApplicationDefinition">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="className" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="credential" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="identity" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="imageId" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="maxInstanceLimit" type="xs:int"/>
-                    <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="networkInterfaces" nillable="true" type="ax221:NetworkInterfaces"/>
-                    <xs:element minOccurs="0" name="payload" nillable="true" type="xs:base64Binary"/>
-                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax221:Properties"/>
-                    <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="type" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="applicationId" nillable="true" type="xs:string"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="cartridges" nillable="true" type="ax218:ConfigCartridge"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="components" nillable="true" type="ax218:ConfigGroup"></xs:element>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="NetworkInterfaces">
+            <xs:complexType name="ConfigCartridge">
                 <xs:sequence>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="networkInterfaces" nillable="true" type="ax221:NetworkInterface"/>
+                    <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="NetworkInterface">
+            <xs:complexType name="ConfigGroup">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="fixedIp" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="networkUuid" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="portUuid" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="alias" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="dependencies" nillable="true" type="ax218:ConfigDependencies"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="subscribables" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="MemberContext">
+            <xs:complexType name="ConfigDependencies">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="allocatedIpAddress" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="initTime" type="xs:long"/>
-                    <xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="lbClusterId" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="nodeId" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="partition" nillable="true" type="ax220:Partition"/>
-                    <xs:element minOccurs="0" name="privateIpAddress" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="publicIpAddress" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="kill_behavior" nillable="true" type="xs:string"></xs:element>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="startup_order" nillable="true" type="ax218:ConfigDependencyPair"></xs:element>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="ClusterContext">
+            <xs:complexType name="ConfigDependencyPair">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"/>
-                    <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="timeoutInMillis" type="xs:long"/>
-                    <xs:element minOccurs="0" name="volumeRequired" type="xs:boolean"/>
-                    <xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax221:Volume"/>
+                    <xs:element minOccurs="0" name="key" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
-            <xs:complexType name="Registrant">
+            <xs:complexType name="MemberContext">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="autoScalerPolicyName" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax221:Properties"/>
-                    <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="allocatedIpAddress" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="initTime" type="xs:long"></xs:element>
+                    <xs:element minOccurs="0" name="instanceId" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="lbClusterId" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="memberId" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="networkPartitionId" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="nodeId" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="partition" nillable="true" type="ax222:Partition"></xs:element>
+                    <xs:element minOccurs="0" name="privateIpAddress" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="publicIpAddress" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
-        </xs:schema>
-        <xs:schema xmlns:ax222="http://pojo.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd">
-            <xs:import namespace="http://pojo.controller.cloud.stratos.apache.org/xsd"/>
-            <xs:complexType name="Partition">
+            <xs:complexType name="Registrant">
                 <xs:sequence>
-                    <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
-                    <xs:element minOccurs="0" name="partitionMax" type="xs:int"/>
-                    <xs:element minOccurs="0" name="partitionMin" type="xs:int"/>
-                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax221:Properties"/>
-                    <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/>
+                    <xs:element minOccurs="0" name="autoScalerPolicyName" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"></xs:element>
+                    <xs:element minOccurs="0" name="persistence" nillable="true" type="ax218:Persistence"></xs:element>
+                    <xs:element minOccurs="0" name="properties" nillable="true" type="ax218:Properties"></xs:element>
+                    <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"></xs:element>
                 </xs:sequence>
             </xs:complexType>
         </xs:schema>
     </wsdl:types>
     <wsdl:message name="validatePartitionRequest">
-        <wsdl:part name="parameters" element="ns:validatePartition"/>
+        <wsdl:part name="parameters" element="ns:validatePartition"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="validatePartitionResponse">
-        <wsdl:part name="parameters" element="ns:validatePartitionResponse"/>
+        <wsdl:part name="parameters" element="ns:validatePartitionResponse"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="CloudControllerServiceInvalidPartitionException">
-        <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidPartitionException"/>
+        <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidPartitionException"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="validateDeploymentPolicyRequest">
-        <wsdl:part name="parameters" element="ns:validateDeploymentPolicy"/>
+        <wsdl:part name="parameters" element="ns:validateDeploymentPolicy"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="validateDeploymentPolicyResponse">
-        <wsdl:part name="parameters" element="ns:validateDeploymentPolicyResponse"/>
+        <wsdl:part name="parameters" element="ns:validateDeploymentPolicyResponse"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="CloudControllerServiceInvalidCartridgeTypeException">
-        <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidCartridgeTypeException"/>
+        <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidCartridgeTypeException"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="terminateInstanceRequest">
-        <wsdl:part name="parameters" element="ns:terminateInstance"/>
+        <wsdl:part name="parameters" element="ns:terminateInstance"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="CloudControllerServiceInvalidMemberException">
-        <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidMemberException"/>
+        <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidMemberException"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="registerServiceRequest">
-        <wsdl:part name="parameters" element="ns:registerService"/>
+        <wsdl:part name="parameters" element="ns:registerService"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="registerServiceResponse">
-        <wsdl:part name="parameters" element="ns:registerServiceResponse"/>
+        <wsdl:part name="parameters" element="ns:registerServiceResponse"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="CloudControllerServiceUnregisteredCartridgeException">
-        <wsdl:part name="parameters" element="ns:CloudControllerServiceUnregisteredCartridgeException"/>
+        <wsdl:part name="parameters" element="ns:CloudControllerServiceUnregisteredCartridgeException"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="deployCartridgeDefinitionRequest">
-        <wsdl:part name="parameters" element="ns:deployCartridgeDefinition"/>
+        <wsdl:part name="parameters" element="ns:deployCartridgeDefinition"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="CloudControllerServiceInvalidCartridgeDefinitionException">
-        <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidCartridgeDefinitionException"/>
+        <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidCartridgeDefinitionException"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="CloudControllerServiceInvalidIaasProviderException">
-        <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidIaasProviderException"/>
+        <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidIaasProviderException"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="getCartridgeInfoRequest">
-        <wsdl:part name="parameters" element="ns:getCartridgeInfo"/>
+        <wsdl:part name="parameters" element="ns:getCartridgeInfo"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="getCartridgeInfoResponse">
-        <wsdl:part name="parameters" element="ns:getCartridgeInfoResponse"/>
+        <wsdl:part name="parameters" element="ns:getCartridgeInfoResponse"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="unregisterServiceRequest">
-        <wsdl:part name="parameters" element="ns:unregisterService"/>
+        <wsdl:part name="parameters" element="ns:unregisterService"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="CloudControllerServiceUnregisteredClusterException">
-        <wsdl:part name="parameters" element="ns:CloudControllerServiceUnregisteredClusterException"/>
+        <wsdl:part name="parameters" element="ns:CloudControllerServiceUnregisteredClusterException"></wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="deployCompositeApplicationDefinitionRequest">
+        <wsdl:part name="parameters" element="ns:deployCompositeApplicationDefinition"></wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="CloudControllerServiceInvalidCompositeApplicationDefinitionException">
+        <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidCompositeApplicationDefinitionException"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="undeployCartridgeDefinitionRequest">
-        <wsdl:part name="parameters" element="ns:undeployCartridgeDefinition"/>
+        <wsdl:part name="parameters" element="ns:undeployCartridgeDefinition"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="terminateAllInstancesRequest">
-        <wsdl:part name="parameters" element="ns:terminateAllInstances"/>
+        <wsdl:part name="parameters" element="ns:terminateAllInstances"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="CloudControllerServiceInvalidClusterException">
-        <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidClusterException"/>
+        <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidClusterException"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="getRegisteredCartridgesRequest">
-        <wsdl:part name="parameters" element="ns:getRegisteredCartridges"/>
+        <wsdl:part name="parameters" element="ns:getRegisteredCartridges"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="getRegisteredCartridgesResponse">
-        <wsdl:part name="parameters" element="ns:getRegisteredCartridgesResponse"/>
+        <wsdl:part name="parameters" element="ns:getRegisteredCartridgesResponse"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="startInstanceRequest">
-        <wsdl:part name="parameters" element="ns:startInstance"/>
+        <wsdl:part name="parameters" element="ns:startInstance"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="startInstanceResponse">
-        <wsdl:part name="parameters" element="ns:startInstanceResponse"/>
+        <wsdl:part name="parameters" element="ns:startInstanceResponse"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="getClusterContextRequest">
-        <wsdl:part name="parameters" element="ns:getClusterContext"/>
+        <wsdl:part name="parameters" element="ns:getClusterContext"></wsdl:part>
     </wsdl:message>
     <wsdl:message name="getClusterContextResponse">
-        <wsdl:part name="parameters" element="ns:getClusterContextResponse"/>
+        <wsdl:part name="parameters" element="ns:getClusterContextResponse"></wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="unDeployCompositeApplicationDefinitionRequest">
+        <wsdl:part name="parameters" element="ns:unDeployCompositeApplicationDefinition"></wsdl:part>
     </wsdl:message>
     <wsdl:portType name="CloudControllerServicePortType">
         <wsdl:operation name="validatePartition">
-            <wsdl:input message="ns:validatePartitionRequest" wsaw:Action="urn:validatePartition"/>
-            <wsdl:output message="ns:validatePartitionResponse" wsaw:Action="urn:validatePartitionResponse"/>
-            <wsdl:fault message="ns:CloudControllerServiceInvalidPartitionException" name="CloudControllerServiceInvalidPartitionException" wsaw:Action="urn:validatePartitionCloudControllerServiceInvalidPartitionException"/>
+            <wsdl:input message="ns:validatePartitionRequest" wsaw:Action="urn:validatePartition"></wsdl:input>
+            <wsdl:output message="ns:validatePartitionResponse" wsaw:Action="urn:validatePartitionResponse"></wsdl:output>
+            <wsdl:fault message="ns:CloudControllerServiceInvalidPartitionException" name="CloudControllerServiceInvalidPartitionException" wsaw:Action="urn:validatePartitionCloudControllerServiceInvalidPartitionException"></wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="validateDeploymentPolicy">
-            <wsdl:input message="ns:validateDeploymentPolicyRequest" wsaw:Action="urn:validateDeploymentPolicy"/>
-            <wsdl:output message="ns:validateDeploymentPolicyResponse" wsaw:Action="urn:validateDeploymentPolicyResponse"/>
-            <wsdl:fault message="ns:CloudControllerServiceInvalidPartitionException" name="CloudControllerServiceInvalidPartitionException" wsaw:Action="urn:validateDeploymentPolicyCloudControllerServiceInvalidPartitionException"/>
-            <wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeTypeException" name="CloudControllerServiceInvalidCartridgeTypeException" wsaw:Action="urn:validateDeploymentPolicyCloudControllerServiceInvalidCartridgeTypeException"/>
+            <wsdl:input message="ns:validateDeploymentPolicyRequest" wsaw:Action="urn:validateDeploymentPolicy"></wsdl:input>
+            <wsdl:output message="ns:validateDeploymentPolicyResponse" wsaw:Action="urn:validateDeploymentPolicyResponse"></wsdl:output>
+            <wsdl:fault message="ns:CloudControllerServiceInvalidPartitionException" name="CloudControllerServiceInvalidPartitionException" wsaw:Action="urn:validateDeploymentPolicyCloudControllerServiceInvalidPartitionException"></wsdl:fault>
+            <wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeTypeException" name="CloudControllerServiceInvalidCartridgeTypeException" wsaw:Action="urn:validateDeploymentPolicyCloudControllerServiceInvalidCartridgeTypeException"></wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="terminateInstance">
-            <wsdl:input message="ns:terminateInstanceRequest" wsaw:Action="urn:terminateInstance"/>
-            <wsdl:fault message="ns:CloudControllerServiceInvalidMemberException" name="CloudControllerServiceInvalidMemberException" wsaw:Action="urn:terminateInstanceCloudControllerServiceInvalidMemberException"/>
-            <wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeTypeException" name="CloudControllerServiceInvalidCartridgeTypeException" wsaw:Action="urn:terminateInstanceCloudControllerServiceInvalidCartridgeTypeException"/>
+            <wsdl:input message="ns:terminateInstanceRequest" wsaw:Action="urn:terminateInstance"></wsdl:input>
+            <wsdl:fault message="ns:CloudControllerServiceInvalidMemberException" name="CloudControllerServiceInvalidMemberException" wsaw:Action="urn:terminateInstanceCloudControllerServiceInvalidMemberException"></wsdl:fault>
+            <wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeTypeException" name="CloudControllerServiceInvalidCartridgeTypeException" wsaw:Action="urn:terminateInstanceCloudControllerServiceInvalidCartridgeTypeException"></wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="registerService">
-            <wsdl:input message="ns:registerServiceRequest" wsaw:Action="urn:registerService"/>
-            <wsdl:output message="ns:registerServiceResponse" wsaw:Action="urn:registerServiceResponse"/>
-            <wsdl:fault message="ns:CloudControllerServiceUnregisteredCartridgeException" name="CloudControllerServiceUnregisteredCartridgeException" wsaw:Action="urn:registerServiceCloudControllerServiceUnregisteredCartridgeException"/>
+            <wsdl:input message="ns:registerServiceRequest" wsaw:Action="urn:registerService"></wsdl:input>
+            <wsdl:output message="ns:registerServiceResponse" wsaw:Action="urn:registerServiceResponse"></wsdl:output>
+            <wsdl:fault message="ns:CloudControllerServiceUnregisteredCartridgeException" name="CloudControllerServiceUnregisteredCartridgeException" wsaw:Action="urn:registerServiceCloudControllerServiceUnregisteredCartridgeException"></wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="deployCartridgeDefinition">
-            <wsdl:input message="ns:deployCartridgeDefinitionRequest" wsaw:Action="urn:deployCartridgeDefinition"/>
-            <wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeDefinitionException" name="CloudControllerServiceInvalidCartridgeDefinitionException" wsaw:Action="urn:deployCartridgeDefinitionCloudControllerServiceInvalidCartridgeDefinitionException"/>
-            <wsdl:fault message="ns:CloudControllerServiceInvalidIaasProviderException" name="CloudControllerServiceInvalidIaasProviderException" wsaw:Action="urn:deployCartridgeDefinitionCloudControllerServiceInvalidIaasProviderException"/>
+            <wsdl:input message="ns:deployCartridgeDefinitionRequest" wsaw:Action="urn:deployCartridgeDefinition"></wsdl:input>
+            <wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeDefinitionException" name="CloudControllerServiceInvalidCartridgeDefinitionException" wsaw:Action="urn:deployCartridgeDefinitionCloudControllerServiceInvalidCartridgeDefinitionException"></wsdl:fault>
+            <wsdl:fault message="ns:CloudControllerServiceInvalidIaasProviderException" name="CloudControllerServiceInvalidIaasProviderException" wsaw:Action="urn:deployCartridgeDefinitionCloudControllerServiceInvalidIaasProviderException"></wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="getCartridgeInfo">
-            <wsdl:input message="ns:getCartridgeInfoRequest" wsaw:Action="urn:getCartridgeInfo"/>
-            <wsdl:output message="ns:getCartridgeInfoResponse" wsaw:Action="urn:getCartridgeInfoResponse"/>
-            <wsdl:fault message="ns:CloudControllerServiceUnregisteredCartridgeException" name="CloudControllerServiceUnregisteredCartridgeException" wsaw:Action="urn:getCartridgeInfoCloudControllerServiceUnregisteredCartridgeException"/>
+            <wsdl:input message="ns:getCartridgeInfoRequest" wsaw:Action="urn:getCartridgeInfo"></wsdl:input>
+            <wsdl:output message="ns:getCartridgeInfoResponse" wsaw:Action="urn:getCartridgeInfoResponse"></wsdl:output>
+            <wsdl:fault message="ns:CloudControllerServiceUnregisteredCartridgeException" name="CloudControllerServiceUnregisteredCartridgeException" wsaw:Action="urn:getCartridgeInfoCloudControllerServiceUnregisteredCartridgeException"></wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="unregisterService">
-            <wsdl:input message="ns:unregisterServiceRequest" wsaw:Action="urn:unregisterService"/>
-            <wsdl:fault message="ns:CloudControllerServiceUnregisteredClusterException" name="CloudControllerServiceUnregisteredClusterException" wsaw:Action="urn:unregisterServiceCloudControllerServiceUnregisteredClusterException"/>
+            <wsdl:input message="ns:unregisterServiceRequest" wsaw:Action="urn:unregisterService"></wsdl:input>
+            <wsdl:fault message="ns:CloudControllerServiceUnregisteredClusterException" name="CloudControllerServiceUnregisteredClusterException" wsaw:Action="urn:unregisterServiceCloudControllerServiceUnregisteredClusterException"></wsdl:fault>
+        </wsdl:operation>
+        <wsdl:operation name="deployCompositeApplicationDefinition">
+            <wsdl:input message="ns:deployCompositeApplicationDefinitionRequest" wsaw:Action="urn:deployCompositeApplicationDefinition"></wsdl:input>
+            <wsdl:fault message="ns:CloudControllerServiceInvalidCompositeApplicationDefinitionException" name="CloudControllerServiceInvalidCompositeApplicationDefinitionException" wsaw:Action="urn:deployCompositeApplicationDefinitionCloudControllerServiceInvalidCompositeApplicationDefinitionException"></wsdl:fault>
+            <wsdl:fault message="ns:CloudControllerServiceInvalidIaasProviderException" name="CloudControllerServiceInvalidIaasProviderException" wsaw:Action="urn:deployCompositeApplicationDefinitionCloudControllerServiceInvalidIaasProviderException"></wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="undeployCartridgeDefinition">
-            <wsdl:input message="ns:undeployCartridgeDefinitionRequest" wsaw:Action="urn:undeployCartridgeDefinition"/>
-            <wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeTypeException" name="CloudControllerServiceInvalidCartridgeTypeException" wsaw:Action="urn:undeployCartridgeDefinitionCloudControllerServiceInvalidCartridgeTypeException"/>
+            <wsdl:input message="ns:undeployCartridgeDefinitionRequest" wsaw:Action="urn:undeployCartridgeDefinition"></wsdl:input>
+            <wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeTypeException" name="CloudControllerServiceInvalidCartridgeTypeException" wsaw:Action="urn:undeployCartridgeDefinitionCloudControllerServiceInvalidCartridgeTypeException"></wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="terminateAllInstances">
-            <wsdl:input message="ns:terminateAllInstancesRequest" wsaw:Action="urn:terminateAllInstances"/>
-            <wsdl:fault message="ns:CloudControllerServiceInvalidClusterException" name="CloudControllerServiceInvalidClusterException" wsaw:Action="urn:terminateAllInstancesCloudControllerServiceInvalidClusterException"/>
+            <wsdl:input message="ns:terminateAllInstancesRequest" wsaw:Action="urn:terminateAllInstances"></wsdl:input>
+            <wsdl:fault message="ns:CloudControllerServiceInvalidClusterException" name="CloudControllerServiceInvalidClusterException" wsaw:Action="urn:terminateAllInstancesCloudControllerServiceInvalidClusterException"></wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="getRegisteredCartridges">
-            <wsdl:input message="ns:getRegisteredCartridgesRequest" wsaw:Action="urn:getRegisteredCartridges"/>
-            <wsdl:output message="ns:getRegisteredCartridgesResponse" wsaw:Action="urn:getRegisteredCartridgesResponse"/>
+            <wsdl:input message="ns:getRegisteredCartridgesRequest" wsaw:Action="urn:getRegisteredCartridges"></wsdl:input>
+            <wsdl:output message="ns:getRegisteredCartridgesResponse" wsaw:Action="urn:getRegisteredCartridgesResponse"></wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="startInstance">
-            <wsdl:input message="ns:startInstanceRequest" wsaw:Action="urn:startInstance"/>
-            <wsdl:output message="ns:startInstanceResponse" wsaw:Action="urn:startInstanceResponse"/>
-            <wsdl:fault message="ns:CloudControllerServiceUnregisteredCartridgeException" name="CloudControllerServiceUnregisteredCartridgeException" wsaw:Action="urn:startInstanceCloudControllerServiceUnregisteredCartridgeException"/>
-            <wsdl:fault message="ns:CloudControllerServiceInvalidIaasProviderException" name="CloudControllerServiceInvalidIaasProviderException" wsaw:Action="urn:startInstanceCloudControllerServiceInvalidIaasProviderException"/>
+            <wsdl:input message="ns:startInstanceRequest" wsaw:Action="urn:startInstance"></wsdl:input>
+            <wsdl:output message="ns:startInstanceResponse" wsaw:Action="urn:startInstanceResponse"></wsdl:output>
+            <wsdl:fault message="ns:CloudControllerServiceUnregisteredCartridgeException" name="CloudControllerServiceUnregisteredCartridgeException" wsaw:Action="urn:startInstanceCloudControllerServiceUnregisteredCartridgeException"></wsdl:fault>
+            <wsdl:fault message="ns:CloudControllerServiceInvalidIaasProviderException" name="CloudControllerServiceInvalidIaasProviderException" wsaw:Action="urn:startInstanceCloudControllerServiceInvalidIaasProviderException"></wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="getClusterContext">
-            <wsdl:input message="ns:getClusterContextRequest" wsaw:Action="urn:getClusterContext"/>
-            <wsdl:output message="ns:getClusterContextResponse" wsaw:Action="urn:getClusterContextResponse"/>
+            <wsdl:input message="ns:getClusterContextRequest" wsaw:Action="urn:getClusterContext"></wsdl:input>
+            <wsdl:output message="ns:getClusterContextResponse" wsaw:Action="urn:getClusterContextResponse"></wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="unDeployCompositeApplicationDefinition">
+            <wsdl:input message="ns:unDeployCompositeApplicationDefinitionRequest" wsaw:Action="urn:unDeployCompositeApplicationDefinition"></wsdl:input>
+            <wsdl:fault message="ns:CloudControllerServiceInvalidCompositeApplicationDefinitionException" name="CloudControllerServiceInvalidCompositeApplicationDefinitionException" wsaw:Action="urn:unDeployCompositeApplicationDefinitionCloudControllerServiceInvalidCompositeApplicationDefinitionException"></wsdl:fault>
+            <wsdl:fault message="ns:CloudControllerServiceInvalidIaasProviderException" name="CloudControllerServiceInvalidIaasProviderException" wsaw:Action="urn:unDeployCompositeApplicationDefinitionCloudControllerServiceInvalidIaasProviderException"></wsdl:fault>
         </wsdl:operation>
     </wsdl:portType>
     <wsdl:binding name="CloudControllerServiceSoap11Binding" type="ns:CloudControllerServicePortType">
-        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"></soap:binding>
         <wsdl:operation name="validatePartition">
-            <soap:operation soapAction="urn:validatePartition" style="document"/>
+            <soap:operation soapAction="urn:validatePartition" style="document"></soap:operation>
             <wsdl:input>
-                <soap:body use="literal"/>
+                <soap:body use="literal"></soap:body>
             </wsdl:input>
             <wsdl:output>
-                <soap:body use="literal"/>
+                <soap:body use="literal"></soap:body>
             </wsdl:output>
             <wsdl:fault name="CloudControllerServiceInvalidPartitionException">
-                <soap:fault use="literal" name="CloudControllerServiceInvalidPartitionException"/>
+                <soap:fault use="literal" name="CloudControllerServiceInvalidPartitionException"></soap:fault>
             </wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="validateDeploymentPolicy">
-            <soap:operation soapAction="urn:validateDeploymentPolicy" style="document"/>
+            <soap:operation soapAction="urn:validateDeploymentPolicy" style="document"></soap:operation>
             <wsdl:input>
-                <soap:body use="literal"/>
+                <soap:body use="literal"></soap:body>
             </wsdl:input>
             <wsdl:output>
-                <soap:body use="literal"/>
+                <soap:body use="literal"></soap:body>
             </wsdl:output>
             <wsdl:fault name="CloudControllerServiceInvalidPartitionException">
-                <soap:fault use="literal" name="CloudControllerServiceInvalidPartitionException"/>
+                <soap:fault use="literal" name="CloudControllerServiceInvalidPartitionException"></soap:fault>
             </wsdl:fault>
             <wsdl:fault name="CloudControllerServiceInvalidCartridgeTypeException">
-                <soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"/>
+                <soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"></soap:fault>
             </wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="terminateInstance">
-            <soap:operation soapAction="urn:terminateInstance" style="document"/>
+            <soap:operation soapAction="urn:terminateInstance" style="document"></soap:operation>
             <wsdl:input>
-                <soap:body use="literal"/>
+                <soap:body use="literal"></soap:body>
             </wsdl:input>
             <wsdl:fault name="CloudControllerServiceInvalidMemberException">
-                <soap:fault use="literal" name="CloudControllerServiceInvalidMemberException"/>
+                <soap:fault use="literal" name="CloudControllerServiceInvalidMemberException"></soap:fault>
             </wsdl:fault>
             <wsdl:fault name="CloudControllerServiceInvalidCartridgeTypeException">
-                <soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"/>
+                <soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"></soap:fault>
             </wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="registerService">
-            <soap:operation soapAction="urn:registerService" style="document"/>
+            <soap:operation soapAction="urn:registerService" style="document"></soap:operation>
             <wsdl:input>
-                <soap:body use="literal"/>
+                <soap:body use="literal"></soap:body>
             </wsdl:input>
             <wsdl:output>
-                <soap:body use="literal"/>
+                <soap:body use="literal"></soap:body>
             </wsdl:output>
             <wsdl:fault name="CloudControllerServiceUnregisteredCartridgeException">
-                <soap:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"/>
+                <soap:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"></soap:fault>
             </wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="deployCartridgeDefinition">
-            <soap:operation soapAction="urn:deployCartridgeDefinition" style="document"/>
+            <soap:operation soapAction="urn:deployCartridgeDefinition" style="document"></soap:operation>
             <wsdl:input>
-                <soap:body use="literal"/>
+                <soap:body use="literal"></soap:body>
             </wsdl:input>
             <wsdl:fault name="CloudControllerServiceInvalidCartridgeDefinitionException">
-                <soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeDefinitionException"/>
+                <soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeDefinitionException"></soap:fault>
             </wsdl:fault>
             <wsdl:fault name="CloudControllerServiceInvalidIaasProviderException">
-                <soap:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"/>
+                <soap:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"></soap:fault>
             </wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="getCartridgeInfo">
-            <soap:operation soapAction="urn:getCartridgeInfo" style="document"/>
+            <soap:operation soapAction="urn:getCartridgeInfo" style="document"></soap:operation>
             <wsdl:input>
-                <soap:body use="literal"/>
+                <soap:body use="literal"></soap:body>
             </wsdl:input>
             <wsdl:output>
-                <soap:body use="literal"/>
+                <soap:body use="literal"></soap:body>
             </wsdl:output>
             <wsdl:fault name="CloudControllerServiceUnregisteredCartridgeException">
-                <soap:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"/>
+                <soap:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"></soap:fault>
             </wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="unregisterService">
-            <soap:operation soapAction="urn:unregisterService" style="document"/>
+            <soap:operation soapAction="urn:unregisterService" style="document"></soap:operation>
             <wsdl:input>
-                <soap:body use="literal"/>
+                <soap:body use="literal"></soap:body>
             </wsdl:input>
             <wsdl:fault name="CloudControllerServiceUnregisteredClusterException">
-                <soap:fault use="literal" name="CloudControllerServiceUnregisteredClusterException"/>
+                <soap:fault use="literal" name="CloudControllerServiceUnregisteredClusterException"></soap:fault>
+            </wsdl:fault>
+        </wsdl:operation>
+        <wsdl:operation name="deployCompositeApplicationDefinition">
+            <soap:operation soapAction="urn:deployCompositeApplicationDefinition" style="document"></soap:operation>
+            <wsdl:input>
+                <soap:body use="literal"></soap:body>
+            </wsdl:input>
+            <wsdl:fault name="CloudControllerServiceInvalidCompositeApplicationDefinitionException">
+                <soap:fault use="literal" name="CloudControllerServiceInvalidCompositeApplicationDefinitionException"></soap:fault>
+            </wsdl:fault>
+            <wsdl:fault name="CloudControllerServiceInvalidIaasProviderException">
+                <soap:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"></soap:fault>
             </wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="undeployCartridgeDefinition">
-            <soap:operation soapAction="urn:undeployCartridgeDefinition" style="document"/>
+            <soap:operation soapAction="urn:undeployCartridgeDefinition" style="document"></soap:operation>
             <wsdl:input>
-                <soap:body use="literal"/>
+                <soap:body use="literal"></soap:body>
             </wsdl:input>
             <wsdl:fault name="CloudControllerServiceInvalidCartridgeTypeException">
-                <soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"/>
+                <soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"></soap:fault>
             </wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="terminateAllInstances">
-            <soap:operation soapAction="urn:terminateAllInstances" style="document"/>
+            <soap:operation soapAction="urn:terminateAllInstances" style="document"></soap:operation>
             <wsdl:input>
-                <soap:body use="literal"/>
+                <soap:body use="literal"></soap:body>
             </wsdl:input>
             <wsdl:fault name="CloudControllerServiceInvalidClusterException">
-                <soap:fault use="literal" name="CloudControllerServiceInvalidClusterException"/>
+                <soap:fault use="literal" name="CloudControllerServiceInvalidClusterException"></soap:fault>
             </wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="getRegisteredCartridges">
-            <soap:operation soapAction="urn:getRegisteredCartridges" style="document"/>
+            <soap:operation soapAction="urn:getRegisteredCartridges" style="document"></soap:operation>
             <wsdl:input>
-                <soap:body use="literal"/>
+                <soap:body use="literal"></soap:body>
             </wsdl:input>
             <wsdl:output>
-                <soap:body use="literal"/>
+                <soap:body use="literal"></soap:body>
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="startInstance">
-            <soap:operation soapAction="urn:startInstance" style="document"/>
+            <soap:operation soapAction="urn:startInstance" style="document"></soap:operation>
             <wsdl:input>
-                <soap:body use="literal"/>
+                <soap:body use="literal"></soap:body>
             </wsdl:input>
             <wsdl:output>
-                <soap:body use="literal"/>
+                <soap:body use="literal"></soap:body>
             </wsdl:output>
             <wsdl:fault name="CloudControllerServiceInvalidIaasProviderException">
-                <soap:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"/>
+                <soap:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"></soap:fault>
             </wsdl:fault>
             <wsdl:fault name="CloudControllerServiceUnregisteredCartridgeException">
-                <soap:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"/>
+                <soap:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"></soap:fault>
             </wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="getClusterContext">
-            <soap:operation soapAction="urn:getClusterContext" style="document"/>
+            <soap:operation soapAction="urn:getClusterContext" style="document"></soap:operation>
             <wsdl:input>
-                <soap:body use="literal"/>
+                <soap:body use="literal"></soap:body>
             </wsdl:input>
             <wsdl:output>
-                <soap:body use="literal"/>
+                <soap:body use="literal"></soap:body>
             </wsdl:output>
         </wsdl:operation>
+        <wsdl:operation name="unDeployCompositeApplicationDefinition">
+            <soap:operation soapAction="urn:unDeployCompositeApplicationDefinition" style="document"></soap:operation>
+            <wsdl:input>
+                <soap:body use="literal"></soap:body>
+            </wsdl:input>
+            <wsdl:fault name="CloudControllerServiceInvalidCompositeApplicationDefinitionException">
+                <soap:fault use="literal" name="CloudControllerServiceInvalidCompositeApplicationDefinitionException"></soap:fault>
+            </wsdl:fault>
+            <wsdl:fault name="CloudControllerServiceInvalidIaasProviderException">
+                <soap:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"></soap:fault>
+            </wsdl:fault>
+        </wsdl:operation>
     </wsdl:binding>
     <wsdl:binding name="CloudControllerServiceSoap12Binding" type="ns:CloudControllerServicePortType">
-        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"></soap12:binding>
         <wsdl:operation name="validatePartition">
-            <soap12:operation soapAction="urn:validatePartition" style="document"/>
+            <soap12:operation soapAction="urn:validatePartition" style="document"></soap12:operation>
             <wsdl:input>
-                <soap12:body use="literal"/>
+                <soap12:body use="literal"></soap12:body>
             </wsdl:input>
             <wsdl:output>
-                <soap12:body use="literal"/>
+                <soap12:body use="literal"></soap12:body>
             </wsdl:output>
             <wsdl:fault name="CloudControllerServiceInvalidPartitionException">
-                <soap12:fault use="literal" name="CloudControllerServiceInvalidPartitionException"/>
+                <soap12:fault use="literal" name="CloudControllerServiceInvalidPartitionException"></soap12:fault>
             </wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="validateDeploymentPolicy">
-            <soap12:operation soapAction="urn:validateDeploymentPolicy" style="document"/>
+            <soap12:operation soapAction="urn:validateDeploymentPolicy" style="document"></soap12:operation>
             <wsdl:input>
-                <soap12:body use="literal"/>
+                <soap12:body use="literal"></soap12:body>
             </wsdl:input>
             <wsdl:output>
-                <soap12:body use="literal"/>
+                <soap12:body use="literal"></soap12:body>
             </wsdl:output>
             <wsdl:fault name="CloudControllerServiceInvalidPartitionException">
-                <soap12:fault use="literal" name="CloudControllerServiceInvalidPartitionException"/>
+                <soap12:fault use="literal" name="CloudControllerServiceInvalidPartitionException"></soap12:fault>
             </wsdl:fault>
             <wsdl:fault name="CloudControllerServiceInvalidCartridgeTypeException">
-                <soap12:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"/>
+                <soap12:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"></soap12:fault>
             </wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="terminateInstance">
-            <soap12:operation soapAction="urn:terminateInstance" style="document"/>
+            <soap12:operation soapAction="urn:terminateInstance" style="document"></soap12:operation>
             <wsdl:input>
-                <soap12:body use="literal"/>
+                <soap12:body use="literal"></soap12:body>
             </wsdl:input>
             <wsdl:fault name="CloudControllerServiceInvalidMemberException">
-                <soap12:fault use="literal" name="CloudControllerServiceInvalidMemberException"/>
+                <soap12:fault use="literal" name="CloudControllerServiceInvalidMemberException"></soap12:fault>
             </wsdl:fault>
             <wsdl:fault name="CloudControllerServiceInvalidCartridgeTypeException">
-                <soap12:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"/>
+                <soap12:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"></soap12:fault>
             </wsdl:fault>
         </wsdl:operation>
         <wsdl:operation name="registerService">
-            <soap12:operation soapAction="urn:registerService" style="document"/>
+            <soap12:operation soapAction="urn:registerService" style="document"></soap12:operation>
             <wsdl:input>
-                <soap12:body use="literal"/>
+                <soap12:body use="literal"></soap12:body>
             </wsdl:

<TRUNCATED>

[2/7] initial grouping code to develop cartridge grouping feature

Posted by me...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java
index e29d028..eec247d 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java
@@ -18,7 +18,12 @@
  */
 package org.apache.stratos.rest.endpoint.bean;
 
+import org.apache.stratos.rest.endpoint.bean.cartridge.definition.PersistenceBean;
+import org.apache.stratos.rest.endpoint.bean.cartridge.definition.PropertyBean;
+
 import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
 
 @XmlRootElement
 public class CartridgeInfoBean {
@@ -34,11 +39,15 @@ public class CartridgeInfoBean {
     String dataCartridgeAlias;
     boolean commitsEnabled;
 
-    private boolean persistanceRequired;
-    private String size;
-    private boolean removeOnTermination;
     private String serviceGroup;
 
+    private PersistenceBean persistence;
+
+    private List<PropertyBean> property;
+
+    public CartridgeInfoBean() {
+    }
+
     public String getCartridgeType() {
         return cartridgeType;
     }
@@ -119,31 +128,7 @@ public class CartridgeInfoBean {
         this.deploymentPolicy = deploymentPolicy;
     }
 
-    public boolean isPersistanceRequired() {
-        return persistanceRequired;
-    }
-
-    public void setPersistanceRequired(boolean persistanceRequired) {
-        this.persistanceRequired = persistanceRequired;
-    }
-
-    public String getSize() {
-        return size;
-    }
-
-    public void setSize(String size) {
-        this.size = size;
-    }
-
-    public boolean isRemoveOnTermination() {
-        return removeOnTermination;
-    }
-
-    public void setRemoveOnTermination(boolean removeOnTermination) {
-        this.removeOnTermination = removeOnTermination;
-    }
-
-	public boolean isCommitsEnabled() {
+    public boolean isCommitsEnabled() {
 		return commitsEnabled;
 	}
 
@@ -158,5 +143,20 @@ public class CartridgeInfoBean {
 	public void setServiceGroup(String serviceGroup) {
 		this.serviceGroup = serviceGroup;
 	}
-    
+
+    public PersistenceBean getPersistence() {
+        return persistence;
+    }
+
+    public void setPersistence(PersistenceBean persistenceBean) {
+        this.persistence = persistenceBean;
+    }
+
+    public List<PropertyBean> getProperty() {
+        return property;
+    }
+
+    public void setProperty(List<PropertyBean> property) {
+        this.property = property;
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/VolumeBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/VolumeBean.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/VolumeBean.java
index 7eabb45..a9d7441 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/VolumeBean.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/VolumeBean.java
@@ -23,6 +23,8 @@ import javax.xml.bind.annotation.XmlRootElement;
 @XmlRootElement
 public class VolumeBean {
 
+    public String id;
+
     public String size;
 
     public String device;
@@ -30,6 +32,10 @@ public class VolumeBean {
     public boolean removeOnTermination;
 
     public String mappingPath;
+    
+    public String snapshotId;
+
+    public String volumeId;
 
     public String toString () {
         return " [ Persistence Required : " + ", Size: " + size + ", device: " +

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/CompositeApplicationDefinitionBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/CompositeApplicationDefinitionBean.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/CompositeApplicationDefinitionBean.java
new file mode 100644
index 0000000..2efc62b
--- /dev/null
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/CompositeApplicationDefinitionBean.java
@@ -0,0 +1,17 @@
+package org.apache.stratos.rest.endpoint.bean.compositeapplication.definition;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import java.util.List;
+
+@XmlRootElement(name = "applicationDefinitionBean")
+
+public class CompositeApplicationDefinitionBean {
+	
+	public String applicationId;
+	public String alias;
+	public List<ConfigGroup> components;
+	public List<ConfigCartridge> cartridges;
+	
+
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigCartridge.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigCartridge.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigCartridge.java
new file mode 100644
index 0000000..85d57ce
--- /dev/null
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigCartridge.java
@@ -0,0 +1,8 @@
+package org.apache.stratos.rest.endpoint.bean.compositeapplication.definition;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "cartridge")
+public class ConfigCartridge {
+	public String alias;
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigDependencies.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigDependencies.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigDependencies.java
new file mode 100644
index 0000000..5efd201
--- /dev/null
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigDependencies.java
@@ -0,0 +1,57 @@
+package org.apache.stratos.rest.endpoint.bean.compositeapplication.definition;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "dependencies")
+public class ConfigDependencies {
+	public List<Pair> startup_order = new ArrayList<Pair>();
+	public String kill_behavior;
+		
+	/*
+	public String getKill_behavior() {
+		return kill_behavior;
+	}
+
+	public void setKill_behavior(String kill_behavior) {
+		this.kill_behavior = kill_behavior;
+	}
+
+	public List<Pair> getStartup_order() {
+		return startup_order;
+	}
+
+	public void setStartup_order(List<Pair> startup_order) {
+		this.startup_order = startup_order;
+	}
+	*/
+	
+
+	public static class Pair {
+		private String key;
+		private String value;
+		
+		private Pair() {}
+		
+		public Pair(String key, String value) {
+			this.key = key;
+			this.value = value;
+		}
+		
+		public String getKey() {
+			return key;
+		}
+		public void setKey(String key) {
+			this.key = key;
+		}
+		public String getValue() {
+			return value;
+		}
+		public void setValue(String value) {
+			this.value = value;
+		}
+	}
+	
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigGroup.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigGroup.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigGroup.java
new file mode 100644
index 0000000..bbdd0e3
--- /dev/null
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/compositeapplication/definition/ConfigGroup.java
@@ -0,0 +1,35 @@
+package org.apache.stratos.rest.endpoint.bean.compositeapplication.definition;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "components")
+public class ConfigGroup {
+	public  String alias;
+	public  List<String> subscribables;
+	public ConfigDependencies dependencies;
+	
+	/*
+	public String getAlias() {
+		return alias;
+	}
+	public void setAlias(String alias) {
+		this.alias = alias;
+	}
+	public List<String> getSubscribables() {
+		return subscribables;
+	}
+	public void setSubscribables(List<String> subscribables) {
+		this.subscribables = subscribables;
+	}
+	public ConfigDependencies getDependencies() {
+		return dependencies;
+	}
+	public void setDependencies(ConfigDependencies dependencies) {
+		this.dependencies = dependencies;
+	}
+	*/
+
+	
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
index 1208967..84ddfbf 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
@@ -19,15 +19,31 @@
 
 package org.apache.stratos.rest.endpoint.bean.util.converter;
 
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.lang.StringUtils;
 import org.apache.stratos.cloud.controller.stub.pojo.*;
+import org.apache.stratos.manager.application.utils.ApplicationUtils;
 import org.apache.stratos.manager.deploy.service.Service;
 import org.apache.stratos.messaging.domain.topology.Cluster;
+import org.apache.stratos.messaging.domain.topology.CompositeApplication;
 import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.Partition;
 import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.PartitionGroup;
 import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.*;
 import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.deployment.DeploymentPolicy;
 import org.apache.stratos.rest.endpoint.bean.cartridge.definition.*;
+import org.apache.stratos.rest.endpoint.bean.compositeapplication.definition.CompositeApplicationDefinitionBean;
+import org.apache.stratos.rest.endpoint.bean.compositeapplication.definition.ConfigCartridge;
+import org.apache.stratos.rest.endpoint.bean.compositeapplication.definition.ConfigDependencies;
+import org.apache.stratos.rest.endpoint.bean.compositeapplication.definition.ConfigGroup;
 import org.apache.stratos.rest.endpoint.bean.topology.Member;
+import org.apache.stratos.messaging.domain.topology.Cartridge;
+import org.apache.stratos.messaging.domain.topology.Composite;
+import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication;
+import org.apache.stratos.messaging.domain.topology.Dependencies;
+import org.apache.stratos.messaging.domain.topology.Group;
+import org.apache.stratos.messaging.domain.topology.Scalable;
+import org.apache.stratos.messaging.domain.topology.util.CompositeApplicationBuilder;
+import org.apache.commons.logging.Log;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -145,18 +161,25 @@ public class PojoConverter {
         return iaasConfigsArray;
     }
 
-    private static Persistence getPersistence(PersistenceBean persistenceBean) {
+    public static Persistence getPersistence(PersistenceBean persistenceBean) {
         Persistence persistence = new Persistence();
         persistence.setPersistanceRequired(persistenceBean.isRequired);
         VolumeBean[] volumeBean = new VolumeBean[persistenceBean.volume.size()];
         persistenceBean.volume.toArray(volumeBean);
-        Volume[] volumes = new Volume[persistenceBean.volume.size()];
-        for (int i = 0 ; i < volumes.length ; i++) {
+         Volume[] volumes = new Volume[persistenceBean.volume.size()];
+         for (int i = 0 ; i < volumes.length ; i++) {
             Volume volume = new Volume();
-            volume.setSize(Integer.parseInt(volumeBean[i].size));
+            volume.setId(volumeBean[i].id);
+            volume.setVolumeId(volumeBean[i].volumeId);
+            if(StringUtils.isEmpty(volume.getVolumeId())){
+                volume.setSize(Integer.parseInt(volumeBean[i].size));
+            }
+
             volume.setDevice(volumeBean[i].device);
             volume.setRemoveOntermination(volumeBean[i].removeOnTermination);
             volume.setMappingPath(volumeBean[i].mappingPath);
+            volume.setSnapshotId(volumeBean[i].snapshotId);
+
             volumes[i] = volume;
         }
         persistence.setVolumes(volumes);
@@ -164,7 +187,7 @@ public class PojoConverter {
 
     }
 
-    private static Properties getProperties (List<PropertyBean> propertyBeans) {
+    public static Properties getProperties(List<PropertyBean> propertyBeans) {
 
         //convert to an array
         PropertyBean [] propertyBeansArray = new PropertyBean[propertyBeans.size()];
@@ -636,4 +659,124 @@ public class PojoConverter {
 
         return serviceDefinitionBeans;
     }
+    
+	private static Log log = LogFactory.getLog(PojoConverter.class);
+	
+	
+	public static ConfigCompositeApplication convertToCompositeApplication(CompositeApplicationDefinitionBean appBean) {
+		ConfigCompositeApplication configApp = new ConfigCompositeApplication();
+		
+		configApp.setAlias(appBean.alias);
+		configApp.setApplicationId(appBean.applicationId);
+		
+		List<org.apache.stratos.messaging.domain.topology.ConfigCartridge> configCartridges = 
+				new ArrayList<org.apache.stratos.messaging.domain.topology.ConfigCartridge>();
+		
+		for (ConfigCartridge beanCartridge : appBean.cartridges ) {
+			org.apache.stratos.messaging.domain.topology.ConfigCartridge configCartridge = 
+					new org.apache.stratos.messaging.domain.topology.ConfigCartridge();
+			configCartridge.setAlias(beanCartridge.alias);
+			configCartridges.add(configCartridge);
+		}
+		configApp.setCartridges(configCartridges);
+		
+		// converting groups / components
+		List<org.apache.stratos.messaging.domain.topology.ConfigGroup> configGroups = 
+				new ArrayList<org.apache.stratos.messaging.domain.topology.ConfigGroup>();
+		
+		for (ConfigGroup beanGroup : appBean.components ) {
+			org.apache.stratos.messaging.domain.topology.ConfigGroup configGroup = 
+					new org.apache.stratos.messaging.domain.topology.ConfigGroup();
+			configGroup.setAlias(beanGroup.alias);
+			configGroup.setSubscribables(beanGroup.subscribables);
+			org.apache.stratos.messaging.domain.topology.ConfigDependencies configDep = 
+					new org.apache.stratos.messaging.domain.topology.ConfigDependencies();
+			
+			
+			// convert dependencies
+			configDep.setKill_behavior(beanGroup.dependencies.kill_behavior);
+			List<org.apache.stratos.messaging.domain.topology.ConfigDependencies.Pair> configPairs = 
+					new ArrayList<org.apache.stratos.messaging.domain.topology.ConfigDependencies.Pair>();
+			for (ConfigDependencies.Pair beanPair : beanGroup.dependencies.startup_order) {
+				configPairs.add(new org.apache.stratos.messaging.domain.topology.ConfigDependencies.Pair(beanPair.getKey(), beanPair.getValue()));
+			}
+			configDep.setStartup_order(configPairs);
+			configGroup.setDependencies(configDep);
+			
+			configGroups.add(configGroup);
+		}
+		configApp.setComponents(configGroups);
+		
+		return configApp;
+	}
+	
+	// grouping
+	public static CompositeApplicationDefinition convertToCompositeApplicationForCC (CompositeApplicationDefinitionBean appBean) {
+		CompositeApplicationDefinition configApp = new CompositeApplicationDefinition();
+		
+		configApp.setAlias(appBean.alias);
+		configApp.setApplicationId(appBean.applicationId);
+		
+		
+		
+		List<org.apache.stratos.cloud.controller.stub.pojo.ConfigCartridge> configCartridges = 
+				new ArrayList<org.apache.stratos.cloud.controller.stub.pojo.ConfigCartridge>();
+		
+		for (ConfigCartridge beanCartridge : appBean.cartridges ) {
+			org.apache.stratos.cloud.controller.stub.pojo.ConfigCartridge configCartridge = 
+					new org.apache.stratos.cloud.controller.stub.pojo.ConfigCartridge();
+			configCartridge.setAlias(beanCartridge.alias);
+			configCartridges.add(configCartridge);
+		}
+		org.apache.stratos.cloud.controller.stub.pojo.ConfigCartridge [] arrayConfigCartridge = 
+				new org.apache.stratos.cloud.controller.stub.pojo.ConfigCartridge[configCartridges.size()];
+		arrayConfigCartridge = configCartridges.toArray(arrayConfigCartridge);
+		configApp.setCartridges(arrayConfigCartridge);
+		
+		// converting groups / components
+		List<org.apache.stratos.cloud.controller.stub.pojo.ConfigGroup> configGroups = 
+				new ArrayList<org.apache.stratos.cloud.controller.stub.pojo.ConfigGroup>();
+		
+		for (ConfigGroup beanGroup : appBean.components ) {
+			org.apache.stratos.cloud.controller.stub.pojo.ConfigGroup configGroup = 
+					new org.apache.stratos.cloud.controller.stub.pojo.ConfigGroup();
+			configGroup.setAlias(beanGroup.alias);
+			String [] arraySubscribables = new String[beanGroup.subscribables.size()];
+			arraySubscribables = beanGroup.subscribables.toArray(arraySubscribables);
+			configGroup.setSubscribables(arraySubscribables);
+			org.apache.stratos.cloud.controller.stub.pojo.ConfigDependencies configDep = 
+					new org.apache.stratos.cloud.controller.stub.pojo.ConfigDependencies();
+			
+			
+			// convert dependencies
+			configDep.setKill_behavior(beanGroup.dependencies.kill_behavior);
+			int i = 0;
+			org.apache.stratos.cloud.controller.stub.pojo.ConfigDependencyPair[] configPairs = 
+					new org.apache.stratos.cloud.controller.stub.pojo.ConfigDependencyPair[beanGroup.dependencies.startup_order.size()];
+			
+			for (ConfigDependencies.Pair beanPair : beanGroup.dependencies.startup_order) {
+				//configPairs.add(new org.apache.stratos.messaging.domain.topology.ConfigDependencies.Pair(beanPair.getKey(), beanPair.getValue()));
+				
+				org.apache.stratos.cloud.controller.stub.pojo.ConfigDependencyPair pair = new org.apache.stratos.cloud.controller.stub.pojo.ConfigDependencyPair();
+				pair.setKey(beanPair.getKey());
+				pair.setValue(beanPair.getValue());
+				
+				configPairs[i] = pair;
+				i++;
+			}
+			configDep.setStartup_order(configPairs);
+			configGroup.setDependencies(configDep);
+			
+			configGroups.add(configGroup);
+			
+		}
+		org.apache.stratos.cloud.controller.stub.pojo.ConfigGroup [] configGroupArray  =  
+				new org.apache.stratos.cloud.controller.stub.pojo.ConfigGroup[configGroups.size()];
+		configGroupArray = configGroups.toArray(configGroupArray);
+		configApp.setComponents(configGroupArray);
+		
+		return configApp;
+	}
+    
+    
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
index 44b2c26..c88acf1 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
@@ -23,14 +23,19 @@ import org.apache.axis2.context.ConfigurationContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy;
+import org.apache.stratos.cloud.controller.stub.pojo.*;
 import org.apache.stratos.cloud.controller.stub.pojo.CartridgeConfig;
 import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo;
+import org.apache.stratos.cloud.controller.stub.pojo.CompositeApplicationDefinition;
 import org.apache.stratos.cloud.controller.stub.pojo.Property;
 import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPartitionExceptionException;
 import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPolicyExceptionException;
 import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeDefinitionExceptionException;
 import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeTypeExceptionException;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCompositeApplicationDefinitionExceptionException;
 import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidIaasProviderExceptionException;
+import org.apache.stratos.manager.application.CompositeApplicationManager;
+import org.apache.stratos.manager.application.utils.ApplicationUtils;
 import org.apache.stratos.manager.client.AutoscalerServiceClient;
 import org.apache.stratos.manager.client.CloudControllerServiceClient;
 import org.apache.stratos.manager.deploy.service.Service;
@@ -48,6 +53,7 @@ import org.apache.stratos.manager.topology.model.TopologyClusterInformationModel
 import org.apache.stratos.manager.utils.ApplicationManagementUtil;
 import org.apache.stratos.manager.utils.CartridgeConstants;
 import org.apache.stratos.messaging.domain.topology.Cluster;
+import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication;
 import org.apache.stratos.messaging.domain.topology.Member;
 import org.apache.stratos.messaging.domain.topology.MemberStatus;
 import org.apache.stratos.messaging.message.receiver.topology.TopologyManager;
@@ -58,10 +64,15 @@ import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.Partition;
 import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.PartitionGroup;
 import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.AutoscalePolicy;
 import org.apache.stratos.rest.endpoint.bean.cartridge.definition.CartridgeDefinitionBean;
+import org.apache.stratos.rest.endpoint.bean.cartridge.definition.PersistenceBean;
 import org.apache.stratos.rest.endpoint.bean.cartridge.definition.ServiceDefinitionBean;
+import org.apache.stratos.rest.endpoint.bean.compositeapplication.definition.CompositeApplicationDefinitionBean;
+import org.apache.stratos.rest.endpoint.bean.compositeapplication.definition.ConfigDependencies;
+import org.apache.stratos.rest.endpoint.bean.compositeapplication.definition.ConfigGroup;
 import org.apache.stratos.rest.endpoint.bean.repositoryNotificationInfoBean.Payload;
 import org.apache.stratos.rest.endpoint.bean.util.converter.PojoConverter;
 import org.apache.stratos.rest.endpoint.exception.RestAPIException;
+import org.apache.stratos.messaging.domain.topology.CompositeApplication;
 
 import javax.ws.rs.core.Response;
 
@@ -74,6 +85,7 @@ public class ServiceUtils {
     public static final String SHOULD_DELETE_VOLUME = "volume.delete.on.unsubscription";
     public static final String VOLUME_SIZE = "volume.size.gb";
     public static final String DEVICE_NAME = "volume.device.name";
+    public static final String VOLUME_ID = "volume.id";
 
     private static Log log = LogFactory.getLog(ServiceUtils.class);
     private static CartridgeSubscriptionManager cartridgeSubsciptionManager = new CartridgeSubscriptionManager();
@@ -120,6 +132,197 @@ public class ServiceUtils {
         stratosAdminResponse.setMessage("Successfully deployed cartridge definition with type " + cartridgeDefinitionBean.type);
         return stratosAdminResponse;
     }
+    
+    // Grouping
+    /*
+    static StratosAdminResponse deployApplication(CompositeApplicationDefinitionBean applicationDefinitionBean, ConfigurationContext ctxt,
+            String userName, String tenantDomain) throws RestAPIException {
+
+    		log.info("Starting to deploy a application " + applicationDefinitionBean);
+    		
+    		if (log.isDebugEnabled()) {
+    			log.debug("application data id:" + applicationDefinitionBean.applicationId + " /alias: " + 
+    					applicationDefinitionBean.alias);
+    			if (applicationDefinitionBean.components != null) {
+    				log.debug("application config groups size " + applicationDefinitionBean.components.size());
+    				for (ConfigGroup cfg : applicationDefinitionBean.components) {
+    					log.debug("listing application config groups "  + cfg.alias + " /sub " + 
+    				               cfg.subscribables + " /dep " + cfg.dependencies);
+    					if (cfg.dependencies != null) {
+    						log.debug("listing application group dependencies: kill: " +  
+    					               cfg.dependencies.kill_behavior + " / startup: " + 
+    					               cfg.dependencies.startup_order);
+    						if (cfg.dependencies.startup_order != null) {
+    							for (ConfigDependencies.Pair pair :  cfg.dependencies.startup_order) {
+    								log.debug("listing dependencies pairs : " + pair.getKey() + " / " + pair.getValue());
+    							}
+    						}
+    					}
+    				}
+    			} else {
+    				log.debug("no config group in application");
+    			}
+
+    		}
+
+    		// convert to json
+    		String applicationId = applicationDefinitionBean.applicationId;
+    		
+    		if (log.isDebugEnabled()) {
+    			log.debug("publishing application created event " + applicationId);
+    		}
+    		
+    		// convert to domain object - move to ojoConverted
+    		ConfigCompositeApplication app = PojoConverter.convertToCompositeApplication(applicationDefinitionBean);
+    		if (log.isDebugEnabled()) {
+    			log.debug("converted application to CompositeApplication " + app);
+    		}
+    		CompositeApplicationManager manager = new CompositeApplicationManager();
+    		
+    		
+			try {
+				manager.deployCompositeApplication(app);
+			} catch (ADCException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+				String message = e.getMessage();
+				log.error(message, e);
+				throw new RestAPIException(message, e);
+			}
+    		
+    		log.info("l [type] " + applicationDefinitionBean);
+    		// deploy to cloud controller
+    		CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
+            
+    		
+    		if (log.isDebugEnabled()) {
+    			log.debug("deployeing composite app in cloud controller");
+    		}
+            
+            ServiceUtils.deployCompositeApplicationDefinition(applicationDefinitionBean, ctxt, userName, tenantDomain);
+    		 
+            if (log.isDebugEnabled()) {
+    			log.debug("done deployeing composite app in cloud controller");
+    		}
+
+    		StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
+    		stratosAdminResponse.setMessage("Successfully deployed application definition w" + applicationDefinitionBean);
+    		return stratosAdminResponse;
+    } */
+    
+    static StratosAdminResponse deployCompositeApplicationDefinition (CompositeApplicationDefinitionBean compositeApplicationDefinition, ConfigurationContext ctxt,
+            String userName, String tenantDomain) throws RestAPIException {
+
+            log.info("Starting to deploy composite application definition "+  compositeApplicationDefinition);
+            
+            CompositeApplicationDefinition appConfig = PojoConverter.convertToCompositeApplicationForCC(compositeApplicationDefinition);
+            
+
+            CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
+            
+            if (cloudControllerServiceClient != null) {
+    			// call CC
+            	try {
+					cloudControllerServiceClient
+					.deployCompositeApplicationDefinition(appConfig);
+				} catch (RemoteException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+					log.error(e.getMessage(), e);
+    				throw new RestAPIException(e.getMessage(), e);
+				} catch (CloudControllerServiceInvalidCompositeApplicationDefinitionExceptionException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+					//String message = e.getFaultMessage().getInvalidCompositeApplicationDefinitionException().getMessage();
+					String message = "CloudControllerServiceInvalidCompositeApplicationDefinitionExceptionException";
+    				log.error(message, e);
+    				throw new RestAPIException(message, e);
+				} catch (CloudControllerServiceInvalidIaasProviderExceptionException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+					String message = e.getFaultMessage().getInvalidIaasProviderException().getMessage();
+    				log.error(message, e);
+    				throw new RestAPIException(message, e);
+				}
+            	
+                log.info("Successfully composite application to cloud controller");
+                    
+            }
+
+            StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
+            stratosAdminResponse.setMessage("Successfully composite application to cloud controller");
+            return stratosAdminResponse;
+        }
+    
+    static StratosAdminResponse unDeployApplication(String configCompositeApplicationAlias, ConfigurationContext ctxt,
+            String userName, String tenantDomain) throws RestAPIException {
+
+    		log.info("Starting to undeploy a composite application definition " + configCompositeApplicationAlias);
+    		
+    		CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
+            
+            if (cloudControllerServiceClient != null) {
+            	try {
+            		if (log.isDebugEnabled()) {
+                		log.debug("trying to undeploy composite application definition " + configCompositeApplicationAlias);
+                	}
+					cloudControllerServiceClient.unDeployCompositeApplicationDefinition(configCompositeApplicationAlias);
+				} catch (RemoteException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+					String message = "Remote ExceptionException";
+    				log.error(message, e);
+    				throw new RestAPIException(message, e);
+				} catch (CloudControllerServiceInvalidCompositeApplicationDefinitionExceptionException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+					String message = "CloudControllerServiceInvalidCompositeApplicationDefinitionExceptionException";
+    				log.error(message, e);
+    				throw new RestAPIException(message, e);
+				} catch (CloudControllerServiceInvalidIaasProviderExceptionException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+					String message = "CloudControllerServiceInvalidIaasProviderExceptionException";
+    				log.error(message, e);
+    				throw new RestAPIException(message, e);
+				}
+            } else {
+            	if (log.isDebugEnabled()) {
+            		log.debug("cloud controller client is null while trying to undeploy composite application definition");
+            	}
+            }
+    		
+    		log.info("l [type] " + configCompositeApplicationAlias);
+
+    		StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
+    		stratosAdminResponse.setMessage("Successfully un-deployed application with alias " + configCompositeApplicationAlias);
+    		return stratosAdminResponse;
+    }
+    
+    
+    static StratosAdminResponse unDeployApplicationOld(String configCompositeApplicationAlias, ConfigurationContext ctxt,
+            String userName, String tenantDomain) throws RestAPIException {
+
+    		log.info("Starting to undeploy a composite application " + configCompositeApplicationAlias);
+    		
+    		CompositeApplicationManager manager = new CompositeApplicationManager();	
+    		
+			try {
+				manager.unDeployCompositeApplication(configCompositeApplicationAlias);
+			} catch (ADCException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+				String message = e.getMessage();
+				log.error(message, e);
+				throw new RestAPIException(message, e);
+			}
+    		
+    		log.info("l [type] " + configCompositeApplicationAlias);
+
+    		StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
+    		stratosAdminResponse.setMessage("Successfully un-deployed application with alias " + configCompositeApplicationAlias);
+    		return stratosAdminResponse;
+    }
 
     @SuppressWarnings("unused")
     private static DeploymentPolicy[] intersection(
@@ -993,14 +1196,30 @@ public class ServiceUtils {
         subscriptionData.setCommitsEnabled(cartridgeInfoBean.isCommitsEnabled());
         subscriptionData.setServiceGroup(cartridgeInfoBean.getServiceGroup());
         
+
+        PersistenceBean persistenceBean = cartridgeInfoBean.getPersistence();
+        if(persistenceBean != null) {
+            subscriptionData.setPersistence(PojoConverter.getPersistence(persistenceBean));
+        }
+        if(cartridgeInfoBean.getProperty() != null){
+            subscriptionData.setProperties(PojoConverter.getProperties(cartridgeInfoBean.getProperty()));
+        }
+
+        /*
+        if (cartridgeInfoBean.getPersistence() != null) {
+
         if (cartridgeInfoBean.isPersistanceRequired()) {
             // Add persistence related properties to PersistenceContext
             PersistenceContext persistenceContext = new PersistenceContext();
             persistenceContext.setPersistanceRequiredProperty(IS_VOLUME_REQUIRED, String.valueOf(cartridgeInfoBean.isPersistanceRequired()));
             persistenceContext.setSizeProperty(VOLUME_SIZE, cartridgeInfoBean.getSize());
             persistenceContext.setDeleteOnTerminationProperty(SHOULD_DELETE_VOLUME, String.valueOf(cartridgeInfoBean.isRemoveOnTermination()));
+            if(cartridgeInfoBean.getVolumeId() != null) {
+                persistenceContext.setVolumeIdProperty(VOLUME_ID, String.valueOf(cartridgeInfoBean.getVolumeId()));
+            }
             subscriptionData.setPersistanceCtxt(persistenceContext);
         }
+        */
 
         //subscribe
         return cartridgeSubsciptionManager.subscribeToCartridgeWithProperties(subscriptionData);
@@ -1072,6 +1291,7 @@ public class ServiceUtils {
             subscriptionData.setTenantId(ApplicationManagementUtil.getTenantId(configurationContext));
             subscriptionData.setTenantAdminUsername(userName);
             subscriptionData.setRepositoryType("git");
+            //subscriptionData.setPayloadProperties(props);
             //subscriptionData.setProperties(props);
             subscriptionData.setPrivateRepository(false);
 
@@ -1082,6 +1302,7 @@ public class ServiceUtils {
             cartridgeSubscription.getPayloadData().add("LOAD_BALANCED_SERVICE_TYPE", loadBalancedCartridgeType);
 
             Properties lbProperties = new Properties();
+            lbProperties.setPayloadProperties(props);
             lbProperties.setProperties(props);
             cartridgeSubsciptionManager.registerCartridgeSubscription(cartridgeSubscription, lbProperties);
             

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
index 7b744a5..a836fb7 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
@@ -39,6 +39,7 @@ import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.Autosca
 import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.deployment.DeploymentPolicy;
 import org.apache.stratos.rest.endpoint.bean.cartridge.definition.CartridgeDefinitionBean;
 import org.apache.stratos.rest.endpoint.bean.cartridge.definition.ServiceDefinitionBean;
+import org.apache.stratos.rest.endpoint.bean.compositeapplication.definition.CompositeApplicationDefinitionBean;
 import org.apache.stratos.rest.endpoint.bean.repositoryNotificationInfoBean.Payload;
 import org.apache.stratos.rest.endpoint.bean.repositoryNotificationInfoBean.Repository;
 import org.apache.stratos.rest.endpoint.bean.topology.Cluster;
@@ -105,6 +106,75 @@ public class StratosAdmin extends AbstractAdmin {
         return Response.ok().header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON).
                 entity(Utils.buildAuthenticationSuccessMessage(sessionId)).build();
     }
+    
+    @POST
+    @Path("/application/definition/")
+    @Produces("application/json")
+    @Consumes("application/json")
+    @AuthorizationAction("/permission/protected/manage/monitor/tenants")
+    @SuperTenantService(true)
+    // Grouping
+    public StratosAdminResponse deployApplicationDefinition(CompositeApplicationDefinitionBean applicationDefinitionBean)
+            throws RestAPIException {
+
+        /*return ServiceUtils.deployApplication(applicationDefinitionBean, getConfigContext(), getUsername(),
+                                     getTenantDomain());
+                                     */
+    	return ServiceUtils.deployCompositeApplicationDefinition(applicationDefinitionBean, getConfigContext(), getUsername(),
+                                     getTenantDomain());
+
+    }
+    
+    @POST
+    @Path("/application/definition/undeploy")
+    @Produces("application/json")
+    @Consumes("application/json")
+    @AuthorizationAction("/permission/protected/manage/monitor/tenants")
+    @SuperTenantService(true)
+    // Grouping
+    public StratosAdminResponse unDeployApplicationDefinition(String alias)
+            throws RestAPIException {
+
+        return ServiceUtils.unDeployApplication(alias, getConfigContext(), getUsername(),
+                                     getTenantDomain());
+
+    }
+    
+
+    
+    @DELETE
+    @Path("/application/definition/{applicationAlias}")
+    @Produces("application/json")
+    @Consumes("application/json")
+    @AuthorizationAction("/permission/protected/manage/monitor/tenants")
+    @SuperTenantService(true)
+    // Grouping
+    public StratosAdminResponse unDeployApplicationDefinitionX(@PathParam("applicationAlias")String  configCompositeApplicationAlias)
+            throws RestAPIException {
+
+        return ServiceUtils.unDeployApplication(configCompositeApplicationAlias, getConfigContext(), getUsername(),
+                getTenantDomain());
+
+    }
+    
+    
+    
+    /*
+     * Grouping --- fix  API, use this instead of POST to remove application !!!!
+   
+    @DELETE
+    @Path("/cartridge/definition/{cartridgeType}")
+    @Produces("application/json")
+    @Consumes("application/json")
+    @AuthorizationAction("/permission/protected/manage/monitor/tenants")
+    @SuperTenantService(true)
+    public StratosAdminResponse unDeployCartridgeDefinition (@PathParam("cartridgeType") String cartridgeType) throws RestAPIException {
+
+        return ServiceUtils.undeployCartridge(cartridgeType);
+    }
+    nnnnnn
+    */
+    
 
     @POST
     @Path("/cartridge/definition/")

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh b/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh
index db86d7d..317da88 100644
--- a/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh
+++ b/products/cartridge-agent/modules/distribution/src/main/bin/stratos.sh
@@ -44,7 +44,8 @@ properties="-Dmb.ip=MB-IP
 	    -Dmonitoring.server.port=MONITORING-SERVER-PORT
 	    -Dmonitoring.server.secure.port=MONITORING-SERVER-SECURE-PORT
 	    -Dmonitoring.server.admin.username=MONITORING-SERVER-ADMIN-USERNAME
-	    -Dmonitoring.server.admin.password=MONITORING-SERVER-ADMIN-PASSWORD"
+	    -Dmonitoring.server.admin.password=MONITORING-SERVER-ADMIN-PASSWORD
+	    -DAPP_PATH=APP-PATH"
 
 # Uncomment below line to enable remote debugging
 #debug="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template b/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template
index c6b062a..45b8d7a 100644
--- a/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template
+++ b/products/cartridge-agent/modules/distribution/src/main/conf/templates/jndi.properties.template
@@ -20,6 +20,6 @@
 # Please use loadbalancer.conf for updating mb-ip, mb-port and templates/jndi.properties.template
 # file for updating other configurations.
 #
-connectionfactoryName=topicConnectionfactory
-connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://$mb_ip:$mb_port'
-java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory
+connectionfactoryName=TopicConnectionFactory
+connectionfactory.topicConnectionfactory=tcp://$mb_ip:$mb_port
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/products/cartridge-agent/modules/distribution/src/main/extensions/mount_volumes.sh
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/src/main/extensions/mount_volumes.sh b/products/cartridge-agent/modules/distribution/src/main/extensions/mount_volumes.sh
index 48f3ceb..63e303f 100755
--- a/products/cartridge-agent/modules/distribution/src/main/extensions/mount_volumes.sh
+++ b/products/cartridge-agent/modules/distribution/src/main/extensions/mount_volumes.sh
@@ -28,8 +28,8 @@ log=/var/log/apache-stratos/cartridge-agent-extensions.log
 echo -e "Starting mounting volumes" 2>&1 | tee -a $log
 
 # $1  is passed from Cartridge Agent code.
-echo -e "launh param file location $1" | tee -a $log
-#source /opt/apache-stratos-cartridge-agent/launch.params
+echo -e "launch param file location $1" | tee -a $log
+
 PERSISTENCE_MAPPING=$1
 echo -e "Persistance mappings : $PERSISTENCE_MAPPING" 2>&1 | tee -a $log
 
@@ -37,8 +37,29 @@ mount_volume(){
 
         device=$1;
         mount_point=$2;
-        echo "device $device"
-        echo "point  $mount_point"
+    echo -e "device $device" | tee -a $log
+        echo -e "mount point  $mount_point"| tee -a $log
+
+
+        if [  "$mount_point" = "null" ]
+        then
+              echo -e "[ERROR] Mount point can not be null" | tee -a $log
+          return
+        fi
+
+        if [  "$device" = "null" ]
+        then
+              echo -e "[ERROR] Device can not be null" | tee -a $log
+          return
+        fi
+
+        device_exist=`sudo fdisk -l $device`;
+        if [ "$device_exist" = "" ]
+        then
+              echo -e "[ERROR] Device $device does not exist in this instance." | tee -a $log
+          return
+    fi
+
         # check if the volume has a file system
         output=`sudo file -s $device`;
         echo $output | tee -a $log
@@ -59,15 +80,15 @@ mount_volume(){
         if [ ! -d "$mount_point" ]
         then
               echo "creating the  mount point directory $mount_point since it does not exist." | tee -a $log
-              sudo mkdir $mount_point
+              sudo mkdir -p $mount_point
         fi
 
         #mounting the device if it is not already mounted
         if [ ! "$device_mounted" = "" ]
         then
-              echo -e "Device $device is already mounted." | tee -a $log
+              echo -e "[WARNING] Device $device is already mounted." | tee -a $log
         else
-              sudo mount $device $mount_point
+              sudo mount $device $mount_point  2>&1 | tee -a $log
         fi
 
 }
@@ -75,12 +96,65 @@ mount_volume(){
 IFS='|' read -ra ADDR <<< "${PERSISTENCE_MAPPING}"
 echo "${ADDR[@]}" | tee -a $log
 
+echo -e "\n Volumes before mounting...." | tee -a $log
+output=`/bin/lsblk`
+echo -e "\n$output\n" | tee -a $log
+output=`/sbin/blkid`
+echo -e "\n$output\n" | tee -a $log
+
+totalcount=0
 for i in "${!ADDR[@]}"; do
-        # expected PERSISTANCE_MAPPING format is device1|mountPoint1|device2|mountpoint2...
-        # so that even indexes are devices and odd indexes are mount points..
-        if (( $i  % 2 == 0 ))
+        # expected PERSISTANCE_MAPPING format is device1|volumeID1|mountPoint1|device2|volumeID2|mountpoint2...
+        if (( $i  % 3 == 0 ))
         then
-           mount_volume ${ADDR[$i]} ${ADDR[$i + 1]}
+           devicelist[$totalcount]=${ADDR[$i]}
+           mountpathlist[$totalcount]=${ADDR[$i + 2]}
+           totalcount=$((totalcount+1))
+           lastdevice=${ADDR[$i]}
         fi
 done
 
+
+device_exist=`sudo fdisk -l $lastdevice`;
+if [ "$device_exist" = "" ]
+then
+# Last device doesn't exist, which means devices are not attached as per the order given in the payload
+# So start mounting from the last available device and come down
+    devlist=`sudo lsblk -n | cut -f 1 -d " "`
+    devcount=`echo ${devlist} | awk '{print NF}'`
+    totalcount=$((totalcount-1))
+        counter=0
+    for ((i=${devcount}-1; totalcount>=0; i--)); do
+        devnum=`expr ${devcount} - ${counter}`
+        currdevice=`echo ${devlist} | cut -d " " -f ${devnum}`
+        fileout=`sudo file -s /dev/${currdevice}`
+        if [[ $fileout == *ROM* ]] || [[ $fileout == *boot* ]] || [[ $fileout == *cloud* ]] || [[ $fileout == *not-regular* ]] || [[ $fileout == *empty* ]] || [[ $fileout == *swap* ]]
+        then
+            # Ignore special files as checked above...
+            counter=`expr ${counter} + 1`
+            continue
+        fi
+        mountpath=${mountpathlist[$totalcount]}
+        totalcount=$((totalcount-1))
+        echo "device is $currdevice"
+        echo "mount path is $mountpath"
+        counter=`expr ${counter} + 1`
+        mount_volume "/dev/${currdevice}" ${mountpath}
+    done
+else
+# Last device exists, which means the volumes are created or few might have been skipped in the first part since the device is already present
+# Mount of rest of the volumes will be fine and contine
+    for i in "${!ADDR[@]}"; do
+        # expected PERSISTANCE_MAPPING format is device1|volumeID1|mountPoint1|device2|volumeID2|mountpoint2...
+        if (( $i  % 3 == 0 ))
+        then
+           mount_volume ${ADDR[$i]} ${ADDR[$i + 2]}
+        fi
+    done
+fi
+
+echo -e "\n Volumes after mounting...." | tee -a $log
+output=`/bin/lsblk`
+echo -e "\n$output\n" | tee -a $log
+output=`/sbin/blkid`
+echo -e "\n$output\n" | tee -a $log

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/products/stratos/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/assembly/bin.xml b/products/stratos/modules/distribution/src/assembly/bin.xml
index 6e1d991..0cefc0c 100755
--- a/products/stratos/modules/distribution/src/assembly/bin.xml
+++ b/products/stratos/modules/distribution/src/assembly/bin.xml
@@ -644,6 +644,12 @@
             <filtered>true</filtered>
             <fileMode>755</fileMode>
         </file>
+        <file>
+            <source>src/main/conf/terminatedependency.drl</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>755</fileMode>
+        </file>
 		<!-- autoscaler -->
         <file>
             <source>${project.basedir}/INSTALL.txt</source>

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/products/stratos/modules/distribution/src/main/conf/mincheck.drl
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/mincheck.drl b/products/stratos/modules/distribution/src/main/conf/mincheck.drl
index b1c0f7c..b29e991 100755
--- a/products/stratos/modules/distribution/src/main/conf/mincheck.drl
+++ b/products/stratos/modules/distribution/src/main/conf/mincheck.drl
@@ -48,6 +48,10 @@ global org.apache.stratos.messaging.domain.topology.Topology $topology;
 global java.util.Map partitionCtxts;
 global java.lang.String clusterId;
 global java.lang.String lbRef;
+global java.lang.String serviceId;
+
+global org.apache.stratos.autoscaler.policy.model.AutoscalePolicy autoscalePolicy;
+
 
 rule "Minimum Rule"
 dialect "mvel"
@@ -57,6 +61,9 @@ dialect "mvel"
 	       eval(log.debug("[min-check] [network-partition] " + $ctxt.getNetworkPartitionId() + " [partition] " + $ctxt.getPartitionId() + " Non terminated member count: " + $ctxt.getNonTerminatedMemberCount()))
 	       eval(log.debug("[min-check] [network-partition] " + $ctxt.getNetworkPartitionId() + " [partition] " + $ctxt.getPartitionId() + " Minimum member count: " + $ctxt.getMinimumMemberCount()))
 	       eval($ctxt.getNonTerminatedMemberCount() < $ctxt.getMinimumMemberCount())
+	       eval(log.debug("Grouping ... checking startup dependencies for " + clusterId))
+           eval($ctxt.checkStartupDependencies(serviceId, clusterId))
+           eval(log.debug("startup dependencies successfully checked for" + clusterId))
 
        then
 	       $delegator.delegateSpawn($ctxt, clusterId, lbRef);

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/products/stratos/modules/distribution/src/main/conf/terminatedependency.drl
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/terminatedependency.drl b/products/stratos/modules/distribution/src/main/conf/terminatedependency.drl
new file mode 100644
index 0000000..9ea243c
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/conf/terminatedependency.drl
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.stratos.autoscaler.rule;
+
+import org.apache.stratos.messaging.domain.topology.Cluster;
+import org.apache.stratos.autoscaler.PartitionContext;
+
+global org.apache.stratos.autoscaler.rule.RuleLog log;
+global org.apache.stratos.autoscaler.rule.RuleTasksDelegator $delegator;
+global java.util.Map partitionCtxts;
+global java.lang.String clusterId;
+global java.lang.String lbRef;
+global java.lang.String serviceId;
+
+global org.apache.stratos.autoscaler.policy.model.AutoscalePolicy autoscalePolicy;
+
+rule "Terminate Dependency Rule"
+
+dialect "mvel"
+        when
+            $ctxt : PartitionContext ()
+            eval(log.debug("Running terminate dependency rule: [partition] " + $ctxt.getPartitionId() + " [network-partition] " + $ctxt.getNetworkPartitionId()))
+            eval(log.debug("[terminate dependency] [network-partition] " + $ctxt.getNetworkPartitionId() + " [partition] " + $ctxt.getPartitionId() +" Member count: " + $ctxt.getMemberStatsContexts().size()))
+            eval(log.debug("Grouping ... in terminatedependency rule terminating all members " + $ctxt.getAllMemberForTerminationCount()))
+            eval(!$ctxt.checkKillDependencies(serviceId, clusterId))
+            eval(log.debug("[terminate dependency] [network-partition] " + $ctxt.getNetworkPartitionId() + " [partition] " + $ctxt.getPartitionId() + " successfully terminated members"))
+ 
+            eval(log.debug("Grouping:terminatedependency:terminating all"))
+
+        then
+           $delegator.delegateTerminateAll(clusterId);
+end
+
+
+


[7/7] git commit: initial grouping code to develop cartridge grouping feature

Posted by me...@apache.org.
 initial grouping code to develop cartridge grouping feature


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/67e868eb
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/67e868eb
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/67e868eb

Branch: refs/heads/4.0.0-grouping
Commit: 67e868eb6c5a6dd2c5da3eabd6f583a8c9158dd0
Parents: fcc90fc
Author: Martin Eppel <me...@cisco..com>
Authored: Thu Jun 26 13:30:49 2014 -0700
Committer: Martin Eppel <me...@cisco..com>
Committed: Thu Jun 26 13:30:49 2014 -0700

----------------------------------------------------------------------
 .../autoscaler/ComplexApplicationContext.java   | 929 +++++++++++++++++++
 .../stratos/autoscaler/PartitionContext.java    |  77 ++
 .../AutoscalerTopologyEventReceiver.java        |  26 +
 .../autoscaler/monitor/AbstractMonitor.java     |  27 +-
 .../autoscaler/monitor/ClusterMonitor.java      |  24 +
 .../rule/AutoscalerRuleEvaluator.java           |  36 +
 .../autoscaler/rule/RuleTasksDelegator.java     |  22 +-
 .../stratos/cartridge/agent/CartridgeAgent.java |  15 +-
 .../publisher/CartridgeStatistics.java          |  66 ++
 .../publisher/HealthStatisticsNotifier.java     | 119 ++-
 .../publisher/HealthStatisticsReader.java       |  44 +-
 .../publisher/IHealthStatisticsReader.java      |  55 ++
 .../statistics/publisher/PluginLoader.java      |  88 ++
 .../java/org/apache/stratos/cli/Command.java    |   5 +-
 .../stratos/cli/RestCommandLineService.java     |   6 +-
 .../apache/stratos/cli/StratosApplication.java  |   8 +-
 .../cli/beans/cartridge/CartridgeInfoBean.java  |  12 +-
 .../cli/commands/ActivateTenantCommand.java     |   3 +-
 .../cli/commands/AddDomainMappingCommand.java   |   3 +-
 .../stratos/cli/commands/AddTenantCommand.java  |  30 +-
 .../cli/commands/AutoscalePolicyCommand.java    |   3 +-
 .../AutoscalingPolicyDeploymentCommand.java     |  10 +-
 .../commands/CartridgeDeploymentCommand.java    |  10 +-
 .../cli/commands/DeactivateTenantCommand.java   |   3 +-
 .../cli/commands/DeleteTenantCommand.java       |   3 +-
 .../DeployServiceDeploymentCommand.java         |  10 +-
 .../cli/commands/DeploymentPolicyCommand.java   |   3 +-
 .../DeploymentPolicyDeploymentCommand.java      |  10 +-
 .../DescribeAutoScalingPolicyCommand.java       |   2 +-
 .../cli/commands/DescribeCartridgeCommand.java  |   2 +-
 .../DescribeDeploymentPolicyCommand.java        |   2 +-
 .../cli/commands/DescribePartitionCommand.java  |   3 +-
 .../stratos/cli/commands/ExitCommand.java       |   8 +-
 .../stratos/cli/commands/HelpCommand.java       |   3 +-
 .../stratos/cli/commands/InfoCommand.java       |   3 +-
 .../stratos/cli/commands/ListAllTenants.java    |   3 +-
 .../cli/commands/ListCartridgesCommand.java     |   3 +-
 .../cli/commands/ListDeployServiceCommand.java  |   3 +-
 .../stratos/cli/commands/ListMemberCommand.java |  14 +-
 .../ListSubscribedCartridgesCommand.java        |   9 +-
 .../stratos/cli/commands/PartitionCommand.java  |   2 +-
 .../commands/PartitionDeploymentCommand.java    |  10 +-
 .../stratos/cli/commands/PoliciesCommand.java   |   3 +-
 .../commands/RemoveDomainMappingCommand.java    |   3 +-
 .../stratos/cli/commands/SubscribeCommand.java  |  59 +-
 .../SubscribedCartridgeInfoCommand.java         |   6 +-
 .../stratos/cli/commands/SyncCommand.java       |   3 +-
 .../UndeployCartridgeDefinitionCommand.java     |   3 +-
 .../UndeployServiceDefinitionCommand.java       |   3 +-
 .../cli/commands/UnsubscribeCommand.java        |   9 +-
 .../apache/stratos/cli/utils/CliConstants.java  |   3 +
 .../stratos/cli/utils/CommandLineUtils.java     |  14 +
 .../src/main/resources/log4j.properties         |   2 +-
 ...CompositeApplicationDefinitionException.java |  44 +
 .../cloud/controller/iaases/AWSEC2Iaas.java     |  17 +-
 .../controller/iaases/OpenstackNovaIaas.java    | 224 +++--
 .../cloud/controller/iaases/VCloudIaas.java     |   2 +-
 .../impl/CloudControllerServiceImpl.java        | 237 +++--
 .../cloud/controller/interfaces/Iaas.java       |   2 +-
 .../pojo/CompositeApplicationDefinition.java    |  39 +
 .../cloud/controller/pojo/ConfigCartridge.java  |  17 +
 .../controller/pojo/ConfigDependencies.java     |  29 +
 .../controller/pojo/ConfigDependencyPair.java   |  29 +
 .../cloud/controller/pojo/ConfigGroup.java      |  35 +
 .../cloud/controller/pojo/Registrant.java       |   9 +
 .../stratos/cloud/controller/pojo/Volume.java   |  24 +-
 .../runtime/FasterLookUpDataHolder.java         |  19 +
 .../controller/topology/TopologyBuilder.java    | 343 ++++++-
 .../topology/TopologyEventPublisher.java        |  61 +-
 .../controller/topology/TopologyManager.java    |   2 +
 .../util/CloudControllerConstants.java          |   1 +
 .../controller/util/CloudControllerUtil.java    |   4 +-
 .../CompositeApplicationManager.java            | 131 +++
 .../application/utils/ApplicationUtils.java     | 104 +++
 .../behaviour/CartridgeMgtBehaviour.java        |   6 +-
 .../client/CloudControllerServiceClient.java    |  23 +-
 .../stratos/manager/deploy/service/Service.java |   2 +-
 .../multitenant/lb/MultiTenantLBService.java    |   2 +-
 .../internal/ADCManagementServerComponent.java  |  14 +
 .../category/DefaultLoadBalancerCategory.java   |   5 +-
 .../category/ExistingLoadBalancerCategory.java  |   3 +-
 .../ServiceLevelLoadBalancerCategory.java       |   5 +-
 .../manager/CartridgeSubscriptionManager.java   |  26 +-
 .../stratos/manager/payload/PayloadData.java    |  29 +-
 .../manager/persistence/PersistenceManager.java |   9 +
 .../RegistryBasedPersistenceManager.java        | 222 +++++
 .../DataInsertionAndRetrievalManager.java       |  67 ++
 .../subscription/CartridgeSubscription.java     |   6 +-
 .../subscription/DataCartridgeSubscription.java |   5 +-
 .../subscription/LBCartridgeSubscription.java   |   5 +-
 .../subscription/PersistenceContext.java        |  11 +
 .../manager/subscription/SubscriptionData.java  |  30 +-
 .../SubscriptionMultiTenantBehaviour.java       |   5 +-
 .../utils/ApplicationManagementUtil.java        |   9 +-
 .../stratos/manager/utils/Serializer.java       |  22 +
 .../messaging/domain/topology/Cartridge.java    |  81 ++
 .../messaging/domain/topology/Composite.java    |  15 +
 .../domain/topology/CompositeApplication.java   | 290 ++++++
 .../domain/topology/ConfigCartridge.java        |  20 +
 .../topology/ConfigCompositeApplication.java    |  42 +
 .../domain/topology/ConfigDependencies.java     |  57 ++
 .../messaging/domain/topology/ConfigGroup.java  |  33 +
 .../messaging/domain/topology/Dependencies.java | 334 +++++++
 .../messaging/domain/topology/Group.java        | 503 ++++++++++
 .../messaging/domain/topology/Scalable.java     |   5 +
 .../messaging/domain/topology/Subscribable.java |  25 +
 .../messaging/domain/topology/Topology.java     |  91 +-
 .../util/CompositeApplicationBuilder.java       | 240 +++++
 .../instance/status/InstanceActivatedEvent.java |   9 +
 .../status/InstanceMaintenanceModeEvent.java    |   9 +
 .../status/InstanceReadyToShutdownEvent.java    |   9 +
 .../instance/status/InstanceStartedEvent.java   |   9 +
 .../CompositeApplicationCreatedEvent.java       |  52 ++
 .../topology/CompositeApplicationEvent.java     |  31 +
 .../CompositeApplicationRemovedEvent.java       |  49 +
 .../event/topology/MemberActivatedEvent.java    |  19 +
 .../topology/MemberMaintenanceModeEvent.java    |   9 +
 .../topology/MemberReadyToShutdownEvent.java    |   9 +
 .../event/topology/MemberStartedEvent.java      |   9 +
 .../event/topology/MemberSuspendedEvent.java    |   9 +
 .../event/topology/MemberTerminatedEvent.java   |   9 +
 ...ompositeApplicationCreatedEventListener.java |  26 +
 ...ompositeApplicationRemovedEventListener.java |  26 +
 ...ositeApplicationCreatedMessageProcessor.java |  98 ++
 ...ositeApplicationRemovedMessageProcessor.java | 100 ++
 .../topology/TopologyMessageProcessorChain.java |  27 +-
 .../stratos/messaging/util/Constants.java       |   1 +
 .../org/apache/stratos/messaging/util/Util.java |   8 +
 .../rest/endpoint/bean/CartridgeInfoBean.java   |  58 +-
 .../bean/cartridge/definition/VolumeBean.java   |   6 +
 .../CompositeApplicationDefinitionBean.java     |  17 +
 .../definition/ConfigCartridge.java             |   8 +
 .../definition/ConfigDependencies.java          |  57 ++
 .../definition/ConfigGroup.java                 |  35 +
 .../bean/util/converter/PojoConverter.java      | 153 ++-
 .../rest/endpoint/services/ServiceUtils.java    | 221 +++++
 .../rest/endpoint/services/StratosAdmin.java    |  70 ++
 .../distribution/src/main/bin/stratos.sh        |   3 +-
 .../conf/templates/jndi.properties.template     |   6 +-
 .../src/main/extensions/mount_volumes.sh        |  96 +-
 .../modules/distribution/src/assembly/bin.xml   |   6 +
 .../distribution/src/main/conf/mincheck.drl     |   7 +
 .../src/main/conf/terminatedependency.drl       |  52 ++
 .../main/resources/CloudControllerService.wsdl  | 885 ++++++++++--------
 144 files changed, 6847 insertions(+), 788 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/ComplexApplicationContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/ComplexApplicationContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/ComplexApplicationContext.java
new file mode 100644
index 0000000..98c4d2c
--- /dev/null
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/ComplexApplicationContext.java
@@ -0,0 +1,929 @@
+package org.apache.stratos.autoscaler;
+
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.messaging.domain.topology.Cluster;
+import org.apache.stratos.messaging.domain.topology.CompositeApplication;
+import org.apache.stratos.messaging.domain.topology.Dependencies;
+import org.apache.stratos.messaging.domain.topology.Group;
+import org.apache.stratos.messaging.domain.topology.Member;
+import org.apache.stratos.messaging.domain.topology.MemberStatus;
+import org.apache.stratos.messaging.domain.topology.Service;
+import org.apache.stratos.messaging.domain.topology.util.CompositeApplicationBuilder;
+import org.apache.stratos.messaging.message.receiver.topology.TopologyManager;
+
+
+public class ComplexApplicationContext {
+	
+	static {
+		is_kill_all_enabled_flag = new HashMap<String, Boolean>();
+		is_in_kill_all_transition = new HashSet<String>();
+	}
+	
+	private static Map<String, Boolean> is_kill_all_enabled_flag;
+	private static HashSet<String> is_in_kill_all_transition;
+	
+
+	
+    private static final Log log = LogFactory.getLog(ComplexApplicationContext.class);  
+
+    // return value of true will bring up new instance (all startup dependencies are up and active)
+    public boolean checkStartupDependencies (String clusterId) {
+    	String serviceType = "undefined";
+    	if (log.isDebugEnabled()) {
+			log.debug("checkStartupDependenciesY: serviceType " + serviceType + "  + clusterId "+ clusterId);
+		}
+    	return checkServiceDependencies (serviceType, clusterId, false);
+    }
+    
+    
+    public boolean checkStartupDependencies (String serviceType, String clusterId) {
+    	if (log.isDebugEnabled()) {
+			log.debug("checkStartupDependenciesY: serviceType " + serviceType + "  + clusterId "+ clusterId);
+		}
+    	return checkServiceDependencies (serviceType, clusterId, false);
+    }
+    
+
+    // return false will terminate instances
+    public boolean checkKillDependencies (String clusterId) {
+    	String serviceType = "undefined";
+    	if (log.isDebugEnabled()) {
+			log.debug("checkKillDependenciesY: serviceType " + serviceType + "  + clusterId "+ clusterId);
+		}
+    	return checkKillTerminateDependencies (serviceType, clusterId, true);
+    }
+    
+    public boolean checkKillDependencies (String serviceType, String clusterId) {
+    	if (log.isDebugEnabled()) {
+			log.debug("checkKillDependenciesY: serviceType " + serviceType + "  + clusterId "+ clusterId);
+		}
+    	return checkKillTerminateDependencies (serviceType, clusterId, true);
+    }
+    
+    
+    public boolean checkServiceDependencies (String serviceType, String clusterId, boolean kill_flag) {
+    	
+    	
+		if (log.isDebugEnabled()) {
+			log.debug("ServiceGroupContext:checkServiceDependencies for service with XY " + 
+				" serviceType "  + serviceType + 
+    			" clusterId: " + clusterId  + " kill_flag: " + kill_flag);
+		}		
+
+		CompositeApplicationBuilder builder = new CompositeApplicationBuilder();
+		CompositeApplication complexApplication = builder.buildCompositeApplication(TopologyManager.getTopology(), null);
+		
+
+		// no app configured
+		if (complexApplication == null) {
+			return true;
+		}
+		
+		String aServiceId = serviceType;
+		if (log.isDebugEnabled()) {
+			log.debug("checking dependencies for service alias " + aServiceId);
+		}
+
+		if (aServiceId == null) {
+			if (log.isDebugEnabled()) {
+				log.debug("invalid serviceType null for cluster  " + clusterId + "skipping dependency check (returning true)");
+			}
+			return true;
+		} 
+		
+		List<Group> service_type_groups = complexApplication.findAllGroupsForServiceType(serviceType);
+
+		String clusterGroupFromClusterId = extractClusterGroupFromClusterId(clusterId);
+		
+		if (clusterGroupFromClusterId == null) {
+			if (log.isDebugEnabled()) {
+				log.debug("cluster id " + clusterId + " has incompatible name to extract group, skipping dependency check (return true)");
+			}
+		}
+		
+		for (Group service_type_group : service_type_groups) {
+			// check if cluster is in the group
+			if (log.isDebugEnabled()) {
+				log.debug(" checking if cluster  " + clusterId + " is in the group " + service_type_group.getAlias() +
+						"extracted group from clusterId is " + clusterGroupFromClusterId);
+			}
+			if (service_type_group.getAlias().equals(clusterGroupFromClusterId)) {
+				boolean result_flag = checkServiceDependenciesForServiceType (serviceType, clusterId, kill_flag, service_type_group);
+				if (log.isDebugEnabled()) {
+					log.debug("cluster is " + clusterId + " is in the group " + service_type_group.getAlias() + " and startup dependency check is " + result_flag);
+				}
+				return result_flag;
+			}
+		}
+		
+		if (log.isDebugEnabled()) {
+			log.debug("no matching group found for cluster  " + clusterId + " skipping dependency check (return true)" );
+		}
+		
+    	return true;
+    	
+    }
+    
+    public boolean checkServiceDependenciesForServiceType (String serviceType, String clusterId, boolean kill_flag, Group home_group) {
+		
+    	String aServiceId = serviceType;
+		
+		if (home_group == null) {
+ 			if (log.isDebugEnabled()) {
+ 				log.debug(" lone cluster without group " + aServiceId + "skip checking and return true (no dependency check)" );
+ 			}
+ 			return true;
+ 		}
+		
+		
+		if (ComplexApplicationContext.isInKillAllTransition(this.getKillInTransitionKey(serviceType, home_group.getAlias()))) {
+			if (log.isDebugEnabled()) {
+				log.debug(" subscribable " + aServiceId + " is inKillAll transition, not spawning a new instance" );
+			}
+			return false;
+		} else {
+			if (log.isDebugEnabled()) {
+				log.debug(" subscribable " + aServiceId + " is not inKillAll transition, continue with dependenciy check" );
+			}
+		}
+
+		Map<String, String> downstreamDependencies = home_group.getDownStreamDependenciesAsMap(aServiceId);
+		
+		
+		if (downstreamDependencies == null || downstreamDependencies.size() == 0) {
+			if (log.isDebugEnabled()) {
+				log.debug("serviceType " + aServiceId + " has no dependencies, returning true (no kill)");
+			}
+			return true;
+		} 
+		
+		if (log.isDebugEnabled()) {
+ 			StringBuffer buf = new StringBuffer();
+ 			buf.append("downstreamdependencies list: [ ");
+ 			
+ 			
+			Set<String> downstream_keys = downstreamDependencies.keySet();
+ 			for (String c : downstream_keys) {
+ 				String d = downstreamDependencies.get(c);
+ 				buf.append(c + ", in group:  ").append(downstreamDependencies.get(d));
+ 			}
+ 			
+ 			buf.append("] ").append(" serviceId ").append(aServiceId);
+ 			log.debug(buf.toString());
+ 		} 
+
+		
+		List<String> in_active_downstreams = this.getServiceSet_StateInActive(downstreamDependencies);	
+		if (in_active_downstreams.size() > 0) {
+			if (log.isDebugEnabled()) {
+				log.debug("found inactive downstream dependencies for serviceType " + aServiceId + " returning false");
+				for (String in_active : in_active_downstreams) {
+					log.debug("inactive downstream dependency " + in_active + " for " + aServiceId);
+				}
+			}
+			
+			return false;
+		}
+
+		if (log.isDebugEnabled()) {
+			log.debug("returning true for dependency check on serviceType " + serviceType);
+		}
+		return true;
+	}    
+    
+    // return false will terminate instances
+    public boolean checkKillTerminateDependencies (String serviceType, String clusterId, boolean kill_flag) {
+		if (log.isDebugEnabled()) {
+			log.debug("ServiceGroupContext:checkKillTerminateDependencies for service with X " + 
+				" serviceType "  + serviceType + 
+    			" clusterId: " + clusterId  + " kill_flag: " + kill_flag);
+		}		
+		
+		if (log.isDebugEnabled()) {
+			log.debug("getting app from builder ");
+		}
+		
+		CompositeApplicationBuilder builder = new CompositeApplicationBuilder();
+		CompositeApplication complexApplication = builder.buildCompositeApplication(TopologyManager.getTopology(), null);
+		
+		String aServiceId = serviceType;
+		if (log.isDebugEnabled()) {
+			log.debug("checking dependencies for service alias " + 
+    			aServiceId);
+		}
+
+		if (aServiceId == null) {
+			if (log.isDebugEnabled()) {
+				log.debug("invalid serviceType null for cluster  " + clusterId + "skipping dependency check (returning true)");
+			}
+			return true;
+		} 
+
+
+		// no app configured, don't terminate
+		if (complexApplication == null) {
+			return true;
+		}
+
+		List<Group> service_type_groups = complexApplication.findAllGroupsForServiceType(serviceType);
+
+		String clusterGroupFromClusterId = extractClusterGroupFromClusterId(clusterId);
+		
+		if (clusterGroupFromClusterId == null) {
+			if (log.isDebugEnabled()) {
+				log.debug("cluster id " + clusterId + " has incompatible name to extract group, skipping terminate dependency check (return true)");
+			}
+		}
+		
+		for (Group service_type_group : service_type_groups) {
+			// check if cluster is in the group
+			if (log.isDebugEnabled()) {
+				log.debug(" checking if cluster  " + clusterId + " is in the group " + service_type_group.getAlias() +
+						"extracted group from clusterId is " + clusterGroupFromClusterId);
+			}
+			if (service_type_group.getAlias().equals(clusterGroupFromClusterId)) {
+				boolean result_flag = checkKillTerminateDependenciesForServiceType (serviceType, clusterId, kill_flag, 
+						service_type_group, complexApplication);
+				if (log.isDebugEnabled()) {
+					log.debug("cluster is " + clusterId + " is in the group " + service_type_group.getAlias() + " and kill dependency check is " + result_flag);
+				}
+				return result_flag;
+			}
+		}
+		
+		if (log.isDebugEnabled()) {
+			log.debug("no matching group found for cluster  " + clusterId + " skipping terminate dependency check (return true)" );
+		}
+		
+		return true;
+    }
+
+    // return false will terminate instances
+    public boolean checkKillTerminateDependenciesForServiceType (String serviceType, String clusterId, boolean kill_flag, 
+    		Group home_group, CompositeApplication complexApplication ) {
+		
+    	String aServiceId = serviceType;
+		
+		if (home_group == null) {
+ 			if (log.isDebugEnabled()) {
+ 				log.debug(" lone cluster without top level group " + aServiceId + "skip checking and return true (no kill)" );
+ 			}
+ 			return true;
+ 		} else if (home_group.findGroup(aServiceId) == null) {
+ 			if (log.isDebugEnabled()) {
+ 				log.debug(" lone cluster without group " + aServiceId + "skip checking and return true (no kill)" );
+ 			}
+ 			return true;
+ 		}
+
+ 		
+		//Group home_group = complexApplication.getTop_level().findGroup(aServiceId);
+
+		if (log.isDebugEnabled()) {
+			log.debug("checking  downstream dependencies for " + aServiceId );
+		}
+		Map<String, String> downstreamDependencies = null;
+		downstreamDependencies = home_group.getDownStreamDependenciesAsMap(aServiceId);
+		if (log.isDebugEnabled()) {
+ 			StringBuffer buf = new StringBuffer();
+ 			buf.append("downstreamdependencies list: [ ");
+ 			
+ 			if (downstreamDependencies != null & downstreamDependencies.keySet().size() > 0) {
+ 				Set<String> downstream_keys = downstreamDependencies.keySet();
+	 			for (String c : downstream_keys) {
+	 				String d = downstreamDependencies.get(c);
+	 				buf.append(c + ", in group:  ").append(d);
+	 			}
+	 			
+	 			buf.append("] ").append(" serviceId ").append(aServiceId);
+ 			} else {
+ 				buf.append(" downstreamDependencies is null ");
+ 			}
+ 			log.debug(buf.toString());
+ 		}
+		
+		
+		
+		if (log.isDebugEnabled()) {
+				log.debug("checking  upstream dependencies for " + aServiceId );
+		}
+		// 2. get upstream dependencies
+		Map<String, String> upstreamDependencies = home_group.getUpstreamDependenciesAsMap(aServiceId);
+ 		
+		if (log.isDebugEnabled()) {
+ 			StringBuffer buf = new StringBuffer();
+ 			buf.append("upstreamdependencies list: [ ");
+ 			
+ 			if (upstreamDependencies != null & upstreamDependencies.keySet().size() > 0) {
+ 				Set<String> upstream_keys = upstreamDependencies.keySet();
+	 			for (String c : upstream_keys) {
+	 				String d = upstreamDependencies.get(c);
+	 				buf.append(c + ", in group:  ").append(upstreamDependencies.get(d));
+	 			}
+	 			
+	 			buf.append("] ").append(" serviceId ").append(aServiceId);
+ 			} else {
+ 				buf.append(" upstreamDependencies is null ");
+ 			}
+ 			log.debug(buf.toString());
+ 		}
+;	
+ 		List<String> in_active_upstreams = this.getServiceSet_StateInActive(upstreamDependencies);
+ 		
+ 		if (log.isDebugEnabled()) {
+			log.debug("getting list of InActive upstream dependencies for  " + aServiceId + " with size of "  + in_active_upstreams.size());
+ 		}	
+ 		
+ 		String kill_behavior = Dependencies.KILL_UNDEFINED;
+ 		// return false if instances should be terminated, true if not
+ 		for (String serviceTypeAlias : in_active_upstreams) {
+ 			String gr_alias = upstreamDependencies.get(serviceTypeAlias); 
+ 			Group gr = complexApplication.getGroupFromGroupAlias(gr_alias);
+ 			if (gr != null) {
+ 				
+	 			kill_behavior = gr.getDependencies().getKill_behavior();
+	 			if (kill_behavior.equals(Dependencies.KILL_ALL)) {
+	 				if (ComplexApplicationContext.isKillAllEnabled(gr.getAlias())) {
+	 					if (log.isDebugEnabled()) {
+	 	 	 				log.debug(" isKillAllEnabled is enabled on upstream (kill) for group " + gr.getAlias() + ", disabling kilAll and preventing " + 
+	 					              " serviceType " + aServiceId + " in group " + gr.getAlias() + 
+	 	 	 						" to spin up a new instance (setting killAllTransitionFlag) ");
+	 	 	 			}
+	 				    // adding to the killalltransition flag
+	 					// building key from alias + group alias
+	 					ComplexApplicationContext.setKillAllTransitionFlag(getKillInTransitionKey(serviceTypeAlias,gr.getAlias()));
+	 					// building key from alias + group alias
+	 					ComplexApplicationContext.setKillAllTransitionFlag(getKillInTransitionKey(aServiceId,home_group.getAlias()));
+	 					return false;
+	 				} else {
+	 					if (log.isDebugEnabled()) {
+	 	 	 				log.debug(" isKillAllEnabled is disabled on upstream (no kill) for group " + gr.getAlias() );
+	 	 	 			}
+	 					return true;
+	 				}
+	 			} else if (kill_behavior.equals(Dependencies.KILL_DEPENDENTS)) {
+	 				if (log.isDebugEnabled()) {
+	 	 				log.debug(" continue to check upstream for kill_flag " + kill_behavior + " for group " + gr.getAlias() );
+	 	 			}
+	 			// continue to check
+	 			} else if (kill_behavior.equals(Dependencies.KILL_NONE)) {
+	 				if (log.isDebugEnabled()) {
+	 	 				log.debug(" continue to check upstream for kill_flag " + kill_behavior + " for group " + gr.getAlias() );
+	 	 			}
+	 				// continue to check
+	 			} else {
+	 				if (log.isDebugEnabled()) {
+	 	 				log.debug(" continue to check upstream for invalide kill_flag " + kill_behavior + " for group " + gr.getAlias() );
+	 	 			}
+	 				//continue to check
+	 			}
+	 		} else {
+	 			// skip 
+	 			if (log.isDebugEnabled()) {
+ 	 				log.debug(" no group found for " + serviceTypeAlias + " while loopig over in_active_upstreams" );
+ 	 			}
+	 		}
+ 			
+ 		}
+ 		
+ 		// check kill_all_enabled flag
+ 		Map<String, String> all = complexApplication.getAllInPathOfAsMap(aServiceId, home_group);
+ 		String [] group_with_kill_all_aliases = home_group.findAllGroupsWithKill2(all, Dependencies.KILL_ALL);
+ 		// "persistent flag for each group"
+ 		this.updateEnableKillAllFlag(all, group_with_kill_all_aliases);
+ 		
+ 		//List<String> in_active_downstreams = this.getClusterSet_StateInActive(dependeciesAliasArray);jj
+ 		List<String> in_active_downstreams = this.getServiceSet_StateInActive(downstreamDependencies);
+ 		
+ 		if (log.isDebugEnabled()) {
+			log.debug("getting list of InActive downstream dependencies for  " + aServiceId + " with size of "  + in_active_downstreams.size());
+ 		}
+ 		
+ 		kill_behavior = Dependencies.KILL_UNDEFINED;
+ 		for (String alias : in_active_downstreams) {
+ 			Group gr = home_group.findGroup(alias);
+ 			if (gr !=null) {
+	 			kill_behavior = gr.getDependencies().getKill_behavior();
+	 			if (kill_behavior.equals(Dependencies.KILL_ALL) ) {
+	 				if (log.isDebugEnabled()) {
+	 	 				log.debug(" return true on downstream for kill_flag " + kill_behavior + " for group " + gr.getAlias() );
+	 	 			}
+	 				if (ComplexApplicationContext.isKillAllEnabled(gr.getAlias())) {
+	 					if (log.isDebugEnabled()) {
+	 	 	 				log.debug(" isKillAllEnabled is enabled on downstream (kill) for group " + gr.getAlias() +
+	 	 	 						  " setting killAllTransitionFlag for" + alias);
+	 	 	 			}
+	 					// adding to the killalltransition flag
+	 					ComplexApplicationContext.setKillAllTransitionFlag(alias);
+	 					return false;
+	 				} else {
+	 					if (log.isDebugEnabled()) {
+	 	 	 				log.debug(" isKillAllEnabled is disabled on downstream (no kill) for group " + gr.getAlias() );
+	 	 	 			}
+	 					return true;
+	 				}
+	 			} else if (kill_behavior.equals(Dependencies.KILL_DEPENDENTS)) {
+	 				if (log.isDebugEnabled()) {
+	 	 				//log.debug(" continue downstream for kill_flag " + kill_behavior + " for group " + gr.getAlias() );
+	 					log.debug(" downstream service(s) is inactive for aServiceId " + aServiceId + 
+		 						" returning false (kill) and terminating cluster members" );
+	 				}
+	 				return false;
+	 			} else if (kill_behavior.equals(Dependencies.KILL_NONE)) {
+	 				if (log.isDebugEnabled()) {
+	 	 				log.debug(" continue downstream to check for kill_flag " + kill_behavior + " for group " + gr.getAlias() );
+	 	 			}
+	 				// continue to check
+	 			} else {
+	 				if (log.isDebugEnabled()) {
+	 	 				log.debug(" continue downstream to check for invalide kill_flag " + kill_behavior + " for group " + gr.getAlias() );
+	 	 			}
+	 				//continue to check
+	 			}
+ 			} else {
+	 			// skip 
+	 			if (log.isDebugEnabled()) {
+ 	 				log.debug(" no group found for " + alias + " while loopig over in_active_downstreams" );
+ 	 			}
+	 		}
+ 			
+ 		}
+ 		
+ 		// this cluster
+ 		Group gr = home_group.findGroup(aServiceId);
+ 		if (gr == null) {
+ 			if (log.isDebugEnabled()) {
+ 				log.debug(" cluster without group, should not reach this code ? for " + aServiceId );
+ 			}
+ 			return true;
+ 		} 
+ 		
+ 		kill_behavior = gr.getDependencies().getKill_behavior();
+ 		
+ 		if (kill_behavior.equals(Dependencies.KILL_DEPENDENTS)) {
+			if (log.isDebugEnabled()) {
+ 				log.debug(Dependencies.KILL_DEPENDENTS + " check if any downstream cluster is inactive for aServiceId " + aServiceId );
+ 			}
+			if (in_active_downstreams.size() > 0) {
+				if (log.isDebugEnabled()) {
+	 				log.debug(" downstream cluster(s) is inactive for aServiceId " + aServiceId + 
+	 						" returning false (kill) and terminating cluster members" );
+	 			}
+				return false;
+			} else {
+				if (log.isDebugEnabled()) {
+	 				log.debug(" no downstream cluster(s) is inactive for aServiceId " + aServiceId + 
+	 						" returning true (no kill)" );
+	 			}
+				return true;
+			}
+ 		}
+ 		
+ 		
+		if (log.isDebugEnabled()) {
+			log.debug("returning true (no kill) for down and upstream dependency check on clusterId " + aServiceId);
+		}
+		return true;
+	}
+	
+    
+	private boolean hasClusterActiveMember (Cluster cluster) {
+		boolean flag = false;
+        if(cluster.isLbCluster()){
+        	if (log.isDebugEnabled()) {
+        		log.debug("cluster member is lbCluster, not checking " + cluster);
+        	}
+        }else{
+        	if (log.isDebugEnabled()) {
+            	log.debug("checking member acitve for " + 
+    	    			" clusterId: " + cluster.getClusterId() + 
+    	    			" serviceId: " + cluster.getServiceName());
+        	}
+
+			Collection<Member> members = cluster.getMembers();
+			for (Member member:members) {
+				if (log.isDebugEnabled()) {
+					log.debug("listing members while checking if active" + 
+							member.getMemberId() + 
+							" private Ip: " + member.getMemberIp() + 
+							" public Ip:" + member.getMemberPublicIp() + 
+							" member state: " + member.getStatus());
+				}
+				if (member.getStatus().equals(MemberStatus.Activated)) {
+					log.debug("member ACTIVE found :" + member.getMemberId());
+					flag = true;
+					break;
+				}
+			}
+			 
+            }
+        return flag;
+    }
+	
+	
+ 	
+	private String extractAlias (String clusterId) {
+		String [] s = clusterId.split("\\.");
+		if (log.isDebugEnabled())  {
+			log.debug("clusterId alias is " + clusterId + " size: " + s.length);
+		}
+		if (s.length == 0) {
+			return null;
+		} 
+		if (log.isDebugEnabled())  {
+			log.debug("clusterId alias is " + clusterId + " alias: " + s[0]);
+		}
+		return s[0];
+	}
+	
+	private String extractClusterGroupFromClusterId (String clusterId) {
+		String sub1 = extractAlias(clusterId);
+		if (sub1 == null) {
+			return null;
+		}
+		
+		String [] s = sub1.split("-");
+		if (log.isDebugEnabled())  {
+			log.debug("clusterGroup alias is " + sub1 + " size: " + s.length);
+		}
+		if (s.length == 0) {
+			return null;
+		} 
+		if (log.isDebugEnabled())  {
+			log.debug("cluster " + clusterId + " is in group " +  s[0]);
+		}
+		return s[0];
+	}
+	
+
+	
+	private void updateEnableKillAllFlag(Map<String, String>all_dependencies, String [] group_with_kill_all_aliases) {
+		if (log.isDebugEnabled()) {
+			log.debug("updating enable_kill_flag ");
+		}
+		if (group_with_kill_all_aliases == null)  {
+			return;
+		}
+		//if (isClusterSet_StateActive(all_dependencies)) { //
+		if (isServiceSet_StateActive(all_dependencies)) {
+			for (String alias : group_with_kill_all_aliases) {
+				ComplexApplicationContext.setKillAllEnabled(alias);
+				if (log.isDebugEnabled()) {
+					log.debug("enable  enable_kill_flag for subscribable" + alias);
+				}
+			}
+		//} else if (isClusterSet_StateInActive(all_dependencies)) {
+		} else if (isServiceSet_StateInActive(all_dependencies)) {
+			for (String alias : group_with_kill_all_aliases) {
+				ComplexApplicationContext.resetKillAllEnabled(alias);
+				if (log.isDebugEnabled()) {
+					log.debug("disable  enable_kill_flag for subscribable" + alias);
+				}
+			}
+			
+			// resetting killalltransition flag for all subscribables
+			Set<String> key_set = all_dependencies.keySet();
+			for (String serviceTypeAlias : key_set) {
+				String group_alias = all_dependencies.get(serviceTypeAlias);
+				ComplexApplicationContext.resetKillAllTransitionFlag(getKillInTransitionKey(serviceTypeAlias, group_alias));
+				if (log.isDebugEnabled()) {
+					log.debug("resetting  enable_kill_flag, is_in_kill_all_transition for subscribable " + serviceTypeAlias + " in group " + group_alias);
+				}
+			}
+			
+		} else {
+			// do nothing
+			if (log.isDebugEnabled()) {
+				log.debug("leaving enable_kill_flag, is_in_kill_all_transition unchanged ");
+			}
+		}
+		
+	}
+	
+	private String getKillInTransitionKey(String serviceTypeAlias, String gr_alias) {
+		return serviceTypeAlias + gr_alias;
+	}
+
+	
+	private boolean isServiceSet_StateActive(Map<String, String>serviceTypes) {
+		List<String> result = getServiceSet_StateActive(serviceTypes);
+		if (result.size() == serviceTypes.size()) {
+			return true;
+		} 
+		
+		return false;
+	}
+	
+	private boolean isServiceSet_StateInActive(Map<String, String> serviceTypes) {
+		List<String> result = getServiceSet_StateInActive(serviceTypes);
+		if (result.size() == serviceTypes.size()) {
+			return true;
+		} 
+		
+		return false;
+	}
+	
+	
+	private List<String> getServiceSet_StateInActive (Map<String, String> serviceTypesMap) {
+		List<String> result = new ArrayList<String> ();
+		
+		if (log.isDebugEnabled()) {
+			log.debug("checking ServiceSet_StateInActive " + serviceTypesMap.size());
+		}
+		
+		if (serviceTypesMap == null) {
+			if (log.isDebugEnabled()) {
+				log.debug("skipping getting set of InActive services, serviceTypes is null ");
+			}
+			return result;
+		} 
+		
+		if (log.isDebugEnabled()) {
+			log.debug("getting set of InActive clusters for serviceTypes (length)" + serviceTypesMap.size());
+		}
+		
+		
+		Collection<Service> services = TopologyManager.getTopology().getServices();
+		
+		Set<String> serviceTypes = serviceTypesMap.keySet();
+		
+		for (String serviceType : serviceTypes) {
+			boolean hasServiceFound = false;
+			for(Service service : services) {
+				String serviceTypeGroup = serviceTypesMap.get(serviceType);
+				if (log.isDebugEnabled()) {
+					log.debug("checking inactive state for service " + service.getServiceName() + 
+							" with nr_of_clusters: " + service.getClusters().size() + 
+							" against serviceType " + serviceType + " in group " + serviceTypeGroup);
+				}
+				if (serviceType.equals(service.getServiceName())) {
+					// matching service type  - check if has active cluster
+					if (log.isDebugEnabled()) {
+						log.debug("matching service types, checking clusters for service " + serviceType);
+					}
+					hasServiceFound = true;
+					Collection<Cluster> clusters = service.getClusters();
+					boolean hasClusterWithActiveMember = false;
+					if (clusters.size() > 0) {
+						// at least one cluster has to exist for service to exist 
+						if (log.isDebugEnabled()) {
+							log.debug("service " + service.getServiceName() + " has at least 1 cluster ");
+						}
+						for (Cluster cluster : clusters) {
+							String clusterGroup = extractClusterGroupFromClusterId(cluster.getClusterId());
+							if (log.isDebugEnabled()) {
+								log.debug("checking (inactive) cluster state for  " + cluster.getClusterId() + " (in group " + clusterGroup + ")" +
+										" and serviceType " + serviceType + " (in group " + serviceTypeGroup + ")");
+							}
+							// Martin TODO if (hasClusterActiveMember (cluster)) {
+							// check group cluster is in 
+							
+							if (clusterGroup != null & clusterGroup.equals(serviceTypeGroup)) {
+								if (hasClusterActiveMember (cluster)) { 
+									hasClusterWithActiveMember = true;
+									if (log.isDebugEnabled()) {
+										log.debug("found active cluster for service " + cluster.getClusterId() + " in group " + serviceTypeGroup);
+									}
+									break;
+								}
+							}
+						}
+					} else {
+						if (log.isDebugEnabled()) {
+							log.debug("service " + service.getServiceName() + " in group " + serviceTypeGroup + " has no cluster, adding as inactive service ");
+							hasClusterWithActiveMember = false;
+						}
+					}
+					
+					if (!hasClusterWithActiveMember) {
+						result.add(serviceType);
+						if (log.isDebugEnabled()) {
+							log.debug("service has not a clutser with active member, adding " + serviceType + " as inactive");
+						}
+					}
+				} else {
+					if (log.isDebugEnabled()) {
+						log.debug("service mismatch between " + service.getServiceName() + " and servicetype " + serviceType + " continue to search ");
+					}
+				}
+				
+			}
+			// covers the case that service hasn't be deployed yet
+			if (!hasServiceFound) {
+				result.add(serviceType);
+				if (log.isDebugEnabled()) {
+					log.debug("no matching service found for " + serviceType + " adding as inactive");
+				}
+			}
+		}
+
+		return result;
+	}
+	
+	
+	private List<String> getServiceSet_StateActive (Map<String, String> serviceTypesMap) {
+		List<String> result = new ArrayList<String> ();
+		
+		if (log.isDebugEnabled()) {
+			log.debug("checking ServiceSet_StateActive " + serviceTypesMap.size());
+		}
+		
+		if (serviceTypesMap == null) {
+			if (log.isDebugEnabled()) {
+				log.debug("skipping getting set of Active services, serviceTypes is null ");
+			}
+			return result;
+		} 
+		
+		if (log.isDebugEnabled()) {
+			log.debug("getting set of Active clusters for serviceTypes (length)" + serviceTypesMap.size());
+		}
+		
+		
+		Collection<Service> services = TopologyManager.getTopology().getServices();
+	
+		Set<String> serviceTypes = serviceTypesMap.keySet();
+		
+		for (String serviceType : serviceTypes) {
+			boolean hasServiceFound = false;
+			for(Service service : services) {
+				String serviceTypeGroup = serviceTypesMap.get(serviceType);
+				if (log.isDebugEnabled()) {
+					log.debug("checking active state for service " + service.getServiceName() + 
+							" with nr_of_clusters: " + service.getClusters().size() + 
+							" against serviceType " + serviceType + " in group " + serviceTypeGroup);
+				}
+				if (serviceType.equals(service.getServiceName())) {
+					// matching service type  - check if has active cluster
+					if (log.isDebugEnabled()) {
+						log.debug("matching service types, checking clusters for service " + serviceType);
+					}
+					hasServiceFound = true;
+					Collection<Cluster> clusters = service.getClusters();
+					boolean hasClusterWithActiveMember = false;
+					if (clusters.size() > 0) {
+						// at least one cluster has to exist for service to exist 
+						if (log.isDebugEnabled()) {
+							log.debug("service " + service.getServiceName() + " has at least 1 cluster ");
+						}
+						for (Cluster cluster : clusters) {
+							String clusterGroup = extractClusterGroupFromClusterId(cluster.getClusterId());
+							if (log.isDebugEnabled()) {
+								log.debug("checking (active) cluster state for  " + cluster.getClusterId() + " (in group " + clusterGroup + ")" +
+										" and serviceType " + serviceType + " (in group " + serviceTypeGroup + ")");
+							}
+							// Martin TODO if (hasClusterActiveMember (cluster)) {
+							if (hasClusterActiveMember (cluster)) { // Martin for test only, replace with hasClusterActiveMember !!!
+								hasClusterWithActiveMember = true;
+								if (log.isDebugEnabled()) {
+									log.debug("found active cluster for service " + cluster.getClusterId() + " in group " + serviceTypeGroup +
+											" , adding as active service");
+								}
+								result.add(serviceType);
+								break;
+							}
+						}
+					} else {
+						if (log.isDebugEnabled()) {
+							log.debug("service " + service.getServiceName() + " has no cluster, skipping service ");
+							hasClusterWithActiveMember = false;
+						}
+					}
+					
+					if (!hasClusterWithActiveMember) {;
+						if (log.isDebugEnabled()) {
+							log.debug("service has not a clutser with active member, skipping " + serviceType + " as active service");
+						}
+					}
+				} else {
+					if (log.isDebugEnabled()) {
+						log.debug("service mismatch between " + service.getServiceName() + " and servicetype " + serviceType + " continue to search ");
+					}
+				}
+				
+			}
+			// covers the case that service hasn't be deployed yet
+			if (!hasServiceFound) {
+				if (log.isDebugEnabled()) {
+					log.debug("no matching service found for " + serviceType + " skipping as active service");
+				}
+			}
+		}
+
+		return result;
+	}
+	
+	/*
+	 * get a list of clusters based on the subscription alias name
+	 */
+	private List<Cluster> getClusters (String [] clusterAliases) {
+		List<Cluster> clusters = new ArrayList<Cluster>();
+		
+		for (String alias : clusterAliases) {
+			Cluster cluster = getClusterFromAlias(alias);
+			if (cluster != null) {
+				clusters.add(cluster);
+			} else {
+				if (log.isDebugEnabled()) {
+					log.debug("getting a (inactive) cluster retrieved as null for alias " + alias);
+				}
+			}
+		}
+		return clusters;
+	}
+	
+	/*
+	 * get a cluster based on the subscription alias name
+	 */
+	private Cluster getClusterFromAlias(String findClusterId) {
+		Cluster result = null;
+		Collection<Service> services = TopologyManager.getTopology().getServices();
+		for(Service service : services) {
+			// extract list of clusters, clusterId -> alias
+			if (log.isDebugEnabled()) {
+				log.debug("ServiceGroupContext:calculateKillBehaviorFlag:service:" + service.getServiceName());
+			}
+			
+			for(Cluster cluster : service.getClusters()) {
+				String clusterId = cluster.getClusterId();
+				String clusterIdAlias = this.extractAlias(clusterId);
+				if (log.isDebugEnabled()) {
+					log.debug("looping over cluster " +  clusterId + 
+							" extracted alias " + clusterIdAlias);
+				}
+				
+				if (clusterIdAlias != null && findClusterId.equals(clusterIdAlias)) {
+					return cluster;
+				} else {
+					if (log.isDebugEnabled()) {
+						log.debug(" ignoring cluster " + clusterId + " in cluster check for " + findClusterId);
+					}
+				}
+
+			}
+		}
+		return result;
+	}
+	
+	private static void setKillAllEnabled(String groupId ) { 
+    	ComplexApplicationContext.is_kill_all_enabled_flag.put(groupId, true);
+    }
+	
+    private static void resetKillAllEnabled(String groupId ) { 
+    	// all cartridges are terminated after kill_all 
+    	ComplexApplicationContext.is_kill_all_enabled_flag.put(groupId, false);
+    }
+    
+    private static void resetKillAllTransitionFlag(String alias) {
+    	ComplexApplicationContext.is_in_kill_all_transition.remove(alias);
+    }
+    
+    private static void setKillAllTransitionFlag(String alias) {
+    	ComplexApplicationContext.is_in_kill_all_transition.add(alias);
+    }
+    
+    public static synchronized Boolean isKillAllEnabled(String groupId) {
+    	Boolean flag = false;
+    	if (ComplexApplicationContext.is_kill_all_enabled_flag == null) {
+    		if (log.isDebugEnabled()) {
+				log.debug(" creating new is_kill_all_enabled_flag");
+			}
+    		ComplexApplicationContext.is_kill_all_enabled_flag = new HashMap<String, Boolean>();
+    	} 
+        flag = ComplexApplicationContext.is_kill_all_enabled_flag.get(groupId);
+        if (flag == null) {
+        	if (log.isDebugEnabled()) {
+				log.debug(" is_kill_all_enabled_flag not initialized for " + groupId + " initializing with true");
+			}
+        	
+        	ComplexApplicationContext.setKillAllEnabled(groupId);
+        	flag = ComplexApplicationContext.is_kill_all_enabled_flag.get(groupId);
+        }
+        return flag;
+    }
+    
+    
+    public static synchronized Boolean isInKillAllTransition(String key) {
+    	if (ComplexApplicationContext.is_in_kill_all_transition == null) {
+    		if (log.isDebugEnabled()) {
+				log.debug(" creating new is_in_kill_all_transition");
+			}
+    		ComplexApplicationContext.is_in_kill_all_transition = new HashSet<String>();
+    	} 
+        if (ComplexApplicationContext.is_in_kill_all_transition.contains(key)) {
+        	return true;
+        }
+        return false;
+    }
+    
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
index 86c2e49..3a19495 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
@@ -27,10 +27,12 @@ import org.apache.stratos.cloud.controller.stub.pojo.MemberContext;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -385,6 +387,81 @@ public class PartitionContext implements Serializable{
         }
         return false;
     }
+    
+    public  int getAllMemberForTerminationCount () {
+    	int count = activeMembers.size() + pendingMembers.size() + terminationPendingMembers.size();
+		if (log.isDebugEnabled()) {
+    		log.debug("PartitionContext:getAllMemberForTerminationCount:size:" + count);
+    	}
+    	return count;
+    }
+    
+    // Map<String, MemberStatsContext> getMemberStatsContexts().keySet()
+    public  Set<String> getAllMemberForTermination () {
+
+    	List<MemberContext> merged =  new ArrayList<MemberContext>();
+    	
+    	
+    	merged.addAll(activeMembers);
+    	merged.addAll(pendingMembers);
+    	merged.addAll(terminationPendingMembers);
+    	
+    	Set<String> results = new HashSet<String>(merged.size());
+    	
+    	for (MemberContext ctx: merged) {
+    		results.add(ctx.getMemberId());
+    	}
+    	
+
+    	if (log.isDebugEnabled()) {
+    		log.debug("PartitionContext:getAllMemberForTermination:size:" + results.size());
+    	}
+    	
+    	//MemberContext x = new MemberContext();
+    	//x.getMemberId()
+    	
+    	return results;
+    }
+    
+    public boolean checkStartupDependencies (String serviceType, String clusterId) {
+    	if (log.isDebugEnabled()) {
+    		log.debug("checkStartupDependencies for cluster with " + " clusterId: " + clusterId);
+    	}
+       
+       
+       ComplexApplicationContext sgc = new ComplexApplicationContext();
+
+       String aServiceName = clusterId;
+       boolean flag = sgc.checkStartupDependencies(serviceType, aServiceName);
+       if (log.isDebugEnabled()) {
+    	   log.debug("checkStartupDependencies for cluster with " + 
+                       " clusterId: " + clusterId + " serviceType: " + serviceType + 
+                       " flag is :" + flag);
+       }
+
+       return flag;
+       
+    }
+    
+    public boolean checkKillDependencies (String serviceType, String clusterId) {
+    	if (log.isDebugEnabled()) {
+    		log.debug("PartitionContext:checkServiceBootDependencies for cluster with " + " clusterId: " + clusterId + 
+    				"and serviceType " + serviceType);
+    	}
+       
+       ComplexApplicationContext sgc = new ComplexApplicationContext();
+
+       String aServiceName = clusterId;
+       boolean flag = sgc.checkKillDependencies(serviceType, aServiceName);
+       if (log.isDebugEnabled()) {
+    	   log.debug("checkKillDependencies for cluster with " + 
+    			   " clusterId: " + clusterId + " serviceType: " + serviceType + 
+                   " flag is :" + flag);
+       }
+       return flag;
+       
+    }
+    
 
     private class PendingMemberWatcher implements Runnable {
         private PartitionContext ctxt;

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java
index cf6223c..520559c 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java
@@ -342,6 +342,32 @@ public class AutoscalerTopologyEventReceiver implements Runnable {
 //                }
             }
         });
+        
+        // Grouping
+        /*
+        topologyEventReceiver.addEventListener(new CompositeApplicationCreatedEventListener() {
+            @Override
+            protected void onEvent(Event event) {
+
+                try {
+                    TopologyManager.acquireReadLock();
+                    
+                    if (log.isDebugEnabled()) {
+                    	log.debug("handling application created event");
+                    }
+
+   
+                } catch (Exception e) {
+                    log.error("Error processing event", e);
+                } finally {
+                    TopologyManager.releaseReadLock();
+                }
+            }
+        });*/
+
+
+
+        
     }
 
     private class LBClusterMonitorAdder implements Runnable {

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractMonitor.java
index 30ed61a..f9792ef 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractMonitor.java
@@ -50,9 +50,11 @@ import org.drools.runtime.rule.FactHandle;
 
 	protected FactHandle minCheckFactHandle;
 	protected FactHandle scaleCheckFactHandle;
+	protected FactHandle terminateDependencyFactHandle;
 	
 	protected StatefulKnowledgeSession minCheckKnowledgeSession;
 	protected StatefulKnowledgeSession scaleCheckKnowledgeSession;
+	protected StatefulKnowledgeSession terminateDependencyKnowledgeSession;
 	protected boolean isDestroyed;
 	
 	protected String clusterId;
@@ -92,13 +94,14 @@ import org.drools.runtime.rule.FactHandle;
     public void destroy() {
         minCheckKnowledgeSession.dispose();
         scaleCheckKnowledgeSession.dispose();
+        terminateDependencyKnowledgeSession.dispose();
         setDestroyed(true);
         if(log.isDebugEnabled()) {
             log.debug("Cluster Monitor Drools session has been disposed. "+this.toString());
         }
     }
-    
-    public boolean isDestroyed() {
+
+	public boolean isDestroyed() {
         return isDestroyed;
     }
 
@@ -177,4 +180,24 @@ import org.drools.runtime.rule.FactHandle;
     public void setMinCheckFactHandle(FactHandle minCheckFactHandle) {
         this.minCheckFactHandle = minCheckFactHandle;
     }
+    
+    public StatefulKnowledgeSession getTerminateDependencyKnowledgeSession() {
+		return terminateDependencyKnowledgeSession;
+	}
+
+	public void setTerminateDependencyKnowledgeSession(
+			StatefulKnowledgeSession terminateDependencyKnowledgeSession) {
+		this.terminateDependencyKnowledgeSession = terminateDependencyKnowledgeSession;
+	}
+
+	public FactHandle getTerminateDependencyFactHandle() {
+		return terminateDependencyFactHandle;
+	}
+
+	public void setTerminateDependencyFactHandle(
+			FactHandle terminateDependencyFactHandle) {
+		this.terminateDependencyFactHandle = terminateDependencyFactHandle;
+	}
+
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ClusterMonitor.java
index 6c44e4e..d5d02bc 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ClusterMonitor.java
@@ -47,9 +47,13 @@ public class ClusterMonitor extends AbstractMonitor{
         this.autoscalerRuleEvaluator = new AutoscalerRuleEvaluator();
         this.scaleCheckKnowledgeSession = autoscalerRuleEvaluator.getScaleCheckStatefulSession();
         this.minCheckKnowledgeSession = autoscalerRuleEvaluator.getMinCheckStatefulSession();
+        this.terminateDependencyKnowledgeSession = autoscalerRuleEvaluator.getTerminateDependencyStatefulSession();
 
         this.deploymentPolicy = deploymentPolicy;
         this.autoscalePolicy = autoscalePolicy;
+        if (log.isDebugEnabled()) {
+        	log.debug("ClusterMonitor:autoScalePolicy:" + autoscalePolicy);
+        }
         networkPartitionCtxts = new ConcurrentHashMap<String, NetworkPartitionContext>();
     }
 
@@ -91,6 +95,8 @@ public class ClusterMonitor extends AbstractMonitor{
 
                 minCheckKnowledgeSession.setGlobal("clusterId", clusterId);
                 minCheckKnowledgeSession.setGlobal("lbRef", lbReferenceType);
+                minCheckKnowledgeSession.setGlobal("autoscalePolicy", autoscalePolicy);
+                minCheckKnowledgeSession.setGlobal("serviceId", serviceId);
                 
                 if (log.isDebugEnabled()) {
                     log.debug(String.format("Running minimum check for partition %s ", partitionContext.getPartitionId()));
@@ -100,6 +106,24 @@ public class ClusterMonitor extends AbstractMonitor{
                         , minCheckFactHandle, partitionContext);
 
             }
+            
+            //terminate dependency per partition
+            // rule terminates all members of a service which is a prerequisites for other services
+            for(PartitionContext partitionContext: networkPartitionContext.getPartitionCtxts().values()){
+
+                terminateDependencyKnowledgeSession.setGlobal("clusterId", clusterId);
+                terminateDependencyKnowledgeSession.setGlobal("lbRef", lbReferenceType);
+                terminateDependencyKnowledgeSession.setGlobal("autoscalePolicy", autoscalePolicy);
+                terminateDependencyKnowledgeSession.setGlobal("serviceId", serviceId);
+                
+                if (log.isDebugEnabled()) {
+                    log.debug(String.format("Running terminate dependency for partition %s ", partitionContext.getPartitionId()));
+                }
+
+                terminateDependencyFactHandle = AutoscalerRuleEvaluator.evaluateTerminateDependency(terminateDependencyKnowledgeSession
+                        , terminateDependencyFactHandle, partitionContext);
+
+            }
 
             boolean rifReset = networkPartitionContext.isRifReset();
             boolean memoryConsumptionReset = networkPartitionContext.isMemoryConsumptionReset();

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java
index b0b7f60..0d6de77 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java
@@ -47,10 +47,12 @@ public class AutoscalerRuleEvaluator {
 	private static final String DRL_FILE_NAME = "mincheck.drl";
 	private static final String SCALING_DRL_FILE_NAME = "scaling.drl";
 	private static final String TERMINATE_ALL_DRL_FILE_NAME = "terminateall.drl";
+	private static final String TERMINATE_DEPENDENCY_DRL_FILE_NAME = "terminatedependency.drl";
 
 	private static KnowledgeBase minCheckKbase;
 	private static KnowledgeBase scaleCheckKbase;
 	private static KnowledgeBase terminateAllKbase;
+	private static KnowledgeBase terminateDependencyKbase;
 
     public AutoscalerRuleEvaluator(){
 
@@ -70,6 +72,12 @@ public class AutoscalerRuleEvaluator {
         if (log.isDebugEnabled()) {
             log.debug("Terminate all rule is parsed successfully");
         }
+        
+        terminateDependencyKbase = readKnowledgeBase(TERMINATE_DEPENDENCY_DRL_FILE_NAME);
+
+        if (log.isDebugEnabled()) {
+            log.debug("Terminate dependency rule is parsed successfully");
+        }
     }
 
     
@@ -124,6 +132,28 @@ public class AutoscalerRuleEvaluator {
         }
         return handle;
     }
+    
+    
+    public static FactHandle evaluateTerminateDependency(StatefulKnowledgeSession ksession, FactHandle handle, Object obj) {
+    	if(log.isDebugEnabled()){
+            log.debug(String.format("Terminate dependency check executing for : %s ", obj));
+        }
+        if (handle == null) {
+
+            ksession.setGlobal("$delegator", new RuleTasksDelegator());
+            handle = ksession.insert(obj);
+        } else {
+            ksession.update(handle, obj);
+        }
+        if(log.isDebugEnabled()){
+            log.debug(String.format("Terminate dependency check firing rules for : %s ", ksession));
+        }
+        ksession.fireAllRules();
+        if(log.isDebugEnabled()){
+            log.debug(String.format("Terminate dependency check executed for : %s ", obj));
+        }
+        return handle;
+    }
 
 
 
@@ -145,6 +175,12 @@ public class AutoscalerRuleEvaluator {
         ksession.setGlobal("log", RuleLog.getInstance());
         return ksession;
     }
+    public StatefulKnowledgeSession getTerminateDependencyStatefulSession() {
+        StatefulKnowledgeSession ksession;
+        ksession = terminateDependencyKbase.newStatefulKnowledgeSession();
+        ksession.setGlobal("log", RuleLog.getInstance());
+        return ksession;
+    }
 
     public static String getLbClusterId(PartitionContext partitionContext, String nwpartitionId) {
         Properties props = partitionContext.getProperties();

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
index 7d8304b..24047fe 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
@@ -149,6 +149,20 @@ public class RuleTasksDelegator {
         }
     }
 
+    public void delegateTerminateDependency(PartitionContext partitionContext, String memberId) {
+        try {
+            //calling SM to send the instance notification event.
+        	if (log.isDebugEnabled()) {
+        		log.debug("delegateTerminateDependency:memberId:" + memberId);
+        	}
+            //InstanceNotificationClient.getInstance().sendMemberCleanupEvent(memberId);
+            //partitionContext.moveActiveMemberToTerminationPendingMembers(memberId);
+            //CloudControllerClient.getInstance().terminate(memberId);
+        } catch (Throwable e) {
+            log.error("Cannot terminate instance", e);
+        }
+    }
+
     public void terminateObsoleteInstance(String memberId) {
         try {
             CloudControllerClient.getInstance().terminate(memberId);
@@ -157,10 +171,16 @@ public class RuleTasksDelegator {
         }
     }
 
+    //Grouping
    	public void delegateTerminateAll(String clusterId) {
            try {
-
+        	   if (log.isDebugEnabled()) {
+           		log.debug("delegateTerminateAll - begin");
+        	   }
                CloudControllerClient.getInstance().terminateAllInstances(clusterId);
+               if (log.isDebugEnabled()) {
+              		log.debug("delegateTerminateAll - done");
+           	   }
            } catch (Throwable e) {
                log.error("Cannot terminate instance", e);
            }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
index e4ddaed..c7f3603 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
@@ -57,6 +57,11 @@ public class CartridgeAgent implements Runnable {
 
     private boolean terminated;
 
+    // We have an asynchronous activity running to respond to ADC updates. We want to ensure
+    // that no publishInstanceActivatedEvent() call is made *before* the port activation test
+    // has succeeded. This flag controls that.
+    private boolean portsActivated;
+
     @Override
     public void run() {
         if(log.isInfoEnabled()) {
@@ -66,6 +71,7 @@ public class CartridgeAgent implements Runnable {
         validateRequiredSystemProperties();
 
         // Start instance notifier listener thread
+        portsActivated = false;
         subscribeToTopicsAndRegisterListeners();
 
         // Publish instance started event
@@ -77,6 +83,10 @@ public class CartridgeAgent implements Runnable {
         // Wait for all ports to be active
         CartridgeAgentUtils.waitUntilPortsActive(CartridgeAgentConfiguration.getInstance().getListenAddress(),
                 CartridgeAgentConfiguration.getInstance().getPorts());
+        portsActivated = true;
+
+        // Publish instance activated event
+        CartridgeAgentEventPublisher.publishInstanceActivatedEvent();
 
         // Check repo url
         String repoUrl = CartridgeAgentConfiguration.getInstance().getRepoUrl();
@@ -84,9 +94,6 @@ public class CartridgeAgent implements Runnable {
             if(log.isInfoEnabled()) {
                 log.info("No artifact repository found");
             }
-
-            // Publish instance activated event
-            CartridgeAgentEventPublisher.publishInstanceActivatedEvent();
         } else {
             //Start periodical file checker task
     		if (CartridgeAgentConfiguration.getInstance().isCommitsEnabled()) {
@@ -260,7 +267,7 @@ public class CartridgeAgent implements Runnable {
 
             ExtensionUtils.executeArtifactsUpdatedExtension();
 
-            if(!cloneExists){
+            if (!cloneExists && portsActivated) {
                 // Executed git clone, publish instance activated event
                 CartridgeAgentEventPublisher.publishInstanceActivatedEvent();
             }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/CartridgeStatistics.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/CartridgeStatistics.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/CartridgeStatistics.java
new file mode 100644
index 0000000..f92de2d
--- /dev/null
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/CartridgeStatistics.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.stratos.cartridge.agent.statistics.publisher;
+
+/**
+ * CartridgeStatistics is an instantaneous representaion of the cartridges current process and memory usage.
+ */
+public class CartridgeStatistics {
+
+    private double memoryUsage;
+    private double processorUsage;
+
+    /**
+     * Constructor
+     *
+     * @param memUsage the consumed memory, as a percentage of the available memory to the cartridge
+     * @param procUsage the processing used, as a percentage of the processing available to the cartridge
+     */
+    public CartridgeStatistics(double memUsage, double procUsage) {
+        memoryUsage = sanitiseUsage(memUsage);
+        processorUsage = sanitiseUsage(procUsage);
+    }
+
+    /**
+     * Called by contructor, utility to check input usage is a percentage.
+     * throws exception if the usage is not of the correct format
+     */
+    private double sanitiseUsage(double usage) throws IllegalArgumentException {
+        if ((usage < 0)) // || (usage > 100)) we currently get percentages over 100% for the procUsage is this fine?
+        {
+            throw new IllegalArgumentException("Usage statistic less than zero");
+        }
+        return usage;
+    }
+
+    /**
+     * Called to get memory usage
+     */
+    public double getMemoryUsage() {
+        return memoryUsage;
+    }
+
+    /**
+     * Called to get processor usage
+     */
+    public double getProcessorUsage() {
+        return processorUsage;
+    }
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
index 4bdad04..40826c5 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
@@ -19,6 +19,8 @@
 
 package org.apache.stratos.cartridge.agent.statistics.publisher;
 
+import org.apache.stratos.cartridge.agent.statistics.publisher.*;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.cartridge.agent.config.CartridgeAgentConfiguration;
@@ -26,6 +28,9 @@ import org.apache.stratos.cartridge.agent.event.publisher.CartridgeAgentEventPub
 import org.apache.stratos.cartridge.agent.util.CartridgeAgentConstants;
 import org.apache.stratos.cartridge.agent.util.CartridgeAgentUtils;
 
+import java.io.File;
+import java.util.List;
+
 /**
  * Health statistics notifier thread for publishing statistics periodically to CEP.
  */
@@ -33,12 +38,48 @@ public class HealthStatisticsNotifier implements Runnable {
     private static final Log log = LogFactory.getLog(HealthStatisticsNotifier.class);
 
     private final HealthStatisticsPublisher statsPublisher;
+    private IHealthStatisticsReader statsReader;
     private long statsPublisherInterval = 15000;
     private boolean terminated;
 
     public HealthStatisticsNotifier() {
         this.statsPublisher = new HealthStatisticsPublisher();
 
+        /* Find all jars in the current working directory */
+        String pluginFileName = System.getProperty("health.stats.reader.plugin");
+        if (pluginFileName != null)
+        {
+            File pluginFile = new File(pluginFileName);
+            if (    (pluginFile != null)
+                 && (pluginFile.exists())) {
+                List<Class> pluginClass = PluginLoader.loadPluginClassesFromJar(pluginFile, IHealthStatisticsReader.class);
+                if (!pluginClass.isEmpty())
+                {
+                    try
+                    {
+                        log.trace("Instantiating new instance of plugin type " + pluginClass);
+                        this.statsReader = (IHealthStatisticsReader)pluginClass.get(0).newInstance( );
+                    }
+                    catch(InstantiationException e)
+                    {
+                        log.error("Unable to instantiate plugin " + pluginClass, e);
+                    }
+                    catch(IllegalAccessException e)
+                    {
+                        log.error("Unable to instantiate plugin " + pluginClass, e);
+                    }
+                }
+            }
+            else
+            {
+                log.error("Plugin not found or malformed: " + pluginFileName + ((pluginFile == null)? " NULL": "Doesn't exist"));
+            }
+        }
+        if (this.statsReader == null)
+        {
+            this.statsReader = new HealthStatisticsReader();
+        }
+
         String interval = System.getProperty("stats.notifier.interval");
         if (interval != null) {
             statsPublisherInterval = Long.getLong(interval);
@@ -47,48 +88,56 @@ public class HealthStatisticsNotifier implements Runnable {
 
     @Override
     public void run() {
-        while (!terminated) {
-            try {
+        if (this.statsReader.init() == false)
+        {
+            log.error("Health statistics reader "+this.statsReader.getClass().getName()+" could not initialise");
+        }
+        else
+        {
+            while (!terminated) {
                 try {
-                    Thread.sleep(statsPublisherInterval);
-                } catch (InterruptedException ignore) {
-                }
+                    try {
+                        Thread.sleep(statsPublisherInterval);
+                    } catch (InterruptedException ignore) {
+                    }
 
-                if (statsPublisher.isEnabled()) {
+                    if (statsPublisher.isEnabled()) {
 
-                    double memoryConsumption = HealthStatisticsReader.getMemoryConsumption();
-                    if(log.isDebugEnabled()) {
-                        log.debug(String.format("Publishing memory consumption: %f", memoryConsumption));
-                    }
-                    statsPublisher.publish(
-                            CartridgeAgentConfiguration.getInstance().getClusterId(),
-                            CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
-                            CartridgeAgentConfiguration.getInstance().getMemberId(),
-                            CartridgeAgentConfiguration.getInstance().getPartitionId(),
-                            CartridgeAgentConstants.MEMORY_CONSUMPTION,
-                            memoryConsumption
-                    );
+                        CartridgeStatistics stats = statsReader.getCartridgeStatistics();
+
+                        if(log.isDebugEnabled()) {
+                            log.debug(String.format("Publishing memory consumption: %f", stats.getMemoryUsage()));
+                        }
+                        statsPublisher.publish(
+                                CartridgeAgentConfiguration.getInstance().getClusterId(),
+                                CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
+                                CartridgeAgentConfiguration.getInstance().getMemberId(),
+                                CartridgeAgentConfiguration.getInstance().getPartitionId(),
+                                CartridgeAgentConstants.MEMORY_CONSUMPTION,
+                                stats.getMemoryUsage()
+                        );
 
-                    double loadAverage = HealthStatisticsReader.getLoadAverage();
-                    if(log.isDebugEnabled()) {
-                        log.debug(String.format("Publishing load average: %f", loadAverage));
+                        if(log.isDebugEnabled()) {
+                            log.debug(String.format("Publishing load average: %f", stats.getProcessorUsage()));
+                        }
+                        statsPublisher.publish(
+                                CartridgeAgentConfiguration.getInstance().getClusterId(),
+                                CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
+                                CartridgeAgentConfiguration.getInstance().getMemberId(),
+                                CartridgeAgentConfiguration.getInstance().getPartitionId(),
+                                CartridgeAgentConstants.LOAD_AVERAGE,
+                                stats.getProcessorUsage()
+                        );
+                    } else if (log.isWarnEnabled()) {
+                        log.warn("Statistics publisher is disabled");
+                    }
+                } catch (Exception e) {
+                    if (log.isErrorEnabled()) {
+                        log.error("Could not publish health statistics", e);
                     }
-                    statsPublisher.publish(
-                            CartridgeAgentConfiguration.getInstance().getClusterId(),
-                            CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
-                            CartridgeAgentConfiguration.getInstance().getMemberId(),
-                            CartridgeAgentConfiguration.getInstance().getPartitionId(),
-                            CartridgeAgentConstants.LOAD_AVERAGE,
-                            loadAverage
-                    );
-                } else if (log.isWarnEnabled()) {
-                    log.warn("Statistics publisher is disabled");
-                }
-            } catch (Exception e) {
-                if (log.isErrorEnabled()) {
-                    log.error("Could not publish health statistics", e);
                 }
             }
+            this.statsReader.delete();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java
index b986191..96e4661 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java
@@ -26,47 +26,43 @@ import org.apache.stratos.cartridge.agent.config.CartridgeAgentConfiguration;
 import org.apache.stratos.cartridge.agent.util.CartridgeAgentUtils;
 
 import java.lang.management.ManagementFactory;
+import java.io.IOException;
 
 /**
  * Health statistics reader.
  */
-public class HealthStatisticsReader {
+public class HealthStatisticsReader implements IHealthStatisticsReader {
+
     private static final int MB = 1024 * 1024;
     private static final Log log = LogFactory.getLog(HealthStatisticsReader.class);
 
-    public static double getMemoryConsumption() {
+    public boolean init() {
+        return true;
+    }
+
+    public CartridgeStatistics getCartridgeStatistics() throws IOException {
     	OperatingSystemMXBean osBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
         double totalMemory = (double)(osBean.getTotalPhysicalMemorySize()/ MB);
         double usedMemory = (double)((totalMemory - (osBean.getFreePhysicalMemorySize() / MB) ));
-        
-        if(log.isDebugEnabled()) {
-        	log.debug("Calculating memory consumption: [totalMemory] "+totalMemory+" [usedMemory] "+usedMemory);
-        }
+        double loadAvg = (double)osBean.getSystemLoadAverage();
+        // assume system cores = available cores to JVM
+        int cores = osBean.getAvailableProcessors();
         double memoryConsumption = (usedMemory / totalMemory) * 100;
-        if(log.isDebugEnabled()) {
-        	log.debug("Calculating memory consumption: [percentage] "+memoryConsumption);
-        }
-        return memoryConsumption;
-    }
-
-    public static double getLoadAverage() {
-    	double loadAvg = (double)ManagementFactory.getOperatingSystemMXBean().getSystemLoadAverage();
-    	// assume system cores = available cores to JVM
-    	int cores = ManagementFactory.getOperatingSystemMXBean().getAvailableProcessors();
-    	
-    	if(log.isDebugEnabled()) {
-        	log.debug("Calculating load average consumption: [loadAverage] "+loadAvg+" [cores] "+cores);
-        }
-    	
         double loadAvgPercentage = (loadAvg/cores) * 100;
+
         if(log.isDebugEnabled()) {
-        	log.debug("Calculating load average consumption: [percentage] "+loadAvgPercentage);
+            log.debug("Memory consumption: [totalMemory] "+totalMemory+"Mb [usedMemory] "+usedMemory+"Mb: "+memoryConsumption+"%");
+            log.debug("Processor consumption: [loadAverage] "+loadAvg+" [cores] "+cores+": "+loadAvgPercentage+"%");
         }
-		return loadAvgPercentage;
+    	
+        return (new CartridgeStatistics(memoryConsumption, loadAvgPercentage));
     }
 
     public static boolean allPortsActive() {
         return CartridgeAgentUtils.checkPortsActive(CartridgeAgentConfiguration.getInstance().getListenAddress(),
                                                     CartridgeAgentConfiguration.getInstance().getPorts());
     }
-}
\ No newline at end of file
+
+    public void delete() {
+    }
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/IHealthStatisticsReader.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/IHealthStatisticsReader.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/IHealthStatisticsReader.java
new file mode 100644
index 0000000..ddb4539
--- /dev/null
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/IHealthStatisticsReader.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.stratos.cartridge.agent.statistics.publisher;
+
+import java.io.IOException;
+
+/**
+ * Health statistics reader interface.
+ */
+public interface IHealthStatisticsReader {
+
+    /**
+     * Called exactly once, before any other method.
+     *
+     * Should be used, along with {@link #delete()}, to manage "unmanaged"
+     * resources, e.g. sockets. Standard objects will of course be managed by
+     * GC in the usual way and should be allocated in the ctor.
+     */
+    public boolean init();
+
+    /**
+     * Called repeatedly to obtain memory and processor use.
+     *
+     * Obtained from the cartridge agent hosti.
+     *
+     * Can throw IOException if the required metrics were not obtainable.
+     */
+    public CartridgeStatistics getCartridgeStatistics() throws IOException;
+
+    /**
+     * Called exactly once, after all other methods.
+     *
+     * Should be used, along with {@link #init()}, to manage "unmanaged"
+     * resources, e.g. sockets. Standard objects will of course be managed by
+     * GC in the usual way and will be collected when no longer referenced.
+     */
+    public void delete();
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/PluginLoader.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/PluginLoader.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/PluginLoader.java
new file mode 100644
index 0000000..afd6394
--- /dev/null
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/PluginLoader.java
@@ -0,0 +1,88 @@
+package org.apache.stratos.cartridge.agent.statistics.publisher;
+
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
+
+import java.io.IOException;
+import java.io.File;
+import java.io.FileFilter;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.LinkedList;
+import java.util.jar.*;
+import java.util.zip.*;
+
+
+public class PluginLoader
+{
+    private static final Log log = LogFactory.getLog(PluginLoader.class);
+
+    /* Built-in plugins are listed here. This is just easier than adding this
+     * jar to the list of jars to search, as it contains too much random stuff,
+     * including stuff with unsatisfied dependencies that we otherwise wouldn't
+     * load. There's a nice looking library called Reflections on Google Code
+     * that would probably be OK, but it's more logic.
+     */
+
+    public static List<Class> loadPluginClassesFromJar( File jarPath, Class pluginInterface )
+    {
+        List<Class> listeners = new LinkedList<Class>( );
+
+        try
+        {
+            URLClassLoader loader = new URLClassLoader( new URL[] { jarPath.toURI().toURL() } );
+            JarFile jar = new JarFile( jarPath );
+            Enumeration<? extends JarEntry> jarEnum = jar.entries();
+
+            log.trace( "Scanning jar file " + jarPath );
+
+            while( jarEnum.hasMoreElements() )
+            {
+                ZipEntry zipEntry = jarEnum.nextElement();
+                String fileName = zipEntry.getName();
+
+                if( fileName.endsWith( ".class" ) )
+                {
+                    log.trace( "Considering jar entry " + fileName );
+                    try
+                    {
+                        String className = fileName.replace( ".class", "" ).replace( "/", "." );
+                        Class cls = loader.loadClass( className );
+                        log.trace( "Loaded class " + className );
+
+                        if( hasInterface( cls, pluginInterface ) )
+                        {
+                            log.trace( "Class has " + pluginInterface.getName()  + " interface; adding " );
+                            listeners.add( cls );
+                        }
+                    }
+                    catch( ClassNotFoundException e )
+                    {
+                        log.error( "Unable to load class from " + fileName + " in " + jarPath );
+                    }
+                }
+            }
+
+        }
+        catch( IOException e )
+        {
+            log.error( "Unable to open JAR file " + jarPath, e );
+        }
+
+        return listeners;
+    }
+
+    private static boolean hasInterface( Class cls, Class iface )
+    {
+        for( Class in : cls.getInterfaces() )
+        {
+            if( in == iface )
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/Command.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/Command.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/Command.java
index 6516556..5f777ce 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/Command.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/Command.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.cli;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.stratos.cli.exception.CommandException;
 
@@ -58,10 +59,12 @@ public interface Command<T extends CommandContext> {
 	 *            The context assoicated with the Command Line Application
 	 * @param args
 	 *            The arguments for the command
+	 * @param already_parsed_opts
+	 *            Options parsed by any parent parsers.
 	 * @return The status code
 	 * @throws org.apache.stratos.cli.exception.CommandException
 	 *             if any errors occur when executing the command
 	 */
-	int execute(T context, String[] args) throws CommandException;
+	int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException;
 
 }


[3/7] initial grouping code to develop cartridge grouping feature

Posted by me...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Dependencies.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Dependencies.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Dependencies.java
new file mode 100644
index 0000000..7e97143
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Dependencies.java
@@ -0,0 +1,334 @@
+package org.apache.stratos.messaging.domain.topology;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class Dependencies implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private Map<String, List<Subscribable>> dependencies = new HashMap<String, List<Subscribable>>();
+	private String kill_behavior = KILL_UNDEFINED;
+	private boolean isKillAllEnabled = false;
+	private Group group;
+	private static final Log log = LogFactory.getLog(Dependencies.class);
+	public static String KILL_NONE = "kill-none";
+	public static String KILL_ALL = "kill-all";
+	public static String KILL_DEPENDENTS = "kill-dependents";
+	public static String KILL_UNDEFINED = "kill-undefined";
+	
+	
+	public String getKill_behavior() {
+		return kill_behavior;
+	}
+	
+	public void  enableKillAll() {
+		isKillAllEnabled = true;
+	}
+	
+	public void  disableKillAll() {
+		isKillAllEnabled = false;
+	}
+	
+	public boolean isKillAllEnabled() {
+		return isKillAllEnabled;
+	}
+	
+	public String getKill_behavior_for_alias(String alias) {
+		if (dependencies.containsKey(alias)) {
+			return kill_behavior;
+		}
+		return KILL_UNDEFINED;
+	}
+
+	public void setKill_behavior(String kill_behavior) {
+		this.kill_behavior = kill_behavior;
+	}
+
+	public void addDependency (String alias, Subscribable dependency) {
+		List<Subscribable> my_dep = dependencies.get(alias);
+		if (my_dep != null) {
+			log.debug(" adding another dependency " + dependency.getAlias() + " for " + alias);
+			my_dep.add(dependency);
+		} else {
+			log.debug("initializing dependency list for " + alias + " with dependency " + dependency.getAlias() );
+			my_dep = new ArrayList<Subscribable>();
+			my_dep.add(dependency);
+			dependencies.put(alias, my_dep);
+		}
+	}
+
+	
+	public List<Subscribable> getDependencies(Subscribable subscribable, boolean kill_flag) {
+		String alias = subscribable.getAlias();		
+		return getDependencies(alias, kill_flag);
+	}
+	
+	public List<Subscribable> getDependencies(String alias, boolean kill_flag) {
+		if (log.isDebugEnabled()) {
+			log.debug("checking dependency tree for " + alias + " kill_flag is " + kill_flag);
+		}
+
+		if (kill_flag) {
+			if (kill_behavior.equals("kill-none")) {
+				if (log.isDebugEnabled()) {
+					log.debug(KILL_NONE + ": returning none dependencies for " + alias);
+				}
+				return new ArrayList<Subscribable>(0);
+			} else if (kill_behavior.equals("KILL_DEPENDENTS")) {
+				if (log.isDebugEnabled()) {
+					log.debug(KILL_DEPENDENTS + ": returning all dependencies for " + alias);
+				}
+				return getDependents (alias, kill_flag);
+			} 
+				log.error("invalid kill option:" + kill_behavior + "rwhile checking dependencies for " + alias);
+			} 
+		// kill_flag false, get "startup dependencies"
+		return getDependents (alias, false);
+	}
+	
+	
+	public List<Subscribable> getDownStreamDependents (String alias) {
+		List<Subscribable> results = new ArrayList<Subscribable>();
+		if (log.isDebugEnabled()) {
+			log.debug("in dependency tree for " + alias  + " / " + dependencies.size());
+		}
+		if (dependencies.containsKey(alias)) {
+			log.debug("adding the list of dependencies for :" + alias);
+			List<Subscribable> my_dep = dependencies.get(alias);
+			Iterator<Subscribable> it = my_dep.iterator();
+			while (it.hasNext()) {
+				Subscribable obj = it.next();
+				if (obj instanceof Scalable) {
+					log.debug("adding scalable " + obj.getAlias() + " as dependency for " + alias);
+					results.add(obj);
+					log.debug("adding subsequent downstream dependencies for " + obj.getAlias() + " as dependency for " + alias);
+					List<Subscribable> sub2 = this.getDownStreamDependents(obj.getAlias());
+					results.addAll(sub2);
+					if (log.isDebugEnabled()) {
+						log.debug("added " + sub2.size() + " elements as subsequent downstream dependencies for " + obj.getAlias() + 
+								" as dependency for " + alias);
+					}
+				} else {
+					log.debug("adding nested dependencies from " + obj.getAlias() + " for " + alias);
+					List<Subscribable> sub_results = obj.getAllDependencies();
+					results.addAll(sub_results);		
+				}
+			}
+		} else {
+			log.debug("continue to check nested dependencies for :" + alias);
+			// convert map to List
+			Set<String> keys = dependencies.keySet();
+			for (String key : keys) {
+				if (log.isDebugEnabled()) {
+					log.debug("looping over dependency list with key:" + key + " for alias " + alias);
+				}
+				List<Subscribable> my_dep = dependencies.get(key);
+				if (my_dep != null) {
+					Iterator<Subscribable> it = my_dep.iterator();
+					while (it.hasNext()) {
+						Subscribable obj = it.next();
+						Dependencies deps = obj.getDependencies();
+						if (deps != null) {
+							if (log.isDebugEnabled()) {
+								log.debug("found nested nested dependencies while looping with key:" + key + " for alias " + alias);
+							}
+							results = deps.getDownStreamDependents(alias);
+						}
+					}
+				}
+			}
+		}
+		return results;
+	}
+		
+		private List<Subscribable> getDependents (String alias, boolean kill_flag) {
+			List<Subscribable> results = new ArrayList<Subscribable>();
+			if (log.isDebugEnabled()) {
+				log.debug("in dependency tree for " + alias + " kill_flag is " + kill_flag + " / " + dependencies.size());
+			}
+			if (dependencies.containsKey(alias)) {
+				log.debug("adding the list of dependencies for :" + alias);
+				List<Subscribable> my_dep = dependencies.get(alias);
+				Iterator<Subscribable> it = my_dep.iterator();
+				while (it.hasNext()) {
+					Subscribable obj = it.next();
+					if (obj instanceof Scalable) {
+						log.debug("adding scalable " + obj.getAlias() + " as dependency for " + alias);
+						results.add(obj);
+					} else {
+						log.debug("adding nested dependencies from " + obj.getAlias() + " for " + alias);
+						List<Subscribable> sub_results = obj.getAllDependencies();
+						results.addAll(sub_results);
+					}
+				}
+			} else {
+				log.debug("continue to check nested dependencies for :" + alias);
+				// convert map to List
+				Set<String> keys = dependencies.keySet();
+				for (String key : keys) {
+					if (log.isDebugEnabled()) {
+						log.debug("looping over dependency list with key:" + key + " for alias " + alias);
+					}
+					List<Subscribable> my_dep = dependencies.get(key);
+					if (my_dep != null) {
+						Iterator<Subscribable> it = my_dep.iterator();
+						while (it.hasNext()) {
+							Subscribable obj = it.next();
+							Dependencies deps = obj.getDependencies();
+							if (deps != null) {
+								if (log.isDebugEnabled()) {
+									log.debug("found nested nested dependencies while looping with key:" + key + " for alias " + alias);
+								}
+								results = deps.getDependencies(alias, kill_flag);
+							}
+						}
+					}
+				}
+			}
+
+		
+		return results;
+	}
+	
+	public List<Subscribable> getUpstreamDependents (String alias) {
+		List<Subscribable> results = new ArrayList<Subscribable>();
+		Set<String> keys = dependencies.keySet();
+		for (String key : keys) {
+			if (log.isDebugEnabled()) {
+				log.debug("looping over dependency list with key:" + key + " for alias " + alias + 
+						" in group " + this.getGroup().getAlias());
+			}
+			List<Subscribable> my_dep = dependencies.get(key);
+			if (my_dep != null) {
+				Iterator<Subscribable> it = my_dep.iterator();
+				while (it.hasNext()) {
+					Subscribable obj = it.next();
+					if (alias.equals(obj.getAlias())) {
+						//results.add(obj);
+						// adding "key"
+						Subscribable key_upstreamdep = this.group.getSubscribable(key);
+						if (log.isDebugEnabled()) {
+							log.debug("adding subscribalbe " + key_upstreamdep.getAlias() + " to upstream dependency list");
+						}
+						results.add(key_upstreamdep);
+						if (log.isDebugEnabled()) {
+							log.debug("adding subsequent upstream dependencies for " + key_upstreamdep.getAlias() + 
+									" as dependency for " + alias);
+						}
+						List<Subscribable> sub2 = this.getUpstreamDependents(key);
+						results.addAll(sub2);
+						if (log.isDebugEnabled()) {
+							log.debug("added " + sub2.size() + " elements as subsequent upstream dependencies for " + key_upstreamdep.getAlias() + 
+									" as dependency for " + alias);
+						}
+					}
+					
+				}
+			}
+		}
+		// get upstream subscribables which have group as dependency
+		Subscribable parent = group.getParent();
+		if (parent instanceof Group) {
+			Group gr = (Group)parent;
+			List<Subscribable> results2 = gr.getUpstreamDependencies(this.group);
+			for (Subscribable s : results2) {
+				if (!results.contains(s)) {
+					results.add(s);
+				}
+			}
+			if (log.isDebugEnabled()) {
+				log.debug("added " + results2.size() + " elements as subsequent upstream dependencies for " + this.group.getAlias() + 
+						" as dependency for " + alias);
+			}
+			
+		}
+		
+		return results;
+		
+	}
+	
+	/*
+	public List<Subscribable> getAllDependencies() {
+		List<Subscribable> results = new ArrayList<Subscribable>();
+		
+		if (log.isDebugEnabled()) {
+			log.debug("adding all nested dependencies to result list");
+		}
+		
+		Set<String> keys = dependencies.keySet();
+		if (log.isDebugEnabled()) {
+			log.debug("adding all nested dependencies to result list with number of keys " + keys.size());
+		}
+		
+		Iterator<String> keyit = keys.iterator();
+		
+		while (keyit.hasNext()) {
+			String key = keyit.next();
+			List<Subscribable> values = dependencies.get(key);
+			
+			Iterator<Subscribable> it = values.iterator();
+			while (it.hasNext()) {
+				Subscribable obj = it.next();
+				if (obj instanceof Scalable) {
+					if (log.isDebugEnabled()) {
+						log.debug("adding scalable / cartridge " + obj.getAlias() + " to result list");
+					}
+					results.add(obj);
+				} else {
+					if (log.isDebugEnabled()) {
+						log.debug("adding nested dependencies to result list");
+					}
+					List<Subscribable> sub_results = obj.getDependencies().getAllDependencies();
+					results.addAll(sub_results);
+				}
+			}
+			
+		}
+		
+		return results;
+	} */
+		
+	public Group getGroup() {
+		return group;
+	}
+
+	public void setGroup(Group group) {
+		this.group = group;
+	}
+
+	public String toString() {
+		String result = "";
+		StringBuffer buf = new StringBuffer();
+		
+		Set<String> keys = dependencies.keySet();
+		
+		Iterator<String> keyit = keys.iterator();
+		
+		while (keyit.hasNext()) {
+			String key = keyit.next();
+			buf.append("Key:" + key).append(" ");
+			List<Subscribable> values = dependencies.get(key);
+			
+			Iterator<Subscribable> it = values.iterator();
+			while (it.hasNext()) {
+				Subscribable obj = it.next();
+				buf.append("value:" + obj.getAlias()).append(" ");
+			}
+		}
+		
+		
+		return buf.toString();
+	}
+	
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Group.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Group.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Group.java
new file mode 100644
index 0000000..fd76bfb
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Group.java
@@ -0,0 +1,503 @@
+package org.apache.stratos.messaging.domain.topology;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
+
+public class Group  implements Subscribable,Composite, Serializable {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String alias;
+	private Map<String, Subscribable> subscribables = new HashMap<String, Subscribable>();
+	private Dependencies dependencies;
+	private Subscribable parent = null;
+	private Group homeGroup;
+	private static final Log log = LogFactory.getLog(Group.class);
+
+	public Group(String alias) {
+		this.alias = alias;
+	}
+
+	public void setAlias(String alias) {
+		this.alias = alias;
+	}
+	
+	public String getAlias() {
+		return alias;
+	}
+	
+	public Map<String, Subscribable> getSubscribables() {
+		return subscribables;
+	}
+	
+	public Subscribable getSubscribable(String alias) {
+		return subscribables.get(alias);
+	}
+
+	public Subscribable getParent() {
+		return parent;
+	}
+
+	public Group getHomeGroup() {
+		return homeGroup;
+	}
+
+	public void setHomeGroup(Group homeGroup) {
+		this.homeGroup = homeGroup;
+	}
+
+	public void setParent(Subscribable parent) {
+		this.parent = parent;
+	}
+	
+	public String getKillBehaviorForAlias(String alias) {
+		if (this.dependencies != null) {
+			return this.dependencies.getKill_behavior_for_alias(alias);
+		} else {
+			return Dependencies.KILL_UNDEFINED;
+		}
+	}
+	
+	public String findKillBehavior(String alias) {
+		
+		List<Group> all_groups = getAllGroups();
+		String kill_behavior = Dependencies.KILL_UNDEFINED;
+		
+		if (log.isDebugEnabled()) {
+			log.debug("searching kill behavior for " + alias + " in group " + this.alias);
+		}
+		
+		for (Group group : all_groups) {
+			kill_behavior = group.getKillBehaviorForAlias(alias);
+			if (Dependencies.KILL_UNDEFINED.equals(kill_behavior)) {
+				if (log.isDebugEnabled()) {
+					log.debug("kill behavior for " + alias + " in group " + this.alias + " is undefined");
+				}
+			} else {
+				if (log.isDebugEnabled()) {
+					log.debug("found kill behavior for " + alias + " in group " + this.alias);
+				}
+				return group.getKillBehaviorForAlias(alias);
+			}
+		}
+		return dependencies.getKill_behavior();
+	}
+	
+	public List<Group> getAllGroups () {
+		List<Group> results = new ArrayList<Group>();
+		// adding the group to list
+		results.add(this);
+		Set<String> keys = subscribables.keySet();
+		if (log.isDebugEnabled()) {
+			log.debug("adding all nested groups to result list with number of keys " + keys.size() + " in group " + this.alias);
+		}
+		
+		Iterator<String> keyit = keys.iterator();
+		
+		while (keyit.hasNext()) {
+			String key = keyit.next();
+			Object obj = subscribables.get(key);
+			if (!(obj instanceof Group)) {
+				if (log.isDebugEnabled()) {
+					log.debug("skipping non composite obj " + obj);
+				}
+
+			} else  {
+				
+				Group group = (Group) obj;
+				if (log.isDebugEnabled()) {
+					log.debug("adding nested groups / composite to result list " + group.getAlias());
+			    }
+				List<Group> sub_results = group.getAllGroups();
+				results.addAll(sub_results);
+			}
+		}
+		
+		return results;
+	}
+	
+	public Dependencies findDependencies(String alias) {
+		Group gr = findGroup(alias);
+		if (gr !=null) {
+			return gr.dependencies;
+		}
+		return null;
+	}
+	
+	public Group findGroup(String alias) {
+		List<Group> all_groups = getAllGroups();
+		for (Group group : all_groups) {
+			if (log.isDebugEnabled()) {
+				log.debug("findGroup in group  " + group.getAlias() + " for alias " + alias);
+			}
+			if (group.subscribables.containsKey(alias)) {
+				return group;
+			} else {
+				// does it need to be checked ?
+			}
+		}
+		
+		return null;
+	}
+	
+	// returns all groups which equal the kill_behavior as parameter
+	public String [] findAllGroupsWithKill(String [] aliases, String kill_behavior) {
+		List<String> results = new ArrayList<String>();
+		for (String alias : aliases) {
+			Group gr = findGroup(alias);
+			// no null check, shouldn't be null
+			if (gr != null) {
+				Dependencies dep = gr.getDependencies();
+				if (dep != null) {
+					if (kill_behavior.equals(dep.getKill_behavior())) {
+						results.add(gr.getAlias());
+					}
+				}
+			} else {
+				if (log.isDebugEnabled()) {
+					log.debug("no group found for alias  " + alias);
+				}
+			}
+		}
+		String [] arr = new String[results.size()];
+		arr = results.toArray(arr);
+		return arr;
+	}
+	
+	public String [] findAllGroupsWithKill2(Map<String, String> aliasesMap, String kill_behavior) {
+		List<String> results = new ArrayList<String>();
+		Set<String> aliases = aliasesMap.keySet();
+		for (String alias : aliases) {
+			Group gr = findGroup(alias);
+			// no null check, shouldn't be null
+			if (gr != null) {
+				Dependencies dep = gr.getDependencies();
+				if (dep != null) {
+					if (kill_behavior.equals(dep.getKill_behavior())) {
+						results.add(gr.getAlias());
+					}
+				}
+			} else {
+				if (log.isDebugEnabled()) {
+					log.debug("no group found for alias  " + alias);
+				}
+			}
+		}
+		String [] arr = new String[results.size()];
+		arr = results.toArray(arr);
+		return arr;
+	}
+	
+
+	public Dependencies getDependencies() {
+		return dependencies;
+	}
+	
+	public List<Subscribable>  getAllDependencies() {
+		List<Subscribable> results = new ArrayList<Subscribable>();
+		
+		if (log.isDebugEnabled()) {
+			log.debug("adding all nested subscribables to result list in subscribable " + this.alias);
+		}
+		
+		Set<String> keys = subscribables.keySet();
+		if (log.isDebugEnabled()) {
+			log.debug("adding all nested dependencies to result list with number of keys " + keys.size());
+		}
+		
+		Iterator<String> keyit = keys.iterator();
+		
+		while (keyit.hasNext()) {
+			String key = keyit.next();
+			Subscribable obj = subscribables.get(key);
+			if (obj instanceof Scalable) {
+				if (log.isDebugEnabled()) {
+					log.debug("adding scalable / cartridge " + obj.getAlias() + " to result list");
+				}
+				results.add(obj);
+			} else {
+				if (log.isDebugEnabled()) {
+					log.debug("adding nested dependencies to result list");
+				}
+				List<Subscribable> sub_results = obj.getAllDependencies();
+				results.addAll(sub_results);
+			}
+		}
+		if (log.isDebugEnabled()) {
+			log.debug("returning " + results.size() + " subscribables while getting all dependent subscribables ");
+		}
+		return results;
+	}
+	
+	public String [] getDownStreamDependenciesAsArray (String alias) {
+		if (log.isDebugEnabled()) {
+			log.debug("getting dependencies from group :" +  this.getAlias());
+		}
+		
+		String [] dependenciesAliasArray = null;
+		List<Subscribable> results = null;
+		
+		if (log.isDebugEnabled()) {
+			log.debug("getting selected dependencies from group : " + alias);
+		}
+		Dependencies group_deps = this.getDependencies();
+		results = group_deps.getDownStreamDependents(alias);
+		dependenciesAliasArray = new String [results.size()];
+		for (int i = 0; i < results.size(); i++ ) {
+			Subscribable s = results.get(i);
+			dependenciesAliasArray[i] = s.getAlias();
+			if (log.isDebugEnabled()) {
+				log.debug("adding " + s.getAlias() + " to dependency array");
+			}
+		}
+		
+		if (log.isDebugEnabled()) {
+			log.debug("returning dependencies for subscribale : " + alias);
+		}
+		return dependenciesAliasArray;
+	}
+	
+	public Map<String, String> getDownStreamDependenciesAsMap (String alias) {
+		if (log.isDebugEnabled()) {
+			log.debug("getting dependencies from group :" +  this.getAlias());
+		}
+		
+		Map<String, String> dependencies_map= null;
+		List<Subscribable> results = null;
+		
+		if (log.isDebugEnabled()) {
+			log.debug("getting selected dependencies from group : " + alias);
+		}
+		Dependencies group_deps = this.getDependencies();
+		results = group_deps.getDownStreamDependents(alias);
+		dependencies_map = new HashMap<String, String>(results.size());
+		for (int i = 0; i < results.size(); i++ ) {
+			Subscribable s = results.get(i);
+			
+			Group gr = s.getHomeGroup(); // TODO - need to change return type to Group
+			String gr_alias = null;
+			if (gr != null) {
+				gr_alias = gr.getAlias();
+			} else {
+				if (log.isDebugEnabled()) {
+					log.debug("home group is null for subscribable " + s.getAlias());
+				}
+			}
+			dependencies_map.put(s.getAlias(), gr_alias);
+			if (log.isDebugEnabled()) {
+				log.debug("adding " + s.getAlias() + " in group " + gr_alias + " to downstream dependency map ");
+			}
+			
+		}
+		
+		if (log.isDebugEnabled()) {
+			log.debug("returning dependencies for subscribale : " + alias);
+		}
+		return dependencies_map;
+	}
+	
+	public String [] getUpstreamDependenciesAsArray (String alias) {
+		String [] dependenciesAliasArray = new String[0];
+		if (log.isDebugEnabled()) {
+			log.debug("searching home group for  : " + alias);
+		}
+		Group gr = this;
+		Subscribable sub = gr.getSubscribable(alias);
+		if (log.isDebugEnabled()) {
+			log.debug("found home group for  : " + alias + " , group is " + gr.getAlias() + " subscribable is " + sub);
+		}
+		//List<Subscribable> results = gr.getUpstreamDependencies(sub);
+		List<Subscribable> results = gr.getDependencies().getUpstreamDependents(sub.getAlias());
+		if (log.isDebugEnabled()) {
+			log.debug("home group upstream result for  : " + alias + " is " + results.size());
+		}
+		dependenciesAliasArray = new String [results.size()];
+		for (int i = 0; i < results.size(); i++) {
+			Subscribable item = results.get(i);
+			if (item != null) {
+				dependenciesAliasArray[i] = item.getAlias();
+			} else {
+				if (log.isDebugEnabled()) {
+					log.debug("dependenciesAliasArray in getUpstreamDependencies has null value");
+					dependenciesAliasArray[i] = null;
+				}
+			}
+		}
+		return dependenciesAliasArray;
+	}
+	
+	public Map<String, String> getUpstreamDependenciesAsMap (String alias) {
+		if (log.isDebugEnabled()) {
+			log.debug("searching home group for  : " + alias);
+		}
+		Group gr = this;
+		Map<String, String> dependencies_map = null;
+		Subscribable sub = gr.getSubscribable(alias);
+		if (log.isDebugEnabled()) {
+			log.debug("found home group for  : " + alias + " , group is " + gr.getAlias() + " subscribable is " + sub);
+		}
+
+		List<Subscribable> results = gr.getDependencies().getUpstreamDependents(sub.getAlias());
+		if (log.isDebugEnabled()) {
+			log.debug("home group upstream result for  : " + alias + " is " + results.size());
+		}
+		dependencies_map = new HashMap<String, String>(results.size());
+		for (int i = 0; i < results.size(); i++) {
+			Subscribable s = results.get(i);
+			if (s != null) {
+				Group home_gr = s.getHomeGroup(); // TODO - need to change return type to Group
+				String key = null;
+				String val = null;
+				if (home_gr != null) {
+					key =  s.getAlias();
+					val = home_gr.getAlias();
+					if (log.isDebugEnabled()) {
+						log.debug("adding " + key + " in group " + val + " to upstream dependency map ");
+					}
+					dependencies_map.put(key, val);
+				} 
+				
+			} else {
+				if (log.isDebugEnabled()) {
+					log.debug("dependenciesAliasMap in getUpstreamDependencies has null value");
+				}
+			}
+			
+			
+		}
+		return dependencies_map;
+	}
+	
+	public List<Subscribable>  getUpstreamDependencies(Subscribable subscribable) {
+		List<Subscribable> upstream = new ArrayList<Subscribable>();
+		Subscribable parentSubscribable = this.getParent();
+		if (log.isDebugEnabled()) {
+			log.debug("getting upstream dependencies for " + subscribable.getAlias() + " in group " + this.alias);
+		}
+		if (subscribable instanceof Scalable)  {
+			// this would be typically where the upstream search starts
+			if (log.isDebugEnabled()) {
+				log.debug("subscribable is  cartridge with alias " + subscribable.getAlias() + " in group " + this.alias);
+			}
+			if (parent == null) {
+				if (log.isDebugEnabled()) {
+					log.debug("parent is null, stopping upstream search in group " + this.alias + " for " + alias  );
+				}
+				return upstream;
+			} else if (parent instanceof Group) {
+
+				Group parentGroup = (Group) parentSubscribable;
+				if (log.isDebugEnabled()) {
+					log.debug("continue upstream search in parent group " + parentGroup.alias + " for " + alias  );
+				}
+				// continue with group alias as dependency alias (dependent would be group)
+				List<Subscribable> list = parentGroup.getUpstreamDependencies(this);
+				if (log.isDebugEnabled()) {
+					log.debug("found " + list.size() + " items in upstream search in parent group " + parentGroup.alias + " for " + alias  );
+				}
+				upstream.addAll(list);
+			}
+		} else if (subscribable instanceof Group) {
+			// get local dependencies
+			if (log.isDebugEnabled()) {
+				log.debug(subscribable.getAlias() + " is a group,  checking in dependencies list of this group " + this.alias + " for " + alias  );
+			}
+			List<Subscribable> listlocal = dependencies.getUpstreamDependents(subscribable.getAlias());
+			if (log.isDebugEnabled()) {
+				log.debug("found " + listlocal.size() + " items in upstream search in group " + this.alias + " for " + alias  );
+			}
+			// add local cartridges which depend on the group
+			upstream.addAll(listlocal);
+			// continue upstream with parent of this group
+			Subscribable parent = this.getParent();
+			if (parent == null) {
+				if (log.isDebugEnabled()) {
+					log.debug("parent is null, stopping upstream search in group " + this.alias + " for " + alias  );
+				}
+				return upstream;
+			} else if (parent instanceof Group) {
+				if (log.isDebugEnabled()) {
+					log.debug("continue upstream search in parent group " + parent.getAlias() + " for " + alias  );
+				}
+				// continue with group alias as dependency alias (dependent would be group)
+				List<Subscribable> list = ((Group) parent).getUpstreamDependencies(this);
+				if (log.isDebugEnabled()) {
+					log.debug("found " + list.size() + " items in upstream search in parent group " + parent.getAlias() + " for " + alias  );
+				}
+				// merge upstream dependencies and local dependencies
+				upstream.addAll(list);
+			}
+
+		} 
+		return upstream;
+	}
+
+	public void setDependencies(Dependencies dependencies) {
+		this.dependencies = dependencies;
+	}
+
+	
+
+
+
+	@Override
+	public void subscribe() {
+		// TODO Auto-generated method stub
+		log.debug("subscribing to group: " + alias);
+		
+		Iterator<String> it = subscribables.keySet().iterator();
+		
+		while (it.hasNext()) {
+			String key = it.next();
+			Subscribable subscribable = subscribables.get(key);
+			subscribable.subscribe();
+		}
+		
+	}
+
+	@Override
+	public void unsubscribe() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void add(Subscribable subscribale) {
+		// TODO Auto-generated method stub
+		if (log.isDebugEnabled()) {
+			log.debug("building the group, adding subscribable " + subscribale.getAlias() + "  to group  " + this.getAlias());
+		}
+		subscribables.put(subscribale.getAlias(), subscribale);
+	}
+
+	@Override
+	public void remove(Subscribable subscribale) {
+		// TODO Auto-generated method stub
+		subscribables.remove(subscribale.getAlias());
+	}
+	
+	public String toString() {
+		StringBuffer buf = new StringBuffer();
+		Iterator<String> it = subscribables.keySet().iterator();
+		
+		while (it.hasNext()) {
+			String key = it.next();
+			Subscribable subscribable = subscribables.get(key);
+			buf.append("subscribable: " + subscribable.toString());
+			
+		}
+		return buf.toString();
+	}
+
+
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Scalable.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Scalable.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Scalable.java
new file mode 100644
index 0000000..ba4c000
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Scalable.java
@@ -0,0 +1,5 @@
+package org.apache.stratos.messaging.domain.topology;
+
+public interface Scalable {
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Subscribable.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Subscribable.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Subscribable.java
new file mode 100644
index 0000000..4f0245f
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Subscribable.java
@@ -0,0 +1,25 @@
+package org.apache.stratos.messaging.domain.topology;
+
+import java.util.List;
+
+
+
+public interface Subscribable {
+	
+
+	
+    public String getAlias();
+	
+	public Dependencies getDependencies();
+	
+	public List<Subscribable>  getAllDependencies();
+	
+	public void subscribe();
+	
+	public void unsubscribe();	
+	
+	public void setHomeGroup(Group homeGroup);
+	
+	public Group getHomeGroup();
+
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java
index 760478c..ae0e112 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java
@@ -24,6 +24,11 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.messaging.domain.topology.util.CompositeApplicationBuilder;
+import org.apache.stratos.messaging.message.receiver.topology.TopologyManager;
+
 /**
  * Defines a topology of serviceMap in Stratos.
  */
@@ -31,10 +36,16 @@ public class Topology implements Serializable {
     private static final long serialVersionUID = -2453583548027402122L;
     // Key: Service.serviceName
     private Map<String, Service> serviceMap;
+    //Grouping
+    private Map<String, CompositeApplication> compositeApplicationMap;
+    private Map<String, ConfigCompositeApplication> configCompositeApplicationMap;
     private boolean initialized;
+    private static Log log = LogFactory.getLog(Topology.class);
 
     public Topology() {
         this.serviceMap = new HashMap<String, Service>();
+        this.compositeApplicationMap = new HashMap<String, CompositeApplication>();
+        this.configCompositeApplicationMap = new HashMap<String, ConfigCompositeApplication>();
     }
 
     public Collection<Service> getServices() {
@@ -70,8 +81,86 @@ public class Topology implements Serializable {
     public void clear() {
         this.serviceMap.clear();
     }
+    
+    // Grouping
+    public Collection<CompositeApplication> getCompositeApplication() {
+        return this.compositeApplicationMap.values();
+    }
+
+    public void addCompositeApplication(String alias, CompositeApplication app) {
+        this.compositeApplicationMap.put(alias, app);
+    }
+
+    public void removeCompositeApplication(String alias) {
+        this.compositeApplicationMap.remove(alias);
+    }
+    
+    public Collection<ConfigCompositeApplication> getConfigCompositeApplication() {
+        
+        if (this.configCompositeApplicationMap == null) {
+    		log.info("adding new config comp in topology while retrieving it, ConfigCompositeApplication is  null");
+    		this.configCompositeApplicationMap = new HashMap<String, ConfigCompositeApplication>();
+    	} 
+        return this.configCompositeApplicationMap.values();
+    }
+    
+    public void addConfigCompositeApplication(String alias, ConfigCompositeApplication configApp) {
+    	log.info("adding config comp in topology" + alias + " / " + configApp);
+    	if (this.configCompositeApplicationMap != null) {
+    		log.info("adding config comp in topology, ConfigCompositeApplication is not null");
+    		this.configCompositeApplicationMap.put(alias, configApp);
+    		log.info("successful config comp in topology, ConfigCompositeApplication is not null");
+    	} else {
+    		log.info("adding config comp in topology, ConfigCompositeApplication is null, adding one");
+    		this.configCompositeApplicationMap = new HashMap<String, ConfigCompositeApplication>();
+    		this.configCompositeApplicationMap.put(alias, configApp);
+    	}
+    }
+
+    public void removeConfigCompositeApplication(String alias) {
+        this.configCompositeApplicationMap.remove(alias);
+    }
+    
+    public void removeAllCompositeApplication() {
+    	java.util.Set<String> keys = this.compositeApplicationMap.keySet();
+    	for (String key : keys) {
+    		compositeApplicationMap.remove(key);
+    	}
+    }
+    
+    public void removeAllConfigCompositeApplication() {
+    	java.util.Set<String> keys = this.configCompositeApplicationMap.keySet();
+    	for (String key : keys) {
+    		configCompositeApplicationMap.remove(key);
+    	}
+    }
+
+    public CompositeApplication getCompositeApplication(String appAlias) {
+        return this.compositeApplicationMap.get(appAlias);
+    }
+
+    public boolean compositeApplicationExists(String appAlias) {
+        return this.compositeApplicationMap.containsKey(appAlias);
+    }
+    
+    public ConfigCompositeApplication getConfigCompositeApplication(String appAlias) {
+        return this.configCompositeApplicationMap.get(appAlias);
+    }
+
+    public boolean configCompositeApplicationExists(String appAlias) {
+        return this.configCompositeApplicationMap.containsKey(appAlias);
+    }
+
+
+    public Map<String, ConfigCompositeApplication> getConfigCompositeApplicationMap() {
+		return configCompositeApplicationMap;
+	}
+    
+    public void setConfigCompositeApplicationMap(Map<String, ConfigCompositeApplication> configCompositeApplicationMap) {
+		this.configCompositeApplicationMap = configCompositeApplicationMap;
+	}
 
-    public void setInitialized(boolean initialized) {
+	public void setInitialized(boolean initialized) {
         this.initialized = initialized;
     }
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/util/CompositeApplicationBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/util/CompositeApplicationBuilder.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/util/CompositeApplicationBuilder.java
new file mode 100644
index 0000000..73d6f9d
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/util/CompositeApplicationBuilder.java
@@ -0,0 +1,240 @@
+package org.apache.stratos.messaging.domain.topology.util;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.messaging.domain.topology.ConfigCartridge;
+import org.apache.stratos.messaging.domain.topology.ConfigGroup;
+import org.apache.stratos.messaging.domain.topology.ConfigDependencies;
+import org.apache.stratos.messaging.domain.topology.Cartridge;
+import org.apache.stratos.messaging.domain.topology.Composite;
+import org.apache.stratos.messaging.domain.topology.CompositeApplication;
+import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication;
+import org.apache.stratos.messaging.domain.topology.Dependencies;
+import org.apache.stratos.messaging.domain.topology.Group;
+import org.apache.stratos.messaging.domain.topology.Scalable;
+import org.apache.stratos.messaging.domain.topology.Topology;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+
+public class CompositeApplicationBuilder {
+
+	private Map<String, Group> groups = null;
+	private Map<String, Cartridge> cartridgesTypes = null;
+	
+	private List<ConfigGroup> configGroupArray = null;
+	private List<ConfigCartridge> configCartridgeArray = null;
+	
+	private static Log log = LogFactory.getLog(CompositeApplicationBuilder.class);
+	
+    public CompositeApplication buildCompositeApplication(Topology topology, String appAlias) {
+    	if (log.isDebugEnabled()) {
+				log.debug("buildCompositeApplication configComplexApplication with topology " + topology);
+			}
+		Collection<ConfigCompositeApplication> configComplexApplications = topology.getConfigCompositeApplication();
+		CompositeApplication complexApplication = new CompositeApplication();
+		if (configComplexApplications.size() > 0) {
+			ConfigCompositeApplication [] complexConfigAppArray = new ConfigCompositeApplication[configComplexApplications.size()];
+			complexConfigAppArray = configComplexApplications.toArray(complexConfigAppArray);
+			
+			// assuming only 1 complex app is configured
+			
+			ConfigCompositeApplication configComplexApplication = complexConfigAppArray[0];
+ 			if (log.isDebugEnabled()) {
+ 				log.debug("buildCompositeApplication configComplexApplication" + configComplexApplication);
+ 			}
+ 			if (configComplexApplication!= null) {
+ 				if (log.isDebugEnabled()) {
+ 					log.debug("buildCompositeApplication configComplexApplication" + configComplexApplication);
+ 				}
+ 				setConfigConfiguration(configComplexApplication);
+ 				
+ 	        	Group top_level = this.buildApplication();
+ 	        	if (top_level != null) {
+ 	        		if (log.isDebugEnabled()) {
+ 	    				log.debug("ServiceGroupContext:configComplexApplication toplevel is " + top_level.getAlias());
+ 	    			}
+ 	        	} else {
+ 	        		if (log.isDebugEnabled()) {
+ 	    				log.debug("buildCompositeApplication toplevel is null");
+ 	    			}
+ 	        	}
+ 	        	if (top_level == null) {
+ 	        		log.debug("buildCompositeApplication top level group is null ...");
+ 	        		return null;
+ 	        	} else {
+ 	        		log.debug("buildCompositeApplication setting top level group " + top_level.getAlias());
+ 	        		//complexApplication.setTop_level(top_level);
+ 	        		complexApplication.setAll_groups(this.groups);
+ 	        		return complexApplication;
+ 	        	}
+ 			} else {
+ 				log.debug("buildCompositeApplication configComplexApplication is null");
+ 			}
+		} else {
+			log.debug("buildCompositeApplication configComplexApplications is null");
+			return null;
+		}
+		return null;
+    }
+	
+	
+	
+	public Group buildApplication() {
+
+		for (ConfigGroup configGroup : configGroupArray) {
+			log.debug("deploying group " + configGroup.getAlias());
+			Group realGroup = new Group(configGroup.getAlias());
+			groups.put(realGroup.getAlias(), realGroup);
+		}
+		
+
+		for (ConfigCartridge configCartridge : configCartridgeArray) {
+			log.debug("deploying cartridge component " + configCartridge.getAlias());
+			Cartridge realCartridge = new Cartridge(configCartridge.getAlias());
+			cartridgesTypes.put(realCartridge.getAlias(), realCartridge);
+		}
+		
+		// building groups
+		// this should be done when reading the topology event in autoscaler
+		log.debug("converting group configuration to groups and assembling application");
+		for (ConfigGroup configGroup : configGroupArray) {
+			Group assembleGroup = groups.get(configGroup.getAlias());
+			Map<String, Cartridge> groupCartridges = new HashMap<String, Cartridge>();
+			log.debug("converting configuration for group " + assembleGroup.getAlias());
+			for (String key : configGroup.getSubscribables()) {
+				Group realgroup = groups.get(key);
+				if (realgroup != null) {
+					// try cartridges
+					assembleGroup.add(realgroup);
+					realgroup.setParent(assembleGroup);
+					realgroup.setHomeGroup(assembleGroup);
+				} else {
+					Cartridge realcartridge_type = cartridgesTypes.get(key);
+					if (realcartridge_type != null) {
+						// create a copy of the cartridge type
+						Cartridge groupCartridge = new Cartridge(realcartridge_type.getAlias());
+						groupCartridge.setCartridgeId(getCartridgeId(assembleGroup.getAlias(), realcartridge_type.getAlias()));
+						assembleGroup.add(groupCartridge);
+						groupCartridge.setParent(assembleGroup);
+						groupCartridge.setHomeGroup(assembleGroup); // TODO need to consolidate parent / home group
+						groupCartridges.put(groupCartridge.getAlias(), groupCartridge);
+						if (log.isDebugEnabled()) {
+							log.debug("added new cartrdige of type " + groupCartridge.getAlias() + " and cartrdigeId " + groupCartridge.getCartridgeId() + 
+									" to group " + assembleGroup.getAlias());
+						}
+					} else {
+						log.debug("Error: no group, cartridge found for alias: " + key);
+					}
+				}
+			}
+			// build dependencies
+			log.debug("building dependencies for group " + assembleGroup.getAlias());
+			Dependencies real_dependencies = buildDependency(configGroup, groups, groupCartridges);
+			assembleGroup.setDependencies(real_dependencies);
+			real_dependencies.setGroup(assembleGroup);
+		}
+		
+		Group application = getTopLevelGroup();
+		log.debug("top level group is: " + application.getAlias());
+		
+		return application;
+	}
+	
+	public Group getTopLevelGroup () {
+		String alias = null;
+		for (ConfigGroup configGroup : configGroupArray) {
+			alias = configGroup.getAlias();
+			boolean isTopLevelGroup = true;
+			log.debug("checking if group " + alias + " is a sub component");
+			for (ConfigGroup configGroupInner : configGroupArray) {
+				for (String key : configGroupInner.getSubscribables()) {
+					log.debug("in group " + configGroupInner.getAlias() );
+					if (key.equals(alias)) {
+						log.debug("found group " + alias + " as sub component in " + configGroupInner.getAlias());
+						isTopLevelGroup = false;
+						break;
+					} 
+				}
+			}
+			if (isTopLevelGroup) {
+				log.debug("is top level group: " + alias);
+				break;
+			}
+		}		
+		Group application = groups.get(alias);
+		log.debug("top level group is: " + alias);
+		return application;
+	}
+	
+	public Dependencies buildDependency(ConfigGroup configGroup, Map<String, Group> groups, Map<String, Cartridge> groupCartridges) {
+		
+		// building dependencies
+		ConfigDependencies config_dep = configGroup.getDependencies();
+		Dependencies real_dependencies = new Dependencies();
+		if (config_dep != null) {
+		    String kill_behavior = config_dep.getKill_behavior();
+		    real_dependencies.setKill_behavior(kill_behavior);
+		    List<ConfigDependencies.Pair> startup_order = config_dep.getStartup_order(); 
+		    for (ConfigDependencies.Pair pair: startup_order) {
+		    	String key = pair.getKey();
+		    	String value = pair.getValue();
+			    //check groups
+			    Group gr = groups.get(value);
+			    log.debug("checking dependency for key " + key + " /val: " + value + " in groups");
+			    if (gr != null) {
+			    	real_dependencies.addDependency(key, gr);
+			    } else {
+			    	log.debug("checking dependency for key " + key + " /val: " + value + " in group cartridges");
+			    	Cartridge cr = groupCartridges.get(value);
+			    	if (cr != null) {
+			    		real_dependencies.addDependency(key, cr);
+			    		if (log.isDebugEnabled()) {
+		    				log.debug("adding group cartridge  " + cr.getCartridgeId()+ " as dependency");
+		    			}
+			    	} else {
+			    		cr = this.cartridgesTypes.get(value);
+			    		if (cr != null) {
+			    			real_dependencies.addDependency(key, cr);
+			    			if (log.isDebugEnabled()) {
+			    				log.debug("adding a lone cartridge  " + cr.getAlias() + " as dependency");
+			    			}
+		    			} else {
+		    				log.debug("error retrieving group with name " + key);
+		    			}
+			    	}
+			    }
+ 
+		    }	    
+		}
+		return real_dependencies;
+    }
+	
+	private  void setConfigConfiguration(ConfigCompositeApplication configApp) {
+		this.groups = new HashMap<String, Group>();
+		this.cartridgesTypes = new HashMap<String, Cartridge>();
+		
+		if (configApp.getComponents() != null) {
+			configGroupArray = configApp.getComponents();
+		} else {
+			configGroupArray = new ArrayList<ConfigGroup>();
+		}
+
+		if (configApp.getCartridges() != null) {
+			configCartridgeArray = configApp.getCartridges();
+		} else {
+			configCartridgeArray = new ArrayList<ConfigCartridge>();
+		}
+
+	}
+	
+	private String getCartridgeId (String homeGroupId, String cartridgeType) {
+		String id = homeGroupId +":"+ cartridgeType;
+		return id;
+	}
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceActivatedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceActivatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceActivatedEvent.java
index db6022d..1017574 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceActivatedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceActivatedEvent.java
@@ -35,6 +35,7 @@ public class InstanceActivatedEvent extends InstanceStatusEvent implements Seria
     private final String networkPartitionId;
     private final String partitionId;
     private final String memberId;
+    private String groupId;
 
     public InstanceActivatedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) {
         this.serviceName = serviceName;
@@ -63,4 +64,12 @@ public class InstanceActivatedEvent extends InstanceStatusEvent implements Seria
     public String getNetworkPartitionId() {
         return networkPartitionId;
     }
+    
+    public String getGroupId() {
+		return groupId;
+	}
+	
+	public void setGroupId(String groupId) {
+		this.groupId = groupId;
+	}
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceMaintenanceModeEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceMaintenanceModeEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceMaintenanceModeEvent.java
index 209ad78..6fb61be 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceMaintenanceModeEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceMaintenanceModeEvent.java
@@ -26,6 +26,7 @@ public class InstanceMaintenanceModeEvent extends InstanceStatusEvent implements
         private final String networkPartitionId;
         private final String partitionId;
         private final String memberId;
+        private String groupId;
 
         public InstanceMaintenanceModeEvent(String serviceName, String clusterId,
                                             String networkPartitionId, String partitionId, String memberId) {
@@ -56,4 +57,12 @@ public class InstanceMaintenanceModeEvent extends InstanceStatusEvent implements
             return networkPartitionId;
         }
 
+		public String getGroupId() {
+			return groupId;
+		}
+
+		public void setGroupId(String groupId) {
+			this.groupId = groupId;
+		}
+
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceReadyToShutdownEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceReadyToShutdownEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceReadyToShutdownEvent.java
index 8bc6140..2741172 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceReadyToShutdownEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceReadyToShutdownEvent.java
@@ -30,6 +30,7 @@ public class InstanceReadyToShutdownEvent extends InstanceStatusEvent implements
     private final String networkPartitionId;
     private final String partitionId;
     private final String memberId;
+    private String groupId;
 
     public InstanceReadyToShutdownEvent(String serviceName, String clusterId,
                                         String networkPartitionId, String partitionId, String memberId) {
@@ -60,5 +61,13 @@ public class InstanceReadyToShutdownEvent extends InstanceStatusEvent implements
         return networkPartitionId;
     }
 
+	public String getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(String groupId) {
+		this.groupId = groupId;
+	}
+
 
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceStartedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceStartedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceStartedEvent.java
index 3c568bd..a459d90 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceStartedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceStartedEvent.java
@@ -32,6 +32,7 @@ public class InstanceStartedEvent extends InstanceStatusEvent implements Seriali
     private final String networkPartitionId;
     private final String partitionId;
     private final String memberId;
+    private String groupId;
 
     public InstanceStartedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) {
         this.serviceName = serviceName;
@@ -60,4 +61,12 @@ public class InstanceStartedEvent extends InstanceStatusEvent implements Seriali
     public String getNetworkPartitionId() {
         return networkPartitionId;
     }
+
+	public String getGroupId() {
+		return groupId;
+	}
+	
+	public void setGroupId(String groupId) {
+		this.groupId = groupId;
+	}
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/CompositeApplicationCreatedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/CompositeApplicationCreatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/CompositeApplicationCreatedEvent.java
new file mode 100644
index 0000000..e7a62c9
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/CompositeApplicationCreatedEvent.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.stratos.messaging.event.topology;
+
+import java.io.Serializable;
+import java.util.*;
+
+import org.apache.stratos.messaging.domain.topology.CompositeApplication;
+import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication;
+
+
+/**
+ * 
+ * @author netiq
+ * event is fired when application is created
+ */
+public class CompositeApplicationCreatedEvent extends TopologyEvent implements Serializable{
+	private static final long serialVersionUID = -1L;
+	private ConfigCompositeApplication compositeApplication;
+	
+	public CompositeApplicationCreatedEvent(ConfigCompositeApplication configCompositeApplication) {
+		this.compositeApplication = configCompositeApplication;
+		
+	}
+
+	public String getApplicationAlias() {
+		return compositeApplication.getAlias();
+	}
+	
+	public ConfigCompositeApplication getCompositeApplication () {
+		return this.compositeApplication;
+	}
+}
+
+

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/CompositeApplicationEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/CompositeApplicationEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/CompositeApplicationEvent.java
new file mode 100644
index 0000000..cf2a6af
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/CompositeApplicationEvent.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.stratos.messaging.event.topology;
+
+import org.apache.stratos.messaging.event.Event;
+
+import java.io.Serializable;
+
+/**
+ * Tenant event definition.
+ */
+public abstract class CompositeApplicationEvent extends Event implements Serializable {
+    private static final long serialVersionUID = -1L;
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/CompositeApplicationRemovedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/CompositeApplicationRemovedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/CompositeApplicationRemovedEvent.java
new file mode 100644
index 0000000..94bdfca
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/CompositeApplicationRemovedEvent.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.stratos.messaging.event.topology;
+
+import java.io.Serializable;
+import java.util.*;
+
+import org.apache.stratos.messaging.domain.topology.CompositeApplication;
+import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication;
+
+
+/**
+ * 
+ * @author netiq
+ * event is fired when application is created
+ */
+public class CompositeApplicationRemovedEvent extends TopologyEvent implements Serializable{
+	private static final long serialVersionUID = -1L;
+	private String compositeApplicationAlias;
+	
+	public CompositeApplicationRemovedEvent(String compositeApplicationAlias) {
+		this.compositeApplicationAlias = compositeApplicationAlias;
+		
+	}
+
+	public String getApplicationAlias() {
+		return compositeApplicationAlias;
+	}
+	
+}
+
+

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java
index 3cda807..98d82e1 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java
@@ -39,7 +39,9 @@ public class MemberActivatedEvent extends TopologyEvent implements Serializable
     private final String partitionId;
     private final String memberId;
     private Map<String, Port> portMap;
+    private String memberPublicIp;
     private String memberIp;
+    private String groupId;
 
     public MemberActivatedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) {
         this.serviceName = serviceName;
@@ -101,4 +103,21 @@ public class MemberActivatedEvent extends TopologyEvent implements Serializable
 	public void setMemberIp(String memberIp) {
 	    this.memberIp = memberIp;
     }
+
+       public String getMemberPublicIp() {
+           return memberPublicIp;
+    }
+
+       public void setMemberPublicIp(String memberPublicIp) {
+           this.memberPublicIp = memberPublicIp;
+    }
+
+
+	public String getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(String groupId) {
+		this.groupId = groupId;
+	}
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberMaintenanceModeEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberMaintenanceModeEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberMaintenanceModeEvent.java
index 032b8cc..8a8ea35 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberMaintenanceModeEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberMaintenanceModeEvent.java
@@ -31,6 +31,7 @@ public class MemberMaintenanceModeEvent extends TopologyEvent implements Seriali
     private final String memberId;
     private MemberStatus status;
     private Properties properties;
+    private String groupId;
 
     public MemberMaintenanceModeEvent(String serviceName, String clusterId,
                                       String networkPartitionId, String partitionId, String memberId) {
@@ -76,4 +77,12 @@ public class MemberMaintenanceModeEvent extends TopologyEvent implements Seriali
     public String getNetworkPartitionId() {
         return networkPartitionId;
     }
+
+	public String getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(String groupId) {
+		this.groupId = groupId;
+	}
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberReadyToShutdownEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberReadyToShutdownEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberReadyToShutdownEvent.java
index b521e76..893160c 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberReadyToShutdownEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberReadyToShutdownEvent.java
@@ -31,6 +31,7 @@ public class MemberReadyToShutdownEvent extends TopologyEvent implements Seriali
     private final String memberId;
     private MemberStatus status;
     private Properties properties;
+    private String groupId;
 
     public MemberReadyToShutdownEvent(String serviceName, String clusterId,
                                       String networkPartitionId, String partitionId, String memberId) {
@@ -76,4 +77,12 @@ public class MemberReadyToShutdownEvent extends TopologyEvent implements Seriali
     public String getNetworkPartitionId() {
         return networkPartitionId;
     }
+
+	public String getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(String groupId) {
+		this.groupId = groupId;
+	}
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java
index 6a89100..c9ab532 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java
@@ -36,6 +36,7 @@ public class MemberStartedEvent extends TopologyEvent implements Serializable {
     private final String memberId;
     private MemberStatus status;
     private Properties properties;
+    private String groupId;
 
     public MemberStartedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) {
         this.serviceName = serviceName;
@@ -80,4 +81,12 @@ public class MemberStartedEvent extends TopologyEvent implements Serializable {
     public String getNetworkPartitionId() {
         return networkPartitionId;
     }
+
+	public String getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(String groupId) {
+		this.groupId = groupId;
+	}
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java
index ed67d4b..5b5b113 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java
@@ -32,6 +32,7 @@ public class MemberSuspendedEvent extends TopologyEvent implements Serializable
     private final String networkPartitionId;
     private final String partitionId;
     private final String memberId;
+    private String groupId;
 
     public MemberSuspendedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) {
         this.serviceName = serviceName;
@@ -60,4 +61,12 @@ public class MemberSuspendedEvent extends TopologyEvent implements Serializable
     public String getPartitionId() {
         return partitionId;
     }
+
+	public String getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(String groupId) {
+		this.groupId = groupId;
+	}
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java
index 986b309..c35f80c 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java
@@ -33,6 +33,7 @@ public class
     private final String networkPartitionId;
     private final String partitionId;
     private final String memberId;
+    private String groupId;
 
     public MemberTerminatedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) {
         this.serviceName = serviceName;
@@ -61,4 +62,12 @@ public class
     public String getNetworkPartitionId() {
         return networkPartitionId;
     }
+
+	public String getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(String groupId) {
+		this.groupId = groupId;
+	}
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/CompositeApplicationCreatedEventListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/CompositeApplicationCreatedEventListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/CompositeApplicationCreatedEventListener.java
new file mode 100644
index 0000000..6c3aa7a
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/CompositeApplicationCreatedEventListener.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.stratos.messaging.listener.topology;
+
+import org.apache.stratos.messaging.listener.EventListener;
+
+public abstract class CompositeApplicationCreatedEventListener extends EventListener {
+
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/CompositeApplicationRemovedEventListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/CompositeApplicationRemovedEventListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/CompositeApplicationRemovedEventListener.java
new file mode 100644
index 0000000..04dce2b
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/CompositeApplicationRemovedEventListener.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.stratos.messaging.listener.topology;
+
+import org.apache.stratos.messaging.listener.EventListener;
+
+public abstract class CompositeApplicationRemovedEventListener extends EventListener {
+
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompositeApplicationCreatedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompositeApplicationCreatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompositeApplicationCreatedMessageProcessor.java
new file mode 100644
index 0000000..1b4faa5
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompositeApplicationCreatedMessageProcessor.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.stratos.messaging.message.processor.topology;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication;
+import org.apache.stratos.messaging.domain.topology.Topology;
+import org.apache.stratos.messaging.event.topology.CompositeApplicationCreatedEvent;
+import org.apache.stratos.messaging.message.processor.MessageProcessor;
+import org.apache.stratos.messaging.util.Util;
+import org.apache.stratos.messaging.domain.topology.CompositeApplication;
+import org.apache.stratos.messaging.domain.topology.util.CompositeApplicationBuilder;
+
+//Grouping
+public class CompositeApplicationCreatedMessageProcessor extends MessageProcessor {
+
+    private static final Log log = LogFactory.getLog(CompositeApplicationCreatedMessageProcessor.class);
+    private MessageProcessor nextProcessor;
+
+    @Override
+    public void setNext(MessageProcessor nextProcessor) {
+        this.nextProcessor = nextProcessor;
+    }
+
+    @Override
+    public boolean process(String type, String message, Object object) {
+        Topology topology = (Topology) object;
+        
+        if (log.isDebugEnabled()) {
+        	log.debug("processing application event of type " + type + 
+        			" / topology:" +  topology + " msg: " + message);
+        }
+
+        if (CompositeApplicationCreatedEvent.class.getName().equals(type)) {
+            // Return if topology has not been initialized
+            if (!topology.isInitialized()) {
+                
+            	if (log.isDebugEnabled()) {
+                	log.debug("topology is not initialized .... need to add check ... Grouping");
+                }
+            	
+            	//return false;
+            }
+
+            // Parse complete message and build event
+            CompositeApplicationCreatedEvent event = 
+            		(CompositeApplicationCreatedEvent) Util.jsonToObject(message, CompositeApplicationCreatedEvent.class);
+            
+            if (log.isDebugEnabled()) {
+            	log.debug("processing application created event with application id: " + event.getApplicationAlias());
+            }
+
+         // Validate event against the existing topology
+            if (topology.compositeApplicationExists(event.getApplicationAlias())) {
+                if (log.isWarnEnabled()) {
+                    log.warn(String.format("CompositeApplication already created: [com app] %s", event.getApplicationAlias()));
+                }
+            } else {
+            	
+            	ConfigCompositeApplication configApp = event.getCompositeApplication();
+             	String alias = "compositeApplicationAlias"; 
+                if (log.isInfoEnabled()) {
+            		log.info("adding ConfigCompositeApplication with alias " + alias + " to topology");
+                }
+                topology.addConfigCompositeApplication(alias, configApp);
+            }
+            
+            // Notify event listeners
+            notifyEventListeners(event);
+            return true;
+
+        } else {
+            if (nextProcessor != null) {
+                // ask the next processor to take care of the message.
+                return nextProcessor.process(type, message, topology);
+            } else {
+                throw new RuntimeException(String.format("Failed to process message using available message processors: [type] %s [body] %s", type, message));
+            }
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompositeApplicationRemovedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompositeApplicationRemovedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompositeApplicationRemovedMessageProcessor.java
new file mode 100644
index 0000000..2bb688a
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompositeApplicationRemovedMessageProcessor.java
@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.stratos.messaging.message.processor.topology;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication;
+import org.apache.stratos.messaging.domain.topology.Service;
+import org.apache.stratos.messaging.domain.topology.Topology;
+import org.apache.stratos.messaging.event.topology.CompositeApplicationCreatedEvent;
+import org.apache.stratos.messaging.event.topology.CompositeApplicationRemovedEvent;
+import org.apache.stratos.messaging.message.processor.MessageProcessor;
+import org.apache.stratos.messaging.util.Util;
+import org.apache.stratos.messaging.domain.topology.CompositeApplication;
+import org.apache.stratos.messaging.domain.topology.util.CompositeApplicationBuilder;
+
+//Grouping
+public class CompositeApplicationRemovedMessageProcessor extends MessageProcessor {
+
+    private static final Log log = LogFactory.getLog(CompositeApplicationRemovedMessageProcessor.class);
+    private MessageProcessor nextProcessor;
+
+    @Override
+    public void setNext(MessageProcessor nextProcessor) {
+        this.nextProcessor = nextProcessor;
+    }
+
+    @Override
+    public boolean process(String type, String message, Object object) {
+        Topology topology = (Topology) object;
+        
+        if (log.isDebugEnabled()) {
+        	log.debug("processing application event of type " + type + 
+        			" / topology:" +  topology + " msg: " + message);
+        }
+
+        if (CompositeApplicationRemovedEvent.class.getName().equals(type)) {
+            // Return if topology has not been initialized
+        	
+            if (!topology.isInitialized()) {
+
+            	if (log.isDebugEnabled()) {
+                	log.debug("topology is not initialized .... need to add check ... Grouping");
+                }
+                //return false;
+            }
+
+            // Parse complete message and build event
+            CompositeApplicationRemovedEvent event = 
+            		(CompositeApplicationRemovedEvent) Util.jsonToObject(message, CompositeApplicationRemovedEvent.class);
+            
+            if (log.isDebugEnabled()) {
+            	log.debug("processing application removed event with application id: " + event.getApplicationAlias());
+            }
+
+         // Validate event against the existing topology
+            if (topology.configCompositeApplicationExists(event.getApplicationAlias())) {
+            	topology.removeAllConfigCompositeApplication();
+                if (log.isDebugEnabled()) {
+                    log.debug("CompositeApplication exists, removing all ConfigCompositeApplication" + event.getApplicationAlias()) ;
+                }
+            } else {
+                topology.removeAllConfigCompositeApplication();
+            	if (log.isWarnEnabled()) {
+                    log.warn("ConfigCompositeApplication " + event.getApplicationAlias() + " does not exist, removing all ") ;
+                }
+            }
+           
+            
+            
+            // Notify event listeners
+            notifyEventListeners(event);
+            return true;
+
+        } else {
+            if (nextProcessor != null) {
+                // ask the next processor to take care of the message.
+                return nextProcessor.process(type, message, topology);
+            } else {
+                throw new RuntimeException(String.format("Failed to process message using available message processors: [type] %s [body] %s", type, message));
+            }
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java
index 7415c1f..56c5f7c 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java
@@ -28,6 +28,7 @@ import org.apache.stratos.messaging.message.processor.MessageProcessorChain;
 /**
  * Defines default topology message processor chain.
  */
+// Grouping
 public class TopologyMessageProcessorChain extends MessageProcessorChain {
     private static final Log log = LogFactory.getLog(TopologyMessageProcessorChain.class);
 
@@ -43,6 +44,8 @@ public class TopologyMessageProcessorChain extends MessageProcessorChain {
     private MemberMaintenanceModeProcessor memberMaintenanceModeProcessor;
     private MemberSuspendedMessageProcessor memberSuspendedMessageProcessor;
     private MemberTerminatedMessageProcessor memberTerminatedMessageProcessor;
+    private CompositeApplicationCreatedMessageProcessor applicationCreatedMessageProcessor;
+    private CompositeApplicationRemovedMessageProcessor applicationRemovedMessageProcessor;
 
     public void initialize() {
         // Add topology event processors
@@ -82,8 +85,19 @@ public class TopologyMessageProcessorChain extends MessageProcessorChain {
         memberTerminatedMessageProcessor = new MemberTerminatedMessageProcessor();
         add(memberTerminatedMessageProcessor);
 
+        applicationCreatedMessageProcessor = new CompositeApplicationCreatedMessageProcessor();
+        add(applicationCreatedMessageProcessor); 
+        
+        applicationRemovedMessageProcessor = new CompositeApplicationRemovedMessageProcessor();
+        add(applicationRemovedMessageProcessor); 
+        
         if (log.isDebugEnabled()) {
-            log.debug("Topology message processor chain initialized");
+            log.debug("Grouping: added applicationCreatedMessageProcessor, applicationRemovedMessageProcessor: " + 
+            		applicationCreatedMessageProcessor + " / " + applicationRemovedMessageProcessor);
+        }
+
+        if (log.isDebugEnabled()) {
+            log.debug("Topology message processor chain initialized X1");
         }
     }
 
@@ -113,6 +127,17 @@ public class TopologyMessageProcessorChain extends MessageProcessorChain {
             serviceRemovedMessageProcessor.addEventListener(eventListener);
         } else if (eventListener instanceof  MemberMaintenanceListener) {
             memberMaintenanceModeProcessor.addEventListener(eventListener);
+        } else if (eventListener instanceof  CompositeApplicationCreatedEventListener) {
+        	applicationCreatedMessageProcessor.addEventListener(eventListener);
+        	if (log.isDebugEnabled()) {
+                log.debug("Grouping: added eventlistener to applicationCreatedMessageProcessor: " + eventListener);
+            }
+
+        } else if (eventListener instanceof  CompositeApplicationRemovedEventListener) {
+        	applicationRemovedMessageProcessor.addEventListener(eventListener);
+        	if (log.isDebugEnabled()) {
+                log.debug("Grouping: added eventlistener to applicationCreatedMessageProcessor: " + eventListener);
+            }
 
         } else {
             throw new RuntimeException("Unknown event listener");

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java
index 8b3c814..d624d6c 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java
@@ -60,6 +60,7 @@ public class Constants {
     public static final String IS_VOLUME_REQUIRED = "volume.required";
     public static final String SHOULD_DELETE_VOLUME = "volume.delete.on.unsubscription";
     public static final String VOLUME_SIZE = "volume.size.gb";
+    public static final String VOLUME_ID = "volume.id";
     public static final String DEVICE_NAME = "volume.device.name";
 	public static final String GRACEFUL_SHUTDOWN_TIMEOUT = "graceful.shutdown.timeout";
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Util.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Util.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Util.java
index eb0035e..ec15b09 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Util.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Util.java
@@ -22,6 +22,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.messaging.message.JsonMessage;
 
+import com.google.gson.Gson;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -104,5 +106,11 @@ public class Util {
     public static Object jsonToObject(String json, Class type) {
         return (new JsonMessage(json, type)).getObject();
     }
+    
+    public static String ObjectToJson(Object obj) {
+    	Gson gson = new Gson();
+    	String result = gson.toJson(obj);
+    	return result;
+    }
 
 }


[5/7] initial grouping code to develop cartridge grouping feature

Posted by me...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java
index dccbb2e..b4b31d5 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java
@@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.cloud.controller.exception.CloudControllerException;
@@ -43,6 +44,7 @@ import org.jclouds.compute.domain.NodeMetadataBuilder;
 import org.jclouds.compute.domain.Template;
 import org.jclouds.compute.domain.TemplateBuilder;
 import org.jclouds.compute.options.TemplateOptions;
+import org.jclouds.ec2.options.CreateSnapshotOptions;
 import org.jclouds.openstack.nova.v2_0.NovaApi;
 import org.jclouds.openstack.nova.v2_0.NovaApiMetadata;
 import org.jclouds.openstack.nova.v2_0.NovaAsyncApi;
@@ -53,6 +55,7 @@ import org.jclouds.openstack.nova.v2_0.domain.KeyPair;
 import org.jclouds.openstack.nova.v2_0.domain.Network;
 import org.jclouds.openstack.nova.v2_0.domain.Volume;
 import org.jclouds.openstack.nova.v2_0.domain.VolumeAttachment;
+import org.jclouds.openstack.nova.v2_0.domain.VolumeSnapshot;
 import org.jclouds.openstack.nova.v2_0.domain.zonescoped.AvailabilityZone;
 import org.jclouds.openstack.nova.v2_0.extensions.AvailabilityZoneAPI;
 import org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi;
@@ -61,12 +64,14 @@ import org.jclouds.openstack.nova.v2_0.extensions.KeyPairApi;
 import org.jclouds.openstack.nova.v2_0.extensions.VolumeApi;
 import org.jclouds.openstack.nova.v2_0.extensions.VolumeAttachmentApi;
 import org.jclouds.openstack.nova.v2_0.options.CreateVolumeOptions;
+import org.jclouds.openstack.nova.v2_0.options.CreateVolumeSnapshotOptions;
 import org.jclouds.rest.RestContext;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
+import java.util.concurrent.TimeoutException;
 
 @SuppressWarnings("deprecation")
 public class OpenstackNovaIaas extends Iaas {
@@ -252,7 +257,13 @@ public class OpenstackNovaIaas extends Iaas {
 
 		// if no unassigned IP is available, we'll try to allocate an IP.
 		if (ip == null || ip.isEmpty()) {
-			FloatingIP allocatedFloatingIP = floatingIp.create();
+			String defaultFloatingIpPool = iaasInfo.getProperty(CloudControllerConstants.DEFAULT_FLOATING_IP_POOL);
+			FloatingIP allocatedFloatingIP;
+			if ((defaultFloatingIpPool == null) || "".equals(defaultFloatingIpPool)) {
+				allocatedFloatingIP = floatingIp.create();
+			} else {
+				allocatedFloatingIP = floatingIp.allocateFromPool(defaultFloatingIpPool);
+			}
 			if (allocatedFloatingIP == null) {
 				String msg = "Failed to allocate an IP address.";
 				log.error(msg);
@@ -334,7 +345,7 @@ public class OpenstackNovaIaas extends Iaas {
 			}
 			if (ip.equals(fip.getIp())) {
 				if(log.isDebugEnabled()) {
-					log.debug("OpenstackNovaIaas:associatePredefinedAddress:floating ip in use:" + fip + " /ip:" + ip);
+					log.debug(String.format("OpenstackNovaIaas:associatePredefinedAddress:floating ip in use:%s /ip:%s", fip, ip));
 				}
 				isAvailable = true;
 				break;
@@ -485,8 +496,7 @@ public class OpenstackNovaIaas extends Iaas {
     	IaasProvider iaasInfo = getIaasProvider();
     	
         if (host == null || zone == null || iaasInfo == null) {
-            String msg = "Host or Zone or IaaSProvider is null: host: " + host + " - zone: " +
-                    zone + " - IaaSProvider: " + iaasInfo;
+            String msg = String.format("Host or Zone or IaaSProvider is null: host: %s - zone: %s - IaaSProvider: %s", host, zone, iaasInfo);
             log.error(msg);
             throw new InvalidHostException(msg);
         }
@@ -504,7 +514,7 @@ public class OpenstackNovaIaas extends Iaas {
             }
         }
         
-        String msg = "Invalid host: " + host +" in the zone: "+zone+ " and of the iaas: "+iaasInfo.getType();
+        String msg = String.format("Invalid host: %s in the zone: %s and of the iaas: %s", host, zone, iaasInfo.getType());
         log.error(msg);
         throw new InvalidHostException(msg);
     }
@@ -515,62 +525,166 @@ public class OpenstackNovaIaas extends Iaas {
     }
 
 	@Override
-	public String createVolume(int sizeGB) {
+	public String createVolume(int sizeGB, String snapshotId) {
 		IaasProvider iaasInfo = getIaasProvider();
 		String region = ComputeServiceBuilderUtil.extractRegion(iaasInfo);
 		String zone = ComputeServiceBuilderUtil.extractZone(iaasInfo);
 		
         if (region == null || iaasInfo == null) {
-        	log.fatal("Cannot create a new volume in the [region] : "+region
-					+" of Iaas : "+iaasInfo);
+        	log.fatal(String.format("Cannot create a new volume in the [region] : %s of Iaas : %s", region, iaasInfo));
             return null;
         }
         ComputeServiceContext context = iaasInfo.getComputeService().getContext();
         
         RestContext<NovaApi, NovaAsyncApi> nova = context.unwrap();
-        VolumeApi api = nova.getApi().getVolumeExtensionForZone(region).get();
-        Volume volume = api.create(sizeGB, CreateVolumeOptions.Builder.availabilityZone(zone));
+        VolumeApi volumeApi = nova.getApi().getVolumeExtensionForZone(region).get();
+        Volume volume;
+        if(StringUtils.isEmpty(snapshotId)){
+        	if(log.isDebugEnabled()){
+        		log.info("Creating a volume in the zone " + zone);
+        	}
+        	volume = volumeApi.create(sizeGB, CreateVolumeOptions.Builder.availabilityZone(zone));
+        }else{
+        	if(log.isDebugEnabled()){
+        		log.info("Creating a volume in the zone " + zone + " from the shanpshot " + snapshotId);
+        	}
+        	volume = volumeApi.create(sizeGB, CreateVolumeOptions.Builder.availabilityZone(zone).snapshotId(snapshotId));
+        }
+
         if (volume == null) {
-			log.fatal("Volume creation was unsuccessful. [region] : " + region+" [zone] : " + zone
-					+ " of Iaas : " + iaasInfo);
-			return null;
-		}
-		
-		log.info("Successfully created a new volume [id]: "+volume.getId()
-				+" in [region] : "+region+" [zone] : "+zone+" of Iaas : "+iaasInfo);
-		return volume.getId();
+            log.fatal(String.format("Volume creation was unsuccessful. [region] : %s [zone] : %s of Iaas : %s", region, zone, iaasInfo));
+            return null;
+        }
+
+        String volumeId = volume.getId();
+        /*
+        Volume.Status volumeStatus = this.getVolumeStatus(volumeApi, volumeId);
+
+        if(!(volumeStatus == Volume.Status.AVAILABLE || volumeStatus == Volume.Status.CREATING)){
+            log.error(String.format("Error while creating [volume id] %s. Volume status is %s", volumeId, volumeStatus));
+            return volumeId;
+        }
+        try {
+            if(!waitForStatus(volumeApi, volumeId, Volume.Status.AVAILABLE)){
+                log.error("Volume did not become AVAILABLE. Current status is " + volume.getStatus());
+            }
+        } catch (TimeoutException e) {
+            log.error("[Volume ID] " + volumeId + "did not become AVAILABLE within expected timeout");
+            return volumeId;
+        }
+        */
+		log.info(String.format("Successfully created a new volume [id]: %s in [region] : %s [zone] : %s of Iaas : %s [Volume ID]%s", volume.getId(), region, zone, iaasInfo, volume.getId()));
+		return volumeId;
 	}
 
-	@Override
+    private boolean waitForStatus(String volumeId, Volume.Status expectedStatus, int timeoutInMins) throws TimeoutException {
+        long timeout = 1000 * 60 * timeoutInMins;
+        long timout = System.currentTimeMillis() + timeout;
+
+        IaasProvider iaasInfo = getIaasProvider();
+        String region = ComputeServiceBuilderUtil.extractRegion(iaasInfo);
+        ComputeServiceContext context = iaasInfo.getComputeService().getContext();;
+        RestContext<NovaApi, NovaAsyncApi> nova = context.unwrap();
+        VolumeApi volumeApi = nova.getApi().getVolumeExtensionForZone(region).get();
+        VolumeAttachmentApi volumeAttachmentApi = nova.getApi().getVolumeAttachmentExtensionForZone(region).get();
+        Volume.Status volumeStatus = this.getVolumeStatus(volumeApi, volumeId);
+
+        while(volumeStatus != expectedStatus){
+            try {
+                if(log.isDebugEnabled()){
+                    log.debug(String.format("Volume %s is still NOT in %s. Current State=%s", volumeId, expectedStatus, volumeStatus));
+                }
+                if(volumeStatus == Volume.Status.ERROR){
+                    log.error("Volume " + volumeId + " is in state ERROR");
+                    return false;
+                }
+                Thread.sleep(1000);
+                volumeStatus = this.getVolumeStatus(volumeApi, volumeId);
+                if (System.currentTimeMillis()> timout) {
+                    throw new TimeoutException();
+                }
+            } catch (InterruptedException e) {
+                // Ignoring the exception
+            }
+        }
+        if(log.isDebugEnabled()){
+            log.debug(String.format("Volume %s status became %s", volumeId, expectedStatus));
+        }
+
+        return true;
+    }
+
+    @Override
 	public String attachVolume(String instanceId, String volumeId, String deviceName) {
-		IaasProvider iaasInfo = getIaasProvider();
+        IaasProvider iaasInfo = getIaasProvider();
+
+        if (StringUtils.isEmpty(volumeId)) {
+            log.error("Volume provided to attach can not be null");
+        }
+
+        if (StringUtils.isEmpty(instanceId)) {
+            log.error("Instance provided to attach can not be null");
+        }
+
+        ComputeServiceContext context = iaasInfo.getComputeService()
+                .getContext();
+        String region = ComputeServiceBuilderUtil.extractRegion(iaasInfo);
+        String device = deviceName == null ? "/dev/vdc" : deviceName;
+
+        if (region == null) {
+            log.fatal(String.format("Cannot attach the volume [id]: %s in the [region] : %s of Iaas : %s", volumeId, region, iaasInfo));
+            return null;
+        }
+
+        RestContext<NovaApi, NovaAsyncApi> nova = context.unwrap();
+        VolumeApi volumeApi = nova.getApi().getVolumeExtensionForZone(region).get();
+        VolumeAttachmentApi volumeAttachmentApi = nova.getApi().getVolumeAttachmentExtensionForZone(region).get();
+
+        Volume.Status volumeStatus = this.getVolumeStatus(volumeApi, volumeId);
+
+        if (log.isDebugEnabled()) {
+            log.debug("Volume " + volumeId + " is in state " + volumeStatus);
+        }
+
+        if (!(volumeStatus == Volume.Status.AVAILABLE || volumeStatus == Volume.Status.CREATING)) {
+            log.error(String.format("Volume %s can not be attached. Volume status is %s", volumeId, volumeStatus));
+            return null;
+        }
+
+        boolean volumeBecameAvailable = false, volumeBecameAttached = false;
+        try {
+            volumeBecameAvailable = waitForStatus(volumeId, Volume.Status.AVAILABLE, 5);
+        } catch (TimeoutException e) {
+            log.error("[Volume ID] " + volumeId + "did not become AVAILABLE within expected timeout");
+        }
+
+        VolumeAttachment attachment = null;
+        if (volumeBecameAvailable) {
+            attachment = volumeAttachmentApi.attachVolumeToServerAsDevice(volumeId, instanceId, device);
+
+            try {
+                volumeBecameAttached = waitForStatus(volumeId, Volume.Status.IN_USE, 2);
+            } catch (TimeoutException e) {
+                log.error("[Volume ID] " + volumeId + "did not become IN_USE within expected timeout");
+            }
+        }
+        try {
+            // waiting 5seconds till volumes are actually attached.
+            Thread.sleep(5000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
 
-		ComputeServiceContext context = iaasInfo.getComputeService()
-				.getContext();
-		
-		String region = ComputeServiceBuilderUtil.extractRegion(iaasInfo);
-		String device = deviceName == null ? "/dev/vdc" : deviceName;
-		
-		if(region == null) {
-			log.fatal("Cannot attach the volume [id]: "+volumeId+" in the [region] : "+region
-					+" of Iaas : "+iaasInfo);
-			return null;
-		}
-		
-		RestContext<NovaApi, NovaAsyncApi> nova = context.unwrap();
-        VolumeAttachmentApi api = nova.getApi().getVolumeAttachmentExtensionForZone(region).get();
-        VolumeAttachment attachment = api.attachVolumeToServerAsDevice(volumeId, instanceId, device);
-        
         if (attachment == null) {
-			log.fatal("Volume [id]: "+volumeId+" attachment for instance [id]: "+instanceId
-					+" was unsuccessful. [region] : " + region
-					+ " of Iaas : " + iaasInfo);
+			log.fatal(String.format("Volume [id]: %s attachment for instance [id]: %s was unsuccessful. [region] : %s of Iaas : %s", volumeId, instanceId, region, iaasInfo));
 			return null;
 		}
-		
-		log.info("Volume [id]: "+volumeId+" attachment for instance [id]: "+instanceId
-				+" was successful [status]: "+"Attaching"+". [region] : " + region
-				+ " of Iaas : " + iaasInfo);
+
+        if(! volumeBecameAttached){
+           log.error(String.format("[Volume ID] %s attachment is called, but not yet became attached", volumeId));
+        }
+
+		log.info(String.format("Volume [id]: %s attachment for instance [id]: %s was successful [status]: Attaching. [region] : %s of Iaas : %s", volumeId, instanceId, region, iaasInfo));
 		return "Attaching";
 	}
 
@@ -584,18 +698,19 @@ public class OpenstackNovaIaas extends Iaas {
 		String region = ComputeServiceBuilderUtil.extractRegion(iaasInfo);
 		
 		if(region == null) {
-			log.fatal("Cannot detach the volume [id]: "+volumeId+" from the instance [id]: "+instanceId
-					+" of the [region] : "+region
-					+" of Iaas : "+iaasInfo);
+			log.fatal(String.format("Cannot detach the volume [id]: %s from the instance [id]: %s of the [region] : %s of Iaas : %s", volumeId, instanceId, region, iaasInfo));
 			return;
 		}
-		
+        if(log.isDebugEnabled()) {
+            log.debug(String.format("Starting to detach volume %s from the instance %s", volumeId, instanceId));
+        }
+
 		RestContext<NovaApi, NovaAsyncApi> nova = context.unwrap();
         VolumeAttachmentApi api = nova.getApi().getVolumeAttachmentExtensionForZone(region).get();
         if (api.detachVolumeFromServer(volumeId, instanceId)) {
-        	log.info("Detachment of Volume [id]: "+volumeId+" from instance [id]: "+instanceId
-    				+" was successful. [region] : " + region
-    				+ " of Iaas : " + iaasInfo);
+        	log.info(String.format("Detachment of Volume [id]: %s from instance [id]: %s was successful. [region] : %s of Iaas : %s", volumeId, instanceId, region, iaasInfo));
+        }else{
+            log.error(String.format("Detachment of Volume [id]: %s from instance [id]: %s was unsuccessful. [volume Status] : %s", volumeId, instanceId, region, iaasInfo));
         }
         
 	}
@@ -610,16 +725,14 @@ public class OpenstackNovaIaas extends Iaas {
 		String region = ComputeServiceBuilderUtil.extractRegion(iaasInfo);
 		
 		if(region == null) {
-			log.fatal("Cannot delete the volume [id]: "+volumeId+" of the [region] : "+region
-					+" of Iaas : "+iaasInfo);
+			log.fatal(String.format("Cannot delete the volume [id]: %s of the [region] : %s of Iaas : %s", volumeId, region, iaasInfo));
 			return;
 		}
 		
 		RestContext<NovaApi, NovaAsyncApi> nova = context.unwrap();
 		VolumeApi api = nova.getApi().getVolumeExtensionForZone(region).get();
         if (api.delete(volumeId)) {
-        	log.info("Deletion of Volume [id]: "+volumeId+" was successful. [region] : " + region
-    				+ " of Iaas : " + iaasInfo);
+        	log.info(String.format("Deletion of Volume [id]: %s was successful. [region] : %s of Iaas : %s", volumeId, region, iaasInfo));
         }
 	}
 
@@ -628,4 +741,7 @@ public class OpenstackNovaIaas extends Iaas {
         return device;
     }
 
+    private Volume.Status getVolumeStatus(VolumeApi volumeApi, String volumeId){
+        return volumeApi.get(volumeId).getStatus();
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/VCloudIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/VCloudIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/VCloudIaas.java
index 9332d7f..b3d1384 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/VCloudIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/VCloudIaas.java
@@ -231,7 +231,7 @@ public class VCloudIaas extends Iaas {
     }
 
 	@Override
-	public String createVolume(int sizeGB) {
+	public String createVolume(int sizeGB, String snapshotId) {
 		// TODO Auto-generated method stub
 		return null;
 	}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
index 56cc2b0..e5cc05a 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
@@ -20,7 +20,7 @@ package org.apache.stratos.cloud.controller.impl;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.net.InetAddresses;
-
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.cloud.controller.concurrent.PartitionValidatorCallable;
@@ -39,6 +39,9 @@ import org.apache.stratos.cloud.controller.topology.TopologyManager;
 import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
 import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
 import org.apache.stratos.cloud.controller.validate.interfaces.PartitionValidator;
+import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication;
+import org.apache.stratos.cloud.controller.pojo.ConfigDependencies;
+import org.apache.stratos.cloud.controller.pojo.ConfigGroup;
 import org.apache.stratos.messaging.domain.topology.Member;
 import org.apache.stratos.messaging.domain.topology.MemberStatus;
 import org.apache.stratos.messaging.util.Constants;
@@ -89,6 +92,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
 					currentData.setMemberIdToContext(serializedObj.getMemberIdToContext());
 					currentData.setClusterIdToMemberContext(serializedObj.getClusterIdToMemberContext());
 					currentData.setCartridges(serializedObj.getCartridges());
+                                       currentData.setConfigCompositeApplication(serializedObj.getConfigCompositeApplication());
 
 					if(log.isDebugEnabled()) {
 					    
@@ -107,11 +111,53 @@ public class CloudControllerServiceImpl implements CloudControllerService {
 			}
 
 		}
+                // restore compostie application
+		List<ConfigCompositeApplication> apps = restoreConfigCompositeApplication();
+		if (apps == null) {
+			this.dataHolder.setConfigCompositeApplication(new ArrayList<ConfigCompositeApplication>());
+
+		}
 	}
 
-    public void deployCartridgeDefinition(CartridgeConfig cartridgeConfig) throws InvalidCartridgeDefinitionException, 
+
+    public void deployCompositeApplicationDefinition(CompositeApplicationDefinition compositeApplicationDefinition) throws InvalidCompositeApplicationDefinitionException, 
+    InvalidIaasProviderException {
+    	
+    	String alias = compositeApplicationDefinition.getAlias();
+    	if(log.isDebugEnabled()){
+            log.debug("composite application alias  : " + alias);
+    	}
+    	
+    	ConfigCompositeApplication messConfigApp = TopologyBuilder.convertCompositeApplication(compositeApplicationDefinition);
+        String key = "compositeApplicationAlias"; //app.getAlias()
+        	
+    	
+    	List<ConfigCompositeApplication> data = new ArrayList<ConfigCompositeApplication>();
+    	data.add(messConfigApp);
+    	dataHolder.setConfigCompositeApplication(data);
+        
+        // persist
+        persist();
+    	
+    	if(log.isDebugEnabled()){
+            log.debug("deploying composite application in cloud controller: " + compositeApplicationDefinition);
+        }
+    	
+    	TopologyBuilder.handleCompositeApplicationCreated(messConfigApp);
+    }
+    
+    public void unDeployCompositeApplicationDefinition(String appAlias) throws InvalidCompositeApplicationDefinitionException, 
     InvalidIaasProviderException {
+    	if(log.isDebugEnabled()){
+            log.debug("undeploying composite application in cloud controller, removing all composite apps ");
+            dataHolder.removeAllConfigCompositeApplications();
+            persist();
+            TopologyBuilder.handleCompositeApplicationRemoved(appAlias);
+        }
+    }
 
+    public void deployCartridgeDefinition(CartridgeConfig cartridgeConfig) throws InvalidCartridgeDefinitionException, 
+    InvalidIaasProviderException {
         if (cartridgeConfig == null) {
             String msg = "Invalid Cartridge Definition: Definition is null.";
             log.error(msg);
@@ -216,7 +262,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
     @Override
     public MemberContext startInstance(MemberContext memberContext) throws
         UnregisteredCartridgeException, InvalidIaasProviderException {
-    	
+
     	if(log.isDebugEnabled()) {
     		log.debug("CloudControllerServiceImpl:startInstance");
     	}
@@ -292,15 +338,10 @@ public class CloudControllerServiceImpl implements CloudControllerService {
             addToPayload(payload, "PARTITION_ID", partitionId);
 
             Iaas iaas = iaasProvider.getIaas();
-            if(ctxt.isVolumeRequired()){
-                addToPayload(payload, "PERSISTENCE_MAPPING", getPersistencePayload(cartridge, iaas).toString());
-            }
             
             if (log.isDebugEnabled()) {
                 log.debug("Payload: " + payload.toString());
             }
-            // reloading the payload with memberID
-            iaasProvider.setPayload(payload.toString().getBytes());
             
             if (iaas == null) {
                 if(log.isDebugEnabled()) {
@@ -316,8 +357,25 @@ public class CloudControllerServiceImpl implements CloudControllerService {
                 }
                 
             }
-            
+
+            if(ctxt.isVolumeRequired()) {
+                if (ctxt.getVolumes() != null) {
+                    for (Volume volume : ctxt.getVolumes()) {
+
+                        if (volume.getId() == null) {
+                            // create a new volume
+                            createVolumeAndSetInClusterContext(volume, iaasProvider);
+                        }
+                    }
+                }
+            }
+
+            if(ctxt.isVolumeRequired()){
+                addToPayload(payload, "PERSISTENCE_MAPPING", getPersistencePayload(ctxt, iaas).toString());
+            }
+            iaasProvider.setPayload(payload.toString().getBytes());
             iaas.setDynamicPayload();
+
             // get the pre built ComputeService from provider or region or zone or host
             computeService = iaasProvider.getComputeService();
             template = iaasProvider.getTemplate();
@@ -337,19 +395,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
             // Should have a length between 3-15
             String str = clusterId.length() > 10 ? clusterId.substring(0, 10) : clusterId.substring(0, clusterId.length());
             String group = str.replaceAll("[^a-z0-9-]", "");
-            
-            if(ctxt.isVolumeRequired()) {
-            	if (ctxt.getVolumes() != null) {
-            		for (Volume volume : ctxt.getVolumes()) {
-						
-            			if (volume.getId() == null) {
-            				// create a new volume
-            				createVolumeAndSetInClusterContext(volume, iaasProvider);
-            			} 
-					}
-            	}
-            }
-            
+
             NodeMetadata node;
 
 //            create and start a node
@@ -375,7 +421,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
                 if(log.isDebugEnabled()) {
                     log.debug("Node id was set. "+memberContext.toString());
                 }
-                
+
                 // attach volumes
 			if (ctxt.isVolumeRequired()) {
 				// remove region prefix
@@ -391,7 +437,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
 						} catch (Exception e) {
 							// continue without throwing an exception, since
 							// there is an instance already running
-							log.error("Attaching Volume to Instance [ "
+							log.error("Attaching Volume " + volume.getId() + " to Instance [ "
 									+ instanceId + " ] failed!", e);
 						}
 					}
@@ -412,39 +458,52 @@ public class CloudControllerServiceImpl implements CloudControllerService {
 
 	private void createVolumeAndSetInClusterContext(Volume volume,
 			IaasProvider iaasProvider) {
-
 		// iaas cannot be null at this state #startInstance method
 		Iaas iaas = iaasProvider.getIaas();
-		
 		int sizeGB = volume.getSize();
-		String volumeId = iaas.createVolume(sizeGB);
-		volume.setId(volumeId);
+		String snapshotId =  volume.getSnapshotId();
+        if(StringUtils.isNotEmpty(volume.getVolumeId())){
+            // volumeID is specified, so not creating additional volumes
+            if(log.isDebugEnabled()){
+                log.debug("Volume creation is skipping since a volume ID is specified. [Volume ID]" + volume.getVolumeId());
+            }
+            volume.setId(volume.getVolumeId());
+        }else{
+            String volumeId = iaas.createVolume(sizeGB, snapshotId);
+            volume.setId(volumeId);
+        }
+        
 		volume.setIaasType(iaasProvider.getType());
 	}
 
-	private StringBuilder getPersistencePayload(Cartridge cartridge, Iaas iaas) {
+
+    private StringBuilder getPersistencePayload(ClusterContext ctx, Iaas iaas) {
 		StringBuilder persistencePayload = new StringBuilder();
-		if(isPersistenceMappingAvailable(cartridge)){
-			for(Volume volume : cartridge.getPersistence().getVolumes()){
+		if(isPersistenceMappingAvailable(ctx)){
+			for(Volume volume : ctx.getVolumes()){
 				if(log.isDebugEnabled()){
 					log.debug("Adding persistence mapping " + volume.toString());
 				}
                 if(persistencePayload.length() != 0) {
                    persistencePayload.append("|");
                 }
+                
 				persistencePayload.append(iaas.getIaasDevice(volume.getDevice()));
 				persistencePayload.append("|");
+                persistencePayload.append(volume.getId());
+                persistencePayload.append("|");
                 persistencePayload.append(volume.getMappingPath());
 			}
 		}
         if(log.isDebugEnabled()){
             log.debug("Persistence payload is" + persistencePayload.toString());
         }
+        System.out.println("****** " + persistencePayload);
 		return persistencePayload;
 	}
 
-	private boolean isPersistenceMappingAvailable(Cartridge cartridge) {
-		return cartridge.getPersistence() != null && cartridge.getPersistence().isPersistanceRequired();
+	private boolean isPersistenceMappingAvailable(ClusterContext ctx) {
+		return ctx.getVolumes() != null && ctx.isVolumeRequired();
 	}
 
 	private void addToPayload(StringBuilder payload, String name, String value) {
@@ -775,7 +834,6 @@ public class CloudControllerServiceImpl implements CloudControllerService {
 		ClusterContext clusterCtxt = dataHolder.getClusterContext(clusterId);
 		if (clusterCtxt.getVolumes() != null) {
 			for (Volume volume : clusterCtxt.getVolumes()) {
-				
 				try {
 					String volumeId = volume.getId();
 					if (volumeId == null) {
@@ -846,7 +904,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
         boolean isLb = property != null ? Boolean.parseBoolean(property) : false;
 
         ClusterContext ctxt = buildClusterContext(cartridge, clusterId,
-				payload, hostName, props, isLb);
+				payload, hostName, props, isLb, registrant.getPersistence());
 
 
 		dataHolder.addClusterContext(ctxt);
@@ -860,8 +918,8 @@ public class CloudControllerServiceImpl implements CloudControllerService {
 	}
 
 	private ClusterContext buildClusterContext(Cartridge cartridge,
-			String clusterId, String payload, String hostName,
-			Properties props, boolean isLb) {
+                                               String clusterId, String payload, String hostName,
+                                               Properties props, boolean isLb, Persistence persistence) {
 
 
 		// initialize ClusterContext
@@ -871,40 +929,65 @@ public class CloudControllerServiceImpl implements CloudControllerService {
 		String property;
 		property = props.getProperty(Constants.GRACEFUL_SHUTDOWN_TIMEOUT);
 		long timeout = property != null ? Long.parseLong(property) : 30000;
-		
-		property = props.getProperty(Constants.IS_VOLUME_REQUIRED);
-        boolean isVolumeRequired = property != null ? Boolean.parseBoolean(property) : false;
-        
-        if(isVolumeRequired) {
+
+        boolean persistanceRequired = false;
+        if(persistence != null){
+              persistanceRequired = persistence.isPersistanceRequired();
+        }
+
+        if(persistanceRequired){
+            ctxt.setVolumes(persistence.getVolumes());
+            ctxt.setVolumeRequired(true);
+        }else{
+            ctxt.setVolumeRequired(false);
+        }
+        /*
+        if(persistanceRequired) {
         	Persistence persistenceData = cartridge.getPersistence();
-        	
+
         	if(persistenceData != null) {
-        		Volume[] volumes = persistenceData.getVolumes();
-        		
+        		Volume[] cartridge_volumes = persistenceData.getVolumes();
+
+
+                Volume[] volumestoCreate = overideVolumes(cartridge_volumes, persistence.getVolumes());
         		property = props.getProperty(Constants.SHOULD_DELETE_VOLUME);
-        		property = props.getProperty(Constants.VOLUME_SIZE);
-        		
-        		for (Volume volume : volumes) {
-        			int volumeSize = property != null ? Integer.parseInt(property) : volume.getSize();
-        			boolean shouldDeleteVolume = property != null ? Boolean.parseBoolean(property) : volume.isRemoveOntermination();
-        			volume.setSize(volumeSize);
-        			volume.setRemoveOntermination(shouldDeleteVolume);
+        		String property_volume_zize = props.getProperty(Constants.VOLUME_SIZE);
+                String property_volume_id = props.getProperty(Constants.VOLUME_ID);
+
+                List<Volume> cluster_volume_list = new LinkedList<Volume>();
+
+        		for (Volume volume : cartridge_volumes) {
+        			int volumeSize = StringUtils.isNotEmpty(property_volume_zize) ? Integer.parseInt(property_volume_zize) : volume.getSize();
+        			boolean shouldDeleteVolume = StringUtils.isNotEmpty(property) ? Boolean.parseBoolean(property) : volume.isRemoveOntermination();
+                    String volumeID = StringUtils.isNotEmpty(property_volume_id) ? property_volume_id : volume.getVolumeId();
+
+                    Volume volume_cluster = new Volume();
+                    volume_cluster.setSize(volumeSize);
+                    volume_cluster.setRemoveOntermination(shouldDeleteVolume);
+                    volume_cluster.setDevice(volume.getDevice());
+                    volume_cluster.setIaasType(volume.getIaasType());
+                    volume_cluster.setMappingPath(volume.getMappingPath());
+                    volume_cluster.setVolumeId(volumeID);
+                    cluster_volume_list.add(volume_cluster);
 				}
-        		ctxt.setVolumes(volumes);
+        		//ctxt.setVolumes(cluster_volume_list.toArray(new Volume[cluster_volume_list.size()]));
+                ctxt.setVolumes(persistence.getVolumes());
+                ctxt.setVolumeRequired(true);
         	} else {
         		// if we cannot find necessary data, we would not consider 
         		// this as a volume required instance.
-        		isVolumeRequired = false;
-        	}
-        	
-        	ctxt.setVolumeRequired(isVolumeRequired);
+        		//isVolumeRequired = false;
+                ctxt.setVolumeRequired(false);
+       	}
+
+        	//ctxt.setVolumeRequired(isVolumeRequired);
         }
-        
+        */
 	    ctxt.setTimeoutInMillis(timeout);
 		return ctxt;
 	}
 
-	@Override
+    @Override
 	public String[] getRegisteredCartridges() {
 		// get the list of cartridges registered
 		List<Cartridge> cartridges = dataHolder
@@ -1018,14 +1101,19 @@ public class CloudControllerServiceImpl implements CloudControllerService {
                          for (Volume volume : ctxt.getVolumes()) {
                             if(volume.getId() != null) {
                                 String iaasType = volume.getIaasType();
-                                Iaas iaas = dataHolder.getIaasProvider(iaasType).getIaas();
+                                //Iaas iaas = dataHolder.getIaasProvider(iaasType).getIaas();
+                                Iaas iaas = cartridge.getIaasProvider(iaasType).getIaas();
                                 if(iaas != null) {
                                     try {
-                                    // delete the volume
-                                    iaas.deleteVolume(volume.getId());
+                                    // delete the volumes if remove on unsubscription is true.
+                                    if(volume.isRemoveOntermination())
+                                    {
+                                        iaas.deleteVolume(volume.getId());
+                                        volume.setId(null);
+                                    }
                                     } catch(Exception ignore) {
-                                        if(log.isDebugEnabled()) {
-                                            log.debug(ignore);
+                                        if(log.isErrorEnabled()) {
+                                            log.error("Error while deleting volume [id] "+ volume.getId(), ignore);
                                         }
                                     }
                                 }
@@ -1134,5 +1222,26 @@ public class CloudControllerServiceImpl implements CloudControllerService {
         return dataHolder.getClusterContext(clusterId);
     }
 
+    private List<ConfigCompositeApplication> restoreConfigCompositeApplication () {
+    	List<ConfigCompositeApplication> apps = this.dataHolder.getConfigCompositeApplication();
+		if (apps == null) {
+			if (log.isDebugEnabled()) {
+				log.debug("composite applications  for cloud controller is null while restoring ");
+			}
+			return apps;
+		}
+    	if (log.isDebugEnabled()) {
+			log.debug("trying to  restore composite applications  for cloud controller " + apps.size());
+		}
+    	for (ConfigCompositeApplication messConfigApp : apps) {
+    		if (log.isDebugEnabled()) {
+    			log.debug(" restoring composite application for cloud controller " + messConfigApp.getAlias());
+    		}
+    		TopologyBuilder.handleCompositeApplicationCreated(messConfigApp);
+    	}
+    	
+    	return apps;
+    }
+
 }
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/Iaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/Iaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/Iaas.java
index 492171d..1ae7dc5 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/Iaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/Iaas.java
@@ -141,7 +141,7 @@ public abstract class Iaas {
      * @param sizeGB size of the volume in Giga Bytes.
      * @return Id of the created volume.
      */
-    public abstract String createVolume(int sizeGB);
+    public abstract String createVolume(int sizeGB, String snapshotId);
    
     /**
      * Attach a given volume to an instance at the specified device path.

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CompositeApplicationDefinition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CompositeApplicationDefinition.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CompositeApplicationDefinition.java
new file mode 100644
index 0000000..97a9948
--- /dev/null
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CompositeApplicationDefinition.java
@@ -0,0 +1,39 @@
+package org.apache.stratos.cloud.controller.pojo;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class CompositeApplicationDefinition  implements Serializable {
+	
+	private static final long serialVersionUID = 1L;
+	private String applicationId;
+	private String alias;
+	private ConfigGroup[] components;
+	private ConfigCartridge [] cartridges;
+	public ConfigCartridge[] getCartridges() {
+		return cartridges;
+	}
+	public void setCartridges(ConfigCartridge[] cartridges) {
+		this.cartridges = cartridges;
+	}
+	public String getApplicationId() {
+		return applicationId;
+	}
+	public void setApplicationId(String applicationId) {
+		this.applicationId = applicationId;
+	}
+	public String getAlias() {
+		return alias;
+	}
+	public void setAlias(String alias) {
+		this.alias = alias;
+	}
+	public ConfigGroup[]  getComponents() {
+		return components;
+	}
+	public void setComponents(ConfigGroup[]  components) {
+		this.components = components;
+	}
+	
+
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ConfigCartridge.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ConfigCartridge.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ConfigCartridge.java
new file mode 100644
index 0000000..a3c3b1e
--- /dev/null
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ConfigCartridge.java
@@ -0,0 +1,17 @@
+package org.apache.stratos.cloud.controller.pojo;
+
+import java.io.Serializable;
+
+
+public class ConfigCartridge  implements Serializable {
+	private String alias;
+	private static final long serialVersionUID = 1L;
+
+	public String getAlias() {
+		return alias;
+	}
+
+	public void setAlias(String alias) {
+		this.alias = alias;
+	}
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ConfigDependencies.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ConfigDependencies.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ConfigDependencies.java
new file mode 100644
index 0000000..fc28e67
--- /dev/null
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ConfigDependencies.java
@@ -0,0 +1,29 @@
+package org.apache.stratos.cloud.controller.pojo;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+public class ConfigDependencies  implements Serializable  {
+	private ConfigDependencyPair[] startup_order;
+	private String kill_behavior;
+	private static final long serialVersionUID = 1L;
+	
+	public ConfigDependencyPair[]  getStartup_order() {
+		return startup_order;
+	}
+	public void setStartup_order(ConfigDependencyPair[]  startup_order) {
+		this.startup_order = startup_order;
+	}
+	public String getKill_behavior() {
+		return kill_behavior;
+	}
+	public void setKill_behavior(String kill_behavior) {
+		this.kill_behavior = kill_behavior;
+	}
+
+
+	
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ConfigDependencyPair.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ConfigDependencyPair.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ConfigDependencyPair.java
new file mode 100644
index 0000000..ac2a7d3
--- /dev/null
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ConfigDependencyPair.java
@@ -0,0 +1,29 @@
+package org.apache.stratos.cloud.controller.pojo;
+
+import java.io.Serializable;
+
+public class ConfigDependencyPair  implements Serializable {
+	private String key;
+	private String value;
+	private static final long serialVersionUID = 1L;
+	
+	public ConfigDependencyPair() {}
+	
+	public ConfigDependencyPair(String key, String value) {
+		this.key = key;
+		this.value = value;
+	}
+	
+	public String getKey() {
+		return key;
+	}
+	public void setKey(String key) {
+		this.key = key;
+	}
+	public String getValue() {
+		return value;
+	}
+	public void setValue(String value) {
+		this.value = value;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ConfigGroup.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ConfigGroup.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ConfigGroup.java
new file mode 100644
index 0000000..65d5610
--- /dev/null
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ConfigGroup.java
@@ -0,0 +1,35 @@
+package org.apache.stratos.cloud.controller.pojo;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+
+public class ConfigGroup  implements Serializable {
+	private  String alias;
+	private  String[] subscribables;
+	private ConfigDependencies dependencies;
+	private static final long serialVersionUID = 1L;
+	
+	public String getAlias() {
+		return alias;
+	}
+	public void setAlias(String alias) {
+		this.alias = alias;
+	}
+	public String[] getSubscribables() {
+		return subscribables;
+	}
+	public void setSubscribables(String[] subscribables) {
+		this.subscribables = subscribables;
+	}
+	public ConfigDependencies getDependencies() {
+		return dependencies;
+	}
+	public void setDependencies(ConfigDependencies dependencies) {
+		this.dependencies = dependencies;
+	}
+
+
+	
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java
index fe7a7e9..2c3458a 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Registrant.java
@@ -33,6 +33,7 @@ public class Registrant {
     private Properties properties;
     private String autoScalerPolicyName;
     private String deploymentPolicyName;
+    private Persistence persistence;
     
     public String getTenantRange() {
         return tenantRange;
@@ -91,4 +92,12 @@ public class Registrant {
                properties + ", autoScalerPolicyName=" + autoScalerPolicyName +
                ", deploymentPolicyName=" + deploymentPolicyName + "]";
     }
+
+    public Persistence getPersistence() {
+        return persistence;
+    }
+
+    public void setPersistence(Persistence persistence) {
+        this.persistence = persistence;
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Volume.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Volume.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Volume.java
index b35f965..b5e3b29 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Volume.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/Volume.java
@@ -29,10 +29,12 @@ public class Volume implements Serializable {
 	private boolean removeOntermination;
     private String mappingPath;
     private String iaasType;
+    private String snapshotId;
+    private String volumeId;
 
     public String toString () {
         return "Persistence Required: " + ", Size: " + getSize() + ", device: " + getDevice() +
-                " mapping path : " + mappingPath + " remove on termination " + isRemoveOntermination();
+                " mapping path : " + mappingPath + " remove on termination " + isRemoveOntermination() + " SnaphotId " + snapshotId;
     }
 
     public int getSize() {
@@ -51,9 +53,7 @@ public class Volume implements Serializable {
         this.device = device;
     }
 
-    public boolean isRemoveOntermination() {
-        return removeOntermination;
-    }
+    public boolean isRemoveOntermination() {return removeOntermination;}
 
     public void setRemoveOntermination(boolean removeOntermination) {
         this.removeOntermination = removeOntermination;
@@ -107,4 +107,20 @@ public class Volume implements Serializable {
 	public void setIaasType(String iaasType) {
 		this.iaasType = iaasType;
 	}
+
+	public String getSnapshotId() {
+		return snapshotId;
+	}
+
+	public void setSnapshotId(String snapshotId) {
+		this.snapshotId = snapshotId;
+	}
+
+    public String getVolumeId() {
+        return volumeId;
+    }
+
+    public void setVolumeId(String volumeId) {
+        this.volumeId = volumeId;
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java
index 9b05b5d..78abe08 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java
@@ -22,6 +22,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.cloud.controller.pojo.*;
 import org.apache.stratos.cloud.controller.registry.RegistryManager;
+import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication;
 import org.wso2.carbon.databridge.agent.thrift.AsyncDataPublisher;
 
 import java.io.Serializable;
@@ -74,6 +75,8 @@ public class FasterLookUpDataHolder implements Serializable{
 	 * List of registered {@link Cartridge}s
 	 */
 	private List<Cartridge> cartridges;
+	
+	private List<ConfigCompositeApplication> configCompositeApplication;
 
 	/**
 	 * List of IaaS Providers.
@@ -118,6 +121,7 @@ public class FasterLookUpDataHolder implements Serializable{
 	private FasterLookUpDataHolder() {
 
 		cartridges = new ArrayList<Cartridge>();
+		configCompositeApplication = new ArrayList<ConfigCompositeApplication>();
 		
 	}
 
@@ -129,6 +133,21 @@ public class FasterLookUpDataHolder implements Serializable{
 	    this.cartridges = cartridges;
 	}
 
+	public List<ConfigCompositeApplication> getConfigCompositeApplication() {
+		return configCompositeApplication;
+	}
+
+	public void setConfigCompositeApplication(
+			List<ConfigCompositeApplication> configCompositeApplication) {
+		this.configCompositeApplication = configCompositeApplication;
+	}
+	
+	public void removeAllConfigCompositeApplications() {
+		if (this.configCompositeApplication != null) {
+			this.configCompositeApplication.removeAll(configCompositeApplication);
+		}
+	}
+
 	public Cartridge getCartridge(String cartridgeType) {
 		for (Cartridge cartridge : cartridges) {
 			if (cartridge.getType().equals(cartridgeType)) {

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
index 9c3ea70..96485a4 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
@@ -25,12 +25,14 @@ import org.apache.stratos.cloud.controller.exception.InvalidMemberException;
 import org.apache.stratos.cloud.controller.impl.CloudControllerServiceImpl;
 import org.apache.stratos.cloud.controller.pojo.Cartridge;
 import org.apache.stratos.cloud.controller.pojo.ClusterContext;
+import org.apache.stratos.cloud.controller.pojo.CompositeApplicationDefinition;
 import org.apache.stratos.cloud.controller.pojo.PortMapping;
 import org.apache.stratos.cloud.controller.pojo.Registrant;
 import org.apache.stratos.cloud.controller.publisher.CartridgeInstanceDataPublisher;
 import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder;
 import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
 import org.apache.stratos.messaging.domain.topology.*;
+import org.apache.stratos.messaging.domain.topology.util.CompositeApplicationBuilder;
 import org.apache.stratos.messaging.event.instance.status.InstanceActivatedEvent;
 import org.apache.stratos.messaging.event.instance.status.InstanceMaintenanceModeEvent;
 import org.apache.stratos.messaging.event.instance.status.InstanceReadyToShutdownEvent;
@@ -38,7 +40,9 @@ import org.apache.stratos.messaging.event.instance.status.InstanceStartedEvent;
 import org.apache.stratos.messaging.event.topology.MemberActivatedEvent;
 import org.apache.stratos.messaging.event.topology.MemberMaintenanceModeEvent;
 import org.apache.stratos.messaging.event.topology.MemberReadyToShutdownEvent;
+import org.apache.stratos.messaging.util.Util;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
@@ -223,6 +227,28 @@ public class TopologyBuilder {
                     instanceStartedEvent.getMemberId()));
         	return;
         }
+        
+      //grouping 
+        
+        if (log.isDebugEnabled()) {
+				log.debug("checking group id in ToplogyBuilder for member started event");
+		}
+       
+        CompositeApplicationBuilder builder = new CompositeApplicationBuilder();
+        String appAlias = "compositeApplicationAlias";
+        CompositeApplication app = builder.buildCompositeApplication(topology, appAlias);
+        if (app != null) {
+        	if (log.isDebugEnabled()) {
+				log.debug("TopologyBuilder found composite app for " + appAlias);
+        	}
+        	String clusterId = instanceStartedEvent.getClusterId();
+        	String groupAlias =  app.extractClusterGroupFromClusterId(clusterId);
+    		instanceStartedEvent.setGroupId(groupAlias);
+    		if (log.isDebugEnabled()) {
+				log.debug("TopologyBuilder  setting groupAlias " +  groupAlias + " for instance started event for cluster " + clusterId);
+        	}
+        }
+        
         try {
             TopologyManager.acquireWriteLock();
             member.setStatus(MemberStatus.Starting);
@@ -259,6 +285,26 @@ public class TopologyBuilder {
                                                      instanceActivatedEvent.getClusterId()));
             return;
         }
+        
+        // grouping
+        
+        CompositeApplicationBuilder builder = new CompositeApplicationBuilder();
+        String appAlias = "compositeApplicationAlias";
+        CompositeApplication app = builder.buildCompositeApplication(topology, appAlias);
+        if (app != null) {
+        	if (log.isDebugEnabled()) {
+				log.debug("TopologyBuilder found composite app for member activated " + appAlias);
+        	}
+        	String clusterId = instanceActivatedEvent.getClusterId();
+        	String groupAlias =  app.extractClusterGroupFromClusterId(clusterId);
+    		instanceActivatedEvent.setGroupId(groupAlias);
+    		if (log.isDebugEnabled()) {
+				log.debug("TopologyBuilder  setting groupAlias " +  groupAlias + " for instance activated event for cluster " + clusterId);
+        	}
+        }
+        
+        
+        
         Member member = cluster.getMember(instanceActivatedEvent.getMemberId());
 
         if (member == null) {
@@ -270,6 +316,8 @@ public class TopologyBuilder {
         MemberActivatedEvent memberActivatedEvent = new MemberActivatedEvent(instanceActivatedEvent.getServiceName(),
                         instanceActivatedEvent.getClusterId(), instanceActivatedEvent.getNetworkPartitionId(), instanceActivatedEvent.getPartitionId(), instanceActivatedEvent.getMemberId());
 
+        // grouping - set grouid
+        memberActivatedEvent.setGroupId(instanceActivatedEvent.getGroupId());
         try {
             TopologyManager.acquireWriteLock();
             member.setStatus(MemberStatus.Activated);
@@ -289,6 +337,7 @@ public class TopologyBuilder {
             }
 
             memberActivatedEvent.setMemberIp(member.getMemberIp());
+            memberActivatedEvent.setMemberPublicIp(member.getMemberPublicIp());
             TopologyManager.updateTopology(topology);
 
         } finally {
@@ -323,6 +372,28 @@ public class TopologyBuilder {
                                                      instanceReadyToShutdownEvent.getClusterId()));
             return;
         }
+        
+      //grouping 
+        
+        if (log.isDebugEnabled()) {
+				log.debug("checking group id in ToplogyBuilder for member started event");
+		}
+       
+        CompositeApplicationBuilder builder = new CompositeApplicationBuilder();
+        String appAlias = "compositeApplicationAlias";
+        CompositeApplication app = builder.buildCompositeApplication(topology, appAlias);
+        if (app != null) {
+        	if (log.isDebugEnabled()) {
+				log.debug("TopologyBuilder found composite app for " + appAlias);
+        	}
+        	String clusterId = instanceReadyToShutdownEvent.getClusterId();
+        	String groupAlias =  app.extractClusterGroupFromClusterId(clusterId);
+    		instanceReadyToShutdownEvent.setGroupId(groupAlias);
+    		if (log.isDebugEnabled()) {
+				log.debug("TopologyBuilder  setting groupAlias " +  groupAlias + " for instance ready shutdown event for cluster " + clusterId);
+        	}
+        }
+        
         Member member = cluster.getMember(instanceReadyToShutdownEvent.getMemberId());
         if (member == null) {
             log.warn(String.format("Member %s does not exist",
@@ -376,12 +447,37 @@ public class TopologyBuilder {
                                                      instanceMaintenanceModeEvent.getClusterId()));
             return;
         }
+        
         Member member = cluster.getMember(instanceMaintenanceModeEvent.getMemberId());
         if (member == null) {
             log.warn(String.format("Member %s does not exist",
                     instanceMaintenanceModeEvent.getMemberId()));
             return;
         }
+        
+        
+        //grouping 
+        
+        if (log.isDebugEnabled()) {
+				log.debug("checking group id in ToplogyBuilder for member started event");
+		}
+       
+        CompositeApplicationBuilder builder = new CompositeApplicationBuilder();
+        String appAlias = "compositeApplicationAlias";
+        CompositeApplication app = builder.buildCompositeApplication(topology, appAlias);
+        if (app != null) {
+        	if (log.isDebugEnabled()) {
+				log.debug("TopologyBuilder found composite app for " + appAlias);
+        	}
+        	String clusterId = instanceMaintenanceModeEvent.getClusterId();
+        	
+        	String groupAlias =  app.extractClusterGroupFromClusterId(clusterId);
+    		instanceMaintenanceModeEvent.setGroupId(groupAlias);
+    		if (log.isDebugEnabled()) {
+				log.debug("TopologyBuilder  setting groupAlias " +  groupAlias + " for instance ready shutdown event for cluster " + clusterId);
+        	}
+        }
+        
         MemberMaintenanceModeEvent memberMaintenanceModeEvent = new MemberMaintenanceModeEvent(
                                                                 instanceMaintenanceModeEvent.getServiceName(),
                                                                 instanceMaintenanceModeEvent.getClusterId(),
@@ -424,6 +520,27 @@ public class TopologyBuilder {
 					memberId));
 			return;
 		}
+		
+		//grouping 
+	      
+        if (log.isDebugEnabled()) {
+				log.debug("checking group id in ToplogyBuilder for member started event");
+		}
+       
+        CompositeApplicationBuilder builder = new CompositeApplicationBuilder();
+        String appAlias = "compositeApplicationAlias";
+        CompositeApplication app = builder.buildCompositeApplication(topology, appAlias);
+
+        String groupAlias =  null;
+        if (app != null) {
+        	if (log.isDebugEnabled()) {
+				log.debug("TopologyBuilder found composite app for " + appAlias);
+        	}
+        	groupAlias =  app.extractClusterGroupFromClusterId(clusterId);
+    		if (log.isDebugEnabled()) {
+				log.debug("TopologyBuilder  setting groupAlias " +  groupAlias + " for member terminated event for cluster " + clusterId);
+        	}
+        }
 
         try {
             TopologyManager.acquireWriteLock();
@@ -432,7 +549,7 @@ public class TopologyBuilder {
         } finally {
             TopologyManager.releaseWriteLock();
         }
-        TopologyEventPublisher.sendMemberTerminatedEvent(serviceName, clusterId, networkPartitionId, partitionId, memberId);
+        TopologyEventPublisher.sendMemberTerminatedEvent(serviceName, clusterId, networkPartitionId, partitionId, memberId, groupAlias);
     }
 
     public static void handleMemberSuspended() {
@@ -443,6 +560,230 @@ public class TopologyBuilder {
             TopologyManager.releaseWriteLock();
         }
     }
+    
+    public static void handleCompositeApplicationCreated(ConfigCompositeApplication messConfigApp) {
+        Topology topology = TopologyManager.getTopology();
+        
+        //ConfigCompositeApplication messConfigApp;
+        try {
+
+            TopologyManager.acquireWriteLock();
+            String key = "compositeApplicationAlias"; //app.getAlias()
+            topology.addConfigCompositeApplication(key ,messConfigApp);
+            TopologyManager.updateTopology(topology);	
+        } 
+        finally {
+            TopologyManager.releaseWriteLock();
+        }
+       TopologyEventPublisher.sendConfigApplicationCreatedEventEvent(messConfigApp);
+        log.info("TopolgyBuilder: sending sendConfigApplicationCreatedEventEvent ");
+
+    }
+    
+    public static void handleCompositeApplicationRemoved(String alias) {
+    	log.info("TopolgyBuilder: sending sendConfigApplicationRemovedEventEvent ");
+    	TopologyEventPublisher.sendConfigApplicationRemovedEventEvent(alias);
+    }
+    
+    
+    public static  ConfigCompositeApplication convertCompositeApplication(CompositeApplicationDefinition compositeApplicationDefinition) {
+    	ConfigCompositeApplication messApp = new ConfigCompositeApplication();
+    	String alias = compositeApplicationDefinition.getAlias();
+    	messApp.setAlias(alias);
+    	String applicationId = compositeApplicationDefinition.getApplicationId();
+    	messApp.setApplicationId(applicationId);
+    	org.apache.stratos.cloud.controller.pojo.ConfigCartridge[] arrayMessCartridges = compositeApplicationDefinition.getCartridges();
+    	org.apache.stratos.cloud.controller.pojo.ConfigGroup [] messConfigGroup = compositeApplicationDefinition.getComponents();
+    	
+    	List<ConfigCartridge> cartridges = new ArrayList<ConfigCartridge>();
+    	List<ConfigGroup> messGroups = new ArrayList<ConfigGroup>();
+    	List<ConfigDependencies.Pair> messDependencies= new ArrayList<ConfigDependencies.Pair>();
+    	
+    	for (org.apache.stratos.cloud.controller.pojo.ConfigCartridge cfg : arrayMessCartridges) {
+    		ConfigCartridge cartridge = new ConfigCartridge();
+    		cartridge.setAlias(cfg.getAlias());
+    		
+    		cartridges.add(cartridge);
+    	}
+    	messApp.setCartridges(cartridges);
+    	if (log.isDebugEnabled()) {
+    		log.debug("TopolgyBuilder:  messConfigGroup size: " + messConfigGroup.length);
+    	}
+    	for (org.apache.stratos.cloud.controller.pojo.ConfigGroup gr : messConfigGroup) {
+    		ConfigGroup group = new ConfigGroup();
+    		
+    		// alias
+    		group.setAlias(gr.getAlias());
+    		if (log.isDebugEnabled()) {
+        		log.debug("TopolgyBuilder:  messConfigGroup group alias " + gr.getAlias());
+        	}
+    		// subscribables
+    		String  [] arraySub = gr.getSubscribables();
+    		if (log.isDebugEnabled()) {
+        		log.debug("TopolgyBuilder:  messConfigGroup group nr of subscribables " + arraySub.length);
+        	}
+    		List<String> subscribables = new ArrayList<String>();
+    		if (arraySub != null) {
+    			int i = 0;
+    			for (String sub : arraySub) {
+    				subscribables.add(arraySub[i]);
+    				i++;
+    			}
+    		} else {
+    			if (log.isDebugEnabled()) {
+            		log.debug("TopolgyBuilder:  messConfigGroup group nr no subscribables is null");
+            	}
+    		}
+    		if (log.isDebugEnabled()) {
+        		log.debug("TopolgyBuilder:  adding subscribables to  group: " + group.getAlias() + 
+        				" and nr of subscribables " + subscribables.size());
+        	}
+    		group.setSubscribables(subscribables);
+    		// dependencies
+    		org.apache.stratos.cloud.controller.pojo.ConfigDependencies dep = gr.getDependencies();
+    		ConfigDependencies messDep = new ConfigDependencies();
+    		org.apache.stratos.cloud.controller.pojo.ConfigDependencyPair [] pairs = dep.getStartup_order();
+    		List<ConfigDependencies.Pair> startup_order;
+    		if (pairs != null) {
+    			log.debug("TopolgyBuilder:  number of startup pairs " + pairs.length);
+     			startup_order = new ArrayList<ConfigDependencies.Pair>(pairs.length);
+    			//for (org.apache.stratos.cloud.controller.pojo.ConfigDependencyPair pair : pairs) {
+    			for (int i = 0; i < pairs.length; i++) {
+    				org.apache.stratos.cloud.controller.pojo.ConfigDependencyPair pair = pairs[i];
+    				if (pair != null) {
+	        			ConfigDependencies.Pair messPair = new ConfigDependencies.Pair(pair.getKey(), pair.getValue());
+	        			startup_order.add(messPair);
+	        			if (log.isDebugEnabled()) {
+	                		log.debug("TopolgyBuilder:  adding dep pairs to  group: " + pair.getKey() + " / " + 
+	                						pair.getValue() + " at " + i);
+	                	}
+	    			} else {
+	    				if (log.isDebugEnabled()) {
+	                		log.debug("TopolgyBuilder: Error while adding pair, pair is null");
+	                	}
+	    			}
+        		}
+    		} else {
+    			if (log.isDebugEnabled()) {
+            		log.debug("TopolgyBuilder:  no dependencies added");
+            	}
+    			startup_order = new ArrayList<ConfigDependencies.Pair>(0);
+    		}
+    		
+    		messDep.setStartup_order(startup_order);
+    		messDep.setKill_behavior(dep.getKill_behavior());
+    		if (log.isDebugEnabled()) {
+        		log.debug("TopolgyBuilder: added kill behavior " + dep.getKill_behavior());
+        	}
+    		group.setDependencies(messDep);
+    		
+    		messGroups.add(group);
+    		if (log.isDebugEnabled()) {
+        		log.debug("TopolgyBuilder: number of groups " + messGroups.size());
+        	}
+    	}
+    	messApp.setComponents(messGroups);
+    	if (log.isDebugEnabled()) {
+    		if (messApp.getComponents() != null) {
+    			log.debug("TopolgyBuilder: added total nr of groups to application  " + messApp.getComponents().size());
+    		}
+			else {
+				log.debug("TopolgyBuilder: added total nr of groups to application  is null");
+			}
+    	}
+
+    	
+    	/* test
+    	ConfigGroup grX = new ConfigGroup();
+    	grX.setAlias("hug");
+    	List<String> subX = new ArrayList<String>();
+    	subX.add("cone");
+    	grX.setSubscribables(subX);
+    	ConfigDependencies cgX = new ConfigDependencies();
+    	cgX.setKill_behavior("kill-all");
+    	log.debug("verifying cgX object serialization : " + Util.ObjectToJson(cgX));
+    	ConfigDependencies.Pair startup_orderX = new ConfigDependencies.Pair("eins", "zwei");
+    	List<ConfigDependencies.Pair> depspairsX = new ArrayList<ConfigDependencies.Pair>();
+    	depspairsX.add(startup_orderX);
+    	log.debug("verifying depspairsX object serialization : " + Util.ObjectToJson(depspairsX));
+    	cgX.setStartup_order(depspairsX);
+    	grX.setDependencies(cgX);
+    	log.debug("verifying grX object serialization : " + Util.ObjectToJson(grX));
+    	messGroups.add(grX);
+    	messApp.setComponents(messGroups);
+    	log.debug("verifying messApp object serialization : " + Util.ObjectToJson(messApp));
+    	//
+    	test end */
+    	
+    	return messApp;
+    }
+    
+    /*
+         public boolean process(String type, String message, Object object) {
+        Topology topology = (Topology) object;
+        
+        if (log.isDebugEnabled()) {
+        	log.debug("processing application event of type " + type + 
+        			" / topology:" +  topology + " msg: " + message);
+        }
+
+        if (CompositeApplicationCreatedEvent.class.getName().equals(type)) {
+            // Return if topology has not been initialized
+            if (!topology.isInitialized()) {
+                
+            	if (log.isDebugEnabled()) {
+                	log.debug("topology is not initialized .... need to add check ... Grouping");
+                }
+            	
+            	//return false;
+            }
+
+            // Parse complete message and build event
+            CompositeApplicationCreatedEvent event = 
+            		(CompositeApplicationCreatedEvent) Util.jsonToObject(message, CompositeApplicationCreatedEvent.class);
+            
+            if (log.isDebugEnabled()) {
+            	log.debug("processing application created event with application id: " + event.getApplicationAlias());
+            }
+
+         // Validate event against the existing topology
+            if (topology.compositeApplicationExists(event.getApplicationAlias())) {
+                if (log.isWarnEnabled()) {
+                    log.warn(String.format("CompositeApplication already created: [com app] %s", event.getApplicationAlias()));
+                }
+            } else {
+            	
+            	ConfigCompositeApplication configApp = event.getCompositeApplication();
+            	CompositeApplicationBuilder builder = new CompositeApplicationBuilder(configApp);
+            	CompositeApplication app = new CompositeApplication();
+            	app.setAlias(configApp.getAlias());
+            	app.setTop_level(builder.buildApplication());
+            	String key = "compositeApplicationAlias"; //app.getAlias()
+                topology.addCompositeApplication(key ,app);
+            	
+            	if (log.isInfoEnabled()) {
+            		log.info("CompositeApplication created with alias" +app.getAlias() + " and saved with key " + "compositeApplicationAlias" );
+            		log.info(String.format("CompositeApplication created: [app] %s", app.getTop_level()));
+            		if (log.isDebugEnabled()) {
+            			log.debug("verifying CompositeApplication object serialization : " + Util.ObjectToJson(app));
+            		}
+            	}
+            }
+            
+            // Notify event listeners
+            notifyEventListeners(event);
+            return true;
+
+        } else {
+            if (nextProcessor != null) {
+                // ask the next processor to take care of the message.
+                return nextProcessor.process(type, message, topology);
+            } else {
+                throw new RuntimeException(String.format("Failed to process message using available message processors: [type] %s [body] %s", type, message));
+            }
+        }
+    }
+     */
 
 
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java
index 86237d8..d4489b4 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java
@@ -25,6 +25,7 @@ import org.apache.stratos.cloud.controller.pojo.PortMapping;
 import org.apache.stratos.messaging.broker.publish.EventPublisher;
 import org.apache.stratos.messaging.broker.publish.EventPublisherPool;
 import org.apache.stratos.messaging.domain.topology.Cluster;
+import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication;
 import org.apache.stratos.messaging.domain.topology.Port;
 import org.apache.stratos.messaging.domain.topology.ServiceType;
 import org.apache.stratos.messaging.domain.topology.Topology;
@@ -113,43 +114,62 @@ public class TopologyEventPublisher {
         MemberStartedEvent memberStartedEventTopology = new MemberStartedEvent(instanceStartedEvent.getServiceName(),
                            instanceStartedEvent.getClusterId(), instanceStartedEvent.getNetworkPartitionId(), instanceStartedEvent.getPartitionId(), instanceStartedEvent.getMemberId());
 
+     // grouping
+        memberStartedEventTopology.setGroupId(instanceStartedEvent.getGroupId());
         if(log.isInfoEnabled()) {
-            log.info(String.format("Publishing member started event: [service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s",
-                    instanceStartedEvent.getServiceName(), instanceStartedEvent.getClusterId(), instanceStartedEvent.getNetworkPartitionId(), instanceStartedEvent.getPartitionId(), instanceStartedEvent.getMemberId()));
+            log.info(" Grouping member started event - adding groupID " + instanceStartedEvent.getGroupId() + " for cluster " +
+            		instanceStartedEvent.getClusterId());
         }
+        
+        if(log.isInfoEnabled()) {
+            log.info(String.format("Publishing member started event: [service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s [groupId] %s",
+            		memberStartedEventTopology.getServiceName(), memberStartedEventTopology.getClusterId(), memberStartedEventTopology.getNetworkPartitionId(), 
+            		memberStartedEventTopology.getPartitionId(), memberStartedEventTopology.getMemberId(), memberStartedEventTopology.getGroupId()));
+        }
+        
         publishEvent(memberStartedEventTopology);
     }
 
      public static void sendMemberActivatedEvent(MemberActivatedEvent memberActivatedEvent) {
          if(log.isInfoEnabled()) {
-            log.info(String.format("Publishing member activated event: [service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s",
-                    memberActivatedEvent.getServiceName(), memberActivatedEvent.getClusterId(), memberActivatedEvent.getNetworkPartitionId(), memberActivatedEvent.getPartitionId(), memberActivatedEvent.getMemberId()));
+            log.info(String.format("Publishing member activated event: [service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s [groupId] %s",
+                    memberActivatedEvent.getServiceName(), memberActivatedEvent.getClusterId(), memberActivatedEvent.getNetworkPartitionId(), 
+                    memberActivatedEvent.getPartitionId(), memberActivatedEvent.getMemberId(), memberActivatedEvent.getGroupId()));
          }
          publishEvent(memberActivatedEvent);
     }
 
     public static void sendMemberReadyToShutdownEvent(MemberReadyToShutdownEvent memberReadyToShutdownEvent) {
          if(log.isInfoEnabled()) {
-            log.info(String.format("Publishing member Ready to shut down event: [service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s",
-                    memberReadyToShutdownEvent.getServiceName(), memberReadyToShutdownEvent.getClusterId(), memberReadyToShutdownEvent.getNetworkPartitionId(), memberReadyToShutdownEvent.getPartitionId(), memberReadyToShutdownEvent.getMemberId()));
+            log.info(String.format("Publishing member Ready to shut down event: [service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s [groupId] %s",
+                    memberReadyToShutdownEvent.getServiceName(), memberReadyToShutdownEvent.getClusterId(), memberReadyToShutdownEvent.getNetworkPartitionId(), 
+                    memberReadyToShutdownEvent.getPartitionId(), memberReadyToShutdownEvent.getMemberId(), memberReadyToShutdownEvent.getGroupId()));
          }
+         // grouping
+         memberReadyToShutdownEvent.setGroupId(memberReadyToShutdownEvent.getGroupId());
          publishEvent(memberReadyToShutdownEvent);
     }
 
     public static void sendMemberMaintenanceModeEvent(MemberMaintenanceModeEvent memberMaintenanceModeEvent) {
             if(log.isInfoEnabled()) {
-               log.info(String.format("Publishing Maintenance mode event: [service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s",
-                       memberMaintenanceModeEvent.getServiceName(), memberMaintenanceModeEvent.getClusterId(), memberMaintenanceModeEvent.getNetworkPartitionId(), memberMaintenanceModeEvent.getPartitionId(), memberMaintenanceModeEvent.getMemberId()));
+               log.info(String.format("Publishing Maintenance mode event: [service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s [groupId] %s",
+                       memberMaintenanceModeEvent.getServiceName(), memberMaintenanceModeEvent.getClusterId(), memberMaintenanceModeEvent.getNetworkPartitionId(), 
+                       memberMaintenanceModeEvent.getPartitionId(), memberMaintenanceModeEvent.getMemberId(), memberMaintenanceModeEvent.getGroupId()));
             }
+
             publishEvent(memberMaintenanceModeEvent);
        }
 
 
-    public static void sendMemberTerminatedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) {
+    public static void sendMemberTerminatedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId, String groupId) {
         MemberTerminatedEvent memberTerminatedEvent = new MemberTerminatedEvent(serviceName, clusterId, networkPartitionId, partitionId, memberId);
+        // grouping
+        memberTerminatedEvent.setGroupId(groupId);
         if(log.isInfoEnabled()) {
-            log.info(String.format("Publishing member terminated event: [service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s", serviceName, clusterId, networkPartitionId, partitionId, memberId));
+            log.info(String.format("Publishing member terminated event: [service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s [groupId] %s", serviceName, clusterId, networkPartitionId, 
+            		partitionId, memberId, groupId));
         }
+
         publishEvent(memberTerminatedEvent);
     }
 
@@ -161,6 +181,27 @@ public class TopologyEventPublisher {
         }
         publishEvent(completeTopologyEvent);
     }
+    
+    // Grouping
+    public static void sendConfigApplicationCreatedEventEvent(ConfigCompositeApplication configCompositeApplication) {
+        
+    	CompositeApplicationCreatedEvent compositeApplicationCreatedEvent = new CompositeApplicationCreatedEvent(configCompositeApplication);
+
+        if(log.isDebugEnabled()) {
+            log.debug(String.format("Publishing compositeApplicationCreatedEvent: " + compositeApplicationCreatedEvent));
+        }
+        publishEvent(compositeApplicationCreatedEvent);
+    }
+    
+	public static void sendConfigApplicationRemovedEventEvent(String alias) {
+	        
+    	CompositeApplicationRemovedEvent compositeApplicationCreatedEvent = new CompositeApplicationRemovedEvent(alias);
+
+        if(log.isDebugEnabled()) {
+            log.debug(String.format("Publishing compositeApplicationRemovedEvent: " + compositeApplicationCreatedEvent));
+        }
+        publishEvent(compositeApplicationCreatedEvent);
+	}
 
     public static void publishEvent(Event event) {
         EventPublisher eventPublisher = EventPublisherPool.getPublisher(Constants.TOPOLOGY_TOPIC);

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyManager.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyManager.java
index 9862b9a..bc07404 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyManager.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyManager.java
@@ -81,6 +81,8 @@ public class TopologyManager {
                             log.debug("Topology not found in registry, creating new");
                         }
                         topology = new Topology();
+                    } else {
+                    	topology.getConfigCompositeApplication();
                     }
                     if (log.isDebugEnabled()) {
                         log.debug("Topology initialized");

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
index 3b81dc8..b96ea28 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
@@ -142,6 +142,7 @@ public final class CloudControllerConstants {
     public static final String INSTANCE_TOPIC = "instance-status";
     // pre define a floating ip
     public static final String FLOATING_IP_PROPERTY = "floatingIp";
+    public static final String DEFAULT_FLOATING_IP_POOL = "defaultFloatingIpPool";
     
     
     /**

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
index a213adf..e770fd1 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
@@ -296,7 +296,9 @@ public class CloudControllerUtil {
         if (properties != null && properties.getProperties() != null) {
 
             for (org.apache.stratos.cloud.controller.pojo.Property property : properties.getProperties()) {
-                javaProps.put(property.getName(), property.getValue());
+                if(property.getValue() != null){
+                    javaProps.put(property.getName(), property.getValue());
+                }
             }
 
         }


[6/7] initial grouping code to develop cartridge grouping feature

Posted by me...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
index 10c9d9e..8299d0d 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
@@ -723,7 +723,7 @@ public class RestCommandLineService {
     public void subscribe(String cartridgeType, String alias, String externalRepoURL, boolean privateRepo, String username,
                           String password,String asPolicy,
                           String depPolicy, String size, boolean remoOnTermination, boolean persistanceMapping,
-                          boolean enableCommits)
+                          boolean enableCommits, String volumeId)
             throws CommandException {
         DefaultHttpClient httpClient = new DefaultHttpClient();
 
@@ -737,6 +737,7 @@ public class RestCommandLineService {
         cartridgeInfoBean.setAutoscalePolicy(null);
         cartridgeInfoBean.setDeploymentPolicy(null);
         cartridgeInfoBean.setSize(size);
+
         cartridgeInfoBean.setRemoveOnTermination(remoOnTermination);
         cartridgeInfoBean.setPersistanceRequired(persistanceMapping);
         cartridgeInfoBean.setCommitsEnabled(enableCommits);
@@ -759,6 +760,7 @@ public class RestCommandLineService {
             cartridgeInfoBean.setRemoveOnTermination(remoOnTermination);
             cartridgeInfoBean.setPersistanceRequired(persistanceMapping);
             cartridgeInfoBean.setCommitsEnabled(enableCommits);
+            cartridgeInfoBean.setVolumeId(volumeId);
             
             jsonSubscribeString = gson.toJson(cartridgeInfoBean, CartridgeInfoBean.class);
 
@@ -781,7 +783,7 @@ public class RestCommandLineService {
                 return;
             }
 
-            String  subscriptionOutputJSON=  subscriptionOutput.substring(20, subscriptionOutput.length() -1);
+            String  subscriptionOutputJSON = subscriptionOutput.substring(20, subscriptionOutput.length() -1);
             SubscriptionInfo subcriptionInfo = gson.fromJson(subscriptionOutputJSON, SubscriptionInfo.class);
 
             System.out.format("You have successfully subscribed to %s cartridge with alias %s.%n", cartridgeType, alias);

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java
index 8a888ee..7450d79 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java
@@ -246,6 +246,8 @@ public class StratosApplication extends CommandLineApplication<StratosCommandCon
 
 		// Command action
 		String action = null;
+		// Command action options
+		Option[] actionOptions = null;
 
 		String usernameInput = null;
 		String passwordInput = null;
@@ -263,6 +265,7 @@ public class StratosApplication extends CommandLineApplication<StratosCommandCon
 			CommandLine commandLine;
 			try {
 				// Must add all options. Otherwise actions cannot be performed directly by command line.
+				// This is because the parser trips over unrecognised options.
 				Options allCommandOptions = new Options();
 				for (Command<StratosCommandContext> command : commands.values()) {
 					Options commandOptions = command.getOptions();
@@ -281,6 +284,7 @@ public class StratosApplication extends CommandLineApplication<StratosCommandCon
 				
 				commandLine = parser.parse(allCommandOptions, args);
 				remainingArgs = commandLine.getArgs();
+				actionOptions = commandLine.getOptions();
 				if (remainingArgs != null && remainingArgs.length > 0) {
 					// Get command action
 					action = remainingArgs[0];
@@ -346,7 +350,7 @@ public class StratosApplication extends CommandLineApplication<StratosCommandCon
 				if (logger.isDebugEnabled()) {
 					logger.debug("Executing Action: {} {}", action, Arrays.asList(actionArgs));
 				}
-				int returnCode = command.execute(context, actionArgs);
+				int returnCode = command.execute(context, actionArgs, actionOptions);
 				if (logger.isDebugEnabled()) {
 					logger.debug("Exiting with error code {} after executing action {}", returnCode, action);
 				}
@@ -443,7 +447,7 @@ public class StratosApplication extends CommandLineApplication<StratosCommandCon
 			return CliConstants.BAD_ARGS_CODE;
 		}
 		try {
-			return command.execute(context, actionArgs);
+			return command.execute(context, actionArgs, new Option[0]);
 		} catch (CommandException e) {
 			if (logger.isErrorEnabled()) {
 				logger.error("Error executing command: " + action, e);

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/CartridgeInfoBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/CartridgeInfoBean.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/CartridgeInfoBean.java
index 58d6f66..9e23120 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/CartridgeInfoBean.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/CartridgeInfoBean.java
@@ -31,7 +31,7 @@ public class CartridgeInfoBean {
     private String autoscalePolicy;
     private String deploymentPolicy;
     private String size;
-
+    private String volumeId;
     boolean privateRepo;
     private boolean removeOnTermination;
     private boolean persistanceRequired;
@@ -140,6 +140,12 @@ public class CartridgeInfoBean {
 	public void setCommitsEnabled(boolean commitsEnabled) {
 		this.commitsEnabled = commitsEnabled;
 	}
-    
-    
+
+    public String getVolumeId() {
+        return volumeId;
+    }
+
+    public void setVolumeId(String volumeId) {
+        this.volumeId = volumeId;
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ActivateTenantCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ActivateTenantCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ActivateTenantCommand.java
index 84acbc1..49054bb 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ActivateTenantCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ActivateTenantCommand.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.cli.commands;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.stratos.cli.Command;
 import org.apache.stratos.cli.RestCommandLineService;
@@ -51,7 +52,7 @@ public class ActivateTenantCommand implements Command<StratosCommandContext> {
     }
 
     @Override
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDomainMappingCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDomainMappingCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDomainMappingCommand.java
index daafc61..bac6a3b 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDomainMappingCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDomainMappingCommand.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.cli.commands;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -51,7 +52,7 @@ public class AddDomainMappingCommand implements Command<StratosCommandContext> {
 	}
 
 	@Override
-	public int execute(StratosCommandContext context, String[] args) throws CommandException {
+	public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java
index b185f7d..a025f45 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java
@@ -29,6 +29,8 @@ import org.slf4j.LoggerFactory;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.Option;
 
+import static org.apache.stratos.cli.utils.CommandLineUtils.mergeOptionArrays;
+
 public class AddTenantCommand implements Command<StratosCommandContext> {
 
     private static final Logger logger = LoggerFactory.getLogger(AddTenantCommand.class);
@@ -87,7 +89,7 @@ public class AddTenantCommand implements Command<StratosCommandContext> {
         return null;
     }
 
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
             logger.debug("Executing {} command...", getName());
         }
@@ -105,46 +107,48 @@ public class AddTenantCommand implements Command<StratosCommandContext> {
 
             try {
                 commandLine = parser.parse(options, args);
+                //merge newly discovered options with previously discovered ones.
+                Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
 
                 if (logger.isDebugEnabled()) {
                     logger.debug("Add tenant");
                 }
 
-                if (commandLine.hasOption(CliConstants.USERNAME_OPTION)) {
+                if (opts.hasOption(CliConstants.USERNAME_OPTION)) {
                     if (logger.isTraceEnabled()) {
                         logger.trace("Username option is passed");
                     }
-                    admin = commandLine.getOptionValue(CliConstants.USERNAME_OPTION);
+                    admin = opts.getOption(CliConstants.USERNAME_OPTION).getValue();
                 }
-                if (commandLine.hasOption(CliConstants.FIRST_NAME_OPTION)) {
+                if (opts.hasOption(CliConstants.FIRST_NAME_OPTION)) {
                     if (logger.isTraceEnabled()) {
                         logger.trace("First name option is passed");
                     }
-                    firstName = commandLine.getOptionValue(CliConstants.FIRST_NAME_OPTION);
+                    firstName = opts.getOption(CliConstants.FIRST_NAME_OPTION).getValue();
                 }
-                if (commandLine.hasOption(CliConstants.LAST_NAME_OPTION)) {
+                if (opts.hasOption(CliConstants.LAST_NAME_OPTION)) {
                     if (logger.isTraceEnabled()) {
                         logger.trace("Last name option is passed");
                     }
-                    lastaName = commandLine.getOptionValue(CliConstants.LAST_NAME_OPTION);
+                    lastaName = opts.getOption(CliConstants.LAST_NAME_OPTION).getValue();
                 }
-                if (commandLine.hasOption(CliConstants.PASSWORD_OPTION)) {
+                if (opts.hasOption(CliConstants.PASSWORD_OPTION)) {
                     if (logger.isTraceEnabled()) {
                         logger.trace("Password option is passed");
                     }
-                    password = commandLine.getOptionValue(CliConstants.PASSWORD_OPTION);
+                    password = opts.getOption(CliConstants.PASSWORD_OPTION).getValue();
                 }
-                if (commandLine.hasOption(CliConstants.DOMAIN_NAME_OPTION)) {
+                if (opts.hasOption(CliConstants.DOMAIN_NAME_OPTION)) {
                     if (logger.isTraceEnabled()) {
                         logger.trace("Domain name option is passed");
                     }
-                    domain = commandLine.getOptionValue(CliConstants.DOMAIN_NAME_OPTION);
+                    domain = opts.getOption(CliConstants.DOMAIN_NAME_OPTION).getValue();
                 }
-                if (commandLine.hasOption(CliConstants.EMAIL_OPTION)) {
+                if (opts.hasOption(CliConstants.EMAIL_OPTION)) {
                     if (logger.isTraceEnabled()) {
                         logger.trace("Email option is passed");
                     }
-                    email = commandLine.getOptionValue(CliConstants.EMAIL_OPTION);
+                    email = opts.getOption(CliConstants.EMAIL_OPTION).getValue();
 
                 }
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AutoscalePolicyCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AutoscalePolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AutoscalePolicyCommand.java
index 9c3b4ba..41c0cc1 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AutoscalePolicyCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AutoscalePolicyCommand.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.cli.commands;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.stratos.cli.Command;
 import org.apache.stratos.cli.RestCommandLineService;
@@ -46,7 +47,7 @@ public class AutoscalePolicyCommand implements Command<StratosCommandContext> {
         return null;
     }
 
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
             logger.debug("Executing {} command...", getName());
         }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AutoscalingPolicyDeploymentCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AutoscalingPolicyDeploymentCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AutoscalingPolicyDeploymentCommand.java
index ae44391..3dcefe7 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AutoscalingPolicyDeploymentCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AutoscalingPolicyDeploymentCommand.java
@@ -30,6 +30,8 @@ import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
 
+import static org.apache.stratos.cli.utils.CommandLineUtils.mergeOptionArrays;
+
 public class AutoscalingPolicyDeploymentCommand implements Command<StratosCommandContext> {
 
     private static final Logger logger = LoggerFactory.getLogger(AutoscalingPolicyDeploymentCommand.class);
@@ -63,7 +65,7 @@ public class AutoscalingPolicyDeploymentCommand implements Command<StratosComman
         return null;
     }
 
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
             logger.debug("Executing {} command...", getName());
         }
@@ -77,16 +79,18 @@ public class AutoscalingPolicyDeploymentCommand implements Command<StratosComman
 
             try {
                 commandLine = parser.parse(options, args);
+                //merge newly discovered options with previously discovered ones.
+                Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
 
                 if (logger.isDebugEnabled()) {
                     logger.debug("Autoscaling policy deployment");
                 }
 
-                if (commandLine.hasOption(CliConstants.RESOURCE_PATH)) {
+                if (opts.hasOption(CliConstants.RESOURCE_PATH)) {
                     if (logger.isTraceEnabled()) {
                         logger.trace("Resource path option is passed");
                     }
-                    resourcePath = commandLine.getOptionValue(CliConstants.RESOURCE_PATH);
+                    resourcePath = opts.getOption(CliConstants.RESOURCE_PATH).getValue();
                     autoscalingPolicyDeployment = readResource(resourcePath);
                 }
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgeDeploymentCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgeDeploymentCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgeDeploymentCommand.java
index e60461c..474ddaf 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgeDeploymentCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgeDeploymentCommand.java
@@ -30,6 +30,8 @@ import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
 
+import static org.apache.stratos.cli.utils.CommandLineUtils.mergeOptionArrays;
+
 public class CartridgeDeploymentCommand implements Command<StratosCommandContext> {
 
     private static final Logger logger = LoggerFactory.getLogger(CartridgeDeploymentCommand.class);
@@ -63,7 +65,7 @@ public class CartridgeDeploymentCommand implements Command<StratosCommandContext
         return null;
     }
 
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
             logger.debug("Executing {} command...", getName());
         }
@@ -77,16 +79,18 @@ public class CartridgeDeploymentCommand implements Command<StratosCommandContext
 
             try {
                 commandLine = parser.parse(options, args);
+                //merge newly discovered options with previously discovered ones.
+                Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
 
                 if (logger.isDebugEnabled()) {
                     logger.debug("Cartridge deployment");
                 }
 
-                if (commandLine.hasOption(CliConstants.RESOURCE_PATH)) {
+                if (opts.hasOption(CliConstants.RESOURCE_PATH)) {
                     if (logger.isTraceEnabled()) {
                         logger.trace("Resource path option is passed");
                     }
-                    resourcePath = commandLine.getOptionValue(CliConstants.RESOURCE_PATH);
+                    resourcePath = opts.getOption(CliConstants.RESOURCE_PATH).getValue();
                     cartridgeDeploymentJSON = readResource(resourcePath);
                 }
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeactivateTenantCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeactivateTenantCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeactivateTenantCommand.java
index 83adf1f..19c9ba8 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeactivateTenantCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeactivateTenantCommand.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.cli.commands;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.stratos.cli.Command;
 import org.apache.stratos.cli.RestCommandLineService;
@@ -51,7 +52,7 @@ public class DeactivateTenantCommand implements Command<StratosCommandContext> {
     }
 
     @Override
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteTenantCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteTenantCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteTenantCommand.java
index 50b4a85..5a5bc98 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteTenantCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteTenantCommand.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.cli.commands;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.stratos.cli.Command;
 import org.apache.stratos.cli.RestCommandLineService;
@@ -51,7 +52,7 @@ public class DeleteTenantCommand implements Command<StratosCommandContext> {
     }
 
     @Override
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeployServiceDeploymentCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeployServiceDeploymentCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeployServiceDeploymentCommand.java
index 95d9647..e62c9c7 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeployServiceDeploymentCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeployServiceDeploymentCommand.java
@@ -31,6 +31,8 @@ import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
 
+import static org.apache.stratos.cli.utils.CommandLineUtils.mergeOptionArrays;
+
 public class DeployServiceDeploymentCommand implements Command<StratosCommandContext> {
 
     private static final Logger logger = LoggerFactory.getLogger(DeployServiceDeploymentCommand.class);
@@ -64,7 +66,7 @@ public class DeployServiceDeploymentCommand implements Command<StratosCommandCon
         return null;
     }
 
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
             logger.debug("Executing {} command...", getName());
         }
@@ -78,16 +80,18 @@ public class DeployServiceDeploymentCommand implements Command<StratosCommandCon
 
             try {
                 commandLine = parser.parse(options, args);
+                //merge newly discovered options with previously discovered ones.
+                Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
 
                 if (logger.isDebugEnabled()) {
                     logger.debug("Deploy Service Deployment");
                 }
 
-                if (commandLine.hasOption(CliConstants.RESOURCE_PATH)) {
+                if (opts.hasOption(CliConstants.RESOURCE_PATH)) {
                     if (logger.isTraceEnabled()) {
                         logger.trace("Resource path option is passed");
                     }
-                    resourcePath = commandLine.getOptionValue(CliConstants.RESOURCE_PATH);
+                    resourcePath = opts.getOption(CliConstants.RESOURCE_PATH).getValue();
                     deployServiceDeployment = readResource(resourcePath);
                 }
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeploymentPolicyCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeploymentPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeploymentPolicyCommand.java
index 1072029..a376ee4 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeploymentPolicyCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeploymentPolicyCommand.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.cli.commands;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.stratos.cli.Command;
 import org.apache.stratos.cli.RestCommandLineService;
@@ -46,7 +47,7 @@ public class DeploymentPolicyCommand implements Command<StratosCommandContext> {
         return null;
     }
 
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
             logger.debug("Executing {} command...", getName());
         }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeploymentPolicyDeploymentCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeploymentPolicyDeploymentCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeploymentPolicyDeploymentCommand.java
index 75fe52a..0183436 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeploymentPolicyDeploymentCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeploymentPolicyDeploymentCommand.java
@@ -30,6 +30,8 @@ import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
 
+import static org.apache.stratos.cli.utils.CommandLineUtils.mergeOptionArrays;
+
 public class DeploymentPolicyDeploymentCommand implements Command<StratosCommandContext> {
 
     private static final Logger logger = LoggerFactory.getLogger(DeploymentPolicyDeploymentCommand.class);
@@ -63,7 +65,7 @@ public class DeploymentPolicyDeploymentCommand implements Command<StratosCommand
         return null;
     }
 
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
             logger.debug("Executing {} command...", getName());
         }
@@ -77,16 +79,18 @@ public class DeploymentPolicyDeploymentCommand implements Command<StratosCommand
 
             try {
                 commandLine = parser.parse(options, args);
+                //merge newly discovered options with previously discovered ones.
+                Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
 
                 if (logger.isDebugEnabled()) {
                     logger.debug("Deployment policy deployment");
                 }
 
-                if (commandLine.hasOption(CliConstants.RESOURCE_PATH)) {
+                if (opts.hasOption(CliConstants.RESOURCE_PATH)) {
                     if (logger.isTraceEnabled()) {
                         logger.trace("Resource path option is passed");
                     }
-                    resourcePath = commandLine.getOptionValue(CliConstants.RESOURCE_PATH);
+                    resourcePath = opts.getOption(CliConstants.RESOURCE_PATH).getValue();
                     deploymentPolicyDeployment = readResource(resourcePath);
                 }
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeAutoScalingPolicyCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeAutoScalingPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeAutoScalingPolicyCommand.java
index 195b417..22173b3 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeAutoScalingPolicyCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeAutoScalingPolicyCommand.java
@@ -51,7 +51,7 @@ public class DescribeAutoScalingPolicyCommand implements Command<StratosCommandC
     }
 
     @Override
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeCommand.java
index 3ae2b42..f6bbff5 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeCommand.java
@@ -51,7 +51,7 @@ public class DescribeCartridgeCommand implements Command<StratosCommandContext>
     }
 
     @Override
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java
index ce31127..21c3370 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java
@@ -51,7 +51,7 @@ public class DescribeDeploymentPolicyCommand implements Command<StratosCommandCo
     }
 
     @Override
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribePartitionCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribePartitionCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribePartitionCommand.java
index 950a957..ee79aec 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribePartitionCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribePartitionCommand.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.cli.commands;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.stratos.cli.Command;
 import org.apache.stratos.cli.RestCommandLineService;
@@ -51,7 +52,7 @@ public class DescribePartitionCommand implements Command<StratosCommandContext>
     }
 
     @Override
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ExitCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ExitCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ExitCommand.java
index 1dbd7d4..65e91e5 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ExitCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ExitCommand.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.cli.commands;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
     import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,11 +27,6 @@ import org.apache.stratos.cli.StratosCommandContext;
 import org.apache.stratos.cli.exception.CommandException;
 import org.apache.stratos.cli.utils.CliConstants;
 
-import java.io.File;
-
-import static org.apache.stratos.cli.utils.CliConstants.STRATOS_DIR;
-import static org.apache.stratos.cli.utils.CliConstants.STRATOS_HISTORY_DIR;
-
 public class ExitCommand implements Command<StratosCommandContext> {
 
 	private static final Logger logger = LoggerFactory.getLogger(ExitCommand.class);
@@ -54,7 +50,7 @@ public class ExitCommand implements Command<StratosCommandContext> {
 	}
 
 	@Override
-	public int execute(StratosCommandContext context, String[] args) throws CommandException {
+	public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
 		// Nothing to execute here. This is a special command.
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/HelpCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/HelpCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/HelpCommand.java
index 0593b4e..17e135d 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/HelpCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/HelpCommand.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.cli.commands;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,7 +50,7 @@ public class HelpCommand implements Command<StratosCommandContext> {
 	}
 
 	@Override
-	public int execute(StratosCommandContext context, String[] args) throws CommandException {
+	public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/InfoCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/InfoCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/InfoCommand.java
index d3c071a..07cbfa4 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/InfoCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/InfoCommand.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.cli.commands;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,7 +51,7 @@ public class InfoCommand implements Command<StratosCommandContext> {
 	}
 
 	@Override
-	public int execute(StratosCommandContext context, String[] args) throws CommandException {
+	public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListAllTenants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListAllTenants.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListAllTenants.java
index f9f7e09..9a00357 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListAllTenants.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListAllTenants.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.cli.commands;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.stratos.cli.Command;
 import org.apache.stratos.cli.RestCommandLineService;
@@ -46,7 +47,7 @@ public class ListAllTenants implements Command<StratosCommandContext> {
         return null;
     }
 
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
             logger.debug("Executing {} command...", getName());
         }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesCommand.java
index 3874d41..412bfa6 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesCommand.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.cli.commands;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.stratos.cli.RestCommandLineService;
 import org.slf4j.Logger;
@@ -46,7 +47,7 @@ public class ListCartridgesCommand implements Command<StratosCommandContext> {
 		return null;
 	}
 
-	public int execute(StratosCommandContext context, String[] args) throws CommandException {
+	public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListDeployServiceCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListDeployServiceCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListDeployServiceCommand.java
index 7580c56..af97c22 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListDeployServiceCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListDeployServiceCommand.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.cli.commands;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.stratos.cli.Command;
 import org.apache.stratos.cli.RestCommandLineService;
@@ -46,7 +47,7 @@ public class ListDeployServiceCommand implements Command<StratosCommandContext>
         return null;
     }
 
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
             logger.debug("Executing {} command...", getName());
         }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListMemberCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListMemberCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListMemberCommand.java
index 4ce5ac7..28cbf48 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListMemberCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListMemberCommand.java
@@ -27,6 +27,8 @@ import org.apache.stratos.cli.utils.CliConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.stratos.cli.utils.CommandLineUtils.mergeOptionArrays;
+
 public class ListMemberCommand implements Command<StratosCommandContext> {
     private static final Logger logger = LoggerFactory.getLogger(ListMemberCommand.class);
 
@@ -78,7 +80,7 @@ public class ListMemberCommand implements Command<StratosCommandContext> {
     }
 
     @Override
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}
@@ -90,21 +92,23 @@ public class ListMemberCommand implements Command<StratosCommandContext> {
 			CommandLine commandLine;
 			try {
 				commandLine = parser.parse(options, args);
+				//merge newly discovered options with previously discovered ones.
+				Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
 				if (logger.isDebugEnabled()) {
 					logger.debug("Subscribing to {} cartridge with alias {}", type, alias);
 				}
 
-                if (commandLine.hasOption(CliConstants.CARTRIDGE_TYPE_OPTION)) {
+                if (opts.hasOption(CliConstants.CARTRIDGE_TYPE_OPTION)) {
                     if (logger.isTraceEnabled()) {
                         logger.trace("Autoscaling policy option is passed");
                     }
-                    type = commandLine.getOptionValue(CliConstants.CARTRIDGE_TYPE_OPTION);
+                    type = opts.getOption(CliConstants.CARTRIDGE_TYPE_OPTION).getValue();
                 }
-                if (commandLine.hasOption(CliConstants.ALIAS_OPTION)) {
+                if (opts.hasOption(CliConstants.ALIAS_OPTION)) {
                     if (logger.isTraceEnabled()) {
                         logger.trace("Deployment policy option is passed");
                     }
-                    alias = commandLine.getOptionValue(CliConstants.ALIAS_OPTION);
+                    alias = opts.getOption(CliConstants.ALIAS_OPTION).getValue();
                 }
 
                 if (type == null) {

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListSubscribedCartridgesCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListSubscribedCartridgesCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListSubscribedCartridgesCommand.java
index 080a72c..57adcce 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListSubscribedCartridgesCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListSubscribedCartridgesCommand.java
@@ -32,6 +32,8 @@ import org.apache.stratos.cli.StratosCommandContext;
 import org.apache.stratos.cli.exception.CommandException;
 import org.apache.stratos.cli.utils.CliConstants;
 
+import static org.apache.stratos.cli.utils.CommandLineUtils.mergeOptionArrays;
+
 public class ListSubscribedCartridgesCommand implements Command<StratosCommandContext> {
 
 	private static final Logger logger = LoggerFactory.getLogger(ListSubscribedCartridgesCommand.class);
@@ -67,7 +69,7 @@ public class ListSubscribedCartridgesCommand implements Command<StratosCommandCo
 		return null;
 	}
 
-	public int execute(StratosCommandContext context, String[] args) throws CommandException {
+	public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}
@@ -83,12 +85,15 @@ public class ListSubscribedCartridgesCommand implements Command<StratosCommandCo
 			try {
 				commandLine = parser.parse(options, args);
 				remainingArgs = commandLine.getArgs();
+				//merge newly discovered options with previously discovered ones.
+				Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
+
 				if (!(remainingArgs == null || remainingArgs.length == 0)) {
 					context.getStratosApplication().printUsage(getName());
 					return CliConstants.BAD_ARGS_CODE;
 				}
 
-				if (commandLine.hasOption(CliConstants.FULL_OPTION)) {
+				if (opts.hasOption(CliConstants.FULL_OPTION)) {
 					if (logger.isTraceEnabled()) {
 						logger.trace("Full option is passed");
 					}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PartitionCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PartitionCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PartitionCommand.java
index 4e5f4a8..ad856e2 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PartitionCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PartitionCommand.java
@@ -46,7 +46,7 @@ public class PartitionCommand implements Command<StratosCommandContext> {
         return null;
     }
 
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
             logger.debug("Executing {} command...", getName());
         }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PartitionDeploymentCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PartitionDeploymentCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PartitionDeploymentCommand.java
index b1e5989..b973536 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PartitionDeploymentCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PartitionDeploymentCommand.java
@@ -30,6 +30,8 @@ import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
 
+import static org.apache.stratos.cli.utils.CommandLineUtils.mergeOptionArrays;
+
 public class PartitionDeploymentCommand implements Command<StratosCommandContext> {
 
     private static final Logger logger = LoggerFactory.getLogger(PartitionDeploymentCommand.class);
@@ -63,7 +65,7 @@ public class PartitionDeploymentCommand implements Command<StratosCommandContext
         return null;
     }
 
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
             logger.debug("Executing {} command...", getName());
         }
@@ -77,16 +79,18 @@ public class PartitionDeploymentCommand implements Command<StratosCommandContext
 
             try {
                 commandLine = parser.parse(options, args);
+                //merge newly discovered options with previously discovered ones.
+                Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
 
                 if (logger.isDebugEnabled()) {
                     logger.debug("Partition deployment");
                 }
 
-                if (commandLine.hasOption(CliConstants.RESOURCE_PATH)) {
+                if (opts.hasOption(CliConstants.RESOURCE_PATH)) {
                     if (logger.isTraceEnabled()) {
                         logger.trace("Resource path option is passed");
                     }
-                    resourcePath = commandLine.getOptionValue(CliConstants.RESOURCE_PATH);
+                    resourcePath = opts.getOption(CliConstants.RESOURCE_PATH).getValue();
                     partionDeployment = readResource(resourcePath);
                 }
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PoliciesCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PoliciesCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PoliciesCommand.java
index b63f400..305440e 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PoliciesCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PoliciesCommand.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.cli.commands;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,7 +51,7 @@ public class PoliciesCommand implements Command<StratosCommandContext> {
 	}
 
 	@Override
-	public int execute(StratosCommandContext context, String[] args) throws CommandException {
+	public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java
index 06e6b11..74aed7d 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.cli.commands;
 
+import org.apache.commons.cli.Option;
 import org.apache.stratos.cli.Command;
 import org.apache.stratos.cli.CommandLineService;
 import org.apache.stratos.cli.StratosCommandContext;
@@ -50,7 +51,7 @@ public class RemoveDomainMappingCommand implements Command<StratosCommandContext
 	}
 
 	@Override
-	public int execute(StratosCommandContext context, String[] args) throws CommandException {
+	public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribeCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribeCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribeCommand.java
index 6479a06..6232893 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribeCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribeCommand.java
@@ -33,6 +33,8 @@ import org.apache.stratos.cli.StratosCommandContext;
 import org.apache.stratos.cli.exception.CommandException;
 import org.apache.stratos.cli.utils.CliConstants;
 
+import static org.apache.stratos.cli.utils.CommandLineUtils.mergeOptionArrays;
+
 public class SubscribeCommand implements Command<StratosCommandContext> {
 
 	private static final Logger logger = LoggerFactory.getLogger(ListSubscribedCartridgesCommand.class);
@@ -75,6 +77,10 @@ public class SubscribeCommand implements Command<StratosCommandContext> {
         size.setArgName("volume-size");
         options.addOption(size);
 
+        Option volumeId = new Option(CliConstants.VOLUME_ID_OPTION, CliConstants.VOLUME_ID_LONG_OPTION, true, "Volume-id");
+        volumeId.setArgName("volume-id");
+        options.addOption(volumeId);
+
         Option persistance = new Option(CliConstants.PERSISTANCE_VOLUME_OPTION, CliConstants.PERSISTANCE_VOLUME_LONG_OPTION,
                 true, "Persistance-volume");
         persistance.setArgName("persistance-volume");
@@ -120,7 +126,7 @@ public class SubscribeCommand implements Command<StratosCommandContext> {
 		return "[Cartridge type] [Cartridge alias]";
 	}
 
-	public int execute(StratosCommandContext context, String[] args) throws CommandException {
+	public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}
@@ -133,6 +139,7 @@ public class SubscribeCommand implements Command<StratosCommandContext> {
             String depPolicy = null;
 			String repoURL = null, username = "", password = "";
             String size = null;
+            String volumeID = null;
 
             boolean removeOnTermination = false;
 			boolean privateRepo = false;
@@ -144,6 +151,8 @@ public class SubscribeCommand implements Command<StratosCommandContext> {
 			try {
 				commandLine = parser.parse(options, args);
 				remainingArgs = commandLine.getArgs();
+				//merge newly discovered options with previously discovered ones.
+				Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
 				if (remainingArgs != null && remainingArgs.length == 2) {
 					// Get type
 					type = remainingArgs[0];
@@ -157,70 +166,80 @@ public class SubscribeCommand implements Command<StratosCommandContext> {
 					logger.debug("Subscribing to {} cartridge with alias {}", type, alias);
 				}
 
-				//if (commandLine.hasOption(CliConstants.POLICY_OPTION)) {
+				//if (opts.hasOption(CliConstants.POLICY_OPTION)) {
 				//	if (logger.isTraceEnabled()) {
 				//		logger.trace("Policy option is passed");
 				//	}
-				//	policy = commandLine.getOptionValue(CliConstants.POLICY_OPTION);
+				//	policy = opts.getOptionValue(CliConstants.POLICY_OPTION);
 				//}
-                if (commandLine.hasOption(CliConstants.AUTOSCALING_POLICY_OPTION)) {
+                if (opts.hasOption(CliConstants.AUTOSCALING_POLICY_OPTION)) {
                     if (logger.isTraceEnabled()) {
                         logger.trace("Autoscaling policy option is passed");
                     }
-                    asPolicy = commandLine.getOptionValue(CliConstants.AUTOSCALING_POLICY_OPTION);
+                    asPolicy = opts.getOption(CliConstants.AUTOSCALING_POLICY_OPTION).getValue();
                 }
-                if (commandLine.hasOption(CliConstants.DEPLOYMENT_POLICY_OPTION)) {
+                if (opts.hasOption(CliConstants.DEPLOYMENT_POLICY_OPTION)) {
                     if (logger.isTraceEnabled()) {
                         logger.trace("Deployment policy option is passed");
                     }
-                    depPolicy = commandLine.getOptionValue(CliConstants.DEPLOYMENT_POLICY_OPTION);
+                    depPolicy = opts.getOption(CliConstants.DEPLOYMENT_POLICY_OPTION).getValue();
                 }
-				if (commandLine.hasOption(CliConstants.REPO_URL_OPTION)) {
+				if (opts.hasOption(CliConstants.REPO_URL_OPTION)) {
 					if (logger.isTraceEnabled()) {
 						logger.trace("RepoURL option is passed");
 					}
-					repoURL = commandLine.getOptionValue(CliConstants.REPO_URL_OPTION);
+					repoURL = opts.getOption(CliConstants.REPO_URL_OPTION).getValue();
 				}
-				//if (commandLine.hasOption(CliConstants.PRIVATE_REPO_OPTION)) {
+				//if (opts.hasOption(CliConstants.PRIVATE_REPO_OPTION)) {
 				//	if (logger.isTraceEnabled()) {
 				//		logger.trace("privateRepo option is passed");
 				//	}
 				//	privateRepo = true;
 				//}
-                if (commandLine.hasOption(CliConstants.VOLUME_SIZE_OPTION)) {
+                if (opts.hasOption(CliConstants.VOLUME_SIZE_OPTION)) {
                     if (logger.isTraceEnabled()) {
                         logger.trace("Volume size option is passed");
 
                     }
-                    size = commandLine.getOptionValue(CliConstants.VOLUME_SIZE_OPTION);
+                    size = opts.getOption(CliConstants.VOLUME_SIZE_OPTION).getValue();
                 }
-                if (commandLine.hasOption(CliConstants.REMOVE_ON_TERMINATION_OPTION)) {
+
+                if (opts.hasOption(CliConstants.VOLUME_ID_OPTION)) {
+                    if (logger.isTraceEnabled()) {
+                        logger.trace("Volume id option is passed");
+
+                    }
+                    volumeID = opts.getOption(CliConstants.VOLUME_ID_OPTION).getValue();
+                }
+
+
+                if (opts.hasOption(CliConstants.REMOVE_ON_TERMINATION_OPTION)) {
                     if (logger.isTraceEnabled()) {
                         logger.trace("Remove on termination option is passed");
 
                     }
                     removeOnTermination = true;
                 }
-                if (commandLine.hasOption(CliConstants.PERSISTANCE_VOLUME_OPTION)) {
+                if (opts.hasOption(CliConstants.PERSISTANCE_VOLUME_OPTION)) {
                     if (logger.isTraceEnabled()) {
                         logger.trace("Persistance volume option is passed");
 
                     }
                     persistanceMapping = true;
                 }
-				if (commandLine.hasOption(CliConstants.USERNAME_OPTION)) {
+				if (opts.hasOption(CliConstants.USERNAME_OPTION)) {
 					if (logger.isTraceEnabled()) {
 						logger.trace("Username option is passed");
 					}
-					username = commandLine.getOptionValue(CliConstants.USERNAME_OPTION);
+					username = opts.getOption(CliConstants.USERNAME_OPTION).getValue();
 				}
-				if (commandLine.hasOption(CliConstants.PASSWORD_OPTION)) {
+				if (opts.hasOption(CliConstants.PASSWORD_OPTION)) {
 					if (logger.isTraceEnabled()) {
 						logger.trace("Password option is passed");
 					}
-					password = commandLine.getOptionValue(CliConstants.PASSWORD_OPTION);
+					password = opts.getOption(CliConstants.PASSWORD_OPTION).getValue();
 				}
-				if (commandLine.hasOption(CliConstants.ENABLE_COMMITS_OPTION)) {
+				if (opts.hasOption(CliConstants.ENABLE_COMMITS_OPTION)) {
 					if (logger.isTraceEnabled()) {
 						logger.trace("Upstream git commits are enabled");
 					}
@@ -251,7 +270,7 @@ public class SubscribeCommand implements Command<StratosCommandContext> {
 
                 RestCommandLineService.getInstance().subscribe(type, alias, repoURL, privateRepo, username,
                 		password, asPolicy, depPolicy, size, removeOnTermination,
-                        persistanceMapping, commitsEnabled);
+                        persistanceMapping, commitsEnabled, volumeID);
 
 				return CliConstants.SUCCESSFUL_CODE;
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribedCartridgeInfoCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribedCartridgeInfoCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribedCartridgeInfoCommand.java
index cc002a3..2762b25 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribedCartridgeInfoCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribedCartridgeInfoCommand.java
@@ -18,12 +18,8 @@
  */
 package org.apache.stratos.cli.commands;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.GnuParser;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.stratos.cli.Command;
 import org.apache.stratos.cli.RestCommandLineService;
@@ -76,7 +72,7 @@ public class SubscribedCartridgeInfoCommand implements Command<StratosCommandCon
 	}
 
 	@Override
-	public int execute(StratosCommandContext context, String[] args) throws CommandException {
+	public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SyncCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SyncCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SyncCommand.java
index f866813..29c146f 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SyncCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SyncCommand.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.cli.commands;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.stratos.cli.Command;
 import org.apache.stratos.cli.RestCommandLineService;
@@ -50,7 +51,7 @@ public class SyncCommand implements Command<StratosCommandContext> {
 	}
 
 	@Override
-	public int execute(StratosCommandContext context, String[] args) throws CommandException {
+	public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UndeployCartridgeDefinitionCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UndeployCartridgeDefinitionCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UndeployCartridgeDefinitionCommand.java
index 52f2a9a..e69880b 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UndeployCartridgeDefinitionCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UndeployCartridgeDefinitionCommand.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.cli.commands;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.stratos.cli.Command;
 import org.apache.stratos.cli.RestCommandLineService;
@@ -51,7 +52,7 @@ public class UndeployCartridgeDefinitionCommand implements Command<StratosComman
     }
 
     @Override
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UndeployServiceDefinitionCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UndeployServiceDefinitionCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UndeployServiceDefinitionCommand.java
index c830052..7c05a8f 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UndeployServiceDefinitionCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UndeployServiceDefinitionCommand.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.cli.commands;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.stratos.cli.Command;
 import org.apache.stratos.cli.RestCommandLineService;
@@ -51,7 +52,7 @@ public class UndeployServiceDefinitionCommand implements Command<StratosCommandC
     }
 
     @Override
-    public int execute(StratosCommandContext context, String[] args) throws CommandException {
+    public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
         if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UnsubscribeCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UnsubscribeCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UnsubscribeCommand.java
index e63c799..20f3676 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UnsubscribeCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UnsubscribeCommand.java
@@ -32,6 +32,8 @@ import org.apache.stratos.cli.StratosCommandContext;
 import org.apache.stratos.cli.exception.CommandException;
 import org.apache.stratos.cli.utils.CliConstants;
 
+import static org.apache.stratos.cli.utils.CommandLineUtils.mergeOptionArrays;
+
 public class UnsubscribeCommand implements Command<StratosCommandContext> {
 
 	private static final Logger logger = LoggerFactory.getLogger(UnsubscribeCommand.class);
@@ -71,7 +73,7 @@ public class UnsubscribeCommand implements Command<StratosCommandContext> {
 	}
 
 	@Override
-	public int execute(StratosCommandContext context, String[] args) throws CommandException {
+	public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing {} command...", getName());
 		}
@@ -84,6 +86,9 @@ public class UnsubscribeCommand implements Command<StratosCommandContext> {
 			try {
 				commandLine = parser.parse(options, args);
 				remainingArgs = commandLine.getArgs();
+				//merge newly discovered options with previously discovered ones.
+				Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
+
 				if (remainingArgs != null && remainingArgs.length == 1) {
 					// Get alias
 					alias = remainingArgs[0];
@@ -95,7 +100,7 @@ public class UnsubscribeCommand implements Command<StratosCommandContext> {
 					return CliConstants.BAD_ARGS_CODE;
 				}
 
-				if (commandLine.hasOption(CliConstants.FORCE_OPTION)) {
+				if (opts.hasOption(CliConstants.FORCE_OPTION)) {
 					if (logger.isTraceEnabled()) {
 						logger.trace("Force option is passed");
 					}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CliConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CliConstants.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CliConstants.java
index 0f6a901..2e898f4 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CliConstants.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CliConstants.java
@@ -224,6 +224,9 @@ public class CliConstants {
     public static final String VOLUME_SIZE_OPTION = "v";
     public static final String VOLUME_SIZE_LONG_OPTION = "volume-size";
 
+    public static final String VOLUME_ID_OPTION = "vi";
+    public static final String VOLUME_ID_LONG_OPTION = "volume-id";
+
     public static final String PERSISTANCE_VOLUME_OPTION = "pv";
     public static final String PERSISTANCE_VOLUME_LONG_OPTION = "persistance-volume";
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CommandLineUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CommandLineUtils.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CommandLineUtils.java
index 91e2251..d9747df 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CommandLineUtils.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CommandLineUtils.java
@@ -18,6 +18,9 @@
  */
 package org.apache.stratos.cli.utils;
 
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 
@@ -91,4 +94,15 @@ public class CommandLineUtils {
 		}
 		return message;
 	}
+
+    public static Options mergeOptionArrays(Option[] a, Option[] b) {
+        Options opts = new Options();
+        for (Option o: a) {
+            opts.addOption(o);
+        }
+        for (Option o: b) {
+            opts.addOption(o);
+        }
+        return opts;
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cli/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/resources/log4j.properties b/components/org.apache.stratos.cli/src/main/resources/log4j.properties
index c5d2084..15304ee 100644
--- a/components/org.apache.stratos.cli/src/main/resources/log4j.properties
+++ b/components/org.apache.stratos.cli/src/main/resources/log4j.properties
@@ -33,4 +33,4 @@ log4j.appender.file.layout.conversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p %c
 
 #Loggers
 log4j.rootLogger=info, file
-log4j.logger.org.wso2.carbon.adc.mgt.cli=info
+log4j.logger.org.wso2.carbon.adc.mgt.cli=DEBUG

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCompositeApplicationDefinitionException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCompositeApplicationDefinitionException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCompositeApplicationDefinitionException.java
new file mode 100644
index 0000000..a7c2bb6
--- /dev/null
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCompositeApplicationDefinitionException.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one 
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 
+ * KIND, either express or implied.  See the License for the 
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.stratos.cloud.controller.exception;
+
+public class InvalidCompositeApplicationDefinitionException extends Exception {
+    
+    private static final long serialVersionUID = -1L;
+    private String message;
+    
+    public InvalidCompositeApplicationDefinitionException(String msg) {
+        super(msg);
+        this.setMessage(msg);
+    }
+    
+    public InvalidCompositeApplicationDefinitionException(String msg, Exception ex) {
+        super(msg, ex);
+        this.setMessage(msg);
+    }
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java
index eafbade..e4d5477 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java
@@ -22,6 +22,7 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.cloud.controller.exception.CloudControllerException;
@@ -457,7 +458,7 @@ public class AWSEC2Iaas extends Iaas {
     }
 
 	@Override
-	public String createVolume(int sizeGB) {
+	public String createVolume(int sizeGB, String snapshotId) {
 		IaasProvider iaasInfo = getIaasProvider();
 
 		ComputeServiceContext context = iaasInfo.getComputeService()
@@ -474,7 +475,19 @@ public class AWSEC2Iaas extends Iaas {
 		
 		ElasticBlockStoreApi blockStoreApi = context.unwrapApi(AWSEC2Api.class).getElasticBlockStoreApiForRegion(region).get();
 		
-		Volume volume = blockStoreApi.createVolumeInAvailabilityZone(zone, sizeGB);
+		Volume volume;
+		if(StringUtils.isEmpty(snapshotId)){
+			if(log.isDebugEnabled()){
+        		log.info("Creating a volume in the zone " + zone);
+        	}
+			volume = blockStoreApi.createVolumeInAvailabilityZone(zone, sizeGB);
+		}else{
+			if(log.isDebugEnabled()){
+        		log.info("Creating a volume in the zone " + zone + " from the shanpshot " + snapshotId);
+        	}
+			volume = blockStoreApi.createVolumeFromSnapshotInAvailabilityZone(zone, snapshotId);
+		}
+		 
 		
 		if (volume == null) {
 			log.fatal("Volume creation was unsuccessful. [region] : " + region


[4/7] initial grouping code to develop cartridge grouping feature

Posted by me...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/application/CompositeApplicationManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/application/CompositeApplicationManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/application/CompositeApplicationManager.java
new file mode 100644
index 0000000..8631694
--- /dev/null
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/application/CompositeApplicationManager.java
@@ -0,0 +1,131 @@
+package org.apache.stratos.manager.application;
+
+import java.util.Collection;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.manager.application.utils.ApplicationUtils;
+import org.apache.stratos.manager.exception.ADCException;
+import org.apache.stratos.manager.exception.PersistenceManagerException;
+import org.apache.stratos.manager.retriever.DataInsertionAndRetrievalManager;
+import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication;
+
+//Grouping
+public class CompositeApplicationManager {
+	
+	private static Log log = LogFactory.getLog(CompositeApplicationManager.class);
+	
+	public void deployCompositeApplication(ConfigCompositeApplication configCompositeApplication) throws ADCException {
+		if (log.isDebugEnabled()) {
+			log.debug("deploying composite application " + configCompositeApplication.getAlias());
+		}
+		registerCompositeApplication(configCompositeApplication);
+		if (log.isDebugEnabled()) {
+			log.debug("publishing composite application " + configCompositeApplication.getAlias());
+		}
+		ApplicationUtils.publishApplicationCreatedEvent(configCompositeApplication);
+		if (log.isDebugEnabled()) {
+			log.debug("composite application successfully deployed" + configCompositeApplication.getAlias());
+		}
+	}
+	
+	public void unDeployCompositeApplication(String configApplicationAlias) throws ADCException {
+		if (log.isDebugEnabled()) {
+			log.debug("undeploying composite application " + configApplicationAlias);
+		}
+		// unregister application
+		unRegisterCompositeApplication(configApplicationAlias);
+		if (log.isDebugEnabled()) {
+			log.debug("publishing composite application removed event" + configApplicationAlias);
+		}
+		ApplicationUtils.publishApplicationUnDeployEvent(configApplicationAlias);
+		if (log.isDebugEnabled()) {
+			log.debug("composite application successfully removed " + configApplicationAlias);
+		}
+	}
+	
+	private void registerCompositeApplication(ConfigCompositeApplication configCompositeApplication) throws ADCException {
+		
+		try {
+			if (log.isDebugEnabled()) {
+				log.debug("registering composite application " + configCompositeApplication.getAlias());
+			}
+			DataInsertionAndRetrievalManager mgr = new DataInsertionAndRetrievalManager();
+			mgr.persistCompositeApplication ( configCompositeApplication);
+			
+			if (log.isDebugEnabled()) {
+				log.debug("testing to retrieve persisted composite application ");
+				Collection<ConfigCompositeApplication> apps = mgr.getCompositeApplications();
+				log.debug("retrieved persisted composite application " + apps.size());
+				for (ConfigCompositeApplication app : apps) {
+					log.debug("retrieved persisted composite application " + app.getAlias());
+				}
+			}
+
+        } catch (PersistenceManagerException e) {
+            String errorMsg = "Error saving composite application " + configCompositeApplication.getAlias();
+            log.error(errorMsg);
+            throw new ADCException(errorMsg, e);
+        }
+
+        log.info("Successfully registered composite application " + configCompositeApplication.getAlias());
+		
+	}
+	
+	private void unRegisterCompositeApplication(String configApplicationAlias) throws ADCException {
+		
+		try {
+			if (log.isDebugEnabled()) {
+				log.debug("unregistering composite application " + configApplicationAlias);
+			}
+			DataInsertionAndRetrievalManager mgr = new DataInsertionAndRetrievalManager();
+			mgr.removeCompositeApplication(configApplicationAlias); 
+			
+			if (log.isDebugEnabled()) {
+				log.debug("removed persisted composite application successfully");
+			}
+
+        } catch (PersistenceManagerException e) {
+            String errorMsg = "Error undeploying composite application " + configApplicationAlias;
+            log.error(errorMsg);
+            throw new ADCException(errorMsg, e);
+        }
+
+        log.info("Successfully undeployed composite application " + configApplicationAlias);
+		
+	}
+	
+	public void restoreCompositeApplications () throws ADCException {
+		try {
+			if (log.isDebugEnabled()) {
+				log.debug("restoring composite applications " );
+			}
+			DataInsertionAndRetrievalManager mgr = new DataInsertionAndRetrievalManager();
+			Collection<ConfigCompositeApplication> apps = mgr.getCompositeApplications();
+			
+			if (apps == null) {
+				if (log.isDebugEnabled()) {			
+					log.debug("no composite application configured");
+				}
+				return;
+			}
+			if (log.isDebugEnabled()) {			
+				log.debug("retrieved persisted composite application " + apps.size());
+				for (ConfigCompositeApplication app : apps) {
+					log.debug("retrieved persisted composite application " + app.getAlias());
+				}
+			}
+			// sending application created event to restore in Toplogy
+			for (ConfigCompositeApplication app : apps) {
+				log.debug("restoring composite application " + app.getAlias());
+				ApplicationUtils.publishApplicationCreatedEvent(app);
+			}
+
+        } catch (PersistenceManagerException e) {
+            String errorMsg = "Error restoring composite application ";
+            log.error(errorMsg);
+            throw new ADCException(errorMsg, e);
+        }
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/application/utils/ApplicationUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/application/utils/ApplicationUtils.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/application/utils/ApplicationUtils.java
new file mode 100644
index 0000000..d1634b0
--- /dev/null
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/application/utils/ApplicationUtils.java
@@ -0,0 +1,104 @@
+package org.apache.stratos.manager.application.utils;
+
+import java.util.Set;
+import java.util.concurrent.Executor;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.messaging.broker.publish.EventPublisher;
+import org.apache.stratos.messaging.broker.publish.EventPublisherPool;
+import org.apache.stratos.messaging.event.topology.CompositeApplicationCreatedEvent;
+import org.apache.stratos.messaging.event.topology.CompositeApplicationRemovedEvent;
+import org.apache.stratos.messaging.util.Constants;
+import org.apache.stratos.messaging.domain.topology.CompositeApplication;
+import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication;
+
+
+// Grouping
+public class ApplicationUtils {
+	
+	private static Log log = LogFactory.getLog(ApplicationUtils.class);
+	
+	   static class ApplicationCreatedEventPublisher implements Runnable {
+	    	
+	    	private ConfigCompositeApplication configCompositeApplication;
+
+	        public ApplicationCreatedEventPublisher(ConfigCompositeApplication configCompositeApplication) {
+	    		this.configCompositeApplication = configCompositeApplication;
+
+			}
+	        
+			@Override
+			public void run() {
+				try {
+					if(log.isInfoEnabled()) {
+						log.info(String.format("Publishing application createdevent: [application-alias] %s ", configCompositeApplication.getAlias()));
+					}
+					CompositeApplicationCreatedEvent event = new CompositeApplicationCreatedEvent(configCompositeApplication);
+					EventPublisher eventPublisher = EventPublisherPool.getPublisher(Constants.TOPOLOGY_TOPIC);
+					eventPublisher.publish(event);
+				} catch (Exception e) {
+					if (log.isErrorEnabled()) {
+						log.error(String.format("Could not publish tenant subscribed event: [application-alias] %s ", configCompositeApplication.getAlias()), e);
+					}
+				}
+				
+			}
+	    	
+	    }
+	   
+	    public static void publishApplicationCreatedEvent(ConfigCompositeApplication configCompositeApplication) {
+	    	
+	    	
+	    	Executor exec = new Executor() {
+				@Override
+				public void execute(Runnable command) {
+					command.run();
+				}
+			};
+			
+			exec.execute(new ApplicationCreatedEventPublisher(configCompositeApplication));
+	    }
+
+	    
+		   static class ApplicationRemovedEventPublisher implements Runnable {
+		    	
+		    	private String configCompositeApplicationAlias;
+
+		        public ApplicationRemovedEventPublisher(String configCompositeApplicationAlias) {
+		    		this.configCompositeApplicationAlias = configCompositeApplicationAlias;
+
+				}
+		        
+				@Override
+				public void run() {
+					try {
+						if(log.isInfoEnabled()) {
+							log.info(String.format("Publishing application createdevent: [application-alias] %s ", configCompositeApplicationAlias));
+						}
+						CompositeApplicationRemovedEvent event = new CompositeApplicationRemovedEvent(configCompositeApplicationAlias);
+						EventPublisher eventPublisher = EventPublisherPool.getPublisher(Constants.TOPOLOGY_TOPIC);
+						eventPublisher.publish(event);
+					} catch (Exception e) {
+						if (log.isErrorEnabled()) {
+							log.error(String.format("Could not publish composite removed event event: [application-alias] %s ", configCompositeApplicationAlias), e);
+						}
+					}
+					
+				}
+		    	
+		    }
+	    
+	    public static void publishApplicationUnDeployEvent(String configApplicationAlias) {
+	    	Executor exec = new Executor() {
+				@Override
+				public void execute(Runnable command) {
+					command.run();
+				}
+			};
+			
+			exec.execute(new ApplicationRemovedEventPublisher(configApplicationAlias));
+	    }
+
+
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/behaviour/CartridgeMgtBehaviour.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/behaviour/CartridgeMgtBehaviour.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/behaviour/CartridgeMgtBehaviour.java
index 56f7e10..40f61b2 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/behaviour/CartridgeMgtBehaviour.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/behaviour/CartridgeMgtBehaviour.java
@@ -21,6 +21,7 @@ package org.apache.stratos.manager.behaviour;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo;
+import org.apache.stratos.cloud.controller.stub.pojo.Persistence;
 import org.apache.stratos.cloud.controller.stub.pojo.Properties;
 import org.apache.stratos.cloud.controller.stub.pojo.Property;
 import org.apache.stratos.manager.client.CloudControllerServiceClient;
@@ -114,7 +115,7 @@ public abstract class CartridgeMgtBehaviour implements Serializable {
         return payloadData;
     }
 
-    public void register(CartridgeInfo cartridgeInfo, Cluster cluster, PayloadData payloadData, String autoscalePolicyName, String deploymentPolicyName, Properties properties) throws ADCException, UnregisteredCartridgeException {
+    public void register(CartridgeInfo cartridgeInfo, Cluster cluster, PayloadData payloadData, String autoscalePolicyName, String deploymentPolicyName, Properties properties, Persistence persistence) throws ADCException, UnregisteredCartridgeException {
     	if(payloadData != null) {
         log.info("Payload: " + payloadData.getCompletePayloadData().toString());
     	}else {
@@ -129,7 +130,8 @@ public abstract class CartridgeMgtBehaviour implements Serializable {
                 cluster.getHostName(),
                 autoscalePolicyName,
                 deploymentPolicyName,
-                properties);
+                properties,
+                persistence);
     }
 
     public void remove(String clusterId, String alias) throws ADCException, NotSubscribedException {

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java
index df6625e..1729d20 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java
@@ -30,6 +30,7 @@ import org.apache.stratos.manager.utils.CartridgeConstants;
 import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeDefinitionExceptionException;
 import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeTypeExceptionException;
 import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidClusterExceptionException;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCompositeApplicationDefinitionExceptionException;
 import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidIaasProviderExceptionException;
 import org.apache.stratos.cloud.controller.stub.CloudControllerServiceStub;
 import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException;
@@ -93,9 +94,9 @@ public class CloudControllerServiceClient {
 	}
 
 	public boolean register(String clusterId, String cartridgeType,
-	                        String payload, String tenantRange,
+                            String payload, String tenantRange,
                             String hostName, Properties properties,
-                            String autoscalorPolicyName, String deploymentPolicyName) throws RemoteException, 
+                            String autoscalorPolicyName, String deploymentPolicyName, Persistence persistence) throws RemoteException,
                             CloudControllerServiceUnregisteredCartridgeExceptionException {		
 	    Registrant registrant = new Registrant();
 	    registrant.setClusterId(clusterId);
@@ -106,10 +107,28 @@ public class CloudControllerServiceClient {
 	    registrant.setPayload(payload);
 	    registrant.setAutoScalerPolicyName(autoscalorPolicyName);
         registrant.setDeploymentPolicyName(deploymentPolicyName);
+        registrant.setPersistence(persistence);
 		return stub.registerService(registrant);
 
 	}
 
+
+	public void deployCompositeApplicationDefinition (CompositeApplicationDefinition compositeApplicationDefinition) 
+			throws RemoteException, CloudControllerServiceInvalidCompositeApplicationDefinitionExceptionException, CloudControllerServiceInvalidIaasProviderExceptionException  
+    		 {
+
+		stub.deployCompositeApplicationDefinition(compositeApplicationDefinition);
+
+	}
+	
+	
+	public void unDeployCompositeApplicationDefinition(String appAlias) throws RemoteException, CloudControllerServiceInvalidCompositeApplicationDefinitionExceptionException, CloudControllerServiceInvalidIaasProviderExceptionException   {
+		stub.unDeployCompositeApplicationDefinition(appAlias);
+    }
+
+
+
+
     @SuppressWarnings("unused")
     private Properties
         extractProperties(java.util.Properties properties) {

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java
index adfe60f..b73ccf6 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java
@@ -81,7 +81,7 @@ public abstract class Service extends CartridgeMgtBehaviour {
 
     public void deploy (Properties properties) throws ADCException, UnregisteredCartridgeException {
 
-        register(getCartridgeInfo(), getCluster(), getPayloadData(), getAutoscalingPolicyName(), getDeploymentPolicyName(), properties);
+        register(getCartridgeInfo(), getCluster(), getPayloadData(), getAutoscalingPolicyName(), getDeploymentPolicyName(), properties, null);
     }
 
     public void undeploy () throws ADCException, NotSubscribedException {

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java
index 5a16fc5..ec200f3 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java
@@ -46,6 +46,6 @@ public class MultiTenantLBService extends Service {
 
         //register the service
         loadBalancerCategory.register(getCartridgeInfo(), getCluster(), getPayloadData(), getAutoscalingPolicyName(), getDeploymentPolicyName(),
-                properties);
+                properties, null);
     }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ADCManagementServerComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ADCManagementServerComponent.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ADCManagementServerComponent.java
index 6857bd6..68f6a6e 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ADCManagementServerComponent.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ADCManagementServerComponent.java
@@ -20,6 +20,8 @@ package org.apache.stratos.manager.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.manager.application.CompositeApplicationManager;
+import org.apache.stratos.manager.exception.ADCException;
 import org.apache.stratos.manager.listener.InstanceStatusListener;
 import org.apache.stratos.manager.publisher.TenantEventPublisher;
 import org.apache.stratos.manager.publisher.TenantSynchronizerTaskScheduler;
@@ -108,6 +110,18 @@ public class ADCManagementServerComponent {
 
             // retrieve persisted CartridgeSubscriptions
             new DataInsertionAndRetrievalManager().cachePersistedSubscriptions();
+            
+            //Grouping
+            /*
+            if (log.isDebugEnabled()) {
+            	log.debug("restoring composite applications ...");
+            }
+            new CompositeApplicationManager().restoreCompositeApplications ();
+            
+            if (log.isDebugEnabled()) {
+            	log.debug("done restoring composite applications ...");
+            }
+            */
 
             //Component activated successfully
             log.info("ADC management server component is activated");

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/DefaultLoadBalancerCategory.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/DefaultLoadBalancerCategory.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/DefaultLoadBalancerCategory.java
index e49dbde..e124883 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/DefaultLoadBalancerCategory.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/DefaultLoadBalancerCategory.java
@@ -23,6 +23,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo;
 import org.apache.stratos.cloud.controller.stub.pojo.ClusterContext;
+import org.apache.stratos.cloud.controller.stub.pojo.Persistence;
 import org.apache.stratos.cloud.controller.stub.pojo.Properties;
 import org.apache.stratos.manager.client.AutoscalerServiceClient;
 import org.apache.stratos.manager.client.CloudControllerServiceClient;
@@ -94,13 +95,13 @@ public class DefaultLoadBalancerCategory extends LoadBalancerCategory {
         }
     }
 
-    public void register(CartridgeInfo cartridgeInfo, Cluster cluster, PayloadData payloadData, String autoscalePolicyName, String deploymentPolicyName, Properties properties) throws ADCException, UnregisteredCartridgeException {
+    public void register(CartridgeInfo cartridgeInfo, Cluster cluster, PayloadData payloadData, String autoscalePolicyName, String deploymentPolicyName, Properties properties, Persistence persistence) throws ADCException, UnregisteredCartridgeException {
     	log.info("Register service with payload data ["+payloadData+"] ");
         if (!isDefaultLBExists()) {
         	if(payloadData != null) {
         		log.info("Payload: " + payloadData.getCompletePayloadData().toString());
         	}
-            super.register(cartridgeInfo, cluster, payloadData, autoscalePolicyName, deploymentPolicyName, properties);
+            super.register(cartridgeInfo, cluster, payloadData, autoscalePolicyName, deploymentPolicyName, properties, persistence);
         }else {
         	log.info(" Default LB exists... Not registering...");
         }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ExistingLoadBalancerCategory.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ExistingLoadBalancerCategory.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ExistingLoadBalancerCategory.java
index b6ecfac..594ad4c 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ExistingLoadBalancerCategory.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ExistingLoadBalancerCategory.java
@@ -20,6 +20,7 @@
 package org.apache.stratos.manager.lb.category;
 
 import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo;
+import org.apache.stratos.cloud.controller.stub.pojo.Persistence;
 import org.apache.stratos.cloud.controller.stub.pojo.Properties;
 import org.apache.stratos.manager.dao.Cluster;
 import org.apache.stratos.manager.exception.ADCException;
@@ -41,7 +42,7 @@ public class ExistingLoadBalancerCategory extends LoadBalancerCategory {
         return null;
     }
 
-    public void register (CartridgeInfo cartridgeInfo, Cluster cluster, PayloadData payloadData, String autoscalePolicyName, String deploymentPolicyName, Properties properties) throws ADCException, UnregisteredCartridgeException {
+    public void register(CartridgeInfo cartridgeInfo, Cluster cluster, PayloadData payloadData, String autoscalePolicyName, String deploymentPolicyName, Properties properties, Persistence persistence) throws ADCException, UnregisteredCartridgeException {
 
         //TODO
     }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ServiceLevelLoadBalancerCategory.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ServiceLevelLoadBalancerCategory.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ServiceLevelLoadBalancerCategory.java
index fc47261..e713d7d 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ServiceLevelLoadBalancerCategory.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/ServiceLevelLoadBalancerCategory.java
@@ -23,6 +23,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo;
 import org.apache.stratos.cloud.controller.stub.pojo.ClusterContext;
+import org.apache.stratos.cloud.controller.stub.pojo.Persistence;
 import org.apache.stratos.cloud.controller.stub.pojo.Properties;
 import org.apache.stratos.manager.client.AutoscalerServiceClient;
 import org.apache.stratos.manager.client.CloudControllerServiceClient;
@@ -102,7 +103,7 @@ public class ServiceLevelLoadBalancerCategory extends LoadBalancerCategory {
         }
     }
 
-    public void register(CartridgeInfo cartridgeInfo, Cluster cluster, PayloadData payloadData, String autoscalePolicyName, String deploymentPolicyName, Properties properties) throws ADCException, UnregisteredCartridgeException {
+    public void register(CartridgeInfo cartridgeInfo, Cluster cluster, PayloadData payloadData, String autoscalePolicyName, String deploymentPolicyName, Properties properties, Persistence persistence) throws ADCException, UnregisteredCartridgeException {
 
         if (!serviceLbExists) {
 
@@ -110,7 +111,7 @@ public class ServiceLevelLoadBalancerCategory extends LoadBalancerCategory {
                 log.info("Payload: " + payloadData.getCompletePayloadData().toString());
             }
 
-            super.register(cartridgeInfo, cluster, payloadData, autoscalePolicyName, deploymentPolicyName, properties);
+            super.register(cartridgeInfo, cluster, payloadData, autoscalePolicyName, deploymentPolicyName, properties, persistence);
         }else {
             log.info("Service LB already exists for cartridge type: " + getLoadBalancedServiceType() + ", deployment policy: " + getDeploymentPolicyName());
         }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
index e7058f5..88641fc 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
@@ -22,10 +22,7 @@ package org.apache.stratos.manager.manager;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException;
-import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo;
-import org.apache.stratos.cloud.controller.stub.pojo.LoadbalancerConfig;
-import org.apache.stratos.cloud.controller.stub.pojo.Properties;
-import org.apache.stratos.cloud.controller.stub.pojo.Property;
+import org.apache.stratos.cloud.controller.stub.pojo.*;
 import org.apache.stratos.manager.client.CloudControllerServiceClient;
 import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo;
 import org.apache.stratos.manager.dto.SubscriptionInfo;
@@ -162,11 +159,11 @@ public class CartridgeSubscriptionManager {
         	if(log.isDebugEnabled()) {
         		log.debug(" Registering LB Cartridge subscription ");
         	}
-            registerCartridgeSubscription(lbCartridgeSubscription, lbCartridgeSubscriptionProperties);
+            registerCartridgeSubscription(lbCartridgeSubscription, lbCartridgeSubscriptionProperties, subscriptionData.getPersistence());
         }
 
         // register service cartridge subscription
-        return registerCartridgeSubscription(serviceCartridgeSubscription, serviceCartridgeSubscriptionProperties);
+        return registerCartridgeSubscription(serviceCartridgeSubscription, serviceCartridgeSubscriptionProperties, subscriptionData.getPersistence());
     }
 
     private boolean activeInstancesAvailable(SubscriptionData subscriptionData) {
@@ -335,7 +332,15 @@ public class CartridgeSubscriptionManager {
         if(cartridgeSubscription.getPayloadData() != null) {
             cartridgeSubscription.getPayloadData().add(CartridgeConstants.COMMIT_ENABLED, String.valueOf(subscriptionData.isCommitsEnabled()));
         }
-        
+
+        if(subscriptionData.getProperties() != null){
+            for(Property property : subscriptionData.getProperties().getProperties()){
+                if (property.getName().startsWith(CartridgeConstants.CUSTOM_PAYLOAD_PARAM_NAME_PREFIX)) {
+                    String payloadParamName = property.getName();
+                    cartridgeSubscription.getPayloadData().add(payloadParamName.substring(payloadParamName.indexOf(".") + 1), property.getValue());
+                }
+            }
+        }
 
         log.info("Tenant [" + subscriptionData.getTenantId() + "] with username [" + subscriptionData.getTenantAdminUsername() +
                 " subscribed to " + "] Cartridge with Alias " + subscriptionData.getCartridgeAlias() + ", Cartridge Type: " +
@@ -350,14 +355,15 @@ public class CartridgeSubscriptionManager {
      *
      * @param cartridgeSubscription CartridgeSubscription subscription
      *
+     * @param persistence
      * @return SubscriptionInfo object populated with relevant information
      * @throws ADCException
      * @throws UnregisteredCartridgeException
      */
-    private SubscriptionInfo registerCartridgeSubscription(CartridgeSubscription cartridgeSubscription, Properties properties)
+    private SubscriptionInfo registerCartridgeSubscription(CartridgeSubscription cartridgeSubscription, Properties properties, Persistence persistence)
             throws ADCException, UnregisteredCartridgeException {
 
-        CartridgeSubscriptionInfo cartridgeSubscriptionInfo = cartridgeSubscription.registerSubscription(properties);
+        CartridgeSubscriptionInfo cartridgeSubscriptionInfo = cartridgeSubscription.registerSubscription(properties, persistence);
 
         //set status as 'SUBSCRIBED'
         cartridgeSubscription.setSubscriptionStatus(CartridgeConstants.SUBSCRIBED);
@@ -464,7 +470,7 @@ public class CartridgeSubscriptionManager {
 
         Properties persistenceMappingProperties = new Properties();
         persistenceMappingProperties.setProperties(new Property[]{persistenceCtxt.getPersistanceRequiredProperty(), persistenceCtxt.getSizeProperty(),
-                persistenceCtxt.getDeleteOnTerminationProperty()});
+                persistenceCtxt.getDeleteOnTerminationProperty(), persistenceCtxt.getVolumeIdProperty()});
 
         return persistenceMappingProperties;
     }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/PayloadData.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/PayloadData.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/PayloadData.java
index 59bf664..aa38780 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/PayloadData.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/payload/PayloadData.java
@@ -20,30 +20,39 @@
 package org.apache.stratos.manager.payload;
 
 import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 public abstract class PayloadData implements Serializable {
 
     private BasicPayloadData basicPayloadData;
-    private StringBuilder completePayloadDataBuilder;
-
+    private Map<String, String> completePayloadMap;
     public PayloadData(BasicPayloadData basicPayloadData) {
 
         this.setBasicPayloadData(basicPayloadData);
-        completePayloadDataBuilder = new StringBuilder(basicPayloadData.getPayloadData());
+        completePayloadMap = new HashMap<String, String>();
     }
 
     public void add (String payloadDataName, String payloadDataValue) {
-
-        if(completePayloadDataBuilder.length() > 0) {
-            completePayloadDataBuilder.append(",");
-        }
-
-        completePayloadDataBuilder.append(payloadDataName + "=" + payloadDataValue);
+        completePayloadMap.put(payloadDataName, payloadDataValue);
     }
 
     public StringBuilder getCompletePayloadData () {
 
-        return completePayloadDataBuilder;
+        //return completePayloadMap;
+        StringBuilder completePayload = new StringBuilder();
+        completePayload.append(basicPayloadData.getPayloadData());
+        Iterator< String > iter = completePayloadMap.keySet().iterator();
+        while(iter.hasNext()) {
+            String key = iter.next();
+            String val = completePayloadMap.get(key);
+            if(completePayload.length() > 0){
+                completePayload.append(",");
+            }
+            completePayload.append(key + "=" + val);
+        }
+        return completePayload;
     }
 
     public BasicPayloadData getBasicPayloadData() {

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/PersistenceManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/PersistenceManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/PersistenceManager.java
index d971273..d5712c3 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/PersistenceManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/PersistenceManager.java
@@ -22,6 +22,7 @@ package org.apache.stratos.manager.persistence;
 import org.apache.stratos.manager.deploy.service.Service;
 import org.apache.stratos.manager.exception.PersistenceManagerException;
 import org.apache.stratos.manager.subscription.CartridgeSubscription;
+import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication;
 
 import java.util.Collection;
 
@@ -46,5 +47,13 @@ public abstract class PersistenceManager {
     public abstract Service getService (String cartridgeType) throws PersistenceManagerException;
 
     public abstract void removeService (String cartridgeType) throws PersistenceManagerException;
+    
+    //Grouping
+    public abstract void persistDeployedCompositeApplication(ConfigCompositeApplication configCompositeApplication)  throws PersistenceManagerException;
+
+    //Grouping
+    public abstract void removeDeployedCompositeApplication(String configCompositeApplicationAlias)  throws PersistenceManagerException;
+
+    public abstract Collection<ConfigCompositeApplication> getDeployedCompositeApplications () throws PersistenceManagerException;
 
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java
index 6ecee93..408c1bb 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/persistence/RegistryBasedPersistenceManager.java
@@ -27,6 +27,7 @@ import org.apache.stratos.manager.registry.RegistryManager;
 import org.apache.stratos.manager.subscription.CartridgeSubscription;
 import org.apache.stratos.manager.utils.Deserializer;
 import org.apache.stratos.manager.utils.Serializer;
+import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
@@ -45,6 +46,7 @@ public class RegistryBasedPersistenceManager extends PersistenceManager {
     private static final String ACTIVE_SUBSCRIPTIONS = "/subscriptions/active";
     private static final String INACTIVE_SUBSCRIPTIONS = "/subscriptions/inactive";
     private static final String SERVICES = "/services";
+    private static final String COMPOSITE_APPLICATION = "/composite_applications";
 
     @Override
     public void persistCartridgeSubscription (CartridgeSubscription cartridgeSubscription) throws PersistenceManagerException {
@@ -216,6 +218,196 @@ public class RegistryBasedPersistenceManager extends PersistenceManager {
 
         return traverseAndGetCartridgeSubscriptions(STRATOS_MANAGER_REOSURCE + ACTIVE_SUBSCRIPTIONS + "/" + Integer.toString(tenantId));
     }
+    
+
+    //Grouping
+    public void persistDeployedCompositeApplication (ConfigCompositeApplication configCompositeAapplication) 
+    		throws PersistenceManagerException {
+
+    	if (log.isDebugEnabled()) {
+            log.debug("trying to persiste ConfigCompositeApplication [ " + configCompositeAapplication.getAlias() + " ]");
+        }
+        int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
+        if (tenantId != MultitenantConstants.SUPER_TENANT_ID) {
+            // TODO: This is only a workaround. Proper fix is to write to tenant registry
+            try {
+                PrivilegedCarbonContext.startTenantFlow();
+                PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+                carbonContext.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
+                carbonContext.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
+
+                persistCompApplication(configCompositeAapplication);
+
+            } finally {
+                PrivilegedCarbonContext.endTenantFlow();
+            }
+
+        } else {
+        	persistCompApplication(configCompositeAapplication);
+        }
+    }
+    
+    // Grouping
+    private void persistCompApplication (ConfigCompositeApplication configCompositeAapplication) throws PersistenceManagerException  {
+
+        // persist Service
+        try {
+            //RegistryManager.getInstance().persist(STRATOS_MANAGER_REOSURCE + COMPOSITE_APPLICATION + "/" + configCompositeAapplication.getAlias(),
+        	RegistryManager.getInstance().persist(STRATOS_MANAGER_REOSURCE + COMPOSITE_APPLICATION + "/" + "compositeApplicationAlias",
+        														Serializer.serializeServiceToByteArray(configCompositeAapplication), null);
+
+            if (log.isDebugEnabled()) {
+                log.debug("Persisted ConfigCompositeApplication successfully: hardcoded [ " + configCompositeAapplication.getAlias() + " ]");
+            }
+
+        } catch (RegistryException e) {
+            throw new PersistenceManagerException(e);
+
+        } catch (IOException e) {
+            throw new PersistenceManagerException(e);
+        }
+    }
+    
+    public void removeDeployedCompositeApplication(String configCompositeApplicationAlias)  throws PersistenceManagerException {
+
+        int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
+        if (tenantId != MultitenantConstants.SUPER_TENANT_ID) {
+            // TODO: This is only a workaround. Proper fix is to write to tenant registry
+            try {
+                PrivilegedCarbonContext.startTenantFlow();
+                PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+                carbonContext.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
+                carbonContext.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
+
+                if (log.isDebugEnabled()) {
+                    log.debug("removing persisted ConfigCompositeApplication : [ " + configCompositeApplicationAlias + " ]");
+                }
+                removeCompApplication(configCompositeApplicationAlias);
+                
+                if (log.isDebugEnabled()) {
+                    log.debug("successfully removed persisted ConfigCompositeApplication : [ " + configCompositeApplicationAlias + " ]");
+                }
+
+            } finally {
+                PrivilegedCarbonContext.endTenantFlow();
+            }
+
+        } else {
+        	if (log.isDebugEnabled()) {
+                log.debug("removing persisted ConfigCompositeApplication 1 : [ " + configCompositeApplicationAlias + " ]");
+            }
+            removeCompApplication(configCompositeApplicationAlias);
+            
+            if (log.isDebugEnabled()) {
+                log.debug("successfully removed persisted ConfigCompositeApplication 1 : [ " + configCompositeApplicationAlias + " ]");
+            }
+        }
+    }
+
+    
+    public Collection<ConfigCompositeApplication> getDeployedCompositeApplications () throws PersistenceManagerException {;
+    	if (log.isDebugEnabled()) {
+            log.debug("retrieving persisted ConfigCompositeApplication ");
+        }
+    	
+    	int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
+        if (tenantId != MultitenantConstants.SUPER_TENANT_ID) {
+            // TODO: This is only a workaround. Proper fix is to write to tenant registry
+            try {
+                PrivilegedCarbonContext.startTenantFlow();
+                PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+                carbonContext.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
+                carbonContext.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
+                if (log.isDebugEnabled()) {
+                    log.debug("traversing ConfigCompositeApplications ");
+                }
+                return traverseAndGetDeloyedCompositeApplication(STRATOS_MANAGER_REOSURCE + COMPOSITE_APPLICATION);
+
+            } finally {
+                PrivilegedCarbonContext.endTenantFlow();
+            }
+
+        } else {
+            return traverseAndGetDeloyedCompositeApplication(STRATOS_MANAGER_REOSURCE + COMPOSITE_APPLICATION);
+        }
+
+    }
+
+
+    public Collection<ConfigCompositeApplication> traverseAndGetDeloyedCompositeApplication (String resourcePath) throws PersistenceManagerException {
+
+        if (log.isDebugEnabled()) {
+            log.debug("traverseAndGetDeloyedCompositeApplication: Root resource path: " + resourcePath);
+        }
+
+        Object resourceObj;
+
+        try {
+            resourceObj = RegistryManager.getInstance().retrieve(resourcePath);
+            if (log.isDebugEnabled()) {
+                log.debug("traversing com apps , retrieving resource: " + resourceObj);
+            }
+
+        } catch (RegistryException e) {
+            throw new PersistenceManagerException(e);
+        }
+
+        Collection<ConfigCompositeApplication> comApps = new ArrayList<ConfigCompositeApplication>();
+
+        if (resourceObj == null) {
+            // there is no resource at the given path
+            return null;
+
+        } else if (resourceObj instanceof String[]) {
+
+            // get the paths for all Service instances
+            String[] compAppResourcePaths = (String[]) resourceObj;
+            if (log.isDebugEnabled()) {
+                for (String retrievedResourcePath : compAppResourcePaths) {
+                    log.debug("Retrieved resource sub-path " + retrievedResourcePath);
+                }
+            }
+
+            // traverse the paths recursively
+            for (String compAppResourcePath : compAppResourcePaths) {
+
+                if (log.isDebugEnabled()) {
+                    log.debug("Traversing resource path " + compAppResourcePath);
+                }
+
+                comApps.addAll(traverseAndGetDeloyedCompositeApplication(compAppResourcePath));
+            }
+
+        } else {
+            // De-serialize
+            Object compAppObj;
+
+            try {
+            	compAppObj = Deserializer.deserializeFromByteArray((byte[]) resourceObj);
+
+            } catch (Exception e) {
+                // issue might be de-serializing only this object, therefore log and continue without throwing
+                log.error("Error while de-serializing the object retrieved from "  + resourcePath, e);
+                return null;
+            }
+
+            if (compAppObj != null && compAppObj instanceof ConfigCompositeApplication) {
+
+            	ConfigCompositeApplication deserilizedCompApp = (ConfigCompositeApplication) compAppObj;
+                if (log.isDebugEnabled()) {
+                    log.debug("Successfully de-serialized ConfigCompositeApplication: " + deserilizedCompApp.toString());
+                }
+
+                comApps.add(deserilizedCompApp);
+
+            }
+        }
+
+        // remove any nulls
+        comApps.removeAll(Collections.singleton(null));
+        return comApps;
+    }
+
 
     @Override
     public void persistService(Service service) throws PersistenceManagerException {
@@ -445,5 +637,35 @@ public class RegistryBasedPersistenceManager extends PersistenceManager {
             throw new PersistenceManagerException(e);
         }
     }
+    
+    private void removeCompApplication(String alias) throws PersistenceManagerException {
+
+        String resourcePath = STRATOS_MANAGER_REOSURCE + COMPOSITE_APPLICATION + "/" + alias;
+
+        try {
+        	Object obj = RegistryManager.getInstance().retrieve(resourcePath);
+        	if (obj != null) {
+        		if (log.isDebugEnabled()) {
+        			log.debug(" found composite application to remve " + obj + " at resource path " + resourcePath);
+        		}
+        	}
+            RegistryManager.getInstance().delete(resourcePath);
+            if (log.isDebugEnabled()) {
+                log.debug("Deleted composite application on path " + resourcePath + " successfully");
+            }
+            
+    		if (log.isDebugEnabled()) {
+    			obj = RegistryManager.getInstance().retrieve(resourcePath);
+     			if (obj == null) {
+     	   			log.debug(" veriying that composite application is remvoved, obj is null "  + resourcePath);
+    			} else {
+    				log.debug(" unsuccessful removing  composite application  " +  obj + " at resource path " +  resourcePath);
+    			}
+    		}
+
+        } catch (RegistryException e) {
+            throw new PersistenceManagerException(e);
+        }
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/retriever/DataInsertionAndRetrievalManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/retriever/DataInsertionAndRetrievalManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/retriever/DataInsertionAndRetrievalManager.java
index 386758f..8250b3f 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/retriever/DataInsertionAndRetrievalManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/retriever/DataInsertionAndRetrievalManager.java
@@ -27,6 +27,7 @@ import org.apache.stratos.manager.lookup.LookupDataHolder;
 import org.apache.stratos.manager.persistence.PersistenceManager;
 import org.apache.stratos.manager.persistence.RegistryBasedPersistenceManager;
 import org.apache.stratos.manager.subscription.CartridgeSubscription;
+import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication;
 
 import java.util.Collection;
 import java.util.Set;
@@ -334,4 +335,70 @@ public class DataInsertionAndRetrievalManager {
             LookupDataHolder.getInstance().releaseReadLock();
         }
     }
+    
+    // Grouping
+    public void persistCompositeApplication (ConfigCompositeApplication configCompositeApplication) throws PersistenceManagerException {
+
+        // get the write lock
+        //LookupDataHolder.getInstance().acquireWriteLock();
+
+        try {
+            // store in LookupDataHolder
+        	//ToDo ... add to data holder
+            // LookupDataHolder.getInstance().putSubscription(cartridgeSubscription);
+
+            try {
+                // store in Persistence Manager
+                persistenceManager.persistDeployedCompositeApplication(configCompositeApplication);
+
+            } catch (PersistenceManagerException e) {
+                String errorMsg = "Error in persisting CartridgeSubscription in Persistence Manager";
+                log.error(errorMsg, e);
+                // remove from the in memory model since persisting failed
+                /* TODO
+                LookupDataHolder.getInstance().removeSubscription(cartridgeSubscription.getSubscriber().getTenantId(), cartridgeSubscription.getType(),
+                        cartridgeSubscription.getAlias(), cartridgeSubscription.getClusterDomain(),
+                        cartridgeSubscription.getRepository() != null ? cartridgeSubscription.getRepository().getUrl() : null);
+				*/
+                throw e;
+            }
+
+        } finally {
+            // release the write lock
+            //LookupDataHolder.getInstance().releaseWriteLock();
+        }
+    }
+    
+    // Grouping
+    
+    public void removeCompositeApplication (String configCompositeApplicationAlias) throws PersistenceManagerException {
+
+        LookupDataHolder.getInstance().acquireWriteLock();
+
+        try {
+            // remove from persistence manager
+            try {
+                persistenceManager.removeDeployedCompositeApplication(configCompositeApplicationAlias);
+
+            } catch (PersistenceManagerException e) {
+                String errorMsg = "Error in removing Composite application from Persistence Manager";
+                log.error(errorMsg, e);
+                throw e;
+            }
+
+        } finally {
+            LookupDataHolder.getInstance().releaseWriteLock();
+        }
+    }
+
+    
+    // Grouping
+    
+    
+    public Collection<ConfigCompositeApplication> getCompositeApplications() throws PersistenceManagerException {
+
+        return persistenceManager.getDeployedCompositeApplications();
+    }
+
+
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CartridgeSubscription.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CartridgeSubscription.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CartridgeSubscription.java
index e143bc3..b974f54 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CartridgeSubscription.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CartridgeSubscription.java
@@ -22,6 +22,7 @@ package org.apache.stratos.manager.subscription;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo;
+import org.apache.stratos.cloud.controller.stub.pojo.Persistence;
 import org.apache.stratos.cloud.controller.stub.pojo.Properties;
 import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo;
 import org.apache.stratos.manager.dao.Cluster;
@@ -134,18 +135,19 @@ public abstract class CartridgeSubscription implements Serializable {
      *
      * @param properties Any additional properties needed
      *
+     * @param persistence
      * @return CartridgeSubscriptionInfo subscription populated with relevant data
      * @throws ADCException
      * @throws UnregisteredCartridgeException
      */
-    public CartridgeSubscriptionInfo registerSubscription(Properties properties)
+    public CartridgeSubscriptionInfo registerSubscription(Properties properties, Persistence persistence)
             throws ADCException, UnregisteredCartridgeException {
 
         // Properties props = new Properties();
         //props.setProperties(getCartridgeInfo().getProperties());
 
         getSubscriptionTenancyBehaviour().register (getCartridgeInfo(), getCluster(), getPayloadData(), getAutoscalingPolicyName(),
-                getDeploymentPolicyName(), properties);
+                getDeploymentPolicyName(), properties, persistence);
 
         return ApplicationManagementUtil.createCartridgeSubscription(getCartridgeInfo(), getAutoscalingPolicyName(),
                 getType(), getAlias(), getSubscriber().getTenantId(), getSubscriber().getTenantDomain(),

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/DataCartridgeSubscription.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/DataCartridgeSubscription.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/DataCartridgeSubscription.java
index 4cefa45..c97bcd3 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/DataCartridgeSubscription.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/DataCartridgeSubscription.java
@@ -19,6 +19,7 @@
 
 package org.apache.stratos.manager.subscription;
 
+import org.apache.stratos.cloud.controller.stub.pojo.Persistence;
 import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo;
 import org.apache.stratos.manager.dao.DataCartridge;
 import org.apache.stratos.manager.exception.ADCException;
@@ -54,11 +55,11 @@ public class DataCartridgeSubscription extends CartridgeSubscription {
     }
 
     @Override
-    public CartridgeSubscriptionInfo registerSubscription(Properties properties) throws ADCException,
+    public CartridgeSubscriptionInfo registerSubscription(Properties properties, Persistence persistence) throws ADCException,
             UnregisteredCartridgeException {
 
         getSubscriptionTenancyBehaviour().register (getCartridgeInfo(), getCluster(), getPayloadData(), getAutoscalingPolicyName(),
-                getDeploymentPolicyName(), properties);
+                getDeploymentPolicyName(), properties, persistence);
 
         DataCartridge dataCartridge = new DataCartridge();
         dataCartridge.setUserName(getDBUsername());

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/LBCartridgeSubscription.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/LBCartridgeSubscription.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/LBCartridgeSubscription.java
index 3bad5fd..f6555f8 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/LBCartridgeSubscription.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/LBCartridgeSubscription.java
@@ -22,6 +22,7 @@ package org.apache.stratos.manager.subscription;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo;
+import org.apache.stratos.cloud.controller.stub.pojo.Persistence;
 import org.apache.stratos.cloud.controller.stub.pojo.Properties;
 import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo;
 import org.apache.stratos.manager.exception.ADCException;
@@ -80,13 +81,13 @@ public class LBCartridgeSubscription extends CartridgeSubscription {
 
     
     @Override
-    public CartridgeSubscriptionInfo registerSubscription(Properties properties) throws ADCException, UnregisteredCartridgeException {    	
+    public CartridgeSubscriptionInfo registerSubscription(Properties properties, Persistence persistence) throws ADCException, UnregisteredCartridgeException {
     	if(!loadBalancerCategory.isLoadBalancedServiceMultiTenant()) {
     		if(log.isDebugEnabled()) {
     		 log.debug("Loadbalanced service is single tenant.");
     		}
     		getLoadBalancerCategory().register (getCartridgeInfo(), getCluster(), getPayloadData(), getAutoscalingPolicyName(),
-    	                getDeploymentPolicyName(), properties);
+    	                getDeploymentPolicyName(), properties, persistence);
     	}
        
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/PersistenceContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/PersistenceContext.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/PersistenceContext.java
index e3b4c13..63a13a1 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/PersistenceContext.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/PersistenceContext.java
@@ -30,11 +30,13 @@ public class PersistenceContext {
     private Property persistanceRequiredProperty;
     private Property sizeProperty;
     private Property deleteOnTerminationProperty;
+    private Property volumeIdProperty;
 
     public PersistenceContext () {
         persistanceRequiredProperty = new Property();
         sizeProperty = new Property();
         deleteOnTerminationProperty = new Property();
+        volumeIdProperty = new Property();
     }
 
 
@@ -64,4 +66,13 @@ public class PersistenceContext {
         this.deleteOnTerminationProperty.setName(propertyName);
         this.deleteOnTerminationProperty.setValue(propertyValue);
     }
+
+    public Property getVolumeIdProperty() {
+        return volumeIdProperty;
+    }
+
+    public void setVolumeIdProperty(String propertyName, String propertyValue) {
+        this.volumeIdProperty.setName(propertyName);
+        this.volumeIdProperty.setValue(propertyValue);
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java
index e267c24..0b257d5 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java
@@ -18,6 +18,8 @@
  */
 package org.apache.stratos.manager.subscription;
 
+import org.apache.stratos.cloud.controller.stub.pojo.Persistence;
+import org.apache.stratos.cloud.controller.stub.pojo.Properties;
 import org.apache.stratos.cloud.controller.stub.pojo.Property;
 
 /**
@@ -38,10 +40,11 @@ public class SubscriptionData {
     private boolean isPrivateRepository;
     private String repositoryUsername;
     private String repositoryPassword;
-    private Property[] properties;
     private PersistenceContext persistanceCtxt;
     private boolean isCommitsEnabled;
     private String serviceGroup;
+    private Persistence persistence;
+    private Properties properties;
 
     public String getCartridgeType() {
         return cartridgeType;
@@ -139,14 +142,6 @@ public class SubscriptionData {
         this.repositoryPassword = repositoryPassword;
     }
 
-    public Property[] getProperties() {
-        return properties;
-    }
-
-    public void setProperties(Property[] properties) {
-        this.properties = properties;
-    }
-
     public PersistenceContext getPersistanceContext() {
         return persistanceCtxt;
     }
@@ -170,5 +165,20 @@ public class SubscriptionData {
 	public void setServiceGroup(String serviceGroup) {
 		this.serviceGroup = serviceGroup;
 	}
-    
+
+    public Persistence getPersistence() {
+        return persistence;
+    }
+
+    public void setPersistence(Persistence persistence) {
+        this.persistence = persistence;
+    }
+
+    public Properties getProperties() {
+        return properties;
+    }
+
+    public void setProperties(Properties properties) {
+        this.properties = properties;
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionMultiTenantBehaviour.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionMultiTenantBehaviour.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionMultiTenantBehaviour.java
index 1b96734..664a2b3 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionMultiTenantBehaviour.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionMultiTenantBehaviour.java
@@ -22,6 +22,7 @@ package org.apache.stratos.manager.subscription.tenancy;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo;
+import org.apache.stratos.cloud.controller.stub.pojo.Persistence;
 import org.apache.stratos.cloud.controller.stub.pojo.Properties;
 import org.apache.stratos.manager.dao.Cluster;
 import org.apache.stratos.manager.deploy.service.Service;
@@ -111,8 +112,8 @@ public class SubscriptionMultiTenantBehaviour extends SubscriptionTenancyBehavio
         return null;
     }
 
-    public void register (CartridgeInfo cartridgeInfo, Cluster cluster, PayloadData payloadData, String autoscalePolicyName,
-                          String deploymentPolicyName, Properties properties)
+    public void register(CartridgeInfo cartridgeInfo, Cluster cluster, PayloadData payloadData, String autoscalePolicyName,
+                         String deploymentPolicyName, Properties properties, Persistence persistence)
             throws ADCException, UnregisteredCartridgeException {
 
         //nothing to do

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java
index d0136f5..7282253 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java
@@ -36,6 +36,7 @@ import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo;
+import org.apache.stratos.cloud.controller.stub.pojo.Persistence;
 import org.apache.stratos.cloud.controller.stub.pojo.Properties;
 import org.apache.stratos.cloud.controller.stub.pojo.Property;
 import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException;
@@ -247,14 +248,14 @@ public class ApplicationManagementUtil {
     
     
     public static void registerService(String cartridgeType, String domain, String subDomain,
-                                        StringBuilder payload, String tenantRange, String hostName,
-                                        String autoscalingPoliyName, String deploymentPolicyName,
-                                        Properties properties)
+                                       StringBuilder payload, String tenantRange, String hostName,
+                                       String autoscalingPoliyName, String deploymentPolicyName,
+                                       Properties properties, Persistence persistence)
             throws ADCException, UnregisteredCartridgeException {
         log.info("Register service..");
         try {
             CloudControllerServiceClient.getServiceClient().register(domain, cartridgeType, payload.toString(), tenantRange,
-                    hostName, properties, autoscalingPoliyName, deploymentPolicyName );
+                    hostName, properties, autoscalingPoliyName, deploymentPolicyName, persistence );
         } catch (CloudControllerServiceUnregisteredCartridgeExceptionException e) {
             String msg = "Exception is occurred in register service operation. Reason :" + e.getMessage();
             log.error(msg, e);

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/Serializer.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/Serializer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/Serializer.java
index fa56b24..d31b1a1 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/Serializer.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/Serializer.java
@@ -22,6 +22,7 @@ package org.apache.stratos.manager.utils;
 import org.apache.stratos.manager.deploy.service.Service;
 import org.apache.stratos.manager.lookup.ClusterIdToSubscription;
 import org.apache.stratos.manager.subscription.CartridgeSubscription;
+import org.apache.stratos.messaging.domain.topology.ConfigCompositeApplication;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -101,4 +102,25 @@ public class Serializer {
         }
 
     }
+    
+    // Grouping
+    public static byte[] serializeServiceToByteArray(ConfigCompositeApplication configCompositeApplication)
+            throws IOException {
+
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        ObjectOutput out = null;
+        try {
+            out = new ObjectOutputStream(bos);
+            out.writeObject(configCompositeApplication);
+
+            return bos.toByteArray();
+
+        } finally {
+            if (out != null) {
+                out.close();
+            }
+            bos.close();
+        }
+
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cartridge.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cartridge.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cartridge.java
new file mode 100644
index 0000000..55d99f0
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cartridge.java
@@ -0,0 +1,81 @@
+package org.apache.stratos.messaging.domain.topology;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class Cartridge implements Subscribable, Scalable {
+	
+	private String alias; // type
+	private String cartridgeId;
+	private Dependencies dependencies;
+	private Subscribable parent;
+	private Group homeGroup;
+    private static final Log log = LogFactory.getLog(Cartridge.class);
+
+	public Cartridge(String alias) {
+		this.alias = alias;
+	}
+	
+	public void setAlias(String alias) {
+		this.alias = alias;
+	}
+	
+	public String getAlias() {
+		return alias;
+	}
+
+	public String getCartridgeId() {
+		return cartridgeId;
+	}
+
+	public void setCartridgeId(String cartridgeId) {
+		this.cartridgeId = cartridgeId;
+	}
+
+	public Subscribable getParent() {
+		return parent;
+	}
+
+	public Group getHomeGroup() {
+		return homeGroup;
+	}
+
+	public void setHomeGroup(Group homeGroup) {
+		this.homeGroup = homeGroup;
+	}
+
+	public void setParent(Subscribable parent) {
+		this.parent = parent;
+	}
+
+	public Dependencies getDependencies() {
+		return dependencies;
+	}
+	
+	public List<Subscribable>  getAllDependencies() {
+		return new ArrayList<Subscribable>(0);
+	}
+
+	public void setDependencies(Dependencies dependencies) {
+		this.dependencies = dependencies;
+	}
+
+	public void subscribe() {	
+	}
+	
+	public void unsubscribe() {	
+	}
+	
+	public String toString() {
+		String result = "";
+		result = alias;
+		if (dependencies != null) {
+			result = result + " dependencies:" + dependencies.toString();
+		} 
+		return result;
+	}
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Composite.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Composite.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Composite.java
new file mode 100644
index 0000000..8b0d75d
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Composite.java
@@ -0,0 +1,15 @@
+package org.apache.stratos.messaging.domain.topology;
+
+import java.util.List;
+
+public interface Composite {
+	
+	public void add(Subscribable subscribable);
+	
+	public void remove(Subscribable subscribable);
+	
+	public Subscribable getParent();
+	
+	public void setParent(Subscribable subscribable);
+	
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/CompositeApplication.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/CompositeApplication.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/CompositeApplication.java
new file mode 100644
index 0000000..c63f448
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/CompositeApplication.java
@@ -0,0 +1,290 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.stratos.messaging.domain.topology;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
+
+/**
+ * Defines a topology of serviceMap in Stratos.
+ */
+// Grouping
+public class CompositeApplication implements Serializable {
+    private static final long serialVersionUID = -1L;
+    // Key: Service.serviceName
+    private String alias;
+    private Group top_level;
+    private Map<String, Group> all_groups  = null;
+    private static final Log log = LogFactory.getLog(CompositeApplication.class);
+
+    public CompositeApplication() {
+       
+    }
+
+    public String getAlias() {
+		return alias;
+	}
+
+
+	public void setAlias(String alias) {
+		this.alias = alias;
+	}
+
+	/*
+	public Group getTop_level() {
+		return this.top_level;
+	}*/
+	/*
+	public void setTop_level(Group top_level) {
+		this.top_level = top_level;
+	} */
+	
+
+	public Map<String, Group> getAll_groups() {
+		return all_groups;
+	}
+
+	public void setAll_groups(Map<String, Group> all_groups) {
+		this.all_groups = all_groups;
+	}
+	
+	
+	public List<Group> findAllGroupsForServiceType(String serviceType) {
+		Set<String> group_names = this.all_groups.keySet();
+		List<Group> found_groups = new ArrayList<Group>();
+		
+		for (String group_name: group_names) {
+			Group gr = this.all_groups.get(group_name);
+			Subscribable sub = gr.getSubscribable(serviceType);
+			if (sub != null) {
+				found_groups.add(gr);
+			} 
+		}
+		
+		return found_groups;
+	}
+	
+	public Group getGroupFromGroupAlias(String alias) {
+		return this.all_groups.get(alias);
+	}
+	
+
+	public String [] getDependencies (String alias, boolean kill_flag) {
+		if (log.isDebugEnabled()) {
+			log.debug("getting dependencies from group :" +  this.top_level);
+		}
+		
+		String [] dependenciesAliasArray = null;
+		List<Subscribable> results = null;
+		if (kill_flag && top_level.getDependencies().getKill_behavior().equals("kill-all")) {
+			if (log.isDebugEnabled()) {
+				log.debug("kill-all: returning all dependencies for " + alias);
+			}
+			
+			results = top_level.getAllDependencies();
+			dependenciesAliasArray = new String [results.size()];
+		} else {
+			if (log.isDebugEnabled()) {
+				log.debug("getting selected dependencies from group : " + alias);
+			}
+			Dependencies group_deps = this.top_level.getDependencies();
+			results = group_deps.getDependencies(alias, kill_flag);
+			dependenciesAliasArray = new String [results.size()];
+			for (int i = 0; i < results.size(); i++ ) {
+				Subscribable s = results.get(i);
+				dependenciesAliasArray[i] = s.getAlias();
+				if (log.isDebugEnabled()) {
+					log.debug("adding " + s.getAlias() + " to dependency array");
+				}
+			}
+		}
+		
+		if (log.isDebugEnabled()) {
+			log.debug("returning dependencies for subscribale : " + alias);
+		}
+		return dependenciesAliasArray;
+	}
+	
+	public String [] getDownStreamDependencies (String alias) {
+		if (log.isDebugEnabled()) {
+			log.debug("getting dependencies from group :" +  this.top_level);
+		}
+		
+		String [] dependenciesAliasArray = null;
+		List<Subscribable> results = null;
+		
+		if (log.isDebugEnabled()) {
+			log.debug("getting selected dependencies from group : " + alias);
+		}
+		Dependencies group_deps = this.top_level.getDependencies();
+		results = group_deps.getDownStreamDependents(alias);
+		dependenciesAliasArray = new String [results.size()];
+		for (int i = 0; i < results.size(); i++ ) {
+			Subscribable s = results.get(i);
+			dependenciesAliasArray[i] = s.getAlias();
+			if (log.isDebugEnabled()) {
+				log.debug("adding " + s.getAlias() + " to dependency array");
+			}
+		}
+		
+		if (log.isDebugEnabled()) {
+			log.debug("returning dependencies for subscribale : " + alias);
+		}
+		return dependenciesAliasArray;
+	}
+	
+	public String extractClusterGroupFromClusterId (String clusterId) {
+		String sub1 = extractAlias(clusterId);
+		if (sub1 == null) {
+			return null;
+		}
+		
+		String [] s = sub1.split("-");
+		if (log.isDebugEnabled())  {
+			log.debug("clusterGroup alias is " + sub1 + " size: " + s.length);
+		}
+		if (s.length == 0) {
+			return null;
+		} 
+		if (log.isDebugEnabled())  {
+			log.debug("cluster " + clusterId + " is in group " +  s[0]);
+		}
+		return s[0];
+	}
+	
+	private String extractAlias (String clusterId) {
+		String [] s = clusterId.split("\\.");
+		if (log.isDebugEnabled())  {
+			log.debug("clusterId alias is " + clusterId + " size: " + s.length);
+		}
+		if (s.length == 0) {
+			return null;
+		} 
+		if (log.isDebugEnabled())  {
+			log.debug("clusterId alias is " + clusterId + " alias: " + s[0]);
+		}
+		return s[0];
+	}
+	
+	
+	/*
+	public String [] getUpstreamDependencies (String alias) {
+		String [] dependenciesAliasArray = new String[0];
+		if (log.isDebugEnabled()) {
+			log.debug("searching home group for  : " + alias);
+		}
+		Group gr = getTop_level().findGroup(alias);
+		if (gr == null) {
+			if (log.isDebugEnabled()) {
+				log.debug("no home group found for  : " + alias);
+			}
+			return dependenciesAliasArray;
+		}
+		Subscribable sub = gr.getSubscribable(alias);
+		if (log.isDebugEnabled()) {
+			log.debug("found home group for  : " + alias + " , group is " + gr.getAlias() + " subscribable is " + sub);
+		}
+		//List<Subscribable> results = gr.getUpstreamDependencies(sub);
+		List<Subscribable> results = gr.getDependencies().getUpstreamDependents(sub.getAlias());
+		if (log.isDebugEnabled()) {
+			log.debug("home group upstream result for  : " + alias + " is " + results.size());
+		}
+		dependenciesAliasArray = new String [results.size()];
+		for (int i = 0; i < results.size(); i++) {
+			Subscribable item = results.get(i);
+			if (item != null) {
+				dependenciesAliasArray[i] = item.getAlias();
+			} else {
+				if (log.isDebugEnabled()) {
+					log.debug("dependenciesAliasArray in getUpstreamDependencies has null value");
+					dependenciesAliasArray[i] = null;
+				}
+			}
+		}
+		return dependenciesAliasArray;
+	} */
+	
+	public String extractAliasFromClusterId (String clusterId) {
+		String [] s = clusterId.split("\\.");
+		if (log.isDebugEnabled())  {
+			log.debug("clusterId alias is " + clusterId + " size: " + s.length);
+		}
+		if (s.length == 0) {
+			return null;
+		} 
+		if (log.isDebugEnabled())  {
+			log.debug("clusterId alias is " + clusterId + " alias: " + s[0]);
+		}
+		return s[0];
+	}
+	
+	/*
+	public String [] getAllInPathOf(String aServiceId) {
+	// check kill_all_enabled flag
+		String [] upstreamDependencies = this.getUpstreamDependencies(aServiceId);
+		String [] downstreamDependencies = this.getDownStreamDependencies(aServiceId);
+		
+ 		List<String> all = new ArrayList<String>(upstreamDependencies.length + downstreamDependencies.length + 1);
+ 		for (String str : upstreamDependencies) {
+ 			all.add(str);
+ 		}
+ 		for (String str : downstreamDependencies) {
+ 			all.add(str);
+ 		}
+ 		all.add(aServiceId);
+ 		String [] arrayAll = new String[all.size()];
+ 		arrayAll = all.toArray(arrayAll);
+ 		return arrayAll;
+	} */
+	
+	public Map<String, String> getAllInPathOfAsMap(String aServiceId, Group home_group) {
+		// check kill_all_enabled flag
+			Map<String, String> upstreamDependencies = home_group.getUpstreamDependenciesAsMap(aServiceId);
+			Map<String, String> downstreamDependencies = home_group.getDownStreamDependenciesAsMap(aServiceId);
+			
+	 		Map<String, String> all = new HashMap<String, String>();
+	 		all.putAll(upstreamDependencies);
+	 		all.putAll(downstreamDependencies);
+	 		
+	 		all.put(aServiceId,  home_group.getAlias());
+	 		
+	 		return all;
+		}
+	
+
+	@Override
+    public String toString() {
+		String result = "compositeApplication [" + alias + "]";
+		if (top_level != null) {
+			result = result + top_level.toString();
+		}
+        return result;
+    }
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigCartridge.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigCartridge.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigCartridge.java
new file mode 100644
index 0000000..ad494ee
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigCartridge.java
@@ -0,0 +1,20 @@
+package org.apache.stratos.messaging.domain.topology;
+
+import java.io.Serializable;
+
+
+public class ConfigCartridge  implements Serializable {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String alias;
+
+	public String getAlias() {
+		return alias;
+	}
+
+	public void setAlias(String alias) {
+		this.alias = alias;
+	}
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigCompositeApplication.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigCompositeApplication.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigCompositeApplication.java
new file mode 100644
index 0000000..eb0564b
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigCompositeApplication.java
@@ -0,0 +1,42 @@
+package org.apache.stratos.messaging.domain.topology;
+
+
+import java.io.Serializable;
+import java.util.List;
+
+
+
+public class ConfigCompositeApplication  implements Serializable {
+	
+	private String applicationId;
+	private String alias;
+	private List<ConfigGroup> components;
+	private List<ConfigCartridge> cartridges;
+	
+	public String getApplicationId() {
+		return applicationId;
+	}
+	public void setApplicationId(String applicationId) {
+		this.applicationId = applicationId;
+	}
+	public String getAlias() {
+		return alias;
+	}
+	public void setAlias(String alias) {
+		this.alias = alias;
+	}
+	public List<ConfigGroup> getComponents() {
+		return components;
+	}
+	public void setComponents(List<ConfigGroup> components) {
+		this.components = components;
+	}
+	public List<ConfigCartridge> getCartridges() {
+		return cartridges;
+	}
+	public void setCartridges(List<ConfigCartridge> cartridges) {
+		this.cartridges = cartridges;
+	}
+	
+
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigDependencies.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigDependencies.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigDependencies.java
new file mode 100644
index 0000000..f8281d9
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigDependencies.java
@@ -0,0 +1,57 @@
+package org.apache.stratos.messaging.domain.topology;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class ConfigDependencies  implements Serializable {
+	private static final long serialVersionUID = 1L;
+	private List<Pair> startup_order = new ArrayList<Pair>();
+	private String kill_behavior;
+		
+	
+	public String getKill_behavior() {
+		return kill_behavior;
+	}
+
+	public void setKill_behavior(String kill_behavior) {
+		this.kill_behavior = kill_behavior;
+	}
+
+	public List<Pair> getStartup_order() {
+		return startup_order;
+	}
+
+	public void setStartup_order(List<Pair> startup_order) {
+		this.startup_order = startup_order;
+	}
+	
+	
+
+	public static class Pair  implements Serializable {
+		private String key;
+		private String value;
+		
+		private Pair() {}
+		
+		public Pair(String key, String value) {
+			this.key = key;
+			this.value = value;
+		}
+		
+		public String getKey() {
+			return key;
+		}
+		public void setKey(String key) {
+			this.key = key;
+		}
+		public String getValue() {
+			return value;
+		}
+		public void setValue(String value) {
+			this.value = value;
+		}
+	}
+	
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/67e868eb/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigGroup.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigGroup.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigGroup.java
new file mode 100644
index 0000000..25b4991
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/ConfigGroup.java
@@ -0,0 +1,33 @@
+package org.apache.stratos.messaging.domain.topology;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+public class ConfigGroup   implements Serializable {
+	private static final long serialVersionUID = 1L;
+	private  String alias;
+	private  List<String> subscribables;
+	private ConfigDependencies dependencies;
+	
+	
+	public String getAlias() {
+		return alias;
+	}
+	public void setAlias(String alias) {
+		this.alias = alias;
+	}
+	public List<String> getSubscribables() {
+		return subscribables;
+	}
+	public void setSubscribables(List<String> subscribables) {
+		this.subscribables = subscribables;
+	}
+	public ConfigDependencies getDependencies() {
+		return dependencies;
+	}
+	public void setDependencies(ConfigDependencies dependencies) {
+		this.dependencies = dependencies;
+	}
+	
+}