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/31 13:17:20 UTC

[39/51] [partial] applying patch related to JIRA STRATOS-12

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/cloud_controller/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/cloud_controller/modules/distribution/src/main/assembly/bin.xml b/products/cloud_controller/modules/distribution/src/main/assembly/bin.xml
deleted file mode 100644
index df5f831..0000000
--- a/products/cloud_controller/modules/distribution/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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.
-  -->
-<assembly>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
-            <outputDirectory>apache-stratos-cc-${pom.version}</outputDirectory>
-            <excludes>
-                <exclude>**/*.sh</exclude>
-                <exclude>**/*.bat</exclude>
-                <exclude>**/log4j.properties</exclude>
-                <exclude>**/conf/axis2/axis2.xml</exclude>
-                <exclude>**/services/sample01.aar</exclude>
-                <exclude>**/repository/services/version/**</exclude>
-                <exclude>**/version.txt</exclude>
-                <exclude>**/LICENSE.txt</exclude>
-                <exclude>**/stratos.bat</exclude>
-		<exclude>**/launch.ini</exclude>
-                <exclude>**/README.txt</exclude>
-                <exclude>**/INSTALL.txt</exclude>
-                <exclude>**/release-notes.html</exclude>
-                <exclude>**/carbon.xml</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
-            <outputDirectory>apache-stratos-cc-${pom.version}</outputDirectory>
-            <excludes>
-                <exclude>**/wso2server.sh</exclude>
-                <exclude>**/wso2server.bat</exclude>
-            </excludes>
-	    <includes>
-                <include>**/*.sh</include>
-                <include>**/native/*</include>
-            </includes>
-            <fileMode>755</fileMode>
-        </fileSet>
-		<!--samples set of product-->
-        <fileSet>
-            <directory>../../modules/samples/product/jmsclient</directory>
-            <outputDirectory>apache-stratos-cc-${pom.version}/samples/jmsclient</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/samples/product/jmstransport</directory>
-            <outputDirectory>apache-stratos-cc-${pom.version}/samples/jmstransport</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/samples/product/wsclient</directory>
-            <outputDirectory>apache-stratos-cc-${pom.version}/samples/wsclient</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/samples/product/services</directory>
-            <outputDirectory>apache-stratos-cc-${pom.version}/samples/services</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>
-                ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/advanced/
-            </directory>
-            <outputDirectory>apache-stratos-cc-${pom.version}/repository/conf/advanced
-            </outputDirectory>
-            <includes>
-                <include>**/qpid-config.xml</include>
-                <include>**/qpid-jmxremote.access</include>
-                <include>**/qpid-virtualhosts.xml</include>
-            </includes>
-        </fileSet>
-	<fileSet>
-            <directory>src/main/conf/synapse-configs</directory>
-            <outputDirectory>apache-stratos-cc-${pom.version}/repository/deployment/server/synapse-configs
-            </outputDirectory>
-        </fileSet>
-	 <fileSet>
-            <directory>src/main/cartridges</directory>
-            <outputDirectory>apache-stratos-cc-${pom.version}/repository/deployment/server/cartridges</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/services</directory>
-            <outputDirectory>apache-stratos-cc-${pom.version}/repository/deployment/server/services</outputDirectory>
-        </fileSet>
-	 <!--Multitenancy related file -->
-        <fileSet>
-            <directory>
-                ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
-            </directory>
-            <outputDirectory>apache-stratos-cc-${pom.version}/repository/conf/multitenancy</outputDirectory>
-            <includes>
-                <include>**/stratos.xml</include>
-                <include>**/multitenancy-packages.xml</include>
-                <include>**/usage-throttling-agent-config.xml</include>
-                <include>**/cloud-services-desc.xml</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-           <directory>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/</directory>
-           <outputDirectory>apache-stratos-cc-${pom.version}/repository/conf/etc</outputDirectory>
-           <includes>
-               <include>**/cassandra.yaml</include>
-           </includes>
-        </fileSet>
-      
-	<!-- copy the landing page webapp -->
-        <fileSet>
-		<directory>lib/home</directory>
-		<outputDirectory>apache-stratos-cc-${pom.version}/repository/deployment/server/webapps/STRATOS_ROOT</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>
-                ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/
-            </directory>
-            <outputDirectory>apache-stratos-cc-${pom.version}/dbscripts/identity</outputDirectory>
-            <includes>
-                <include>**/h2.sql</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../styles/service/src/main/resources/web/styles/css</directory>
-           <outputDirectory>${pom.artifactId}-${pom.version}/resources/allthemes/Default/admin</outputDirectory>
-            <includes>
-                <include>**/**.css</include>
-           </includes>
-        </fileSet>
-        <fileSet>
-           <directory>../styles/service/src/main/resources/web/styles/images</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/resources/allthemes/Default/images</outputDirectory>
-            <includes>
-                <include>**/**.gif</include>
-                <include>**/**.png</include>
-            </includes>
-        </fileSet>
-
-	<!-- get axis2_1.6.1.wso2v9.jar from carbon kernel patch 0002 -->
-        <fileSet>
-           <directory>../p2-profile/target/WSO2-CARBON-PATCH-4.1.0-0002/</directory>
-           <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory>
-           <includes>
-              <include>**/patch0002/axis2_1.6.1.wso2v9.jar</include>
-           </includes>
-        </fileSet>
-    </fileSets>
-
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>apache-stratos-cc-${pom.version}/repository/deployment/client/modules
-            </outputDirectory>
-            <includes>
-                <include>org.apache.rampart:rampart:mar</include>
-            </includes>
-        </dependencySet>
-	<dependencySet>
-            <outputDirectory>apache-stratos-cc-${pom.version}/client-lib</outputDirectory>
-            <includes>
-                <include>org.wso2.andes.wso2:andes-client:jar</include>
-                <include>org.apache.geronimo.specs.wso2:geronimo-jms_1.1_spec:jar</include>
-                <include>org.wso2.carbon:org.wso2.carbon.event.client.stub:jar</include>
-                <include>org.wso2.carbon:org.wso2.carbon.event.client:jar</include>
-		        <include>slf4j.wso2:slf4j:jar</include>
-                <include>log4j:log4j:jar</include>
-            </includes>
-        </dependencySet>
-    </dependencySets>
-
-    <files>
-        <file>
-            <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/axis2/axis2.xml</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}/repository/conf/axis2</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>src/main/conf/event-broker.xml</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}/repository/conf</outputDirectory>
-        </file>
-	<!--file>
-            <source>src/main/conf/user-mgt.xml</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}/repository/conf</outputDirectory>
-            <destName>user-mgt.xml</destName>
-        </file-->
-	  <!-- Setting jamm javaagent in bam -->
-        <file>
-            <source>src/main/resources/launch.ini</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>src/main/conf/embedded-ldap.xml</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}/repository/conf</outputDirectory>
-            <destName>embedded-ldap.xml</destName>
-        </file>
-         <file>
-            <source>src/main/conf/zoo.cfg</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}/repository/conf/etc</outputDirectory>
-        </file>
-         <file>
-            <source>src/main/conf/jaas.conf</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}/repository/conf/security</outputDirectory>
-        </file>
-         <file>
-            <source>src/main/resources/stratos.sh</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}/bin/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>src/main/resources/log4j.properties</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}/repository/conf</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>755</fileMode>
-        </file>
-	 <file>
-            <source>src/main/conf/synapse.properties</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}/repository/conf</outputDirectory>
-            <destName>synapse.properties</destName>
-            <filtered>true</filtered>
-        </file>
-        <file>
-            <source>src/main/conf/cipher-text.properties</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}/lib</outputDirectory>
-            <destName>cipher-text.properties</destName>
-            <filtered>true</filtered>
-        </file>
-         <file>
-            <source>src/main/resources/stratos.bat</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}/bin/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>755</fileMode>
-        </file>
-	<file>
-            <source>src/main/conf/datasources.properties</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}/repository/conf</outputDirectory>
-            <destName>datasources.properties</destName>
-            <filtered>true</filtered>
-        </file>
-        <file>
-            <source>../../LICENSE.txt</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>../../README.txt</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>../../INSTALL.txt</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <!--file>
-            <source>../../docs/xdoc/release-notes.xml</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}</outputDirectory>
-            <destName>release-notes.html</destName>
-            <fileMode>644</fileMode>
-        </file-->
-<!--
-        <file>
-            <source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}/bin/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>-->
-        <file>
-            <source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}/bin/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}/repository/conf/</outputDirectory>
-            <filtered>true</filtered>
-        </file>
-	<!--file>
-            <source>
-                ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/authenticators.xml
-            </source>
-            <outputDirectory>apache-stratos-cc-${pom.version}/repository/conf/security/</outputDirectory>
-            <filtered>true</filtered>
-        </file-->
-
-	<!-- Including logging-config.xml file -->
- 	<file>
-            <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml</source>
-            <outputDirectory>apache-stratos-cc-${pom.version}/repository/conf/etc/</outputDirectory>
-        </file>
-        <file>
-             <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity.xml</source>
-	     <outputDirectory>apache-stratos-cc-${pom.version}/repository/conf/</outputDirectory>
-        </file>
-	<file>
-            <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cloud-controller.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
-        </file>
-	<file>
-            <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/cartridge.xsd</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
-        </file>
-	<file>
-            <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/services.xsd</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
-        </file>
-	<file>
-            <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/service.xsd</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
-        </file>
-	<file>
-            <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/cartridges.xsd</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
-        </file>
-	<file>
-            <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/coordination-client-config.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
-        </file>
-    </files>
-</assembly>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/cloud_controller/modules/distribution/src/main/assembly/dist.xml
----------------------------------------------------------------------
diff --git a/products/cloud_controller/modules/distribution/src/main/assembly/dist.xml b/products/cloud_controller/modules/distribution/src/main/assembly/dist.xml
deleted file mode 100644
index 262851d..0000000
--- a/products/cloud_controller/modules/distribution/src/main/assembly/dist.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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.
-  -->
-<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>apache-stratos-cc-${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/ffe2e466/products/cloud_controller/modules/distribution/src/main/assembly/filter.properties
----------------------------------------------------------------------
diff --git a/products/cloud_controller/modules/distribution/src/main/assembly/filter.properties b/products/cloud_controller/modules/distribution/src/main/assembly/filter.properties
deleted file mode 100644
index 1d2a3aa..0000000
--- a/products/cloud_controller/modules/distribution/src/main/assembly/filter.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-product.name=Apache Stratos Cloud Controller
-product.key=CC
-product.version=1.0.0
-carbon.version=4.1.1

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/cloud_controller/modules/distribution/src/main/conf/axis2.xml
----------------------------------------------------------------------
diff --git a/products/cloud_controller/modules/distribution/src/main/conf/axis2.xml b/products/cloud_controller/modules/distribution/src/main/conf/axis2.xml
deleted file mode 100755
index 77dcf02..0000000
--- a/products/cloud_controller/modules/distribution/src/main/conf/axis2.xml
+++ /dev/null
@@ -1,524 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ 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.
-  -->
-
-<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/ffe2e466/products/cloud_controller/modules/distribution/src/main/conf/cipher-text.properties
----------------------------------------------------------------------
diff --git a/products/cloud_controller/modules/distribution/src/main/conf/cipher-text.properties b/products/cloud_controller/modules/distribution/src/main/conf/cipher-text.properties
deleted file mode 100644
index 4a1c469..0000000
--- a/products/cloud_controller/modules/distribution/src/main/conf/cipher-text.properties
+++ /dev/null
@@ -1,26 +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.
-#
-
-#aliases=esb
-#
-## configuration  per each plaintext
-#esb.secret=M6U74dMVvRm4XFMczki2qZ6CsTvnUuRTjSditlACR5vTISSMI7F/mCTVJGOGdKJjij+VWVhBtmAOkElyvR9TwlUECnZ1o5DNsTK6l8je+9amc/ziTQLP3Q1tzm/Ex1pzHsG6jPGGrv3O0B9pZTfYFqRvlcNhM7Ve3WvA3ibs4Yk=
-#esb.secret.alias=wso2carbon
-#esb.secret.keystore=identity
-#

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/cloud_controller/modules/distribution/src/main/conf/datasources.properties
----------------------------------------------------------------------
diff --git a/products/cloud_controller/modules/distribution/src/main/conf/datasources.properties b/products/cloud_controller/modules/distribution/src/main/conf/datasources.properties
deleted file mode 100644
index 0cf8cdb..0000000
--- a/products/cloud_controller/modules/distribution/src/main/conf/datasources.properties
+++ /dev/null
@@ -1,58 +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.
-#
-
-################################################################################
-## 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/ffe2e466/products/cloud_controller/modules/distribution/src/main/conf/embedded-ldap.xml
----------------------------------------------------------------------
diff --git a/products/cloud_controller/modules/distribution/src/main/conf/embedded-ldap.xml b/products/cloud_controller/modules/distribution/src/main/conf/embedded-ldap.xml
deleted file mode 100644
index 144628e..0000000
--- a/products/cloud_controller/modules/distribution/src/main/conf/embedded-ldap.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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.
-  -->
-
-<!--
-	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/ffe2e466/products/cloud_controller/modules/distribution/src/main/conf/event-broker.xml
----------------------------------------------------------------------
diff --git a/products/cloud_controller/modules/distribution/src/main/conf/event-broker.xml b/products/cloud_controller/modules/distribution/src/main/conf/event-broker.xml
deleted file mode 100644
index 0c242a0..0000000
--- a/products/cloud_controller/modules/distribution/src/main/conf/event-broker.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-this is the configuration file for the carbon event broker component. this configuration file configures the various subsystems of the event
-broker compoent and parameters.
--->
-<eventBrokerConfig xmlns="http://wso2.org/carbon/event/broker">
-    <eventBroker name="carbonEventBroker" class = "org.wso2.carbon.event.core.internal.CarbonEventBrokerFactory">
-         <!-- topic manager implemenation class.-->
-        <topicManager name="TopicManager" class="org.wso2.carbon.event.core.internal.topic.registry.RegisistryTopicManagerFactory">
-            <!-- root node of the topic tree -->
-            <topicStoragePath>event/topics</topicStoragePath>
-        </topicManager>
-        <!-- subscriptionmnager implementaion. subscription manager persits the
-        subscriptions at the registry.  users can configure the topics root node and the topicIndex path -->
-        <subscriptionManager name="subscriptionManager"
-                             class="org.wso2.carbon.event.core.internal.subscription.registry.RegistrySubscriptionManagerFactory">
-            <topicStoragePath>event/topics</topicStoragePath>
-            <indexStoragePath>event/topicIndex</indexStoragePath>
-        </subscriptionManager>
-
-        <!-- delivary manager inmplementation. delivary manager does actual delivary part of the event broker -->
-        <deliveryManager name="deliveryManager"
-                         class="org.wso2.carbon.event.core.internal.delivery.jms.QpidJMSDeliveryManagerFactory"
-                         type="local">
-           <!--  <remoteMessageBroker>
-                <hostName>localhost</hostName>
-                <servicePort>9443</servicePort>
-                <webContext>/</webContext>
-                <userName>admin</userName>
-                <password>admin</password>
-                <qpidPort>5672</qpidPort>
-                <clientID>clientID</clientID>
-                <virtualHostName>carbon</virtualHostName>
-            </remoteMessageBroker> -->
-        </deliveryManager>
-
-         <!-- when publising an event event broker uses a seperate thread pool with an executor. following parameters configure different parameters of that -->
-        <eventPublisher>
-            <minSpareThreads>5</minSpareThreads>
-            <maxThreads>50</maxThreads>
-            <maxQueuedRequests>1000</maxQueuedRequests>
-            <keepAliveTime>1000</keepAliveTime>
-        </eventPublisher>
-    </eventBroker>
-</eventBrokerConfig>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/cloud_controller/modules/distribution/src/main/conf/jaas.conf
----------------------------------------------------------------------
diff --git a/products/cloud_controller/modules/distribution/src/main/conf/jaas.conf b/products/cloud_controller/modules/distribution/src/main/conf/jaas.conf
deleted file mode 100644
index 7a2a295..0000000
--- a/products/cloud_controller/modules/distribution/src/main/conf/jaas.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-Server {
-       org.apache.zookeeper.server.auth.DigestLoginModule required
-       user_super="admin"
-       user_admin="admin";
-};
-Client {
-       org.apache.zookeeper.server.auth.DigestLoginModule required
-       username="admin"
-       password="admin";
-};

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/cloud_controller/modules/distribution/src/main/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/products/cloud_controller/modules/distribution/src/main/conf/log4j.properties b/products/cloud_controller/modules/distribution/src/main/conf/log4j.properties
deleted file mode 100644
index ec224d4..0000000
--- a/products/cloud_controller/modules/distribution/src/main/conf/log4j.properties
+++ /dev/null
@@ -1,128 +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.
-#
-
-##
-# This is the log4j configuration file used by WSO2 ESB
-# =====================================================
-#
-# IMPORTANT : Please do not remove or change the names of any of the Appenders defined here.
-# The layout pattern & log file can be changed using the WSO2 ESB Management Console, and those
-# settings will override the settings in this file.
-##
-
-##
-# WSO2 ESB is now able to create per-service trace logs at runtime. Thus while a message
-# is being processed through a Proxy service or the Synapse service (i.e. message mediation through
-# the 'main' sequence), tracing may be turned 'on' at any Proxy, Sequence or Mediator level. This
-# trace state 'flows' with the message - i.e from a trace enabled sequence to another sequence etc.
-# and applies to all mediators within a trace enabled sequence etc. unless another sequence or
-# mediator does not override and specify a different trace setting.
-##
-
-# the root category is ERROR (applies for all 3rd party JARs etc) and will be logged to the
-# LOG_APPENDER and the CONSOLE_APPENDER
-
-log4j.rootLogger=ERROR, CARBON_CONSOLE, CARBON_LOGFILE, ERROR_LOGFILE
-
-log4j.category.org.apache.synapse=INFO
-log4j.category.org.apache.synapse.transport=INFO
-log4j.category.org.apache.axis2=INFO
-log4j.category.org.apache.axis2.transport=INFO
-log4j.logger.com.atomikos=INFO,ATOMIKOS
-log4j.logger.org.quartz=WARN
-log4j.logger.org.wso2=INFO
-log4j.logger.org.wso2.carbon=INFO
-
-log4j.logger.org.apache.catalina=WARN
-log4j.logger.org.apache.synapse.endpoints.EndpointContext=ERROR
-log4j.logger.org.apache.coyote=WARN
-log4j.logger.org.apache.axis2.enterprise=FATAL
-log4j.logger.de.hunsicker.jalopy.io=FATAL
-
-# uncomment the following logs to see HTTP headers and messages
-#log4j.logger.org.apache.synapse.transport.nhttp.headers=DEBUG
-#log4j.logger.org.apache.synapse.transport.nhttp.wire=DEBUG
-
-#nhttp accesslogs
-log4j.logger.org.apache.synapse.transport.nhttp.access=INFO
-
-# qpid related logs for the message broker
-log4j.logger.qpid=FATAL
-log4j.logger.org.apache.qpid=FATAL
-
-# The console appender is used to display general information at console
-log4j.appender.CARBON_CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CARBON_CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CARBON_CONSOLE.layout.ConversionPattern=[%d{ISO8601}] %5p - %c{1} %m%n
-
-# Configure the service logger at INFO level. Writes only run-time/mediation-time audit messages
-log4j.category.SERVICE_LOGGER=INFO, SERVICE_APPENDER
-log4j.additivity.SERVICE_LOGGER=false
-log4j.appender.SERVICE_APPENDER=org.apache.log4j.RollingFileAppender
-log4j.appender.SERVICE_APPENDER.File=repository/logs/${instance.log}/wso2-cc${instance.log}.log
-log4j.appender.SERVICE_APPENDER.MaxFileSize=1000KB
-log4j.appender.SERVICE_APPENDER.MaxBackupIndex=10
-log4j.appender.SERVICE_APPENDER.layout=org.apache.log4j.PatternLayout
-log4j.appender.SERVICE_APPENDER.layout.ConversionPattern=%d{ISO8601} [%X{ip}-%X{host}] [%t] %5p %c{1} %m%n
-
-# The trace logger dumps enough information @INFO level, but maybe pushed upto TRACE.
-# Writes only run-time/mediation time tracing/debug messages for messages passing through trace
-# enabled sequences, mediators and services. Enabling tracing on these has a performance impact
-log4j.category.TRACE_LOGGER=INFO, TRACE_APPENDER
-log4j.additivity.TRACE_LOGGER=false
-log4j.appender.TRACE_APPENDER=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.TRACE_APPENDER.File=repository/logs/${instance.log}/wso2-cc-trace${instance.log}.log
-log4j.appender.TRACE_APPENDER.Append=true
-log4j.appender.TRACE_APPENDER.layout=org.apache.log4j.PatternLayout
-log4j.appender.TRACE_APPENDER.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%X{ip}-%X{host}] [%t] %5p %c{1} %m%n
-
-# CARBON_LOGFILE is set to be a DailyRollingFileAppender using a PatternLayout.
-log4j.appender.CARBON_LOGFILE=org.apache.log4j.DailyRollingFileAppender
-# Log file will be overridden by the configuration setting in the DB
-# This path should be relative to WSO2 Carbon Home
-log4j.appender.CARBON_LOGFILE.File=${carbon.home}/repository/logs/${instance.log}/wso2carbon${instance.log}.log
-log4j.appender.CARBON_LOGFILE.Append=true
-log4j.appender.CARBON_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout
-# ConversionPattern will be overridden by the configuration setting in the DB
-log4j.appender.CARBON_LOGFILE.layout.ConversionPattern=TID: [%T] [%S] [%d] %P%5p {%c} - %x %m {%c}%n
-log4j.appender.CARBON_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S]
-log4j.appender.CARBON_LOGFILE.threshold=DEBUG
-
-# The standard error log where all the warnings, errors and fatal errors will be logged
-log4j.appender.ERROR_LOGFILE=org.apache.log4j.FileAppender
-log4j.appender.ERROR_LOGFILE.File=repository/logs/${instance.log}/wso2-cc-errors.log
-log4j.appender.ERROR_LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.ERROR_LOGFILE.layout.ConversionPattern=%d{ISO8601} [%X{ip}-%X{host}] [%t] %5p %c{1} %m%n
-log4j.appender.ERROR_LOGFILE.threshold=WARN
-
-log4j.logger.org.apache.directory.shared.ldap=WARN, CARBON_CONSOLE
-log4j.logger.org.apache.directory.server.ldap.handlers=WARN, CARBON_CONSOLE
-log4j.logger.org.apache.directory.shared.ldap.entry.DefaultServerAttribute=FATAL, CARBON_CONSOLE
-log4j.logger.org.apache.directory.shared.ldap.ldif.LdifReader=ERROR, CARBON_CONSOLE
-log4j.logger.org.apache.directory.server.ldap.LdapProtocolHandler=ERROR, CARBON_CONSOLE
-
-# Appender config to send Atomikos transaction logs to new log file tm.out.
-log4j.appender.ATOMIKOS = org.apache.log4j.RollingFileAppender
-log4j.appender.ATOMIKOS.File = repository/logs/tm.out
-log4j.appender.ATOMIKOS.Append = true
-log4j.appender.ATOMIKOS.layout = org.apache.log4j.PatternLayout
-log4j.appender.ATOMIKOS.layout.ConversionPattern=%p %t %c - %m%n
-log4j.additivity.com.atomikos=false
-
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/cloud_controller/modules/distribution/src/main/conf/rule-component.conf
----------------------------------------------------------------------
diff --git a/products/cloud_controller/modules/distribution/src/main/conf/rule-component.conf b/products/cloud_controller/modules/distribution/src/main/conf/rule-component.conf
deleted file mode 100644
index 1bd6c09..0000000
--- a/products/cloud_controller/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/ffe2e466/products/cloud_controller/modules/distribution/src/main/conf/synapse-configs/default/registry.xml
----------------------------------------------------------------------
diff --git a/products/cloud_controller/modules/distribution/src/main/conf/synapse-configs/default/registry.xml b/products/cloud_controller/modules/distribution/src/main/conf/synapse-configs/default/registry.xml
deleted file mode 100644
index f259c7a..0000000
--- a/products/cloud_controller/modules/distribution/src/main/conf/synapse-configs/default/registry.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ 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.
-  -->
-
-<!-- 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>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/cloud_controller/modules/distribution/src/main/conf/synapse-configs/default/sequences/errorHandler.xml
----------------------------------------------------------------------
diff --git a/products/cloud_controller/modules/distribution/src/main/conf/synapse-configs/default/sequences/errorHandler.xml b/products/cloud_controller/modules/distribution/src/main/conf/synapse-configs/default/sequences/errorHandler.xml
deleted file mode 100644
index 8621bee..0000000
--- a/products/cloud_controller/modules/distribution/src/main/conf/synapse-configs/default/sequences/errorHandler.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ 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.
-  -->
-    <sequence name="errorHandler" xmlns="http://ws.apache.org/ns/synapse">
-	<log level="full">
-        	<property name="MESSAGE" value="Executing default 'fault' sequence"/>
-        	<property name="ERROR_CODE" expression="get-property('ERROR_CODE')"/>
-        	<property name="ERROR_MESSAGE" expression="get-property('ERROR_MESSAGE')"/>
-    	</log>
-        <makefault response="true">
-            <code value="tns:Receiver" xmlns:tns="http://www.w3.org/2003/05/soap-envelope"/>
-            <reason value="COULDN'T SEND THE MESSAGE TO THE SERVER."/>
-        </makefault>
-        <send/>
-    </sequence>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/cloud_controller/modules/distribution/src/main/conf/synapse-configs/default/sequences/fault.xml
----------------------------------------------------------------------
diff --git a/products/cloud_controller/modules/distribution/src/main/conf/synapse-configs/default/sequences/fault.xml b/products/cloud_controller/modules/distribution/src/main/conf/synapse-configs/default/sequences/fault.xml
deleted file mode 100644
index 9d2d8f7..0000000
--- a/products/cloud_controller/modules/distribution/src/main/conf/synapse-configs/default/sequences/fault.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ 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.
-  -->
-
-<!-- Default fault sequence shipped with the Apache Synapse -->
-<sequence xmlns="http://ws.apache.org/ns/synapse" name="fault">
-
-    <!-- Log the message at the full log level with the ERROR_MESSAGE and the ERROR_CODE-->
-    <!-- log level="full">
-        <property name="MESSAGE" value="Executing default 'fault' sequence"/>
-        <property name="ERROR_CODE" expression="get-property('ERROR_CODE')"/>
-        <property name="ERROR_MESSAGE" expression="get-property('ERROR_MESSAGE')"/>
-    </log -->
-
-    <!-- Drops the messages by default if there is a fault -->
-    <script language="js"><![CDATA[
-        mc.setPayloadXML(
-           <{mc.getProperty("SERVICENAME")}Response xmlns="org.wso2.gateway">
-            <Timestamp>{new Date()}</Timestamp>
-            <Ack>Failure</Ack>
-            <Errors>
-             <ShortMessage>Gateway Error</ShortMessage>
-             <LongMessage>{mc.getProperty("ERROR_MESSAGE")}</LongMessage>
-             <ErrorCode>500</ErrorCode>
-             <SeverityCode>Error</SeverityCode>
-             <ErrorClassification>RequestError</ErrorClassification>
-            </Errors>
-            <ServiceName>{mc.getProperty("SERVICENAME")}</ServiceName>
-            <ResponseCode>{mc.getProperty("HTTP_SC")}</ResponseCode>
-            <ContentType>{mc.getProperty("Content-Type")}</ContentType>
-            <Version>1.5.1</Version>
-           </{mc.getProperty("SERVICENAME")}Response>
-        );
-      ]]></script>
-    <switch source="get-property('ERROR_CODE')">
-        <case regex="101504">   <!-- TIMEOUT ERROR -->
-            <property name="HTTP_SC" value="504" scope="axis2"/>
-            <sequence key="seq_timeout"/>
-        </case>
-        <case regex="303001">
-            <property name="HTTP_SC" value="503" scope="axis2"/>
-            <sequence key="seq_endpoint_down"/>
-        </case>
-        <case regex="111503">
-            <property name="HTTP_SC" value="503" scope="axis2"/>
-            <sequence key="seq_endpoint_down"/>
-        </case>
-        <default>
-            <property name="HTTP_SC" value="500" scope="axis2"/>
-        </default>
-    </switch>
-    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
-    <header name="To" action="remove"/>
-    <property name="RESPONSE" value="true"/>
-    <property name="messageType" value="text/xml" scope="axis2"/>
-    <property name="ContentType" value="text/xml" scope="axis2"/>
-
-    <send/>
-
-</sequence>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe2e466/products/cloud_controller/modules/distribution/src/main/conf/synapse-configs/default/sequences/main.xml
----------------------------------------------------------------------
diff --git a/products/cloud_controller/modules/distribution/src/main/conf/synapse-configs/default/sequences/main.xml b/products/cloud_controller/modules/distribution/src/main/conf/synapse-configs/default/sequences/main.xml
deleted file mode 100644
index c4dbf5b..0000000
--- a/products/cloud_controller/modules/distribution/src/main/conf/synapse-configs/default/sequences/main.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ 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.
-  -->
-
-<!-- Default main sequence shipped with the WSO2 ESB -->
-<sequence xmlns="http://ws.apache.org/ns/synapse" name="main" onError="fault">
-    <description>The main sequence for the message mediation</description>
-
-    <in>
-        <property name="REQUEST_HOST_HEADER" expression="$trp:host" scope="axis2"/>
-        <property name="SERVICE_PREFIX" expression="$axis2:SERVICE_PREFIX"/>
-        <send>
-            <!--endpoint name="sdlbEndpoint">
-                <session type="http">-->
-                    <!-- Session timout is 15mins-->
-                    <!--sessionTimeout>900000</sessionTimeout>
-                </session>
-                <serviceDynamicLoadbalance failover="true"
-                                           algorithm="org.apache.synapse.endpoints.algorithms.RoundRobin"
-                                           configuration="$system:loadbalancer.xml"/>
-            </endpoint>
-            -->
-	          <!--endpoint name="tenantAwareLBEndpoint">
-                <class name ="org.wso2.carbon.lb.endpoint.endpoint.TenantAwareLoadBalanceEndpoint">
-                     <parameter name="algorithm"> org.apache.synapse.endpoints.algorithms.RoundRobin</parameter>
-                     <parameter name="configuration">$system:loadbalancer.conf</parameter>
-                     <parameter name="failover">true</parameter>          
-                     <parameter name="sessionTimeout">900000</parameter>
-  	            </class>
- 	          </endpoint-->
-        </send>
-        <drop/>
-    </in>
-
-    <out>
-        <!-- Handling status codes: 301, 302 Redirection -->
-        <filter source="$trp:Location" regex=".+">
-            <property name="LB_SP_Host" expression="$ctx:SERVICE_PREFIX"
-                      pattern="(^http.?://\b)(.*):(\d*)(.*)" group="2"/>
-
-            <property name="LB_Location_Protocol" expression="$trp:Location"
-                      pattern="(^http.?://\b)(.*):(\d*)(.*)" group="1"/>
-            <property name="LB_Location_Host" expression="$trp:Location"
-                      pattern="(^http.?://\b)(.*):(\d*)(.*)" group="2"/>
-            <property name="LB_Location_Path" expression="$trp:Location"
-                      pattern="(^http.?://\b)(.*):(\d*)(.*)" group="4"/>
-
-            <!--<log level="custom">
-               <property name="ameera-ocation" expression="$trp:Location"/>
-               <property name="ameera-sprefix" expression="$ctx:SERVICE_PREFIX"/>
-           </log>-->
-
-            <filter xpath="fn:lower-case($ctx:LB_SP_Host)=fn:lower-case($ctx:LB_Location_Host)">
-                <then>
-                    <switch source="fn:lower-case($ctx:LB_Location_Protocol)">
-                        <case regex="https://">
-                            <property name="Location"
-                                      expression="fn:concat($ctx:LB_Location_Protocol,$ctx:LB_REQUEST_HOST,$ctx:LB_Location_Path)"
-                                      scope="transport"/>
-                        </case>
-                        <case regex="http://">
-                            <property name="Location"
-                                      expression="fn:concat($ctx:LB_Location_Protocol,$ctx:LB_REQUEST_HOST,$ctx:LB_Location_Path)"
-                                      scope="transport"/>
-                        </case>
-                    </switch>
-                </then>
-
-                <else>
-                    <filter xpath="$ctx:LB_REQUEST_HOST=fn:lower-case($ctx:LB_Location_Host)">
-                        <switch source="fn:lower-case($ctx:LB_Location_Protocol)">
-                            <case regex="https://">
-                                <property name="Location"
-                                          expression="fn:concat($ctx:LB_Location_Protocol,$ctx:LB_REQUEST_HOST,$ctx:LB_Location_Path)"
-                                          scope="transport"/>
-                            </case>
-                            <case regex="http://">
-                                <property name="Location"
-                                          expression="fn:concat($ctx:LB_Location_Protocol,$ctx:LB_REQUEST_HOST,$ctx:LB_Location_Path)"
-                                          scope="transport"/>
-                            </case>
-                        </switch>
-                    </filter>
-                </else>
-            </filter>
-        </filter>
-
-        <!-- Send the messages where they have been sent (i.e. implicit To EPR) -->
-        <property name="messageType" value="text/html" scope="axis2"/>
-        <send/>
-        <drop/>
-    </out>
-
-</sequence>