http://git-wip-us.apache.org/repos/asf/stratos/blob/ee5e9639/components/org.apache.stratos.throttling.manager/src/test/resources/registry.xml
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.throttling.manager/src/test/resources/registry.xml
 
b/components/org.apache.stratos.throttling.manager/src/test/resources/registry.xml
deleted file mode 100644
index f8a374c..0000000
--- 
a/components/org.apache.stratos.throttling.manager/src/test/resources/registry.xml
+++ /dev/null
@@ -1,250 +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.
-  -->
-<wso2registry>
-    <currentDBConfig>h2-db</currentDBConfig>
-    
-    <readOnly>false</readOnly>
-    <enableCache>true</enableCache>
-    <registryRoot>/beep</registryRoot>
-
-    <dbConfig name="derby-embedded-db">
-        <url>jdbc:derby:databasetest/CARBON_TEST;create=true</url>
-        <!--userName>su</userName>
-        <password>su</password-->
-        <driverName>org.apache.derby.jdbc.EmbeddedDriver</driverName>
-        <maxActive>80</maxActive>
-        <maxWait>60000</maxWait>
-        <minIdle>5</minIdle>
-    </dbConfig>
-
-    <dbConfig name="in-memory">
-        <url>jdbc:hsqldb:mem:aname</url>
-        <userName>sa</userName>
-        <password/>
-        <driverName>org.hsqldb.jdbcDriver</driverName>
-    </dbConfig>
-
-    <dbConfig name="sample">
-        <url>jdbc:hsqldb:$basedir$/sample/sample-db;shutdown=true</url>
-        <userName>sa</userName>
-        <password/>
-        <driverName>org.hsqldb.jdbcDriver</driverName>
-    </dbConfig>
-
-    <dbConfig name="derby-db">
-        <url>jdbc:derby://localhost:1527/derbyDB;create=true</url>
-        <userName>userName</userName>
-        <password>password</password>
-        <driverName>org.apache.derby.jdbc.ClientDriver</driverName>
-        <maxActive>80</maxActive>
-        <maxWait>60000</maxWait>
-        <minIdle>5</minIdle>
-    </dbConfig>
-
-    <dbConfig name="mysql-db">
-        <url>jdbc:mysql://localhost:3306/regdb</url>
-        <userName>regadmin</userName>
-        <password>regadmin</password>
-        <driverName>com.mysql.jdbc.Driver</driverName>
-        <maxActive>80</maxActive>
-        <maxWait>60000</maxWait>
-        <minIdle>5</minIdle>
-    </dbConfig>
-
-    <dbConfig name="registry-datasource">
-        <dataSource>dataSourceName</dataSource>
-    </dbConfig>
-
-    <dbConfig name="oracle-db">
-        <url>jdbc:oracle:thin:@hostname:1521:registry</url>
-        <userName>username</userName>
-        <password>password</password>
-        <driverName>oracle.jdbc.driver.OracleDriver</driverName>
-        <maxActive>100</maxActive>
-        <maxWait>60000</maxWait>
-        <minIdle>5</minIdle>
-    </dbConfig>
-
-       <dbConfig name="mssql-db">
-        <url>jdbc:jtds:sqlserver://localhost:1433/registry</url>
-        <userName>registry</userName>
-        <password>registry</password>
-        <driverName>net.sourceforge.jtds.jdbc.Driver</driverName>
-        <maxActive>100</maxActive>
-        <maxWait>60000</maxWait>
-        <minIdle>5</minIdle>
-    </dbConfig>
-
-    <dbConfig name="h2-db">
-        <url>jdbc:h2:target/databasetest/CARBON_TEST</url>
-        <!--userName>sa</userName>
-        <password>sa</password-->
-        <driverName>org.h2.Driver</driverName>
-        <maxActive>80</maxActive>
-        <maxWait>60000</maxWait>
-        <minIdle>5</minIdle>
-    </dbConfig>
-
-    <handler 
class="org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler">
-        <filter 
class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property 
name="mediaType">application/vnd.apache.synapse</property>
-        </filter>
-    </handler>
-
-    <handler 
class="org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler">
-        <filter 
class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property name="mediaType">application/vnd.wso2.esb</property>
-        </filter>
-    </handler>
-
-    <handler 
class="org.wso2.carbon.registry.extensions.handlers.Axis2RepositoryHandler">
-        <filter 
class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property name="mediaType">application/vnd.apache.axis2</property>
-        </filter>
-    </handler>
-
-    <handler 
class="org.wso2.carbon.registry.extensions.handlers.Axis2RepositoryHandler">
-        <filter 
class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property name="mediaType">application/vnd.wso2.wsas</property>
-        </filter>
-    </handler>
-
-    <!--handler 
class="org.wso2.carbon.registry.extensions.handlers.IndexingHandler">
-        <filter 
class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property name="mediaType">text/plain</property>
-        </filter>
-    </handler>
-
-    <handler 
class="org.wso2.carbon.registry.extensions.handlers.XMLIndexingHandler">
-        <filter 
class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property name="mediaType">application/xml</property>
-        </filter>
-    </handler>
-
-    <handler 
class="org.wso2.carbon.registry.extensions.handlers.PDFIndexingHandler">
-        <filter 
class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property name="mediaType">application/pdf</property>
-        </filter>
-    </handler>
-
-    <handler 
class="org.wso2.carbon.registry.extensions.handlers.MSWordIndexingHandler">
-        <filter 
class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property name="mediaType">application/msword</property>
-        </filter>
-    </handler>
-
-    <handler 
class="org.wso2.carbon.registry.extensions.handlers.MSExcelIndexingHandler">
-        <filter 
class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property name="mediaType">application/vnd.ms-excel</property>
-        </filter>
-    </handler>
-
-    <handler 
class="org.wso2.carbon.registry.extensions.handlers.MSPowerpointIndexingHandler">
-        <filter 
class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property name="mediaType">application/vnd.ms-powerpoint</property>
-        </filter>
-    </handler-->
-    
-       <handler 
class="org.wso2.carbon.registry.extensions.handlers.WSDLMediaTypeHandler">
-               <property name="schemaLocationConfiguration" type="xml">
-            <location>/test_schemas/</location>
-           </property>
-               <property name="wsdlLocationConfiguration" type="xml">
-            <location>/test_wsdls/</location>
-           </property>
-               <filter 
class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property name="mediaType">application/wsdl+xml</property>
-        </filter>
-    </handler>
-
-    <handler 
class="org.wso2.carbon.registry.extensions.handlers.ZipWSDLMediaTypeHandler">
-        <property name="wsdlMediaType">application/wsdl+xml</property>
-        <property name="schemaLocationConfiguration" type="xml">
-            <location>/test_schemas/</location>
-        </property>
-        <property name="wsdlLocationConfiguration" type="xml">
-            <location>/test_wsdls/</location>
-        </property>
-        <filter 
class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property 
name="mediaType">application/vnd.wso2.governance-archive</property>
-        </filter>
-    </handler>
-
-    <handler 
class="org.wso2.carbon.registry.extensions.handlers.ServiceMediaTypeHandler">
-      <filter 
class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-       <property name="mediaType">application/vnd.wso2-service+xml</property>
-      </filter>
-    </handler>
-
-    <handler 
class="org.wso2.carbon.registry.extensions.handlers.PolicyMediaTypeHandler">
-       <property name="policyLocationConfiguration" type="xml">
-            <location>/test_policies/</location>
-       </property>
-        <filter 
class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property name="mediaType">application/policy+xml</property>
-        </filter>
-    </handler>
-
-       <handler 
class="org.wso2.carbon.registry.extensions.handlers.XSDMediaTypeHandler">
-        <property name="locationConfiguration" type="xml">
-            <locationType>absolute</locationType>
-            <location>/test_schemas/</location>
-        </property>
-        <filter 
class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property name="mediaType">application/x-xsd+xml</property>
-        </filter>
-    </handler>
-
-    <handler 
class="org.wso2.carbon.registry.extensions.handlers.EndpointMediaTypeHandler">
-        <property 
name="endpointMediaType">application/vnd.wso2.endpoint</property>
-        <property name="endpointLocationConfiguration" type="xml">
-            <location>/test_endpoints/</location>
-        </property>
-        <filter 
class="org.wso2.carbon.registry.extensions.filters.EndpointMediaTypeMatcher">
-        </filter>
-    </handler>
-
-
-    <handler 
class="org.wso2.carbon.registry.extensions.handlers.ExternalLinkHandler">
-        <filter 
class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property 
name="mediaType">application/vnd.wso2-hyperlink</property>
-        </filter>
-    </handler>
-
-       <!--remoteInstance url="https://host:port/registry";>
-       <id>instanceid</id>
-       <username>username</username>
-       <password>password</password>
-    </remoteInstance-->
-
-    <staticConfiguration>
-        <versioningProperties>true</versioningProperties>
-        <versioningComments>true</versioningComments>
-        <versioningTags>true</versioningTags>
-        <versioningRatings>true</versioningRatings>
-        <!-- Location you want to add service and default location will be 
/governance/services/ -->
-        <servicePath>/test_services</servicePath>
-    </staticConfiguration>
-               
-
-    <versionResourcesOnChange>true</versionResourcesOnChange>
-
-</wso2registry>

