http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/common/org.apache.stratos.common.server.feature/resources/conf/stratos.xml
----------------------------------------------------------------------
diff --git 
a/features/manager/common/org.apache.stratos.common.server.feature/resources/conf/stratos.xml
 
b/features/manager/common/org.apache.stratos.common.server.feature/resources/conf/stratos.xml
deleted file mode 100644
index 296a28f..0000000
--- 
a/features/manager/common/org.apache.stratos.common.server.feature/resources/conf/stratos.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!-- 
-  #  Licensed to the Apache Software Foundation (ASF) under one
-  #  or more contributor license agreements.  See the NOTICE file
-  #  distributed with this work for additional information
-  #  regarding copyright ownership.  The ASF licenses this file
-  #  to you under the Apache License, Version 2.0 (the
-  #  "License"); you may not use this file except in compliance
-  #  with the License.  You may obtain a copy of the License at
-  #  
-  #  http://www.apache.org/licenses/LICENSE-2.0
-  #  
-  #  Unless required by applicable law or agreed to in writing,
-  #  software distributed under the License is distributed on an
-  #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  #  KIND, either express or implied.  See the License for the
-  #  specific language governing permissions and limitations
-  #  under the License.
-  -->
-<!--
-    This is the configuration file for Stratos specific constants.
--->
-
-<stratosConfig xmlns="http://wso2.com/cloud/stratos";>
-
-    <!--DisableTenantManagementEmails is set to true by default. 
-    No Tenant Management mails will be sent, and the tenants will be
-    activated as they are created.-->
-    <DisableTenantManagementEmails>true</DisableTenantManagementEmails>
-
-    <!--Set the email validation mandatory if you want to have the tenants 
-    verify the registration before letting them logging in. This will be 
-    overridden by DisableTenantManagementEmails, if that is set to true.-->
-    <EmailValidationMandatoryForLogin>false</EmailValidationMandatoryForLogin>
-
-    <!--Moderate the tenant activation by sending the activation mail to the
-    AdminEmail address given below, instead of the tenant email address
-    Default is false - Tenant Registration Not moderated. This will be 
-    overridden by DisableTenantManagementEmails, if that is set to true.-->
-    <TenantActivationModerated>false</TenantActivationModerated>
-
-    <!--Super Admin Email Address to moderate the tenant registrations-->
-    <SuperAdminEmail>super-admin-email</SuperAdminEmail>
-
-       <!-- 
-       <UsagePlanUrl>http://wso2.com/cloud/stratoslive/pricing</UsagePlanUrl> 
-       -->
-    
-     <!--this parameter is used to disable usage summary generator for 
registry content-->
-     <SkipSummaryGenerator>false</SkipSummaryGenerator>
-
-    <!--Following email address is for general notifications such as
-       tenant creation, bill generation etc..-->
-    <NotificationEmail>notification-email</NotificationEmail>
-
-    <!--Following email address can be used for finance related notifications
-       such as when payments received -->
-    
<FinanceNotificationEmail>finance-notification-email</FinanceNotificationEmail> 
   
-
-     <!--this parameter is used to disable charging at the registration time-->
-    <ChargeOnRegistration>false</ChargeOnRegistration>
-
-    <!--A few Stratos Public Cloud Specific customizations are handled by this 
parameter-->
-    <StratosPublicCloudSetup>true</StratosPublicCloudSetup>
-
-    <!--The URL of the Paypal-->
-    <PaypalUrl>Paypal URL</PaypalUrl>
-
-    <PaypalAPIUsername>username</PaypalAPIUsername>
-    <PaypalAPIPassword>password</PaypalAPIPassword>
-    <PaypalAPISignature>signature</PaypalAPISignature>
-       <PaypalEnvironment>live</PaypalEnvironment>
-
-     <!--Manager Configurations-->
-     
<managerServiceUrl>https://cloud-test.wso2.com/services/</managerServiceUrl>
-     <adminUserName>admin</adminUserName>
-     <adminPassword>admin</adminPassword>
-
-    <!--The google-analytics URL-->
-   <GoogleAnalyticsURL>http://google-analytics.js</GoogleAnalyticsURL>
-
-    <!--Loading message shown during SSO. For example, "Loading StratosLive" 
-->
-    <SSOLoadingMessage>Loading...</SSOLoadingMessage>  
-</stratosConfig>

http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/common/org.apache.stratos.common.server.feature/resources/conf/tenant-mgt.xml
----------------------------------------------------------------------
diff --git 
a/features/manager/common/org.apache.stratos.common.server.feature/resources/conf/tenant-mgt.xml
 
b/features/manager/common/org.apache.stratos.common.server.feature/resources/conf/tenant-mgt.xml
deleted file mode 100644
index 6ca710e..0000000
--- 
a/features/manager/common/org.apache.stratos.common.server.feature/resources/conf/tenant-mgt.xml
+++ /dev/null
@@ -1,38 +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.
-  -->
-<TenantManager class="org.wso2.carbon.user.core.tenant.JDBCTenantManager">
-</TenantManager>
-<!--If the product is using LDAP user store in MT mode, use following tenant 
manager.-->
-<!--TenantManager 
class="org.wso2.carbon.user.core.tenant.CommonHybridLDAPTenantManager">
-    <Property name="RootPartition">dc=wso2,dc=com</Property>
-    <Property name="OrganizationalObjectClass">organizationalUnit</Property>
-    <Property name="OrganizationalAttribute">ou</Property>
-    <Property 
name="OrganizationalSubContextObjectClass">organizationalUnit</Property>
-    <Property name="OrganizationalSubContextAttribute">ou</Property>
-</TenantManager-->
-<!--Following tenant manager is used by Identity Server (IS) as its default 
tenant manager.
-    IS will do token replacement when building the product. Therefore do not 
change the syntax.-->        
-<!--ISTenantManager 
class="org.wso2.carbon.user.core.tenant.CommonHybridLDAPTenantManager">
-    <Property name="RootPartition">dc=wso2,dc=org</Property>
-    <Property name="OrganizationalObjectClass">organizationalUnit</Property>
-    <Property name="OrganizationalAttribute">ou</Property>
-    <Property 
name="OrganizationalSubContextObjectClass">organizationalUnit</Property>
-    <Property name="OrganizationalSubContextAttribute">ou</Property>
-</ISTenantManager-->
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/common/org.apache.stratos.common.server.feature/resources/conf/usage-throttling-agent-config.xml
----------------------------------------------------------------------
diff --git 
a/features/manager/common/org.apache.stratos.common.server.feature/resources/conf/usage-throttling-agent-config.xml
 
