You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2013/07/21 21:02:00 UTC

[28/44] applied 0001-Moved-cloud-controller-1.0.1-to-products-and-removed.patch

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0ab7c4aa/products/stratos2/cloud_controller/1.0.0/docs/xdoc/user_guide.xml
----------------------------------------------------------------------
diff --git a/products/stratos2/cloud_controller/1.0.0/docs/xdoc/user_guide.xml b/products/stratos2/cloud_controller/1.0.0/docs/xdoc/user_guide.xml
deleted file mode 100644
index ae3e733..0000000
--- a/products/stratos2/cloud_controller/1.0.0/docs/xdoc/user_guide.xml
+++ /dev/null
@@ -1,416 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!--
-~ Copyright (c) 2009, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-~
-~ WSO2 Inc. 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.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-    <head>
-        <meta http-equiv="content-type" content="text/html; charset=iso-8859-1"/>
-        <title>WSO2 MB - User Guide</title>
-        <link href="css/mb-docs.css" rel="stylesheet"/>
-        <link href="styles/dist-docs.css" rel="stylesheet" type="text/css"
-              media="all"/>
-    </head>
-
-    <body>
-        <p>[<a href="docs_index.html">Documentation Index</a>]
-        </p>
-        <h1>WSO2 Message Broker(MB) User Guide</h1>
-
-        <p>The goal of this guide is to provide guidelines to be followed
-            in order to get familiar with WSO2 Message Broker and the procedure
-            of using the features provided by the product.
-        </p>
-
-        <h2>Contents</h2>
-
-        <div class="toc">
-            <ul>
-                <li>
-                    <a href="#Introduction">Introduction to Message Broker</a>
-                </li>
-                <!--li><a href="#Sample">Stock Quote Sample</a> </li-->
-                <li>
-                    <a href="#References">References</a>
-                </li>
-            </ul>
-        </div>
-
-        <h2 id="Introduction">Introduction to Message Broker</h2>
-        <p>This gives a brief introduction of how message broker can be used
-            in publishing and receiving messages.
-        </p>
-
-        <p>
-            WSO2 Message Broker is basically consist of two major features.They are:
-        </p>
-        <ul>
-            <li>Pub/ Sub Feature</li>
-            <li>Message Broker Clustering feature</li>
-        </ul>
-
-        <h3>
-            Pub/Sub Feature
-        </h3>
-
-        <p>This feature of the WSO2 Message Broker provides the facility for users to route messages
-            to the required users. If we are explaining deeply,
-            there is a concept called 'Topic' and message routing is done on the base of that
-            topic. When a particular user want to publish
-            a message to a particular sector , he creates a topic with a name related to the
-            messages that he is going to pulish. As an example, if a particular
-            user want to publish messages related with sports news, he can create a topic with the
-            name 'SportsNews' and publish the messages to that topic.
-        </p>
-
-        <p>
-            When another particular user is interested on any topic in the topic tree, he can
-            subscribe to that topic and receive messages which are published
-            to that topic by the publisher. As in the above example, when a particular user is
-            interested on sports, he can subscribed to the topic 'SportsNews'
-            and get messages published to that topic.
-        </p>
-
-        <p>
-            <img src="images/MessageFlowDiagram.jpg"
-                 alt="Pub/Sub Message Flow"/>
-        </p>
-        <h3>How to use Pub/Sub Feature</h3>
-
-        <p>In WSO2 Message Broker , Pub/Sub feature is one of the two major features. Inorder to use
-            this feature , it is needed to create a Topic and subscribe to it.
-        </p>
-        <ul>
-            <li>Step 01</li>
-
-            <p>Login to the server</p>
-
-            <li>Step 02</li>
-
-            <p>Click on the 'Add' menu item under the 'Topics' menu to create a topic. To create a
-                topic , the only thing needed to be provided is the name of the topic.
-            </p>
-
-            <p>
-                <img src="images/topic_add.png"
-                     alt="Add Topic"/>
-            </p>
-
-            <li>Step 03</li>
-
-            <p>When you add a topic using the 'add' button , you will be directed to the 'Topic
-                Browser' page and you will see the topic tree.
-            </p>
-            <p>
-                <img src="images/topic_browser.png"
-                     alt="Topic Browser"/>
-            </p>
-
-            <p>Once you click on a topic in the topic tree , it will display all the available
-                operations on a topic.
-                Once you click on the 'Help' link on that page you will find the information on all
-                the operations available on the topic
-            </p>
-
-            <p>If you click on details link , you will find following page.</p>
-
-            <p>
-                <img src="images/topic_details.png"
-                     alt="Topic Details"/>
-            </p>
-
-            <li>Step 04</li>
-
-            <p>Once you click on the topic , you will get the following page.</p>
-            <p>
-                <img src="images/topic_browser_clicked.png"
-                     alt="Topic Details"/>
-            </p>
-
-
-            <p>Once you click on 'Subscribe' link on the above page, you will be directed to Add
-                subscriptions page.
-            </p>
-
-            <p>
-                <img src="images/topic_addSubscription.png"
-                     alt="Subscribe to topics"/>
-            </p>
-
-            <p>You can create a subscription to the topic by provide the information on subscription
-            </p>
-            <li>Topic</li>
-            <p>User does not need to specify the topic here , since its automatically sets up.</p>
-
-            <li>Subscription Mode</li>
-
-            <p>This is the mode of the subscription and there are three modes.</p>
-
-            <p>The default mode for the subscription is "Topic Only". With this mode , user creates
-                the
-                subscription only to the topic. In this mode subscribers only receive events which
-                are published only to the that topic.
-            </p>
-
-            <p>Next mode of subscription is "Topic and Immediate child". In this mode subscribers of
-                the topic
-                receives events published not only the specified topic but also to the immediate
-                child of that topic.
-            </p>
-
-            <p>Last mode of subscription is "Topic and Children". In this mode subscribers of the
-                specified
-                topic will receive events published to the specified topic and all its children
-            </p>
-
-            <li>Event Sink URL</li>
-            <p>This is the URL which the subscriber should provide to receive events published. When
-                events are
-                published to the topic, they are sent to the specified URL here.
-            </p>
-
-            <li>Expiration Time</li>
-            <p>Here user can specify the expiration time of the subscription. This is not a required
-                parameter and
-                if user leave it alone, subscription will never be expired.
-            </p>
-
-            <p>Note : You can create a simple axis2service and use it's URL as the EventSinkURL .
-                Inorder to create an axis2service ,
-            </p>
-            <ul>
-                <li>Browse the location : /wso2mb-1.0.0/samples/services/EventSinkService
-                </li>
-                <li>Type the command : ant</li>
-
-                <P>(This ant task will create a simple axis2service 'EventSinkService' and deploy it
-                    in the location :
-                    /wso2mb-1.0.0/repository/deployment/server/axis2services/ )
-                </P>
-            </ul>
-
-            <p>Now you can create a subscription by providing the Event Sink URL :
-                https://localhost:9443/services/EventSinkService/getOMElement
-            </p>
-
-            <p>Click on the button 'Subscribe' and it will create the subscription and list it in
-                the subscription table of that topic in topic details page.
-            </p>
-
-
-            <p>
-                <img src="images/topic_subscriptionDetails.png"
-                     alt="Topic subscription details"/>
-            </p>
-
-
-            <li>Step 05</li>
-
-            <p>At the end of the subscribing process , you can test whether the topic and the
-                subscriptions created are working fine.
-                In order to do that what you have to do is type a XML message in the provided text
-                box and under the 'Publish' section
-                of Topic Details page and click on 'Publish button'
-            </p>
-
-            <p>Then check the command line and you will be able to see the XML Message that you
-                types in the provided space.
-            </p>
-            <h3>Clustering support of WSO2 Message Broker</h3>
-            <p>
-            	WSO2 MB  is now supporting clustering. That means high availability and failover support
-            	is there. You can setup several Message Broker nodes and configure them up to work as a cluster 
-            	so that if one node is down message routing and handling will be taken over by other nodes in the cluster.
-            	At the same time overhead of routing messages is distributed among the Message Broker cluster nodes so
-            	that overall performance of Message Brokering goes up. Thus, having a lot of publishers and subscribers will
-            	not be a problem anymore as there is no significant performance degrade with the number of publishers, 
-            	subscribers and exchanges. Scalability is beyond you with WSO2 MB with combined resources you have. 
-            	Fault tolerance brings you great benefits in deployment apart from the performance gain. 
-            </p>
-
-            <p>
-                There are several cluster deployment models supported by WSO2 Message Broker. Read on them at <a href="deployment_guide.html">
-                Deployment guide
-                </a>
-                and choose the suitable deployment pattern for your use-case and enable clustering as described there.
-            </p>
-
-            <li>   Sample Scenario - This sample is based on Clustering Scenario 1, <a href="cluster_scenario_01.html">'Starting external cassandra server
-                   and zoo keeper server and point all broker nodes to them'</a>:
-                <ul>
-                    <li>
-                        In your local machine setup two WSO2 MB instances running with external Cassandra server and Zookeeper server
-                        (note that you can setup Cassandra and Zookeeper to run on the same machine). In order to do that in the second WSO2 MB
-                        instance define a port offset changing &lt;MB Home&gt;/repository/conf/carbon.xml (eg: set port offset to 1).
-                    </li>
-                    <li>
-                        We will call first broker instance MB1 (runs on port 5672) and the other MB2 (runs on port 5673).
-                    </li>
-                    <li>
-                        Using following JMS client make subscriptions to a queue "myQueue" at MB1.
-                        <pre xml:space="preserve">
-
-                        import javax.jms.*;
-                        import javax.naming.InitialContext;
-                        import javax.naming.NamingException;
-                        import java.util.Properties;
-
-                        public class ConsumeClient {
-                            public void consumeMessage() {
-
-                                Properties initialContextProperties = new Properties();
-                                initialContextProperties.put("java.naming.factory.initial",
-                                        "org.wso2.andes.jndi.PropertiesFileInitialContextFactory");
-                                String connectionString = "amqp://admin:admin@clientID/carbon?brokerlist='tcp://localhost:5672'";
-                                initialContextProperties.put("connectionfactory.qpidConnectionfactory", connectionString);
-                                initialContextProperties.put("queue.myQueue", "myQueue");
-
-                                try {
-                                    InitialContext initialContext = new InitialContext(initialContextProperties);
-                                    QueueConnectionFactory queueConnectionFactory
-                                            = (QueueConnectionFactory) initialContext.lookup("qpidConnectionfactory");
-                                    QueueConnection queueConnection = queueConnectionFactory.createQueueConnection();
-                                    queueConnection.start();
-
-                                    QueueSession queueSession = queueConnection.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-                                    Destination destination = (Destination) initialContext.lookup("myQueue");
-
-                                    MessageConsumer messageConsumer = queueSession.createConsumer(destination);
-
-                                    TextMessage textMessage = (TextMessage) messageConsumer.receive();
-                                    System.out.println("Got message ==> " + textMessage.getText());
-
-                                    try {
-                                        Thread.sleep(9000);
-                                    } catch (Exception e) {
-                                        System.out.println(e);
-                                    }
-
-                                    messageConsumer.close();
-
-                                    queueSession.close();
-                                    queueConnection.stop();
-                                    queueConnection.close();
-
-                                } catch (NamingException e) {
-                                    e.printStackTrace();
-                                } catch (JMSException e) {
-                                    e.printStackTrace();
-                                }
-
-
-                            }
-
-                            public static void main(String[] args) {
-                                ConsumeClient sendConsumeClient = new ConsumeClient();
-                                sendConsumeClient.consumeMessage();
-                            }
-                        }
-
-                        </pre>
-
-                    </li>
-                    <li>
-                        Now using Message Sender described below, send a message to "myQueue" at MB2.
-
-                        <pre xml:space="preserve">
-
-                        import javax.jms.*;
-                        import javax.naming.InitialContext;
-                        import javax.naming.NamingException;
-                        import java.util.Properties;
-
-                        public class SendClient {
-                            public static void main(String[] args) {
-                                SendClient sendClient = new SendClient();
-                                sendClient.sendMessage();
-                            }
-
-                            public void sendMessage() {
-
-                                Properties initialContextProperties = new Properties();
-                                initialContextProperties.put("java.naming.factory.initial",
-                                        "org.wso2.andes.jndi.PropertiesFileInitialContextFactory");
-                                String connectionString = "amqp://admin:admin@clientID/carbon?brokerlist='tcp://localhost:5673'";
-                                initialContextProperties.put("connectionfactory.qpidConnectionfactory", connectionString);
-                                initialContextProperties.put("queue.myQueue", "myQueue");
-
-
-                                try {
-                                    InitialContext initialContext = new InitialContext(initialContextProperties);
-                                    QueueConnectionFactory queueConnectionFactory
-                                            = (QueueConnectionFactory) initialContext.lookup("qpidConnectionfactory");
-
-                                    QueueConnection queueConnection = queueConnectionFactory.createQueueConnection();
-                                    queueConnection.start();
-
-                                    QueueSession queueSession = queueConnection.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
-
-                                    TextMessage textMessage = queueSession.createTextMessage();
-                                    textMessage.setText("Test message");
-                                    System.out.println("Sending Message : " + textMessage.getText().length());
-
-                                    // Send message
-                                    Queue queue = (Queue) initialContext.lookup("myQueue");
-
-                                    QueueSender queueSender = queueSession.createSender(queue);
-                                    queueSender.send(textMessage);
-
-                                    // Housekeeping
-                                    queueSender.close();
-                                    queueSession.close();
-                                    queueConnection.stop();
-                                    queueConnection.close();
-
-                                } catch (NamingException e) {
-                                    e.printStackTrace();
-                                } catch (JMSException e) {
-                                    e.printStackTrace();
-                                }
-
-                            }
-                        }
-                        </pre>
-                    </li>
-                    <li>
-                        Now you can run the consumer to receive messages from MB1. You will notice that the message you have
-                        sent to MB2 can be received by MB1. Even if MB2 instance was destroyed message will be consumed to the consumer.
-                    </li>
-                </ul>
-            </li>
-            <li>
-                <p>Following is a typical deployment diagram for a Message Broker cluster setup.</p>
-
-                <img src="images/Deployment_Diagram.jpg"
-                     alt="A typical cluster deployment"/>
-            </li>
-        </ul>
-        <h2 id="References">References</h2>
-        <ul>
-            <li>
-                <a href="http://zookeeper.apache.org/">Apache Zookeeper
-                </a>
-            </li>
-            <li>
-                <a href="http://cassandra.apache.org/">Apache Cassandra
-                </a>
-            </li>
-        </ul>
-
-    </body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0ab7c4aa/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/content-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/content-bg.gif b/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/content-bg.gif
deleted file mode 100644
index 6d0a579..0000000
Binary files a/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/content-bg.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0ab7c4aa/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/favicon.ico
----------------------------------------------------------------------
diff --git a/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/favicon.ico b/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/favicon.ico
deleted file mode 100644
index f7b2bbf..0000000
Binary files a/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/favicon.ico and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0ab7c4aa/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/feature-02-icon.gif
----------------------------------------------------------------------
diff --git a/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/feature-02-icon.gif b/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/feature-02-icon.gif
deleted file mode 100644
index 8754de1..0000000
Binary files a/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/feature-02-icon.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0ab7c4aa/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/feature-03-icon.gif
----------------------------------------------------------------------
diff --git a/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/feature-03-icon.gif b/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/feature-03-icon.gif
deleted file mode 100644
index d81f1fe..0000000
Binary files a/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/feature-03-icon.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0ab7c4aa/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/intro-bg.gif
----------------------------------------------------------------------
diff --git a/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/intro-bg.gif b/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/intro-bg.gif
deleted file mode 100644
index a38a0df..0000000
Binary files a/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/intro-bg.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0ab7c4aa/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/logo.gif
----------------------------------------------------------------------
diff --git a/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/logo.gif b/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/logo.gif
deleted file mode 100644
index ee9beef..0000000
Binary files a/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/logo.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0ab7c4aa/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/sign-in.gif
----------------------------------------------------------------------
diff --git a/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/sign-in.gif b/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/sign-in.gif
deleted file mode 100644
index 9e992cc..0000000
Binary files a/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/sign-in.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0ab7c4aa/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/top.gif
----------------------------------------------------------------------
diff --git a/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/top.gif b/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/top.gif
deleted file mode 100644
index 9ed482c..0000000
Binary files a/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/images/top.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0ab7c4aa/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/index.html
----------------------------------------------------------------------
diff --git a/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/index.html b/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/index.html
deleted file mode 100644
index 81d79b7..0000000
--- a/products/stratos2/cloud_controller/1.0.0/modules/distribution/lib/home/index.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-	<head>  <script type="text/javascript" src="../../carbon/googleanalytics/js/jquery.min.js"></script>
-                <script type="text/javascript" src="../../carbon/googleanalytics/js/googleAnalyticsProcessor.js"></script>
-		<meta http-equiv="content-type" content="text/html;charset=utf-8" />
-		<title>StratosLive</title>
-		<link href="style.css" rel="stylesheet" type="text/css" media="all" />
-		<link rel="icon" href="images/favicon.ico" type="image/x-icon"/>
-		<meta name="description" content="WSO2 is the lean enterprise middleware company, delivering the only complete open source enterprise SOA middleware stack available internally and in the cloud." />
-		<meta name="keywords" content="cloud, platform-as-a-service, PaaS" />
-	</head>
-
-	<body>
-		<div id="main-content">
-			<div id="header">
-				<div class="logo"><img src="images/logo.gif"/></div>
-			</div>
-			<div id="content">
-				<div class="intro">
-					<div class="register">
-						<a href="https://stratoslive.wso2.com/carbon/tenant-register/select_domain.jsp"><img src="images/register.gif"/></a>
-						<a href="../carbon/sso-acs/redirect_ajaxprocessor.jsp"><img src="images/sign-in.gif"/></a>
-					</div>
-					<p>WSO2 MB brings Event Driven Architecture capabilities to WSO2 Carbon platform. It provides WS-Eventing, JMS and SQS interfaces to client. It uses Apache Qpid as the underling broker which supports AMQP.</p>
-				</div>
-				<div class="clear"></div>
-				<div class="features">
-					<h2>Features</h2>
-					<div class="feature feature-left">
-						<img src="images/feature-01-icon.gif"/>
-						<h2>Bring CEP to SOA</h2>
-						<p>
-							Bring CEP to SOA by processing XML events and produce results as XML events.
-						</p>
-					</div>
-					<div class="feature">
-						<img src="images/feature-02-icon.gif"/>
-						<h2>Registry Storage</h2>
-						<p>
-							Ability to define different event streams, queries and out put streams and store them in the registry as a bucket.
-						</p>
-					</div>
-					<div class="feature">
-					 	<img src="images/feature-03-icon.gif"/>
-						<h2>Esper and Fusion</h2>
-						<p>
-							Support Esper and fusion back end runtimes.
-						</p>
-					</div>
-					<div class="clear"></div>				
-				</div>
-				<div class="clear"></div>
-			</div>
-			<div id="footer">
-				<div class="footer-links">
-					<a href="http://www.wso2.com/cloud/services/terms-of-use" target="_blank">Terms of Service</a> | <a href="http://www.wso2.com/cloud/services/privacy-policy" target="_blank">Privacy Policy</a> | <a href="http://www.wso2.com/cloud/services/support" target="_blank">Support</a>
-				</div>
-				<div class="powered">
-						<span>Powered by</span><img src="images/powered-logo.gif" alt="ESB"/>
-					</div>
-					<span class="copyright">&copy;stratoslive.wso2.com copyright 2010-2011 WSO2, Inc. </span>
-				</div>
-			</div>
-		</div>
-	</body>
-
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0ab7c4aa/products/stratos2/cloud_controller/1.0.0/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos2/cloud_controller/1.0.0/modules/distribution/pom.xml b/products/stratos2/cloud_controller/1.0.0/modules/distribution/pom.xml
deleted file mode 100644
index f2eb494..0000000
--- a/products/stratos2/cloud_controller/1.0.0/modules/distribution/pom.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~  Copyright (c) 2009, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~  WSO2 Inc. 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.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.wso2.cc</groupId>
-        <artifactId>cc-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>wso2cc</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Cloud Controller - Distribution</name>
-    <url>http://wso2.org/projects/mb/java</url>
-    <description>WSO2 Cloud Controller - Distribution</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.rampart</groupId>
-            <artifactId>rampart</artifactId>
-            <version>${rampart.mar.version}</version>
-            <type>mar</type>
-        </dependency>
-        <dependency>
-            <groupId>slf4j.wso2</groupId>
-            <artifactId>slf4j</artifactId>
-            <version>${slf4j.wso2.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.andes</groupId>
-            <artifactId>andes-client</artifactId>
-	    <version>0.13-wso2v6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs.wso2</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-	    <version>1.1.0.wso2v1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.event.client</artifactId>
-	    <version>4.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.event.client.stub</artifactId>
-	     <version>4.1.0</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.0-alpha-4</version>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>unpack-wso2carbon</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.wso2.carbon</groupId>
-                                    <artifactId>wso2carbon-core</artifactId>
-                                    <version>${carbon.kernel.version}</version>
-                                    <type>zip</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>target</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>extract-docs-from-components</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <property name="tempdir" value="target/docs-temp"/>
-                                <mkdir dir="${tempdir}"/>
-                                <unzip dest="${tempdir}">
-                                    <fileset dir="target">
-                                        <include name="wso2cc-${project.version}.zip"/>
-                                    </fileset>
-                                </unzip>
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/"
-                                      overwrite="false">
-                                    <fileset
-                                            dir="${tempdir}/wso2cc-${project.version}/repository/components/">
-                                    </fileset>
-                                </copy>
-                                <unzip dest="${tempdir}">
-                                    <fileset
-                                            dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/">
-                                        <include name="*.ui*.jar"/>
-                                    </fileset>
-                                </unzip>
-                                <move todir="${tempdir}/web/" includeemptydirs="false">
-                                    <fileset dir="${tempdir}/web/">
-                                        <exclude name="**/yui/**"/>
-                                        <!--<exclude name="**/tenant-login/**"/>-->
-                                        <exclude name="**/codepress/**"/>
-                                        <exclude name="**/editarea/**"/>
-                                        <exclude name="**/ajax/**"/>
-                                        <exclude name="**/WEB-INF/**"/>
-                                        <include name="**/*.html"/>
-                                    </fileset>
-                                    <mapper type="glob" from="*.html" to="*.xml"/>
-                                </move>
-                                <mkdir dir="src/site/xdoc"/>
-                                <copy todir="src/site/xdoc" overwrite="false"
-                                      includeemptydirs="false">
-                                    <fileset dir="${tempdir}/web">
-                                        <exclude name="**/yui/**"/>
-                                        <exclude name="**/codepress/**"/>
-                                        <exclude name="**/editarea/**"/>
-                                        <exclude name="**/ajax/**"/>
-                                        <exclude name="**/WEB-INF/**"/>
-                                        <exclude name="**/*.html"/>
-                                        <exclude name="**/*.js"/>
-                                        <exclude name="**/*.jsp"/>
-                                        <exclude name="**/*.xsl"/>
-                                        <exclude name="*.*"/>
-                                    </fileset>
-                                </copy>
-                                <copy todir="src/site" overwrite="false" includeemptydirs="false">
-                                    <fileset dir="../../docs">
-                                    </fileset>
-                                </copy>
-                                <copy todir="target/site/" overwrite="false"
-                                      includeemptydirs="false">
-                                    <fileset dir="src/site/xdoc/">
-                                        <include name="**/images/*.*"/>
-                                    </fileset>
-                                </copy>
-                                <!--<delete dir="${tempdir}"/>-->
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>clean_target</id>
-                        <phase>install</phase>
-                        <configuration>
-                            <tasks>
-                                <delete dir="target/archive-tmp"/>
-                                <delete dir="target/dependency-maven-plugin-markers"/>
-                                <delete dir="target/maven-archiver"/>
-                                <delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
-                                <delete dir="target/sources"/>
-                                <delete dir="target/site"/>
-                                <delete dir="src/site"/>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <reportPlugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-project-info-reports-plugin</artifactId>
-                            <version>2.4</version>
-                            <reportSets>
-                                <reportSet>
-                                    <reports>
-                                        <report>index</report>
-                                    </reports>
-                                </reportSet>
-                            </reportSets>
-                        </plugin>
-                    </reportPlugins>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>site</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>pre_dist</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                        <configuration>
-                            <filters>
-                                <filter>${basedir}/src/main/assembly/filter.properties</filter>
-                            </filters>
-                            <descriptors>
-                                <descriptor>src/main/assembly/dist.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>dist</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                        <configuration>
-                            <filters>
-                                <filter>${basedir}/src/main/assembly/filter.properties</filter>
-                            </filters>
-                            <descriptors>
-                                <descriptor>src/main/assembly/bin.xml</descriptor>
-                                <descriptor>src/main/assembly/src.xml</descriptor>
-                                <descriptor>src/main/assembly/docs.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0ab7c4aa/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/assembly/dist.xml
----------------------------------------------------------------------
diff --git a/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/assembly/dist.xml b/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/assembly/dist.xml
deleted file mode 100644
index 6591fb5..0000000
--- a/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/assembly/dist.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.
- -->
-<assembly>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-        <!-- Copying p2 profile and osgi bundles-->
-        <fileSet>
-            <directory>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
-            <outputDirectory>wso2cc-${pom.version}/repository/components</outputDirectory>
-            <excludes>
-                <exclude>**/eclipse.ini</exclude>
-                <exclude>**/*.lock</exclude>
-                <exclude>**/.data</exclude>
-                <exclude>**/.settings</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0ab7c4aa/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/assembly/docs.xml
----------------------------------------------------------------------
diff --git a/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/assembly/docs.xml b/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/assembly/docs.xml
deleted file mode 100644
index 353f97f..0000000
--- a/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/assembly/docs.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.
- -->
-<assembly>
-    <id>docs</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>target/site</directory>
-            <outputDirectory>wso2cc-${pom.version}-docs</outputDirectory>
-            <fileMode>755</fileMode>
-        </fileSet>
-    </fileSets>
-</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0ab7c4aa/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/axis2.xml
----------------------------------------------------------------------
diff --git a/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/axis2.xml b/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/axis2.xml
deleted file mode 100755
index 6c8f0a8..0000000
--- a/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/axis2.xml
+++ /dev/null
@@ -1,523 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~  Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
-  ~
-  ~  WSO2 Inc. 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.
-  -->
-
-<axisconfig name="AxisJava2.0">
-    
-    <!-- ================================================= -->
-    <!--                  Parameters                       -->
-    <!-- ================================================= -->
-
-    <!-- This will give out the timout of the configuration contexts, in milliseconds -->
-    <parameter name="ConfigContextTimeoutInterval" locked="false">30000</parameter>
-
-    <!-- Synapse Configuration file location relative to CARBON_HOME -->
-    <parameter name="SynapseConfig.ConfigurationFile" locked="false">repository/deployment/server/synapse-configs</parameter>
-    <!-- Synapse Home parameter -->
-    <parameter name="SynapseConfig.HomeDirectory" locked="false">.</parameter>
-    <!-- Resolve root used to resolve synapse references like schemas inside a WSDL -->
-    <parameter name="SynapseConfig.ResolveRoot" locked="false">.</parameter>
-    <!-- Synapse Server name parameter -->
-    <parameter name="SynapseConfig.ServerName" locked="false">localhost</parameter>
-   
-
-    <!-- ================================================= -->
-    <!--                Message Formatters                 -->
-    <!-- ================================================= -->
-
-    <!-- Following content type to message formatter mapping can be used to implement support -->
-    <!-- for different message format serializations in Axis2. These message formats are -->
-    <!-- expected to be resolved based on the content type. -->
-    <messageFormatters>
-        <!--messageFormatter contentType="application/xml"
-                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>-->
-        <!--messageFormatter contentType="text/xml"
-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>-->
-        <!--messageFormatter contentType="application/soap+xml"
-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>-->
-        <!--messageFormatter contentType="application/x-www-form-urlencoded"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
-        <messageFormatter contentType="multipart/related"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-        <messageFormatter contentType="application/xml"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-        <messageFormatter contentType="application/txt"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-        <messageFormatter contentType="text/html"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-        <messageFormatter contentType="application/soap+xml"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-        <messageFormatter contentType="text/xml"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-        <!--messageFormatter contentType="x-application/hessian"
-                         class="org.apache.synapse.format.hessian.HessianMessageFormatter"/-->
-        <!--messageFormatter contentType=""
-                         class="org.apache.synapse.format.hessian.HessianMessageFormatter"/-->
-
-        <messageFormatter contentType="text/css"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-        <messageFormatter contentType="text/javascript"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-
-        <messageFormatter contentType="image/gif"
-                         class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-        <messageFormatter contentType="img/gif"
-                         class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-        <messageFormatter contentType="image/jpeg"
-                         class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-        <messageFormatter contentType="image/png"
-                         class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-        <messageFormatter contentType="image/ico"
-                         class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-        <messageFormatter contentType="image/x-icon"
-                         class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-
-	    <messageFormatter contentType="application/x-javascript"
-                             class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-	    <messageFormatter contentType="application/x-shockwave-flash"
-                             class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-	    <messageFormatter contentType="application/atom+xml"
-                         class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-        <messageFormatter contentType="application/x-www-form-urlencoded"
-                          class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-	    <messageFormatter contentType="application/xhtml+xml"
-                              class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-	    <messageFormatter contentType="application/octet-stream"
-                          class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-        <messageFormatter contentType="application/javascript"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-
-        <messageFormatter contentType="multipart/form-data"
-                          class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-        <messageFormatter contentType="application/soap+xml"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-
-        <!--JSON Message Formatters-->
-        <messageFormatter contentType="application/json"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-        <messageFormatter contentType="application/json/badgerfish"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-        <messageFormatter contentType="text/javascript"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-
-
-        <messageFormatter contentType=".*"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-
-    </messageFormatters>
-
-    <!-- ================================================= -->
-    <!--                Message Builders                   -->
-    <!-- ================================================= -->
-
-    <!-- Following content type to builder mapping can be used to implement support for -->
-    <!-- different message formats in Axis2. These message formats are expected to be -->
-    <!-- resolved based on the content type. -->
-    <messageBuilders>
-        <messageBuilder contentType="application/xml"
-                        class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-        <messageBuilder contentType="application/txt"
-                        class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-        <!--messageBuilder contentType="application/xml"
-                        class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
-        <!--messageBuilder contentType="application/x-www-form-urlencoded"
-                        class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
-        <!--messageBuilder contentType="multipart/form-data"
-                        class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
-        <messageBuilder contentType="multipart/related"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-        <messageBuilder contentType="application/soap+xml"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-        <messageBuilder contentType="text/plain"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-        <messageBuilder contentType="text/xml"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-        <!--messageBuilder contentType="x-application/hessian"
-                        class="org.apache.synapse.format.hessian.HessianMessageBuilder"/-->
-        <!--messageBuilder contentType=""
-                         class="org.apache.synapse.format.hessian.HessianMessageBuilder"/-->
-
-        <!--JSON Message Builders-->
-        <messageBuilder contentType="application/json"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-        <messageBuilder contentType="application/json/badgerfish"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-        <messageBuilder contentType="text/javascript"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-
-
-        <messageBuilder contentType="text/html"
-                                 class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-        <messageBuilder contentType="text/css"
-                                 class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-        <messageBuilder contentType="text/javascript"
-                                 class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-
-        <messageBuilder contentType="image/gif"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-        <messageBuilder contentType="img/gif"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-        <messageBuilder contentType="image/jpeg"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-        <messageBuilder contentType="image/png"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-        <messageBuilder contentType="image/ico"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-        <messageBuilder contentType="image/x-icon"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-
-
-	    <messageBuilder contentType="application/x-javascript"
-                           class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-	    <messageBuilder contentType="application/x-shockwave-flash"
-                           class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-	    <messageBuilder contentType="application/atom+xml"
-                           class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-	    <messageBuilder contentType="application/x-www-form-urlencoded"
-                            class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-	    <messageBuilder contentType="application/xhtml+xml"
-                           class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-	    <messageBuilder contentType="application/octet-stream"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-        <messageBuilder contentType="application/javascript"
-                                 class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-
-        <messageBuilder contentType="multipart/form-data"
-                        class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-        <messageBuilder contentType="application/soap+xml"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-
-
-        <messageBuilder contentType=".*"
-                        class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-
-    </messageBuilders>
-
-    <!-- ================================================= -->
-    <!--             Transport Ins (Listeners)             -->
-    <!-- ================================================= -->
-    <!--Default trasnport will be passthrough if you need to change please add it here -->
-   <transportReceiver name="http" class="org.wso2.carbon.transport.passthru.PassThroughHttpListener">
-      <parameter name="port">8280</parameter>
-      <parameter name="non-blocking"> true</parameter>
-   </transportReceiver>
-   <transportReceiver name="https" class="org.wso2.carbon.transport.passthru.PassThroughHttpSSLListener">
-        <parameter name="port" locked="false">8243</parameter>
-        <parameter name="non-blocking" locked="false">true</parameter>
-        <!--parameter name="bind-address" locked="false">hostname or IP address</parameter-->
-        <!--parameter name="WSDLEPRPrefix" locked="false">https://apachehost:port/somepath</parameter-->
-        <parameter name="keystore" locked="false">
-            <KeyStore>
-                <Location>repository/resources/security/wso2carbon.jks</Location>
-                <Type>JKS</Type>
-                <Password>wso2carbon</Password>
-                <KeyPassword>wso2carbon</KeyPassword>
-            </KeyStore>
-        </parameter>
-        <parameter name="truststore" locked="false">
-            <TrustStore>
-                <Location>repository/resources/security/client-truststore.jks</Location>
-                <Type>JKS</Type>
-                <Password>wso2carbon</Password>
-            </TrustStore>
-        </parameter>
-        <!--<parameter name="SSLVerifyClient">require</parameter>
-            supports optional|require or defaults to none -->
-    </transportReceiver>
-
-    <!-- uncomment for non blocking http transport based on HttpCore + NIO extensions -->
-    <!--transportReceiver name="http" class="org.apache.synapse.transport.nhttp.HttpCoreNIOListener">
-        <parameter name="port" locked="false">8280</parameter>
-        <parameter name="non-blocking" locked="false">true</parameter-->
-        <!--parameter name="bind-address" locked="false">hostname or IP address</parameter-->
-        <!--parameter name="WSDLEPRPrefix" locked="false">https://apachehost:port/somepath</parameter-->
-        <!--parameter name="httpGetProcessor" locked="false">org.wso2.carbon.transport.nhttp.api.NHttpGetProcessor</parameter-->
-    <!--/transportReceiver-->
-
-    <!-- the non blocking https transport based on HttpCore + SSL-NIO extensions -->
-    <!--transportReceiver name="https" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSSLListener">
-        <parameter name="port" locked="false">8243</parameter>
-        <parameter name="non-blocking" locked="false">true</parameter-->
-        <!--parameter name="bind-address" locked="false">hostname or IP address</parameter-->
-        <!--parameter name="WSDLEPRPrefix" locked="false">https://apachehost:port/somepath</parameter-->
-        <!--parameter name="httpGetProcessor" locked="false">org.wso2.carbon.transport.nhttp.api.NHttpGetProcessor</parameter-->
-        <!--parameter name="keystore" locked="false">
-            <KeyStore>
-                <Location>repository/resources/security/wso2carbon.jks</Location>
-                <Type>JKS</Type>
-                <Password>wso2carbon</Password>
-                <KeyPassword>wso2carbon</KeyPassword>
-            </KeyStore>
-        </parameter>
-        <parameter name="truststore" locked="false">
-            <TrustStore>
-                <Location>repository/resources/security/client-truststore.jks</Location>
-                <Type>JKS</Type>
-                <Password>wso2carbon</Password>
-            </TrustStore>
-        </parameter-->
-        <!--<parameter name="SSLVerifyClient">require</parameter>
-            supports optional|require or defaults to none -->
-    <!--/transportReceiver-->
-
-    <!-- ================================================= -->
-    <!--             Transport Outs (Senders)              -->
-    <!-- ================================================= -->
-    <!--Default trasnport will be passthrough if you need to change please add it here -->
-    <transportSender name="http"  class="org.wso2.carbon.transport.passthru.PassThroughHttpSender">
-        <parameter name="non-blocking" locked="false">true</parameter>
-        <parameter name="warnOnHTTP500" locked="false">*</parameter>
-        <!--parameter name="http.proxyHost" locked="false">localhost</parameter>
-        <parameter name="http.proxyPort" locked="false">3128</parameter>
-        <parameter name="http.nonProxyHosts" locked="false">localhost|moon|sun</parameter-->
-    </transportSender>
-    <transportSender name="https" class="org.wso2.carbon.transport.passthru.PassThroughHttpSSLSender">
-        <parameter name="non-blocking" locked="false">true</parameter>
-        <parameter name="keystore" locked="false">
-            <KeyStore>
-                <Location>repository/resources/security/wso2carbon.jks</Location>
-                <Type>JKS</Type>
-                <Password>wso2carbon</Password>
-                <KeyPassword>wso2carbon</KeyPassword>
-            </KeyStore>
-        </parameter>
-        <parameter name="truststore" locked="false">
-            <TrustStore>
-                <Location>repository/resources/security/client-truststore.jks</Location>
-                <Type>JKS</Type>
-                <Password>wso2carbon</Password>
-            </TrustStore>
-        </parameter>
-        <parameter name="HostnameVerifier">AllowAll</parameter>
-            <!--supports Strict|AllowAll|DefaultAndLocalhost or the default if none specified -->
-     </transportSender>
-    <!-- Uncomment for non-blocking http transport based on HttpCore + NIO extensions -->
-    <!--transportSender name="http" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSender">
-        <parameter name="non-blocking" locked="false">true</parameter>
-    </transportSender>
-    <transportSender name="https" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSSLSender">
-        <parameter name="non-blocking" locked="false">true</parameter>
-        <parameter name="keystore" locked="false">
-            <KeyStore>
-                <Location>repository/resources/security/wso2carbon.jks</Location>
-                <Type>JKS</Type>
-                <Password>wso2carbon</Password>
-                <KeyPassword>wso2carbon</KeyPassword>
-            </KeyStore>
-        </parameter>
-        <parameter name="truststore" locked="false">
-            <TrustStore>
-                <Location>repository/resources/security/client-truststore.jks</Location>
-                <Type>JKS</Type>
-                <Password>wso2carbon</Password>
-            </TrustStore>
-        </parameter>
-        <parameter name="HostnameVerifier">AllowAll</parameter-->
-            <!--supports Strict|AllowAll|DefaultAndLocalhost or the default if none specified -->
-    <!--/transportSender-->
-
-    <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
-
-    <!-- ================================================= -->
-    <!--                Clustering                         -->
-    <!-- ================================================= -->
-    <!--
-     To enable clustering for this node, set the value of "enable" attribute of the "clustering"
-     element to "true". The initialization of a node in the cluster is handled by the class
-     corresponding to the "class" attribute of the "clustering" element. It is also responsible for
-     getting this node to join the cluster.
-     -->
-    <clustering class="org.apache.axis2.clustering.tribes.TribesClusteringAgent" enable="true">
-
-        <!--
-           This parameter indicates whether the cluster has to be automatically initalized
-           when the AxisConfiguration is built. If set to "true" the initialization will not be
-           done at that stage, and some other party will have to explictly initialize the cluster.
-        -->
-        <parameter name="AvoidInitiation">true</parameter>
-
-        <!--
-           The membership scheme used in this setup. The only values supported at the moment are
-           "multicast" and "wka"
-
-           1. multicast - membership is automatically discovered using multicasting
-           2. wka - Well-Known Address based multicasting. Membership is discovered with the help
-                    of one or more nodes running at a Well-Known Address. New members joining a
-                    cluster will first connect to a well-known node, register with the well-known node
-                    and get the membership list from it. When new members join, one of the well-known
-                    nodes will notify the others in the group. When a member leaves the cluster or
-                    is deemed to have left the cluster, it will be detected by the Group Membership
-                    Service (GMS) using a TCP ping mechanism.
-        -->
-        <parameter name="membershipScheme">wka</parameter>
-
-        <!--
-         The clustering domain/group. Nodes in the same group will belong to the same multicast
-         domain. There will not be interference between nodes in different groups.
-        -->
-        <parameter name="domain">wso2.carbon.lb.domain</parameter>
-
-        <!--
-           When a Web service request is received, and processed, before the response is sent to the
-           client, should we update the states of all members in the cluster? If the value of
-           this parameter is set to "true", the response to the client will be sent only after
-           all the members have been updated. Obviously, this can be time consuming. In some cases,
-           such this overhead may not be acceptable, in which case the value of this parameter
-           should be set to "false"
-        -->
-        <parameter name="synchronizeAll">false</parameter>
-
-        <!--
-          The maximum number of times we need to retry to send a message to a particular node
-          before giving up and considering that node to be faulty
-        -->
-        <parameter name="maxRetries">10</parameter>
-
-        <!-- The multicast address to be used -->
-        <parameter name="mcastAddress">228.0.0.4</parameter>
-
-        <!-- The multicast port to be used -->
-        <parameter name="mcastPort">45564</parameter>
-
-        <!-- The frequency of sending membership multicast messages (in ms) -->
-        <parameter name="mcastFrequency">500</parameter>
-
-        <!-- The time interval within which if a member does not respond, the member will be
-         deemed to have left the group (in ms)
-         -->
-        <parameter name="memberDropTime">3000</parameter>
-
-        <!--
-           The IP address of the network interface to which the multicasting has to be bound to.
-           Multicasting would be done using this interface.
-        -->
-        <parameter name="mcastBindAddress">127.0.0.1</parameter>
-
-        <!-- The host name or IP address of this member -->
-        
-        <!--parameter name="localMemberHost">127.0.0.1</parameter-->
-        
-
-        <!--
-        The TCP port used by this member. This is the port through which other nodes will
-        contact this member
-         -->
-        <parameter name="localMemberPort">4000</parameter>
-
-        <!--
-        Preserve message ordering. This will be done according to sender order.
-        -->
-        <parameter name="preserveMessageOrder">false</parameter>
-
-        <!--
-        Maintain atmost-once message processing semantics
-        -->
-        <parameter name="atmostOnceMessageSemantics">false</parameter>
-         
-        <!--
-           This interface is responsible for handling state replication. The property changes in
-           the Axis2 context hierarchy in this node, are propagated to all other nodes in the cluster.
-
-           The "excludes" patterns can be used to specify the prefixes (e.g. local_*) or
-           suffixes (e.g. *_local) of the properties to be excluded from replication. The pattern
-           "*" indicates that all properties in a particular context should not be replicated.
-
-            The "enable" attribute indicates whether context replication has been enabled
-        -->
-        <stateManager class="org.apache.axis2.clustering.state.DefaultStateManager"
-                      enable="false">
-            <replication>
-                <defaults>
-                    <exclude name="local_*"/>
-                    <exclude name="LOCAL_*"/>
-                </defaults>
-                <context class="org.apache.axis2.context.ConfigurationContext">
-                    <exclude name="local_*"/>
-                    <exclude name="UseAsyncOperations"/>
-                    <exclude name="SequencePropertyBeanMap"/>
-                </context>
-                <context class="org.apache.axis2.context.ServiceGroupContext">
-                    <exclude name="local_*"/>
-                    <exclude name="my.sandesha.*"/>
-                </context>
-                <context class="org.apache.axis2.context.ServiceContext">
-                    <exclude name="local_*"/>
-                    <exclude name="my.sandesha.*"/>
-                </context>
-            </replication>
-        </stateManager>
-    </clustering>
-
-    <!-- ================================================= -->
-    <!--                    Phases                         -->
-    <!-- ================================================= -->
-
-    <phaseOrder type="InFlow">
-        <!--  System pre defined phases       -->
-        <phase name="Transport"/>
-        <phase name="Addressing"/>
-        <phase name="Security"/>
-        <phase name="PreDispatch"/>
-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase"/>
-        <!--  System pre defined phases       -->
-        <phase name="RMPhase"/>
-        <phase name="OpPhase"/>
-    </phaseOrder>
-
-    <phaseOrder type="OutFlow">
-        <!-- Handlers related to unified-endpoint component are added to the UEPPhase -->
-        <phase name="UEPPhase" />
-        <!--      user can add his own phases to this area  -->
-        <phase name="RMPhase"/>
-        <phase name="MUPhase"/>
-        <phase name="OpPhase"/>
-        <phase name="OperationOutPhase"/>
-        <!--system predefined phase-->
-        <!--these phase will run irrespective of the service-->
-        <phase name="PolicyDetermination"/>
-        <phase name="MessageOut"/>
-        <phase name="Security"/>
-    </phaseOrder>
-
-    <phaseOrder type="InFaultFlow">
-        <phase name="Transport"/>
-        <phase name="Addressing"/>
-        <phase name="Security"/>
-        <phase name="PreDispatch"/>
-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase"/>
-        <!--      user can add his own phases to this area  -->
-        <phase name="RMPhase"/>
-        <phase name="OpPhase"/>
-        <phase name="MUPhase"/>
-        <phase name="OperationInFaultPhase"/>
-    </phaseOrder>
-
-    <phaseOrder type="OutFaultFlow">
-        <!-- Handlers related to unified-endpoint component are added to the UEPPhase -->
-        <phase name="UEPPhase" />
-        <!--      user can add his own phases to this area  -->
-        <phase name="RMPhase"/>
-        <!-- Must Understand Header processing phase -->
-        <phase name="MUPhase"/>
-        <phase name="OperationOutFaultPhase"/>
-        <phase name="PolicyDetermination"/>
-        <phase name="MessageOut"/>
-        <phase name="Security"/>
-    </phaseOrder>
-
-</axisconfig>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0ab7c4aa/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/datasources.properties
----------------------------------------------------------------------
diff --git a/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/datasources.properties b/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/datasources.properties
deleted file mode 100644
index 2ef0505..0000000
--- a/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/datasources.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-#  Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
-#
-#  Licensed 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.
-#
-
-################################################################################
-## DataSources Configuration
-################################################################################
-#synapse.datasources=lookupds,reportds
-#synapse.datasources.icFactory=com.sun.jndi.rmi.registry.RegistryContextFactory
-#synapse.datasources.providerPort=2199
-## If following property is present , then assumes that there is an external JNDI provider and will not start a RMI registry
-##synapse.datasources.providerUrl=rmi://localhost:2199
-#
-#synapse.datasources.lookupds.registry=Memory
-#synapse.datasources.lookupds.type=BasicDataSource
-#synapse.datasources.lookupds.driverClassName=org.apache.derby.jdbc.ClientDriver
-#synapse.datasources.lookupds.url=jdbc:derby://localhost:1527/lookupdb;create=false
-## Optionally you can specifiy a specific password provider implementation which overrides any globally configured provider
-#synapse.datasources.lookupds.secretProvider=org.apache.synapse.commons.security.secret.handler.SharedSecretCallbackHandler
-#synapse.datasources.lookupds.username=esb
-## Depending on the password provider used, you may have to use an encrypted password here!
-#synapse.datasources.lookupds.password=esb
-#synapse.datasources.lookupds.dsName=lookupdb
-#synapse.datasources.lookupds.maxActive=100
-#synapse.datasources.lookupds.maxIdle=20
-#synapse.datasources.lookupds.maxWait=10000
-#
-#synapse.datasources.reportds.registry=JNDI
-#synapse.datasources.reportds.type=PerUserPoolDataSource
-#synapse.datasources.reportds.cpdsadapter.factory=org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS
-#synapse.datasources.reportds.cpdsadapter.className=org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS
-#synapse.datasources.reportds.cpdsadapter.name=cpds
-#synapse.datasources.reportds.dsName=reportdb
-#synapse.datasources.reportds.driverClassName=org.apache.derby.jdbc.ClientDriver
-#synapse.datasources.reportds.url=jdbc:derby://localhost:1527/reportdb;create=false
-## Optionally you can specifiy a specific password provider implementation which overrides any globally configured provider
-#synapse.datasources.reportds.secretProvider=org.apache.synapse.commons.security.secret.handler.SharedSecretCallbackHandler
-#synapse.datasources.reportds.username=esb
-## Depending on the password provider used, you may have to use an encrypted password here!
-#synapse.datasources.reportds.password=esb
-#synapse.datasources.reportds.maxActive=100
-#synapse.datasources.reportds.maxIdle=20
-#synapse.datasources.reportds.maxWait=10000
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0ab7c4aa/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/embedded-ldap.xml
----------------------------------------------------------------------
diff --git a/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/embedded-ldap.xml b/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/embedded-ldap.xml
deleted file mode 100644
index 6e64fac..0000000
--- a/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/embedded-ldap.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- *
-* Copyright 2004,2005 The Apache Software Foundation.
-*
-* Licensed 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.
-* -->
-
-<!--
-	All carbon based products comes with a LDAP user store.
-	For this we use an embedded LDAP in carbon based products.
-	This file contains necessary configurations to control the behavior of embedded LDAP.
-	You may use this file to enable, disable LDAP server, configure connection admin password, etc ...
-	In addition to embedded-ldap server configurations this file also has Kerberos KDC (Key Distribution Center)
-	specific configurations.
--->
-
-<EmbeddedLDAPConfig>
-
-  <!--
-	LDAP server configurations
-	==========================
-	This section contains LDAP server specific configurations.
-
-	Property                Usage
-	=======                 ====
-	enable                  If true the embedded LDAP server will start when server starts up.
-				            Else embedded LDAP server will not start. Thus user has to use a different
-				            user store.
-	instanceid              An id given to the LDAP server instance.
-	connectionPassword      The password of the admin. (uid=admin,ou=system)
-	workingDirectory        Location where LDAP will store its schema files.
-	AdminEntryObjectClass   Object class which encapsulate attributes needed by claims.
-	allowAnonymousAccess    Should allow users to access LDAP server without credentials. Default false.
-	accessControlEnabled    Should access control be enabled among partitions. Default true.
-	saslHostName            Default host name to be used in SASL (Simple Authentication and Security Layer).
-				            This property comes from apacheds implementation itself.
-	saslPrincipalName       Default SASL principal name. Again this property also comes from apacheds implementation
-				            itself.
-  -->
-  <EmbeddedLDAP>
-    <Property name="enable">false</Property>
-    <Property name="port">${Ports.EmbeddedLDAP.LDAPServerPort}</Property>
-    <Property name="instanceId">default</Property>
-    <Property name="connectionPassword">admin</Property>
-    <Property name="workingDirectory">.</Property>
-    <Property name="AdminEntryObjectClass">wso2Person</Property>
-    <Property name="allowAnonymousAccess">false</Property>
-    <Property name="accessControlEnabled">true</Property>
-    <Property name="denormalizeOpAttrsEnabled">false</Property>
-    <Property name="maxPDUSize">2000000</Property>
-    <Property name="saslHostName">localhost</Property>
-    <Property name="saslPrincipalName">ldap/localhost@EXAMPLE.COM</Property>
-  </EmbeddedLDAP>
-
-  <!--
-	Default partition configurations
-	================================
-	When embedded LDAP server starts for the first time it will create a default partition.
-	Following properties configure values for the default partition.
-
-	Property                        Usage
-	=======                         =====
-	id                              Each partition is given an id. The id given to the default paritition.
-	realm                           Realm is the place where we store user principals and service principals.
-                                        The name of the realm for default partition.
-	kdcPassword                     This parameter is used when KDC (Key Distribution Center) is enabled. In apacheds
-                                        KDC also has a server principal. This defines a password for KDC server principal.
-	ldapServerPrinciplePassword     If LDAP server is also defined as a server principal, this will be the password.
-
-  -->
-  <DefaultPartition>
-    <Property name="id">root</Property>
-    <Property name="realm">wso2.org</Property>
-    <Property name="kdcPassword">secret</Property>
-    <Property name="ldapServerPrinciplePassword">randall</Property>
-  </DefaultPartition>
-
-  <!--
-	Default partition admin configurations
-	======================================
-	In a multi-tenant scenario each tenant will have a separate partition. Thus tenant admin will be the partition admin.
-	Following configurations define admin attributes for above created default partition.
-
-	Property            Usage
-	========            =====
-	uid                 UID attribute for partition admin.
-	commonName          The cn attribute for admin
-	lastName            The sn attribute for admin
-	email               The email attribute for admin
-	passwordType        The password hashing mechanism. Following hashing mechanisms are available, "SHA", "MD5".
-                        "Plaintext" is also a valid value. If KDC is enabled password type will be enforced to be
-                        plain text.
-  -->
-  <PartitionAdmin>
-    <Property name="uid">admin</Property>
-    <Property name="firstName">admin</Property>
-    <Property name="lastName">admin</Property>
-    <Property name="email">admin@wso2.com</Property>
-    <Property name="password">admin</Property>
-    <Property name="passwordType">SHA</Property>
-  </PartitionAdmin>
-
-  <!--
-	Default partition admin's group configuration
-	=============================================
-	Embedded LDAP is capable of keeping group information also.
-	If LDAP groups are enabled in user store (usr-mgt.xml) group information will be
-	recorded in a separate sub-context. Following configuration defines the group
-	properties.
-
-	Property                Usage
-	=======                 =====
-	adminRoleName		    The name of the role/group that admin should be included.
-	groupNameAttribute	    The attribute which group name will be recorded.
-	memberNameAttribute	    The attribute which memebers are recorded.
-  -->
-  <PartitionAdminGroup>
-    <Property name="adminRoleName">admin</Property>
-    <Property name="groupNameAttribute">cn</Property>
-    <Property name="memberNameAttribute">member</Property>
-  </PartitionAdminGroup>
-
-    <!--
-      KDC configurations
-      =================
-      Following configurations are applicable to KDC server. Generally, the KDC is only enabled in
-      Identity Server. You may enable KDC server if you wish to do so. But if you dont have any Kerberos specific
-      programs, it is recommended to disable KDC server.
-
-      Property                          Usage
-      =======                           =====
-      name                              Name given to default KDC server.
-      enabled                           If true a KDC server will start when starting LDAP server.
-                                          Else a KDC server will not start with a LDAP server.
-      protocol                          Default protocol to be used in KDC communication. Default is UDP.
-      maximumTicketLifeTime             The maximum life time of a ticket issued by the KDC.
-      maximumRenewableLifeTime          Life time which a ticket can be used by renewing it several times.
-      preAuthenticationTimeStampEnabled Pre-authentication is a feature in latest Kerberos protocol.
-                                          This property says whether to enable it or disable it.
-    -->
-  <KDCServer>
-    <Property name="name">defaultKDC</Property>
-    <Property name="enabled">false</Property>
-    <Property name="protocol">UDP</Property>
-    <Property name="host">localhost</Property>
-    <Property name="port">${Ports.EmbeddedLDAP.KDCServerPort}</Property>
-    <Property name="maximumTicketLifeTime">8640000</Property>
-    <Property name="maximumRenewableLifeTime">604800000</Property>
-    <Property name="preAuthenticationTimeStampEnabled">true</Property>
-  </KDCServer>
-
-</EmbeddedLDAPConfig>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0ab7c4aa/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/rule-component.conf
----------------------------------------------------------------------
diff --git a/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/rule-component.conf b/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/rule-component.conf
deleted file mode 100644
index 1bd6c09..0000000
--- a/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/rule-component.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-<RuleServer>
-    <RuleEngineProvider class="org.wso2.carbon.rule.engine.jsr94.JSR94BackendRuntimeFactory"/>
-</RuleServer>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0ab7c4aa/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/synapse-configs/default/registry.xml
----------------------------------------------------------------------
diff --git a/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/synapse-configs/default/registry.xml b/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/synapse-configs/default/registry.xml
deleted file mode 100644
index b19a4c8..0000000
--- a/products/stratos2/cloud_controller/1.0.0/modules/distribution/src/main/conf/synapse-configs/default/registry.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~  Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
-  ~
-  ~  WSO2 Inc. 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.
-  -->
-
-<!-- Registry declaration of the WSO2 ESB -->
-<registry xmlns="http://ws.apache.org/ns/synapse" provider="org.wso2.carbon.mediation.registry.WSO2Registry">
-    <!--all resources loaded from the URL registry would be
-    cached for this number of milliseconds -->
-    <parameter name="cachableDuration">15000</parameter>
-</registry>