http://git-wip-us.apache.org/repos/asf/stratos/blob/ee5e9639/components/org.apache.stratos.throttling.manager/src/test/resources/user-test/adv-jdbc-readonly-test.xml
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.throttling.manager/src/test/resources/user-test/adv-jdbc-readonly-test.xml
 
b/components/org.apache.stratos.throttling.manager/src/test/resources/user-test/adv-jdbc-readonly-test.xml
deleted file mode 100644
index e8e4ebd..0000000
--- 
a/components/org.apache.stratos.throttling.manager/src/test/resources/user-test/adv-jdbc-readonly-test.xml
+++ /dev/null
@@ -1,60 +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>adminx</AdminRole>
-            <AdminUser>
-                <UserName>adminx</UserName>
-                <Password>adminy</Password>
-            </AdminUser>
-            <EveryOneRoleName>everyonex</EveryOneRoleName>
-            <ReadOnly>true</ReadOnly>
-           <MaxUserNameListLength>500</MaxUserNameListLength>
-            <Property 
name="url">jdbc:h2:target/advjdbcrotest/CARBON_TEST</Property>
-            <Property name="driverName">org.h2.Driver</Property>
-            <Property name="maxActive">50</Property>
-            <Property name="maxWait">60000</Property>
-            <Property name="minIdle">5</Property>
-        </Configuration>
-        <UserStoreManager
-            class="org.wso2.carbon.user.core.jdbc.JDBCUserStoreManager">
-             <Property 
name="url">jdbc:h2:target/advjdbcrotest/CARBON_TEST</Property>
-            <Property name="driverName">org.h2.Driver</Property>
-            <Property name="maxActive">50</Property>
-            <Property name="maxWait">60000</Property>
-            <Property name="minIdle">5</Property>
-            <Property name="PasswordDigest">MD5</Property>
-            <Property name="GetPasswordSQL">SELECT * FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?</Property>
-            <Property name="GetRoleListSQL">SELECT UM_ROLE_NAME FROM UM_ROLE 
WHERE UM_TENANT_ID=?</Property>
-            <Property name="UserFilterSQL">SELECT UM_USER_NAME FROM UM_USER 
WHERE UM_USER_NAME LIKE ? AND UM_TENANT_ID=? ORDER BY UM_USER_NAME</Property>
-            <Property name="UserRoleSQL">SELECT UM_ROLE_NAME FROM 
UM_USER_ROLE, UM_ROLE, UM_USER WHERE UM_USER.UM_USER_NAME=? AND 
UM_USER.UM_ID=UM_USER_ROLE.UM_USER_ID AND UM_ROLE.UM_ID=UM_USER_ROLE.UM_ROLE_ID 
AND UM_USER_ROLE.UM_TENANT_ID=? AND UM_ROLE.UM_TENANT_ID=? AND 
UM_USER.UM_TENANT_ID=?</Property>
-            <Property name="IsRoleExistingSQL">SELECT UM_ID FROM UM_ROLE WHERE 
UM_ROLE_NAME=? AND UM_TENANT_ID=?</Property>
-            <Property name="IsUserExistingSQL">SELECT UM_ID FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?</Property>
-            <Property name="GetUserListOfRoleSQL">SELECT UM_USER_NAME FROM 
UM_USER_ROLE, UM_ROLE, UM_USER WHERE UM_ROLE.UM_ROLE_NAME=? AND 
UM_USER.UM_ID=UM_USER_ROLE.UM_USER_ID AND UM_ROLE.UM_ID=UM_USER_ROLE.UM_ROLE_ID 
AND UM_USER_ROLE.UM_TENANT_ID=? AND UM_ROLE.UM_TENANT_ID=? AND 
UM_USER.UM_TENANT_ID=?</Property>
-            <Property name="GetUserPropertyForProfileSQL">SELECT UM_ATTR_VALUE 
FROM UM_USER_ATTRIBUTE, UM_USER WHERE UM_USER.UM_ID = 
UM_USER_ATTRIBUTE.UM_USER_ID AND UM_USER.UM_USER_NAME=? AND UM_ATTR_NAME=? AND 
UM_PROFILE_ID=? AND UM_USER_ATTRIBUTE.UM_TENANT_ID=? AND 
UM_USER.UM_TENANT_ID=?</Property>
-            <Property name="GetUserPropertiesForProfileSQL">SELECT 
UM_ATTR_NAME, UM_ATTR_VALUE FROM UM_USER_ATTRIBUTE, UM_USER WHERE UM_USER.UM_ID 
= UM_USER_ATTRIBUTE.UM_USER_ID AND UM_USER.UM_USER_NAME=? AND UM_PROFILE_ID=? 
AND UM_USER_ATTRIBUTE.UM_TENANT_ID=? AND UM_USER.UM_TENANT_ID=?</Property>
-            <Property name="GetProfileNamesSQL">SELECT DISTINCT UM_PROFILE_ID 
FROM UM_USER_ATTRIBUTE WHERE UM_TENANT_ID=?</Property>
-            <Property name="PasswordDigest">MD5</Property>           
-        </UserStoreManager>
-        <AuthorizationManager
-            
class="org.wso2.carbon.user.core.authorization.JDBCAuthorizationManager"></AuthorizationManager>
-    </Realm>
-</UserManager>
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/ee5e9639/components/org.apache.stratos.throttling.manager/src/test/resources/user-test/jdbc-readonly-test.xml
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.throttling.manager/src/test/resources/user-test/jdbc-readonly-test.xml
 
b/components/org.apache.stratos.throttling.manager/src/test/resources/user-test/jdbc-readonly-test.xml
deleted file mode 100644
index d2f931c..0000000
--- 
a/components/org.apache.stratos.throttling.manager/src/test/resources/user-test/jdbc-readonly-test.xml
+++ /dev/null
@@ -1,60 +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>adminx</AdminRole>
-            <AdminUser>
-                <UserName>adminx</UserName>
-                <Password>adminy</Password>
-            </AdminUser>
-            <SystemUserName>system</SystemUserName>
-            <EveryOneRoleName>everyonex</EveryOneRoleName>
-            <ReadOnly>true</ReadOnly>
-            <MaxUserNameListLength>500</MaxUserNameListLength>
-            <Property 
name="url">jdbc:h2:target/ReadOnlyTest/CARBON_TEST</Property>
-            <Property name="driverName">org.h2.Driver</Property>
-            <Property name="maxActive">50</Property>
-            <Property name="maxWait">60000</Property>
-            <Property name="minIdle">5</Property>
-        </Configuration>
-        <UserStoreManager
-            class="org.wso2.carbon.user.core.jdbc.JDBCUserStoreManager">
-            <Property 
name="url">jdbc:h2:target/ReadOnlyTest/CARBON_TEST</Property>
-            <Property name="driverName">org.h2.Driver</Property>
-            <Property name="maxActive">50</Property>
-            <Property name="maxWait">60000</Property>
-            <Property name="minIdle">5</Property>
-            <Property name="PasswordDigest">MD5</Property>
-            <Property name="GetPasswordSQL">SELECT * FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?</Property>
-            <Property name="GetRoleListSQL">SELECT UM_ROLE_NAME FROM UM_ROLE 
WHERE UM_TENANT_ID=?</Property>
-            <Property name="UserFilterSQL">SELECT UM_USER_NAME FROM UM_USER 
WHERE UM_USER_NAME LIKE ? AND UM_TENANT_ID=? ORDER BY UM_USER_NAME</Property>
-            <Property name="UserRoleSQL">SELECT UM_ROLE_NAME FROM 
UM_USER_ROLE, UM_ROLE, UM_USER WHERE UM_USER.UM_USER_NAME=? AND 
UM_USER.UM_ID=UM_USER_ROLE.UM_USER_ID AND UM_ROLE.UM_ID=UM_USER_ROLE.UM_ROLE_ID 
AND UM_USER_ROLE.UM_TENANT_ID=? AND UM_ROLE.UM_TENANT_ID=? AND 
UM_USER.UM_TENANT_ID=?</Property>
-            <Property name="IsRoleExistingSQL">SELECT UM_ID FROM UM_ROLE WHERE 
UM_ROLE_NAME=? AND UM_TENANT_ID=?</Property>
-            <Property name="IsUserExistingSQL">SELECT UM_ID FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?</Property>
-            <Property name="GetUserListOfRoleSQL">SELECT UM_USER_NAME FROM 
UM_USER_ROLE, UM_ROLE, UM_USER WHERE UM_ROLE.UM_ROLE_NAME=? AND 
UM_USER.UM_ID=UM_USER_ROLE.UM_USER_ID AND UM_ROLE.UM_ID=UM_USER_ROLE.UM_ROLE_ID 
AND UM_USER_ROLE.UM_TENANT_ID=? AND UM_ROLE.UM_TENANT_ID=? AND 
UM_USER.UM_TENANT_ID=?</Property>
-            <Property name="GetUserPropertyForProfileSQL">SELECT UM_ATTR_VALUE 
FROM UM_USER_ATTRIBUTE, UM_USER WHERE UM_USER.UM_ID = 
UM_USER_ATTRIBUTE.UM_USER_ID AND UM_USER.UM_USER_NAME=? AND UM_ATTR_NAME=? AND 
UM_PROFILE_ID=? AND UM_USER_ATTRIBUTE.UM_TENANT_ID=? AND 
UM_USER.UM_TENANT_ID=?</Property>
-            <Property name="GetUserPropertiesForProfileSQL">SELECT 
UM_ATTR_NAME, UM_ATTR_VALUE FROM UM_USER_ATTRIBUTE, UM_USER WHERE UM_USER.UM_ID 
= UM_USER_ATTRIBUTE.UM_USER_ID AND UM_USER.UM_USER_NAME=? AND UM_PROFILE_ID=? 
AND UM_USER_ATTRIBUTE.UM_TENANT_ID=? AND UM_USER.UM_TENANT_ID=?</Property>
-            <Property name="GetProfileNamesSQL">SELECT DISTINCT UM_PROFILE_ID 
FROM UM_USER_ATTRIBUTE WHERE UM_TENANT_ID=?</Property>
-            <Property name="PasswordDigest">SHA-256</Property>           
-        </UserStoreManager>
-        <AuthorizationManager
-            
class="org.wso2.carbon.user.core.authorization.JDBCAuthorizationManager"></AuthorizationManager>
-    </Realm>
-</UserManager>