b/features/manager/common/org.apache.stratos.common.server.feature/resources/conf/usage-throttling-agent-config.xml
deleted file mode 100644
index 9f40b86..0000000
--- 
a/features/manager/common/org.apache.stratos.common.server.feature/resources/conf/usage-throttling-agent-config.xml
+++ /dev/null
@@ -1,49 +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.
-  -->
-<UsageAndThrottlingAgentConfiguration 
xmlns="http://wso2.com/carbon/multitenancy/usage-throttling-agent/config";>
-    <UsageAgent>
-        <UsageDataPersistenceTask>
-            <StartupDelayInMilliSeconds>60000</StartupDelayInMilliSeconds>
-            <NumberOfRecordsPerExecution>100</NumberOfRecordsPerExecution>
-            
<ExecutionIntervalInMilliSeconds>-1</ExecutionIntervalInMilliSeconds>
-        </UsageDataPersistenceTask>
-    </UsageAgent>
-    <ThrottlingAgent>
-        <ThrottlingInfoCacheUpdaterTask>
-            <StartupDelayInSeconds></StartupDelayInSeconds>
-            <ExecutionIntervalInSeconds></ExecutionIntervalInSeconds>
-        </ThrottlingInfoCacheUpdaterTask>
-    </ThrottlingAgent>
-   <ThrottlingManagerTask>
-    <tasks>
-        <task>
-            <parameters>
-                <parameter name="interval">10</parameter>  <!-- minutes = If 
This set to negative(-) value then throttling manager excecution will disable   
-->
-               <parameter name="delay">60</parameter> <!--minutes -->
-            </parameters>
-            <dataProviders>
-                <dataProvider 
class="org.wso2.carbon.throttling.manager.dataproviders.BillingDataProvider">
-                </dataProvider>
-                <dataProvider 
class="org.wso2.carbon.throttling.manager.dataproviders.UsageDataProvider">
-                </dataProvider>
-            </dataProviders>
-        </task>
-    </tasks>
-  </ThrottlingManagerTask>
-</UsageAndThrottlingAgentConfiguration>

http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/common/org.apache.stratos.common.server.feature/resources/p2.inf
----------------------------------------------------------------------
diff --git 
a/features/manager/common/org.apache.stratos.common.server.feature/resources/p2.inf
 
b/features/manager/common/org.apache.stratos.common.server.feature/resources/p2.inf
deleted file mode 100644
index 329e2ee..0000000
--- 
a/features/manager/common/org.apache.stratos.common.server.feature/resources/p2.inf
+++ /dev/null
@@ -1,25 +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.
-
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/cloud-services-desc.xml,target:${installFolder}/../conf/multitenancy/cloud-services-desc.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/stratos.xml,target:${installFolder}/../conf/multitenancy/stratos.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/identity.xml,target:${installFolder}/../conf/identity.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/tenant-mgt.xml,target:${installFolder}/../conf/multitenancy/tenant-mgt.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/multitenancy-packages.xml,target:${installFolder}/../conf/multitenancy/multitenancy-packages.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/usage-throttling-agent-config.xml,target:${installFolder}/../conf/multitenancy/usage-throttling-agent-config.xml,overwrite:true);\
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/build.properties
----------------------------------------------------------------------
diff --git 
a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/build.properties
 
b/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/build.properties
deleted file mode 100644
index 7602c01..0000000
--- 
a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/build.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.
-#
-#
-
-custom = true
-root.stratos=conf

http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/cloud-services-desc.xml
----------------------------------------------------------------------
diff --git 
a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/cloud-services-desc.xml
 
b/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/cloud-services-desc.xml
deleted file mode 100644
index fc71948..0000000
--- 
a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/cloud-services-desc.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version='1.0'?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<!-- 
-     This has the configurations for the cloud services. 
-     Label, link, icon, description, and the other similar information for 
each of the services are
-     given here. 
-  -->
-<cloudServices xmlns="http://wso2.com/carbon/cloud/mgt/services";>
-   <cloudService name="Apache Stratos Controller" default="true">
-       <key>SCC</key>
-        <label>Apache Stratos Controller</label>
-        <link>https://scc.cloud.wso2.com</link>
-        <!--icon>
-            https://localhost:9443/cloud-services-icons/esb.gif
-        </icon-->
-        <productPageURL>http://wso2.com/cloud/stratos</productPageURL>
-        <description>WSO2 stratos controller.</description>
-    </cloudService>
-    <cloudService name="WSO2 Cloud Controller" default="true">
-       <key>CC</key>
-        <label>WSO2 Cloud Controller</label>
-        <link>https://cc.cloud.wso2.com</link>
-        <!--icon>
-            https://localhost:9443/cloud-services-icons/esb.gif
-        </icon-->
-        <productPageURL>http://wso2.com/cloud/stratos</productPageURL>
-        <description>WSO2 Cloud Controller.</description>
-    </cloudService>
-    <cloudService name="Apache Stratos Agent" default="true">
-       <key>Agent</key>
-        <label>Apache Stratos Agent</label>
-        <link>https://cc.cloud.wso2.com</link>
-        <!--icon>
-            https://localhost:9443/cloud-services-icons/esb.gif
-        </icon-->
-        <productPageURL>http://wso2.com/cloud/stratos</productPageURL>
-        <description>Apache Stratos Agent.</description>
-    </cloudService>
-    <cloudService name="WSO2 Enterprise Service Bus" default="true">
-       <key>ESB</key>
-        <label>Enterprise Service Bus</label>
-        <link>https://esb.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/esb.gif
-        </icon>
-        
<productPageURL>http://wso2.com/products/enterprise-service-bus/</productPageURL>
-        <description>Enterprise Service Bus in the cloud.</description>
-    </cloudService>
-    <cloudService name="Application Server" default="true">
-       <key>AS</key>
-        <label>Application Server</label>
-        <link>https://appserver.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/appserver.gif
-        </icon>
-        
<productPageURL>http://wso2.com/products/application-server/</productPageURL>
-        <description>Application Server in the cloud.</description>
-    </cloudService>
-    <cloudService name="WSO2 Data Services Server" default="true">
-       <key>DSS</key>
-        <label>WSO2 Data Services Server</label>
-        <link>https://dss.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/ds.gif
-        </icon>
-        
<productPageURL>http://wso2.com/products/data-services-server/</productPageURL>
-        <description>Data Services Server in the cloud.</description>
-    </cloudService>
-    <cloudService name="WSO2 Governance Registry" default="true">
-       <key>Greg</key>
-        <label>Governance</label>
-        <link>https://governance.cloud.wso2.com</link>
-        <description>Governance in the cloud.</description>
-        <icon>
-            https://localhost:9443/cloud-services-icons/governance.gif
-        </icon>
-        
<productPageURL>http://wso2.com/products/governance-registry/</productPageURL>
-    </cloudService>
-    <cloudService name="WSO2 Identity Server" default="true">
-       <key>IS</key>
-        <label>WSO2 Identity Server</label>
-        <link>https://identity.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/identity.gif
-        </icon>
-        <description>Identity in the cloud.</description>
-        
<productPageURL>http://wso2.com/products/identity-server/</productPageURL>
-    </cloudService>
-    <cloudService name="WSO2 Business Activity Monitor" default="true">
-        <label>Business Activity Monitor</label>
-        <link>https://bam.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/bam.gif
-        </icon>
-        <description>Business Activity Monitor in the cloud.</description>
-        
<productPageURL>http://wso2.com/products/business-activity-monitor/</productPageURL>
-    </cloudService>
-    <cloudService name="WSO2 Business Process Server" default="true">
-       <key>BPS</key>
-        <label>Business Process Server</label>
-        <link>https://bps.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/bps.gif
-        </icon>
-        <description>Business Process Server in the cloud.</description>
-        
<productPageURL>http://wso2.com/products/business-process-server/</productPageURL>
-    </cloudService>
-    <cloudService name="WSO2 Business Rule Server" default="true">
-       <key>BRS</key>
-        <label>Business Rule Server</label>
-        <link>https://brs.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/brs.gif
-        </icon>
-        <description>Business Rules Server in the cloud.</description>
-        
<productPageURL>http://wso2.com/products/business-rules-server/</productPageURL>
-    </cloudService>
-    <cloudService name="WSO2 Mashup Server" default="true">
-       <key>MB</key>
-        <label>Mashup Server</label>
-        <link>https://mashup.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/mashup.gif
-        </icon>
-        <description>Mashup Server in the cloud.</description>
-        
<productPageURL>http://wso2.com/products/mashup-server/</productPageURL>
-    </cloudService>
-    <cloudService name="WSO2 Gadget Server" default="true">
-       <key>GS</key>
-        <label>Gadget Server</label>
-        <link>https://gadget.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/gadget.gif
-        </icon>
-        <description>Gadgets in the cloud.</description>
-        
<productPageURL>http://wso2.com/products/gadget-server/</productPageURL>
-    </cloudService>
-    <cloudService name="Cloud Gateway" default="true">
-       <key>CG</key>
-        <label>Cloud Gateway</label>
-        <link>https://cg.stratoslive.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/csg.gif
-        </icon>
-        <description>Cloud Gateway in the cloud.</description>
-               
<productPageURL>http://wso2.com/products/cloud-services-gateway/</productPageURL>
 <!-- FIXME, put the correct project home -->
