You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/01/08 06:51:24 UTC

[13/46] renamed adc.mgt to manager

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/model/TopologyClusterInformationModel.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/model/TopologyClusterInformationModel.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/model/TopologyClusterInformationModel.java
deleted file mode 100644
index 8fe10e7..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/model/TopologyClusterInformationModel.java
+++ /dev/null
@@ -1,502 +0,0 @@
-/*
- * 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.adc.mgt.topology.model;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.messaging.domain.topology.Cluster;
-
-import java.util.*;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-public class TopologyClusterInformationModel {
-
-    private static final Log log = LogFactory.getLog(TopologyClusterInformationModel.class);
-
-    private Map<Integer, Set<CartridgeTypeContext>> tenantIdToCartridgeTypeContextMap;
-    //private Map<TenantIdAndAliasTopologyKey, Cluster> tenantIdAndAliasTopologyKeyToClusterMap;
-    //private Map<Integer, List<Cluster>> tenantIdToClusterMap;
-    //private Map<TenantIdAndTypeTopologyKey , List<Cluster>> tenantIdAndTypeTopologyKeyToClusterMap;
-    private static TopologyClusterInformationModel topologyClusterInformationModel;
-
-    //locks
-    private static volatile ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
-    private static volatile ReentrantReadWriteLock.ReadLock readLock = lock.readLock();
-    private static volatile ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock();
-
-    private TopologyClusterInformationModel() {
-        //tenantIdAndAliasTopologyKeyToClusterMap = new HashMap<TenantIdAndAliasTopologyKey, Cluster>();
-        //tenantIdAndTypeTopologyKeyToClusterMap = new HashMap<TenantIdAndTypeTopologyKey, List<Cluster>>();
-        //tenantIdToClusterMap = new HashMap<Integer, List<Cluster>>();
-        tenantIdToCartridgeTypeContextMap = new HashMap<Integer, Set<CartridgeTypeContext>>();
-    }
-
-    public static TopologyClusterInformationModel getInstance () {
-        if(topologyClusterInformationModel == null) {
-            synchronized (TopologyClusterInformationModel.class) {
-                if (topologyClusterInformationModel == null) {
-                    topologyClusterInformationModel = new TopologyClusterInformationModel();
-                }
-            }
-        }
-
-        return topologyClusterInformationModel;
-    }
-
-    /*public void addCluster (int tenantId, String cartridgeType, String subscriptionAlias, Cluster cluster) {
-
-        List<Cluster> clusters;
-        writeLock.lock();
-
-        try {
-            //[Tenant Id + Subscription Alias] -> Cluster map
-            tenantIdAndAliasTopologyKeyToClusterMap.putSubscription(new TenantIdAndAliasTopologyKey(tenantId, subscriptionAlias), cluster);
-
-            //Tenant Id -> Cluster map
-            clusters = tenantIdToClusterMap.get(tenantId);
-            if(clusters == null) {
-                clusters = new ArrayList<Cluster>();
-                clusters.add(cluster);
-                tenantIdToClusterMap.putSubscription(tenantId, clusters);
-            } else {
-                clusters.add(cluster);
-            }
-
-            //[Tenant Id + Cartridge Type] -> Cluster map
-            clusters = tenantIdAndTypeTopologyKeyToClusterMap.get(new TenantIdAndTypeTopologyKey(tenantId, cartridgeType));
-            if(clusters == null) {
-                clusters = new ArrayList<Cluster>();
-                clusters.add(cluster);
-                tenantIdAndTypeTopologyKeyToClusterMap.putSubscription(new TenantIdAndTypeTopologyKey(tenantId, cartridgeType), clusters);
-            } else {
-                clusters.add(cluster);
-            }
-
-        } finally {
-            writeLock.unlock();
-        }
-    } */
-
-    public void addCluster (int tenantId, String cartridgeType, String subscriptionAlias, Cluster cluster) {
-
-        Set<CartridgeTypeContext> cartridgeTypeContextSet = null;
-        Set<SubscriptionAliasContext> subscriptionAliasContextSet = null;
-
-        writeLock.lock();
-        try {
-            //check if a set of CartridgeTypeContext instances already exist for given tenant Id
-            cartridgeTypeContextSet = tenantIdToCartridgeTypeContextMap.get(tenantId);
-            if(cartridgeTypeContextSet != null) {
-                CartridgeTypeContext cartridgeTypeContext = null;
-                //iterate through the set
-                Iterator<CartridgeTypeContext> typeCtxIterator = cartridgeTypeContextSet.iterator();
-                while (typeCtxIterator.hasNext()) {
-                    //see if the set contains a CartridgeTypeContext instance with the given cartridge type
-                    cartridgeTypeContext = typeCtxIterator.next();
-                    if (cartridgeTypeContext.getType().equals(cartridgeType)){
-                        //if so, get the SubscriptionAliasContext set
-                        subscriptionAliasContextSet = cartridgeTypeContext.getSubscriptionAliasContextSet();
-                        break;
-                    }
-                }
-                //check if a SubscriptionAliasContext set is not found
-                if(subscriptionAliasContextSet == null) {
-                    //no SubscriptionAliasContext instance
-                    //create a new SubscriptionAliasContext instance
-                    SubscriptionAliasContext subscriptionAliasContext = new SubscriptionAliasContext(subscriptionAlias,
-                            cluster);
-                    //create a SubscriptionAliasContext set
-                    subscriptionAliasContextSet = new HashSet<SubscriptionAliasContext>();
-                    //add the created SubscriptionAliasContext instance to SubscriptionAliasContext set
-                    subscriptionAliasContextSet.add(subscriptionAliasContext);
-                    //set it to the CartridgeTypeContext instance
-                    cartridgeTypeContext = new CartridgeTypeContext(cartridgeType);
-                    cartridgeTypeContext.setSubscriptionAliasContextSet(subscriptionAliasContextSet);
-                    //add to the cartridgeTypeContextSet
-                    cartridgeTypeContextSet.add(cartridgeTypeContext);
-
-                } else {
-                    //iterate through the set
-                    /*Iterator<SubscriptionAliasContext> aliasIterator = subscriptionAliasContextSet.iterator();
-                    while (aliasIterator.hasNext()) {
-                        //see if the set contains a SubscriptionAliasContext instance with the given alias
-                        SubscriptionAliasContext subscriptionAliasContext = aliasIterator.next();
-                        if (subscriptionAliasContext.getSubscriptionAlias().equals(subscriptionAlias)) {
-                            //remove the existing one
-                            aliasIterator.remove();
-                            break;
-                        }
-                    }*/
-                    // remove the existing one
-                    subscriptionAliasContextSet.remove(new SubscriptionAliasContext(subscriptionAlias, null));
-
-                    //now, add the new cluster object
-                    subscriptionAliasContextSet.add(new SubscriptionAliasContext(subscriptionAlias, cluster));
-                }
-
-            } else {
-                //no entries for this tenant, go from down to top creating relevant objects and populating them
-                //create a new SubscriptionAliasContext instance
-                SubscriptionAliasContext subscriptionAliasContext = new SubscriptionAliasContext(subscriptionAlias,
-                        cluster);
-                //create a SubscriptionAliasContext set
-                subscriptionAliasContextSet = new HashSet<SubscriptionAliasContext>();
-                //add the created SubscriptionAliasContext instance to SubscriptionAliasContext set
-                subscriptionAliasContextSet.add(subscriptionAliasContext);
-
-                //create a new CartridgeTypeContext instance
-                CartridgeTypeContext cartridgeTypeContext = new CartridgeTypeContext(cartridgeType);
-                //link the SubscriptionAliasContextSet to it
-                cartridgeTypeContext.setSubscriptionAliasContextSet(subscriptionAliasContextSet);
-
-                //Create CartridgeTypeContext instance
-                cartridgeTypeContextSet = new HashSet<CartridgeTypeContext>();
-                //link the SubscriptionAliasContext set to CartridgeTypeContext instance
-                cartridgeTypeContext.setSubscriptionAliasContextSet(subscriptionAliasContextSet);
-
-                //link the CartridgeTypeContext set to the [tenant Id -> CartridgeTypeContext] map
-                tenantIdToCartridgeTypeContextMap.put(tenantId, cartridgeTypeContextSet);
-            }
-
-        } finally {
-            writeLock.unlock();
-        }
-    }
-
-    public Cluster getCluster (int tenantId, String cartridgeType, String subscriptionAlias) {
-
-        Set<CartridgeTypeContext> cartridgeTypeContextSet = null;
-        Set<SubscriptionAliasContext> subscriptionAliasContextSet = null;
-
-        readLock.lock();
-        try {
-            //check if a set of CartridgeTypeContext instances already exist for given tenant Id
-            cartridgeTypeContextSet = tenantIdToCartridgeTypeContextMap.get(tenantId);
-            if(cartridgeTypeContextSet != null) {
-                CartridgeTypeContext cartridgeTypeContext = null;
-                //iterate through the set
-                Iterator<CartridgeTypeContext> typeCtxIterator = cartridgeTypeContextSet.iterator();
-                while (typeCtxIterator.hasNext()) {
-                    //see if the set contains a CartridgeTypeContext instance with the given cartridge type
-                    cartridgeTypeContext = typeCtxIterator.next();
-                    if (cartridgeTypeContext.getType().equals(cartridgeType)){
-                        //if so, get the SubscriptionAliasContext set
-                        subscriptionAliasContextSet = cartridgeTypeContext.getSubscriptionAliasContextSet();
-                        break;
-                    }
-                }
-                if(subscriptionAliasContextSet != null) {
-                    //iterate through the set
-                    Iterator<SubscriptionAliasContext> aliasIterator = subscriptionAliasContextSet.iterator();
-                    while (aliasIterator.hasNext()) {
-                        //see if the set contains a SubscriptionAliasContext instance with the given alias
-                        SubscriptionAliasContext subscriptionAliasContext = aliasIterator.next();
-                        if (subscriptionAliasContext.equals(new SubscriptionAliasContext(subscriptionAlias, null))) {
-                            return subscriptionAliasContext.getCluster();
-                        }
-                    }
-                }
-            }
-
-        } finally {
-            readLock.unlock();
-        }
-
-        return null;
-    }
-
-    public Set<Cluster> getClusters (int tenantId, String cartridgeType) {
-
-        Set<CartridgeTypeContext> cartridgeTypeContextSet = null;
-        Set<SubscriptionAliasContext> subscriptionAliasContextSet = null;
-        Set<Cluster> clusterSet = null;
-
-        readLock.lock();
-        try {
-            cartridgeTypeContextSet = tenantIdToCartridgeTypeContextMap.get(tenantId);
-            if(cartridgeTypeContextSet != null) {
-                //iterate through the set
-                Iterator<CartridgeTypeContext> typeCtxIterator = cartridgeTypeContextSet.iterator();
-                while (typeCtxIterator.hasNext()) {
-                    //iterate and get each of SubscriptionAliasContext sets
-                    CartridgeTypeContext cartridgeTypeContext = typeCtxIterator.next();
-
-                    if (cartridgeType != null) {
-                        // check if CartridgeTypeContext instance matches the cartridgeType
-                        if (cartridgeTypeContext.equals(new CartridgeTypeContext(cartridgeType))) {
-
-                            subscriptionAliasContextSet = cartridgeTypeContext.getSubscriptionAliasContextSet();
-
-                            if (subscriptionAliasContextSet != null) {
-                                //iterate and convert to Cluster set
-                                Iterator<SubscriptionAliasContext> aliasCtxIterator = subscriptionAliasContextSet.iterator();
-
-                                clusterSet = new HashSet<Cluster>();
-                                while (aliasCtxIterator.hasNext()) {
-                                    clusterSet.add(aliasCtxIterator.next().getCluster());
-                                }
-                            }
-                        }
-
-                    } else {
-                        // no cartridgeType specified
-                        subscriptionAliasContextSet = cartridgeTypeContext.getSubscriptionAliasContextSet();
-
-                        if (subscriptionAliasContextSet != null) {
-                            //iterate and convert to Cluster set
-                            Iterator<SubscriptionAliasContext> aliasCtxIterator = subscriptionAliasContextSet.iterator();
-
-                            clusterSet = new HashSet<Cluster>();
-                            while (aliasCtxIterator.hasNext()) {
-                                clusterSet.add(aliasCtxIterator.next().getCluster());
-                            }
-                        }
-                    }
-                }
-            }
-
-        } finally {
-            readLock.unlock();
-        }
-
-        return clusterSet;
-    }
-
-    /*public Set<Cluster> getClusters (int tenantId) {
-
-        Set<CartridgeTypeContext> cartridgeTypeContextSet = null;
-        Set<SubscriptionAliasContext> subscriptionAliasContextSet = null;
-        Set<Cluster> clusterSet = null;
-
-        readLock.lock();
-        try {
-            cartridgeTypeContextSet = tenantIdToCartridgeTypeContextMap.get(tenantId);
-            if(cartridgeTypeContextSet != null) {
-                CartridgeTypeContext cartridgeTypeContext = null;
-                //iterate through the set
-                Iterator<CartridgeTypeContext> typeCtxIterator = cartridgeTypeContextSet.iterator();
-                while (typeCtxIterator.hasNext()) {
-                    //see if the set contains a CartridgeTypeContext instance with the given cartridge type
-                }
-
-                if (subscriptionAliasContextSet != null) {
-                    //iterate and convert to Cluster set
-                    Iterator<SubscriptionAliasContext> aliasCtxIterator = subscriptionAliasContextSet.iterator();
-                    clusterSet = new HashSet<Cluster>();
-                    while (aliasCtxIterator.hasNext()) {
-                        clusterSet.add(aliasCtxIterator.next().getCluster());
-                    }
-                }
-            }
-
-        } finally {
-            readLock.unlock();
-        }
-
-        return clusterSet;
-    }*/
-
-    public void removeCluster (int tenantId, String cartridgeType, String subscriptionAlias) {
-
-        Set<CartridgeTypeContext> cartridgeTypeContextSet = null;
-        Set<SubscriptionAliasContext> subscriptionAliasContextSet = null;
-
-        writeLock.lock();
-        try {
-            //check if a set of CartridgeTypeContext instances already exist for given tenant Id
-            cartridgeTypeContextSet = tenantIdToCartridgeTypeContextMap.get(tenantId);
-            if(cartridgeTypeContextSet != null) {
-                CartridgeTypeContext cartridgeTypeContext = null;
-                //iterate through the set
-                Iterator<CartridgeTypeContext> typeCtxIterator = cartridgeTypeContextSet.iterator();
-                while (typeCtxIterator.hasNext()) {
-                    //see if the set contains a CartridgeTypeContext instance with the given cartridge type
-                    cartridgeTypeContext = typeCtxIterator.next();
-                    if (cartridgeTypeContext.getType().equals(cartridgeType)){
-                        //if so, get the SubscriptionAliasContext set
-                        subscriptionAliasContextSet = cartridgeTypeContext.getSubscriptionAliasContextSet();
-                        break;
-                    }
-                }
-                if(subscriptionAliasContextSet != null) {
-                    //iterate through the set
-                    Iterator<SubscriptionAliasContext> aliasIterator = subscriptionAliasContextSet.iterator();
-                    while (aliasIterator.hasNext()) {
-                        //see if the set contains a SubscriptionAliasContext instance with the given alias
-                        SubscriptionAliasContext subscriptionAliasContext = aliasIterator.next();
-                        if (subscriptionAliasContext.getSubscriptionAlias().equals(subscriptionAlias)) {
-                            //remove the existing one
-                            aliasIterator.remove();
-                            break;
-                        }
-                    }
-                }
-            }
-
-        } finally {
-            writeLock.unlock();
-        }
-    }
-
-    private class CartridgeTypeContext {
-
-        private String type;
-        private Set<SubscriptionAliasContext> subscriptionAliasContextSet;
-
-        public CartridgeTypeContext (String type) {
-            this.type = type;
-        }
-
-        public void setSubscriptionAliasContextSet (Set<SubscriptionAliasContext> subscriptionAliasContextSet) {
-            this.subscriptionAliasContextSet = subscriptionAliasContextSet;
-        }
-
-        public String getType () {
-            return type;
-        }
-
-        public Set<SubscriptionAliasContext> getSubscriptionAliasContextSet () {
-            return subscriptionAliasContextSet;
-        }
-
-        public boolean equals(Object other) {
-
-            if(this == other) {
-                return true;
-            }
-            if(!(other instanceof CartridgeTypeContext)) {
-                return false;
-            }
-
-            CartridgeTypeContext that = (CartridgeTypeContext)other;
-            return this.type.equals(that.type);
-        }
-
-        public int hashCode () {
-            return type.hashCode();
-        }
-    }
-
-    private class SubscriptionAliasContext {
-
-        private String subscriptionAlias;
-        private Cluster cluster;
-
-        public SubscriptionAliasContext(String subscriptionAlias, Cluster cluster) {
-            this.subscriptionAlias = subscriptionAlias;
-            this.cluster = cluster;
-        }
-
-        public String getSubscriptionAlias () {
-            return subscriptionAlias;
-        }
-
-        public Cluster getCluster () {
-            return cluster;
-        }
-
-        public boolean equals(Object other) {
-
-            if(this == other) {
-                return true;
-            }
-            if(!(other instanceof SubscriptionAliasContext)) {
-                return false;
-            }
-
-            SubscriptionAliasContext that = (SubscriptionAliasContext)other;
-            return this.subscriptionAlias.equals(that.subscriptionAlias);
-        }
-
-        public int hashCode () {
-            return subscriptionAlias.hashCode();
-        }
-    }
-
-    private class TenantIdAndAliasTopologyKey {
-
-        private int tenantId;
-        private String subscriptionAlias;
-
-        public TenantIdAndAliasTopologyKey (int tenantId, String subscriptionAlias) {
-
-            this.tenantId = tenantId;
-            this.subscriptionAlias = subscriptionAlias;
-        }
-
-        public boolean equals(Object other) {
-
-            if(this == other) {
-                return true;
-            }
-            if(!(other instanceof TenantIdAndAliasTopologyKey)) {
-                return false;
-            }
-
-            TenantIdAndAliasTopologyKey that = (TenantIdAndAliasTopologyKey)other;
-            return ((this.tenantId == that.tenantId) && (this.subscriptionAlias == that.subscriptionAlias));
-        }
-
-        public int hashCode () {
-
-            int subscriptionAliasHashCode = 0;
-            if(subscriptionAlias != null) {
-                subscriptionAliasHashCode = subscriptionAlias.hashCode();
-            }
-
-            return (tenantId * 3 + subscriptionAliasHashCode * 5);
-        }
-    }
-
-    public class TenantIdAndTypeTopologyKey {
-
-        private int tenantId;
-        private String subscriptionAlias;
-
-        public TenantIdAndTypeTopologyKey (int tenantId, String subscriptionAlias) {
-
-            this.tenantId = tenantId;
-            this.subscriptionAlias = subscriptionAlias;
-        }
-
-        public boolean equals(Object other) {
-
-            if(this == other) {
-                return true;
-            }
-            if(!(other instanceof TenantIdAndTypeTopologyKey)) {
-                return false;
-            }
-
-            TenantIdAndTypeTopologyKey that = (TenantIdAndTypeTopologyKey)other;
-            return ((this.tenantId == that.tenantId) && (this.subscriptionAlias == that.subscriptionAlias));
-        }
-
-        public int hashCode () {
-
-            int subscriptionAliasHashCode = 0;
-            if(subscriptionAlias != null) {
-                subscriptionAliasHashCode = subscriptionAlias.hashCode();
-            }
-
-            return (tenantId * 3 + subscriptionAliasHashCode * 5);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/receiver/StratosManagerTopologyReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/receiver/StratosManagerTopologyReceiver.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/receiver/StratosManagerTopologyReceiver.java
deleted file mode 100644
index 74180eb..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/receiver/StratosManagerTopologyReceiver.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * 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.adc.mgt.topology.receiver;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.adc.mgt.retriever.DataInsertionAndRetrievalManager;
-import org.apache.stratos.adc.mgt.subscription.CartridgeSubscription;
-import org.apache.stratos.adc.mgt.topology.model.TopologyClusterInformationModel;
-import org.apache.stratos.messaging.domain.topology.Cluster;
-import org.apache.stratos.messaging.domain.topology.Service;
-import org.apache.stratos.messaging.event.Event;
-import org.apache.stratos.messaging.event.topology.*;
-import org.apache.stratos.messaging.listener.topology.*;
-import org.apache.stratos.messaging.message.processor.topology.TopologyMessageProcessorChain;
-import org.apache.stratos.messaging.message.receiver.topology.TopologyEventMessageDelegator;
-import org.apache.stratos.messaging.message.receiver.topology.TopologyManager;
-import org.apache.stratos.messaging.message.receiver.topology.TopologyReceiver;
-
-public class StratosManagerTopologyReceiver implements Runnable {
-
-    private static final Log log = LogFactory.getLog(StratosManagerTopologyReceiver.class);
-
-    private TopologyReceiver stratosManagerTopologyReceiver;
-    private boolean terminate;
-
-    public StratosManagerTopologyReceiver() {
-        this.terminate = false;
-        this.stratosManagerTopologyReceiver = new TopologyReceiver(createMessageDelegator());
-    }
-
-    private TopologyEventMessageDelegator createMessageDelegator() {
-        TopologyMessageProcessorChain processorChain = createEventProcessorChain();
-        return new TopologyEventMessageDelegator(processorChain);
-    }
-
-    private TopologyMessageProcessorChain createEventProcessorChain() {
-
-        TopologyMessageProcessorChain processorChain = new TopologyMessageProcessorChain();
-
-        //add listner to Complete Topology Event
-        processorChain.addEventListener(new CompleteTopologyEventListener() {
-            @Override
-            protected void onEvent(Event event) {
-
-                log.info("********** [CompleteTopologyEventListener] Received: " + event.getClass() + " **********");
-
-                try {
-                    TopologyManager.acquireReadLock();
-
-                    for (Service service : TopologyManager.getTopology().getServices()) {
-                        //iterate through all clusters
-                        for (Cluster cluster : service.getClusters()) {
-                            //get subscription details
-                            CartridgeSubscription cartridgeSubscription = getCartridgeSubscription(cluster.getClusterId());
-
-                            if(cartridgeSubscription != null) {
-                                //add the information to Topology Cluster Info. model
-                                TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscription.getSubscriber().getTenantId(),
-                                        cartridgeSubscription.getType(), cartridgeSubscription.getAlias(), cluster);
-                            }
-                        }
-                    }
-                } finally {
-                    TopologyManager.releaseReadLock();
-                }
-            }
-        });
-
-        //Cluster Created event listner
-        processorChain.addEventListener(new ClusterCreatedEventListener() {
-            @Override
-            protected void onEvent(Event event) {
-
-                log.info("********** [ClusterCreatedEventListener] Received: " + event.getClass() + " **********");
-
-                ClusterCreatedEvent clustercreatedEvent = (ClusterCreatedEvent) event;
-                //get subscription details
-                CartridgeSubscription cartridgeSubscription =
-                        getCartridgeSubscription(clustercreatedEvent.getClusterId());
-
-                if(cartridgeSubscription != null) {
-
-                    Cluster cluster;
-                    //acquire read lock
-                    TopologyManager.acquireReadLock();
-                    try {
-                        cluster = TopologyManager.getTopology().
-                                getService(cartridgeSubscription.getType()).getCluster(cartridgeSubscription.getClusterDomain());
-
-                        //add the information to Topology Cluster Info. model
-                        TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscription.getSubscriber().getTenantId(),
-                                cartridgeSubscription.getType(), cartridgeSubscription.getAlias(), cluster);
-
-                    } finally {
-                        //release read lock
-                        TopologyManager.releaseReadLock();
-                    }
-                }
-            }
-        });
-
-        //Cluster Removed event listner
-        processorChain.addEventListener(new ClusterRemovedEventListener() {
-            @Override
-            protected void onEvent(Event event) {
-
-                log.info("********** [ClusterRemovedEventListener] Received: " + event.getClass() + " **********");
-
-                ClusterRemovedEvent clusterRemovedEvent = (ClusterRemovedEvent) event;
-
-                CartridgeSubscription cartridgeSubscription =
-                        getCartridgeSubscription(clusterRemovedEvent.getClusterId());
-
-                if(cartridgeSubscription != null) {
-                    //add the information to Topology Cluster Info. model
-                    TopologyClusterInformationModel.getInstance().removeCluster(cartridgeSubscription.getSubscriber().getTenantId(),
-                            cartridgeSubscription.getType(), cartridgeSubscription.getAlias());
-                }
-            }
-        });
-
-        //Member Started event listner
-        processorChain.addEventListener(new MemberStartedEventListener() {
-            @Override
-            protected void onEvent(Event event) {
-
-                log.info("********** [MemberStartedEventListener] Received: " + event.getClass() + " **********");
-
-                MemberStartedEvent memberStartedEvent = (MemberStartedEvent) event;
-
-                String clusterDomain = memberStartedEvent.getClusterId();
-                CartridgeSubscription cartridgeSubscription = getCartridgeSubscription(clusterDomain);
-
-                if(cartridgeSubscription != null) {
-
-                    Cluster cluster;
-                    //acquire read lock
-                    TopologyManager.acquireReadLock();
-
-                    try {
-                        cluster = TopologyManager.getTopology().
-                                getService(cartridgeSubscription.getType()).getCluster(cartridgeSubscription.getClusterDomain());
-
-                        TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscription.getSubscriber().getTenantId(),
-                                cartridgeSubscription.getType(), cartridgeSubscription.getAlias(), cluster);
-
-                    } finally {
-                        //release read lock
-                        TopologyManager.releaseReadLock();
-                    }
-                }
-
-            }
-        });
-
-        //Member Activated event listner
-        processorChain.addEventListener(new MemberActivatedEventListener() {
-            @Override
-            protected void onEvent(Event event) {
-
-                log.info("********** [MemberActivatedEventListener] Received: " + event.getClass() + " **********");
-
-                MemberActivatedEvent memberActivatedEvent = (MemberActivatedEvent) event;
-
-                String clusterDomain = memberActivatedEvent.getClusterId();
-                CartridgeSubscription cartridgeSubscription = getCartridgeSubscription(clusterDomain);
-
-                if(cartridgeSubscription != null) {
-
-                    Cluster cluster;
-                    //acquire read lock
-                    TopologyManager.acquireReadLock();
-
-                    try {
-                        cluster = TopologyManager.getTopology().
-                                getService(cartridgeSubscription.getType()).getCluster(cartridgeSubscription.getClusterDomain());
-
-                        TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscription.getSubscriber().getTenantId(),
-                                cartridgeSubscription.getType(),
-                                cartridgeSubscription.getAlias(), cluster);
-
-                    } finally {
-                        //release read lock
-                        TopologyManager.releaseReadLock();
-                    }
-                }
-
-            }
-        });
-
-        //Member Suspended event listner
-        processorChain.addEventListener(new MemberSuspendedEventListener() {
-            @Override
-            protected void onEvent(Event event) {
-
-                log.info("********** [MemberSuspendedEventListener] Received: " + event.getClass() + " **********");
-
-                MemberSuspendedEvent memberSuspendedEvent = (MemberSuspendedEvent) event;
-
-                String clusterDomain = memberSuspendedEvent.getClusterId();
-                CartridgeSubscription cartridgeSubscription = getCartridgeSubscription(clusterDomain);
-
-                if(cartridgeSubscription != null) {
-
-                    Cluster cluster;
-                    //acquire read lock
-                    TopologyManager.acquireReadLock();
-
-                    try {
-                        cluster = TopologyManager.getTopology().
-                                getService(cartridgeSubscription.getType()).getCluster(cartridgeSubscription.getClusterDomain());
-
-                        TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscription.getSubscriber().getTenantId(),
-                                cartridgeSubscription.getType(), cartridgeSubscription.getAlias(), cluster);
-
-                    } finally {
-                        //release read lock
-                        TopologyManager.releaseReadLock();
-                    }
-                }
-
-            }
-        });
-
-        //Member Terminated event listner
-        processorChain.addEventListener(new MemberTerminatedEventListener() {
-            @Override
-            protected void onEvent(Event event) {
-
-                log.info("********** [MemberTerminatedEventListener] Received: " + event.getClass() + " **********");
-
-                MemberTerminatedEvent memberTerminatedEvent = (MemberTerminatedEvent) event;
-
-                String clusterDomain = memberTerminatedEvent.getClusterId();
-                CartridgeSubscription cartridgeSubscription = getCartridgeSubscription(clusterDomain);
-
-                if(cartridgeSubscription != null) {
-
-                    Cluster cluster;
-                    //acquire read lock
-                    TopologyManager.acquireReadLock();
-
-                    try {
-                        cluster = TopologyManager.getTopology().
-                                getService(cartridgeSubscription.getType()).getCluster(cartridgeSubscription.getClusterDomain());
-
-                        TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscription.getSubscriber().getTenantId(),
-                                cartridgeSubscription.getType(), cartridgeSubscription.getAlias(), cluster);
-
-                    } finally {
-                        //release read lock
-                        TopologyManager.releaseReadLock();
-                    }
-                }
-
-            }
-        });
-
-        return processorChain;
-    }
-
-    private CartridgeSubscription getCartridgeSubscription(String clusterDomain) {
-
-        try {
-            return new DataInsertionAndRetrievalManager().getCartridgeSubscription(clusterDomain);
-
-        } catch (Exception e) {
-            log.error("Error getting subscription information for cluster " + clusterDomain, e);
-            return null;
-        }
-    }
-
-    @Override
-    public void run() {
-
-        Thread thread = new Thread(stratosManagerTopologyReceiver);
-        thread.start();
-        log.info("Stratos Manager topology receiver thread started");
-
-        //Keep running till terminate is set from deactivate method of the component
-        while (!terminate) {
-            //loop while terminate = false
-        }
-        log.info("Stratos Manager topology receiver thread terminated");
-    }
-
-    //terminate Topology Receiver
-    public void terminate () {
-        stratosManagerTopologyReceiver.terminate();
-        terminate = true;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f74f29c/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java
deleted file mode 100644
index f498ee1..0000000
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/ApplicationManagementUtil.java
+++ /dev/null
@@ -1,1102 +0,0 @@
-package org.apache.stratos.adc.mgt.utils;
-/*
- *
- * 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.
- *
-*/
-
-
-import com.google.gson.Gson;
-import org.apache.axis2.clustering.ClusteringAgent;
-import org.apache.axis2.clustering.Member;
-import org.apache.axis2.clustering.management.GroupManagementAgent;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.adc.mgt.client.CloudControllerServiceClient;
-import org.apache.stratos.adc.mgt.dao.CartridgeSubscriptionInfo;
-import org.apache.stratos.adc.mgt.dao.DataCartridge;
-import org.apache.stratos.adc.mgt.dao.PortMapping;
-import org.apache.stratos.adc.mgt.dto.Cartridge;
-import org.apache.stratos.adc.mgt.dto.Policy;
-import org.apache.stratos.adc.mgt.dto.RepositoryInformation;
-import org.apache.stratos.adc.mgt.dto.SubscriptionInfo;
-import org.apache.stratos.adc.mgt.exception.*;
-import org.apache.stratos.adc.mgt.internal.DataHolder;
-import org.apache.stratos.adc.mgt.repository.Repository;
-import org.apache.stratos.adc.mgt.service.RepositoryInfoBean;
-import org.apache.stratos.adc.topology.mgt.service.TopologyManagementService;
-import org.apache.stratos.adc.topology.mgt.serviceobjects.DomainContext;
-import org.apache.stratos.cloud.controller.pojo.CartridgeInfo;
-import org.apache.stratos.cloud.controller.pojo.Properties;
-import org.apache.stratos.cloud.controller.pojo.Property;
-import org.apache.stratos.cloud.controller.stub.CloudControllerServiceIllegalArgumentExceptionException;
-import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException;
-import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.LsRemoteCommand;
-import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.api.errors.InvalidRemoteException;
-import org.eclipse.jgit.api.errors.TransportException;
-import org.eclipse.jgit.lib.Ref;
-import org.eclipse.jgit.storage.file.FileRepository;
-import org.eclipse.jgit.transport.CredentialsProvider;
-import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
-import org.wso2.carbon.utils.CarbonUtils;
-import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
-
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.rmi.RemoteException;
-import java.text.DecimalFormat;
-import java.util.*;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-/**
- * This class contains utility methods used by ApplicationManagementService.
- */
-public class ApplicationManagementUtil {
-
-    private static Log log = LogFactory.getLog(ApplicationManagementUtil.class);
-    //private static volatile CloudControllerServiceClient serviceClient;
-
-    /**
-     * Method used to createSubscription to cartridges.
-     */
-	public static SubscriptionInfo doSubscribe(String cartridgeType, String alias, String policy, String repoURL,
-			boolean privateRepo, String repoUsername, String repoPassword, String dataCartridgeType,
-			String dataCartridgeAlias, String username, int tenantId, String tenantDomain) throws ADCException,
-            PolicyException, UnregisteredCartridgeException, InvalidCartridgeAliasException,
-            DuplicateCartridgeAliasException, RepositoryRequiredException, AlreadySubscribedException,
-            RepositoryCredentialsRequiredException, InvalidRepositoryException, RepositoryTransportException {
-
-		String clusterDomain = "";
-        String clusterSubDomain = CartridgeConstants.DEFAULT_SUBDOMAIN;
-        String mgtClusterDomain = "";
-        String mgtClusterSubDomain = CartridgeConstants.DEFAULT_MGT_SUBDOMAIN;
-        CartridgeSubscriptionInfo subscription = null;
-        String mysqlPassword = null;
-        Repository repository = null;
-        DataCartridge dataCartridge = null;
-        String cartName = (alias != null && alias.trim().length() > 0) ? alias : cartridgeType;
-        String payloadZipFileName = "/tmp/" + UUID.randomUUID().toString() + ".zip";
-
-		log.info("Subscribing tenant [" + tenantId + "] with username [" + username + "] Cartridge Alias " + alias
-				+ ", Cartridge Type: " + cartridgeType + ", Repo URL: " + repoURL + ", Policy: " + policy);
-		
-		// Assign auto scaling only when necessary.
-		// Muti-tenant cartridge may not need a policy.
-		Policy autoScalingPolicy = null;
-		
-		CartridgeInfo cartridgeInfo;
-		try {
-			cartridgeInfo = CloudControllerServiceClient.getServiceClient().getCartridgeInfo(cartridgeType);
-		} catch (UnregisteredCartridgeException e) {
-			String message = cartridgeType
-					+ " is not a valid cartridge type. Please try again with a valid cartridge type.";
-			log.error(message);
-			throw e;
-		} catch (Exception e) {
-			String message = "Error getting info for " + cartridgeType;
-			log.error(message, e);
-			throw new ADCException(message, e);
-		}
-
-		validateCartridgeAlias(cartName, cartridgeType);
-		
-
-        if (cartridgeType.equals(CartridgeConstants.MYSQL_CARTRIDGE_NAME)) {
-        	
-        	autoScalingPolicy = PolicyHolder.getInstance().getDefaultPolicy();
-        	
-        	if (autoScalingPolicy == null) {
-        		throw new PolicyException("Could not load default auto-scaling policy.");
-        	}
-        	if (log.isDebugEnabled()) {
-    			log.debug("Selected Policy: " + new Gson().toJson(autoScalingPolicy));
-    		}
-        	
-            dataCartridge = new DataCartridge();
-            mysqlPassword = generatePassword();
-            dataCartridge.setPassword(mysqlPassword);
-            dataCartridge.setDataCartridgeType(cartridgeType);
-            dataCartridge.setUserName(CartridgeConstants.MYSQL_DEFAULT_USER);
-            clusterDomain = getDynamicClusterDomain(cartridgeType, cartName, cartridgeInfo);
-
-            /*egisterService(cartridgeType,
-                    clusterDomain,
-                    clusterSubDomain,
-                    createPayload(cartridgeInfo, cartName, autoScalingPolicy, repoURL, mysqlPassword, "localhost", payloadZipFileName, tenantId, tenantDomain),
-                    "*",
-                    cartName + "." + cartridgeInfo.getHostName(),
-                    setRegisterServiceProperties(autoScalingPolicy, tenantId,cartName));*/
-            deletePayloadFile(payloadZipFileName);
-        } else {
-        	
-			if (!new Boolean(System.getProperty(CartridgeConstants.FEATURE_INTERNAL_REPO_ENABLED))) {
-				if (log.isDebugEnabled()) {
-					log.debug("Internal repo feature is not enabled.");
-				}
-
-				if (repoURL == null || repoURL.trim().length() == 0) {
-					throw new RepositoryRequiredException("External repository required for subscription");
-				}
-			}
-
-			if (repoURL != null && repoURL.trim().length() > 0) {
-				if (log.isDebugEnabled()) {
-					log.debug("Repo URL entered: " + repoURL);
-				}
-				// Validate Remote Repository.
-				validateRepository(repoURL, repoUsername, repoPassword, privateRepo,
-						new Boolean(System.getProperty(CartridgeConstants.FEATURE_EXTERNAL_REPO_VAIDATION_ENABLED)));
-			}
-
-            try {
-                repository = manageRepository(repoURL, repoUsername, repoPassword, cartName, cartridgeInfo, username,
-                        tenantDomain);
-            } catch (Exception e) {
-                log.error(e.getMessage());
-                throw new ADCException(e);
-            }
-        	
-            // TODO: Check logic here
-            if (!cartridgeInfo.getMultiTenant()) {
-            	
-        		if (policy != null && policy.trim().length() > 0) {
-        			autoScalingPolicy = PolicyHolder.getInstance().getPolicy(policy);
-        		} else {
-        			autoScalingPolicy = PolicyHolder.getInstance().getDefaultPolicy();
-        		}
-        		if (autoScalingPolicy == null) {
-        			throw new PolicyException("Could not load auto-scaling policy.");
-        		}
-        		if (log.isDebugEnabled()) {
-        			log.debug("Selected Policy: " + new Gson().toJson(autoScalingPolicy));
-        		}
-
-                if (cartridgeInfo.getProvider().equalsIgnoreCase(CartridgeConstants.PROVIDER_NAME_WSO2)) { //carbon cartridge private jet mode
-
-                    clusterDomain = getDynamicClusterDomain(cartridgeType, cartName, cartridgeInfo);
-                   /* registerService(cartridgeType,
-                            clusterDomain,
-                            clusterSubDomain,
-                            createCarbonPayload(cartridgeInfo, cartName, alias, payloadZipFileName, tenantDomain, false),
-                            Integer.toString(tenantId),
-                            cartName + "." + cartridgeInfo.getHostName(),
-                            setRegisterServiceProperties(autoScalingPolicy,tenantId,cartName));*/
-                    deletePayloadFile(payloadZipFileName);
-
-                } else {
-                    clusterDomain = getDynamicClusterDomain(cartridgeType, cartName, cartridgeInfo);
-
-                    String mySQLPassword = null;
-                    String mySQLHostName = null;
-
-                    if (dataCartridgeType != null && dataCartridgeType.trim().length() > 0 && dataCartridgeAlias != null
-                            && dataCartridgeAlias.trim().length() > 0) {
-                        if (log.isInfoEnabled()) {
-                            log.info("Retrieving Data Cartridge info for connect ... Alias : " + dataCartridgeAlias
-                                    + ", Type: " + dataCartridgeType);
-                        }
-
-                        //TODO: Optimize following logic. Same logic is used in MySQLPasswordConfigurer
-                        int maxAttempts = Integer.parseInt(System.getProperty(CartridgeConstants.MAX_ATTEMPTS, "50"));
-                        int i = 0;
-
-                        while (i < maxAttempts) {
-                            i++;
-                            Cartridge c = null;
-                            try {
-                                c = getCartridgeInfo(dataCartridgeAlias, tenantDomain);
-                            } catch (NotSubscribedException e) {
-                                // This cannot happen here.
-                            }
-                            if (c != null) {
-                               /* if (!c.getStatus().equals("ACTIVE")) {
-                                    try {
-                                        Thread.sleep(3000);
-                                    } catch (InterruptedException ignore) {
-                                    }
-                                } else {
-                                    mySQLPassword = c.getPassword();
-                                    mySQLHostName = c.getIp();
-                                    break;
-                                }*/
-                            }
-                        }
-                        log.info(" MYSQL Cartridge info retrieved ");
-                    }
-
-                    /*registerService(cartridgeType,
-                            clusterDomain,
-                            clusterSubDomain,
-                            createPayload(cartridgeInfo, cartName, autoScalingPolicy, repoURL, mySQLPassword,
-                                    mySQLHostName, payloadZipFileName, tenantId, tenantDomain), "*",
-                            cartName + "." + cartridgeInfo.getHostName(),
-                            setRegisterServiceProperties(autoScalingPolicy,tenantId,cartName));*/
-                    deletePayloadFile(payloadZipFileName);
-                }
-
-            } else {
-            	
-            	boolean allowMultipleSubscription = new Boolean(
-						System.getProperty(CartridgeConstants.FEATURE_MULTI_TENANT_MULTIPLE_SUBSCRIPTION_ENABLED));
-
-				if (!allowMultipleSubscription) {
-					// If the cartridge is multi-tenant. We should not let users
-					// createSubscription twice.
-					boolean subscribed;
-					try {
-						subscribed = PersistenceManager.isAlreadySubscribed(cartridgeType, tenantId);
-					} catch (Exception e) {
-						String msg = "Error checking whether the cartridge type " + cartridgeType
-								+ " is already subscribed";
-						log.error(msg, e);
-						throw new ADCException(msg, e);
-					}
-					
-					if (subscribed) {
-						String msg = "Already subscribed to " + cartridgeType
-								+ ". This multi-tenant cartridge will not be available to createSubscription";
-						if (log.isDebugEnabled()) {
-							log.debug(msg);
-						}
-						throw new AlreadySubscribedException(msg, cartridgeType);
-					}
-				}
-
-                TopologyManagementService topologyService = DataHolder.getTopologyMgtService();
-                DomainContext[] domainContexts = topologyService.getDomainsAndSubdomains(cartridgeType, tenantId);
-                log.info("Retrieved " + domainContexts.length + " domain and corresponding subdomain pairs");
-
-                if (domainContexts.length > 0) {
-                	                        if(domainContexts.length > 2) {
-                	                            if(log.isDebugEnabled())
-                	                                log.debug("Too many domain sub domain pairs");
-                	                       }
-                	
-                	                        for (int i = 0 ; i < domainContexts.length ; i++) {
-                	                            if(domainContexts[i].getSubDomain().equalsIgnoreCase("mgt")) {
-                	                                mgtClusterDomain = domainContexts[i].getDomain();
-                	                                mgtClusterSubDomain = domainContexts[i].getSubDomain();
-                	                            }
-                	                          else
-                	                          {
-                	                              clusterDomain = domainContexts[i].getDomain();
-                	                              clusterSubDomain = domainContexts[i].getSubDomain();
-                	                          }
-                	                      }
-                } else {
-                	String msg = "Domain contexts not found for " + cartridgeType + " and tenant id " + tenantId;
-                    log.warn(msg);
-                    throw new ADCException(msg);
-                }
-            }
-        }
-
-        /*subscription =
-                createCartridgeSubscription(cartridgeInfo, autoScalingPolicy,
-                        cartridgeType, cartName, tenantId, tenantDomain,
-                        repository, clusterDomain, clusterSubDomain,
-                        mgtClusterDomain, mgtClusterSubDomain, dataCartridge);
-        */
-
-        try {
-			PersistenceManager.persistSubscription(subscription);
-		} catch (Exception e) {
-			throw new ADCException("Error Saving Subscription", e);
-		}
-        addDNSEntry(alias, cartridgeType);
-        return createSubscriptionResponse(subscription, repository);
-
-    }
-    
-    private static File getPayload(CartridgeInfo cartridgeInfo, String cartridgeName, Policy policy, String repoURL,
-                                   String mySQLPassword, String mySQLHost, String payloadZipFileName,
-                                   int tenantId, String tenantDomain) throws Exception {
-        String payloadString = "";
-
-        payloadString += "TENANT_RANGE=" + "*";
-        payloadString += ",TENANT_ID=" + tenantId;
-        payloadString +=
-            ",REPO_INFO_EPR=" +
-                    System.getProperty(CartridgeConstants.REPO_INFO_EPR);
-        payloadString +=
-                ",CARTRIDGE_AGENT_EPR=" +
-                        System.getProperty(CartridgeConstants.CARTRIDGE_AGENT_EPR);
-        payloadString += createPortMappingPayloadString(cartridgeInfo);
-        payloadString += ",HOST_NAME=" + cartridgeName + "." + cartridgeInfo.getHostName();
-        payloadString += ",MIN=" + policy.getMinAppInstances();
-        payloadString += ",MAX=" + policy.getMaxAppInstances();
-        payloadString += ",SERVICE=" + cartridgeInfo.getType();
-        payloadString += ",TENANT_CONTEXT=" + tenantDomain;
-        payloadString += ",CARTRIDGE_ALIAS=" + cartridgeName;
-
-        String gitRepoURL = null;
-        if (repoURL != null) {
-            gitRepoURL = repoURL;
-        } else {
-            gitRepoURL = "git@" + System.getProperty(CartridgeConstants.GIT_HOST_IP) + ":" + tenantDomain
-                    + System.getProperty("file.separator") + cartridgeName + ".git";
-        }
-        payloadString += ",GIT_REPO=" + gitRepoURL;
-        payloadString += ",APP_PATH=" + cartridgeInfo.getBaseDir();
-        payloadString += ",BAM_IP=" + System.getProperty(CartridgeConstants.BAM_IP);
-        payloadString += ",BAM_PORT=" + System.getProperty(CartridgeConstants.BAM_PORT);
-
-        // MYSQL params
-        payloadString += ",MYSQL_HOST=" + mySQLHost;
-        payloadString += ",MYSQL_USER=" + "root";
-        payloadString += ",MYSQL_PASSWORD=" + mySQLPassword;
-        
-        DecimalFormat df = new DecimalFormat("##.##");
-        df.setParseBigDecimal(true);
-
-        // Autoscaling params
-        payloadString += ",ALARMING_LOWER_RATE=" + df.format(policy.getAlarmingLowerRate());
-        payloadString += ",ALARMING_UPPER_RATE=" + df.format(policy.getAlarmingUpperRate());
-        payloadString += ",MAX_REQUESTS_PER_SEC=" + policy.getMaxRequestsPerSecond();
-        payloadString += ",ROUNDS_TO_AVERAGE=" + policy.getRoundsToAverage();
-        payloadString += ",SCALE_DOWN_FACTOR=" + df.format(policy.getScaleDownFactor());
-
-        log.info("** Payload ** " + payloadString);
-        
-        String payloadStringTempFile = "launch-params";
-
-        FileWriter fstream = new FileWriter(payloadStringTempFile);
-        BufferedWriter out = new BufferedWriter(fstream);
-        out.write(payloadString);
-        out.close();
-
-        FileOutputStream fos = new FileOutputStream(payloadZipFileName);
-        ZipOutputStream zos = new ZipOutputStream(fos);
-
-		addToZipFile(System.getProperty("user.dir"), payloadStringTempFile, zos);
-
-		File folder = new File(CarbonUtils.getCarbonHome()+
-				File.separator + "repository"
-				+ File.separator + "resources" + File.separator + "user-data");
-		for (File fileEntry : folder.listFiles()) {
-			if (!fileEntry.isDirectory()) {
-				addToZipFile(folder.getPath(), fileEntry.getName(), zos);
-			}
-		}
-
-        zos.close();
-        fos.close();
-
-        return new File(payloadZipFileName);
-    }
-
-    private static File getCarbonPayload (CartridgeInfo cartridgeInfo, String cartridgeName, String cartridgeAlias,
-                                          String payloadZipFileName, String tenantDomain, boolean isMultitenant) throws Exception {
-
-        String payloadString = "";
-        payloadString += "DEPLOYMENT=" + "default";  //TODO: Currently hard coded but can be either manager, worker or default.
-        //payloadString += ",DOMAIN=" + "s2.wso2.com";
-        payloadString += ",SERVICE=" + cartridgeInfo.getType();
-        //payloadString += ",TENANT_ID=" + tenantId;
-        payloadString += ",SC_IP=" + System.getProperty(CartridgeConstants.SC_IP);
-        payloadString += ",CARTRIDGE_ALIAS=" + cartridgeAlias;
-        payloadString += ",MULTITENANT=" + "false";
-
-        if(isMultitenant) { //not used at the moment
-            payloadString += ",DOMAIN=" + "wso2." + cartridgeInfo.getType() + ".domain";
-            payloadString += ",HOSTNAME=" + cartridgeInfo.getType() + ".s2.wso2.com";
-
-        } else {
-            payloadString += ",DOMAIN=" + cartridgeName + "." + cartridgeInfo.getHostName() + "." + cartridgeInfo.getType() +
-                    ".domain";
-            payloadString += ",HOSTNAME=" + cartridgeName + "." + cartridgeInfo.getHostName();
-        }
-
-        log.info("** Payload ** " + payloadString);
-
-        String payloadStringTempFile = "launch-params";
-
-        FileWriter fstream = new FileWriter(payloadStringTempFile);
-        BufferedWriter out = new BufferedWriter(fstream);
-        out.write(payloadString);
-        out.close();
-
-        FileOutputStream fos = new FileOutputStream(payloadZipFileName);
-        ZipOutputStream zos = new ZipOutputStream(fos);
-
-        addToZipFile(System.getProperty("user.dir"), payloadStringTempFile, zos);
-
-        zos.close();
-        fos.close();
-
-        return new File(payloadZipFileName);
-    }
-
-    private static String createPortMappingPayloadString(CartridgeInfo cartridgeInfo) {
-        // port mappings
-        StringBuilder portMapBuilder = new StringBuilder();
-        org.apache.stratos.cloud.controller.pojo.PortMapping[] portMappings = cartridgeInfo.getPortMappings();
-        for (org.apache.stratos.cloud.controller.pojo.PortMapping portMapping : portMappings) {
-            String port = portMapping.getPort();
-            String protocol = portMapping.getProtocol();
-            String proxyPort = portMapping.getProxyPort();
-            portMapBuilder.append(protocol).append(":").append(port).append(":").append(proxyPort).append("|");
-        }
-
-        // remove last "|" character
-        String portMappingString = portMapBuilder.toString();
-        String portMappingPayloadString = null;
-        if (portMappingString.charAt(portMappingString.length() - 1) == '|') {
-            portMappingPayloadString = portMappingString.substring(0, portMappingString.length() - 1);
-        } else {
-            portMappingPayloadString = portMappingString;
-        }
-
-        return ",PORTS=" + portMappingPayloadString;
-    }
-
-    private static void addToZipFile(String dir, String fileName, ZipOutputStream zos) throws FileNotFoundException,
-            IOException {
-
-        log.info("Writing '" + fileName + "' to zip file");
-
-        File file = new File(dir+File.separator+fileName);
-        FileInputStream fis = new FileInputStream(file);
-        ZipEntry zipEntry = new ZipEntry(fileName);
-        zos.putNextEntry(zipEntry);
-
-        byte[] bytes = new byte[1024];
-        int length;
-        while ((length = fis.read(bytes)) >= 0) {
-            zos.write(bytes, 0, length);
-        }
-
-        zos.closeEntry();
-        fis.close();
-    }
-
-    private static DataHandler createPayload(CartridgeInfo cartridgeInfo, String cartridgeName, Policy policy, String repoURL, String mySQLPwd, String mySQLHost,
-                                             String payloadZipFileName, int tenantId,
-                                             String tenantDomain)
-            throws ADCException {
-
-        FileDataSource dataSource = null;
-        File payloadFile = null;
-        try {
-            payloadFile = getPayload(cartridgeInfo, cartridgeName,
-            		policy, repoURL,
-                    mySQLPwd, mySQLHost, payloadZipFileName, tenantId, tenantDomain);
-            dataSource = new FileDataSource(payloadFile);
-        } catch (Exception e) {
-            String msg = "Exception : " + e.getMessage();
-            log.error(msg, e);
-            throw new ADCException("Subscribe failed ", e);
-        }
-        return new DataHandler(dataSource);
-    }
-
-    private static DataHandler createCarbonPayload (CartridgeInfo cartridgeInfo, String cartridgeName, String cartridgeAlias, String payloadZipFileName,
-                                                    String tenantDomain, boolean isMultitenant) throws ADCException {
-
-        FileDataSource dataSource = null;
-        File payloadFile = null;
-        try {
-            payloadFile = getCarbonPayload(cartridgeInfo, cartridgeName, cartridgeAlias, payloadZipFileName,
-                    tenantDomain, isMultitenant);
-            dataSource = new FileDataSource(payloadFile);
-
-        } catch (Exception e) {
-            String msg = "Exception : " + e.getMessage();
-            log.error(msg, e);
-            throw new ADCException("Subscribe failed ", e);
-        }
-
-        return new DataHandler(dataSource);
-    }
-
-    protected static String getAppDeploymentDirPath(String cartridge, AxisConfiguration axisConfig) {
-        return axisConfig.getRepository().getPath() + File.separator + cartridge;
-    }
-
-    public static CartridgeSubscriptionInfo createCartridgeSubscription(CartridgeInfo cartridgeInfo,
-                                                                    String policyName,
-                                                                    String cartridgeType,
-                                                                    String cartridgeName,
-                                                                    int tenantId,
-                                                                    String tenantDomain,
-                                                                    Repository repository,
-                                                                    String hostName,
-                                                                    String clusterDomain,
-                                                                    String clusterSubDomain,
-                                                                    String mgtClusterDomain,
-                                                                    String mgtClusterSubDomain,
-                                                                    DataCartridge dataCartridge,
-                                                                    String state,
-                                                                    String subscribeKey) {
-
-        CartridgeSubscriptionInfo cartridgeSubscriptionInfo = new CartridgeSubscriptionInfo();
-        cartridgeSubscriptionInfo.setCartridge(cartridgeType);
-        cartridgeSubscriptionInfo.setAlias(cartridgeName);
-        cartridgeSubscriptionInfo.setClusterDomain(clusterDomain);
-        cartridgeSubscriptionInfo.setClusterSubdomain(clusterSubDomain);
-        cartridgeSubscriptionInfo.setMgtClusterDomain(mgtClusterDomain);
-        cartridgeSubscriptionInfo.setMgtClusterSubDomain(mgtClusterSubDomain);
-        cartridgeSubscriptionInfo.setHostName(hostName);
-        cartridgeSubscriptionInfo.setPolicy(policyName);
-        cartridgeSubscriptionInfo.setRepository(repository);
-        cartridgeSubscriptionInfo.setPortMappings(createPortMappings(cartridgeInfo));
-        cartridgeSubscriptionInfo.setProvider(cartridgeInfo.getProvider());
-        cartridgeSubscriptionInfo.setDataCartridge(dataCartridge);
-        cartridgeSubscriptionInfo.setTenantId(tenantId);
-        cartridgeSubscriptionInfo.setTenantDomain(tenantDomain);
-        cartridgeSubscriptionInfo.setBaseDirectory(cartridgeInfo.getBaseDir());
-        //cartridgeSubscriptionInfo.setState("PENDING");
-        cartridgeSubscriptionInfo.setState(state);
-        cartridgeSubscriptionInfo.setSubscriptionKey(subscribeKey);
-        return cartridgeSubscriptionInfo;
-    }
-
-
-
-	private static List<PortMapping> createPortMappings(CartridgeInfo cartridgeInfo) {
-        List<PortMapping> portMappings = new ArrayList<PortMapping>();
-
-        if (cartridgeInfo.getPortMappings() != null) {
-            for (org.apache.stratos.cloud.controller.pojo.PortMapping portMapping : cartridgeInfo.getPortMappings()) {
-                PortMapping portMap = new PortMapping();
-                portMap.setPrimaryPort(portMapping.getPort());
-                portMap.setProxyPort(portMapping.getProxyPort());
-                portMap.setType(portMapping.getProtocol());
-                portMappings.add(portMap);
-            }
-        }
-        return portMappings;
-    }
-
-    /*public static CloudControllerServiceClient getServiceClient() throws AxisFault {
-        if (serviceClient == null) {
-            synchronized (CloudControllerServiceClient.class) {
-                if (serviceClient == null) {
-                    serviceClient = new CloudControllerServiceClient(
-                            System.getProperty(CartridgeConstants.AUTOSCALER_SERVICE_URL));
-                }
-            }
-        }
-        return serviceClient;
-    }*/
-
-    public static int getTenantId(ConfigurationContext configurationContext) {
-        int tenantId = MultitenantUtils.getTenantId(configurationContext);
-        if(log.isDebugEnabled()) {
-            log.debug("Returning tenant ID : " + tenantId);
-        }
-        return tenantId;
-    }
-
-	public static void validateCartridgeAlias(String alias, String cartridgeType) throws InvalidCartridgeAliasException, DuplicateCartridgeAliasException, ADCException {
-		// Do not use quotes in messages, current UI JavaScript does not work if there are quotes
-		// TODO: Fix message display in UI
-		String patternString = "([a-z0-9]+([-][a-z0-9])*)+";
-        Pattern pattern = Pattern.compile(patternString);
-        
-        if (!pattern.matcher(alias).matches()) {
-        	String msg = "The alias " + alias + " can contain only alpha-numeric lowercase characters. Please enter a valid alias.";
-			log.error(msg);
-			throw new InvalidCartridgeAliasException(msg, cartridgeType, alias);
-        }
-		
-		boolean isAliasTaken = false;
-		try {			
-			isAliasTaken = PersistenceManager.isAliasAlreadyTaken(alias, cartridgeType);			
-		} catch (Exception e) {
-			String msg = "Exception : " + e.getMessage();
-			log.error(msg, e);
-			throw new ADCException("Error when checking alias is already taken", e);
-		}
-		
-		if (isAliasTaken) {
-			String msg = "The alias " + alias + " is already taken. Please try again with a different alias.";
-			log.error(msg);
-			throw new DuplicateCartridgeAliasException(msg, cartridgeType, alias);
-		}
-	}
-	
-	public static RepositoryInformation validateRepository(String repoURL, String repoUsername, String repoPassword,
-			boolean privateRepo, boolean testConnection) throws RepositoryRequiredException, ADCException,
-			RepositoryCredentialsRequiredException, InvalidRepositoryException, RepositoryTransportException {
-		RepositoryInformation repositoryInformation = new RepositoryInformation();
-		repositoryInformation.setRepoURL(repoURL);
-		if (log.isDebugEnabled()) {
-			log.debug("Validating Git Repository");
-		}
-
-		if (repoURL != null && repoURL.trim().length() > 0 && privateRepo) {
-			if (log.isDebugEnabled()) {
-				log.debug("External repo validation is a private repo: " + repoURL);
-			}
-			if (repoUsername == null || repoUsername.trim().length() == 0 || repoPassword == null
-					|| repoPassword.trim().length() == 0) {
-				throw new RepositoryCredentialsRequiredException(
-						"Username and Password are required for private repository");
-			}
-		}
-
-		if (!testConnection) {
-			if (log.isDebugEnabled()) {
-				log.debug("External repo validation is not enabled");
-			}
-			return repositoryInformation;
-		}
-
-		if (repoURL == null || repoURL.trim().length() == 0) {
-			// This means, no repo to validate.
-			return repositoryInformation;
-		}
-		
-		if (log.isDebugEnabled()) {
-			log.debug("External repo validation enabled");
-		}
-
-		// This assumes running on Linux.
-		String parentDirName = "/tmp/" + UUID.randomUUID().toString();
-		CredentialsProvider credentialsProvider = null;
-		if (repoUsername != null && repoUsername.trim().length() > 0 && repoPassword != null
-				&& repoPassword.trim().length() > 0) {
-			if (log.isDebugEnabled()) {
-				log.debug("External repo credentails are passed: " + repoUsername);
-			}
-			credentialsProvider = new UsernamePasswordCredentialsProvider(repoUsername, repoPassword.toCharArray());
-		}
-
-		// Initialize temp local file repo
-		FileRepository localRepo = null;
-		try {
-			File f = new File(parentDirName + "/.git");
-			localRepo = new FileRepository(f);
-			if (log.isDebugEnabled()) {
-				log.debug("Local File Repo: " + f.getAbsoluteFile());
-			}
-		} catch (IOException e) {
-			throw new ADCException("Error creating local file repo", e);
-		}
-
-		Git git = new Git(localRepo);
-		LsRemoteCommand cmd = git.lsRemote().setRemote(repoURL);
-		if (credentialsProvider != null) {
-			cmd.setCredentialsProvider(credentialsProvider);
-		}
-		try {
-			Collection<Ref> collection = cmd.call();
-			List<String> refNames = new ArrayList<String>();
-			if (collection != null) {
-				for (Ref ref : collection) {
-					if (log.isDebugEnabled()) {
-						log.debug(repoURL + ": " + ref.getName());
-					}
-					refNames.add(ref.getName());
-				}
-			}
-			repositoryInformation.setRefName(refNames.toArray(new String[refNames.size()]));
-		} catch (InvalidRemoteException e) {
-			throw new InvalidRepositoryException("Provided repository url is not valid", e);
-		} catch (TransportException e) {
-			throw new RepositoryTransportException("Transport error when checking remote repository", e);
-		} catch (GitAPIException e) {
-			throw new ADCException("Git API error when checking remote repository", e);
-		}
-		return repositoryInformation;
-	}
-
-    public static String generatePassword() {
-
-        final int PASSWORD_LENGTH = 8;
-        StringBuffer sb = new StringBuffer();
-        for (int x = 0; x < PASSWORD_LENGTH; x++) {
-            sb.append((char) ((int) (Math.random() * 26) + 97));
-        }
-        return sb.toString();
-
-    }
-
-    private static void deletePayloadFile(String payloadZipFileName) {
-        File payloadFile = new File(payloadZipFileName);
-        payloadFile.delete();
-        log.info(" Payload file is deleted. ");
-    }
-
-    public static java.util.Properties setRegisterServiceProperties(Policy policy, int tenantId, String alias) {
-    	
-    	DecimalFormat df = new DecimalFormat("##.##");
-        df.setParseBigDecimal(true);
-
-        java.util.Properties properties = new java.util.Properties();
-        List<Property> allProperties = new ArrayList<Property>();
-        // min_app_instances
-        Property property = new Property();
-        property.setName("min_app_instances");
-        property.setValue(df.format(policy.getMinAppInstances()));
-        allProperties.add(property);
-        
-        
-     // max_app_instances
-        property = new Property();
-        property.setName("max_app_instances");
-        property.setValue(df.format(policy.getMaxAppInstances()));
-        allProperties.add(property);
-        
-        // max_requests_per_second
-        property = new Property();
-        property.setName("max_requests_per_second");
-        property.setValue(df.format(policy.getMaxRequestsPerSecond()));
-        allProperties.add(property);
-        
-        // alarming_upper_rate
-        property = new Property();
-        property.setName("alarming_upper_rate");
-        property.setValue(df.format(policy.getAlarmingUpperRate()));
-        allProperties.add(property);
-        
-     // alarming_lower_rate
-        property = new Property();
-        property.setName("alarming_lower_rate");
-        property.setValue(df.format(policy.getAlarmingLowerRate()));
-        allProperties.add(property);
-        
-        // scale_down_factor
-        property = new Property();
-        property.setName("scale_down_factor");
-        property.setValue(df.format(policy.getScaleDownFactor()));
-        allProperties.add(property);
-        
-     // rounds_to_average
-        property = new Property();
-        property.setName("rounds_to_average");
-        property.setValue(df.format(policy.getRoundsToAverage()));
-        allProperties.add(property);
-        
-       // tenant id
-        property = new Property();
-        property.setName("tenant_id");
-        property.setValue(String.valueOf(tenantId));
-        allProperties.add(property);
-        
-        // alias
-        property = new Property();
-        property.setName("alias");
-        property.setValue(String.valueOf(alias));
-        allProperties.add(property);
-        
-        return addToJavaUtilProperties(allProperties);
-    }
-
-    private static java.util.Properties addToJavaUtilProperties(List<Property> allProperties) {
-        java.util.Properties properties = new java.util.Properties();
-        for (Property property : allProperties) {
-            properties.put(property.getName(), property.getValue());
-        }
-        return properties;
-    }
-
-    private static String convertRepoURL(String gitURL) {
-        String convertedHttpURL = null;
-        if (gitURL != null && gitURL.startsWith("git@")) {
-            StringBuilder httpRepoUrl = new StringBuilder();
-            httpRepoUrl.append("http://");
-            String[] urls = gitURL.split(":");
-            String[] hostNameArray = urls[0].split("@");
-            String hostName = hostNameArray[1];
-            httpRepoUrl.append(hostName).append("/").append(urls[1]);
-            convertedHttpURL = httpRepoUrl.toString();
-        } else if (gitURL != null && gitURL.startsWith("http")) {
-            convertedHttpURL = gitURL;
-        }
-        return convertedHttpURL;
-    }
-
-    public static void addDNSEntry(String alias, String cartridgeType) {
-        //new DNSManager().addNewSubDomain(alias + "." + cartridgeType, System.getProperty(CartridgeConstants.ELB_IP));
-    }
-
-    public static SubscriptionInfo createSubscriptionResponse(CartridgeSubscriptionInfo cartridgeSubscriptionInfo, Repository repository) {
-    	SubscriptionInfo subscriptionInfo = new SubscriptionInfo();
-    	
-        if (repository != null && repository.getUrl() != null) {
-        	subscriptionInfo.setRepositoryURL(convertRepoURL(repository.getUrl()));
-        }
-        
-        subscriptionInfo.setHostname(cartridgeSubscriptionInfo.getHostName());
-        
-        return subscriptionInfo;
-    }
-
-    private static String getDynamicClusterDomain(String cartridgeType, String cartName,
-                                                  CartridgeInfo cartridgeInfo) {
-        return cartName + "." + cartridgeInfo.getHostName() + "." + cartridgeType +
-                ".domain";
-    }
-
-    private static Repository manageRepository(String repoURL, String repoUserName, String repoUserPassword,
-                                               String cartName, CartridgeInfo cartridgeInfo, String username,
-                                               String tenantDomain)
-            throws Exception {
-
-        Repository repository = new Repository();
-        if (repoURL != null && repoURL.trim().length() > 0) {
-            log.info("External REPO URL is provided as [" + repoURL +
-                    "]. Therefore not creating a new repo.");
-            //repository.setRepoName(repoURL.substring(0, repoURL.length()-4)); // remove .git part
-            repository.setUrl(repoURL);
-            repository.setUserName(repoUserName);
-            repository.setPassword(repoUserPassword);
-        } else {
-
-            //log.info("External REPO URL is not provided. Therefore creating a new repo. Adding to Executor");
-            log.info("External git repo url not provided for tenant "
-                    + tenantDomain + ", creating an git internal repository");
-
-            // for internal repos  internal git server username and password is used.
-            repository.setUserName(System.getProperty(CartridgeConstants.INTERNAL_GIT_USERNAME));
-            repository.setPassword(System.getProperty(CartridgeConstants.INTERNAL_GIT_PASSWORD));
-            /*repoCreationExecutor.execute(new RepositoryCreator(new RepositoryInfoBean(repoURL,
-                    cartName,
-                    tenantDomain,
-                    repository.getRepoUserName(),
-                    repository.getRepoUserPassword(),
-                    cartridgeInfo.getDeploymentDirs(),
-                    cartridgeInfo)));*/
-            new RepositoryCreator(new RepositoryInfoBean(repoURL,
-                    cartName,
-                    tenantDomain,
-                    repository.getUserName(),
-                    repository.getPassword(),
-                    cartridgeInfo.getDeploymentDirs(),
-                    cartridgeInfo)).createInternalRepository();
-            String repoName = tenantDomain + "/" + cartName;
-            repository.setUrl("https://" + System.getProperty(CartridgeConstants.GIT_HOST_NAME) + ":8443/git/" + repoName);
-
-        }
-        return repository;
-    }
-
-    public static Cartridge getCartridgeInfo(String alias, String tenantDomain) throws ADCException, NotSubscribedException {
-        log.info("Alias: " + alias);
-        if (alias == null) {
-            String msg = "Provided alias is empty";
-            log.error(msg);
-            throw new ADCException("Alias you provided is empty.");
-        }
-
-        CartridgeSubscriptionInfo sub;
-        try {
-            sub = PersistenceManager.getSubscription(tenantDomain, alias);
-        } catch (Exception e) {
-            String message = "Cannot get subscription info for " + tenantDomain + " and alias " + alias;
-            log.error(message, e);
-            throw new ADCException(message, e);
-        }
-        if (sub == null) {
-            String msg = "Info request for not subscribed cartridge";
-            log.error(msg);
-            throw new NotSubscribedException("You have not subscribed for " + alias, alias);
-        }
-
-        log.info("Cluster domain : " + sub.getClusterDomain() + " cartridge: " + sub.getCartridge());
-        
-        CartridgeInfo cartridgeInfo = null;
-        try {
-            cartridgeInfo = CloudControllerServiceClient.getServiceClient().getCartridgeInfo(sub.getCartridge());
-        } catch (Exception e) {
-            throw new ADCException("Cannot get cartridge info: " + sub.getCartridge(), e);
-        }
-
-        TopologyManagementService topologyMgtService = DataHolder.getTopologyMgtService();
-
-        String[] ips =
-                topologyMgtService.getActiveIPs(sub.getCartridge(),
-                        sub.getClusterDomain(),
-                        sub.getClusterSubdomain());
-        return populateCartridgeInfo(cartridgeInfo, sub, ips, tenantDomain);
-    }
-
-    public static void registerService(String cartridgeType, String domain, String subDomain,
-                                        StringBuilder payload, String tenantRange, String hostName,
-                                        String autoscalingPoliyName, String deploymentPolicyName,
-                                        Properties properties)
-            throws ADCException, UnregisteredCartridgeException {
-        log.info("Register service..");
-        try {
-            CloudControllerServiceClient.getServiceClient().register(domain, cartridgeType, payload.toString(), tenantRange,
-                    hostName, properties, autoscalingPoliyName, deploymentPolicyName);
-        } catch (CloudControllerServiceIllegalArgumentExceptionException e) {
-            String msg = "Exception is occurred in register service operation. Reason :" + e.getMessage();
-            log.error(msg, e);
-            throw new IllegalArgumentException("Not a registered cartridge " + cartridgeType, e);
-        } catch (CloudControllerServiceUnregisteredCartridgeExceptionException e) {
-            String msg = "Exception is occurred in register service operation. Reason :" + e.getMessage();
-            log.error(msg, e);
-            throw new UnregisteredCartridgeException("Not a registered cartridge " + cartridgeType, cartridgeType, e);
-        } catch (RemoteException e) {
-        	log.error("Remote Error", e);
-        	throw new ADCException("An error occurred in subscribing process");
-        }
-    }
-
-    public static Cartridge populateCartridgeInfo(CartridgeInfo cartridgeInfo, CartridgeSubscriptionInfo sub, String[] ips, String tenantDomain) throws ADCException {
-    	Cartridge cartridge = new Cartridge();
-        if (ips != null && ips.length > 0) {
-			if (log.isDebugEnabled()) {
-				log.debug("Found IPs: " + Arrays.toString(ips) + " for " + cartridgeInfo.getType() + ", "
-						+ sub.getAlias());
-			}
-			if (CartridgeConstants.DATA_CARTRIDGE_PROVIDER.equals(sub.getProvider())) {
-				// FIXME Temporary fix for SPI-301
-				//cartridge.setIp(ips[ips.length - 1]);
-				if (sub.getDataCartridge() != null) {
-					if (log.isDebugEnabled()) {
-						log.debug("Data Cartridge Info: " + sub.getDataCartridge().getUserName());
-					}
-					cartridge.setPassword(sub.getDataCartridge().getPassword());
-					cartridge.setDbUserName(sub.getDataCartridge().getUserName());
-				}
-			}
-			if (cartridgeInfo.getMultiTenant()) { // TODO refactor logic for carbon cartridges.
-				//cartridge.setStatus(CartridgeConstants.ACTIVE);
-				//cartridge.setActiveInstances(ips.length);
-			} else {
-				Map<String, String> instanceIpMap;
-				try {
-					instanceIpMap = PersistenceManager.getCartridgeInstanceInfo(ips, sub.getClusterDomain(),
-							sub.getClusterSubdomain());
-					//cartridge.setActiveInstances(ips.length);
-					//cartridge.setStatus(CartridgeConstants.ACTIVE);
-				} catch (Exception e) {
-					throw new ADCException("Error checking cartridge status");
-				}
-
-                if(cartridgeInfo.getProvider().equalsIgnoreCase(CartridgeConstants.PROVIDER_NAME_WSO2)) {
-                    //cartridge.setActiveInstances(ips.length);
-                    //cartridge.setStatus(CartridgeConstants.ACTIVE);
-                    /*List<Member> members = getMemberInstances(sub.getClusterDomain(), sub.getClusterSubdomain());
-                    if(members != null) {
-                        int activeInstancesCount = 0;
-                        for (Member member : members) {
-                            if (member != null && member.isActive() && member.getDomain().equals(sub.getClusterDomain())) {
-                                cartridge.setStatus(CartridgeConstants.ACTIVE);
-                                activeInstancesCount ++;
-                            }
-                        }
-                        cartridge.setActiveInstances(activeInstancesCount);
-                    }*/
-                }
-			}
-        } else {
-            log.warn("IPs have not returned through Topology Management for " + sub.getAlias());
-            //cartridge.setStatus(CartridgeConstants.SUBSCRIBED);
-        }
-        cartridge.setDisplayName(cartridgeInfo.getDisplayName());
-        cartridge.setDescription(cartridgeInfo.getDescription());
-        cartridge.setVersion(cartridgeInfo.getVersion());
-        cartridge.setMultiTenant(cartridgeInfo.getMultiTenant());
-
-        List<String> accessURLs = new ArrayList<String>();
-
-        if (cartridgeInfo.getPortMappings() != null) {
-            for (org.apache.stratos.cloud.controller.pojo.PortMapping portMapping : cartridgeInfo
-                    .getPortMappings()) {
-                if (portMapping != null) {
-					try {
-						int port = Integer.parseInt(portMapping.getProxyPort());
-	                	String protocol = portMapping.getProtocol();
-
-	                	if ("http".equals(protocol) && port == 80) {
-	                	    port = -1;
-	                	} else if ("https".equals(protocol) && port == 443) {
-	                	    port = -1;
-	                	}
-	                	
-	                	String file = "";
-	                	if (CartridgeConstants.PROVIDER_NAME_WSO2.equals(cartridgeInfo.getProvider()) && !cartridgeInfo.getMultiTenant()) {
-	                		// Carbon Private Jet Cartridges
-	                		file = "/t/" + tenantDomain;
-	                	}
-	                	
-	                	URL serverURL = new URL(protocol, sub.getHostName(), port, file);
-						accessURLs.add(serverURL.toExternalForm());
-					} catch (MalformedURLException e) {
-						if (log.isErrorEnabled()) {
-							log.error("Error getting access URL for " + cartridgeInfo.getType(), e);
-						}
-					} catch (NumberFormatException e) {
-						if (log.isErrorEnabled()) {
-							log.error("Error getting port of access URL for " + cartridgeInfo.getType(), e);
-						}
-					}
-                }
-            }
-        }
-
-        cartridge.setAccessURLs(accessURLs.toArray(new String[accessURLs.size()]));
-
-        cartridge.setCartridgeAlias(sub.getAlias());
-        cartridge.setCartridgeType(sub.getCartridge());
-        cartridge.setHostName(sub.getHostName());
-        //cartridge.setPolicy(sub.getPolicy());
-        Policy policy = PolicyHolder.getInstance().getPolicy(sub.getPolicy());
-        if (policy != null) {
-        //	cartridge.setPolicyDescription(policy.getDescription());
-        }
-        cartridge.setProvider(sub.getProvider());
-        cartridge.setMappedDomain(sub.getMappedDomain());
-
-        if (sub.getRepository() != null) {
-            cartridge.setRepoURL(convertRepoURL(sub.getRepository().getUrl()));
-        }
-        return cartridge;
-    }
-
-    private static List<Member> getMemberInstances(String domain, String subDomain) {
-
-        ClusteringAgent clusteringAgent = DataHolder.getServerConfigContext()
-                .getAxisConfiguration().getClusteringAgent();
-        GroupManagementAgent groupMgtAgent = clusteringAgent.getGroupManagementAgent(domain, subDomain);
-
-        if (groupMgtAgent == null) {
-            log.warn("Group Management Agent not found for domain : " + domain +
-                    ", sub domain : " + subDomain);
-            return null;
-        }
-
-        List<Member> members = groupMgtAgent.getMembers();
-        if (members == null || members.isEmpty()) {
-            return null;
-        }
-
-        return members;
-    }
-
-    private static String checkCartridgeStatus(Map<String, String> instanceIpMap) {
-        if (instanceIpMap.values().contains(CartridgeConstants.ACTIVE)) {
-            return CartridgeConstants.ACTIVE;
-        } else
-            return CartridgeConstants.NOT_READY;
-    }
-}