http://git-wip-us.apache.org/repos/asf/stratos/blob/ee5e9639/components/org.apache.stratos.throttling.manager/src/test/resources/user-test/user-mgt-registry-test.xml
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.throttling.manager/src/test/resources/user-test/user-mgt-registry-test.xml
 
b/components/org.apache.stratos.throttling.manager/src/test/resources/user-test/user-mgt-registry-test.xml
deleted file mode 100644
index 57f1973..0000000
--- 
a/components/org.apache.stratos.throttling.manager/src/test/resources/user-test/user-mgt-registry-test.xml
+++ /dev/null
@@ -1,95 +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>
-            <ReadOnly>false</ReadOnly>
-            <MaxUserNameListLength>500</MaxUserNameListLength>
-                       <Property 
name="url">jdbc:h2:target/databasetest/CARBON_TEST</Property>
-                       <Property name="driverName">org.h2.Driver</Property>
-                       <Property name="maxActive">50</Property>
-                       <Property name="maxWait">60000</Property>
-                       <Property name="minIdle">5</Property>
-        </Configuration>
-        <UserStoreManager
-            class="org.wso2.carbon.user.core.jdbc.JDBCUserStoreManager">
-            <Property name="PasswordJavaRegEx">[\S]{5,30}$</Property>
-            <Property name="PasswordJavaScriptRegEx">[\\S]{5,30}</Property>
-            <Property name="SelectUserSQL">SELECT * FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?</Property>
-            <Property name="GetRoleListSQL">SELECT UM_ROLE_NAME FROM UM_ROLE 
WHERE UM_TENANT_ID=?</Property>
-            <Property name="UserFilterSQL">SELECT UM_USER_NAME FROM UM_USER 
WHERE UM_USER_NAME LIKE ? AND UM_TENANT_ID=? ORDER BY UM_USER_NAME</Property>
-            <Property name="UserRoleSQL">SELECT UM_ROLE_NAME FROM 
UM_USER_ROLE, UM_ROLE, UM_USER WHERE UM_USER.UM_USER_NAME=? AND 
UM_USER.UM_ID=UM_USER_ROLE.UM_USER_ID AND UM_ROLE.UM_ID=UM_USER_ROLE.UM_ROLE_ID 
AND UM_USER_ROLE.UM_TENANT_ID=? AND UM_ROLE.UM_TENANT_ID=? AND 
UM_USER.UM_TENANT_ID=?</Property>
-            <Property name="IsRoleExistingSQL">SELECT UM_ID FROM UM_ROLE WHERE 
UM_ROLE_NAME=? AND UM_TENANT_ID=?</Property>
-            <Property name="IsUserExistingSQL">SELECT UM_ID FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?</Property>
-            <Property name="GetUserListOfRoleSQL">SELECT UM_USER_NAME FROM 
UM_USER_ROLE, UM_ROLE, UM_USER WHERE UM_ROLE.UM_ROLE_NAME=? AND 
UM_USER.UM_ID=UM_USER_ROLE.UM_USER_ID AND UM_ROLE.UM_ID=UM_USER_ROLE.UM_ROLE_ID 
AND UM_USER_ROLE.UM_TENANT_ID=? AND UM_ROLE.UM_TENANT_ID=? AND 
UM_USER.UM_TENANT_ID=?</Property>
-            <Property name="GetUserPropertyForProfileSQL">SELECT UM_ATTR_VALUE 
FROM UM_USER_ATTRIBUTE, UM_USER WHERE UM_USER.UM_ID = 
UM_USER_ATTRIBUTE.UM_USER_ID AND UM_USER.UM_USER_NAME=? AND UM_ATTR_NAME=? AND 
UM_PROFILE_ID=? AND UM_USER_ATTRIBUTE.UM_TENANT_ID=? AND 
UM_USER.UM_TENANT_ID=?</Property>
-            <Property name="GetUserPropertiesForProfileSQL">SELECT 
UM_ATTR_NAME, UM_ATTR_VALUE FROM UM_USER_ATTRIBUTE, UM_USER WHERE UM_USER.UM_ID 
= UM_USER_ATTRIBUTE.UM_USER_ID AND UM_USER.UM_USER_NAME=? AND UM_PROFILE_ID=? 
AND UM_USER_ATTRIBUTE.UM_TENANT_ID=? AND UM_USER.UM_TENANT_ID=?</Property>
-            <Property name="GetProfileNamesSQL">SELECT DISTINCT UM_PROFILE_ID 
FROM UM_USER_ATTRIBUTE WHERE UM_TENANT_ID=?</Property>
-            <Property name="GetUserProfileNamesSQL">SELECT DISTINCT 
UM_PROFILE_ID FROM UM_USER_ATTRIBUTE WHERE UM_USER_ID=(SELECT UM_ID FROM 
UM_USER WHERE UM_USER_NAME=? AND UM_TENANT_ID=?) AND UM_TENANT_ID=?</Property>
-            <Property name="GetUsersWithDefaultPasswordsSQL">SELECT 
UM_USER_NAME FROM UM_USER WHERE WHERE UM_USER_NAME=? AND 
UM_TENANT_ID=?</Property>
-            <Property name="UserNameUniqueAcrossTenantsSQL">SELECT UM_ID FROM 
UM_USER WHERE UM_USER_NAME=?</Property>
-            <Property name="GetUserIDFromUserNameSQL">SELECT UM_ID FROM 
UM_USER WHERE UM_USER_NAME=? AND UM_TENANT_ID=?</Property>
-            <Property name="GetTenantIDFromUserNameSQL">SELECT UM_TENANT_ID 
FROM UM_USER WHERE UM_USER_NAME=?</Property>
-            <Property name="PasswordDigest">SHA-256</Property>
-            <Property name="StoreSaltedPassword">true</Property>
-            <Property name="UserNameUniqueAcrossTenants">false</Property>
-            <Property name="IsEmailUserName">false</Property>
-            <Property name="SuperDomain">wso2.com</Property>
-            <Property name="IsUsersOfRoleListing">true</Property>
-            <!-- writing sqls follow-->
-            <Property name="AddUserSQL">INSERT INTO UM_USER (UM_USER_NAME, 
UM_USER_PASSWORD, UM_SALT_VALUE, UM_REQUIRE_CHANGE, UM_CHANGED_TIME, 
UM_TENANT_ID) VALUES (?, ?, ?, ?, ?, ?)</Property>
-            <Property name="AddRoleSQL">INSERT INTO UM_ROLE (UM_ROLE_NAME, 
UM_TENANT_ID) VALUES (?, ?)</Property>
-            <Property name="AddUserToRoleSQL">INSERT INTO UM_USER_ROLE 
(UM_USER_ID, UM_ROLE_ID, UM_TENANT_ID) VALUES ((SELECT UM_ID FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?),(SELECT UM_ID FROM UM_ROLE WHERE 
UM_ROLE_NAME=? AND UM_TENANT_ID=?), ?)</Property>
-            <Property name="AddUserToRoleSQL-mssql">INSERT INTO UM_USER_ROLE 
(UM_USER_ID, UM_ROLE_ID, UM_TENANT_ID) SELECT (SELECT UM_ID FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?),(SELECT UM_ID FROM UM_ROLE WHERE 
UM_ROLE_NAME=? AND UM_TENANT_ID=?),(?)</Property>
-            <Property name="RemoveUserFromRoleSQL">DELETE FROM UM_USER_ROLE 
WHERE UM_USER_ID=(SELECT UM_ID FROM UM_USER WHERE UM_USER_NAME=? AND 
UM_TENANT_ID=?) AND UM_ROLE_ID=(SELECT UM_ID FROM UM_ROLE WHERE UM_ROLE_NAME=? 
AND UM_TENANT_ID=?) AND UM_TENANT_ID=?</Property>
-            <Property name="AddRoleToUserSQL">INSERT INTO UM_USER_ROLE 
(UM_ROLE_ID, UM_USER_ID, UM_TENANT_ID) VALUES ((SELECT UM_ID FROM UM_ROLE WHERE 
UM_ROLE_NAME=? AND UM_TENANT_ID=?),(SELECT UM_ID FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?), ?)</Property>
-            <Property name="AddRoleToUserSQL-mssql">INSERT INTO UM_USER_ROLE 
(UM_ROLE_ID, UM_USER_ID, UM_TENANT_ID) SELECT (SELECT UM_ID FROM UM_ROLE WHERE 
UM_ROLE_NAME=? AND UM_TENANT_ID=?),(SELECT UM_ID FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?), (?)</Property>
-            <Property name="RemoveRoleFromUserSQL">DELETE FROM UM_USER_ROLE 
WHERE UM_ROLE_ID=(SELECT UM_ID FROM UM_ROLE WHERE UM_ROLE_NAME=? AND 
UM_TENANT_ID=?) AND UM_USER_ID=(SELECT UM_ID FROM UM_USER WHERE UM_USER_NAME=? 
AND UM_TENANT_ID=?) AND UM_TENANT_ID=?</Property>
-            <Property name="DeleteRoleSQL">DELETE FROM UM_ROLE WHERE 
UM_ROLE_NAME = ? AND UM_TENANT_ID=?</Property>
-            <Property name="OnDeleteRoleRemoveUserRoleMappingSQL">DELETE FROM 
UM_USER_ROLE WHERE UM_ROLE_ID=(SELECT UM_ID FROM UM_ROLE WHERE UM_ROLE_NAME=? 
AND UM_TENANT_ID=?) AND UM_TENANT_ID=?</Property>
-            <Property name="OnDeleteUserRemoveUserRoleMappingSQL">DELETE FROM 
UM_USER_ROLE WHERE UM_USER_ID=(SELECT UM_ID FROM UM_USER WHERE UM_USER_NAME=? 
AND UM_TENANT_ID=?) AND UM_TENANT_ID=?</Property>
-            <Property name="OnDeleteUserRemoveUserAttributeSQL">DELETE FROM 
UM_USER_ATTRIBUTE WHERE UM_USER_ID=(SELECT UM_ID FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?) AND UM_TENANT_ID=?</Property>
-            <Property name="DeleteUserSQL">DELETE FROM UM_USER WHERE 
UM_USER_NAME = ? AND UM_TENANT_ID=?</Property>
-            <Property name="UpdateUserPasswordSQL">UPDATE UM_USER SET 
UM_USER_PASSWORD= ?, UM_SALT_VALUE=?, UM_REQUIRE_CHANGE=?, UM_CHANGED_TIME=? 
WHERE UM_USER_NAME= ? AND UM_TENANT_ID=?</Property>
-            <Property name="AddUserPropertySQL">INSERT INTO UM_USER_ATTRIBUTE 
(UM_USER_ID, UM_ATTR_NAME, UM_ATTR_VALUE, UM_PROFILE_ID, UM_TENANT_ID) VALUES 
((SELECT UM_ID FROM UM_USER WHERE UM_USER_NAME=? AND UM_TENANT_ID=?), ?, ?, ?, 
?)</Property>
-            <Property name="AddUserPropertySQL-mssql">INSERT INTO 
UM_USER_ATTRIBUTE (UM_USER_ID, UM_ATTR_NAME, UM_ATTR_VALUE, UM_PROFILE_ID, 
UM_TENANT_ID) SELECT (SELECT UM_ID FROM UM_USER WHERE UM_USER_NAME=? AND 
UM_TENANT_ID=?), (?), (?), (?), (?)</Property>
-            <Property name="UpdateUserPropertySQL">UPDATE UM_USER_ATTRIBUTE 
SET UM_ATTR_VALUE=? WHERE UM_USER_ID=(SELECT UM_ID FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?) AND UM_ATTR_NAME=? AND UM_PROFILE_ID=? AND 
UM_TENANT_ID=?</Property>
-            <Property name="DeleteUserPropertySQL">DELETE FROM 
UM_USER_ATTRIBUTE WHERE UM_USER_ID=(SELECT UM_ID FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?) AND UM_ATTR_NAME=? AND UM_PROFILE_ID=? AND 
UM_TENANT_ID=?</Property>
-        </UserStoreManager>
-        <AuthorizationManager
-            
class="org.wso2.carbon.user.core.authorization.JDBCAuthorizationManager"></AuthorizationManager>
-    </Realm>
-    <SystemPermission>
-        <Permission>login</Permission>
-        <Permission>manage-configuration</Permission>
-        <Permission>manage-security</Permission>
-        <Permission>upload-services</Permission>
-        <Permission>manage-services</Permission>
-        <Permission>manage-lc-configuration</Permission>
-        <Permission>manage-mediation</Permission>
-        <Permission>monitor-system</Permission>
-        <Permission>delegate-identity</Permission>
-    </SystemPermission>
-</UserManager>