-    </cloudService>
-    <cloudService name="WSO2 Complex Event Processor" default="true">
-       <key>CEP</key>
-        <label>Complex Event Processor</label>
-        <link>https://cep.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/cep.gif
-        </icon>
-        
<productPageURL>http://wso2.com/products/complex-event-processing-server/</productPageURL>
 <!-- FIXME, put the correct project home -->
-        <description>Complex Event Processor in the cloud.</description>
-    </cloudService>
-    <cloudService name="WSO2 Message Broker" default="true">
-       <key>MB</key>
-        <label>Message Broker</label>
-        <link>https://mb.cloud.wso2.com</link>
-        <icon>
-            https://localhost:9443/cloud-services-icons/mb.gif
-        </icon>
-        
<productPageURL>http://wso2.com/products/message-broker/</productPageURL>
-        <description>Message Broker in the cloud.</description>
-    </cloudService>
-    <cloudService name="WSO2 Storage Server" default="true">
-       <key>SS</key>
-       <label>WSO2 Storage Server</label>
-       <link>https://ss.stratoslive.wso2.com</link>
-       <icon>
-                       https://localhost:9443/cloud-services-icons/ss.gif
-       </icon>
-       <description>WSO2 Storage Server.</description>
-       
<productPageURL>http://wso2.com/products/storage-server/</productPageURL>
-    </cloudService>
-</cloudServices>

http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/identity.xml
----------------------------------------------------------------------
diff --git 
a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/identity.xml
 
