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

[02/15] renaming stratos to manager

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/pom.xml b/features/stratos/pom.xml
deleted file mode 100644
index 73de878..0000000
--- a/features/stratos/pom.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2009-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ 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.
--->
-
-<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.wso2.carbon</groupId>
-        <artifactId>carbon-features</artifactId>
-        <version>4.1.0</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.carbon</groupId>
-    <artifactId>stratos-features</artifactId>
-    <packaging>pom</packaging>
-    <version>2.1.0</version>
-    <name>WSO2 Stratos - Features</name>
-    <description>features</description>
-    <url>http://wso2.com</url>
-
-    <modules>
-        <module>common</module>
-	<module>tenant-mgt</module>
-	<module>load-balance-agent</module>
-        <module>gapp</module>
-        <module>throttling</module>
-        <module>usage</module>
-        <module>billing</module>
-	<module>deployment/2.1.0</module>
-	<module>status-monitor</module>
-	<module>sso-mgt</module>
-    </modules>
-
-    <distributionManagement>
-        <repository>
-            <id>wso2-maven2-repository</id>
-            <name>WSO2 Maven2 Repository</name>
-            <url>scp://dist.wso2.org/home/httpd/dist.wso2.org/maven2/</url>
-        </repository>
-        <snapshotRepository>
-            <id>wso2-maven2-snapshot-repository</id>
-            <name>WSO2 Maven2 Snapshot Repository</name>
-            <url>scp://dist.wso2.org/home/httpd/dist.wso2.org/snapshots/maven2/</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <scm>
-        <connection>
-            scm:svn:https://wso2.org/repos/wso2/trunk/carbon/components
-        </connection>
-        <developerConnection>
-            scm:svn:https://wso2.org/repos/wso2/trunk/carbon/components
-        </developerConnection>
-    </scm>
-    
-    <properties>
-        <stratos.version>2.1.0</stratos.version>
-	<synapse.version>2.1.0-wso2v6</synapse.version>
-        <carbon.version>4.1.0</carbon.version>
-        <quartz.wso2.version>2.1.1.wso2v1</quartz.wso2.version>
-	<carbon.p2.plugin.version>1.5</carbon.p2.plugin.version>
-    </properties>
-<dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.activation</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.sample.installer</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.redirector.servlet</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.redirector.servlet.ui</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.stratos.common</artifactId>
-                <version>${stratos.version}</version>
-			</dependency>
-			<dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.stratos.landing.page.deployer</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.throttling.agent</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.tenant.activity</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.throttling.agent.stub</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.usage.agent</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.tenant.dispatcher</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.quartz-scheduler.wso2</groupId>
-                <artifactId>quartz</artifactId>
-                <version>${quartz.wso2.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.task</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.application.upload</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.synapse</groupId>
-                <artifactId>synapse-tasks</artifactId>
-                <version>${synapse.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.sso.redirector.ui</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.google.analytics.ui</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.feature/2.1.0/pom.xml b/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.feature/2.1.0/pom.xml
deleted file mode 100644
index eda32d0..0000000
--- a/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.wso2.carbon</groupId>
-		<artifactId>stratos-sso-mgt-feature</artifactId>
-		<version>2.1.0</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.wso2.stratos.identity.saml2.sso.mgt.feature</artifactId>
-    <version>2.1.0</version>
-	<packaging>pom</packaging>
-	<name>WSO2 Stratos - Stratos SSO Management Feature</name>
-	<url>http://wso2.org</url>
-	<description>This feature contains the SSO Management Bundles used in Stratos.</description>
-
-	<dependencies>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.stratos.identity.saml2.sso.mgt.server.feature</artifactId>
-            <version>${stratos.version}</version>
-            <type>zip</type>
-	    </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.stratos.identity.saml2.sso.mgt.ui.feature</artifactId>
-            <version>2.1.0</version>
-            <type>zip</type>
-	    </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.wso2.stratos.identity.saml2.sso.mgt</id>
-							<propertiesFile>../../../feature.properties</propertiesFile>
-                            <includedFeatures>
-                                <includedFeatureDef>org.wso2.carbon:org.wso2.stratos.identity.saml2.sso.mgt.server.feature</includedFeatureDef>
-                                <includedFeatureDef>org.wso2.carbon:org.wso2.stratos.identity.saml2.sso.mgt.ui.feature</includedFeatureDef>
-                            </includedFeatures>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.server.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.server.feature/2.1.0/pom.xml b/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.server.feature/2.1.0/pom.xml
deleted file mode 100644
index a4a4796..0000000
--- a/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.server.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.wso2.carbon</groupId>
-		<artifactId>stratos-sso-mgt-feature</artifactId>
-		<version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.wso2.stratos.identity.saml2.sso.mgt.server.feature</artifactId>
-	<packaging>pom</packaging>
-	<name>WSO2 Stratos - Stratos SSO Management Server Feature</name>
-	<url>http://wso2.org</url>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.wso2.carbon</groupId>
-			<artifactId>org.wso2.stratos.identity.saml2.sso.mgt</artifactId>
-            <version>${stratos.version}</version>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-				    <execution>
-				        <id>prefilter-resources</id>
-				        <phase>generate-resources</phase>
-				        <goals>
-				            <goal>copy-resources</goal>
-				        </goals>
-				        <configuration>
-				            <outputDirectory>src/main/resources</outputDirectory>
-				            <resources>
-				                <resource>
-				                    <directory>resources</directory>
-				                    <includes>
-				                        <include>conf/sso-idp-config.xml</include>	
-				                        <include>p2.inf</include>
-						    </includes>
-				                </resource>
-				            </resources>
-				        </configuration>
-				    </execution>
-                		</executions>
-            		</plugin>
-			<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.wso2.stratos.identity.saml2.sso.mgt.server</id>
-							<propertiesFile>../../etc/feature.properties</propertiesFile>
-							<adviceFile>
-								<properties>
-								    <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
-								</properties>
-						    	</adviceFile>
-							<bundles>
-								<bundleDef>org.wso2.carbon:org.wso2.stratos.identity.saml2.sso.mgt</bundleDef>
-							</bundles>
-							<importFeatures>
-								<importFeatureDef>org.wso2.carbon.core.server:${carbon.version}</importFeatureDef>
-                                <importFeatureDef>org.wso2.carbon.identity.sso.saml.server:${carbon.version}</importFeatureDef>
-							</importFeatures>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.server.feature/2.1.0/resources/conf/sso-idp-config.xml
----------------------------------------------------------------------
diff --git a/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.server.feature/2.1.0/resources/conf/sso-idp-config.xml b/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.server.feature/2.1.0/resources/conf/sso-idp-config.xml
deleted file mode 100644
index ce9557d..0000000
--- a/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.server.feature/2.1.0/resources/conf/sso-idp-config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.
- -->
-<SSOIdentityProviderConfig>
-    <!-- <ServiceProviders>
-        <ServiceProvider>
-            <Issuer>wsas</Issuer>
-            <AssertionConsumerService>https://localhost:8443/acs</AssertionConsumerService>
-        </ServiceProvider>
-        <ServiceProvider>
-            <Issuer>identity</Issuer>
-            <AssertionConsumerService>https://localhost:10443/acs</AssertionConsumerService>
-        </ServiceProvider>
-    </ServiceProviders> -->
-</SSOIdentityProviderConfig>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.server.feature/2.1.0/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.server.feature/2.1.0/resources/p2.inf b/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.server.feature/2.1.0/resources/p2.inf
deleted file mode 100644
index 74c756a..0000000
--- a/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.server.feature/2.1.0/resources/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.stratos.identity.saml2.sso.mgt.server_${feature.version}/conf/sso-idp-config.xml,target:${installFolder}/../conf/sso-idp-config.xml,overwrite:true);\

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.ui.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.ui.feature/2.1.0/pom.xml b/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.ui.feature/2.1.0/pom.xml
deleted file mode 100644
index 5472443..0000000
--- a/features/stratos/sso-mgt/org.wso2.stratos.identity.saml2.sso.mgt.ui.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.wso2.carbon</groupId>
-		<artifactId>stratos-sso-mgt-feature</artifactId>
-		<version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.wso2.stratos.identity.saml2.sso.mgt.ui.feature</artifactId>
-	<packaging>pom</packaging>
-	<version>2.1.0</version>
-	<name>WSO2 Stratos - Stratos SSO Management UI Feature</name>
-	<url>http://wso2.org</url>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.wso2.carbon</groupId>
-			<artifactId>org.wso2.stratos.identity.saml2.sso.mgt.ui</artifactId>
-            <version>2.1.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.wso2.stratos.identity.saml2.sso.mgt.ui</id>
-							<propertiesFile>../../etc/feature.properties</propertiesFile>
-							    <adviceFile>
-								<properties>
-								    <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef>
-								</properties>
-							    </adviceFile> 
-							<bundles>
-								<bundleDef>org.wso2.carbon:org.wso2.stratos.identity.saml2.sso.mgt.ui</bundleDef>
-							</bundles>
-							<importFeatures>
-								<importFeatureDef>org.wso2.carbon.core.ui:${carbon.version}</importFeatureDef>
-							</importFeatures>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/sso-mgt/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/sso-mgt/pom.xml b/features/stratos/sso-mgt/pom.xml
deleted file mode 100644
index 26ff6f6..0000000
--- a/features/stratos/sso-mgt/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. 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.wso2.carbon</groupId>
-        <artifactId>stratos-features</artifactId>
-        <version>2.1.0</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>stratos-sso-mgt-feature</artifactId>
-	<packaging>pom</packaging>
-	<name>WSO2 Stratos - Stratos SSO Management Feature Aggregator Module</name>
-	<url>http://wso2.org</url>
-
-	<modules>
-		<module>org.wso2.stratos.identity.saml2.sso.mgt.feature/2.1.0</module>
-		<module>org.wso2.stratos.identity.saml2.sso.mgt.server.feature/2.1.0</module>
-		<module>org.wso2.stratos.identity.saml2.sso.mgt.ui.feature/2.1.0</module>
-	</modules>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/status-monitor/org.wso2.carbon.status.monitor.agent.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/status-monitor/org.wso2.carbon.status.monitor.agent.feature/2.1.0/pom.xml b/features/stratos/status-monitor/org.wso2.carbon.status.monitor.agent.feature/2.1.0/pom.xml
deleted file mode 100644
index be80685..0000000
--- a/features/stratos/status-monitor/org.wso2.carbon.status.monitor.agent.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2012, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ 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.
--->
-        
-<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.wso2.carbon</groupId>
-   	<artifactId>status-monitor-feature</artifactId>
-        <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.status.monitor.agent.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Stratos - Status Monitor Agent Feature</name>
-    <url>http://wso2.org</url>
-    <description>
-        This feature contains the bundles required for Status Monitoring Backend Functionality
-    </description>
-
-    <dependencies>
-        <dependency>              
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.status.monitor.core</artifactId>
-        </dependency>
-        <dependency>              
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.status.monitor.agent</artifactId>
-        </dependency>
-
-        <!--dependencies for the service service-->
-        <!--dependencies for the Identity Server Client-->
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.authenticator.stub</artifactId>
-            <version>${wso2carbon.version}</version>
-        </dependency>
-
-        <!--dependencies for the CEP Server and MB Client-->
-        <dependency>
-            <groupId>org.apache.geronimo.specs.wso2</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-            <version>${orbit.version.geronimo-jms_1.1_spec}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.qpid.wso2</groupId>
-            <artifactId>qpid-client</artifactId>
-            <version>0.12.wso2v1</version>
-        </dependency>
-
-        <!--dependencies to invoke the load average service-->
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.load.balance.agent.stub</artifactId>
-            <version>${wso2carbon.version}</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.wso2.carbon.status.monitor.agent</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.wso2.carbon:org.wso2.carbon.status.monitor.core</bundleDef>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.status.monitor.agent</bundleDef>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.authenticator.stub</bundleDef>
-                                <bundleDef>org.apache.geronimo.specs.wso2:geronimo-jms_1.1_spec</bundleDef>
-                                <bundleDef>org.apache.qpid.wso2:qpid-client</bundleDef>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.load.balance.agent.stub</bundleDef>
-                            </bundles>
-                            <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef>
-                            </importFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/status-monitor/org.wso2.carbon.status.monitor.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/status-monitor/org.wso2.carbon.status.monitor.feature/2.1.0/pom.xml b/features/stratos/status-monitor/org.wso2.carbon.status.monitor.feature/2.1.0/pom.xml
deleted file mode 100644
index 80f885a..0000000
--- a/features/stratos/status-monitor/org.wso2.carbon.status.monitor.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2012, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ 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.
--->
-        
-<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.wso2.carbon</groupId>
-    	<artifactId>status-monitor-feature</artifactId>
-        <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.status.monitor.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Stratos - Status Monitor Feature</name>
-    <url>http://wso2.org</url>
-    <description>
-        This feature contains the bundles required for the Stratos Status Monitor Functionality
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.status.monitor.server.feature</artifactId>
-            <version>${project.version}</version>
-            <type>zip</type>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.status.monitor.ui.feature</artifactId>
-            <version>${project.version}</version>
-            <type>zip</type>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.status.monitor.agent.feature</artifactId>
-            <version>${project.version}</version>
-            <type>zip</type>
-        </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.wso2.carbon.status.monitor</id>
-                            <propertiesFile>../../../etc/feature.properties</propertiesFile>
-                            <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core:${wso2carbon.version}</importFeatureDef>
-                            </importFeatures>
-                            <includedFeatures>
-                                <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.status.monitor.ui.feature</includedFeatureDef>
-                                <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.status.monitor.server.feature</includedFeatureDef>
-                                <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.status.monitor.agent.feature</includedFeatureDef>
-                            </includedFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/status-monitor/org.wso2.carbon.status.monitor.server.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/status-monitor/org.wso2.carbon.status.monitor.server.feature/2.1.0/pom.xml b/features/stratos/status-monitor/org.wso2.carbon.status.monitor.server.feature/2.1.0/pom.xml
deleted file mode 100644
index c1bbe00..0000000
--- a/features/stratos/status-monitor/org.wso2.carbon.status.monitor.server.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2012, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ 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.
--->
-        
-<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.wso2.carbon</groupId>
-   	<artifactId>status-monitor-feature</artifactId>
-        <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.status.monitor.server.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Stratos - Status Monitor Server Feature</name>
-    <url>http://wso2.org</url>
-    <description>
-        This feature contains the bundles required for Status Monitoring Backend Functionality
-    </description>
-
-    <dependencies>
-        <dependency>              
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.status.monitor.core</artifactId>
-        </dependency>
-        <dependency>              
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.status.monitor</artifactId>
-        </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.wso2.carbon.status.monitor.server</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.wso2.carbon:org.wso2.carbon.status.monitor.core</bundleDef>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.status.monitor</bundleDef>
-                            </bundles>
-                            <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef>
-                            </importFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/status-monitor/org.wso2.carbon.status.monitor.ui.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/status-monitor/org.wso2.carbon.status.monitor.ui.feature/2.1.0/pom.xml b/features/stratos/status-monitor/org.wso2.carbon.status.monitor.ui.feature/2.1.0/pom.xml
deleted file mode 100644
index 5b9f149..0000000
--- a/features/stratos/status-monitor/org.wso2.carbon.status.monitor.ui.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2012, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ 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.
--->
-        
-<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.wso2.carbon</groupId>
-   	<artifactId>status-monitor-feature</artifactId>
-        <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.status.monitor.ui.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Status Monitor UI Feature</name>
-    <url>http://wso2.org</url>
-    <description>
-        This feature contains the bundles required for the Status Monitor Front End
-    </description>
-
-    <dependencies>
-        <dependency>              
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.status.monitor.ui</artifactId>
-        </dependency>
-        <dependency>              
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.status.monitor.stub</artifactId>
-        </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.wso2.carbon.status.monitor.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.status.monitor.ui</bundleDef>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.status.monitor.stub</bundleDef>
-                            </bundles>
-                            <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.ui:${wso2carbon.version}</importFeatureDef>
-                            </importFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/status-monitor/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/status-monitor/pom.xml b/features/stratos/status-monitor/pom.xml
deleted file mode 100644
index 68d8334..0000000
--- a/features/stratos/status-monitor/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2012, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ 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.
--->
-        
-<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.wso2.carbon</groupId>
-        <artifactId>stratos-features</artifactId>
-        <version>2.1.0</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>status-monitor-feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Stratos - Status Monitor Aggregator Module</name>
-    <url>http://wso2.org</url>
-
-    <modules>
-        <module>org.wso2.carbon.status.monitor.feature/2.1.0</module>
-        <module>org.wso2.carbon.status.monitor.server.feature/2.1.0</module>
-        <module>org.wso2.carbon.status.monitor.agent.feature/2.1.0</module>
-        <module>org.wso2.carbon.status.monitor.ui.feature/2.1.0</module>
-    </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.status.monitor</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.status.monitor.core</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.status.monitor.agent</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.status.monitor.ui</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.status.monitor.stub</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/tenant-activity/org.wso2.carbon.tenant.activity.server.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/tenant-activity/org.wso2.carbon.tenant.activity.server.feature/2.1.0/pom.xml b/features/stratos/tenant-activity/org.wso2.carbon.tenant.activity.server.feature/2.1.0/pom.xml
deleted file mode 100644
index cedff5a..0000000
--- a/features/stratos/tenant-activity/org.wso2.carbon.tenant.activity.server.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2010-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ 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.
--->
-
-<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.wso2.carbon</groupId>
-        <artifactId>tenant-activity-feature</artifactId>
-        <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.tenant.activity.server.feature</artifactId>
-    <version>2.1.0</version>
-    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Tenant activity Server Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the core bundles required for API management back end
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.tenant.activity</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>           
- <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-                <executions>                  
-                </executions>
-            </plugin>
-
-            <plugin>
-		        <artifactId>maven-resources-plugin</artifactId>
-		        <executions>
-		           
-		        </executions>
-		    </plugin>
-
-
-            <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.wso2.carbon.tenant.activity.server</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.wso2.carbon:org.wso2.carbon.tenant.activity</bundleDef>
-                            </bundles>
-                            <importBundles>
-                            </importBundles>
-                            <importFeatures>
-                            </importFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/tenant-activity/org.wso2.carbon.tenant.activity.ui.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/tenant-activity/org.wso2.carbon.tenant.activity.ui.feature/2.1.0/pom.xml b/features/stratos/tenant-activity/org.wso2.carbon.tenant.activity.ui.feature/2.1.0/pom.xml
deleted file mode 100644
index b781888..0000000
--- a/features/stratos/tenant-activity/org.wso2.carbon.tenant.activity.ui.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ 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.
--->
-
-<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.wso2.carbon</groupId>
-        <artifactId>tenant-activity-feature</artifactId>
-        <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.tenant.activity.ui.feature</artifactId>
-    <version>2.1.0</version>
-    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Tenant Activity UI Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the bundles required for Tenant Activity front-end functionality
-    </description>
-
-    <dependencies>
- 	<dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.tenant.activity.stub</artifactId>
-            <version>4.1.0</version>
-        </dependency>
-	<dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.tenant.activity.ui</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-	<dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.tenant.activity</artifactId>
-            <version>2.1.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>4-p2-feature-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-feature-gen</goal>
-                        </goals>
-                        <configuration>
-                            <id>org.wso2.carbon.tenant.activity.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.tenant.activity.stub</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.activity.ui</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.activity</bundleDef>
-                            </bundles>
-                            <importBundles>
-                                <!--<importBundleDef>org.wso2.carbon:org.wso2.carbon.identity.core</importBundleDef>-->
-                            </importBundles>
-                            <importFeatures>
-                            </importFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/tenant-activity/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/tenant-activity/pom.xml b/features/stratos/tenant-activity/pom.xml
deleted file mode 100644
index 44c35fd..0000000
--- a/features/stratos/tenant-activity/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ 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.
--->
-<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.wso2.carbon</groupId>
-        <artifactId>stratos-features</artifactId>
-        <version>2.1.0</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>tenant-activity-feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Stratos - Tenant activity Feature Aggregator Module</name>
-    <url>http://wso2.org</url>
-    <modules>
-        <module>org.wso2.carbon.tenant.activity.ui.feature/2.1.0</module>
-        <module>org.wso2.carbon.tenant.activity.server.feature/2.1.0</module>
-    </modules>
-</project>
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/pom.xml b/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/pom.xml
deleted file mode 100644
index 0dca9ce..0000000
--- a/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ 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.
--->
-
-<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.wso2.carbon</groupId>
-        <artifactId>tenant-mgt-feature</artifactId>
-        <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-        <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.tenant.mgt.core.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Stratos - Multitenancy Tenant Management Server Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the core bundles required for Back-end Multitenancy Tenant Management Core functionality</description>
-
-       <dependencies>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.tenant.mgt.core</artifactId>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.keystore.mgt</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.theme.mgt</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.stratos.common</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-        </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-               <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>prefilter-resources</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>src/main/resources</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>resources</directory>
-                                    <includes>
-                                        <include>**/cloud-services-desc.xml</include>
-                                        <include>p2.inf</include>
-                                        <include>build.properties</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <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.wso2.carbon.tenant.mgt.core</id>
-                            <propertiesFile>../../../../etc/feature.properties</propertiesFile>
-                            <adviceFile>
-                                <properties>
-                                    <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
-                                </properties>
-                            </adviceFile>
-                            <!--bundles>
-                            </bundles-->
-                            <importBundles>
-                                 <importBundleDef>org.wso2.carbon:org.wso2.carbon.stratos.common</importBundleDef>
-                                 <importBundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.core</importBundleDef>
-                                 <importBundleDef>org.wso2.carbon:org.wso2.carbon.theme.mgt</importBundleDef>
-                                 <importBundleDef>org.wso2.carbon:org.wso2.carbon.keystore.mgt</importBundleDef>
-                            </importBundles>
-                            <importFeatures>
-                               
-                            </importFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/build.properties b/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/build.properties
deleted file mode 100644
index 59417f4..0000000
--- a/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-custom = true
-root.tenant.core=conf

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/conf/cloud-services-desc.xml
----------------------------------------------------------------------
diff --git a/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/conf/cloud-services-desc.xml b/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/conf/cloud-services-desc.xml
deleted file mode 100644
index 7f797b1..0000000
--- a/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/conf/cloud-services-desc.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<!-- 
-     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="WSO2 Stratos Manager">
-        <key>manager</key>
-	<link>https://cloud.wso2.com</link>
-    </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/incubator-stratos/blob/25ac7c8e/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/p2.inf b/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/p2.inf
deleted file mode 100644
index 644de8e..0000000
--- a/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.tenant.mgt.core_${feature.version}/conf/cloud-services-desc.xml,target:${installFolder}/../conf/cloud-services-desc.xml,overwrite:true);

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.server.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.server.feature/2.1.0/pom.xml b/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.server.feature/2.1.0/pom.xml
deleted file mode 100644
index 32ac1d3..0000000
--- a/features/stratos/tenant-mgt/org.wso2.carbon.tenant.mgt.server.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ 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.
--->
-
-<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.wso2.carbon</groupId>
-        <artifactId>tenant-mgt-feature</artifactId>
-        <version>2.1.0</version>
-	<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.tenant.mgt.server.feature</artifactId>
-    <version>2.1.0</version>
-    <packaging>pom</packaging>
-    <name>WSO2 Stratos - Multitenancy Tenant Management Server Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the core bundles required for Back-end Multitenancy Tenant Management Core functionality</description>
-
-    <dependencies>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.tenant.mgt.core</artifactId>
-		<version>2.1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.tenant.mgt</artifactId>
-		<version>2.1.0</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.email.verification</artifactId>
-		<version>4.1.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.wso2.carbon.tenant.mgt.server</id>
-                            <propertiesFile>../../../../etc/feature.properties</propertiesFile>
-                            <adviceFile>
-                                <properties>
-                                    <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
-                                </properties>
-                            </adviceFile>
-                            <bundles>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.core</bundleDef>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt</bundleDef>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.email.verification</bundleDef>
-                            </bundles>
-                            <importFeatures>
-                               <importFeatureDef>org.wso2.carbon.core.server</importFeatureDef> 
-                               <!-- <importFeatureDef>org.wso2.carbon.registry.core.server.feature</importFeatureDef>-->
-                            </importFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/tenant-mgt/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/tenant-mgt/pom.xml b/features/stratos/tenant-mgt/pom.xml
deleted file mode 100644
index 691b2f0..0000000
--- a/features/stratos/tenant-mgt/pom.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ 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.
--->
-        
-<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.wso2.carbon</groupId>
-        <artifactId>stratos-features</artifactId>
-        <version>2.1.0</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>tenant-mgt-feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Stratos - Tenant Management Aggregator Module</name>
-    <url>http://wso2.org</url>
-
-    <modules>
-        <module>org.wso2.carbon.tenant.mgt.server.feature/2.1.0</module>
-        <module>org.wso2.carbon.tenant.mgt.core.feature/2.1.0</module>
-    </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.tenant.mgt</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.tenant.mgt.core</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.keystore.mgt</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.theme.mgt</artifactId>
-                <version>${stratos.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.email.verification</artifactId>
-                <version>${wso2carbon.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-</project>
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/throttling/org.wso2.carbon.stratos.throttling.agent.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/throttling/org.wso2.carbon.stratos.throttling.agent.feature/2.1.0/pom.xml b/features/stratos/throttling/org.wso2.carbon.stratos.throttling.agent.feature/2.1.0/pom.xml
deleted file mode 100644
index 79bc582..0000000
--- a/features/stratos/throttling/org.wso2.carbon.stratos.throttling.agent.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ 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.
--->
-
-<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.wso2.carbon</groupId>
-        <artifactId>throttling-feature</artifactId>
-        <version>2.1.0</version>
-	<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.stratos.throttling.agent.feature</artifactId>
-    <version>2.1.0</version>
-    <packaging>pom</packaging>
-    <name>WSO2 Stratos - Throttling Agent Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the bundles required for throttle resource usage</description>
-
-        <dependencies>
- 	<dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.throttling.agent</artifactId>
-                <version>2.1.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.wso2.carbon.stratos.throttling.agent</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.throttling.agent</bundleDef>
-								<bundleDef>org.wso2.carbon:org.wso2.carbon.throttling.agent.stub</bundleDef>
-                            </bundles>             
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/throttling/org.wso2.carbon.stratos.throttling.manager.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/throttling/org.wso2.carbon.stratos.throttling.manager.feature/2.1.0/pom.xml b/features/stratos/throttling/org.wso2.carbon.stratos.throttling.manager.feature/2.1.0/pom.xml
deleted file mode 100644
index 1b78930..0000000
--- a/features/stratos/throttling/org.wso2.carbon.stratos.throttling.manager.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ 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.
--->
-
-<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.wso2.carbon</groupId>
-        <artifactId>throttling-feature</artifactId>
-        <version>2.1.0</version>
-	<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.stratos.throttling.manager.feature</artifactId>
-    <version>2.1.0</version>
-    <packaging>pom</packaging>
-    <name>WSO2 Stratos - Throttling Manager Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the bundles required for throttling rule excecution, update and controll throttling process</description>
-
-        <dependencies>
- 	<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.throttling.manager</artifactId>
-                <version>2.1.0</version>
-        </dependency>
-	<dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.throttling.ui</artifactId>
-                <version>${stratos.version}</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.wso2.carbon.stratos.throttling.manager</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.throttling.manager</bundleDef>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.throttling.ui:${stratos.version}</bundleDef>
-								<bundleDef>org.wso2.carbon:org.wso2.carbon.throttling.stub:${carbon.platform.version}</bundleDef>
-                            </bundles>
-                            <!--importFeatures>
-                                <importFeatureDef>org.wso2.carbon.stratos.common:${wso2carbon.version}</importFeatureDef>
-                            </importFeatures-->                            
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>