You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/08/11 17:24:13 UTC

[9/9] stratos git commit: Removing unnecessary features, artifacts and restructuring distribution artifacts

Removing unnecessary features, artifacts and restructuring distribution artifacts


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

Branch: refs/heads/master
Commit: 8d321a267f5f0538cef745f607612f9a61ec17db
Parents: d616372
Author: Akila Perera <ra...@gmail.com>
Authored: Tue Aug 11 20:53:36 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Tue Aug 11 20:53:36 2015 +0530

----------------------------------------------------------------------
 .../main/resources/conf/cloud-controller.xml    |  62 +-
 pom.xml                                         |   1 +
 .../stratos/conf/application-authenticators.xml |  26 -
 products/stratos/conf/axis2.xml                 | 526 ----------------
 products/stratos/conf/bam.xml                   |  45 --
 products/stratos/conf/billing-config.xml        |  68 ---
 products/stratos/conf/cipher-text.properties    |  26 -
 products/stratos/conf/cloud-services-desc.xml   | 205 -------
 .../conf/data-bridge/data-bridge-config.xml     |  74 ---
 .../conf/data-bridge/thrift-agent-config.xml    |  47 --
 products/stratos/conf/datasources.properties    |  58 --
 products/stratos/conf/email-bill-generated.xml  |  39 --
 .../conf/email-billing-notifications.xml        |  50 --
 .../conf/email-new-tenant-activation.xml        |  47 --
 .../conf/email-new-tenant-registration.xml      |  47 --
 products/stratos/conf/email-password-reset.xml  |  43 --
 .../conf/email-payment-received-customer.xml    |  39 --
 .../conf/email-payment-received-wso2.xml        |  39 --
 .../conf/email-registration-complete.xml        |  38 --
 .../conf/email-registration-moderation.xml      |  47 --
 ...l-registration-payment-received-customer.xml |  39 --
 products/stratos/conf/email-registration.xml    |  46 --
 products/stratos/conf/email-update.xml          |  39 --
 products/stratos/conf/embedded-ldap.xml         | 165 -----
 products/stratos/conf/event-broker.xml          |  63 --
 products/stratos/conf/features-dashboard.xml    |  66 --
 products/stratos/conf/identity.xml              | 108 ----
 products/stratos/conf/jaas.conf                 |  30 -
 products/stratos/conf/jndi.properties           |  22 -
 .../conf/metering-config-non-manager.xml        | 104 ----
 products/stratos/conf/mqtttopic.properties      |  21 -
 products/stratos/conf/nhttp.properties          |  42 --
 products/stratos/conf/passthru-http.properties  |  34 --
 products/stratos/conf/registry.xml              | 103 ----
 products/stratos/conf/rule-component.conf       |  22 -
 products/stratos/conf/samples-desc.xml          |  33 -
 products/stratos/conf/sso-idp-config.xml        |  39 --
 products/stratos/conf/status-monitor-config.xml |  53 --
 products/stratos/conf/stratos-config.xml        |  30 -
 products/stratos/conf/stratos-datasources.xml   |  69 ---
 .../conf/synapse-configs/default/registry.xml   |  26 -
 .../default/sequences/errorHandler.xml          |  31 -
 .../synapse-configs/default/sequences/fault.xml |  76 ---
 .../synapse-configs/default/sequences/main.xml  | 110 ----
 .../conf/synapse-configs/default/synapse.xml    |  25 -
 products/stratos/conf/synapse.properties        |  38 --
 .../conf/temp-artifacts/carbon/module.xml       |  69 ---
 .../carbon/scripts/registry/artifacts.js        | 595 -------------------
 .../carbon/scripts/registry/registry-osgi.js    | 466 ---------------
 .../carbon/scripts/registry/registry-ws.js      |  77 ---
 .../carbon/scripts/registry/registry.js         |  45 --
 .../carbon/scripts/server/config.js             |  53 --
 .../carbon/scripts/server/osgi.js               |  31 -
 .../carbon/scripts/server/server.js             | 115 ----
 .../carbon/scripts/server/tenant.js             |  70 ---
 .../carbon/scripts/user/registry-space.js       |  60 --
 .../temp-artifacts/carbon/scripts/user/space.js |  31 -
 .../carbon/scripts/user/user-manager.js         | 179 ------
 .../temp-artifacts/carbon/scripts/user/user.js  |  99 ---
 ...ryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar | Bin 11856 -> 0 bytes
 .../org.wso2.store.sso.common_1.0.0.jar         | Bin 13957 -> 0 bytes
 ...so2.stratos.identity.saml2.sso.mgt_2.2.0.jar | Bin 12276 -> 0 bytes
 .../stratos/conf/temp-artifacts/sso/module.xml  |  28 -
 .../temp-artifacts/sso/scripts/sso.client.js    | 193 ------
 products/stratos/conf/tenant-mgt.xml            |  42 --
 products/stratos/conf/tenant-reg-agent.xml      |  25 -
 products/stratos/conf/thrift-client-config.xml  |  27 -
 products/stratos/conf/throttling-rules.drl      | 270 ---------
 products/stratos/conf/user-mgt.xml              | 241 --------
 products/stratos/conf/zoo.cfg                   |  24 -
 .../modules/distribution/lib/home/faq.html      | 413 -------------
 .../distribution/lib/home/images/bottom.gif     | Bin 523 -> 0 bytes
 .../distribution/lib/home/images/bullet-01.gif  | Bin 159 -> 0 bytes
 .../distribution/lib/home/images/content-bg.gif | Bin 233 -> 0 bytes
 .../distribution/lib/home/images/favicon.ico    | Bin 17542 -> 0 bytes
 .../lib/home/images/feature-01-icon.gif         | Bin 2825 -> 0 bytes
 .../lib/home/images/feature-02-icon.gif         | Bin 3361 -> 0 bytes
 .../lib/home/images/feature-03-icon.gif         | Bin 3285 -> 0 bytes
 .../lib/home/images/feature-middle-bg.gif       | Bin 1139 -> 0 bytes
 .../distribution/lib/home/images/intro-bg.gif   | Bin 3964 -> 0 bytes
 .../distribution/lib/home/images/intro-text.gif | Bin 4082 -> 0 bytes
 .../distribution/lib/home/images/left-bg.gif    | Bin 1135 -> 0 bytes
 .../distribution/lib/home/images/logo.gif       | Bin 11127 -> 0 bytes
 .../lib/home/images/powered-logo.gif            | Bin 1280 -> 0 bytes
 .../distribution/lib/home/images/register.gif   | Bin 6946 -> 0 bytes
 .../distribution/lib/home/images/sign-in.gif    | Bin 3150 -> 0 bytes
 .../lib/home/images/stratos-products-new.jpg    | Bin 25720 -> 0 bytes
 .../distribution/lib/home/images/title-bg.gif   | Bin 1182 -> 0 bytes
 .../distribution/lib/home/images/top.gif        | Bin 16149 -> 0 bytes
 .../distribution/lib/home/images/webinar.png    | Bin 12318 -> 0 bytes
 .../lib/home/images/white-paper.png             | Bin 15148 -> 0 bytes
 .../modules/distribution/lib/home/index.html    | 140 -----
 .../lib/home/js/jquery-1.5.1.min.js             |  16 -
 .../lib/home/js/jquery.orbit-1.2.3.min.js       |  17 -
 .../distribution/lib/home/js/orbit-1.2.3.css    | 223 -------
 .../lib/home/js/orbit/left-arrow.png            | Bin 860 -> 0 bytes
 .../distribution/lib/home/js/orbit/loading.gif  | Bin 2608 -> 0 bytes
 .../lib/home/js/orbit/mask-black.png            | Bin 705 -> 0 bytes
 .../lib/home/js/orbit/right-arrow.png           | Bin 825 -> 0 bytes
 .../lib/home/js/orbit/rotator-black.png         | Bin 733 -> 0 bytes
 .../lib/home/js/orbit/timer-black.png           | Bin 705 -> 0 bytes
 .../modules/distribution/lib/home/style.css     | 181 ------
 .../distribution/qpid-resources/etc/config.xml  | 101 ----
 .../qpid-resources/etc/jmxremote.access         |  23 -
 .../qpid-resources/etc/virtualhosts.xml         |  62 --
 .../distribution/qpid-resources/qpid.xml        |  25 -
 .../modules/distribution/src/assembly/bin.xml   | 453 +++++---------
 .../distribution/src/assembly/filter.properties |   4 +-
 .../main/conf/application-authenticators.xml    |  26 +
 .../conf/data-bridge/data-bridge-config.xml     |  74 +++
 .../conf/data-bridge/thrift-agent-config.xml    |  47 ++
 .../distribution/src/main/conf/etc/launch.ini   | 269 +++++++++
 .../distribution/src/main/conf/event-broker.xml |  63 ++
 .../distribution/src/main/conf/jndi.properties  |   6 +-
 .../src/main/conf/mqtttopic.properties          |  21 +
 .../distribution/src/main/conf/registry.xml     | 103 ++++
 .../src/main/conf/sso-idp-config.xml            |  39 ++
 .../distribution/src/main/conf/tenant-mgt.xml   |  42 ++
 .../src/main/conf/thrift-client-config.xml      |  27 +
 .../distribution/src/main/conf/user-mgt.xml     | 343 +++++++++++
 .../resources/allthemes/Dark/admin/logo.gif     | Bin 0 -> 3476 bytes
 .../resources/allthemes/Dark/admin/main.css     | 253 ++++++++
 .../allthemes/Dark/admin/powered-stratos.gif    | Bin 0 -> 1515 bytes
 .../allthemes/Dark/admin/right-logo.gif         | Bin 0 -> 2325 bytes
 .../allthemes/Dark/admin/theme-header-bg.gif    | Bin 0 -> 4245 bytes
 .../Dark/admin/theme-header-region-bg.gif       | Bin 0 -> 793 bytes
 .../allthemes/Dark/admin/theme-menu-header.gif  | Bin 0 -> 261 bytes
 .../Dark/admin/theme-menu-panel-l-bg.gif        | Bin 0 -> 312 bytes
 .../Dark/admin/theme-menu-table-bg.gif          | Bin 0 -> 5671 bytes
 .../Dark/admin/theme-right-links-bg.gif         | Bin 0 -> 1005 bytes
 .../src/main/resources/allthemes/Dark/thumb.png | Bin 0 -> 19546 bytes
 .../allthemes/Default/admin/def-body-bg.gif     | Bin 0 -> 419 bytes
 .../allthemes/Default/admin/def-header-bg.gif   | Bin 0 -> 17875 bytes
 .../Default/admin/def-header-region-bg.gif      | Bin 0 -> 22784 bytes
 .../resources/allthemes/Default/admin/logo.gif  | Bin 0 -> 3476 bytes
 .../resources/allthemes/Default/admin/main.css  | 250 ++++++++
 .../allthemes/Default/admin/powered-stratos.gif | Bin 0 -> 1515 bytes
 .../allthemes/Default/admin/right-logo.gif      | Bin 0 -> 3629 bytes
 .../main/resources/allthemes/Default/thumb.png  | Bin 0 -> 24432 bytes
 .../resources/allthemes/Light/admin/logo.gif    | Bin 0 -> 3476 bytes
 .../resources/allthemes/Light/admin/main.css    | 250 ++++++++
 .../allthemes/Light/admin/menu_header.gif       | Bin 0 -> 243 bytes
 .../allthemes/Light/admin/powered-stratos.gif   | Bin 0 -> 1515 bytes
 .../allthemes/Light/admin/right-links-bg.gif    | Bin 0 -> 1191 bytes
 .../allthemes/Light/admin/right-logo.gif        | Bin 0 -> 2325 bytes
 .../allthemes/Light/admin/theme-header-bg.gif   | Bin 0 -> 3792 bytes
 .../Light/admin/theme-header-region-b-bg.gif    | Bin 0 -> 121 bytes
 .../Light/admin/theme-header-region-bg.gif      | Bin 0 -> 534 bytes
 .../Light/admin/theme-menu-panel-l-bg.gif       | Bin 0 -> 772 bytes
 .../Light/admin/theme-menu-table-bg.gif         | Bin 0 -> 5991 bytes
 .../main/resources/allthemes/Light/thumb.png    | Bin 0 -> 18102 bytes
 .../distribution/src/main/resources/launch.ini  | 269 ---------
 .../powerded-by-logos/appserver-logo.gif        | Bin 0 -> 1473 bytes
 .../resources/powerded-by-logos/bam-logo.gif    | Bin 0 -> 1690 bytes
 .../resources/powerded-by-logos/bps-logo.gif    | Bin 0 -> 1606 bytes
 .../resources/powerded-by-logos/brs-logo.gif    | Bin 0 -> 1596 bytes
 .../resources/powerded-by-logos/csg-logo.gif    | Bin 0 -> 2030 bytes
 .../resources/powerded-by-logos/ds-logo.gif     | Bin 0 -> 1528 bytes
 .../resources/powerded-by-logos/esb-logo.gif    | Bin 0 -> 1598 bytes
 .../resources/powerded-by-logos/gadget-logo.gif | Bin 0 -> 1368 bytes
 .../powerded-by-logos/governance-logo.gif       | Bin 0 -> 1525 bytes
 .../powerded-by-logos/identity-logo.gif         | Bin 0 -> 1398 bytes
 .../resources/powerded-by-logos/mashup-logo.gif | Bin 0 -> 1440 bytes
 .../src/main/temp-artifacts/carbon/module.xml   |  69 +++
 .../carbon/scripts/registry/artifacts.js        | 595 +++++++++++++++++++
 .../carbon/scripts/registry/registry-osgi.js    | 466 +++++++++++++++
 .../carbon/scripts/registry/registry-ws.js      |  77 +++
 .../carbon/scripts/registry/registry.js         |  45 ++
 .../carbon/scripts/server/config.js             |  53 ++
 .../carbon/scripts/server/osgi.js               |  31 +
 .../carbon/scripts/server/server.js             | 115 ++++
 .../carbon/scripts/server/tenant.js             |  70 +++
 .../carbon/scripts/user/registry-space.js       |  60 ++
 .../temp-artifacts/carbon/scripts/user/space.js |  31 +
 .../carbon/scripts/user/user-manager.js         | 179 ++++++
 .../temp-artifacts/carbon/scripts/user/user.js  |  99 +++
 ...ryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar | Bin 0 -> 11856 bytes
 .../org.wso2.store.sso.common_1.0.0.jar         | Bin 0 -> 13957 bytes
 ...so2.stratos.identity.saml2.sso.mgt_2.2.0.jar | Bin 0 -> 12276 bytes
 .../src/main/temp-artifacts/sso/module.xml      |  28 +
 .../temp-artifacts/sso/scripts/sso.client.js    | 193 ++++++
 products/stratos/modules/p2-profile-gen/pom.xml |  59 +-
 .../payload/user-data/ssl-cert-snakeoil.key     |  16 -
 .../payload/user-data/ssl-cert-snakeoil.pem     |  14 -
 .../resources/allthemes/Dark/admin/logo.gif     | Bin 3476 -> 0 bytes
 .../resources/allthemes/Dark/admin/main.css     | 253 --------
 .../allthemes/Dark/admin/powered-stratos.gif    | Bin 1515 -> 0 bytes
 .../allthemes/Dark/admin/right-logo.gif         | Bin 2325 -> 0 bytes
 .../allthemes/Dark/admin/theme-header-bg.gif    | Bin 4245 -> 0 bytes
 .../Dark/admin/theme-header-region-bg.gif       | Bin 793 -> 0 bytes
 .../allthemes/Dark/admin/theme-menu-header.gif  | Bin 261 -> 0 bytes
 .../Dark/admin/theme-menu-panel-l-bg.gif        | Bin 312 -> 0 bytes
 .../Dark/admin/theme-menu-table-bg.gif          | Bin 5671 -> 0 bytes
 .../Dark/admin/theme-right-links-bg.gif         | Bin 1005 -> 0 bytes
 .../stratos/resources/allthemes/Dark/thumb.png  | Bin 19546 -> 0 bytes
 .../allthemes/Default/admin/def-body-bg.gif     | Bin 419 -> 0 bytes
 .../allthemes/Default/admin/def-header-bg.gif   | Bin 17875 -> 0 bytes
 .../Default/admin/def-header-region-bg.gif      | Bin 22784 -> 0 bytes
 .../resources/allthemes/Default/admin/logo.gif  | Bin 3476 -> 0 bytes
 .../resources/allthemes/Default/admin/main.css  | 250 --------
 .../allthemes/Default/admin/powered-stratos.gif | Bin 1515 -> 0 bytes
 .../allthemes/Default/admin/right-logo.gif      | Bin 3629 -> 0 bytes
 .../resources/allthemes/Default/thumb.png       | Bin 24432 -> 0 bytes
 .../resources/allthemes/Light/admin/logo.gif    | Bin 3476 -> 0 bytes
 .../resources/allthemes/Light/admin/main.css    | 250 --------
 .../allthemes/Light/admin/menu_header.gif       | Bin 243 -> 0 bytes
 .../allthemes/Light/admin/powered-stratos.gif   | Bin 1515 -> 0 bytes
 .../allthemes/Light/admin/right-links-bg.gif    | Bin 1191 -> 0 bytes
 .../allthemes/Light/admin/right-logo.gif        | Bin 2325 -> 0 bytes
 .../allthemes/Light/admin/theme-header-bg.gif   | Bin 3792 -> 0 bytes
 .../Light/admin/theme-header-region-b-bg.gif    | Bin 121 -> 0 bytes
 .../Light/admin/theme-header-region-bg.gif      | Bin 534 -> 0 bytes
 .../Light/admin/theme-menu-panel-l-bg.gif       | Bin 772 -> 0 bytes
 .../Light/admin/theme-menu-table-bg.gif         | Bin 5991 -> 0 bytes
 .../stratos/resources/allthemes/Light/thumb.png | Bin 18102 -> 0 bytes
 .../cloud-services-icons/appserver.gif          | Bin 2086 -> 0 bytes
 .../resources/cloud-services-icons/bam.gif      | Bin 1773 -> 0 bytes
 .../resources/cloud-services-icons/bps.gif      | Bin 1531 -> 0 bytes
 .../resources/cloud-services-icons/brs-old.gif  | Bin 1772 -> 0 bytes
 .../resources/cloud-services-icons/brs.gif      | Bin 2170 -> 0 bytes
 .../resources/cloud-services-icons/cep.png      | Bin 3218 -> 0 bytes
 .../resources/cloud-services-icons/cg.gif       | Bin 2385 -> 0 bytes
 .../cloud-services-icons/csg-inactive.gif       | Bin 3188 -> 0 bytes
 .../resources/cloud-services-icons/csg.gif      | Bin 3176 -> 0 bytes
 .../resources/cloud-services-icons/ds.gif       | Bin 2012 -> 0 bytes
 .../resources/cloud-services-icons/esb.gif      | Bin 1787 -> 0 bytes
 .../resources/cloud-services-icons/gadget.gif   | Bin 2242 -> 0 bytes
 .../cloud-services-icons/governance.gif         | Bin 1977 -> 0 bytes
 .../resources/cloud-services-icons/identity.gif | Bin 1936 -> 0 bytes
 .../cloud-services-icons/inactive-appserver.gif | Bin 1957 -> 0 bytes
 .../cloud-services-icons/inactive-bam.gif       | Bin 1647 -> 0 bytes
 .../cloud-services-icons/inactive-brs.gif       | Bin 1874 -> 0 bytes
 .../cloud-services-icons/inactive-cep.png       | Bin 2959 -> 0 bytes
 .../cloud-services-icons/inactive-esb.gif       | Bin 1656 -> 0 bytes
 .../cloud-services-icons/inactive-gadget.gif    | Bin 2087 -> 0 bytes
 .../inactive-governance.gif                     | Bin 1850 -> 0 bytes
 .../cloud-services-icons/inactive-identity.gif  | Bin 1794 -> 0 bytes
 .../cloud-services-icons/inactive-mashup.gif    | Bin 1772 -> 0 bytes
 .../cloud-services-icons/inactive-mb.png        | Bin 2746 -> 0 bytes
 .../resources/cloud-services-icons/mashup.gif   | Bin 1850 -> 0 bytes
 .../resources/cloud-services-icons/mb.png       | Bin 3139 -> 0 bytes
 .../resources/cloud-services-icons/pom.xml      |  58 --
 .../resources/cloud-services-icons/ss.gif       | Bin 2432 -> 0 bytes
 .../resources/cloud-services-icons/ts.gif       | Bin 2475 -> 0 bytes
 .../powerded-by-logos/appserver-logo.gif        | Bin 1473 -> 0 bytes
 .../resources/powerded-by-logos/bam-logo.gif    | Bin 1690 -> 0 bytes
 .../resources/powerded-by-logos/bps-logo.gif    | Bin 1606 -> 0 bytes
 .../resources/powerded-by-logos/brs-logo.gif    | Bin 1596 -> 0 bytes
 .../resources/powerded-by-logos/csg-logo.gif    | Bin 2030 -> 0 bytes
 .../resources/powerded-by-logos/ds-logo.gif     | Bin 1528 -> 0 bytes
 .../resources/powerded-by-logos/esb-logo.gif    | Bin 1598 -> 0 bytes
 .../resources/powerded-by-logos/gadget-logo.gif | Bin 1368 -> 0 bytes
 .../powerded-by-logos/governance-logo.gif       | Bin 1525 -> 0 bytes
 .../powerded-by-logos/identity-logo.gif         | Bin 1398 -> 0 bytes
 .../resources/powerded-by-logos/mashup-logo.gif | Bin 1440 -> 0 bytes
 255 files changed, 4120 insertions(+), 8332 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