b/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/identity.xml
deleted file mode 100644
index d0a32fd..0000000
--- 
a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/identity.xml
+++ /dev/null
@@ -1,174 +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.
-  -->
-<Server xmlns="http://wso2.org/projects/carbon/carbon.xml";>
-
-       <JDBCPersistenceManager>
-               <DataSource>
-                       <!-- Include a data source name (jndiConfigName) from 
the set of data 
-                               sources defined in master-datasources.xml -->
-                       <Name>jdbc/WSO2CarbonDB</Name>
-               </DataSource>
-               <!-- If the identity database is created from another place and 
if it is 
-                       required to skip schema initialization during the 
server start up, set the 
-                       following property to "true". -->
-               <!-- <SkipDBSchemaCreation>false</SkipDBSchemaCreation> -->
-       </JDBCPersistenceManager>
-
-       <!-- Security configurations -->
-       <Security>
-               <UserTrustedRPStore>
-                       
<Location>${carbon.home}/repository/resources/security/userRP.jks
-                       </Location>
-                       <!-- Keystore type (JKS/PKCS12 etc.) -->
-                       <Type>JKS</Type>
-                       <!-- Keystore password -->
-                       <Password>wso2carbon</Password>
-                       <!-- Private Key password -->
-                       <KeyPassword>wso2carbon</KeyPassword>
-               </UserTrustedRPStore>
-
-               <!-- The directory under which all other KeyStore files will be 
stored -->
-               <KeyStoresDir>${carbon.home}/conf/keystores</KeyStoresDir>
-       </Security>
-
-       <Identity>
-               <IssuerPolicy>SelfAndManaged</IssuerPolicy>
-               <TokenValidationPolicy>CertValidate</TokenValidationPolicy>
-               <BlackList></BlackList>
-               <WhiteList></WhiteList>
-               <System>
-                       <KeyStore></KeyStore>
-                       <StorePass></StorePass>
-               </System>
-       </Identity>
-
-       <OpenID>
-               
<OpenIDServerUrl>https://localhost:9443/openidserver</OpenIDServerUrl>
-               
<OpenIDUserPattern>https://localhost:9443/openid/</OpenIDUserPattern>
-               <!-- If the users must be prompted for approval -->
-               <OpenIDSkipUserConsent>false</OpenIDSkipUserConsent>
-               <!-- Expiry time of the OpenID RememberMe token in minutes -->
-               <OpenIDRememberMeExpiry>7200</OpenIDRememberMeExpiry>
-               <!-- Multifactor Authentication configuration -->
-        <UseMultifactorAuthentication>false</UseMultifactorAuthentication>     
-        <!-- To enable or disable openid dumb mode -->
-        <DisableOpenIDDumbMode>false</DisableOpenIDDumbMode>   
-       </OpenID>
-
-       <OAuth>
-               <RequestTokenUrl>https://localhost:9443/oauth/request-token
-               </RequestTokenUrl>
-               <AccessTokenUrl>https://localhost:9443/oauth/access-token
-               </AccessTokenUrl>
-               <AuthorizeUrl>https://localhost:9443/oauth/authorize-url
-               </AuthorizeUrl>
-               <!-- Default validity period for Authorization Code in seconds 
-->
-               <AuthorizationCodeDefaultValidityPeriod>300
-               </AuthorizationCodeDefaultValidityPeriod>
-               <!-- Default validity period for Access Token in seconds -->
-               <AccessTokenDefaultValidityPeriod>3600
-               </AccessTokenDefaultValidityPeriod>
-               <!-- Timestamp skew in seconds -->
-               <TimestampSkew>300</TimestampSkew>
-               <!-- Enable OAuth caching. This cache has the replication 
support. -->
-               <EnableOAuthCache>true</EnableOAuthCache>
-               <!-- Configure the security measures needs to be done prior to 
store the 
-                       token in the database, such as hashing, encrypting, 
etc. -->
-               
<TokenPersistencePreprocessor>org.wso2.carbon.identity.oauth.preprocessor.PlainTextTokenPersistencePreprocessor
-               </TokenPersistencePreprocessor>
-               <!-- Supported Response Types -->
-               <SupportedResponseTypes>token,code</SupportedResponseTypes>
-               <!-- Supported Grant Types -->
-               
<SupportedGrantTypes>authorization_code,password,refresh_token,client_credentials
-               </SupportedGrantTypes>
-               <OAuthCallbackHandlers>
-                       <OAuthCallbackHandler
-                               
Class="org.wso2.carbon.identity.oauth.callback.DefaultCallbackHandler" />
-               </OAuthCallbackHandlers>
-               <!-- Assertions can be used to embedd parameters into access 
token. -->
-               <EnableAssertions>
-                       <UserName>false</UserName>
-               </EnableAssertions>
-
-               <!-- This should be set to true when using multiple user stores 
and keys 
-                       should saved into different tables according to the 
user store. By default 
-                       all the application keys are saved in to the same 
table. UserName Assertion 
-                       should be 'true' to use this. -->
-               
<EnableAccessTokenPartitioning>false</EnableAccessTokenPartitioning>
-               <!-- user store domain names and mapping to new table name. eg: 
if you 
-                       provide 'A:foo.com', foo.com should be the user store 
domain name and 'A' 
-                       represent the relavant mapping of token store table, 
i.e. tokens will be 
-                       added to a table called IDN_OAUTH2_ACCESS_TOKEN_A. -->
-               <AccessTokenPartitioningDomains><!-- A:foo.com, B:bar.com -->
-               </AccessTokenPartitioningDomains>
-               <AuthorizationContextTokenGeneration>           
-                       <Enabled>true</Enabled>
-                       
<TokenGeneratorImplClass>org.wso2.carbon.identity.oauth2.token.JWTTokenGenerator</TokenGeneratorImplClass>
-                       
<ClaimsRetrieverImplClass>org.wso2.carbon.identity.oauth2.token.DefaultClaimsRetriever</ClaimsRetrieverImplClass>
-                       
<ConsumerDialectURI>http://wso2.org/claims</ConsumerDialectURI>
-                       <SignatureAlgorithm>SHA256withRSA</SignatureAlgorithm>
-                       <AuthorizationContextTTL>15</AuthorizationContextTTL>
-               </AuthorizationContextTokenGeneration>
-       </OAuth>
-
-       <MultifactorAuthentication>
-               <XMPPSettings>
-                       <XMPPConfig>
-                               <XMPPProvider>gtalk</XMPPProvider>
-                               <XMPPServer>talk.google.com</XMPPServer>
-                               <XMPPPort>5222</XMPPPort>
-                               <XMPPExt>gmail.com</XMPPExt>
-                               
<XMPPUserName>[email protected]</XMPPUserName>
-                               <XMPPPassword>wso2carbon</XMPPPassword>
-                       </XMPPConfig>
-               </XMPPSettings>
-       </MultifactorAuthentication>
-
-       <SSOService>
-               <IdentityProviderURL>https://localhost:9443/samlsso
-               </IdentityProviderURL>
-               <SingleLogoutRetryCount>5</SingleLogoutRetryCount>
-               <SingleLogoutRetryInterval>60000</SingleLogoutRetryInterval> 
<!-- in milli seconds -->
-               <TenantPartitioningEnabled>false</TenantPartitioningEnabled>
-       </SSOService>
-
-       <EntitlementSettings>
-               <!-- Uncomment this to enable on-demand policy loading -->
-               <!--OnDemandPolicyLoading> <Enable>true</Enable> 
<MaxInMemoryPolicies>100</MaxInMemoryPolicies> 
-                       </OnDemandPolicyLoading -->
-               <DecisionCaching>
-                       <Enable>true</Enable>
-                       <CachingInterval>36000</CachingInterval>
-               </DecisionCaching>
-               <AttributeCaching>
-                       <Enable>true</Enable>
-               </AttributeCaching>
-               <ThirftBasedEntitlementConfig>
-                       <EnableThriftService>true</EnableThriftService>
-                       
<ReceivePort>${Ports.ThriftEntitlementReceivePort}</ReceivePort>
-                       <ClientTimeout>10000</ClientTimeout>
-                       <KeyStore>
-                               
<Location>${carbon.home}/repository/resources/security/wso2carbon.jks
-                               </Location>
-                               <Password>wso2carbon</Password>
-                       </KeyStore>
-               </ThirftBasedEntitlementConfig>
-       </EntitlementSettings>
-</Server>

http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/multitenancy-packages.xml
----------------------------------------------------------------------
diff --git 
a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/multitenancy-packages.xml
 