http://git-wip-us.apache.org/repos/asf/stratos/blob/ee5e9639/components/org.apache.stratos.throttling.manager/src/test/resources/user-test/user-mgt-test.xml
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.throttling.manager/src/test/resources/user-test/user-mgt-test.xml
 
b/components/org.apache.stratos.throttling.manager/src/test/resources/user-test/user-mgt-test.xml
deleted file mode 100644
index 3663a7f..0000000
--- 
a/components/org.apache.stratos.throttling.manager/src/test/resources/user-test/user-mgt-test.xml
+++ /dev/null
@@ -1,96 +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>
-            <ReadOnly>false</ReadOnly>
-            <MaxUserNameListLength>500</MaxUserNameListLength>
-                       <!-- Property name="url"> Different test cases must 
have different urls. 
-                       Because creating the database in same directory while 
running TestCase after another gives errors in some architectures</Property-->
-                       <Property name="driverName">org.h2.Driver</Property>
-                       <Property name="maxActive">50</Property>
-                       <Property name="maxWait">60000</Property>
-                       <Property name="minIdle">5</Property>
-        </Configuration>
-        <UserStoreManager
-            class="org.wso2.carbon.user.core.jdbc.JDBCUserStoreManager">
-            <Property name="PasswordJavaRegEx">[\S]{5,30}$</Property>
-            <Property name="PasswordJavaScriptRegEx">[\\S]{5,30}</Property>
-            <Property name="SelectUserSQL">SELECT * FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?</Property>
-            <Property name="GetRoleListSQL">SELECT UM_ROLE_NAME FROM UM_ROLE 
WHERE UM_TENANT_ID=?</Property>
-            <Property name="UserFilterSQL">SELECT UM_USER_NAME FROM UM_USER 
WHERE UM_USER_NAME LIKE ? AND UM_TENANT_ID=? ORDER BY UM_USER_NAME</Property>
-            <Property name="UserRoleSQL">SELECT UM_ROLE_NAME FROM 
UM_USER_ROLE, UM_ROLE, UM_USER WHERE UM_USER.UM_USER_NAME=? AND 
UM_USER.UM_ID=UM_USER_ROLE.UM_USER_ID AND UM_ROLE.UM_ID=UM_USER_ROLE.UM_ROLE_ID 
AND UM_USER_ROLE.UM_TENANT_ID=? AND UM_ROLE.UM_TENANT_ID=? AND 
UM_USER.UM_TENANT_ID=?</Property>
-            <Property name="IsRoleExistingSQL">SELECT UM_ID FROM UM_ROLE WHERE 
UM_ROLE_NAME=? AND UM_TENANT_ID=?</Property>
-            <Property name="IsUserExistingSQL">SELECT UM_ID FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?</Property>
-            <Property name="GetUserListOfRoleSQL">SELECT UM_USER_NAME FROM 
UM_USER_ROLE, UM_ROLE, UM_USER WHERE UM_ROLE.UM_ROLE_NAME=? AND 
UM_USER.UM_ID=UM_USER_ROLE.UM_USER_ID AND UM_ROLE.UM_ID=UM_USER_ROLE.UM_ROLE_ID 
AND UM_USER_ROLE.UM_TENANT_ID=? AND UM_ROLE.UM_TENANT_ID=? AND 
UM_USER.UM_TENANT_ID=?</Property>
-            <Property name="GetUserPropertyForProfileSQL">SELECT UM_ATTR_VALUE 
FROM UM_USER_ATTRIBUTE, UM_USER WHERE UM_USER.UM_ID = 
UM_USER_ATTRIBUTE.UM_USER_ID AND UM_USER.UM_USER_NAME=? AND UM_ATTR_NAME=? AND 
UM_PROFILE_ID=? AND UM_USER_ATTRIBUTE.UM_TENANT_ID=? AND 
UM_USER.UM_TENANT_ID=?</Property>
-            <Property name="GetUserPropertiesForProfileSQL">SELECT 
UM_ATTR_NAME, UM_ATTR_VALUE FROM UM_USER_ATTRIBUTE, UM_USER WHERE UM_USER.UM_ID 
= UM_USER_ATTRIBUTE.UM_USER_ID AND UM_USER.UM_USER_NAME=? AND UM_PROFILE_ID=? 
AND UM_USER_ATTRIBUTE.UM_TENANT_ID=? AND UM_USER.UM_TENANT_ID=?</Property>
-            <Property name="GetProfileNamesSQL">SELECT DISTINCT UM_PROFILE_ID 
FROM UM_USER_ATTRIBUTE WHERE UM_TENANT_ID=?</Property>
-            <Property name="GetUserProfileNamesSQL">SELECT DISTINCT 
UM_PROFILE_ID FROM UM_USER_ATTRIBUTE WHERE UM_USER_ID=(SELECT UM_ID FROM 
UM_USER WHERE UM_USER_NAME=? AND UM_TENANT_ID=?) AND UM_TENANT_ID=?</Property>
-            <Property name="GetUsersWithDefaultPasswordsSQL">SELECT 
UM_USER_NAME FROM UM_USER WHERE WHERE UM_USER_NAME=? AND 
UM_TENANT_ID=?</Property>
-            <Property name="UserNameUniqueAcrossTenantsSQL">SELECT UM_ID FROM 
UM_USER WHERE UM_USER_NAME=?</Property>
-            <Property name="GetUserIDFromUserNameSQL">SELECT UM_ID FROM 
UM_USER WHERE UM_USER_NAME=? AND UM_TENANT_ID=?</Property>
-            <Property name="GetTenantIDFromUserNameSQL">SELECT UM_TENANT_ID 
FROM UM_USER WHERE UM_USER_NAME=?</Property>
-            <Property name="PasswordDigest">SHA-256</Property>
-            <Property name="StoreSaltedPassword">true</Property>
-            <Property name="UserNameUniqueAcrossTenants">false</Property>
-            <Property name="IsEmailUserName">false</Property>
-            <Property name="SuperDomain">wso2.com</Property>
-            <Property name="IsUsersOfRoleListing">true</Property>
-            <!-- writing sqls follow-->
-            <Property name="AddUserSQL">INSERT INTO UM_USER (UM_USER_NAME, 
UM_USER_PASSWORD, UM_SALT_VALUE, UM_REQUIRE_CHANGE, UM_CHANGED_TIME, 
UM_TENANT_ID) VALUES (?, ?, ?, ?, ?, ?)</Property>
-            <Property name="AddRoleSQL">INSERT INTO UM_ROLE (UM_ROLE_NAME, 
UM_TENANT_ID) VALUES (?, ?)</Property>
-            <Property name="AddUserToRoleSQL">INSERT INTO UM_USER_ROLE 
(UM_USER_ID, UM_ROLE_ID, UM_TENANT_ID) VALUES ((SELECT UM_ID FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?),(SELECT UM_ID FROM UM_ROLE WHERE 
UM_ROLE_NAME=? AND UM_TENANT_ID=?), ?)</Property>
-            <Property name="AddUserToRoleSQL-mssql">INSERT INTO UM_USER_ROLE 
(UM_USER_ID, UM_ROLE_ID, UM_TENANT_ID) SELECT (SELECT UM_ID FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?),(SELECT UM_ID FROM UM_ROLE WHERE 
UM_ROLE_NAME=? AND UM_TENANT_ID=?),(?)</Property>
-            <Property name="RemoveUserFromRoleSQL">DELETE FROM UM_USER_ROLE 
WHERE UM_USER_ID=(SELECT UM_ID FROM UM_USER WHERE UM_USER_NAME=? AND 
UM_TENANT_ID=?) AND UM_ROLE_ID=(SELECT UM_ID FROM UM_ROLE WHERE UM_ROLE_NAME=? 
AND UM_TENANT_ID=?) AND UM_TENANT_ID=?</Property>
-            <Property name="AddRoleToUserSQL">INSERT INTO UM_USER_ROLE 
(UM_ROLE_ID, UM_USER_ID, UM_TENANT_ID) VALUES ((SELECT UM_ID FROM UM_ROLE WHERE 
UM_ROLE_NAME=? AND UM_TENANT_ID=?),(SELECT UM_ID FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?), ?)</Property>
-            <Property name="AddRoleToUserSQL-mssql">INSERT INTO UM_USER_ROLE 
(UM_ROLE_ID, UM_USER_ID, UM_TENANT_ID) SELECT (SELECT UM_ID FROM UM_ROLE WHERE 
UM_ROLE_NAME=? AND UM_TENANT_ID=?),(SELECT UM_ID FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?), (?)</Property>
-            <Property name="RemoveRoleFromUserSQL">DELETE FROM UM_USER_ROLE 
WHERE UM_ROLE_ID=(SELECT UM_ID FROM UM_ROLE WHERE UM_ROLE_NAME=? AND 
UM_TENANT_ID=?) AND UM_USER_ID=(SELECT UM_ID FROM UM_USER WHERE UM_USER_NAME=? 
AND UM_TENANT_ID=?) AND UM_TENANT_ID=?</Property>
-            <Property name="DeleteRoleSQL">DELETE FROM UM_ROLE WHERE 
UM_ROLE_NAME = ? AND UM_TENANT_ID=?</Property>
-            <Property name="OnDeleteRoleRemoveUserRoleMappingSQL">DELETE FROM 
UM_USER_ROLE WHERE UM_ROLE_ID=(SELECT UM_ID FROM UM_ROLE WHERE UM_ROLE_NAME=? 
AND UM_TENANT_ID=?) AND UM_TENANT_ID=?</Property>
-            <Property name="OnDeleteUserRemoveUserRoleMappingSQL">DELETE FROM 
UM_USER_ROLE WHERE UM_USER_ID=(SELECT UM_ID FROM UM_USER WHERE UM_USER_NAME=? 
AND UM_TENANT_ID=?) AND UM_TENANT_ID=?</Property>
-            <Property name="OnDeleteUserRemoveUserAttributeSQL">DELETE FROM 
UM_USER_ATTRIBUTE WHERE UM_USER_ID=(SELECT UM_ID FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?) AND UM_TENANT_ID=?</Property>
-            <Property name="DeleteUserSQL">DELETE FROM UM_USER WHERE 
UM_USER_NAME = ? AND UM_TENANT_ID=?</Property>
-            <Property name="UpdateUserPasswordSQL">UPDATE UM_USER SET 
UM_USER_PASSWORD= ?, UM_SALT_VALUE=?, UM_REQUIRE_CHANGE=?, UM_CHANGED_TIME=? 
WHERE UM_USER_NAME= ? AND UM_TENANT_ID=?</Property>
-            <Property name="AddUserPropertySQL">INSERT INTO UM_USER_ATTRIBUTE 
(UM_USER_ID, UM_ATTR_NAME, UM_ATTR_VALUE, UM_PROFILE_ID, UM_TENANT_ID) VALUES 
((SELECT UM_ID FROM UM_USER WHERE UM_USER_NAME=? AND UM_TENANT_ID=?), ?, ?, ?, 
?)</Property>
-            <Property name="AddUserPropertySQL-mssql">INSERT INTO 
UM_USER_ATTRIBUTE (UM_USER_ID, UM_ATTR_NAME, UM_ATTR_VALUE, UM_PROFILE_ID, 
UM_TENANT_ID) SELECT (SELECT UM_ID FROM UM_USER WHERE UM_USER_NAME=? AND 
UM_TENANT_ID=?), (?), (?), (?), (?)</Property>
-            <Property name="UpdateUserPropertySQL">UPDATE UM_USER_ATTRIBUTE 
SET UM_ATTR_VALUE=? WHERE UM_USER_ID=(SELECT UM_ID FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?) AND UM_ATTR_NAME=? AND UM_PROFILE_ID=? AND 
UM_TENANT_ID=?</Property>
-            <Property name="DeleteUserPropertySQL">DELETE FROM 
UM_USER_ATTRIBUTE WHERE UM_USER_ID=(SELECT UM_ID FROM UM_USER WHERE 
UM_USER_NAME=? AND UM_TENANT_ID=?) AND UM_ATTR_NAME=? AND UM_PROFILE_ID=? AND 
UM_TENANT_ID=?</Property>
-        </UserStoreManager>
-        <AuthorizationManager
-            
class="org.wso2.carbon.user.core.authorization.JDBCAuthorizationManager"></AuthorizationManager>
-    </Realm>
-    <SystemPermission>
-        <Permission>login</Permission>
-        <Permission>manage-configuration</Permission>
-        <Permission>manage-security</Permission>
-        <Permission>upload-services</Permission>
-        <Permission>manage-services</Permission>
-        <Permission>manage-lc-configuration</Permission>
-        <Permission>manage-mediation</Permission>
-        <Permission>monitor-system</Permission>
-        <Permission>delegate-identity</Permission>
-    </SystemPermission>
-</UserManager>