index dc0ea72..78f7f6a 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
@@ -16,43 +16,43 @@
   #  KIND, either express or implied.  See the License for the
   #  specific language governing permissions and limitations
   #  under the License.
-  --> 
+  -->
 <cloudController xmlns:svns="http://org.wso2.securevault/configuration">
-	<svns:secureVault provider="org.wso2.securevault.secret.handler.SecretManagerSecretCallbackHandler" />
+    <svns:secureVault provider="org.wso2.securevault.secret.handler.SecretManagerSecretCallbackHandler"/>
 
     <!-- BAM data publisher configuration -->
     <dataPublisher enable="false">
-		<bamServer>
+        <bamServer>
             <!-- BAM server URL should be specified in carbon.xml -->
-			<adminUserName>admin</adminUserName>
-			<adminPassword svns:secretAlias="cloud.controller.bam.server.admin.password">admin</adminPassword>
-		</bamServer>
-		<!-- Default cron expression is '1 * * * * ? *' meaning 'first second of every minute'.
-			 Optional element. -->
-		<cron>1 * * * * ? *</cron>
-	</dataPublisher>
+            <adminUserName>admin</adminUserName>
+            <adminPassword svns:secretAlias="cloud.controller.bam.server.admin.password">admin</adminPassword>
+        </bamServer>
+        <!-- Default cron expression is '1 * * * * ? *' meaning 'first second of every minute'.
+             Optional element. -->
+        <cron>1 * * * * ? *</cron>
+    </dataPublisher>
 
     <!-- Complete topology event publisher cron configuration -->
     <topologySync enable="true">
