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

[20/33] Removed autoscaler, cloud-controller and stratos-manager products

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/conf/throttling-rules.drl
----------------------------------------------------------------------
diff --git a/products/stratos-manager/conf/throttling-rules.drl b/products/stratos-manager/conf/throttling-rules.drl
deleted file mode 100755
index cf62ae4..0000000
--- a/products/stratos-manager/conf/throttling-rules.drl
+++ /dev/null
@@ -1,270 +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.
- */
-
-import org.wso2.carbon.throttling.manager.dataobjects.*;
-import org.wso2.carbon.billing.mgt.dataobjects.*;
-import org.wso2.carbon.stratos.common.constants.*;
-
-// free users restrictions
-
-rule unsetRestrictFreeUsers
-when
- $package: MultitenancyPackage(name == "Demo")
- $dataContext : ThrottlingDataContext()
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_ADD_USER_ACTION, false, null);
-
-end
-
-
-rule restrictFreeDataVolume
-when
- $package: MultitenancyPackage(name == "Demo")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) > (20 * 1024 * 1024) && 
-            $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, true, 
-            "You have exceeded the maximum allowed disk storage of 20Mb. Please upgrade the subscription.");
-end
-
-
-rule unsetRestrictFreeDataVolume
-when
- $package: MultitenancyPackage(name == "Demo")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) <= (20 * 1024 * 1024) && 
-            $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, false, null);
-end
-
-
-rule restrictFreeBandwidth
-when
- $package: MultitenancyPackage(name == "Demo")
- $dataContext : ThrottlingDataContext()
- eval(($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_INCOMING_BANDWIDTH) + 
- 		$dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_OUTGOING_BANDWIDTH)) > (50 * 1024 * 1024) && 
-            $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_SERVICE_IN_BANDWIDTH_ACTION, true, 
-            "You have exceeded the maximum allowed bandwidth of 50Mb. Please upgrade the subscription.");
- validation.setTenantBlocked(StratosConstants.THROTTLING_WEBAPP_IN_BANDWIDTH_ACTION, true, 
-            "You have exceeded the maximum allowed bandwidth of 50Mb. Please upgrade the subscription.");
- validation.setTenantBlocked(StratosConstants.THROTTLING_OUT_DATA_ACTION, true, 
-            "You have exceeded the maximum allowed bandwidth of 50Mb. Please upgrade the subscription.");                      
-end
-
-
-rule unsetRestrictFreeBandwidth
-when
- $package: MultitenancyPackage(name == "Demo")
- $dataContext : ThrottlingDataContext()
- eval(($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_INCOMING_BANDWIDTH) + 
- 		$dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_OUTGOING_BANDWIDTH)) < (50 * 1024 * 1024) && 
-            $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_SERVICE_IN_BANDWIDTH_ACTION,false,null);
- validation.setTenantBlocked(StratosConstants.THROTTLING_WEBAPP_IN_BANDWIDTH_ACTION,false,null);
- validation.setTenantBlocked(StratosConstants.THROTTLING_OUT_DATA_ACTION,false,null);
-end
-
-
-//---------------------------------------------------------------------------------
-// small users restrictions
-
-
-
-rule restrictSmallDataVolume
-when
- $package: MultitenancyPackage(name == "SMB")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) > (50 * 1024 * 1024) && 
-            $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, true, 
-            "You have exceeded the maximum allowed disk storage of 50Mb. Please upgrade the subscription.");
-end
-
-
-rule unsetRestrictSmallDataVolume
-when
- $package: MultitenancyPackage(name == "SMB")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) <= (50 * 1024 * 1024) && 
-            $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, false, null);
-end
-
-
-rule restrictSmallBandwidth
-when
- $package: MultitenancyPackage(name == "SMB")
- $dataContext : ThrottlingDataContext()
- eval(($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_INCOMING_BANDWIDTH) + 
- 		$dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_OUTGOING_BANDWIDTH)) > (150 * 1024 * 1024) && 
-            $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_SERVICE_IN_BANDWIDTH_ACTION, true, 
-            "You have exceeded the maximum allowed bandwidth of 150Mb. Please upgrade the subscription.");
- validation.setTenantBlocked(StratosConstants.THROTTLING_WEBAPP_IN_BANDWIDTH_ACTION, true, 
-            "You have exceeded the maximum allowed bandwidth of 150Mb. Please upgrade the subscription.");
- validation.setTenantBlocked(StratosConstants.THROTTLING_OUT_DATA_ACTION, true, 
-            "You have exceeded the maximum allowed bandwidth of 150Mb. Please upgrade the subscription."); 
-end
-
-
-rule unsetRestrictSmallBandwidth
-when
- $package: MultitenancyPackage(name == "SMB")
- $dataContext : ThrottlingDataContext()
- eval(($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_INCOMING_BANDWIDTH) + 
- 		$dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_OUTGOING_BANDWIDTH)) < (150 * 1024 * 1024) && 
-            $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_SERVICE_IN_BANDWIDTH_ACTION,false,null);
- validation.setTenantBlocked(StratosConstants.THROTTLING_WEBAPP_IN_BANDWIDTH_ACTION,false,null);
- validation.setTenantBlocked(StratosConstants.THROTTLING_OUT_DATA_ACTION,false,null);
-end
-
-
-rule unsetRestrictSmallUsers
-when
- $package: MultitenancyPackage(name == "SMB")
- $dataContext : ThrottlingDataContext()
-then
-
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_ADD_USER_ACTION, false, null);
-
-end
-
-
-
-
-//-------------------------------------------------------------------------------
-// medium users restrictions
-
-
-
-rule restrictMediumDataVolume
-when
- $package: MultitenancyPackage(name == "Professional")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) > (500 * 1024 * 1024) && 
-            $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, true, 
-            "You have exceeded the maximum allowed disk storage of 500Mb. Please upgrade the subscription.");
-end
-
-
-rule unsetRestrictMediumDataVolume
-when
- $package: MultitenancyPackage(name == "Professional")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) <= (500 * 1024 * 1024) && 
-            $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, false, null);
-end
-
-
-rule unsetRestrictMediumUsers
-when
- $package: MultitenancyPackage(name == "Professional")
- $dataContext : ThrottlingDataContext()
-then
-
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_ADD_USER_ACTION, false, null);
-
-end
-
-
-
-//-----------------------------------------------------------------------------------------------
-// large users restrictions
-
-
-rule restrictLargeDataVolume
-when
- $package: MultitenancyPackage(name == "Enterprise")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) > (1500 * 1024 * 1024) && 
-            $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, true, 
-            "You have exceeded the maximum allowed disk storage of 1500Mb.");
-end
-
-
-rule unsetRestrictLargeDataVolume
-when
- $package: MultitenancyPackage(name == "Enterprise")
- $dataContext : ThrottlingDataContext()
- eval($dataContext.getDataLong(ThrottlingDataEntryConstants.TENANT_CAPACITY) <= (1500 * 1024 * 1024) && 
-            $dataContext.getDataObject(ThrottlingDataEntryConstants.PACKAGE) == $package)
-
-then
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_IN_DATA_ACTION, false, null);
-end
-
-
-rule unsetRestrictLargeUsers
-when
- $package: MultitenancyPackage(name == "Enterprise")
- $dataContext : ThrottlingDataContext()
-then
-
- ThrottlingAccessValidation validation = $dataContext.getAccessValidation();
- validation.setTenantBlocked(StratosConstants.THROTTLING_ADD_USER_ACTION, false, null);
-
-end
-
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/conf/user-mgt.xml
----------------------------------------------------------------------
diff --git a/products/stratos-manager/conf/user-mgt.xml b/products/stratos-manager/conf/user-mgt.xml
deleted file mode 100644
index c6cdb74..0000000
--- a/products/stratos-manager/conf/user-mgt.xml
+++ /dev/null
@@ -1,241 +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.
-  -->
-        
-<UserManager>
-    <Realm>
-        <Configuration>
-                <AdminRole>admin</AdminRole>
-                <AdminUser>
-                     <UserName>admin</UserName>
-                     <Password>admin</Password>
-                </AdminUser>
-            <EveryOneRoleName>everyone</EveryOneRoleName> <!-- By default users in this role sees the registry root -->
-            <Property name="dataSource">jdbc/WSO2CarbonDB</Property>
-            <Property name="MultiTenantRealmConfigBuilder">org.wso2.carbon.user.core.config.multitenancy.SimpleRealmConfigBuilder</Property>
-        </Configuration>
-	<!-- Following is the default user store manager. This user store manager is based on embedded-apacheds LDAP. It reads/writes users and roles into the 		     default apacheds LDAP user store. Descriptions about each of the following properties can be found in user management documentation of the 	 respective product. In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
-	     Note: Do not comment within UserStoreManager tags. Cause, specific tag names are used as tokens when building configurations for products. -->
-	<!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ReadWriteLDAPUserStoreManager">
-            <Property name="ConnectionURL">ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}</Property>
-            <Property name="ConnectionName">uid=admin,ou=system</Property>
-            <Property name="ConnectionPassword">admin</Property>
-            <Property name="passwordHashMethod">SHA</Property>
-            <Property name="UserNameListFilter">(objectClass=person)</Property>
-	    <Property name="UserEntryObjectClass">wso2Person</Property>
-            <Property name="UserSearchBase">ou=Users,dc=wso2,dc=org</Property>
-            <Property name="UserNameSearchFilter">(&amp;(objectClass=person)(uid=?))</Property>
-            <Property name="UserNameAttribute">uid</Property>
-            <Property name="PasswordJavaScriptRegEx">^[\\S]{5,30}$</Property>
-            <Property name="UsernameJavaScriptRegEx">^[\\S]{3,30}$</Property>
-	    <Property name="UsernameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\&lt;&gt;,\'\"]{3,30}$</Property>
-            <Property name="RolenameJavaScriptRegEx">^[\\S]{3,30}$</Property>
-            <Property name="RolenameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\&lt;&gt;,\'\"]{3,30}$</Property>
-            <Property name="ReadLDAPGroups">true</Property>
-	    <Property name="WriteLDAPGroups">true</Property>
-	    <Property name="EmptyRolesAllowed">true</Property>
-            <Property name="GroupSearchBase">ou=Groups,dc=wso2,dc=org</Property>
-            <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
-            <Property name="GroupEntryObjectClass">groupOfNames</Property>
-            <Property name="GroupNameSearchFilter">(&amp;(objectClass=groupOfNames)(cn=?))</Property>
-            <Property name="GroupNameAttribute">cn</Property>
-            <Property name="MembershipAttribute">member</Property>
-	    <Property name="UserRolesCacheEnabled">true</Property>
-	    <Property name="UserDNPattern">uid={0},ou=Users,dc=wso2,dc=org</Property>
-        </UserStoreManager-->
-
-	<!-- Following is the configuration for internal JDBC user store. This user store manager is based on JDBC. In case if application needs to manage 		     passwords externally set property <Property name="PasswordsExternallyManaged">true</Property>. In case if user core cache domain is needed to 			identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>. Furthermore properties, IsEmailUserName and 	     			DomainCalculation are readonly properties. 
-	     Note: Do not comment within UserStoreManager tags. Cause, specific tag names are used as tokens when building configurations for products. -->	
-        <UserStoreManager class="org.wso2.carbon.user.core.jdbc.JDBCUserStoreManager">
-	    <Property name="ReadOnly">false</Property>
-            <Property name="MaxUserNameListLength">100</Property>
-            <Property name="IsEmailUserName">false</Property>
-            <Property name="DomainCalculation">default</Property>
-            <Property name="PasswordDigest">SHA-256</Property>
-            <Property name="StoreSaltedPassword">true</Property>
-            <Property name="UserNameUniqueAcrossTenants">false</Property>
-            <Property name="PasswordJavaRegEx">^[\S]{5,30}$</Property>
-            <Property name="PasswordJavaScriptRegEx">^[\\S]{5,30}$</Property>
-	    <Property name="UsernameJavaRegEx">^[^~!#$;%^*+={}\\|\\\\&lt;&gt;,\'\"]{3,30}$</Property>
-	    <Property name="UsernameJavaScriptRegEx">^[\\S]{3,30}$</Property>
-	    <Property name="RolenameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\&lt;&gt;,\'\"]{3,30}$</Property>
-	    <Property name="RolenameJavaScriptRegEx">^[\\S]{3,30}$</Property>
-            <Property name="UserRolesCacheEnabled">true</Property>
-        </UserStoreManager>
-	
-	<!-- If product is using an external LDAP as the user store in READ ONLY mode, use following user manager.
-		In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
- 	-->
-        <!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ReadOnlyLDAPUserStoreManager">
-            <Property name="ReadOnly">true</Property>
-	    <Property name="MaxUserNameListLength">100</Property>
-            <Property name="ConnectionURL">ldap://localhost:10389</Property>
-            <Property name="ConnectionName">uid=admin,ou=system</Property>
-            <Property name="ConnectionPassword">admin</Property>
-            <Property name="UserSearchBase">ou=system</Property>
-            <Property name="UserNameListFilter">(objectClass=person)</Property>
-            <Property name="UserNameAttribute">uid</Property>
-            <Property name="ReadLDAPGroups">false</Property>
-            <Property name="GroupSearchBase">ou=system</Property>
-            <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
-            <Property name="GroupNameAttribute">cn</Property>
-            <Property name="MembershipAttribute">member</Property>
-            <Property name="UserRolesCacheEnabled">true</Property>
-	    <Property name="ReplaceEscapeCharactersAtUserLogin">true</Property>
-        </UserStoreManager-->
-	
-	<!-- Active directory configuration is as follows.
-	    In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
-	    There are few special properties for "Active Directory". 
-	    They are : 
-	    1.Referral - (comment out this property if this feature is not reuired) This enables LDAP referral support.
-	    2.BackLinksEnabled - (Do not comment, set to true or false) In some cases LDAP works with BackLinksEnabled. In which role is stored
-	     at user level. Depending on this value we need to change the Search Base within code.
-	    3.isADLDSRole - (Do not comment) Set to true if connecting to an AD LDS instance else set to false.  
-	-->
-	<!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ActiveDirectoryUserStoreManager">
-            <Property name="defaultRealmName">WSO2.ORG</Property>
-            <Property name="kdcEnabled">false</Property>
-            <Property name="ConnectionURL">ldaps://10.100.1.100:636</Property> 
-            <Property name="ConnectionName">CN=admin,CN=Users,DC=WSO2,DC=Com</Property>
-            <Property name="ConnectionPassword">A1b2c3d4</Property>
-	    <Property name="passwordHashMethod">SHA</Property>
-            <Property name="UserSearchBase">CN=Users,DC=WSO2,DC=Com</Property>
-            <Property name="UserEntryObjectClass">user</Property>
-            <Property name="UserNameAttribute">cn</Property>
-            <Property name="isADLDSRole">false</Property>
-	    <Property name="userAccountControl">512</Property>
-            <Property name="UserNameListFilter">(objectClass=user)</Property>
-	    <Property name="UserNameSearchFilter">(&amp;(objectClass=user)(cn=?))</Property>
-            <Property name="UsernameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\&lt;&gt;]{3,30}$</Property>
-            <Property name="UsernameJavaScriptRegEx">^[\\S]{3,30}$</Property>
-            <Property name="PasswordJavaScriptRegEx">^[\\S]{5,30}$</Property>
-	    <Property name="RolenameJavaScriptRegEx">^[\\S]{3,30}$</Property>
-            <Property name="RolenameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\&lt;&gt;]{3,30}$</Property>
-	    <Property name="ReadLDAPGroups">true</Property>
-	    <Property name="WriteLDAPGroups">true</Property>
-	    <Property name="EmptyRolesAllowed">true</Property>
-            <Property name="GroupSearchBase">CN=Users,DC=WSO2,DC=Com</Property>
-	    <Property name="GroupEntryObjectClass">group</Property>
-            <Property name="GroupNameAttribute">cn</Property>
-            <Property name="MembershipAttribute">member</Property>
-            <Property name="GroupNameListFilter">(objectcategory=group)</Property>
-	    <Property name="GroupNameSearchFilter">(&amp;(objectClass=group)(cn=?))</Property>
-            <Property name="UserRolesCacheEnabled">true</Property>
-            <Property name="Referral">follow</Property>
-	    <Property name="BackLinksEnabled">true</Property>
-        </UserStoreManager-->
-	
-	<!-- If product is using an external LDAP as the user store in read/write mode, use following user manager 
-		In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
-	-->
-	<!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ReadWriteLDAPUserStoreManager">
-            <Property name="ConnectionURL">ldap://localhost:10389</Property>
-            <Property name="ConnectionName">uid=admin,ou=system</Property>
-            <Property name="ConnectionPassword">secret</Property>
-            <Property name="passwordHashMethod">SHA</Property>
-            <Property name="UserNameListFilter">(objectClass=person)</Property>
-	    <Property name="UserEntryObjectClass">inetOrgPerson</Property>
-            <Property name="UserSearchBase">ou=system</Property>
-            <Property name="UserNameSearchFilter">(&amp;(objectClass=person)(uid=?))</Property>
-            <Property name="UserNameAttribute">uid</Property>
-	    <Property name="UsernameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\&lt;&gt;]{3,30}$</Property>
-            <Property name="UsernameJavaScriptRegEx">^[\\S]{3,30}$</Property>
-	    <Property name="RolenameJavaScriptRegEx">^[\\S]{3,30}$</Property>
-            <Property name="RolenameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\&lt;&gt;]{3,30}$</Property>
-            <Property name="PasswordJavaScriptRegEx">^[\\S]{5,30}$</Property>
-	    <Property name="ReadLDAPGroups">true</Property>
-	    <Property name="WriteLDAPGroups">true</Property>
-	    <Property name="EmptyRolesAllowed">false</Property>
-            <Property name="GroupSearchBase">ou=system</Property>
-            <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
-            <Property name="GroupEntryObjectClass">groupOfNames</Property>
-            <Property name="GroupNameSearchFilter">(&amp;(objectClass=groupOfNames)(cn=?))</Property>
-            <Property name="GroupNameAttribute">cn</Property>
-            <Property name="MembershipAttribute">member</Property>
-            <Property name="UserRolesCacheEnabled">true</Property>
-	    <Property name="ReplaceEscapeCharactersAtUserLogin">true</Property>
-        </UserStoreManager-->
-
-	<!-- Following user manager is used by Identity Server (IS) as its default user manager. 
-	     IS will do token replacement when building the product. Therefore do not change the syntax. 
-	     If "kdcEnabled" parameter is true, IS will allow service principle management. Thus "ServicePasswordJavaRegEx", "ServiceNameJavaRegEx"
-	     properties control the service name format and service password formats.
-	     In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
-	-->
-	<!--ISUserStoreManager class="org.wso2.carbon.user.core.ldap.ReadWriteLDAPUserStoreManager">
-            <Property name="defaultRealmName">WSO2.ORG</Property>
-            <Property name="kdcEnabled">false</Property>
-            <Property name="ConnectionURL">ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}</Property>
-            <Property name="ConnectionName">uid=admin,ou=system</Property>
-            <Property name="ConnectionPassword">admin</Property>
-            <Property name="passwordHashMethod">SHA</Property>
-            <Property name="UserNameListFilter">(objectClass=person)</Property>
-            <Property name="UserEntryObjectClass">scimPerson</Property>
-            <Property name="UserSearchBase">ou=Users,dc=wso2,dc=org</Property>
-            <Property name="UserNameSearchFilter">(&amp;(objectClass=person)(uid=?))</Property>
-            <Property name="UserNameAttribute">uid</Property>
-            <Property name="PasswordJavaScriptRegEx">^[\\S]{5,30}$</Property>
-	    <Property name="ServicePasswordJavaRegEx">^[\\S]{5,30}$</Property>
-	    <Property name="ServiceNameJavaRegEx">^[\\S]{2,30}/[\\S]{2,30}$</Property>
-            <Property name="UsernameJavaScriptRegEx">^[\\S]{3,30}$</Property>
-            <Property name="UsernameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\&lt;&gt;,\'\"]{3,30}$</Property>
-            <Property name="RolenameJavaScriptRegEx">^[\\S]{3,30}$</Property>
-            <Property name="RolenameJavaRegEx">^[^~!@#$;%^*+={}\\|\\\\&lt;&gt;,\'\"]{3,30}$</Property>
-	    <Property name="ReadLDAPGroups">true</Property>
-	    <Property name="WriteLDAPGroups">true</Property>
-	    <Property name="EmptyRolesAllowed">true</Property>
-            <Property name="GroupSearchBase">ou=Groups,dc=wso2,dc=org</Property>
-            <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
-	    <Property name="GroupEntryObjectClass">groupOfNames</Property>
-            <Property name="GroupNameSearchFilter">(&amp;(objectClass=groupOfNames)(cn=?))</Property>
-            <Property name="GroupNameAttribute">cn</Property>
-            <Property name="MembershipAttribute">member</Property>
-            <Property name="UserRolesCacheEnabled">true</Property>
-	    <Property name="UserDNPattern">uid={0},ou=Users,dc=wso2,dc=org</Property>
-	    <Property name="SCIMEnabled">true</Property>
-        </ISUserStoreManager-->
-
-        <AuthorizationManager
-            class="org.wso2.carbon.user.core.authorization.JDBCAuthorizationManager">
-            <Property name="AdminRoleManagementPermissions">/permission</Property>
-	    <Property name="AuthorizationCacheEnabled">true</Property>
-        </AuthorizationManager>
-    </Realm>
-</UserManager>
-
-<!--*******Description of some of the configuration properties used in user-mgt.xml*********************************
-UserRolesCacheEnabled - This is to indicate whether to cache role list of a user. By default it is set to true.
-                        You may need to disable it if user-roles are changed by external means and need to reflect
-                        those changes in the carbon product immediately.
-
-ReplaceEscapeCharactersAtUserLogin - This is to configure whether escape characters in user name needs to be replaced at user login.
-				     Currently the identified escape characters that needs to be replaced are '\' & '\\'
-
-UserDNPattern - This property will be used when authenticating users. During authentication we do a bind. But if the user is login with
-                email address or some other property we need to first lookup LDAP and retreive DN for the user. This involves an additional step. 
-                If UserDNPattern is specified the DN will be contructed using the pattern specified in this property. Performance of this is much better than looking
-                up DN and binding user.
-
-passwordHashMethod - This says how the password should be stored. Allowed values are as follows,
-                     SHA - Uses SHA digest method
-                     MD5 - Uses MD 5 digest method
-                     PLAIN_TEXT - Plain text passwords
-                     In addition to above this supports all digest methods supported by http://docs.oracle.com/javase/6/docs/api/java/security/MessageDigest.html.
-
--->

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/conf/zoo.cfg
----------------------------------------------------------------------
diff --git a/products/stratos-manager/conf/zoo.cfg b/products/stratos-manager/conf/zoo.cfg
deleted file mode 100644
index 5c54037..0000000
--- a/products/stratos-manager/conf/zoo.cfg
+++ /dev/null
@@ -1,24 +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.
-#
-
-tickTime=2000
-dataDir=repository/data/zookeeper
-clientPort=2181
-start_zk_server=false

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/dbscripts/billing-h2.sql
----------------------------------------------------------------------
diff --git a/products/stratos-manager/dbscripts/billing-h2.sql b/products/stratos-manager/dbscripts/billing-h2.sql
deleted file mode 100755
index ccf1393..0000000
--- a/products/stratos-manager/dbscripts/billing-h2.sql
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/ 
-
-CREATE TABLE IF NOT EXISTS BC_CUSTOMER (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_NAME VARCHAR (64),
-             BC_STARTED_DATE TIMESTAMP,
-             BC_EMAIL VARCHAR (64),
-             BC_ADDRESS VARCHAR (256),
-             CONSTRAINT PK_BC_CUSTOMER PRIMARY KEY (BC_ID)
-);
-
-CREATE HASH INDEX BC_CUSTOMER_IND_BY_BC_NAME ON BC_CUSTOMER(BC_NAME);
-CREATE HASH INDEX BC_CUSTOMER_IND_BY_BC_EMAIL ON BC_CUSTOMER(BC_EMAIL);
-
-CREATE TABLE IF NOT EXISTS BC_ITEM (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_NAME VARCHAR (64),
-             BC_COST VARCHAR (64),
-             BC_DESCRIPTION VARCHAR(128),
-             BC_PARENT_ITEM_ID INTEGER,
-             CONSTRAINT PK_BC_ITEM PRIMARY KEY (BC_ID)
-);
-INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ('Demo',NULL,NULL,NULL);
-INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ('SMB',NULL,NULL,NULL);
-INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ('Professional',NULL,NULL,NULL);
-INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ('Enterprise',NULL,NULL,NULL);
-
-ALTER TABLE BC_ITEM ADD CONSTRAINT IF NOT EXISTS BC_ITEM_FK_BY_PARENT_ITEM_ID FOREIGN KEY (BC_PARENT_ITEM_ID) REFERENCES BC_ITEM (BC_ID);
-
-
-CREATE TABLE IF NOT EXISTS BC_SUBSCRIPTION (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_FILTER VARCHAR (32),
-             BC_IS_ACTIVE INTEGER,
-             BC_ACTIVE_SINCE TIMESTAMP,
-             BC_ACTIVE_UNTIL TIMESTAMP,
-             BC_ITEM_ID INTEGER,
-             BC_TENANT_ID INTEGER,
-             CONSTRAINT PK_BC_SUBSCRIPTION PRIMARY KEY (BC_ID)
-);
-
-ALTER TABLE BC_SUBSCRIPTION ADD CONSTRAINT IF NOT EXISTS BC_SUBSCRIPTION_FK_BY_ITEM_ID FOREIGN KEY (BC_ITEM_ID) REFERENCES BC_ITEM (BC_ID);
-
-CREATE TABLE IF NOT EXISTS BC_INVOICE (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_TENANT_ID INTEGER,
-             BC_DATE TIMESTAMP,
-             BC_START_DATE TIMESTAMP,
-             BC_END_DATE TIMESTAMP,
-             BC_BOUGHT_FORWARD VARCHAR (64),
-             BC_CARRIED_FORWARD VARCHAR (64),
-             BC_TOTAL_PAYMENTS VARCHAR (64),
-             BC_TOTAL_COST VARCHAR (64),
-             CONSTRAINT PK_BC_INVOICE PRIMARY KEY (BC_ID)
-);
-
-
-CREATE TABLE IF NOT EXISTS BC_PAYMENT (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_DATE TIMESTAMP,
-             BC_AMOUNT VARCHAR (64),
-             BC_DESCRIPTION VARCHAR (128),
-             BC_INVOICE_ID INTEGER,
-	     	 BC_TENANT_ID INTEGER,	
-             CONSTRAINT PK_BC_PAYMENT PRIMARY KEY (BC_ID)
-);
-
-ALTER TABLE BC_PAYMENT ADD CONSTRAINT IF NOT EXISTS BC_PAYMENT_FK_BY_INVOICE_ID FOREIGN KEY (BC_INVOICE_ID) REFERENCES BC_INVOICE (BC_ID);
-
--- this is n-n relationship
-CREATE TABLE IF NOT EXISTS BC_PAYMENT_SUBSCRIPTION (
-             BC_PAYMENT_ID INTEGER,
-             BC_SUBSCRIPTION_ID INTEGER,
-             CONSTRAINT PK_BC_SUBSCRIPTION_ORDER PRIMARY KEY (BC_PAYMENT_ID, BC_SUBSCRIPTION_ID)
-);
-
-ALTER TABLE BC_PAYMENT_SUBSCRIPTION ADD CONSTRAINT IF NOT EXISTS BC_PAYMENT_SUBSCRIPTION_FK_BY_PAYMENT_ID FOREIGN KEY (BC_PAYMENT_ID) REFERENCES BC_PAYMENT (BC_ID);
-ALTER TABLE BC_PAYMENT_SUBSCRIPTION ADD CONSTRAINT IF NOT EXISTS BC_PAYMENT_SUBSCRIPTION_FK_BY_SUBSCRIPTION_ID FOREIGN KEY (BC_SUBSCRIPTION_ID) REFERENCES BC_SUBSCRIPTION (BC_ID);
-
-CREATE TABLE IF NOT EXISTS BC_INVOICE_SUBSCRIPTION (
-             BC_ID INTEGER  AUTO_INCREMENT,
-             BC_INVOICE_ID INTEGER,
-             BC_SUBSCRIPTION_ID INTEGER,
-             CONSTRAINT PK_BC_INVOICE_ITEM PRIMARY KEY (BC_ID)
-);
-
-ALTER TABLE BC_INVOICE_SUBSCRIPTION ADD CONSTRAINT IF NOT EXISTS BC_INVOICE_SUBSCRIPTION_FK_BY_INVOICE_ID FOREIGN KEY (BC_INVOICE_ID) REFERENCES BC_INVOICE (BC_ID);
-ALTER TABLE BC_INVOICE_SUBSCRIPTION ADD CONSTRAINT IF NOT EXISTS BC_INVOICE_SUBSCRIPTION_FK_BY_SUBSCRIPTION_ID FOREIGN KEY (BC_SUBSCRIPTION_ID) REFERENCES BC_SUBSCRIPTION (BC_ID);
-
-
-CREATE TABLE IF NOT EXISTS BC_INVOICE_SUBSCRIPTION_ITEM (
-             BC_INVOICE_SUBSCRIPTION_ID INTEGER,
-             BC_ITEM_ID INTEGER,
-             BC_COST VARCHAR (64),
-	     BC_DESCRIPTION VARCHAR (64),	
-             CONSTRAINT PK_BC_INVOICE_SUBSCRIPTION_ITEM PRIMARY KEY (BC_INVOICE_SUBSCRIPTION_ID, BC_ITEM_ID)
-);
-
-ALTER TABLE BC_INVOICE_SUBSCRIPTION_ITEM ADD CONSTRAINT IF NOT EXISTS BC_INVOICE_SUBSCRIPTION_ITEM_FK_BY_INVOICE_SUBSCRIPTION_ID FOREIGN KEY (BC_INVOICE_SUBSCRIPTION_ID) REFERENCES BC_INVOICE_SUBSCRIPTION (BC_ID);
-ALTER TABLE BC_INVOICE_SUBSCRIPTION_ITEM ADD CONSTRAINT IF NOT EXISTS BC_INVOICE_SUBSCRIPTION_ITEM_FK_BY_ITEM_ID FOREIGN KEY (BC_ITEM_ID) REFERENCES BC_ITEM(BC_ID);
-
-CREATE TABLE IF NOT EXISTS BC_DISCOUNT (
-	BC_ID INTEGER AUTO_INCREMENT,
-	BC_TENANT_ID INTEGER,
-	BC_PERCENTAGE FLOAT,
-	BC_AMOUNT FLOAT,
-	BC_START_DATE TIMESTAMP,
-	BC_END_DATE TIMESTAMP,
-	BC_PERCENTAGE_TYPE INTEGER,
-	CONSTRAINT PK_BC_DISCOUNT PRIMARY KEY (BC_ID)
-);

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/dbscripts/billing-mysql.sql
----------------------------------------------------------------------
diff --git a/products/stratos-manager/dbscripts/billing-mysql.sql b/products/stratos-manager/dbscripts/billing-mysql.sql
deleted file mode 100755
index cfe828f..0000000
--- a/products/stratos-manager/dbscripts/billing-mysql.sql
+++ /dev/null
@@ -1,139 +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.
-*/ 
-
-CREATE TABLE IF NOT EXISTS BC_CUSTOMER (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_NAME VARCHAR (64),
-             BC_STARTED_DATE TIMESTAMP,
-             BC_EMAIL VARCHAR (64),
-             BC_ADDRESS VARCHAR (256),
-             CONSTRAINT PK_BC_CUSTOMER PRIMARY KEY (BC_ID)
-)ENGINE INNODB;
-
-CREATE INDEX BC_CUSTOMER_IND_BY_BC_NAME USING HASH ON BC_CUSTOMER(BC_NAME);
-CREATE INDEX BC_CUSTOMER_IND_BY_BC_EMAIL USING HASH ON BC_CUSTOMER(BC_EMAIL);
-
-CREATE TABLE IF NOT EXISTS BC_ITEM (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_NAME VARCHAR (64),
-             BC_COST VARCHAR (64),
-             BC_DESCRIPTION VARCHAR(128),
-             BC_PARENT_ITEM_ID INTEGER,
-             CONSTRAINT PK_BC_ITEM PRIMARY KEY (BC_ID)
-)ENGINE INNODB;
-INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ("Demo",NULL,NULL,NULL);
-INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ("SMB",NULL,NULL,NULL);
-INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ("Professional",NULL,NULL,NULL);
-INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ("Enterprise",NULL,NULL,NULL);
-
-ALTER TABLE BC_ITEM ADD CONSTRAINT BC_ITEM_FK_BY_PARENT_ITEM_ID FOREIGN KEY (BC_PARENT_ITEM_ID) REFERENCES BC_ITEM (BC_ID);
-
-
-CREATE TABLE IF NOT EXISTS BC_SUBSCRIPTION (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_FILTER VARCHAR (32),
-             BC_IS_ACTIVE INTEGER,
-             BC_ACTIVE_SINCE TIMESTAMP,
-             BC_ACTIVE_UNTIL TIMESTAMP,
-             BC_ITEM_ID INTEGER,
-             BC_TENANT_ID INTEGER,
-             CONSTRAINT PK_BC_SUBSCRIPTION PRIMARY KEY (BC_ID)
-)ENGINE INNODB;
-
-ALTER TABLE BC_SUBSCRIPTION ADD CONSTRAINT BC_SUBSCRIPTION_FK_BY_ITEM_ID FOREIGN KEY (BC_ITEM_ID) REFERENCES BC_ITEM (BC_ID);
-
-CREATE TABLE IF NOT EXISTS BC_INVOICE (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_TENANT_ID INTEGER,
-             BC_DATE TIMESTAMP,
-             BC_START_DATE TIMESTAMP,
-             BC_END_DATE TIMESTAMP,
-             BC_BOUGHT_FORWARD VARCHAR (64),
-             BC_CARRIED_FORWARD VARCHAR (64),
-             BC_TOTAL_PAYMENTS VARCHAR (64),
-             BC_TOTAL_COST VARCHAR (64),
-             CONSTRAINT PK_BC_INVOICE PRIMARY KEY (BC_ID)
-)ENGINE INNODB;
-
-
-CREATE TABLE IF NOT EXISTS BC_PAYMENT (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_DATE TIMESTAMP,
-             BC_AMOUNT VARCHAR (64),
-             BC_DESCRIPTION VARCHAR (128),
-             BC_INVOICE_ID INTEGER,
-	     BC_TENANT_ID INTEGER,	
-             CONSTRAINT PK_BC_SUBSCRIPTION_ORDER PRIMARY KEY (BC_ID)
-)ENGINE INNODB;
-
-ALTER TABLE BC_PAYMENT ADD CONSTRAINT BC_PAYMENT_FK_BY_INVOICE_ID FOREIGN KEY (BC_INVOICE_ID) REFERENCES BC_INVOICE (BC_ID);
-
-CREATE TABLE IF NOT EXISTS BC_REGISTRATION_PAYMENT (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_DATE TIMESTAMP,
-             BC_AMOUNT VARCHAR (64),
-             BC_DESCRIPTION VARCHAR (128),
-			 BC_USAGE_PLAN VARCHAR (64),
-	     	 BC_TENANT_ID INTEGER,	
-             CONSTRAINT PK_BC_REGISTRATION_PAYMENT PRIMARY KEY (BC_ID)
-)ENGINE INNODB;
-
--- this is n-n relationship
-CREATE TABLE IF NOT EXISTS BC_PAYMENT_SUBSCRIPTION (
-             BC_PAYMENT_ID INTEGER,
-             BC_SUBSCRIPTION_ID INTEGER,
-             CONSTRAINT PK_BC_SUBSCRIPTION_ORDER PRIMARY KEY (BC_PAYMENT_ID, BC_SUBSCRIPTION_ID)
-)ENGINE INNODB;
-
-ALTER TABLE BC_PAYMENT_SUBSCRIPTION ADD CONSTRAINT BC_PAYMENT_SUBSCRIPTION_FK_BY_PAYMENT_ID FOREIGN KEY (BC_PAYMENT_ID) REFERENCES BC_PAYMENT (BC_ID);
-ALTER TABLE BC_PAYMENT_SUBSCRIPTION ADD CONSTRAINT BC_PAYMENT_SUBSCRIPTION_FK_BY_SUBSCRIPTION_ID FOREIGN KEY (BC_SUBSCRIPTION_ID) REFERENCES BC_SUBSCRIPTION (BC_ID);
-
-CREATE TABLE IF NOT EXISTS BC_INVOICE_SUBSCRIPTION (
-             BC_ID INTEGER  AUTO_INCREMENT,
-             BC_INVOICE_ID INTEGER,
-             BC_SUBSCRIPTION_ID INTEGER,
-             CONSTRAINT PK_BC_INVOICE_ITEM PRIMARY KEY (BC_ID)
-)ENGINE INNODB;
-
-ALTER TABLE BC_INVOICE_SUBSCRIPTION ADD CONSTRAINT BC_INVOICE_SUBSCRIPTION_FK_BY_INVOICE_ID FOREIGN KEY (BC_INVOICE_ID) REFERENCES BC_INVOICE (BC_ID);
-ALTER TABLE BC_INVOICE_SUBSCRIPTION ADD CONSTRAINT BC_INVOICE_SUBSCRIPTION_FK_BY_SUBSCRIPTION_ID FOREIGN KEY (BC_SUBSCRIPTION_ID) REFERENCES BC_SUBSCRIPTION (BC_ID);
-
-
-CREATE TABLE IF NOT EXISTS BC_INVOICE_SUBSCRIPTION_ITEM (
-             BC_INVOICE_SUBSCRIPTION_ID INTEGER,
-             BC_ITEM_ID INTEGER,
-             BC_COST VARCHAR (64),
-	     BC_DESCRIPTION varchar (64),	
-             CONSTRAINT PK_BC_INVOICE_SUBSCRIPTION_ITEM PRIMARY KEY (BC_INVOICE_SUBSCRIPTION_ID, BC_ITEM_ID)
-)ENGINE INNODB;
-
-ALTER TABLE BC_INVOICE_SUBSCRIPTION_ITEM ADD CONSTRAINT BC_INVOICE_SUBSCRIPTION_ITEM_FK_BY_INVOICE_SUBSCRIPTION_ID FOREIGN KEY (BC_INVOICE_SUBSCRIPTION_ID) REFERENCES BC_INVOICE_SUBSCRIPTION (BC_ID);
-ALTER TABLE BC_INVOICE_SUBSCRIPTION_ITEM ADD CONSTRAINT BC_INVOICE_SUBSCRIPTION_ITEM_FK_BY_ITEM_ID FOREIGN KEY (BC_ITEM_ID) REFERENCES BC_ITEM(BC_ID);
-
-CREATE TABLE IF NOT EXISTS BC_DISCOUNT (
-        BC_ID INTEGER AUTO_INCREMENT,
-        BC_TENANT_ID INTEGER,
-        BC_PERCENTAGE FLOAT,
-        BC_AMOUNT FLOAT,
-        BC_START_DATE TIMESTAMP,
-        BC_END_DATE TIMESTAMP,
-        BC_PERCENTAGE_TYPE INTEGER,
-        CONSTRAINT PK_BC_DISCOUNT PRIMARY KEY (BC_ID)
-)ENGINE INNODB;
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/dbscripts/metering_h2.sql
----------------------------------------------------------------------
diff --git a/products/stratos-manager/dbscripts/metering_h2.sql b/products/stratos-manager/dbscripts/metering_h2.sql
deleted file mode 100755
index 1f38fe2..0000000
--- a/products/stratos-manager/dbscripts/metering_h2.sql
+++ /dev/null
@@ -1,133 +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.
-*/ 
-
---
--- TABLES
---
-
-CREATE TABLE IF NOT EXISTS USAGE_HOURLY_ANALYTICS (
-        ID VARCHAR(200) NOT NULL,
-        HOUR_FACT TIMESTAMP,
-        SERVER_NAME VARCHAR(100),
-        TENANT_ID VARCHAR(50),
-        PAYLOAD_TYPE VARCHAR(50),
-        PAYLOAD_VALUE  BIGINT,
-        PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS USAGE_DAILY_ANALYTICS (
-        ID VARCHAR(200) NOT NULL,
-        DAY_FACT TIMESTAMP,
-        SERVER_NAME VARCHAR(100),
-        TENANT_ID VARCHAR(50),
-        PAYLOAD_TYPE VARCHAR(50),
-        PAYLOAD_VALUE  BIGINT,
-        PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS USAGE_MONTHLY_ANALYTICS (
-        ID VARCHAR(200) NOT NULL,
-        MONTH_FACT TIMESTAMP,
-        SERVER_NAME VARCHAR(100),
-        TENANT_ID VARCHAR(50),
-        PAYLOAD_TYPE VARCHAR(50),
-        PAYLOAD_VALUE  BIGINT,
-        PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS USAGE_LAST_HOURLY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (ID)
-);
-	
-CREATE TABLE IF NOT EXISTS USAGE_LAST_DAILY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS USAGE_LAST_MONTHLY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_HOURLY_ANALYTICS (
-	ID VARCHAR(200) NOT NULL,
-	HOUR_FACT TIMESTAMP,
-	SERVER_NAME VARCHAR(100),
-	TENANT_ID VARCHAR(50),
-	REQUEST_COUNT BIGINT,
-	RESPONSE_COUNT BIGINT,
-	FAULT_COUNT BIGINT,
-	PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_DAILY_ANALYTICS (
-	ID VARCHAR(200) NOT NULL,
-	DAY_FACT TIMESTAMP,
-	SERVER_NAME VARCHAR(100),
-	TENANT_ID VARCHAR(50),
-	REQUEST_COUNT BIGINT,
-	RESPONSE_COUNT BIGINT,
-	FAULT_COUNT BIGINT,
-	PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_MONTHLY_ANALYTICS (
-	ID VARCHAR(200) NOT NULL,
-	MONTH_FACT TIMESTAMP,
-	SERVER_NAME VARCHAR(100),
-	TENANT_ID VARCHAR(50),
-	REQUEST_COUNT BIGINT,
-	RESPONSE_COUNT BIGINT,
-	FAULT_COUNT BIGINT,
-	PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_LAST_HOURLY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (ID)
-);
-	
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_LAST_DAILY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_LAST_MONTHLY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS REGISTRY_USAGE_HOURLY_ANALYTICS ( 
-	ID VARCHAR(50),
-	TENANT_ID VARCHAR(50),	
-	HISTORY_USAGE BIGINT,
-	CURRENT_USAGE BIGINT,
-	PRIMARY KEY (ID)
-); 
-
-
-COMMIT;
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/dbscripts/metering_mysql.sql
----------------------------------------------------------------------
diff --git a/products/stratos-manager/dbscripts/metering_mysql.sql b/products/stratos-manager/dbscripts/metering_mysql.sql
deleted file mode 100755
index 755403d..0000000
--- a/products/stratos-manager/dbscripts/metering_mysql.sql
+++ /dev/null
@@ -1,168 +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.
-*/ 
-
--- WSO2 METERING DATABASE SQL FOR MySQL
-
-SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
-
-SET AUTOCOMMIT=0;
-START TRANSACTION;
-
---
--- TABLES
---
-
-CREATE TABLE IF NOT EXISTS USAGE_HOURLY_ANALYTICS (
-        ID VARCHAR(200) NOT NULL,
-        HOUR_FACT TIMESTAMP,
-        SERVER_NAME VARCHAR(100),
-        TENANT_ID VARCHAR(50),
-        PAYLOAD_TYPE VARCHAR(50),
-        PAYLOAD_VALUE  BIGINT,
-        PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS USAGE_DAILY_ANALYTICS (
-        ID VARCHAR(200) NOT NULL,
-        DAY_FACT TIMESTAMP,
-        SERVER_NAME VARCHAR(100),
-        TENANT_ID VARCHAR(50),
-        PAYLOAD_TYPE VARCHAR(50),
-        PAYLOAD_VALUE  BIGINT,
-        PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS USAGE_MONTHLY_ANALYTICS (
-        ID VARCHAR(200) NOT NULL,
-        MONTH_FACT TIMESTAMP,
-        SERVER_NAME VARCHAR(100),
-        TENANT_ID VARCHAR(50),
-        PAYLOAD_TYPE VARCHAR(50),
-        PAYLOAD_VALUE  BIGINT,
-        PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS USAGE_LAST_HOURLY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-	
-CREATE TABLE IF NOT EXISTS USAGE_LAST_DAILY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS USAGE_LAST_MONTHLY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_HOURLY_ANALYTICS (
-	ID VARCHAR(200) NOT NULL,
-	HOUR_FACT TIMESTAMP,
-	SERVER_NAME VARCHAR(100),
-	TENANT_ID VARCHAR(50),
-	REQUEST_COUNT BIGINT,
-	RESPONSE_COUNT BIGINT,
-	FAULT_COUNT BIGINT,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_DAILY_ANALYTICS (
-	ID VARCHAR(200) NOT NULL,
-	DAY_FACT TIMESTAMP,
-	SERVER_NAME VARCHAR(100),
-	TENANT_ID VARCHAR(50),
-	REQUEST_COUNT BIGINT,
-	RESPONSE_COUNT BIGINT,
-	FAULT_COUNT BIGINT,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_MONTHLY_ANALYTICS (
-	ID VARCHAR(200) NOT NULL,
-	MONTH_FACT TIMESTAMP,
-	SERVER_NAME VARCHAR(100),
-	TENANT_ID VARCHAR(50),
-	REQUEST_COUNT BIGINT,
-	RESPONSE_COUNT BIGINT,
-	FAULT_COUNT BIGINT,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_LAST_HOURLY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-	
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_LAST_DAILY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_LAST_MONTHLY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS REGISTRY_USAGE_HOURLY_ANALYTICS ( 
-	ID VARCHAR(50),
-	TENANT_ID VARCHAR(50),	
-	HISTORY_USAGE BIGINT,
-	CURRENT_USAGE BIGINT,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS CARTRIDGE_STATS_HOURLY_ANALYTICS (
-        HOUR_FACT TIMESTAMP,
-        TENANT_ID VARCHAR(50),
-	CARTRIDGE_TYPE VARCHAR(20),
-	IMAGE_ID VARCHAR(100),
-	NODE_ID VARCHAR(100),
-	DURATION_HOURS INT(5),
-        PRIMARY KEY (`NODE_ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS CARTRIDGE_STATS_LAST_HOURLY_TS (
-        ID VARCHAR(200) NOT NULL,
-        TIMESTMP TIMESTAMP,
-        PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS CARTRIDGE_STATS_LAST_DAILY_TS (
-        ID VARCHAR(200) NOT NULL,
-        TIMESTMP TIMESTAMP,
-        PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS CARTRIDGE_STATS_LAST_MONTHLY_TS (
-        ID VARCHAR(200) NOT NULL,
-        TIMESTMP TIMESTAMP,
-        PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
- 
-
-COMMIT;
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/dbscripts/migration.sql
----------------------------------------------------------------------
diff --git a/products/stratos-manager/dbscripts/migration.sql b/products/stratos-manager/dbscripts/migration.sql
deleted file mode 100755
index 421fd1d..0000000
--- a/products/stratos-manager/dbscripts/migration.sql
+++ /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.
-*/ 
-
-ALTER TABLE UM_TENANT ADD UM_CREATED_DATE TIMESTAMP NOT NULL DEFAULT '2010-06-01 00:00:01';  
-ALTER TABLE UM_TENANT ADD UNIQUE INDEX INDEX_UM_TENANT_UM_DOMAIN_NAME (UM_DOMAIN_NAME);
-
-ALTER TABLE REG_ASSOCIATION ADD INDEX REG_ASSOCIATION_INDEX_SOURCEPATH (REG_SOURCEPATH, REG_TENANT_ID);
-ALTER TABLE REG_ASSOCIATION ADD INDEX REG_ASSOCIATION_INDEX_TARGETPATH (REG_TARGETPATH, REG_TENANT_ID);
-ALTER TABLE REG_ASSOCIATION ADD INDEX REG_ASSOCIATION_INDEX_ASSOCIATION_TYPE (REG_ASSOCIATION_TYPE, REG_TENANT_ID); 
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/dbscripts/s2_h2.sql
----------------------------------------------------------------------
diff --git a/products/stratos-manager/dbscripts/s2_h2.sql b/products/stratos-manager/dbscripts/s2_h2.sql
deleted file mode 100644
index d88149d..0000000
--- a/products/stratos-manager/dbscripts/s2_h2.sql
+++ /dev/null
@@ -1,115 +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.
-*/ 
-
---
--- Create schema s2_db
---
-
--- CREATE SCHEMA  IF NOT EXISTS s2_db; 
--- SET SCHEMA s2_db;
-
---
--- Definition of table s2_db.CARTRIDGE_INSTANCE
---
-
-DROP TABLE IF EXISTS CARTRIDGE_INSTANCE;
-CREATE TABLE  CARTRIDGE_INSTANCE (
-  ID int(11) NOT NULL AUTO_INCREMENT,
-  INSTANCE_IP varchar(255) NOT NULL,
-  TENANT_ID int(11) DEFAULT NULL,
-  TENANT_DOMAIN varchar(255) DEFAULT NULL,
-  CARTRIDGE_TYPE varchar(255) NOT NULL,
-  STATE varchar(255) NOT NULL,
-  CLUSTER_DOMAIN varchar(255) NOT NULL,
-  CLUSTER_SUBDOMAIN varchar(255) NOT NULL,
-  PRIMARY KEY (ID)
-);
-
---
--- Definition of table CARTRIDGE_SUBSCRIPTION
---
-
-DROP TABLE IF EXISTS CARTRIDGE_SUBSCRIPTION;
-CREATE TABLE  CARTRIDGE_SUBSCRIPTION (
-  SUBSCRIPTION_ID int(11) NOT NULL AUTO_INCREMENT,
-  TENANT_ID int(11) NOT NULL,
-  CARTRIDGE varchar(30) NOT NULL,
-  PROVIDER varchar(30) NOT NULL,
-  HOSTNAME varchar(255) NOT NULL,
-  POLICY varchar(50) NULL,
-  CLUSTER_DOMAIN varchar(255) NOT NULL,
-  CLUSTER_SUBDOMAIN varchar(255) NOT NULL,
-  MGT_DOMAIN varchar(255) NOT NULL,
-  MGT_SUBDOMAIN varchar(255) NOT NULL,
-  STATE varchar(30) NOT NULL,
-  ALIAS varchar(255) NOT NULL,
-  TENANT_DOMAIN varchar(255) NOT NULL,
-  BASE_DIR varchar(255) NOT NULL,
-  REPO_ID int(11) DEFAULT NULL,
-  DATA_CARTRIDGE_ID int(11) DEFAULT NULL,
-  MAPPED_DOMAIN varchar(255),
-  PRIMARY KEY (SUBSCRIPTION_ID)
-);
-
-
-
---
--- Definition of table DATA_CARTRIDGE
---
-
-DROP TABLE IF EXISTS DATA_CARTRIDGE;
-CREATE TABLE  DATA_CARTRIDGE (
-  DATA_CART_ID int(11) NOT NULL AUTO_INCREMENT,
-  TYPE varchar(30) NOT NULL,
-  USER_NAME varchar(255) NOT NULL,
-  PASSWORD varchar(255) NOT NULL,
-  STATE varchar(255) NOT NULL,
-  PRIMARY KEY (DATA_CART_ID) 
-);
-
-
---
--- Definition of table PORT_MAPPING
---
-
-DROP TABLE IF EXISTS PORT_MAPPING;
-CREATE TABLE  PORT_MAPPING (
-  PORT_MAPPING_ID int(11) NOT NULL AUTO_INCREMENT,
-  SUBSCRIPTION_ID int(11) NOT NULL,
-  TYPE varchar(30) NOT NULL,
-  PRIMARY_PORT varchar(30) NOT NULL,
-  PROXY_PORT varchar(30) NOT NULL,
-  STATE varchar(30) NOT NULL,
-  PRIMARY KEY (PORT_MAPPING_ID)
-);
-
-
---
--- Definition of table REPOSITORY
---
-
-DROP TABLE IF EXISTS REPOSITORY;
-CREATE TABLE  REPOSITORY (
-  REPO_ID int(11) NOT NULL AUTO_INCREMENT,
-  REPO_NAME varchar(255) NOT NULL,
-  STATE varchar(30) NOT NULL,
-  REPO_USER_NAME varchar(255) NOT NULL,
-  REPO_USER_PASSWORD varchar(255) NOT NULL,
-  PRIMARY KEY (REPO_ID)
-);

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/dbscripts/stratos_mysql.sql
----------------------------------------------------------------------
diff --git a/products/stratos-manager/dbscripts/stratos_mysql.sql b/products/stratos-manager/dbscripts/stratos_mysql.sql
deleted file mode 100644
index 9b2393b..0000000
--- a/products/stratos-manager/dbscripts/stratos_mysql.sql
+++ /dev/null
@@ -1,159 +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.
-*/ 
-
--- MySQL Administrator dump 1.4
---
--- ------------------------------------------------------
--- Server version	5.5.24-0ubuntu0.12.04.1
-
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-
-
---
--- Create schema stratos_foundation
---
-
-CREATE DATABASE IF NOT EXISTS stratos_foundation;
-USE stratos_foundation;
-
---
--- Definition of table `stratos_foundation`.`CARTRIDGE_INSTANCE`
---
-
-DROP TABLE IF EXISTS `stratos_foundation`.`CARTRIDGE_INSTANCE`;
-CREATE TABLE  `stratos_foundation`.`CARTRIDGE_INSTANCE` (
-  `ID` int(11) NOT NULL AUTO_INCREMENT,
-  `INSTANCE_IP` varchar(255) NOT NULL,
-  `TENANT_ID` int(11) DEFAULT NULL,
-  `TENANT_DOMAIN` varchar(255) DEFAULT NULL,
-  `CARTRIDGE_TYPE` varchar(255) NOT NULL,
-  `STATE` varchar(255) NOT NULL,
-  `CLUSTER_DOMAIN` varchar(255) NOT NULL,
-  `CLUSTER_SUBDOMAIN` varchar(255) NOT NULL,
-  PRIMARY KEY (`ID`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
-
---
--- Definition of table `stratos_foundation`.`CARTRIDGE_SUBSCRIPTION`
---
-
-DROP TABLE IF EXISTS `stratos_foundation`.`CARTRIDGE_SUBSCRIPTION`;
-CREATE TABLE  `stratos_foundation`.`CARTRIDGE_SUBSCRIPTION` (
-  `SUBSCRIPTION_ID` int(11) NOT NULL AUTO_INCREMENT,
-  `TENANT_ID` int(11) NOT NULL,
-  `CARTRIDGE` varchar(30) NOT NULL,
-  `PROVIDER` varchar(30) NOT NULL,
-  `HOSTNAME` varchar(255) NOT NULL,
-  `POLICY` varchar(50) NULL,
-  `CLUSTER_DOMAIN` varchar(255) NOT NULL,
-  `CLUSTER_SUBDOMAIN` varchar(255) NOT NULL,
-  `MGT_DOMAIN` varchar(255) NOT NULL,
-  `MGT_SUBDOMAIN` varchar(255) NOT NULL,
-  `STATE` varchar(30) NOT NULL,
-  `ALIAS` varchar(255) NOT NULL,
-  `TENANT_DOMAIN` varchar(255) NOT NULL,
-  `BASE_DIR` varchar(255) NULL,
-  `REPO_ID` int(11) DEFAULT NULL,
-  `DATA_CARTRIDGE_ID` int(11) DEFAULT NULL,
-  `MAPPED_DOMAIN` varchar(255),
-  `SUBSCRIPTION_KEY` varchar(255) NOT NULL,
-  PRIMARY KEY (`SUBSCRIPTION_ID`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
-
-
-
---
--- Definition of table `stratos_foundation`.`DATA_CARTRIDGE`
---
-
-DROP TABLE IF EXISTS `stratos_foundation`.`DATA_CARTRIDGE`;
-CREATE TABLE  `stratos_foundation`.`DATA_CARTRIDGE` (
-  `DATA_CART_ID` int(11) NOT NULL AUTO_INCREMENT,
-  `TYPE` varchar(30) NOT NULL,
-  `USER_NAME` varchar(255) NOT NULL,
-  `PASSWORD` varchar(255) NOT NULL,
-  `STATE` varchar(255) NOT NULL,
-  PRIMARY KEY (`DATA_CART_ID`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
-
-
---
--- Definition of table `stratos_foundation`.`PORT_MAPPING`
---
-
-DROP TABLE IF EXISTS `stratos_foundation`.`PORT_MAPPING`;
-CREATE TABLE  `stratos_foundation`.`PORT_MAPPING` (
-  `PORT_MAPPING_ID` int(11) NOT NULL AUTO_INCREMENT,
-  `SUBSCRIPTION_ID` int(11) NOT NULL,
-  `TYPE` varchar(30) NOT NULL,
-  `PRIMARY_PORT` varchar(30) NOT NULL,
-  `PROXY_PORT` varchar(30) NOT NULL,
-  `STATE` varchar(30) NOT NULL,
-  PRIMARY KEY (`PORT_MAPPING_ID`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
-
-
---
--- Definition of table `stratos_foundation`.`REPOSITORY`
---
-
-DROP TABLE IF EXISTS `stratos_foundation`.`REPOSITORY`;
-CREATE TABLE  `stratos_foundation`.`REPOSITORY` (
-  `REPO_ID` int(11) NOT NULL AUTO_INCREMENT,
-  `REPO_NAME` varchar(255) NOT NULL,
-  `STATE` varchar(30) NOT NULL,
-  `REPO_USER_NAME` varchar(255) NOT NULL,
-  `REPO_USER_PASSWORD` varchar(255) NOT NULL,
-  PRIMARY KEY (`REPO_ID`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
-
-
---
--- Definition of table `stratos_foundation`.`SERVICE`
---
-DROP TABLE IF EXISTS `stratos_foundation`.`SERVICE`;
-CREATE TABLE `stratos_foundation`.`SERVICE` (
-    `SERVICE_ID` int NOT NULL AUTO_INCREMENT,
-    `TYPE` varchar(255) NOT NULL,
-    `AUTOSCALING_POLICY` varchar(255) NOT NULL,
-    `DEPLOYMENT_POLICY` varchar(255) NOT NULL,
-    `TENANT_RANGE` varchar(255) NOT NULL,
-    `CLUSTER_ID` varchar(255) NOT NULL,
-    `HOST_NAME` varchar(255) NOT NULL,
-    `SUBSCRIPTION_KEY` varchar(255) NOT NULL,
-    PRIMARY KEY (`SERVICE_ID`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
-
-
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/dbscripts/wso2_rss.sql
----------------------------------------------------------------------
diff --git a/products/stratos-manager/dbscripts/wso2_rss.sql b/products/stratos-manager/dbscripts/wso2_rss.sql
deleted file mode 100755
index 4a2348f..0000000
--- a/products/stratos-manager/dbscripts/wso2_rss.sql
+++ /dev/null
@@ -1,99 +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.
-*/ 
-
-CREATE TABLE RSS_INSTANCE (
-  rss_instance_id INTEGER AUTO_INCREMENT,
-  name VARCHAR(128) NOT NULL,
-  server_url VARCHAR(1024) NOT NULL,
-  dbms_type VARCHAR(128) NOT NULL,
-  instance_type VARCHAR(128) NOT NULL,
-  server_category VARCHAR(128) NOT NULL,
-  admin_username VARCHAR(128),
-  admin_password VARCHAR(128),
-  tenant_id INTEGER NOT NULL,
-  UNIQUE (name, tenant_id),
-  PRIMARY KEY (rss_instance_id)
-) ENGINE="InnoDB";
-
-CREATE TABLE DATABASE_INSTANCE (
-  database_instance_id INTEGER AUTO_INCREMENT,
-  name VARCHAR(128) NOT NULL,
-  rss_instance_id INTEGER,
-  tenant_id INTEGER,
-  UNIQUE (name, rss_instance_id),
-  PRIMARY KEY (database_instance_id),
-  FOREIGN KEY (rss_instance_id) REFERENCES RSS_INSTANCE (rss_instance_id)
-) ENGINE="InnoDB";
-
-CREATE TABLE DATABASE_USER (
-  user_id INTEGER AUTO_INCREMENT,
-  db_username VARCHAR(128) NOT NULL,
-  rss_instance_id INTEGER,
-  user_tenant_id INTEGER,
-  UNIQUE (db_username, rss_instance_id, user_tenant_id),
-  PRIMARY KEY (user_id),
-  FOREIGN KEY (rss_instance_id) REFERENCES RSS_INSTANCE (rss_instance_id)
-) ENGINE="InnoDB";
-
-CREATE TABLE DATABASE_INSTANCE_PROPERTY (
-  db_property_id INTEGER AUTO_INCREMENT,
-  prop_name VARCHAR(128) NOT NULL,
-  prop_value TEXT,
-  database_instance_id INTEGER,
-  UNIQUE (prop_name, database_instance_id),
-  PRIMARY KEY (db_property_id),
-  FOREIGN KEY (database_instance_id) REFERENCES DATABASE_INSTANCE (database_instance_id)
-) ENGINE="InnoDB";
-
-CREATE TABLE USER_DATABASE_ENTRY (
-  user_id INTEGER,
-  database_instance_id INTEGER,
-  PRIMARY KEY (user_id, database_instance_id),
-  FOREIGN KEY (user_id) REFERENCES DATABASE_USER (user_id),
-  FOREIGN KEY (database_instance_id) REFERENCES DATABASE_INSTANCE (database_instance_id)
-) ENGINE="InnoDB";
-
-CREATE TABLE USER_DATABASE_PERMISSION (
-  user_id INTEGER,
-  database_instance_id INTEGER,
-  perm_name VARCHAR(128) NOT NULL,
-  perm_value VARCHAR(128),
-  PRIMARY KEY (user_id, database_instance_id, perm_name),
-  FOREIGN KEY (user_id) REFERENCES DATABASE_USER (user_id),
-  FOREIGN KEY (database_instance_id) REFERENCES DATABASE_INSTANCE (database_instance_id)
-) ENGINE="InnoDB";
-
-CREATE TABLE WSO2_RSS_DATABASE_INSTANCE_COUNT (
-  instance_count INTEGER NOT NULL DEFAULT 0
-) ENGINE="InnoDB";
-
-CREATE TABLE USER_PRIVILEGE_GROUP (
-  priv_group_id INTEGER AUTO_INCREMENT,
-  priv_group_name VARCHAR(128),
-  tenant_id INTEGER,
-  PRIMARY KEY (priv_group_id, priv_group_name, tenant_id)
-) ENGINE="InnoDB";
-
-CREATE TABLE USER_PRIVILEGE_GROUP_ENTRY (
-  priv_group_id INTEGER,
-  perm_name VARCHAR(128),
-  perm_value CHAR(1),
-  PRIMARY KEY (priv_group_id, perm_name),
-  FOREIGN KEY (priv_group_id) REFERENCES USER_PRIVILEGE_GROUP (priv_group_id)
-) ENGINE="InnoDB";

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/cloud-service-mgt/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/cloud-service-mgt/pom.xml b/products/stratos-manager/modules/cloud-service-mgt/pom.xml
deleted file mode 100644
index aa69f7c..0000000
--- a/products/stratos-manager/modules/cloud-service-mgt/pom.xml
+++ /dev/null
@@ -1,98 +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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-	<groupId>org.apache.stratos</groupId>
-	<artifactId>stratos-manager-parent</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apache.stratos.manager.services.mgt</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache Stratos - Cloud Manager Cloud Services Management</name>
-
-    <build>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Private-Package>
-                            org.apache.stratos.manager.services.mgt.*,
-                        </Private-Package>
-                        <Import-Package>
-                            org.wso2.carbon.registry.core.*;version=1.0.1,
-                            !javax.xml.namespace,
-                            javax.xml.namespace; version=0.0.0,
-                            javax.servlet; version=2.4.0,
-                            javax.servlet.http; version=2.4.0,
-                            org.apache.axiom.*; version="${axiom.osgi.version.range}",
-                            *;resolution:=optional
-                        </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-
-    </build>
- <dependencies>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.registry.core</artifactId>
-            <version>${wso2carbon.version}</version>
-        </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.wso2.carbon</groupId>-->
-            <!--<artifactId>org.wso2.carbon.registry.extensions</artifactId>-->
-            <!--<version>${registry-component.version}</version>-->
-        <!--</dependency>-->
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.registry.resource</artifactId>
-            <version>${wso2carbon.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.stratos</groupId>
-            <artifactId>org.apache.stratos.common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.stratos</groupId>
-            <artifactId>org.apache.stratos.tenant.mgt</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-   
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/beans/CloudService.java
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/beans/CloudService.java b/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/beans/CloudService.java
deleted file mode 100644
index 7648280..0000000
--- a/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/beans/CloudService.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.manager.services.mgt.beans;
-
-public class CloudService {
-    private String name;
-    private String label;
-    private String link;
-    private String icon;
-    private String description;
-    private boolean active;
-    private String productPageURL;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    public String getLink() {
-        return link;
-    }
-
-    public void setLink(String link) {
-        this.link = link;
-    }
-
-    public String getIcon() {
-        return icon;
-    }
-
-    public void setIcon(String icon) {
-        this.icon = icon;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public boolean isActive() {
-        return active;
-    }
-
-    public void setActive(boolean active) {
-        this.active = active;
-    }
-
-    public String getProductPageURL() {
-        return productPageURL;
-    }
-
-    public void setProductPageURL(String productPageURL) {
-        this.productPageURL = productPageURL;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/internal/CloudServiceMgtServiceComponent.java
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/internal/CloudServiceMgtServiceComponent.java b/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/internal/CloudServiceMgtServiceComponent.java
deleted file mode 100644
index 770a47d..0000000
--- a/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/internal/CloudServiceMgtServiceComponent.java
+++ /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.
- */
-package org.apache.stratos.manager.services.mgt.internal;
-
-import org.apache.stratos.manager.services.mgt.util.Util;
-import org.wso2.carbon.registry.core.service.RegistryService;
-import org.wso2.carbon.user.core.service.RealmService;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.osgi.service.component.ComponentContext;
-
-/**
- * @scr.component name="org.apache.stratos.manager.services.mgt"
- * immediate="true"
- * @scr.reference name="registry.service"
- * interface="org.wso2.carbon.registry.core.service.RegistryService" cardinality="1..1"
- * policy="dynamic" bind="setRegistryService" unbind="unsetRegistryService"
- * @scr.reference name="user.realmservice.default"
- * interface="org.wso2.carbon.user.core.service.RealmService"
- * cardinality="1..1" policy="dynamic" bind="setRealmService"
- * unbind="unsetRealmService"
- */
-public class CloudServiceMgtServiceComponent {
-    private static Log log = LogFactory.getLog(CloudServiceMgtServiceComponent.class);
-
-    protected void activate(ComponentContext context) {
-        try {
-            Util.loadCloudServicesConfiguration();
-            Util.loadServiceIcons();
-            log.debug("******* Cloud Manager Service Manager bundle is activated ******* ");
-        } catch (Throwable e) {
-            String msg = "******* Cloud Manager Service Manager bundle activation failed. ******* ";
-            log.error(msg, e);
-        }
-    }
-
-    protected void deactivate(ComponentContext context) {
-        log.debug("******* Cloud Manager Service Manager bundle is deactivated ******* ");
-    }
-    protected void setRegistryService(RegistryService registryService) {
-        Util.setRegistryService(registryService);
-    }
-
-    protected void unsetRegistryService(RegistryService registryService) {
-        Util.setRegistryService(null);
-    }
-
-    protected void setRealmService(RealmService realmService) {
-        Util.setRealmService(realmService);
-    }
-
-    protected void unsetRealmService(RealmService realmService) {
-        Util.setRealmService(null);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/services/CloudManagerService.java
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/services/CloudManagerService.java b/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/services/CloudManagerService.java
deleted file mode 100644
index f12a4bb..0000000
--- a/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/services/CloudManagerService.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.manager.services.mgt.services;
-
-import org.wso2.carbon.core.AbstractAdmin;
-import org.wso2.carbon.registry.core.session.UserRegistry;
-import org.apache.stratos.common.config.CloudServiceConfig;
-import org.apache.stratos.common.config.CloudServicesDescConfig;
-import org.apache.stratos.common.constants.StratosConstants;
-import org.apache.stratos.manager.services.mgt.beans.CloudService;
-import org.apache.stratos.manager.services.mgt.util.Util;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class CloudManagerService extends AbstractAdmin {
-    
-    public CloudService[] retrieveCloudServiceInfo() throws Exception {
-        UserRegistry registry = (UserRegistry)getConfigUserRegistry();
-        int tenantId = registry.getTenantId();
-
-        CloudServicesDescConfig cloudServicesDesc = Util.getCloudServicesDescConfig();
-        Map<String, CloudServiceConfig> cloudServiceConfigs =
-                cloudServicesDesc.getCloudServiceConfigs();
-        List<CloudService> cloudServices = new ArrayList<CloudService>();
-        if (cloudServiceConfigs != null) {
-            Set<String> configKeys = cloudServiceConfigs.keySet();
-            for (String configKey : configKeys) {
-                CloudServiceConfig cloudServiceConfig = cloudServiceConfigs.get(configKey);
-                String label = cloudServiceConfig.getLabel();
-                if (label == null) {
-                    // we are only returning display-able services
-                    continue;
-                }
-                CloudService cloudService = new CloudService();
-                String name = cloudServiceConfig.getName();
-                cloudService.setName(name);
-                cloudService.setLabel(label);
-                cloudService.setLink(cloudServiceConfig.getLink());
-                cloudService.setIcon(cloudServiceConfig.getIcon());
-                cloudService.setDescription(cloudServiceConfig.getDescription());
-                cloudService.setProductPageURL(cloudServiceConfig.getProductPageURL());
-                boolean active = Util.isCloudServiceActive(name, tenantId);
-                cloudService.setActive(tenantId == 0 || active);
-
-                cloudServices.add(cloudService);
-            }
-        }
-        return cloudServices.toArray(new CloudService[cloudServices.size()]);
-    }
-
-    public void saveCloudServicesActivity(String[] activeServiceNames) throws Exception {
-        UserRegistry registry = (UserRegistry)getConfigUserRegistry();
-        int tenantId = registry.getTenantId();
-
-        CloudServicesDescConfig cloudServicesDesc = Util.getCloudServicesDescConfig();
-        Map<String, CloudServiceConfig> cloudServiceConfigMap =
-                cloudServicesDesc.getCloudServiceConfigs();
-
-        List<String> activeServiceNamesList = Arrays.asList(activeServiceNames);
-        if (cloudServiceConfigMap != null) {
-            for (String cloudServiceName : cloudServiceConfigMap.keySet()) {
-                if (activeServiceNamesList.contains(cloudServiceName)) {
-                    // this should be made active
-                    if (!Util.isCloudServiceActive(cloudServiceName, tenantId)) {
-                        Util.setCloudServiceActive(true, cloudServiceName, tenantId);
-                    }
-                } else {
-                    // this should be made inactive
-                    if (Util.isCloudServiceActive(cloudServiceName, tenantId)) {
-                        Util.setCloudServiceActive(false, cloudServiceName, tenantId);
-                    }
-
-                }
-            }
-        }
-        Util.setCloudServiceActive(true, StratosConstants.CLOUD_IDENTITY_SERVICE, tenantId);
-        Util.setCloudServiceActive(true, StratosConstants.CLOUD_GOVERNANCE_SERVICE, tenantId);
-    }
-
-    public void activate(String cloudServiceName) throws Exception {
-        UserRegistry registry = (UserRegistry) getConfigUserRegistry();
-        int tenantId = registry.getTenantId();
-        if (!Util.isCloudServiceActive(cloudServiceName, tenantId)) {
-            Util.setCloudServiceActive(true, cloudServiceName, tenantId);
-        }
-    }
-
-    public void deactivate(String cloudServiceName) throws Exception {
-        if (StratosConstants.CLOUD_IDENTITY_SERVICE.equals(cloudServiceName) ||
-            StratosConstants.CLOUD_GOVERNANCE_SERVICE.equals(cloudServiceName)) {
-            // cloud identity and governance services cannot be deactivated..
-            return;
-        }
-        UserRegistry registry = (UserRegistry) getConfigUserRegistry();
-        int tenantId = registry.getTenantId();
-        if (Util.isCloudServiceActive(cloudServiceName, tenantId)) {
-            Util.setCloudServiceActive(false, cloudServiceName, tenantId);
-        }
-    }
-}
-
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/eae721e7/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/util/Constants.java
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/util/Constants.java b/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/util/Constants.java
deleted file mode 100644
index 0f91d7e..0000000
--- a/products/stratos-manager/modules/cloud-service-mgt/src/main/java/org/apache/stratos/manager/services/mgt/util/Constants.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.manager.services.mgt.util;
-
-public class Constants {
-    public static final String CLOUD_SERVICE_INFO_STORE_PATH =
-            "/repository/components/org.apache.stratos/cloud-manager/cloud-services";
-    public static final String CLOUD_SERVICE_ICONS_STORE_PATH =
-            "/repository/components/org.apache.stratos/cloud-manager/" +
-                    "cloud-services-icons";
-
-    public static final String CLOUD_SERVICE_IS_ACTIVE_PROP_KEY = "active";
-}