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 2015/08/12 13:33:07 UTC

[44/50] [abbrv] stratos git commit: Removing unnecessary features, artifacts and restructuring distribution artifacts

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/js/jquery.orbit-1.2.3.min.js
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/js/jquery.orbit-1.2.3.min.js b/products/stratos/modules/distribution/lib/home/js/jquery.orbit-1.2.3.min.js
deleted file mode 100755
index 13acb8d..0000000
--- a/products/stratos/modules/distribution/lib/home/js/jquery.orbit-1.2.3.min.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * jQuery Orbit Plugin 1.2.3
- * www.ZURB.com/playground
- * Copyright 2010, ZURB
- * Free to use under the MIT license.
- * http://www.opensource.org/licenses/mit-license.php
-*/
-
-(function(d){d.fn.orbit=function(a){a=d.extend({animation:"horizontal-push",animationSpeed:600,timer:!0,advanceSpeed:4E3,pauseOnHover:!1,startClockOnMouseOut:!1,startClockOnMouseOutAfter:1E3,directionalNav:!0,captions:!0,captionAnimation:"fade",captionAnimationSpeed:600,bullets:!1,bulletThumbs:!1,bulletThumbLocation:"",afterSlideChange:function(){}},a);return this.each(function(){function q(){if(!a.timer||a.timer=="false")return!1;else r.is(":hidden")?s=setInterval(function(){l("next")},a.advanceSpeed):
-(o=!0,x.removeClass("active"),s=setInterval(function(){var a="rotate("+m+"deg)";m+=2;t.css({"-webkit-transform":a,"-moz-transform":a,"-o-transform":a});m>180&&(t.addClass("move"),z.addClass("move"));m>360&&(t.removeClass("move"),z.removeClass("move"),m=0,l("next"))},a.advanceSpeed/180))}function n(){if(!a.timer||a.timer=="false")return!1;else o=!1,clearInterval(s),x.addClass("active")}function A(){if(!a.captions||a.captions=="false")return!1;else{var y=e.eq(b).data("caption");(_captionHTML=d(y).html())?
-(j.attr("id",y).html(_captionHTML),a.captionAnimation=="none"&&j.show(),a.captionAnimation=="fade"&&j.fadeIn(a.captionAnimationSpeed),a.captionAnimation=="slideOpen"&&j.slideDown(a.captionAnimationSpeed)):(a.captionAnimation=="none"&&j.hide(),a.captionAnimation=="fade"&&j.fadeOut(a.captionAnimationSpeed),a.captionAnimation=="slideOpen"&&j.slideUp(a.captionAnimationSpeed))}}function B(){if(a.bullets)D.children("li").removeClass("active").eq(b).addClass("active");else return!1}function l(d){function c(){e.eq(f).css({"z-index":1});
-u=!1;a.afterSlideChange.call(this)}var f=b,g=d;if(f==g)return!1;if(e.length=="1")return!1;u||(u=!0,d=="next"?(b++,b==p&&(b=0)):d=="prev"?(b--,b<0&&(b=p-1)):(b=d,f<b?g="next":f>b&&(g="prev")),B(),e.eq(f).css({"z-index":2}),a.animation=="fade"&&e.eq(b).css({opacity:0,"z-index":3}).animate({opacity:1},a.animationSpeed,c),a.animation=="horizontal-slide"&&(g=="next"&&e.eq(b).css({left:h,"z-index":3}).animate({left:0},a.animationSpeed,c),g=="prev"&&e.eq(b).css({left:-h,"z-index":3}).animate({left:0},a.animationSpeed,
-c)),a.animation=="vertical-slide"&&(g=="prev"&&e.eq(b).css({top:v,"z-index":3}).animate({top:0},a.animationSpeed,c),g=="next"&&e.eq(b).css({top:-v,"z-index":3}).animate({top:0},a.animationSpeed,c)),a.animation=="horizontal-push"&&(g=="next"&&(e.eq(b).css({left:h,"z-index":3}).animate({left:0},a.animationSpeed,c),e.eq(f).animate({left:-h},a.animationSpeed)),g=="prev"&&(e.eq(b).css({left:-h,"z-index":3}).animate({left:0},a.animationSpeed,c),e.eq(f).animate({left:h},a.animationSpeed))),A())}var b=0,
-p=0,h,v,u,f=d(this).addClass("orbit"),c=f.wrap('<div class="orbit-wrapper" />').parent();f.add(h).width("1px").height("1px");var e=f.children("img, a, div");e.each(function(){var a=d(this),b=a.width(),a=a.height();b>f.width()&&(f.add(c).width(b),h=f.width());a>f.height()&&(f.add(c).height(a),v=f.height());p++});if(e.length==1)a.directionalNav=!1,a.timer=!1,a.bullets=!1;e.eq(b).css({"z-index":3}).fadeIn(function(){e.css({display:"block"})});if(a.timer){c.append('<div class="timer"><span class="mask"><span class="rotator"></span></span><span class="pause"></span></div>');
-var r=d("div.timer"),o;if(r.length!=0){var t=d("div.timer span.rotator"),z=d("div.timer span.mask"),x=d("div.timer span.pause"),m=0,s;q();r.click(function(){o?n():q()});if(a.startClockOnMouseOut){var C;c.mouseleave(function(){C=setTimeout(function(){o||q()},a.startClockOnMouseOutAfter)});c.mouseenter(function(){clearTimeout(C)})}}}a.pauseOnHover&&c.mouseenter(function(){n()});if(a.captions){c.append('<div class="orbit-caption"></div>');var j=c.children(".orbit-caption");A()}if(a.directionalNav){if(a.directionalNav==
-"false")return!1;c.append('<div class="slider-nav"><span class="right">Right</span><span class="left">Left</span></div>');var k=c.children("div.slider-nav").children("span.left"),w=c.children("div.slider-nav").children("span.right");k.click(function(){n();l("prev")});w.click(function(){n();l("next")})}if(a.bullets){c.append('<ul class="orbit-bullets"></ul>');var D=d("ul.orbit-bullets");for(i=0;i<p;i++){k=d("<li>"+(i+1)+"</li>");if(a.bulletThumbs&&(w=e.eq(i).data("thumb")))k=d('<li class="has-thumb">'+
-i+"</li>"),k.css({background:"url("+a.bulletThumbLocation+w+") no-repeat"});d("ul.orbit-bullets").append(k);k.data("index",i);k.click(function(){n();l(d(this).data("index"))})}B()}})}})(jQuery);
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/js/orbit-1.2.3.css
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/js/orbit-1.2.3.css b/products/stratos/modules/distribution/lib/home/js/orbit-1.2.3.css
deleted file mode 100644
index 90ecd2d..0000000
--- a/products/stratos/modules/distribution/lib/home/js/orbit-1.2.3.css
+++ /dev/null
@@ -1,223 +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.
- *
-*/
-
-/* CSS for jQuery Orbit Plugin 1.2.3
- * www.ZURB.com/playground
- * Copyright 2010, ZURB
- * Free to use under the MIT license.
- * http://www.opensource.org/licenses/mit-license.php
- 
- 
- 
-/* PUT IN YOUR SLIDER ID AND SIZE TO MAKE LOAD BEAUTIFULLY
-   ================================================== */
-#featured { 
-	width: 940px;
-	height: 450px;
-	url('orbit/loading.gif') no-repeat center center;
-	overflow: hidden; }
-#featured>img,  
-#featured>div,
-#featured>a { display: none; }
-
-
-
-
-/* CONTAINER
-   ================================================== */
-
-div.orbit-wrapper {
-    width: 1px;
-    height: 1px;
-    position: relative; }
-
-div.orbit {
-    width: 1px;
-    height: 1px;
-    position: relative;
-    overflow: hidden }
-
-div.orbit>img {
-    position: absolute;
-    top: 0;
-    left: 0;
-    display: none; }
-
-div.orbit>a {
-    border: none;
-    position: absolute;
-    top: 0;
-    left: 0;
-    line-height: 0; 
-    display: none; }
-
-.orbit>div {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%; }
-
-/* Note: If your slider only uses content or anchors, you're going to want to put the width and height declarations on the ".orbit>div" and "div.orbit>a" tags in addition to just the .orbit-wrapper */
-
-
-/* TIMER
-   ================================================== */
-
-div.timer {
-    width: 40px;
-    height: 40px;
-    overflow: hidden;
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    opacity: .6;
-    cursor: pointer;
-    z-index: 1001; }
-
-span.rotator {
-    display: block;
-    width: 40px;
-    height: 40px;
-    position: absolute;
-    top: 0;
-    left: -20px;
-    background: url(orbit/rotator-black.png) no-repeat;
-    z-index: 3; }
-
-span.mask {
-    display: block;
-    width: 20px;
-    height: 40px;
-    position: absolute;
-    top: 0;
-    right: 0;
-    z-index: 2;
-    overflow: hidden; }
-
-span.rotator.move {
-    left: 0 }
-
-span.mask.move {
-    width: 40px;
-    left: 0;
-    background: url(orbit/timer-black.png) repeat 0 0; }
-
-span.pause {
-    display: block;
-    width: 40px;
-    height: 40px;
-    position: absolute;
-    top: 0;
-    left: 0;
-    background: url(orbit/pause-black.png) no-repeat;
-    z-index: 4;
-    opacity: 0; }
-
-span.pause.active {
-    background: url(orbit/pause-black.png) no-repeat 0 -40px }
-
-div.timer:hover span.pause,
-span.pause.active {
-    opacity: 1 }
-
-
-/* CAPTIONS
-   ================================================== */
-
-.orbit-caption {
-    display: none;
-    font-family: "HelveticaNeue", "Helvetica-Neue", Helvetica, Arial, sans-serif; }
-
-.orbit-wrapper .orbit-caption {
-    background: #000;
-    background: rgba(0,0,0,.6);
-    z-index: 1000;
-    color: #fff;
-	text-align: center;
-	padding: 7px 0;
-    font-size: 13px;
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    width: 100%; }
-
-
-/* DIRECTIONAL NAV
-   ================================================== */
-
-div.slider-nav {
-    display: block }
-
-div.slider-nav span {
-    width: 30px;
-    height: 41px;
-    text-indent: -9999px;
-    position: absolute;
-    z-index: 1000;
-    background-color: #fffff;
-    top: 50%;
-    margin-top: -22px;
-    cursor: pointer; }
-
-div.slider-nav span.right {
-    background: url(orbit/right-arrow.png);
-    right: 0; }
-
-div.slider-nav span.left {
-    background: url(orbit/left-arrow.png);
-    left: 0; }
-
-/* BULLET NAV
-   ================================================== */
-
-.orbit-bullets {
-    position: absolute;
-    z-index: 1000;
-    list-style: none;
-    bottom: -40px;
-    left: 50%;
-	margin-left: -50px;
-    padding: 0; }
-
-.orbit-bullets li {
-    float: left;
-    margin-left: 5px;
-    cursor: pointer;
-    color: #999;
-    text-indent: -9999px;
-    background: url(orbit/bullets.jpg) no-repeat 4px 0;
-    width: 13px;
-    height: 12px;
-    overflow: hidden; }
-
-.orbit-bullets li.active {
-    color: #222;
-    background-position: -8px 0; }
-    
-.orbit-bullets li.has-thumb {
-    background: none;
-    width: 100px;
-    height: 75px; }
-
-.orbit-bullets li.active.has-thumb {
-    background-position: 0 0;
-    border-top: 2px solid #000; }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/js/orbit/left-arrow.png
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/js/orbit/left-arrow.png b/products/stratos/modules/distribution/lib/home/js/orbit/left-arrow.png
deleted file mode 100755
index bd65cb1..0000000
Binary files a/products/stratos/modules/distribution/lib/home/js/orbit/left-arrow.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/js/orbit/loading.gif
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/js/orbit/loading.gif b/products/stratos/modules/distribution/lib/home/js/orbit/loading.gif
deleted file mode 100755
index 969f505..0000000
Binary files a/products/stratos/modules/distribution/lib/home/js/orbit/loading.gif and /dev/null differ

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/js/orbit/mask-black.png
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/js/orbit/mask-black.png b/products/stratos/modules/distribution/lib/home/js/orbit/mask-black.png
deleted file mode 100755
index e4e77b5..0000000
Binary files a/products/stratos/modules/distribution/lib/home/js/orbit/mask-black.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/js/orbit/right-arrow.png
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/js/orbit/right-arrow.png b/products/stratos/modules/distribution/lib/home/js/orbit/right-arrow.png
deleted file mode 100755
index 2c9baab..0000000
Binary files a/products/stratos/modules/distribution/lib/home/js/orbit/right-arrow.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/js/orbit/rotator-black.png
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/js/orbit/rotator-black.png b/products/stratos/modules/distribution/lib/home/js/orbit/rotator-black.png
deleted file mode 100755
index a0d24a7..0000000
Binary files a/products/stratos/modules/distribution/lib/home/js/orbit/rotator-black.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/js/orbit/timer-black.png
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/js/orbit/timer-black.png b/products/stratos/modules/distribution/lib/home/js/orbit/timer-black.png
deleted file mode 100755
index e4e77b5..0000000
Binary files a/products/stratos/modules/distribution/lib/home/js/orbit/timer-black.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/lib/home/style.css
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/lib/home/style.css b/products/stratos/modules/distribution/lib/home/style.css
deleted file mode 100644
index c98a894..0000000
--- a/products/stratos/modules/distribution/lib/home/style.css
+++ /dev/null
@@ -1,181 +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.
- *
-*/
-
-body { font-family: "Calibri","Lucida Grande","Lucida Sans","Microsoft Sans Serif","Lucida Sans Unicode","Verdana","Sans-serif","trebuchet ms"; font-size: .85em; line-height: 135%; color: #434343; margin: 0px; padding: 0px; background-color: #94C8EC;}
-
-p { }
-
-td { }
-
-a:link { text-decoration: none; }
-
-a:visited { text-decoration: none; }
-
-a:hover { text-decoration: none; }
-
-a:active { text-decoration: none; }
-
-a img { border: 0px; }
-div.clear { clear: both; }
-
-div#main-content { width: 960px; margin: auto; background-image: url(images/top.gif); background-repeat: no-repeat; background-position: left 15px; }
-
-div#header { height: 140px; }
-div.top-nav {
-	float: right;
-}
-div.top-nav ul {
-	list-style: none;
-	margin: 0px;
-	padding: 0px;
-}
-div.top-nav ul li {
-	position: relative;
-	float: left;
-	padding-left: 10px;
-	padding-right: 10px;
-	padding-top: 10px;
-	padding-bottom: 0px;
-	border-right: solid 1px #005577;
-}
-div.top-nav ul li.right {
-	border-right: 0px;
-}
-div.top-nav ul li a {
-	color: #005577;
-	font-weight: bold;
-	font-size: 16px;
-}
-div.top-nav ul li a:hover {
-	color: #ffffff;
-}
-div.logo { float: left; margin-top: 25px; }
-div#content { background-color: #ffffff; background-image: url(images/content-bg.gif); background-repeat: repeat-y; background-position: left top; }
-div#left {
-	float: left;
-	width: 400px;
-	background-image: url(images/left-bg.gif);
-	background-position: right top;
-	background-repeat: no-repeat;
-}
-div#left div.stratos-products div.title {
-	margin-left: 30px;
-	margin-top: 5px;
-	font-size: 24px;
-	font-weight: normal;
-	line-height: 32px;
-}
-div#left div.stratos-products div.products {
-	margin-left: 30px;
-	margin-top: 25px;
-	padding-bottom: 40px;
-}
-div#left div.stratos-products div.products a {
-	display: block;
-	height: 24px;
-	margin-bottom: 7px;
-	background-image: url(images/stratos-products.gif);
-	background-repeat: no-repeat;
-	background-position: left top;
-}
-div#left div.stratos-products div.products a {
-	background: url(images/stratos-products-new.jpg) no-repeat top left;
-}
-div#left div.stratos-products div.products a.as-new{ background-position: 0 0; width: 170px; height: 24px; } 
-div#left div.stratos-products div.products a.bam-new{ background-position: 0 -74px; width: 204px; height: 23px; } 
-div#left div.stratos-products div.products a.bps-new{ background-position: 0 -147px; width: 198px; height: 23px; } 
-div#left div.stratos-products div.products a.brs-new{ background-position: 0 -220px; width: 183px; height: 23px; } 
-div#left div.stratos-products div.products a.cep-new{ background-position: 0 -293px; width: 231px; height: 22px; } 
-div#left div.stratos-products div.products a.cg-new{ background-position: 0 -365px; width: 148px; height: 24px; } 
-div#left div.stratos-products div.products a.dss-new{ background-position: 0 -439px; width: 181px; height: 24px; } 
-div#left div.stratos-products div.products a.esb-new{ background-position: 0 -513px; width: 192px; height: 24px; }
-div#left div.stratos-products div.products a.greg-new{ background-position: 0 -587px; width: 180px; height: 23px; } 
-div#left div.stratos-products div.products a.is-new{ background-position: 0 -660px; width: 147px; height: 23px; } 
-div#left div.stratos-products div.products a.mb-new{ background-position: 0 -733px; width: 157px; height: 23px; } 
-div#left div.stratos-products div.products a.ss-new{ background-position: 0 -806px; width: 142px; height: 23px; } 
-div#left div.stratos-products div.products a.ts-new{ background-position: 0 -879px; width: 130px; height: 23px; } 
-div#left div.stratos-products div.products a:hover { opacity:0.7;filter:alpha(opacity=70) }
-div#right {
-	float: left;
-	width: 560px;
-}
-
-div#right div.register { width: 555px; margin-top: 15px; margin-right: 0px; padding-bottom: 10px; text-align: center;
-background-image: url(images/intro-bg.gif);background-position: center bottom; background-repeat: no-repeat;
-}
-div#right div.register a { display: block; height: 62px; margin-bottom: 10px; }
-div#right div.register a img { margin-bottom: 7px; }
-div#right div.register a:hover img { opacity:0.7;filter:alpha(opacity=70) }
-
-div#right div.banner{
-	width: 500px;
-	margin: auto;
-	height: 297px;
-	margin-top: 30px;
-}
-div#right div.banner div#featured {
-	width: 500px;
-	height: 297px;
-}
-div#right div.banner div#featured div.screencast {
-	width: 500px;
-	height: 297px;
-	text-align: center;
-}
-div#right div.banner div#featured div.screencast h2 {
-	font-size: 16px;
-	margin-top: 0px;
-	margin-bottom: 0px;
-	padding-bottom: 8px;
-	padding-top: 8px;
-	line-height: 16px;
-	background-color: #000000;
-	color: #ffffff;
-	margin-left: 30px;
-	margin-right: 30px;
-}
-div#right div.banner div#featured div.whitepaper, div#right div.banner div#featured div.webinar {
-	width: 500px;
-	height: 297px;
-	text-align: center;
-	margin-top: 23px;
-}
-div#bottom { 
-	background-image: url(images/feature-middle-bg.gif);
-	background-position: center top;
-	background-repeat: no-repeat; 
-	}
-div#bottom div.feature {
-	float: left; 
-	width: 240px;
-	padding-left: 40px;
-	padding-right: 40px;
-	font-size: 20px;
-	line-height: 25px;
-	font-weight: bold;
-	text-align: center;
-	padding-bottom: 20px;
-}
-div#footer { height: 80px; background-image: url(images/bottom.gif); background-position: left top; background-repeat: no-repeat; padding-top: 25px;}
-div#footer div.powered { color: #333333; float: right; font-size: 85%; margin-right: 10px; }
-div#footer div.powered span { float: left; line-height: 23px; margin-right: 5px; }
-div.footer-links { padding-bottom: 5px; padding-left: 10px; border-bottom: solid 1px #4E84C4; margin-bottom: 10px; color: #4E84C4; }
-div#footer span.copyright { font-size: 90%; padding-left: 10px; }

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/qpid-resources/etc/config.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/qpid-resources/etc/config.xml b/products/stratos/modules/distribution/qpid-resources/etc/config.xml
deleted file mode 100755
index a54dd98..0000000
--- a/products/stratos/modules/distribution/qpid-resources/etc/config.xml
+++ /dev/null
@@ -1,101 +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.
-  -->
-<broker>
-    <prefix>${QPID_HOME}</prefix>
-    <work>${QPID_WORK}</work>
-    <conf>${prefix}/etc</conf>
-
-    <plugin-directory>${QPID_HOME}/lib/plugins</plugin-directory>
-    <cache-directory>${QPID_WORK}/cache</cache-directory>
-    
-    <connector>
-        <!-- To enable SSL edit the keystorePath and keystorePassword
-	     and set enabled to true. 
-             To disasble Non-SSL port set sslOnly to true -->
-        <ssl>
-            <enabled>false</enabled>
-            <sslOnly>false</sslOnly>
-            <keystorePath>/path/to/keystore.ks</keystorePath>
-            <keystorePassword>keystorepass</keystorePassword>
-        </ssl>
-        <qpidnio>false</qpidnio>
-        <protectio>
-            <enabled>false</enabled>
-            <readBufferLimitSize>262144</readBufferLimitSize>
-            <writeBufferLimitSize>262144</writeBufferLimitSize>	    
-        </protectio>
-        <transport>nio</transport>
-        <port>5672</port>
-        <sslport>8672</sslport>
-        <socketReceiveBuffer>32768</socketReceiveBuffer>
-        <socketSendBuffer>32768</socketSendBuffer>
-    </connector>
-    <management>
-        <enabled>true</enabled>
-        <jmxport>8999</jmxport>
-        <ssl>
-            <enabled>false</enabled>
-            <!-- Update below path to your keystore location, or run the bin/create-example-ssl-stores(.sh|.bat)
-                 script from within the etc/ folder to generate an example store with self-signed cert -->
-            <keyStorePath>${conf}/qpid.keystore</keyStorePath>
-            <keyStorePassword>password</keyStorePassword>
-        </ssl>
-    </management>
-    <advanced>
-        <filterchain enableExecutorPool="true"/>
-        <enablePooledAllocator>false</enablePooledAllocator>
-        <enableDirectBuffers>false</enableDirectBuffers>
-        <framesize>65535</framesize>
-        <compressBufferOnQueue>false</compressBufferOnQueue>
-        <enableJMSXUserID>false</enableJMSXUserID>
-        <locale>en_US</locale>	
-    </advanced>
-
-    <security>
-        <principal-databases>
-            <principal-database>
-                <name>carbon-user-store</name>
-                <class>org.wso2.carbon.qpid.authentication.qpid.CarbonBasedPrincipalDatabase</class>
-            </principal-database>
-        </principal-databases>
-
-        <msg-auth>false</msg-auth>
-        
-        <jmx>
-            <access>${conf}/jmxremote.access</access>
-            <principal-database>carbon-user-store</principal-database>
-        </jmx>
-    </security>
-
-    <virtualhosts>${conf}/virtualhosts.xml</virtualhosts>
-    
-    <heartbeat>
-        <delay>0</delay>
-        <timeoutFactor>2.0</timeoutFactor>
-    </heartbeat>
-    <queue>
-        <auto_register>true</auto_register>
-    </queue>
-
-    <status-updates>ON</status-updates>
-
-</broker>
-
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/qpid-resources/etc/jmxremote.access
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/qpid-resources/etc/jmxremote.access b/products/stratos/modules/distribution/qpid-resources/etc/jmxremote.access
deleted file mode 100755
index f496e92..0000000
--- a/products/stratos/modules/distribution/qpid-resources/etc/jmxremote.access
+++ /dev/null
@@ -1,23 +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.
-
-#Generated by JMX Console : Last edited by user:admin
-#Tue Jun 12 16:46:39 BST 2007
-#admin=admin
-#guest=readonly
-#user=readwrite

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/qpid-resources/etc/virtualhosts.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/qpid-resources/etc/virtualhosts.xml b/products/stratos/modules/distribution/qpid-resources/etc/virtualhosts.xml
deleted file mode 100755
index f55e8c8..0000000
--- a/products/stratos/modules/distribution/qpid-resources/etc/virtualhosts.xml
+++ /dev/null
@@ -1,62 +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.
-  -->
-<virtualhosts>
-    <default>carbon</default>
-    <virtualhost>
-        <name>carbon</name>
-        <carbon>
-            <store>
-                <!--class>org.apache.qpid.server.store.MemoryMessageStore</class-->
-		<class>org.apache.qpid.server.store.DerbyMessageStore</class>
-		<environment-path>repository/database/qpid/derbystore</environment-path>
-            </store>
-
-            <housekeeping>
-                <threadCount>2</threadCount>
-                <expiredMessageCheckPeriod>20000</expiredMessageCheckPeriod>
-            </housekeeping>
-
-            <exchanges>
-                <exchange>
-                    <type>direct</type>
-                    <name>carbon.direct</name>
-                    <durable>true</durable>
-                </exchange>
-                <exchange>
-                    <type>topic</type>
-                    <name>carbon.topic</name>
-                </exchange>
-            </exchanges>
-            
-	    <queues>
-                <maximumQueueDepth>4235264</maximumQueueDepth>
-                <!-- 4Mb -->
-                <maximumMessageSize>2117632</maximumMessageSize>
-                <!-- 2Mb -->
-                <maximumMessageAge>600000</maximumMessageAge>
-                <!-- 10 mins -->
-                <maximumMessageCount>50</maximumMessageCount>
-                <!-- 50 messages -->
-            </queues>
-        </carbon>
-    </virtualhost>
-</virtualhosts>
-
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/qpid-resources/qpid.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/qpid-resources/qpid.xml b/products/stratos/modules/distribution/qpid-resources/qpid.xml
deleted file mode 100755
index 086fb08..0000000
--- a/products/stratos/modules/distribution/qpid-resources/qpid.xml
+++ /dev/null
@@ -1,25 +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.
-  -->
-<Qpid>
-    <!-- Start Qpid broker when Carbon starts up -->
-    <AutoStart>true</AutoStart>
-    <RegistryRoot>event</RegistryRoot>
-</Qpid>

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/assembly/bin.xml b/products/stratos/modules/distribution/src/assembly/bin.xml
index 08de3f9..623e49b 100755
--- a/products/stratos/modules/distribution/src/assembly/bin.xml
+++ b/products/stratos/modules/distribution/src/assembly/bin.xml
@@ -57,7 +57,8 @@
         </fileSet>
         <!-- Copying p2 profile and osgi bundles-->
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components
+            </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/components</outputDirectory>
             <excludes>
                 <exclude>**/eclipse.ini</exclude>
@@ -85,7 +86,9 @@
             </excludes>
         </fileSet>
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps</directory>
+            <directory>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps
+            </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps</outputDirectory>
             <excludes>
                 <exclude>**/publisher/**</exclude>
@@ -106,14 +109,16 @@
         </fileSet>
         <fileSet>
             <directory>../../../../components/org.apache.stratos.manager.console/console</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/console</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/console
+            </outputDirectory>
             <excludes>
                 <exclude>**/README</exclude>
             </excludes>
         </fileSet>
         <fileSet>
             <directory>../../../../components/org.apache.stratos.manager.console/sso</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/sso</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/sso
+            </outputDirectory>
         </fileSet>
         <fileSet>
             <directory>../../../../components/org.apache.stratos.manager.console/modules/console</directory>
@@ -135,140 +140,20 @@
             </includes>
             <fileMode>755</fileMode>
         </fileSet>
-        <fileSet>
-            <directory>../../conf/synapse-configs</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/synapse-configs</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>../../conf</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-            <excludes>
-                <exclude>**/samples-desc.xml</exclude>
-                <exclude>**/identity.xml</exclude>
-                <exclude>**/user-mgt.xml</exclude>
-                <exclude>**/datasources.properties</exclude>
-                <exclude>.svn</exclude>
-                <exclude>**/temp-artifacts/**</exclude>
-                <exclude>tenant-mgt.xml</exclude>
-                <exclude>email-bill-generated.xml</exclude>
-                <exclude>email-billing-notifications.xml</exclude>
-                <exclude>email-new-tenant-activation.xml</exclude>
-                <exclude>email-new-tenant-registration.xml</exclude>
-                <exclude>email-password-reset.xml</exclude>
-                <exclude>email-payment-received-customer.xml</exclude>
-                <exclude>email-registration-payment-received-customer.xml</exclude>
-                <exclude>email-payment-received-wso2.xml</exclude>
-                <exclude>email-registration-complete.xml</exclude>
-                <exclude>email-registration-moderation.xml</exclude>
-                <exclude>email-registration.xml</exclude>
-                <exclude>email-update.xml</exclude>
-                <exclude>tenant-reg-agent.xml</exclude>
-                <exclude>features-dashboard.xml</exclude>
-                <exclude>**/data-bridge/**</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>../../conf</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/email</outputDirectory>
-            <includes>
-                <include>email-bill-generated.xml</include>
-                <include>email-billing-notifications.xml</include>
-                <include>email-new-tenant-activation.xml</include>
-                <include>email-new-tenant-registration.xml</include>
-                <include>email-password-reset.xml</include>
-                <include>email-payment-received-customer.xml</include>
-                <include>email-registration-payment-received-customer.xml</include>
-                <include>email-payment-received-wso2.xml</include>
-                <include>email-registration-complete.xml</include>
-                <include>email-registration-moderation.xml</include>
-                <include>email-registration.xml</include>
-                <include>email-update.xml</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../conf</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy</outputDirectory>
-            <includes>
-                <include>tenant-reg-agent.xml</include>
-                <include>features-dashboard.xml</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../conf</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources</outputDirectory>
-            <includes>
-                <include>stratos-datasources.xml</include>
-            </includes>
-        </fileSet>
+
         <!-- Copying themes, cloud icons-->
         <fileSet>
-            <directory>../../resources</directory>
+            <directory>src/main/resources</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/resources</outputDirectory>
             <fileMode>755</fileMode>
             <includes>
                 <include>allthemes/**</include>
                 <include>powerded-by-logos/**</include>
             </includes>
-            <excludes>
-                <exclude>.svn</exclude>
-            </excludes>
-        </fileSet>
-        <!--start BAM related files -->
-        <!--<fileSet>
-            <directory>resources/dataservices</directory>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/dataservices
-            </outputDirectory>
-            <includes>
-                <include>*.dbs</include>
-                <include>*.xml</include>
-            </includes>
         </fileSet>
+
+        <!-- ADC management related files -->
         <fileSet>
-            <directory>resources/dataservices/bam</directory>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/dataservices
-            </outputDirectory>
-            <includes>
-                <include>*.dbs</include>
-                <include>*.xml</include>
-            </includes>
-        </fileSet>-->
-        <fileSet>
-            <directory>resources</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources</outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-        </fileSet>
-        <!--fileSet>
-            <directory>resources/dbscripts</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/</outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-        </fileSet-->
-        <!--end BAM related files -->
-        <!--qpid related files -->
-        <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/advanced/</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/advanced</outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-            <excludes>
-                <exclude>**/jmx.xml</exclude>
-                <exclude>**/authenticators.xml</exclude>
-                <exclude>**/logging-config.xml</exclude>
-            </excludes>
-        </fileSet>
-        <!-- end of qpid related files -->
-        <!-- adc.mgt related files -->
-        <fileSet>
-            <!--directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/</directory-->
             <directory>src/main/conf/</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
             <includes>
@@ -283,7 +168,7 @@
                 <include>policies.xsd</include>
             </includes>
         </fileSet>
-        <!-- end of adc.mgt related files -->
+
         <!-- axis2.xml -->
         <fileSet>
             <directory>src/main/conf/</directory>
@@ -307,32 +192,13 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/</directory>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
+            </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy/</outputDirectory>
             <includes>
                 <include>**/multitenancy-packages.xml</include>
                 <include>**/stratos.xml</include>
                 <include>**/usage-throttling-agent-config.xml</include>
-                <!--include>**/cloud-services-desc.xml</include-->
-            </includes>
-        </fileSet>
-        <!-- copy the landing page webapp -->
-        <fileSet>
-            <directory>lib/home</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/STRATOS_ROOT</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>../../modules/features-dashboard/target/</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
-            <includes>
-                <include>**/*.war</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../resources/cloud-services-icons/target/</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
-            <includes>
-                <include>**/*.war</include>
             </includes>
         </fileSet>
         <fileSet>
@@ -381,11 +247,13 @@
                 <include>*/**</include>
             </includes>
         </fileSet>
+
         <!-- copy the billing h2 db -->
         <fileSet>
             <directory>target/database</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
         </fileSet>
+
         <!-- Kernel Patches-->
         <fileSet>
             <directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001</directory>
@@ -449,40 +317,25 @@
                 <include>**/patch0008/*.*</include>
             </includes>
         </fileSet>
-        <!--
-		<fileSet>
-                   <directory>../../dbscripts/</directory>
-                   <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts</outputDirectory>
-                </fileSet>
--->
+
+        <!-- Jaggery modules -->
         <fileSet>
-            <directory>../../payload</directory>
-            <includes>
-                <include>user-data</include>
-            </includes>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>../../payload/user-data/</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/user-data</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>../../conf/temp-artifacts/sso</directory>
+            <directory>src/main/temp-artifacts/sso</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/modules/sso</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>../../conf/temp-artifacts/carbon</directory>
+            <directory>src/main/temp-artifacts/carbon</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/modules/carbon</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>../../conf/temp-artifacts</directory>
+            <directory>src/main/temp-artifacts</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/plugins</outputDirectory>
             <includes>
                 <include>org.wso2.store.sso.common_1.0.0.jar</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>../../conf/temp-artifacts</directory>
+            <directory>src/main/temp-artifacts</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/plugins</outputDirectory>
             <includes>
                 <include>org.wso2.stratos.identity.saml2.sso.mgt_2.2.0.jar</include>
@@ -490,44 +343,52 @@
         </fileSet>
         <!-- autoscaler -->
         <fileSet>
-            <directory>../../conf/temp-artifacts</directory>
+            <directory>src/main/temp-artifacts</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/plugins</outputDirectory>
             <includes>
                 <include>org.jaggeryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar</include>
             </includes>
         </fileSet>
+
         <!-- cep -->
         <!--creating an empty input event adaptors directory-->
         <fileSet>
             <directory>../../../../extensions/cep/artifacts/inputeventadaptors</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/inputeventadaptors</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/inputeventadaptors
+            </outputDirectory>
         </fileSet>
         <!--creating an empty output event adaptors directory-->
         <fileSet>
             <directory>../../../../extensions/cep/artifacts/outputeventadaptors</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/outputeventadaptors</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/outputeventadaptors
+            </outputDirectory>
         </fileSet>
         <!--creating an empty event builders directory-->
         <fileSet>
             <directory>../../../../extensions/cep/artifacts/eventbuilders</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/eventbuilders</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/eventbuilders
+            </outputDirectory>
         </fileSet>
         <!--creating an empty event formatters directory-->
         <fileSet>
             <directory>../../../../extensions/cep/artifacts/eventformatters</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/eventformatters</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/eventformatters
+            </outputDirectory>
         </fileSet>
         <!--creating an empty execution plans directory-->
         <fileSet>
             <directory>../../../../extensions/cep/artifacts/executionplans</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/executionplans</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/executionplans
+            </outputDirectory>
         </fileSet>
         <!--customization scripts-->
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/scripts</directory>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/scripts
+            </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/scripts</outputDirectory>
         </fileSet>
     </fileSets>
+
     <dependencySets>
         <dependencySet>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/lib</outputDirectory>
@@ -583,6 +444,7 @@
             </includes>
         </dependencySet>
     </dependencySets>
+
     <files>
         <file>
             <source>src/main/conf/log4j.properties</source>
@@ -590,6 +452,48 @@
             <filtered>true</filtered>
             <fileMode>600</fileMode>
         </file>
+        <file>
+            <source>src/main/conf/jndi.properties</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>600</fileMode>
+        </file>
+        <file>
+            <source>src/main/conf/tenant-mgt.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>600</fileMode>
+        </file>
+        <file>
+            <source>src/main/conf/registry.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>600</fileMode>
+        </file>
+        <file>
+            <source>src/main/conf/user-mgt.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>600</fileMode>
+        </file>
+        <file>
+            <source>src/main/conf/mqtttopic.properties</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>600</fileMode>
+        </file>
+        <file>
+            <source>src/main/conf/event-broker.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>600</fileMode>
+        </file>
+        <file>
+            <source>src/main/conf/sso-idp-config.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>600</fileMode>
+        </file>
         <!-- cep -->
         <file>
             <source>src/main/conf/siddhi/siddhi.extension</source>
@@ -603,7 +507,9 @@
         </file>
         <!-- cloud-controller -->
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cloud-controller.xml</source>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cloud-controller.xml
+            </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
         </file>
         <!-- cloud-controller -->
@@ -620,7 +526,7 @@
             <filtered>true</filtered>
             <fileMode>600</fileMode>
         </file>
-        <!--iindentity.xml and application-authentication.xml for oAuth feature -->
+        <!-- identity.xml and application-authentication.xml for oAuth feature -->
         <file>
             <source>src/main/conf/identity.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
@@ -634,6 +540,12 @@
             <fileMode>600</fileMode>
         </file>
         <file>
+            <source>src/main/conf/application-authenticators.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>600</fileMode>
+        </file>
+        <file>
             <source>src/main/conf/security/client-truststore.jks</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security/</outputDirectory>
             <filtered>false</filtered>
@@ -689,13 +601,7 @@
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>../../conf/samples-desc.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>src/main/resources/launch.ini</source>
+            <source>src/main/conf/etc/launch.ini</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
@@ -712,55 +618,37 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <file>
-            <source>../../conf/datasources.properties</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
         <!-- copy custome webapp classLoading files -->
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml</source>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml
+            </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml</source>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml
+            </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/context.xml</source>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/context.xml
+            </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <!--file>
-            <source>../../conf/cartridge-config.properties</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file-->
-        <file>
-            <source>../../conf/cloud-services-desc.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
         <file>
             <source>${project.basedir}/README.txt</source>
             <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <!--file>
-            <source>LICENSE.txt</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file-->
         <file>
             <source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory>
@@ -773,32 +661,18 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <!--file>
-            <source>target/wso2carbon-core-${carbon.kernel.version}/bin/wso2server.bat</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file-->
-        <!--file>
-            <source>bam-resources/bam.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file-->
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources/security/userRP.jks</source>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources/security/userRP.jks
+            </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
-        <!--file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
-	    <filtered>true</filtered>
-	    <fileMode>644</fileMode>	
-        </file-->
         <!-- Including logging-config.xml file -->
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml</source>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml
+            </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/</outputDirectory>
         </file>
         <file>
@@ -814,134 +688,87 @@
             <fileMode>755</fileMode>
         </file>
         <file>
-            <source>src/bin/git-folder-structure.sh</source>
-            <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>src/bin/manage-git-repo.sh</source>
-            <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>src/bin/set-mysql-password.sh</source>
-            <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>src/bin/add_entry_zone_file.sh</source>
-            <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>src/bin/remove_entry_zone_file.sh</source>
-            <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>src/bin/update-instance.sh</source>
-            <outputDirectory>apache-stratos-${pom.version}/bin/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/claim-config.xml</source>
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/claim-config.xml
+            </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/tasks-config.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
-        </file>
-        <file>
-            <source>../../conf/zoo.cfg</source>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/tasks-config.xml
+            </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
         </file>
-        <file>
-            <source>../../conf/jaas.conf</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security</outputDirectory>
-            <destName>jaas.conf</destName>
-            <filtered>true</filtered>
-        </file>
-        <file>
-            <source>../../conf/tenant-mgt.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <!--Application authenticators -->
-        <file>
-            <source>../../conf/application-authenticators.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security/</outputDirectory>
-            <fileMode>644</fileMode>
-        </file>
         <!-- REST endpoint webapp -->
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/api.war</source>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/api.war
+            </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
         <!-- Mock iaas webapp -->
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mock-iaas.war</source>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mock-iaas.war
+            </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
         <!--oauth2.war and authenticationendpoint.war is related to oAuth feature  -->
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/oauth2.war</source>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/oauth2.war
+            </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/authenticationendpoint.war</source>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/authenticationendpoint.war
+            </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
         <!-- End of REST endpoint webapp -->
         <!-- Meta data service webapp -->
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/metadata.war</source>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/metadata.war
+            </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
         <!-- End of Meta data service webapp -->
         <file>
-            <source>../../conf/data-bridge/data-bridge-config.xml</source>
+            <source>src/main/conf/data-bridge/data-bridge-config.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>../../conf/data-bridge/thrift-agent-config.xml</source>
+            <source>src/main/conf/data-bridge/thrift-agent-config.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>../../conf/thrift-client-config.xml</source>
+            <source>src/main/conf/thrift-client-config.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
-        <!--Copying config files from kernel patches -->
-        <!--
-        <file>
-            <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts/mysql.sql</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/registry</outputDirectory>
-            <filtered>true</filtered>
-        </file>
--->
+
+        <!-- Kernel patches configuration -->
         <file>
-            <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-text.properties</source>
+            <source>
+                ../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-text.properties
+            </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security/</outputDirectory>
             <filtered>true</filtered>
         </file>
         <file>
-            <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-tool.properties</source>
+            <source>
+                ../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-tool.properties
+            </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security/</outputDirectory>
             <filtered>true</filtered>
         </file>
@@ -951,4 +778,4 @@
             <filtered>true</filtered>
         </file>
     </files>
-</assembly>
+</assembly>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/assembly/filter.properties
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/assembly/filter.properties b/products/stratos/modules/distribution/src/assembly/filter.properties
index 7748c21..866e34e 100755
--- a/products/stratos/modules/distribution/src/assembly/filter.properties
+++ b/products/stratos/modules/distribution/src/assembly/filter.properties
@@ -19,8 +19,8 @@
 
 product.name=Apache Stratos
 product.key=STRATOS
-product.version=4.1.1
+product.version=4.1.2
 hotdeployment=true
 hotupdate=false
 carbon.version=4.2.0
-default.server.role=Stratos
+default.server.role=Stratos
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/conf/application-authenticators.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/application-authenticators.xml b/products/stratos/modules/distribution/src/main/conf/application-authenticators.xml
new file mode 100644
index 0000000..5a12e34
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/conf/application-authenticators.xml
@@ -0,0 +1,26 @@
+<?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.
+  -->
+
+<Authenticators>
+	<Authenticator name="BasicAuthenticator" disabled="false" factor="1">
+		<Status value="10" loginPage="/sso/login" />
+	</Authenticator>
+</Authenticators>

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/conf/data-bridge/data-bridge-config.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/data-bridge/data-bridge-config.xml b/products/stratos/modules/distribution/src/main/conf/data-bridge/data-bridge-config.xml
new file mode 100644
index 0000000..33f9905
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/conf/data-bridge/data-bridge-config.xml
@@ -0,0 +1,74 @@
+<!--
+  ~ 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.
+  -->
+
+<dataBridgeConfiguration xmlns="http://wso2.org/carbon/databridge">
+
+    <!--<StreamDefinitionStore>org.wso2.carbon.databridge.streamdefn.cassandra.datastore.CassandraStreamDefinitionStore</StreamDefinitionStore>-->
+    <StreamDefinitionStore>org.wso2.carbon.databridge.streamdefn.registry.datastore.RegistryStreamDefinitionStore</StreamDefinitionStore>
+
+    <workerThreads>10</workerThreads>
+    <eventBufferCapacity>10000</eventBufferCapacity>
+    <clientTimeoutMS>30000</clientTimeoutMS>
+    <keySpaceName>EVENT_KS</keySpaceName>
+
+    <!-- Default configuration for thriftDataReceiver -->
+    <thriftDataReceiver>
+        <hostName>0.0.0.0</hostName>
+        <port>7611</port>
+        <securePort>7711</securePort>
+    </thriftDataReceiver>
+
+    <!--<streamDefinitions>
+        <streamDefinition>
+            {
+             'name':'org.wso2.esb.MediatorStatistics',
+             'version':'1.3.0',
+             'nickName': 'Stock Quote Information',
+             'description': 'Some Desc',
+             'metaData':[
+             {'name':'ipAdd','type':'STRING'}
+             ],
+             'payloadData':[
+             {'name':'symbol','type':'STRING'},
+             {'name':'price','type':'DOUBLE'},
+             {'name':'volume','type':'INT'},
+             {'name':'max','type':'DOUBLE'},
+             {'name':'min','type':'Double'}
+             ]
+            }
+        </streamDefinition>
+        <streamDefinition domainName="wso2">
+            {
+             'name':'org.wso2.esb.MediatorStatistics',
+             'version':'1.3.4',
+             'nickName': 'Stock Quote Information',
+             'description': 'Some Other Desc',
+             'metaData':[
+             {'name':'ipAdd','type':'STRING'}
+             ],
+             'payloadData':[
+             {'name':'symbol','type':'STRING'},
+             {'name':'price','type':'DOUBLE'},
+             {'name':'volume','type':'INT'}
+             ]
+            }
+        </streamDefinition>
+    </streamDefinitions>-->
+
+</dataBridgeConfiguration>

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/conf/data-bridge/thrift-agent-config.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/data-bridge/thrift-agent-config.xml b/products/stratos/modules/distribution/src/main/conf/data-bridge/thrift-agent-config.xml
new file mode 100644
index 0000000..628909f
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/conf/data-bridge/thrift-agent-config.xml
@@ -0,0 +1,47 @@
+<!--
+  ~ 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.
+  -->
+
+
+
+<thriftAgentConfiguration xmlns="http://wso2.org/carbon/databridge/agent/thrift">
+
+    <bufferedEventsSize>20000</bufferedEventsSize>
+
+    <poolSize>50</poolSize>
+    <maxPoolSize>50</maxPoolSize>
+
+    <maxTransportPoolSize>250</maxTransportPoolSize>
+    <maxIdleConnections>250</maxIdleConnections>
+    <evictionTimePeriod>5500</evictionTimePeriod>
+    <minIdleTimeInPool>5000</minIdleTimeInPool>
+
+    <secureMaxTransportPoolSize>250</secureMaxTransportPoolSize>
+    <secureMaxIdleConnections>250</secureMaxIdleConnections>
+    <secureEvictionTimePeriod>5500</secureEvictionTimePeriod>
+    <secureMinIdleTimeInPool>5000</secureMinIdleTimeInPool>
+
+    <maxMessageBundleSize>100</maxMessageBundleSize>
+    <asyncDataPublisherBufferedEventSize>10000</asyncDataPublisherBufferedEventSize>
+    <loadBalancingReconnectionInterval>30</loadBalancingReconnectionInterval>
+    <!--<trustStore>
+        .../wso2cep-1.0.0/repository/resources/security/client-truststore.jks
+    </trustStore>
+    <trustStorePassword>wso2carbon</trustStorePassword>-->
+
+</thriftAgentConfiguration>

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/conf/etc/launch.ini
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/etc/launch.ini b/products/stratos/modules/distribution/src/main/conf/etc/launch.ini
new file mode 100644
index 0000000..53dbec5
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/conf/etc/launch.ini
@@ -0,0 +1,269 @@
+#
+# 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.
+#
+
+# Eclipse Runtime Configuration Overrides
+# These properties are loaded prior to starting the framework and can also be used to override System Properties
+# @null is a special value used to override and clear the framework's copy of a System Property prior to starting the framework
+# "*" can be used together with @null to clear System Properties that match a prefix name.
+
+osgi.*=@null
+org.osgi.*=@null
+eclipse.*=@null
+
+osgi.parentClassloader=app
+osgi.contextClassLoaderParent=app
+
+# When osgi.clean is set to "true", any cached data used by the OSGi framework
+# will be wiped clean. This will clean the caches used to store bundle
+# dependency resolution and eclipse extension registry data. Using this
+# option will force OSGi framework to reinitialize these caches.
+# The following setting is put in place to get rid of the problems
+# faced when re-starting the system. Please note that, when this setting is
+# true, if you manually start a bundle, it would not be available when
+# you re-start the system. To avid this, copy the bundle jar to the plugins
+# folder, before you re-start the system.
+osgi.clean=true
+
+# Uncomment the following line to turn on Eclipse Equinox debugging.
+# You may also edit the osgi-debug.options file and fine tune the debugging
+# options to suite your needs.
+#osgi.debug=./repository/conf/osgi-debug.options
+
+# Following system property allows us to control the public JDK packages exported through the system bundle.
+org.osgi.framework.system.packages=javax.accessibility,\
+javax.lang.model.type, \
+javax.activity,\
+javax.crypto,\
+javax.crypto.interfaces,\
+javax.crypto.spec,\
+javax.imageio,\
+javax.imageio.event,\
+javax.imageio.metadata,\
+javax.imageio.plugins.bmp,\
+javax.imageio.plugins.jpeg,\
+javax.imageio.spi,\
+javax.imageio.stream,\
+javax.jms,\
+javax.management,\
+javax.management.loading,\
+javax.management.modelmbean,\
+javax.management.monitor,\
+javax.management.openmbean,\
+javax.management.relation,\
+javax.management.remote,\
+javax.management.remote.rmi,\
+javax.management.timer,\
+javax.naming,\
+javax.naming.directory,\
+javax.naming.event,\
+javax.naming.ldap,\
+javax.naming.spi,\
+javax.net,\
+javax.net.ssl,\
+javax.print,\
+javax.print.attribute,\
+javax.print.attribute.standard,\
+javax.print.event,\
+javax.rmi,\
+javax.rmi.CORBA,\
+javax.rmi.ssl,\
+javax.script,\
+javax.security.auth,\
+javax.security.auth.callback,\
+javax.security.auth.kerberos,\
+javax.security.auth.login,\
+javax.security.auth.spi,\
+javax.security.auth.x500,\
+javax.security.cert,\
+javax.security.sasl,\
+javax.sound.midi,\
+javax.sound.midi.spi,\
+javax.sound.sampled,\
+javax.sound.sampled.spi,\
+javax.sql,\
+javax.sql.rowset,\
+javax.sql.rowset.serial,\
+javax.sql.rowset.spi,\
+javax.swing,\
+javax.swing.border,\
+javax.swing.colorchooser,\
+javax.swing.event,\
+javax.swing.filechooser,\
+javax.swing.plaf,\
+javax.swing.plaf.basic,\
+javax.swing.plaf.metal,\
+javax.swing.plaf.multi,\
+javax.swing.plaf.synth,\
+javax.swing.table,\
+javax.swing.text,\
+javax.swing.text.html,\
+javax.swing.text.html.parser,\
+javax.swing.text.rtf,\
+javax.swing.tree,\
+javax.swing.undo,\
+javax.transaction,\
+javax.transaction.xa,\
+javax.xml.namespace,\
+javax.xml.parsers,\
+javax.xml.transform,\
+javax.xml.transform.stream,\
+javax.xml.transform.dom,\
+javax.xml.transform.sax,\
+javax.xml,\
+javax.xml.validation,\
+javax.xml.datatype,\
+javax.xml.xpath,\
+javax.activation,\
+com.sun.activation.registries,\
+com.sun.activation.viewers,\
+org.ietf.jgss,\
+org.omg.CORBA,\
+org.omg.CORBA_2_3,\
+org.omg.CORBA_2_3.portable,\
+org.omg.CORBA.DynAnyPackage,\
+org.omg.CORBA.ORBPackage,\
+org.omg.CORBA.portable,\
+org.omg.CORBA.TypeCodePackage,\
+org.omg.CosNaming,\
+org.omg.CosNaming.NamingContextExtPackage,\
+org.omg.CosNaming.NamingContextPackage,\
+org.omg.Dynamic,\
+org.omg.DynamicAny,\
+org.omg.DynamicAny.DynAnyFactoryPackage,\
+org.omg.DynamicAny.DynAnyPackage,\
+org.omg.IOP,\
+org.omg.IOP.CodecFactoryPackage,\
+org.omg.IOP.CodecPackage,\
+org.omg.Messaging,\
+org.omg.PortableInterceptor,\
+org.omg.PortableInterceptor.ORBInitInfoPackage,\
+org.omg.PortableServer,\
+org.omg.PortableServer.CurrentPackage,\
+org.omg.PortableServer.POAManagerPackage,\
+org.omg.PortableServer.POAPackage,\
+org.omg.PortableServer.portable,\
+org.omg.PortableServer.ServantLocatorPackage,\
+org.omg.SendingContext,\
+org.omg.stub.java.rmi,\
+org.w3c.dom,\
+org.w3c.dom.bootstrap,\
+org.w3c.dom.css,\
+org.w3c.dom.events,\
+org.w3c.dom.html,\
+org.w3c.dom.ls,\
+org.w3c.dom.ranges,\
+org.w3c.dom.stylesheets,\
+org.w3c.dom.traversal,\
+org.w3c.dom.views ,\
+org.xml.sax,\
+org.xml.sax.ext,\
+org.xml.sax.helpers,\
+org.apache.xerces.xpointer,\
+org.apache.xerces.xni.grammars,\
+org.apache.xerces.impl.xs.util,\
+org.apache.xerces.jaxp.validation,\
+org.apache.xerces.impl.dtd.models,\
+org.apache.xerces.impl.xpath,\
+org.apache.xerces.dom3.as,\
+org.apache.xerces.impl.dv.xs,\
+org.apache.xerces.util,\
+org.apache.xerces.impl.xs.identity,\
+org.apache.xerces.impl.xs.opti,\
+org.apache.xerces.jaxp,\
+org.apache.xerces.impl.dv,\
+org.apache.xerces.xs.datatypes,\
+org.apache.xerces.dom.events,\
+org.apache.xerces.impl.msg,\
+org.apache.xerces.xni,\
+org.apache.xerces.impl.xs,\
+org.apache.xerces.impl,\
+org.apache.xerces.impl.io,\
+org.apache.xerces.xinclude,\
+org.apache.xerces.jaxp.datatype,\
+org.apache.xerces.parsers,\
+org.apache.xerces.impl.dv.util,\
+org.apache.xerces.xni.parser,\
+org.apache.xerces.impl.xs.traversers,\
+org.apache.xerces.impl.dv.dtd,\
+org.apache.xerces.xs,\
+org.apache.xerces.impl.dtd,\
+org.apache.xerces.impl.validation,\
+org.apache.xerces.impl.xs.models,\
+org.apache.xerces.impl.xpath.regex,\
+org.apache.xml.serialize,\
+org.apache.xerces.dom,\
+org.apache.xalan,\
+org.apache.xalan.xslt,\
+org.apache.xalan.templates,\
+org.apache.xalan.xsltc,\
+org.apache.xalan.xsltc.cmdline,\
+org.apache.xalan.xsltc.cmdline.getopt,\
+org.apache.xalan.xsltc.trax,\
+org.apache.xalan.xsltc.dom,\
+org.apache.xalan.xsltc.runtime,\
+org.apache.xalan.xsltc.runtime.output,\
+org.apache.xalan.xsltc.util,\
+org.apache.xalan.xsltc.compiler,\
+org.apache.xalan.xsltc.compiler.util,\
+org.apache.xalan.serialize,\
+org.apache.xalan.client,\
+org.apache.xalan.res,\
+org.apache.xalan.transformer,\
+org.apache.xalan.extensions,\
+org.apache.xalan.lib,\
+org.apache.xalan.lib.sql,\
+org.apache.xalan.processor,\
+org.apache.xalan.trace,\
+org.apache.xml.dtm,\
+org.apache.xml.dtm.ref,\
+org.apache.xml.dtm.ref.sax2dtm,\
+org.apache.xml.dtm.ref.dom2dtm,\
+org.apache.xml.utils,\
+org.apache.xml.utils.res,\
+org.apache.xml.res,\
+org.apache.xml.serializer,\
+org.apache.xml.serializer.utils,\
+org.apache.xpath,\
+org.apache.xpath.domapi,\
+org.apache.xpath.objects,\
+org.apache.xpath.patterns,\
+org.apache.xpath.jaxp,\
+org.apache.xpath.res,\
+org.apache.xpath.operations,\
+org.apache.xpath.functions,\
+org.apache.xpath.axes,\
+org.apache.xpath.compiler,\
+org.apache.xml.resolver,\
+org.apache.xml.resolver.tools,\
+org.apache.xml.resolver.helpers,\
+org.apache.xml.resolver.readers,\
+org.apache.xml.resolver.etc,\
+org.apache.xml.resolver.apps,\
+javax.xml.ws,\
+javax.xml.bind,\
+javax.xml.bind.annotation,\
+javax.annotation,\
+javax.jws,\
+javax.jws.soap,\
+javax.xml.soap,\
+com.sun.xml.internal.messaging.saaj.soap.ver1_1,\
+com.sun.xml.internal.messaging.saaj.soap,\
+com.sun.tools.internal.ws.spi,\
+org.wso2.carbon.bootstrap
+

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/modules/distribution/src/main/conf/event-broker.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/event-broker.xml b/products/stratos/modules/distribution/src/main/conf/event-broker.xml
new file mode 100644
index 0000000..296c7cd
--- /dev/null
+++ b/products/stratos/modules/distribution/src/main/conf/event-broker.xml
@@ -0,0 +1,63 @@
+<!--
+  ~ 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 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>