-		<property name="cron" value="1 * * * * ? *" />
-	</topologySync>	
+        <property name="cron" value="1 * * * * ? *"/>
+    </topologySync>
 
-	<!-- Specify the properties that are common to an IaaS here. This element 
-		is not necessary [0..1]. But you can use this section to avoid specifying 
-		same property over and over again. -->
-	<iaasProviders>
-		<!-- iaasProvider type="openstack" name="Openstack">
+    <!-- Specify the properties that are common to an IaaS here. This element
+        is not necessary [0..1]. But you can use this section to avoid specifying
+        same property over and over again. -->
+    <iaasProviders>
+        <!-- iaasProvider type="openstack" name="Openstack">
             <className>org.apache.stratos.cloud.controller.iaases.openstack.OpenstackIaas</className>
-			<provider>openstack-nova</provider>
-			<identity svns:secretAlias="cloud.controller.openstack.identity">demo:demo</identity>
-			<credential svns:secretAlias="cloud.controller.openstack.credential">openstack</credential>
-			<property name="jclouds.endpoint" value="http://192.168.16.20:5000/" />
-           	<property name="jclouds.openstack-nova.auto-create-floating-ips" value="false"/>
-			<property name="jclouds.api-version" value="2.0/" />
-			<property name="openstack.networking.provider" value="nova" />
-			<property name="X" value="x" />
-			<property name="Y" value="y" />
-		</iaasProvider -->
+            <provider>openstack-nova</provider>
+            <identity svns:secretAlias="cloud.controller.openstack.identity">project:username</identity>
+            <credential svns:secretAlias="cloud.controller.openstack.credential">credential</credential>
+            <property name="jclouds.endpoint" value="http://192.168.16.99:5000/v2.0" />
+            <property name="jclouds.openstack-nova.auto-create-floating-ips" value="false"/>
+            <property name="jclouds.api-version" value="2.0/" />
+            <property name="openstack.networking.provider" value="nova" />
+            <property name="keyPair" value="keypair-name" />
+            <property name="securityGroups" value="default" />
+        </iaasProvider -->
         <!-- iaasProvider type="ec2" name="Amazon EC2">
             <className>org.apache.stratos.cloud.controller.iaases.ec2.EC2Iaas</className>
             <provider>aws-ec2</provider>