b/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/multitenancy-packages.xml
deleted file mode 100644
index c5cfa02..0000000
--- 
a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/multitenancy-packages.xml
+++ /dev/null
@@ -1,100 +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.
-  -->
-<!-- 
-   Subscription types and the respective limits of parameters for each of the 
packages.
-  -->
-
-<packages xmlns="http://wso2.com/carbon/multitenancy/billing/pacakges";>
-    <package name="Demo">
-        <subscriptionCharge>0</subscriptionCharge> <!-- $ per month -->
-        <users>
-            <limit>1</limit>
-            <charge>0</charge> <!-- charge per month -->
-        </users>
-        <resourceVolume>
-            <limit>20</limit> <!--mb per tenant -->
-           <overuseCharge>0</overuseCharge>
-        </resourceVolume>
-        <bandwidth>
-            <limit>50</limit> <!-- mb per tenant -->
-            <overuseCharge>0</overuseCharge> <!-- $ per mb -->
-        </bandwidth>
-       <cartridge>
-           <hourLimit>5</hourLimit>
-           <overUsageCharge>0.1</overUsageCharge>
-       </cartridge>
-    </package>
-    <package name="SMB">
-        <subscriptionCharge>100</subscriptionCharge> <!-- $ per month -->
-        <users>
-            <limit>unlimited</limit>
-            <charge>0</charge> <!-- charge per month -->
-        </users>
-        <resourceVolume>
-            <limit>50</limit> <!--mb per tenant -->
-           <overuseCharge>0</overuseCharge>    
-        </resourceVolume>
-        <bandwidth>
-            <limit>150</limit> <!-- mb per tenant -->
-            <overuseCharge>0</overuseCharge> <!-- $ per mb -->
-        </bandwidth>
-       <cartridge>
-            <hourLimit>24</hourLimit>
-            <overUsageCharge>0.1</overUsageCharge>
-        </cartridge>
-    </package>
-    <package name="Professional">
-        <subscriptionCharge>500</subscriptionCharge> <!-- $ per month -->
-        <users>
-            <limit>unlimited</limit>
-            <charge>0</charge> <!-- charge per month -->
-        </users>
-        <resourceVolume>
-            <limit>500</limit> <!--mb per tenant -->
-           <overuseCharge>0</overuseCharge>    
-        </resourceVolume>
-        <bandwidth>
-            <limit>1536</limit> <!-- mb per tenant -->
-            <overuseCharge>0.03</overuseCharge> <!-- $ per mb -->
-        </bandwidth>
-       <cartridge>
-            <hourLimit>500</hourLimit>
-            <overUsageCharge>0.1</overUsageCharge>
-        </cartridge>
-    </package>
-    <package name="Enterprise">
-        <subscriptionCharge>2000</subscriptionCharge> <!-- $ per month -->
-        <users>
-            <limit>unlimited</limit>
-            <charge>0</charge> <!-- charge per month -->
-        </users>
-        <resourceVolume>
-            <limit>5120</limit> <!--mb per tenant -->
-           <overuseCharge>0</overuseCharge>    
-        </resourceVolume>
-        <bandwidth>
-            <limit>15360</limit> <!-- mb per tenant -->
-            <overuseCharge>0.02</overuseCharge> <!-- $ per mb -->
-        </bandwidth>
-       <cartridge>
-            <hourLimit>1000</hourLimit>
-            <overUsageCharge>0.1</overUsageCharge>
-        </cartridge>
-    </package>
-</packages>

http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/stratos.xml
----------------------------------------------------------------------
diff --git 
a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/stratos.xml
 
b/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/stratos.xml
deleted file mode 100644
index 296a28f..0000000
--- 
a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/stratos.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!-- 
-  #  Licensed to the Apache Software Foundation (ASF) under one
-  #  or more contributor license agreements.  See the NOTICE file
-  #  distributed with this work for additional information
-  #  regarding copyright ownership.  The ASF licenses this file
-  #  to you under the Apache License, Version 2.0 (the
-  #  "License"); you may not use this file except in compliance
-  #  with the License.  You may obtain a copy of the License at
-  #  
-  #  http://www.apache.org/licenses/LICENSE-2.0
-  #  
-  #  Unless required by applicable law or agreed to in writing,
-  #  software distributed under the License is distributed on an
-  #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  #  KIND, either express or implied.  See the License for the
-  #  specific language governing permissions and limitations
-  #  under the License.
-  -->
-<!--
-    This is the configuration file for Stratos specific constants.
--->
-
-<stratosConfig xmlns="http://wso2.com/cloud/stratos";>
-
-    <!--DisableTenantManagementEmails is set to true by default. 
-    No Tenant Management mails will be sent, and the tenants will be
-    activated as they are created.-->
-    <DisableTenantManagementEmails>true</DisableTenantManagementEmails>
-
-    <!--Set the email validation mandatory if you want to have the tenants 
-    verify the registration before letting them logging in. This will be 
-    overridden by DisableTenantManagementEmails, if that is set to true.-->
-    <EmailValidationMandatoryForLogin>false</EmailValidationMandatoryForLogin>
-
-    <!--Moderate the tenant activation by sending the activation mail to the
-    AdminEmail address given below, instead of the tenant email address
-    Default is false - Tenant Registration Not moderated. This will be 
-    overridden by DisableTenantManagementEmails, if that is set to true.-->
-    <TenantActivationModerated>false</TenantActivationModerated>
-
-    <!--Super Admin Email Address to moderate the tenant registrations-->
-    <SuperAdminEmail>super-admin-email</SuperAdminEmail>
-
-       <!-- 
-       <UsagePlanUrl>http://wso2.com/cloud/stratoslive/pricing</UsagePlanUrl> 
-       -->
-    
-     <!--this parameter is used to disable usage summary generator for 
registry content-->
-     <SkipSummaryGenerator>false</SkipSummaryGenerator>
-
-    <!--Following email address is for general notifications such as
-       tenant creation, bill generation etc..-->
-    <NotificationEmail>notification-email</NotificationEmail>
-
-    <!--Following email address can be used for finance related notifications
-       such as when payments received -->
-    
<FinanceNotificationEmail>finance-notification-email</FinanceNotificationEmail> 
   
-
-     <!--this parameter is used to disable charging at the registration time-->
-    <ChargeOnRegistration>false</ChargeOnRegistration>
-
-    <!--A few Stratos Public Cloud Specific customizations are handled by this 
parameter-->
-    <StratosPublicCloudSetup>true</StratosPublicCloudSetup>
-
-    <!--The URL of the Paypal-->
-    <PaypalUrl>Paypal URL</PaypalUrl>
-
-    <PaypalAPIUsername>username</PaypalAPIUsername>
-    <PaypalAPIPassword>password</PaypalAPIPassword>
-    <PaypalAPISignature>signature</PaypalAPISignature>
-       <PaypalEnvironment>live</PaypalEnvironment>
-
-     <!--Manager Configurations-->
-     
<managerServiceUrl>https://cloud-test.wso2.com/services/</managerServiceUrl>
-     <adminUserName>admin</adminUserName>
-     <adminPassword>admin</adminPassword>
-
-    <!--The google-analytics URL-->
-   <GoogleAnalyticsURL>http://google-analytics.js</GoogleAnalyticsURL>
-
-    <!--Loading message shown during SSO. For example, "Loading StratosLive" 
-->
-    <SSOLoadingMessage>Loading...</SSOLoadingMessage>  
-</stratosConfig>