http://git-wip-us.apache.org/repos/asf/stratos/blob/ee5e9639/components/org.apache.stratos.throttling.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.throttling.ui/pom.xml 
b/components/org.apache.stratos.throttling.ui/pom.xml
deleted file mode 100644
index dd571f8..0000000
--- a/components/org.apache.stratos.throttling.ui/pom.xml
+++ /dev/null
@@ -1,126 +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.
-  -->
-<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-components-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apache.stratos.throttling.ui</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache Stratos - Throttling - User Interface</name>
-
-    <build>
-               <plugins>
-                   <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>
-                               <Export-Package>
-                                   org.apache.stratos.throttling.ui.*,
-                               </Export-Package>
-                               <Import-Package>
-                                   org.apache.stratos.throttling.stub.*; 
version="${carbon.platform.package.import.version.range}",
-                                   
javax.servlet;version="${imp.pkg.version.javax.servlet}",
-                                   
javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
-                                   !javax.xml.namespace,
-                                   javax.xml.namespace; version=0.0.0,         
                   
-                                   org.apache.lucene.*,
-                                   *;resolution:=optional
-                               </Import-Package>
-                               <Carbon-Component>UIBundle</Carbon-Component>
-                           </instructions>
-                       </configuration>
-                   </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-           <dependency>
-            <groupId>commons-codec.wso2</groupId>
-            <artifactId>commons-codec</artifactId>
-           <version>1.4.0.wso2v1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.registry.common.ui</artifactId>
-            <version>${wso2carbon.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.registry.core</artifactId>
-            <version>${wso2carbon.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>javax.servlet</artifactId>
-           <version>3.0.0.v201112011016</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis2.wso2</groupId>
-            <artifactId>axis2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom.wso2</groupId>
-            <artifactId>axiom</artifactId>
-           <version>1.2.11.wso2v4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.ui</artifactId>
-            <version>${wso2carbon.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.core</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.throttling.stub</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-</project>

http://git-wip-us.apache.org/repos/asf/stratos/blob/ee5e9639/components/org.apache.stratos.throttling.ui/src/main/java/org/apache/stratos/throttling/ui/clients/ThrottlingRuleEditorClient.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.throttling.ui/src/main/java/org/apache/stratos/throttling/ui/clients/ThrottlingRuleEditorClient.java
 
b/components/org.apache.stratos.throttling.ui/src/main/java/org/apache/stratos/throttling/ui/clients/ThrottlingRuleEditorClient.java
deleted file mode 100644
index d3e75e1..0000000
--- 
a/components/org.apache.stratos.throttling.ui/src/main/java/org/apache/stratos/throttling/ui/clients/ThrottlingRuleEditorClient.java
+++ /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.
- */
-package org.apache.stratos.throttling.ui.clients;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.CarbonConstants;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import 
org.apache.stratos.throttling.stub.services.ThrottlingRuleEditorServiceStub;
-import org.wso2.carbon.ui.CarbonUIUtil;
-import org.wso2.carbon.utils.ServerConstants;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpSession;
-
-public class ThrottlingRuleEditorClient {
-    private static final Log log = 
LogFactory.getLog(ThrottlingRuleEditorClient.class);
-
-    private ThrottlingRuleEditorServiceStub stub;
-    private String epr;
-
-    public ThrottlingRuleEditorClient(String cookie, String backendServerURL,
-            ConfigurationContext configContext) throws RegistryException {
-
-        epr = backendServerURL + "ThrottlingRuleEditorService";
-
-        try {
-            stub = new ThrottlingRuleEditorServiceStub(configContext, epr);
-
-            ServiceClient client = stub._getServiceClient();
-            Options option = client.getOptions();
-            option.setManageSession(true);
-            
option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, 
cookie);
-
-        } catch (AxisFault axisFault) {
-            String msg =
-                    "Failed to initiate throttling rule editor service client. 
" +
-                            axisFault.getMessage();
-            log.error(msg, axisFault);
-            throw new RegistryException(msg, axisFault);
-        }
-    }
-
-    public ThrottlingRuleEditorClient(ServletConfig config, HttpSession 
session)
-            throws RegistryException {
-
-        String cookie = (String) 
session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
-        String backendServerURL = 
CarbonUIUtil.getServerURL(config.getServletContext(), session);
-        ConfigurationContext configContext =
-                (ConfigurationContext) config.getServletContext().getAttribute(
-                        CarbonConstants.CONFIGURATION_CONTEXT);
-        epr = backendServerURL + "ThrottlingRuleEditorService";
-
-        try {
-            stub = new ThrottlingRuleEditorServiceStub(configContext, epr);
-
-            ServiceClient client = stub._getServiceClient();
-            Options option = client.getOptions();
-            option.setManageSession(true);
-            
option.setProperty(org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING, 
cookie);
-
-        } catch (AxisFault axisFault) {
-            String msg =
-                    "Failed to initiate throttling rule editor service client. 
" +
-                            axisFault.getMessage();
-            log.error(msg, axisFault);
-            throw new RegistryException(msg, axisFault);
-        }
-    }
-
-    public String retrieveThrottlingRules() throws Exception {
-        return stub.retrieveThrottlingRules();
-    }
-
-    public void updateThrottlingRules(String ruleContent) throws Exception {
-        stub.updateThrottlingRules(ruleContent);
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/ee5e9639/components/org.apache.stratos.throttling.ui/src/main/resources/META-INF/component.xml
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.throttling.ui/src/main/resources/META-INF/component.xml
 
b/components/org.apache.stratos.throttling.ui/src/main/resources/META-INF/component.xml
deleted file mode 100644
index 47c20c1..0000000
--- 
a/components/org.apache.stratos.throttling.ui/src/main/resources/META-INF/component.xml
+++ /dev/null
@@ -1,37 +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.
-  -->
-<component xmlns="http://products.wso2.org/carbon";>
-    <!-- sample menu configuration -->
-    <menus>
-        <menu>
-            <id>multitenancy_throttling_menu</id>
-            <i18n-key>throttling.menu.key</i18n-key>
-            
<i18n-bundle>org.apache.stratos.throttling.ui.i18n.Resources</i18n-bundle>
-            <parent-menu>configure_menu</parent-menu>
-            <link>../mt-throttling/throttling.jsp</link>
-            <region>region1</region>
-            <order>8</order>
-            <style-class>manage</style-class>
-            <icon>../mt-throttling/images/throttling.gif</icon>
-            
<require-permission>/permission/protected/configure/throttling-rules</require-permission>
-            <require-super-tenant>true</require-super-tenant>
-        </menu>
-    </menus>
-
-</component>

http://git-wip-us.apache.org/repos/asf/stratos/blob/ee5e9639/components/org.apache.stratos.throttling.ui/src/main/resources/ThrottlingRuleEditorService.wsdl
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.throttling.ui/src/main/resources/ThrottlingRuleEditorService.wsdl
 
b/components/org.apache.stratos.throttling.ui/src/main/resources/ThrottlingRuleEditorService.wsdl
deleted file mode 100644
index 9763fcb..0000000
--- 
a/components/org.apache.stratos.throttling.ui/src/main/resources/ThrottlingRuleEditorService.wsdl
+++ /dev/null
@@ -1,167 +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.
-  -->
-
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; 
xmlns:ns1="http://org.apache.axis2/xsd"; 
xmlns:ns="http://services.manager.throttling.carbon.wso2.org"; 
xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"; 
xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; 
xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"; 
xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"; 
targetNamespace="http://services.manager.throttling.carbon.wso2.org";>
-    <wsdl:documentation>ThrottlingRuleEditorService</wsdl:documentation>
-    <wsdl:types>
-        <xs:schema attributeFormDefault="qualified" 
elementFormDefault="qualified" 
targetNamespace="http://services.manager.throttling.carbon.wso2.org";>
-            <xs:element name="updateThrottlingRulesException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" 
name="updateThrottlingRulesException" nillable="true" type="ns:Exception" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:complexType name="Exception">
-                <xs:sequence>
-                    <xs:element minOccurs="0" name="Message" nillable="true" 
type="xs:string" />
-                </xs:sequence>
-            </xs:complexType>
-            <xs:element name="updateThrottlingRules">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="ruleContent" 
nillable="true" type="xs:string" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="retrieveThrottlingRulesException">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" 
name="retrieveThrottlingRulesException" nillable="true" type="ns:Exception" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="retrieveThrottlingRules">
-                <xs:complexType>
-                    <xs:sequence />
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="retrieveThrottlingRulesResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" 
nillable="true" type="xs:string" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-        </xs:schema>
-    </wsdl:types>
-    <wsdl:message name="updateThrottlingRulesRequest">
-        <wsdl:part name="parameters" element="ns:updateThrottlingRules" />
-    </wsdl:message>
-    <wsdl:message name="updateThrottlingRulesException">
-        <wsdl:part name="parameters" 
element="ns:updateThrottlingRulesException" />
-    </wsdl:message>
-    <wsdl:message name="retrieveThrottlingRulesRequest">
-        <wsdl:part name="parameters" element="ns:retrieveThrottlingRules" />
-    </wsdl:message>
-    <wsdl:message name="retrieveThrottlingRulesResponse">
-        <wsdl:part name="parameters" 
element="ns:retrieveThrottlingRulesResponse" />
-    </wsdl:message>
-    <wsdl:message name="retrieveThrottlingRulesException">
-        <wsdl:part name="parameters" 
element="ns:retrieveThrottlingRulesException" />
-    </wsdl:message>
-    <wsdl:portType name="ThrottlingRuleEditorServicePortType">
-        <wsdl:operation name="updateThrottlingRules">
-            <wsdl:input message="ns:updateThrottlingRulesRequest" 
wsaw:Action="urn:updateThrottlingRules" />
-            <wsdl:fault message="ns:updateThrottlingRulesException" 
name="updateThrottlingRulesException" 
wsaw:Action="urn:updateThrottlingRulesupdateThrottlingRulesException" />
-        </wsdl:operation>
-        <wsdl:operation name="retrieveThrottlingRules">
-            <wsdl:input message="ns:retrieveThrottlingRulesRequest" 
wsaw:Action="urn:retrieveThrottlingRules" />
-            <wsdl:output message="ns:retrieveThrottlingRulesResponse" 
wsaw:Action="urn:retrieveThrottlingRulesResponse" />
-            <wsdl:fault message="ns:retrieveThrottlingRulesException" 
name="retrieveThrottlingRulesException" 
wsaw:Action="urn:retrieveThrottlingRulesretrieveThrottlingRulesException" />
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="ThrottlingRuleEditorServiceSoap11Binding" 
type="ns:ThrottlingRuleEditorServicePortType">
-        <soap:binding transport="http://schemas.xmlsoap.org/soap/http"; 
style="document" />
-        <wsdl:operation name="updateThrottlingRules">
-            <soap:operation soapAction="urn:updateThrottlingRules" 
style="document" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:fault name="updateThrottlingRulesException">
-                <soap:fault use="literal" 
name="updateThrottlingRulesException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="retrieveThrottlingRules">
-            <soap:operation soapAction="urn:retrieveThrottlingRules" 
style="document" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="retrieveThrottlingRulesException">
-                <soap:fault use="literal" 
name="retrieveThrottlingRulesException" />
-            </wsdl:fault>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:binding name="ThrottlingRuleEditorServiceSoap12Binding" 
type="ns:ThrottlingRuleEditorServicePortType">
-        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http"; 
style="document" />
-        <wsdl:operation name="updateThrottlingRules">
-            <soap12:operation soapAction="urn:updateThrottlingRules" 
style="document" />
-            <wsdl:input>
-                <soap12:body use="literal" />
-            </wsdl:input>
-            <wsdl:fault name="updateThrottlingRulesException">
-                <soap12:fault use="literal" 
name="updateThrottlingRulesException" />
-            </wsdl:fault>
-        </wsdl:operation>
-        <wsdl:operation name="retrieveThrottlingRules">
-            <soap12:operation soapAction="urn:retrieveThrottlingRules" 
style="document" />
-            <wsdl:input>
-                <soap12:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal" />
-            </wsdl:output>
-            <wsdl:fault name="retrieveThrottlingRulesException">
-                <soap12:fault use="literal" 
name="retrieveThrottlingRulesException" />
-            </wsdl:fault>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:binding name="ThrottlingRuleEditorServiceHttpBinding" 
type="ns:ThrottlingRuleEditorServicePortType">
-        <http:binding verb="POST" />
-        <wsdl:operation name="updateThrottlingRules">
-            <http:operation location="updateThrottlingRules" />
-            <wsdl:input>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:input>
-        </wsdl:operation>
-        <wsdl:operation name="retrieveThrottlingRules">
-            <http:operation location="retrieveThrottlingRules" />
-            <wsdl:input>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="parameters" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="ThrottlingRuleEditorService">
-        <wsdl:port name="ThrottlingRuleEditorServiceHttpsSoap11Endpoint" 
binding="ns:ThrottlingRuleEditorServiceSoap11Binding">
-            <soap:address 
location="https://192.168.1.100:9443/services/ThrottlingRuleEditorService.ThrottlingRuleEditorServiceHttpsSoap11Endpoint/";
 />
-        </wsdl:port>
-        <wsdl:port name="ThrottlingRuleEditorServiceHttpsSoap12Endpoint" 
binding="ns:ThrottlingRuleEditorServiceSoap12Binding">
-            <soap12:address 
location="https://192.168.1.100:9443/services/ThrottlingRuleEditorService.ThrottlingRuleEditorServiceHttpsSoap12Endpoint/";
 />
-        </wsdl:port>
-        <wsdl:port name="ThrottlingRuleEditorServiceHttpsEndpoint" 
binding="ns:ThrottlingRuleEditorServiceHttpBinding">
-            <http:address 
location="https://192.168.1.100:9443/services/ThrottlingRuleEditorService.ThrottlingRuleEditorServiceHttpsEndpoint/";
 />
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>

http://git-wip-us.apache.org/repos/asf/stratos/blob/ee5e9639/components/org.apache.stratos.throttling.ui/src/main/resources/org/apache/carbon/throttling/ui/i18n/JSResources.properties
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.throttling.ui/src/main/resources/org/apache/carbon/throttling/ui/i18n/JSResources.properties
 
b/components/org.apache.stratos.throttling.ui/src/main/resources/org/apache/carbon/throttling/ui/i18n/JSResources.properties
deleted file mode 100644
index b183e61..0000000
--- 
a/components/org.apache.stratos.throttling.ui/src/main/resources/org/apache/carbon/throttling/ui/i18n/JSResources.properties
+++ /dev/null
@@ -1,22 +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.
-#
-#
-
-empty=To make sure the js properties file is not empty

http://git-wip-us.apache.org/repos/asf/stratos/blob/ee5e9639/components/org.apache.stratos.throttling.ui/src/main/resources/org/apache/carbon/throttling/ui/i18n/Resources.properties
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.throttling.ui/src/main/resources/org/apache/carbon/throttling/ui/i18n/Resources.properties
 
b/components/org.apache.stratos.throttling.ui/src/main/resources/org/apache/carbon/throttling/ui/i18n/Resources.properties
deleted file mode 100644
index 237de68..0000000
--- 
a/components/org.apache.stratos.throttling.ui/src/main/resources/org/apache/carbon/throttling/ui/i18n/Resources.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-
-throttling.menu.key=Throttling
-throttling.rules=Throttling Rules

http://git-wip-us.apache.org/repos/asf/stratos/blob/ee5e9639/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/docs/images/add-org.png
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/docs/images/add-org.png
 
b/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/docs/images/add-org.png
deleted file mode 100644
index fc710f8..0000000
Binary files 
a/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/docs/images/add-org.png
 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/stratos/blob/ee5e9639/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/docs/userguide.html
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/docs/userguide.html
 
b/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/docs/userguide.html
deleted file mode 100644
index bbedd2c..0000000
--- 
a/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/docs/userguide.html
+++ /dev/null
@@ -1,36 +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.
-  -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>Multitenancy Throttling Rules Editor - User Guide</title>
-  <link href="../../admin/css/documentation.css" rel="stylesheet" 
type="text/css" media="all" />
-</head>
-
-<body>
-<h1>Multitenancy Throttling Rules Editor</h1>
-
-<p>
-This editor allows you to edit the rules and update it. The changes to the 
rules get effected immediately 
-after you press the 'Update' button. 
-</p>
-
-</body>
-
-</html>

http://git-wip-us.apache.org/repos/asf/stratos/blob/ee5e9639/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/images/throttling.gif
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/images/throttling.gif
 
b/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/images/throttling.gif
deleted file mode 100644
index a9b04e2..0000000
Binary files 
a/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/images/throttling.gif
 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/stratos/blob/ee5e9639/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/throttling.jsp
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/throttling.jsp
 
b/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/throttling.jsp
deleted file mode 100644
index c3446bb..0000000
--- 
a/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/throttling.jsp
+++ /dev/null
@@ -1,104 +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.
-  --%>
-<%@ page import="org.wso2.carbon.CarbonConstants"%>
-<%@ page
-       
import="org.apache.stratos.throttling.ui.clients.ThrottlingRuleEditorClient"%>
-<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar";
-       prefix="carbon"%>
-
-<carbon:jsi18n
-       resourceBundle="org.apache.stratos.throttling.ui.i18n.JSResources"
-       request="<%=request%>" />
-
-
-
-<fmt:bundle basename="org.apache.stratos.throttling.ui.i18n.Resources">
-       <carbon:breadcrumb label="tenant.menu"
-               resourceBundle="org.apache.stratos.throttling.ui.i18n.Resources"
-               topPage="true" request="<%=request%>" />
-       <jsp:include
-               
page="../registry_common/registry_common-i18n-ajaxprocessor.jsp" />
-       <script type="text/javascript"
-               src="../registry_common/js/registry_validation.js"></script>
-       <script type="text/javascript"
-               src="../registry_common/js/registry_common.js"></script>
-       <script type="text/javascript" src="../ajax/js/prototype.js"></script>
-       <script type="text/javascript" src="js/register_config.js"></script>
-       <%
-       String error = request.getParameter("error");
-       if ("true".equals(error)) {
-%>
-    <script type="text/javascript">
-        jQuery(document).ready(function() {
-            CARBON.showErrorDialog('Error in updating the rules. ' +
-                    'Please make sure the syntax of the rules are correct.');
-        });
-    </script>
-
-<%         
-       } else if("false".equals(error)) {
-           %>
-           <script type="text/javascript">
-               jQuery(document).ready(function() {
-                   CARBON.showInfoDialog('The rules are updated 
successfully.');
-               });
-           </script>
-
-       <%                  
-       }
-       %>
-       <%
-           String ruleContent;
-               try {
-                   ThrottlingRuleEditorClient client =
-                           new ThrottlingRuleEditorClient(config, session);
-                   ruleContent = client.retrieveThrottlingRules();
-               } catch (Exception e) {
-                   String error1 = e.getMessage();
-                   request.setAttribute(CarbonUIMessage.ID, new 
CarbonUIMessage(error1, error1, null));
-        %>
-                <jsp:include page="../admin/error.jsp"/>
-     <%
-           return;
-               }
-       %>
-
-       <div id="middle">
-
-       <h2><fmt:message key="throttling.rules" /></h2>
-
-       <div id="workArea">
-
-       <form id="throttlingForm" action="throttling_ajaxprocessor.jsp" 
method="post">
-
-       <div>
-       <textarea rows="25" cols="110" name="content" 
id="content"><%=ruleContent%></textarea>
-       </div>
-
-       <div>
-       <input type="submit" value="Update"/>
-       </div>
-       </form>
-       </div>
-       </div>
-</fmt:bundle>
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/ee5e9639/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/throttling_ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/throttling_ajaxprocessor.jsp
 
b/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/throttling_ajaxprocessor.jsp
deleted file mode 100644
index 3c012ca..0000000
--- 
a/components/org.apache.stratos.throttling.ui/src/main/resources/web/mt-throttling/throttling_ajaxprocessor.jsp
+++ /dev/null
@@ -1,30 +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.
-  --%>
-<%@ page 
import="org.apache.stratos.throttling.ui.clients.ThrottlingRuleEditorClient" %>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
-try {
-       ThrottlingRuleEditorClient client = new 
ThrottlingRuleEditorClient(config, session);
-       client.updateThrottlingRules(request.getParameter("content"));
-} catch (Exception e) {
-       response.sendRedirect("../mt-throttling/throttling.jsp?error=true");
-    return;
-}
-response.sendRedirect("../mt-throttling/throttling.jsp?error=false");
-%>

http://git-wip-us.apache.org/repos/asf/stratos/blob/ee5e9639/components/org.apache.stratos.usage.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.usage.agent/pom.xml 
b/components/org.apache.stratos.usage.agent/pom.xml
deleted file mode 100644
index 17d8a2e..0000000
--- a/components/org.apache.stratos.usage.agent/pom.xml
+++ /dev/null
@@ -1,146 +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-components-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-<!--   <relativePath>../pom.xml</relativePath>-->
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apache.stratos.usage.agent</artifactId>
-    <packaging>bundle</packaging>
-    <name>Apache Stratos - Usage Agent</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>
-                        
<Axis2Module>${project.artifactId}-${project.version}</Axis2Module>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Private-Package>
-                               !org.apache.stratos.usage.agent.api.*,
-                            org.apache.stratos.usage.agent.*,
-                        </Private-Package>
-                        <Export-Package>
-                            org.apache.stratos.usage.agent.api.*,
-                            org.apache.stratos.usage.agent.beans.*,
-                            org.apache.stratos.usage.agent.util.PublisherUtils,
-                        </Export-Package>
-                        <Import-Package>
-                            org.apache.stratos.common.*,
-                            org.wso2.carbon.registry.core.*;version=1.0.1,
-                            org.wso2.carbon.registry.resource.*,
-                            !javax.xml.namespace,
-                            javax.xml.namespace; version=0.0.0,
-                            
javax.servlet;version="${imp.pkg.version.javax.servlet}",
-                            
javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
-                            org.apache.axiom.*; 
version="${axiom.osgi.version.range}",
-                            *;resolution:=optional
-                        </Import-Package>
-                        <DynamicImport-Package>*</DynamicImport-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.axis2.wso2</groupId>
-            <artifactId>axis2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.utils</artifactId>
-            <version>${carbon.platform.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.registry.core</artifactId>
-            <version>${carbon.platform.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.stratos</groupId>
-            <artifactId>org.apache.stratos.common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.statistics</artifactId>
-            <version>${carbon.platform.version}</version>
-        </dependency>
-       <dependency>
-            <groupId>org.wso2.carbon</groupId>
-           <artifactId>org.wso2.carbon.registry.common</artifactId>
-            <version>${carbon.platform.version}</version>
-       </dependency>
-       <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.event.core</artifactId>
-            <version>${carbon.platform.version}</version>
-        </dependency>
-       <dependency>
-           <groupId>org.wso2.carbon</groupId>
-           <artifactId>org.wso2.carbon.email.verification</artifactId>
-            <version>${carbon.platform.version}</version>
-       </dependency>
-       <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.server</artifactId>
-            <version>${carbon.platform.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.tomcat.ext</artifactId>
-            <version>${carbon.platform.version}</version>
-        </dependency>
-       <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
-            <version>${carbon.platform.version}</version>
-        </dependency>
-
-    </dependencies>
-
-</project>

Reply via email to