@@ -60,7 +60,7 @@
             <credential svns:secretAlias="cloud.controller.ec2.credential">credential</credential>
             <property name="jclouds.ec2.ami-query" value="owner-id=owner-id;state=available;image-type=machine"/>
             <property name="availabilityZone" value="ap-southeast-1b"/>
-            <property name="securityGroups" value="security-group"/>
+            <property name="securityGroups" value="default"/>
             <property name="autoAssignIp" value="true" />
             <property name="keyPair" value="keypair-name"/>
         </iaasProvider -->
@@ -75,7 +75,7 @@
             <provider>mock</provider>
             <identity svns:secretAlias="cloud.controller.mock.identity">identity</identity>
             <credential svns:secretAlias="cloud.controller.mock.credential">credential</credential>
-            <property name="api.endpoint" value="https://localhost:9443/mock-iaas/api" />
+            <property name="api.endpoint" value="https://localhost:9443/mock-iaas/api"/>
         </iaasProvider>
-	</iaasProviders>
-</cloudController>
+    </iaasProviders>
+</cloudController>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 993194a..1b46728 100644
--- a/pom.xml
+++ b/pom.xml
@@ -555,5 +555,6 @@
         <jclouds.version>1.8.1</jclouds.version>
         <project.jclouds.stratos.version>1.8.1-stratosv1</project.jclouds.stratos.version>
         <kubernetes.api.version>2.2.16</kubernetes.api.version>