http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/tenant-mgt.xml
----------------------------------------------------------------------
diff --git 
a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/tenant-mgt.xml
 
b/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/tenant-mgt.xml
deleted file mode 100644
index 6ca710e..0000000
--- 
a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/tenant-mgt.xml
+++ /dev/null
@@ -1,38 +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.
-  -->
-<TenantManager class="org.wso2.carbon.user.core.tenant.JDBCTenantManager">
-</TenantManager>
-<!--If the product is using LDAP user store in MT mode, use following tenant 
manager.-->
-<!--TenantManager 
class="org.wso2.carbon.user.core.tenant.CommonHybridLDAPTenantManager">
-    <Property name="RootPartition">dc=wso2,dc=com</Property>
-    <Property name="OrganizationalObjectClass">organizationalUnit</Property>
-    <Property name="OrganizationalAttribute">ou</Property>
-    <Property 
name="OrganizationalSubContextObjectClass">organizationalUnit</Property>
-    <Property name="OrganizationalSubContextAttribute">ou</Property>
-</TenantManager-->
-<!--Following tenant manager is used by Identity Server (IS) as its default 
tenant manager.
-    IS will do token replacement when building the product. Therefore do not 
change the syntax.-->        
-<!--ISTenantManager 
class="org.wso2.carbon.user.core.tenant.CommonHybridLDAPTenantManager">
-    <Property name="RootPartition">dc=wso2,dc=org</Property>
-    <Property name="OrganizationalObjectClass">organizationalUnit</Property>
-    <Property name="OrganizationalAttribute">ou</Property>
-    <Property 
name="OrganizationalSubContextObjectClass">organizationalUnit</Property>
-    <Property name="OrganizationalSubContextAttribute">ou</Property>
-</ISTenantManager-->
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/usage-throttling-agent-config.xml
----------------------------------------------------------------------
diff --git 
a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/usage-throttling-agent-config.xml
 
b/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/usage-throttling-agent-config.xml
deleted file mode 100644
index 9f40b86..0000000
--- 
a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/conf/usage-throttling-agent-config.xml
+++ /dev/null
@@ -1,49 +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.
-  -->
-<UsageAndThrottlingAgentConfiguration 
xmlns="http://wso2.com/carbon/multitenancy/usage-throttling-agent/config";>
-    <UsageAgent>
-        <UsageDataPersistenceTask>
-            <StartupDelayInMilliSeconds>60000</StartupDelayInMilliSeconds>
-            <NumberOfRecordsPerExecution>100</NumberOfRecordsPerExecution>
-            
<ExecutionIntervalInMilliSeconds>-1</ExecutionIntervalInMilliSeconds>
-        </UsageDataPersistenceTask>
-    </UsageAgent>
-    <ThrottlingAgent>
-        <ThrottlingInfoCacheUpdaterTask>
-            <StartupDelayInSeconds></StartupDelayInSeconds>
-            <ExecutionIntervalInSeconds></ExecutionIntervalInSeconds>
-        </ThrottlingInfoCacheUpdaterTask>
-    </ThrottlingAgent>
-   <ThrottlingManagerTask>
-    <tasks>
-        <task>
-            <parameters>
-                <parameter name="interval">10</parameter>  <!-- minutes = If 
This set to negative(-) value then throttling manager excecution will disable   
-->
-               <parameter name="delay">60</parameter> <!--minutes -->
-            </parameters>
-            <dataProviders>
-                <dataProvider 
class="org.wso2.carbon.throttling.manager.dataproviders.BillingDataProvider">
-                </dataProvider>
-                <dataProvider 
class="org.wso2.carbon.throttling.manager.dataproviders.UsageDataProvider">
-                </dataProvider>
-            </dataProviders>
-        </task>
-    </tasks>
-  </ThrottlingManagerTask>
-</UsageAndThrottlingAgentConfiguration>

http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git 
a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/p2.inf
 