+        <store.version>1.0.1</store.version>
     </properties>
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/application-authenticators.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/application-authenticators.xml b/products/stratos/conf/application-authenticators.xml
deleted file mode 100644
index 5a12e34..0000000
--- a/products/stratos/conf/application-authenticators.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.
-  -->
-
-<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/conf/axis2.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/axis2.xml b/products/stratos/conf/axis2.xml
deleted file mode 100755
index 01075e5..0000000
--- a/products/stratos/conf/axis2.xml
+++ /dev/null
@@ -1,526 +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.apache.synapse.transport.passthru.PassThroughHttpListener">
-      <parameter name="port">8280</parameter>
-      <parameter name="non-blocking"> true</parameter>
-      <parameter name="httpGetProcessor" locked="false">org.wso2.carbon.transport.nhttp.api.PassThroughNHttpGetProcessor</parameter>
-   </transportReceiver>
-   <transportReceiver name="https" class="org.apache.synapse.transport.passthru.PassThroughHttpSSLListener">
-        <parameter name="port" locked="false">8243</parameter>
-        <parameter name="non-blocking" locked="false">true</parameter>
-        <parameter name="httpGetProcessor" locked="false">org.wso2.carbon.transport.nhttp.api.PassThroughNHttpGetProcessor</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.apache.synapse.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.apache.synapse.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.adc.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/stratos/blob/8d321a26/products/stratos/conf/bam.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/bam.xml b/products/stratos/conf/bam.xml
deleted file mode 100755
index 8e8822b..0000000
--- a/products/stratos/conf/bam.xml
+++ /dev/null
@@ -1,45 +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.
-  -->
-
-<bamServer>
-
-    <!--
-        Configuration for Billing and Metering. 
-    -->
-    
-    <!--Configuration for summary generation task. 
-          1. initial-delay = Time for first summary generation after the server start. (in seconds)
-          2. interval = Periodic interval to run summary generation task. (in seconds)
-    -->
-    <summaryGeneration>
-             <initial-delay>600</initial-delay>
-             <interval>3600</interval>
-    </summaryGeneration>
-
-    <!--Configuration for data collection task for pull mode servers. 
-          1. initial-delay = Time for first data collection after the server start. (in seconds)
-          2. interval = Periodic interval to run summary generation task. (in seconds)
-    -->
-    <dataCollection>
-             <initial-delay>60</initial-delay>
-             <interval>60</interval>
-    </dataCollection>
-
-</bamServer>

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/billing-config.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/billing-config.xml b/products/stratos/conf/billing-config.xml
deleted file mode 100755
index e50beb6..0000000
--- a/products/stratos/conf/billing-config.xml
+++ /dev/null
@@ -1,68 +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.
-  -->
-
-<!-- 
-     Defines the database and the Task for billing. Multi-tenancy billing rules (by default, uses 
-     multitenancy-billing-rules.drl) and email for billing notifications (by default, uses 
-     email-billing-notifications.xml) are specified here. 
-  -->
-
-<billingConfig xmlns="http://wso2.com/carbon/multitenancy/billing/config">
-    <tasks>
-        <task id="multitenancyScheduledTask">
-            <schedule scheduleHelperClass="org.wso2.carbon.billing.core.scheduler.scheduleHelpers.MonthlyScheduleHelper">
-                <parameter name="timeZone">GMT-8:00</parameter>
-		<!--cron format: second minute hour dayOfTheMonth Month DayOfWeek-->
-                <parameter name="cron">0 0 0 1 * ?</parameter>
-            </schedule>
-            <handlers>
-                <handler service="org.wso2.carbon.billing.mgt.handlers.MultitenancySubscriptionFeedingHandler">
-                </handler>
-                <handler class="org.wso2.carbon.billing.core.handlers.SubscriptionTreeBuildingHandler">
-                </handler>
-                <handler class="org.wso2.carbon.billing.core.handlers.RuleHandler">
-                    <parameter name="file">multitenancy-billing-rules.drl</parameter>
-                </handler>
-                <handler class="org.wso2.carbon.billing.core.handlers.InvoiceCalculationHandler">
-                </handler>
-                <handler class="org.wso2.carbon.billing.core.handlers.DefaultFinalizingHandler">
-                </handler>
-                <handler class="org.wso2.carbon.billing.core.handlers.EmailSendingHandler">
-                    <parameter name="file">email-billing-notifications.xml</parameter>
-                </handler>
-            </handlers>
-        </task>
-        <task id="multitenancyViewingTask">
-            <handlers>
-                <handler service="org.wso2.carbon.billing.mgt.handlers.MultitenancySubscriptionFeedingHandler">
-                </handler>
-                <handler class="org.wso2.carbon.billing.core.handlers.SubscriptionTreeBuildingHandler">
-                </handler>
-                <handler class="org.wso2.carbon.billing.core.handlers.RuleHandler">
-                    <parameter name="file">multitenancy-billing-rules.drl</parameter>
-                </handler>
-                <handler class="org.wso2.carbon.billing.core.handlers.InvoiceCalculationHandler">
-                </handler>
-                <!--
-                <handler class="org.wso2.carbon.billing.core.handlers.DefaultFinalizingHandler">
-                </handler>-->
-            </handlers>
-        </task>
-    </tasks>
-</billingConfig>

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/cipher-text.properties
----------------------------------------------------------------------
diff --git a/products/stratos/conf/cipher-text.properties b/products/stratos/conf/cipher-text.properties
deleted file mode 100644
index 4a1c469..0000000
--- a/products/stratos/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/stratos/blob/8d321a26/products/stratos/conf/cloud-services-desc.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/cloud-services-desc.xml b/products/stratos/conf/cloud-services-desc.xml
deleted file mode 100644
index 110624f..0000000
--- a/products/stratos/conf/cloud-services-desc.xml
+++ /dev/null
@@ -1,205 +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 has the configurations for the cloud services. 
-     Label, link, icon, description, and the other similar information for each of the services are
-     given here. 
-  -->
-<cloudServices xmlns="http://wso2.com/carbon/cloud/mgt/services">
-     <cloudService name="Apache Stratos" default="true">
-        <key>STRATOS</key>
-        <label>Apache Stratos</label>
-        <link>https://stratos.cloud.wso2.com</link>
-        <!--icon>
-            https://localhost:9443/cloud-services-icons/esb.gif
-        </icon-->
-        <productPageURL>http://wso2.com/cloud/stratos</productPageURL>
-        <description>Apache stratos</description>
-    </cloudService>
-     <cloudService name="WSO2 Stratos Controller" default="true">
-	<key>SCC</key>
-        <label>WSO2 Stratos Controller</label>
-        <link>https://scc.cloud.wso2.com</link>
-        <!--icon>
-            https://localhost:9443/cloud-services-icons/esb.gif
-        </icon-->
-        <productPageURL>http://wso2.com/cloud/stratos</productPageURL>
-        <description>WSO2 stratos controller.</description>
-    </cloudService>
-    <cloudService name="WSO2 Cloud Controller" default="true">
-	<key>CC</key>
-        <label>WSO2 Cloud Controller</label>
-        <link>https://cc.cloud.wso2.com</link>
-        <!--icon>
-            https://localhost:9443/cloud-services-icons/esb.gif
-        </icon-->
-        <productPageURL>http://wso2.com/cloud/stratos</productPageURL>
-        <description>WSO2 Cloud Controller.</description>
-    </cloudService>
-    <cloudService name="WSO2 Stratos Agent" default="true">
-	<key>Agent</key>
-        <label>WSO2 Stratos Agent</label>
-        <link>https://cc.cloud.wso2.com</link>
-        <!--icon>
-            https://localhost:9443/cloud-services-icons/esb.gif
-        </icon-->
-        <productPageURL>http://wso2.com/cloud/stratos</productPageURL>
-        <description>WSO2 Stratos Agent.</description>
-    </cloudService>
-    <cloudService name="WSO2 Enterprise Service Bus" default="true">
-	<key>ESB</key>
-        <label>Enterprise Service Bus</label>
-        <link>https://esb.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/esb.gif
-        </icon>
-        <productPageURL>http://wso2.com/products/enterprise-service-bus/</productPageURL>
-        <description>Enterprise Service Bus in the cloud.</description>
-    </cloudService>
-    <cloudService name="Application Server" default="true">
-	<key>AS</key>
-        <label>Application Server</label>
-        <link>https://appserver.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/appserver.gif
-        </icon>
-        <productPageURL>http://wso2.com/products/application-server/</productPageURL>
-        <description>Application Server in the cloud.</description>
-    </cloudService>
-    <cloudService name="WSO2 Data Services Server" default="true">
-	<key>DSS</key>
-        <label>WSO2 Data Services Server</label>
-        <link>https://dss.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/ds.gif
-        </icon>
-        <productPageURL>http://wso2.com/products/data-services-server/</productPageURL>
-        <description>Data Services Server in the cloud.</description>
-    </cloudService>
-    <cloudService name="WSO2 Governance Registry" default="true">
-	<key>Greg</key>
-        <label>Governance</label>
-        <link>https://governance.cloud.wso2.com</link>
-        <description>Governance in the cloud.</description>
-        <icon>
-            https://localhost:9443/cloud-services-icons/governance.gif
-        </icon>
-        <productPageURL>http://wso2.com/products/governance-registry/</productPageURL>
-    </cloudService>
-    <cloudService name="WSO2 Identity Server" default="true">
-	<key>IS</key>
-        <label>WSO2 Identity Server</label>
-        <link>https://identity.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/identity.gif
-        </icon>
-        <description>Identity in the cloud.</description>
-        <productPageURL>http://wso2.com/products/identity-server/</productPageURL>
-    </cloudService>
-    <cloudService name="WSO2 Business Activity Monitor" default="true">
-        <label>Business Activity Monitor</label>
-        <link>https://bam.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/bam.gif
-        </icon>
-        <description>Business Activity Monitor in the cloud.</description>
-        <productPageURL>http://wso2.com/products/business-activity-monitor/</productPageURL>
-    </cloudService>
-    <cloudService name="WSO2 Business Process Server" default="true">
-	<key>BPS</key>
-        <label>Business Process Server</label>
-        <link>https://bps.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/bps.gif
-        </icon>
-        <description>Business Process Server in the cloud.</description>
-        <productPageURL>http://wso2.com/products/business-process-server/</productPageURL>
-    </cloudService>
-    <cloudService name="WSO2 Business Rule Server" default="true">
-	<key>BRS</key>
-        <label>Business Rule Server</label>
-        <link>https://brs.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/brs.gif
-        </icon>
-        <description>Business Rules Server in the cloud.</description>
-        <productPageURL>http://wso2.com/products/business-rules-server/</productPageURL>
-    </cloudService>
-    <cloudService name="WSO2 Mashup Server" default="true">
-	<key>MB</key>
-        <label>Mashup Server</label>
-        <link>https://mashup.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/mashup.gif
-        </icon>
-        <description>Mashup Server in the cloud.</description>
-        <productPageURL>http://wso2.com/products/mashup-server/</productPageURL>
-    </cloudService>
-    <cloudService name="WSO2 Gadget Server" default="true">
-	<key>GS</key>
-        <label>Gadget Server</label>
-        <link>https://gadget.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/gadget.gif
-        </icon>
-        <description>Gadgets in the cloud.</description>
-        <productPageURL>http://wso2.com/products/gadget-server/</productPageURL>
-    </cloudService>
-    <cloudService name="Cloud Gateway" default="true">
-	<key>CG</key>
-        <label>Cloud Gateway</label>
-        <link>https://cg.stratoslive.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/csg.gif
-        </icon>
-        <description>Cloud Gateway in the cloud.</description>
-		<productPageURL>http://wso2.com/products/cloud-services-gateway/</productPageURL> <!-- FIXME, put the correct project home -->
-    </cloudService>
-    <cloudService name="WSO2 Complex Event Processor" default="true">
-	<key>CEP</key>
-        <label>Complex Event Processor</label>
-        <link>https://cep.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/cep.gif
-        </icon>
-        <productPageURL>http://wso2.com/products/complex-event-processing-server/</productPageURL> <!-- FIXME, put the correct project home -->
-        <description>Complex Event Processor in the cloud.</description>
-    </cloudService>
-    <cloudService name="WSO2 Message Broker" default="true">
-	<key>MB</key>
-        <label>Message Broker</label>
-        <link>https://mb.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/mb.gif
-        </icon>
-        <productPageURL>http://wso2.com/products/message-broker/</productPageURL>
-        <description>Message Broker in the cloud.</description>
-    </cloudService>
-    <cloudService name="WSO2 Storage Server" default="true">
-	<key>SS</key>
-   	<label>WSO2 Storage Server</label>
-   	<link>https://ss.stratoslive.wso2.com</link>
-   	<icon>
-       		https://localhost:9443/cloud-services-icons/ss.gif
-   	</icon>
-   	<description>WSO2 Storage Server.</description>
-   	<productPageURL>http://wso2.com/products/storage-server/</productPageURL>
-    </cloudService>
-</cloudServices>

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/data-bridge/data-bridge-config.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/data-bridge/data-bridge-config.xml b/products/stratos/conf/data-bridge/data-bridge-config.xml
deleted file mode 100644
index 33f9905..0000000
--- a/products/stratos/conf/data-bridge/data-bridge-config.xml
+++ /dev/null
@@ -1,74 +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.
-  -->
-
-<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/conf/data-bridge/thrift-agent-config.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/data-bridge/thrift-agent-config.xml b/products/stratos/conf/data-bridge/thrift-agent-config.xml
deleted file mode 100644
index 628909f..0000000
--- a/products/stratos/conf/data-bridge/thrift-agent-config.xml
+++ /dev/null
@@ -1,47 +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.
-  -->
-
-
-
-<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/conf/datasources.properties
----------------------------------------------------------------------
diff --git a/products/stratos/conf/datasources.properties b/products/stratos/conf/datasources.properties
deleted file mode 100644
index 0cf8cdb..0000000
--- a/products/stratos/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/stratos/blob/8d321a26/products/stratos/conf/email-bill-generated.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/email-bill-generated.xml b/products/stratos/conf/email-bill-generated.xml
deleted file mode 100755
index 2310fa4..0000000
--- a/products/stratos/conf/email-bill-generated.xml
+++ /dev/null
@@ -1,39 +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.
-  -->
-
-<!-- 
-    Contains the body of the mail that to be sent when bill generation is completed.
-  -->
-
-<configuration>       
-    <subject>[BillGeneration] Bill generation completed</subject>
-    <body>
-Hi ,
-
-Bill generation completed successfully on {date}. Following customers may need your attention.
-
-Customer Name	Subscription Plan	Carried Forward Balance
-===============================================
-{reported-customers}
-
-Best Regards,
-WSO2 Cloud Services
-http://stratoslive.wso2.com
-    </body>
-</configuration>

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/email-billing-notifications.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/email-billing-notifications.xml b/products/stratos/conf/email-billing-notifications.xml
deleted file mode 100755
index afc2807..0000000
--- a/products/stratos/conf/email-billing-notifications.xml
+++ /dev/null
@@ -1,50 +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.
-  -->
-
-<!-- 
-    Contains the body of the mail that to be sent as the invoice of the tenant for the period.
-  -->
-
-<configuration>       
-    <subject>WSO2 Cloud Services</subject>
-    <body>
-Hi {customer-name},
-
-This is the billing information for the time period of {start-date} to {end-date} for the use of WSO2 cloud services.
-
-Charges for subscriptions
-=========================
-{subscription-charges}
-
-Payment details
-===============
-{payment-details}
-
-Invoice Summary
-===============
-Brought Forward      {bought-forward}
-Total Cost          {total-cost}
-Total Payments      {total-payments}
-Carried Forward     {carried-forward}
-
-Best Regards,
-WSO2 Cloud Services
-http://stratoslive.wso2.com
-    </body>
-</configuration>

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/email-new-tenant-activation.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/email-new-tenant-activation.xml b/products/stratos/conf/email-new-tenant-activation.xml
deleted file mode 100755
index e24b0cb..0000000
--- a/products/stratos/conf/email-new-tenant-activation.xml
+++ /dev/null
@@ -1,47 +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.
-  -->
-
-<!--    
-    Contains the body of the mail that to be sent to the super admin or a given admin email address,
-    when a new tenant activates their account.
-  -->
-
-<configuration>       
-    <subject>WSO2 Cloud Services - A Tenant Has Activated Their Account</subject>
-    <body>
-Hi,
-
-Congratulations! A tenant has activated their account just now in WSO2 Cloud Services. 
-
-Tenant Details
-===============
-Admin Name: {user-name}
-Domain Name: {domain-name}
-Email Address: {email-address}
-
-Tenant Admin Profile
-====================
-First Name: {first-name}
-Last Name: {last-name}
-
-Best Regards,
-WSO2 Cloud Services Team
-http://stratoslive.wso2.com
-    </body>
-</configuration>

http://git-wip-us.apache.org/repos/asf/stratos/blob/8d321a26/products/stratos/conf/email-new-tenant-registration.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/email-new-tenant-registration.xml b/products/stratos/conf/email-new-tenant-registration.xml
deleted file mode 100755
index 8423625..0000000
--- a/products/stratos/conf/email-new-tenant-registration.xml
+++ /dev/null
@@ -1,47 +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.
-  -->
-
-<!--    
-    Contains the body of the mail that to be sent to the super admin or a given admin email address,
-    when a new tenant registers for an account.
-  -->
-
-<configuration>       
-    <subject>WSO2 Cloud Services - A New Tenant Has Registererd To Stratos</subject>
-    <body>
-Hi,
-
-Congratulations! A new tenant has registered an account in WSO2 Cloud Services. 
-
-Tenant Details
-===============
-Admin Name: {user-name}
-Domain Name: {domain-name}
-Email Address: {email-address}
-
-Tenant Admin Profile
-====================
-First Name: {first-name}
-Last Name: {last-name}
-
-Best Regards,
-WSO2 Cloud Services Team
-http://stratoslive.wso2.com
-    </body>
-</configuration>