b/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/p2.inf
deleted file mode 100644
index 329e2ee..0000000
--- 
a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/p2.inf
+++ /dev/null
@@ -1,25 +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.
-
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/cloud-services-desc.xml,target:${installFolder}/../conf/multitenancy/cloud-services-desc.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/stratos.xml,target:${installFolder}/../conf/multitenancy/stratos.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/identity.xml,target:${installFolder}/../conf/identity.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/tenant-mgt.xml,target:${installFolder}/../conf/multitenancy/tenant-mgt.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/multitenancy-packages.xml,target:${installFolder}/../conf/multitenancy/multitenancy-packages.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/usage-throttling-agent-config.xml,target:${installFolder}/../conf/multitenancy/usage-throttling-agent-config.xml,overwrite:true);\
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml
----------------------------------------------------------------------
diff --git 
a/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml 
b/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml
deleted file mode 100644
index 07d6305..0000000
--- a/features/manager/common/org.apache.stratos.common.ui.feature/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>common-feature</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apache.stratos.common.ui.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Stratos - Common UI Feature</name>
-    <url>http://apache.org</url>
-    <description>This feature contains the bundles required for Front-end 
servlet functionality</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.redirector.servlet.ui</artifactId>
-            <version>2.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.sso.redirector.ui</artifactId>
-            <version>2.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.google.analytics.ui</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.tenant.mgt.stub</artifactId>
-            <version>4.2.0</version>
-        </dependency>
-        <!--  Tenant Mgmt  -->
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.tenant.mgt.ui</artifactId>
-            <version>2.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.stratos</groupId>
-            <artifactId>org.apache.stratos.common.stub</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.theme.mgt.ui</artifactId>
-            <version>2.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.theme.mgt.stub</artifactId>
-            <version>4.2.0</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.wso2.maven</groupId>
-                <artifactId>carbon-p2-plugin</artifactId>
-                <version>${carbon.p2.plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>p2-feature-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-feature-gen</goal>
-                        </goals>
-                        <configuration>
-                            <id>org.apache.stratos.common.ui</id>
-                            
<propertiesFile>../../../../etc/feature.properties</propertiesFile>
-                            <adviceFile>
-                                <properties>
-                                    
<propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef>
-                                    
<propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
-                                </properties>
-                            </adviceFile>
-                            <bundles>
-                                
<bundleDef>org.wso2.carbon:org.wso2.carbon.redirector.servlet.ui</bundleDef>
-                                
<bundleDef>org.wso2.carbon:org.wso2.carbon.redirector.servlet.stub:4.2.0</bundleDef>
-                                
<bundleDef>org.wso2.carbon:org.wso2.carbon.sso.redirector.ui</bundleDef>
-                                
<bundleDef>org.wso2.carbon:org.wso2.carbon.google.analytics.ui</bundleDef>
-
-                                <!-- Tenant Mgmt-->
-                                
<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.ui</bundleDef>
-                                
<bundleDef>org.apache.stratos:org.apache.stratos.common.stub</bundleDef>
-                                
<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.stub</bundleDef>
-                                <!-- Tenant Mgmt End-->
-
-                            </bundles>
-                            <importFeatures>
-                                
<importFeatureDef>org.wso2.carbon.core.ui:${wso2carbon.version}</importFeatureDef>
-                                <importFeatureDef>
-                                    
org.wso2.carbon.identity.authenticator.saml2.sso.ui:${wso2carbon.version}
-                                </importFeatureDef>
-                            </importFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/common/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/common/pom.xml b/features/manager/common/pom.xml
deleted file mode 100644
index 0d8ce99..0000000
--- a/features/manager/common/pom.xml
+++ /dev/null
@@ -1,43 +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-manager-features</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>common-feature</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Stratos - Common Feature Aggregator Module</name>
-    <url>http://apache.org</url>
-
-    <modules>
-        <module>org.apache.stratos.common.feature</module>
-        <module>org.apache.stratos.common.server.feature</module>
-        <module>org.apache.stratos.common.ui.feature</module>
-    </modules>
-
-    
-
-</project>
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
----------------------------------------------------------------------
diff --git 
a/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
 
b/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
new file mode 100644
index 0000000..b7ffd2a
--- /dev/null
+++ 
b/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
@@ -0,0 +1,113 @@
+<?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-manager-features</artifactId>
+        <version>4.1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.stratos.metadata.client.feature</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Stratos - Metadata client Feature</name>
+    <url>http://apache.org</url>
+    <description/>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>${gson2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpasyncclient</artifactId>
+            <version>4.0-beta3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient-osgi</artifactId>
+            <version>4.3.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.3.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore-osgi</artifactId>
+            <version>4.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore-nio</artifactId>
+            <version>4.2.4</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>4-p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>org.apache.stratos.metadata.client</id>
+                            
<propertiesFile>../../../etc/feature.properties</propertiesFile>
+                            <adviceFile>
+                                <properties>
+                                    
<propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
+                                    
<propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
+                                </properties>
+                            </adviceFile>
+                            <bundles>
+                                
<bundleDef>org.apache.stratos:org.apache.stratos.metadata.client:${project.version}
+                                </bundleDef>
+                                
<bundleDef>com.google.code.gson:gson:${gson2.version}</bundleDef>
+                                
<bundleDef>org.apache.commons:commons-lang3:3.1</bundleDef>
+                                
<bundleDef>org.apache.httpcomponents:httpclient-osgi:4.3.5</bundleDef>
+                                
<bundleDef>org.apache.httpcomponents:httpcore-osgi:4.3.2</bundleDef>
+                            </bundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
----------------------------------------------------------------------
diff --git 
a/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
 
b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
new file mode 100644
index 0000000..42d709d
--- /dev/null
+++ 
b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
@@ -0,0 +1,305 @@
+<?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-manager-features</artifactId>
+        <version>4.1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.stratos.metadata.service.feature</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Stratos - Meta Data Service feature</name>
+    <description>This feature packs the Meta Data Service of 
stratos</description>
+
+    <dependencies>
+        <!--CXF runtime environment-->
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-bundle</artifactId>
+            <version>2.7.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf.xjcplugins</groupId>
+            <artifactId>cxf-xjc-dv</artifactId>
+            <version>2.6.2</version>
+        </dependency>
+        <dependency>
+          <groupId>commons-lang</groupId>
+          <artifactId>commons-lang</artifactId>
+          <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf.xjc-utils</groupId>
+            <artifactId>cxf-xjc-runtime</artifactId>
+            <version>2.6.2</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.velocity</groupId>
+          <artifactId>velocity</artifactId>
+          <version>1.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf.xjcplugins</groupId>
+            <artifactId>cxf-xjc-ts</artifactId>
+            <version>2.6.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf.xjcplugins</groupId>
+            <artifactId>cxf-xjc-boolean</artifactId>
+            <version>2.6.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf.xjcplugins</groupId>
+            <artifactId>cxf-xjc-bug671</artifactId>
+            <version>2.6.2</version>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache-core</artifactId>
+            <version>2.5.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpasyncclient</artifactId>
+            <version>4.0-beta3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore-nio</artifactId>
+            <version>4.2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <version>2.0-m10</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.1.13</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-xjc</artifactId>
+            <version>2.1.13</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>woodstox-core-asl</artifactId>
+            <version>4.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>stax2-api</artifactId>
+            <version>3.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jettison</groupId>
+            <artifactId>jettison</artifactId>
+            <version>1.3.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.security</groupId>
+            <artifactId>wss4j</artifactId>
+            <version>1.6.11</version>
+        </dependency>
+        <dependency>
+            <groupId>xml-resolver</groupId>
+            <artifactId>xml-resolver</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.xmlschema</groupId>
+            <artifactId>xmlschema-core</artifactId>
+            <version>2.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.santuario</groupId>
+            <artifactId>xmlsec</artifactId>
+            <version>1.5.5</version>
+        </dependency>
+        <dependency>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+            <version>1.6.3</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+          <groupId>commons-collections</groupId>
+          <artifactId>commons-collections</artifactId>
+          <version>3.2.1</version>
+        </dependency>
+        <dependency>
+          <groupId>aopalliance</groupId>
+          <artifactId>aopalliance</artifactId>
+          <version>1.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>3.0.7.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-asm</artifactId>
+            <version>3.0.7.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>3.0.7.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>3.0.7.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>3.0.7.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-expression</artifactId>
+            <version>3.0.7.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>3.0.7.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.webapp.ext</groupId>
+            <artifactId>carbon-cxf</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+         <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.registry.ws.stub</artifactId>
+            <version>4.2.0</version>
+        </dependency>
+        
+        
+        <!--dependency>
+            <groupId>org.apache.stratos</groupId>
+            <artifactId>org.apache.stratos.autoscaler.service.stub</artifactId>
+            <version>${project.version}</version>
+        </dependency-->
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${project.build.directory}/runtime/</directory>
+            </resource>
+            <resource>
+                <directory>${project.build.directory}/web-app/</directory>
+            </resource>
+           <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>pack-REST-webapp</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.stratos</groupId>
+                                    
<artifactId>org.apache.stratos.metadata.service</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>war</type>
+                                    <overWrite>true</overWrite>
+                                    
<outputDirectory>${project.build.directory}/web-app/web-app</outputDirectory>
+                                    
<destFileName>stratosmetadataservice.war</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>org.apache.stratos.metadata.service</id>
+                            
<propertiesFile>../../etc/feature.properties</propertiesFile>
+                            <adviceFile>
+                                <properties>
+                                    
<propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
+                                    
<propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
+                                </properties>
+                            </adviceFile>
+                           <bundles>
+                               
<bundleDef>org.apache.stratos:org.apache.stratos.manager.stub:${project.version}</bundleDef>
+                           </bundles>
+                            <importFeatures>
+                                
<importFeatureDef>org.wso2.carbon.core:${wso2carbon.version}</importFeatureDef>
+                            </importFeatures>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+</project>

http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git 
a/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/p2.inf
 
b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/p2.inf
new file mode 100644
index 0000000..68be3a2
--- /dev/null
+++ 
b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/p2.inf
@@ -0,0 +1,22 @@
+# 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.
+
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.metadata.service_${feature.version}/web-app/stratosmetadataservice.war,target:${installFolder}/../../deployment/server/webapps/stratosmetadataservice.war,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.metadata.service_${feature.version}/tomcat/webapp-classloading.xml,target:${installFolder}/../../conf/tomcat/webapp-classloading.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.metadata.service_${feature.version}/tomcat/webapp-classloading-environments.xml,target:${installFolder}/../../conf/tomcat/webapp-classloading-environments.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.metadata.service_${feature.version}/tomcat/context.xml,target:${installFolder}/../../conf/tomcat/context.xml,overwrite:true);\

http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/context.xml
----------------------------------------------------------------------
diff --git 
a/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/context.xml
 
b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/context.xml
new file mode 100644
index 0000000..a85c9af
--- /dev/null
+++ 
b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/context.xml
@@ -0,0 +1,36 @@
+<?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.
+-->
+<!-- The contents of this file will be loaded for each web application -->
+<Context crossContext="true">
+
+    <!-- Default set of monitored resources -->
+
+    <Loader className="org.wso2.carbon.webapp.mgt.loader.CarbonWebappLoader" 
loaderClass="org.wso2.carbon.webapp.mgt.loader.CarbonWebappClassLoader"/>
+
+    <!-- Uncomment this to disable session persistence across Tomcat restarts 
-->
+    <!--
+    <Manager pathname="" />
+    -->
+
+    <!-- Uncomment this to enable Comet connection tacking (provides events
+         on session expiration as well as webapp lifecycle) -->
+    <!--
+    <Valve className="org.apache.catalina.valves.CometConnectionManagerValve" 
/>
+    -->
+
+</Context>

http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/webapp-classloading-environments.xml
----------------------------------------------------------------------
diff --git 
a/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/webapp-classloading-environments.xml
 
b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/webapp-classloading-environments.xml
new file mode 100644
index 0000000..5366f82
--- /dev/null
+++ 
b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/webapp-classloading-environments.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+  ~ Copyright 2005-2013 WSO2, Inc. (http://wso2.com)
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!--
+    This file defines the different classloading environments. This is 
container level config file. Individual webapps are not allowed to override 
these elements.
+    
+    ${carbon.home} represents the carbon.home system property.
+    Other system properties can be specified in a similar manner.
+-->
+<Classloading xmlns="http://wso2.org/projects/as/classloading-environments";>
+
+    <!--
+     We define three different environments.
+
+     1) Delegated environment - This is a virtual environment where all the 
resources belongs to these environments are loaded from the parent. This way 
you can control whats being loaded from the parent classloader. Only the 
packages and resources specified in the delegated environments are loaded from 
the parent. All the others are loaded from the local webapp's classpath. If a 
webapps has speficied two or more delegated environments, they all get merged 
at runtime.
+     -->
+    <DelegatedEnvironments>
+        <DelegatedEnvironment>
+            <Name>Tomcat</Name>
+            
<DelegatedPackages>javax.annotation.*,javax.ejb,javax.el,javax.persistence,javax.servlet.*,javax.xml,javax.xml.ws,org.apache.catalina.*,org.apache.coyote.*,org.apache.el.*,com.sun.el.*,org.apache.jasper.*,org.apache.naming.*,org.apache.tomcat.*,org.wso2.carbon.tomcat.jndi.*</DelegatedPackages>
+        </DelegatedEnvironment>
+
+        <DelegatedEnvironment>
+            <Name>Carbon</Name>
+            <DelegatedPackages>*,!org.springframework.*</DelegatedPackages>
+        </DelegatedEnvironment>
+    </DelegatedEnvironments>
+
+    <!--
+         2) Shared  environment - These environments are loaded once and 
shared between multiple webapps. Certain runtimes can be shared by multiple 
webapps. So no need to load them per webapp.
+     -->
+
+    <!--SharedEnvironments>
+        <SharedEnvironment>
+            <name>Spring</name>
+            <Classpath></Classpath>
+        </SharedEnvironment>
+    </SharedEnvironments-->
+
+    <!--
+     3) Exclusive environment - These environments are loaded per webapp. 
Exclusive environments define a set of resources(jars) which should be loaded 
per webapp. e.g. CXF runtime.
+     -->
+    <ExclusiveEnvironments>
+        <ExclusiveEnvironment>
+            <Name>CXF</Name>
+            
<Classpath>${carbon.home}/lib/runtimes/cxf/*.jar;${carbon.home}/lib/runtimes/cxf/</Classpath>
+        </ExclusiveEnvironment>
+    </ExclusiveEnvironments>
+</Classloading>

http://git-wip-us.apache.org/repos/asf/stratos/blob/e16acd17/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/webapp-classloading.xml
----------------------------------------------------------------------
diff --git 
a/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/webapp-classloading.xml
 
b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/webapp-classloading.xml
new file mode 100644
index 0000000..f42616f
--- /dev/null
+++ 
b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/src/main/resources/tomcat/webapp-classloading.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+  ~ Copyright 2005-2013 WSO2, Inc. (http://wso2.com)
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!--
+    This file defines class loading policy of the whole container. But this 
behaviour can be overridden by individual webapps by putting this file into the 
META-INF/ directory.   
+-->
+<Classloading xmlns="http://wso2.org/projects/as/classloading";>
+
+    <!-- Parent-first or child-first. Default behaviour is child-first.-->
+    <ParentFirst>false</ParentFirst>
+
+    <!-- 
+       Default environments that contains provides to all the webapps. This 
can be overridden by individual webapps by specifing required environments 
+       Tomcat environment is the default and every webapps gets it even if 
they didn't specify it.
+       e.g. If a webapps requires CXF, they will get both Tomcat and CXF.
+     -->
+    <Environments>Carbon</Environments>
+</Classloading>

Reply via email to