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:10 UTC

[08/15] renaming stratos to manager

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/manager/throttling/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/throttling/pom.xml b/features/manager/throttling/pom.xml
new file mode 100644
index 0000000..fcf1100
--- /dev/null
+++ b/features/manager/throttling/pom.xml
@@ -0,0 +1,36 @@
+<?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>throttling-feature</artifactId>
+    <packaging>pom</packaging>
+    <name>WSO2 Stratos - Throttling Feature Aggregator Module</name>
+    <url>http://wso2.org</url>
+    <modules>
+        <module>org.wso2.carbon.stratos.throttling.manager.feature/2.1.0</module>
+        <module>org.wso2.carbon.stratos.throttling.agent.feature/2.1.0</module>
+    </modules>
+</project>
+

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/manager/usage/org.wso2.carbon.stratos.usage.agent.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/usage/org.wso2.carbon.stratos.usage.agent.feature/2.1.0/pom.xml b/features/manager/usage/org.wso2.carbon.stratos.usage.agent.feature/2.1.0/pom.xml
new file mode 100644
index 0000000..ceebe88
--- /dev/null
+++ b/features/manager/usage/org.wso2.carbon.stratos.usage.agent.feature/2.1.0/pom.xml
@@ -0,0 +1,77 @@
+<?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>usage-feature</artifactId>
+        <version>2.1.0</version>
+	<relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <version>2.1.0</version>
+    <artifactId>org.wso2.carbon.stratos.usage.agent.feature</artifactId>
+    <packaging>pom</packaging>
+    <name>WSO2 Stratos - Usage Agent Feature</name>
+    <url>http://wso2.org</url>
+    <description>This feature contains the bundles required for usage data collecting and publishing functionality</description>
+
+        <dependencies>
+ 	<dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.registry.common</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.stratos.usage.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.usage.agent</bundleDef>
+                            </bundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/manager/usage/org.wso2.carbon.stratos.usage.agent.feature/2.1.2/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/usage/org.wso2.carbon.stratos.usage.agent.feature/2.1.2/pom.xml b/features/manager/usage/org.wso2.carbon.stratos.usage.agent.feature/2.1.2/pom.xml
new file mode 100644
index 0000000..6caf5f8
--- /dev/null
+++ b/features/manager/usage/org.wso2.carbon.stratos.usage.agent.feature/2.1.2/pom.xml
@@ -0,0 +1,81 @@
+<?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>usage-feature</artifactId>
+        <version>2.1.0</version>
+	<relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <version>2.1.2</version>
+    <artifactId>org.wso2.carbon.stratos.usage.agent.feature</artifactId>
+    <packaging>pom</packaging>
+    <name>WSO2 Stratos - Usage Agent Feature</name>
+    <url>http://wso2.org</url>
+    <description>This feature contains the bundles required for usage data collecting and publishing functionality</description>
+
+        <dependencies>
+ 	<dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.registry.common</artifactId>
+                <version>${wso2carbon.version}</version>
+        </dependency>
+	        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.usage.agent</artifactId>
+            <version>2.1.2</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.usage.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.usage.agent</bundleDef>
+                            </bundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/manager/usage/org.wso2.carbon.stratos.usage.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/usage/org.wso2.carbon.stratos.usage.feature/2.1.0/pom.xml b/features/manager/usage/org.wso2.carbon.stratos.usage.feature/2.1.0/pom.xml
new file mode 100644
index 0000000..352c4d2
--- /dev/null
+++ b/features/manager/usage/org.wso2.carbon.stratos.usage.feature/2.1.0/pom.xml
@@ -0,0 +1,79 @@
+<?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>usage-feature</artifactId>
+        <version>2.1.0</version>
+	<relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.stratos.usage.feature</artifactId>
+    <packaging>pom</packaging>
+    <version>2.1.0</version>
+    <name>WSO2 Stratos - Usage Composite Feature</name>
+    <url>http://wso2.org</url>
+    <description>This feature contains the bundles required for Usage feature</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.stratos.usage.server.feature</artifactId>
+            <version>2.1.0</version>
+            <type>zip</type>
+            </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.stratos.usage.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>p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>org.wso2.carbon.stratos.usage</id>
+                            <propertiesFile>../../../../etc/feature.properties</propertiesFile>
+                            <includedFeatures>
+                                <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.stratos.usage.server.feature</includedFeatureDef>
+				<includedFeatureDef>org.wso2.carbon:org.wso2.carbon.stratos.usage.ui.feature</includedFeatureDef>
+                            </includedFeatures>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/manager/usage/org.wso2.carbon.stratos.usage.feature/2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/usage/org.wso2.carbon.stratos.usage.feature/2.1.3/pom.xml b/features/manager/usage/org.wso2.carbon.stratos.usage.feature/2.1.3/pom.xml
new file mode 100644
index 0000000..60a094b
--- /dev/null
+++ b/features/manager/usage/org.wso2.carbon.stratos.usage.feature/2.1.3/pom.xml
@@ -0,0 +1,79 @@
+<?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>usage-feature</artifactId>
+        <version>2.1.0</version>
+	<relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.stratos.usage.feature</artifactId>
+    <packaging>pom</packaging>
+    <version>2.1.3</version>
+    <name>WSO2 Stratos - Usage Composite Feature</name>
+    <url>http://wso2.org</url>
+    <description>This feature contains the bundles required for Usage feature</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.stratos.usage.server.feature</artifactId>
+            <version>2.1.3</version>
+            <type>zip</type>
+            </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.stratos.usage.ui.feature</artifactId>
+            <version>2.1.3</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.stratos.usage</id>
+                            <propertiesFile>../../../../etc/feature.properties</propertiesFile>
+                            <includedFeatures>
+                                <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.stratos.usage.server.feature:2.1.3</includedFeatureDef>
+				<includedFeatureDef>org.wso2.carbon:org.wso2.carbon.stratos.usage.ui.feature:2.1.3</includedFeatureDef>
+                            </includedFeatures>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/manager/usage/org.wso2.carbon.stratos.usage.server.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/usage/org.wso2.carbon.stratos.usage.server.feature/2.1.0/pom.xml b/features/manager/usage/org.wso2.carbon.stratos.usage.server.feature/2.1.0/pom.xml
new file mode 100644
index 0000000..48496d3
--- /dev/null
+++ b/features/manager/usage/org.wso2.carbon.stratos.usage.server.feature/2.1.0/pom.xml
@@ -0,0 +1,80 @@
+<?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>usage-feature</artifactId>
+        <version>2.1.0</version>
+	<relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.stratos.usage.server.feature</artifactId>
+    <version>2.1.0</version>
+    <packaging>pom</packaging>
+    <name>WSO2 Stratos - Usage Server Feature</name>
+    <url>http://wso2.org</url>
+    <description>This feature contains the bundles required for usage data accumilating and retreiving functionality</description>
+
+        <dependencies>
+	<dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.usage</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.usage.server</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.usage</bundleDef>
+                                <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.usage.meteringqueryds.stub:${carbon.version}</bundleDef>-->
+                            </bundles>
+                            <!--importFeatures>
+                                <importFeatureDef>org.wso2.carbon.stratos.common:${wso2carbon.version}</importFeatureDef>
+                            </importFeatures-->                            
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/manager/usage/org.wso2.carbon.stratos.usage.server.feature/2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/usage/org.wso2.carbon.stratos.usage.server.feature/2.1.3/pom.xml b/features/manager/usage/org.wso2.carbon.stratos.usage.server.feature/2.1.3/pom.xml
new file mode 100644
index 0000000..7471545
--- /dev/null
+++ b/features/manager/usage/org.wso2.carbon.stratos.usage.server.feature/2.1.3/pom.xml
@@ -0,0 +1,80 @@
+<?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>usage-feature</artifactId>
+        <version>2.1.0</version>
+	<relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.stratos.usage.server.feature</artifactId>
+    <version>2.1.3</version>
+    <packaging>pom</packaging>
+    <name>WSO2 Stratos - Usage Server Feature</name>
+    <url>http://wso2.org</url>
+    <description>This feature contains the bundles required for usage data accumilating and retreiving functionality</description>
+
+        <dependencies>
+	<dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.usage</artifactId>
+                <version>2.1.3</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.usage.server</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.usage</bundleDef>
+                                <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.usage.meteringqueryds.stub:${carbon.version}</bundleDef>-->
+                            </bundles>
+                            <!--importFeatures>
+                                <importFeatureDef>org.wso2.carbon.stratos.common:${wso2carbon.version}</importFeatureDef>
+                            </importFeatures-->                            
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/manager/usage/org.wso2.carbon.stratos.usage.ui.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/usage/org.wso2.carbon.stratos.usage.ui.feature/2.1.0/pom.xml b/features/manager/usage/org.wso2.carbon.stratos.usage.ui.feature/2.1.0/pom.xml
new file mode 100644
index 0000000..448098e
--- /dev/null
+++ b/features/manager/usage/org.wso2.carbon.stratos.usage.ui.feature/2.1.0/pom.xml
@@ -0,0 +1,85 @@
+<?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>usage-feature</artifactId>
+        <version>2.1.0</version>
+	<relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.stratos.usage.ui.feature</artifactId>
+    <version>2.1.0</version>
+    <packaging>pom</packaging>
+    <name>WSO2 Stratos - Usage UI Feature</name>
+    <url>http://wso2.org</url>
+    <description>This feature contains the bundles required for usage ui</description>
+
+        <dependencies>
+ 	<dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.registry.common</artifactId>
+                <version>${wso2carbon.version}</version>
+        </dependency>
+	<dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.usage.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.carbon.stratos.usage.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.usage.ui</bundleDef>
+				<bundleDef>org.wso2.carbon:org.wso2.carbon.usage.stub:4.1.0</bundleDef>
+                            </bundles>
+                            <!--importFeatures>
+                                <importFeatureDef>org.wso2.carbon.stratos.common:${wso2carbon.version}</importFeatureDef>
+                            </importFeatures-->                            
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/manager/usage/org.wso2.carbon.stratos.usage.ui.feature/2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/usage/org.wso2.carbon.stratos.usage.ui.feature/2.1.3/pom.xml b/features/manager/usage/org.wso2.carbon.stratos.usage.ui.feature/2.1.3/pom.xml
new file mode 100644
index 0000000..b1e451d
--- /dev/null
+++ b/features/manager/usage/org.wso2.carbon.stratos.usage.ui.feature/2.1.3/pom.xml
@@ -0,0 +1,85 @@
+<?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>usage-feature</artifactId>
+        <version>2.1.0</version>
+	<relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.stratos.usage.ui.feature</artifactId>
+    <version>2.1.3</version>
+    <packaging>pom</packaging>
+    <name>WSO2 Stratos - Usage UI Feature</name>
+    <url>http://wso2.org</url>
+    <description>This feature contains the bundles required for usage ui</description>
+
+        <dependencies>
+ 	<dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.registry.common</artifactId>
+                <version>${wso2carbon.version}</version>
+        </dependency>
+	<dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.usage.ui</artifactId>
+                <version>2.1.3</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.usage.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.usage.ui:2.1.3</bundleDef>
+				<bundleDef>org.wso2.carbon:org.wso2.carbon.usage.stub:4.1.3</bundleDef>
+                            </bundles>
+                            <!--importFeatures>
+                                <importFeatureDef>org.wso2.carbon.stratos.common:${wso2carbon.version}</importFeatureDef>
+                            </importFeatures-->                            
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/manager/usage/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/usage/pom.xml b/features/manager/usage/pom.xml
new file mode 100644
index 0000000..e52458e
--- /dev/null
+++ b/features/manager/usage/pom.xml
@@ -0,0 +1,36 @@
+<?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>usage-feature</artifactId>
+    <packaging>pom</packaging>
+    <name>WSO2 Stratos - Usage Feature Aggregator Module</name>
+    <url>http://wso2.org</url>
+    <modules>
+        <module>org.wso2.carbon.stratos.usage.server.feature/2.1.0</module>
+        <module>org.wso2.carbon.stratos.usage.agent.feature/2.1.0</module>
+    </modules>
+</project>
+

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/billing/org.wso2.carbon.billing.server.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/billing/org.wso2.carbon.billing.server.feature/2.1.0/pom.xml b/features/stratos/billing/org.wso2.carbon.billing.server.feature/2.1.0/pom.xml
deleted file mode 100644
index 33ea9b4..0000000
--- a/features/stratos/billing/org.wso2.carbon.billing.server.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,103 +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>billing-feature</artifactId>
-        <version>2.1.0</version>
-	<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.billing.server.feature</artifactId>
-    <packaging>pom</packaging>
-    <version>2.1.0</version>
-    <name>WSO2 Stratos - Billing Server Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the bundles required for billing server</description>
-
-        <dependencies>
-	<dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.billing.core</artifactId>
-                <version>2.1.0</version>
-        </dependency>
-	 <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.billing.mgt</artifactId>
-	    <version>2.1.0</version>
-        </dependency>
-	<dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.rule.kernel</artifactId>
-                <version>4.1.0</version>
-        </dependency>
-	<dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.rule.common</artifactId>
-                <version>4.1.0</version>
-        </dependency>
-	<dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.rule.backend</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.billing.server</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.billing.core</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.billing.mgt</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.rule.kernel</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.rule.common</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.rule.backend</bundleDef>
-                           </bundles>
-                            <!--importFeatures>
-                                <importFeatureDef>org.wso2.carbon.stratos.common:${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/billing/org.wso2.carbon.billing.server.feature/2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/billing/org.wso2.carbon.billing.server.feature/2.1.1/pom.xml b/features/stratos/billing/org.wso2.carbon.billing.server.feature/2.1.1/pom.xml
deleted file mode 100644
index b94e4b0..0000000
--- a/features/stratos/billing/org.wso2.carbon.billing.server.feature/2.1.1/pom.xml
+++ /dev/null
@@ -1,109 +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>billing-feature</artifactId>
-        <version>2.1.0</version>
-	<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.billing.server.feature</artifactId>
-    <packaging>pom</packaging>
-    <version>2.1.1</version>
-    <name>WSO2 Stratos - Billing Server Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the bundles required for billing server</description>
-
-        <dependencies>
-	<dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.billing.core</artifactId>
-                <version>2.1.0</version>
-        </dependency>
-	 <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.billing.mgt</artifactId>
-	    <version>2.1.0</version>
-        </dependency>
-	<dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.rule.kernel</artifactId>
-                <version>4.1.0</version>
-        </dependency>
-	<dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.rule.common</artifactId>
-                <version>4.1.0</version>
-        </dependency>
-	<dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.rule.backend</artifactId>
-                <version>4.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.email.sender</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.billing.server</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.billing.core</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.billing.mgt</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.rule.kernel</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.rule.common</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.rule.backend</bundleDef>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.email.sender:2.1.0</bundleDef>
-                           </bundles>
-                            <!--importFeatures>
-                                <importFeatureDef>org.wso2.carbon.stratos.common:${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/billing/org.wso2.carbon.billing.server.feature/2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/billing/org.wso2.carbon.billing.server.feature/2.1.3/pom.xml b/features/stratos/billing/org.wso2.carbon.billing.server.feature/2.1.3/pom.xml
deleted file mode 100644
index baeb861..0000000
--- a/features/stratos/billing/org.wso2.carbon.billing.server.feature/2.1.3/pom.xml
+++ /dev/null
@@ -1,109 +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>billing-feature</artifactId>
-        <version>2.1.0</version>
-	<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.billing.server.feature</artifactId>
-    <packaging>pom</packaging>
-    <version>2.1.3</version>
-    <name>WSO2 Stratos - Billing Server Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the bundles required for billing server</description>
-
-        <dependencies>
-	<dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.billing.core</artifactId>
-                <version>2.1.3</version>
-        </dependency>
-	 <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.billing.mgt</artifactId>
-	    <version>2.1.3</version>
-        </dependency>
-	<dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.rule.kernel</artifactId>
-                <version>4.1.0</version>
-        </dependency>
-	<dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.rule.common</artifactId>
-                <version>4.1.0</version>
-        </dependency>
-	<dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.rule.backend</artifactId>
-                <version>4.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.email.sender</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.billing.server</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.billing.core</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.billing.mgt</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.rule.kernel</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.rule.common</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.rule.backend</bundleDef>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.email.sender:2.1.0</bundleDef>
-                           </bundles>
-                            <!--importFeatures>
-                                <importFeatureDef>org.wso2.carbon.stratos.common:${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/billing/org.wso2.carbon.billing.ui.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/billing/org.wso2.carbon.billing.ui.feature/2.1.0/pom.xml b/features/stratos/billing/org.wso2.carbon.billing.ui.feature/2.1.0/pom.xml
deleted file mode 100644
index c525a0a..0000000
--- a/features/stratos/billing/org.wso2.carbon.billing.ui.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,85 +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>billing-feature</artifactId>
-        <version>2.1.0</version>
-	<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.billing.ui.feature</artifactId>
-    <version>2.1.0</version>
-    <packaging>pom</packaging>
-    <name>WSO2 Stratos - Billing UI Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the bundles required for billing UI</description>
-
-        <dependencies>
-	<dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.billing.mgt.stub</artifactId>
-                <version>4.1.0</version>
-        </dependency>
-	<dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.billing.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.carbon.billing.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.billing.mgt.stub</bundleDef>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.billing.mgt.ui</bundleDef>
-                           </bundles>
-                            <!--importFeatures>
-                                <importFeatureDef>org.wso2.carbon.stratos.common:${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/billing/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/billing/pom.xml b/features/stratos/billing/pom.xml
deleted file mode 100644
index 53414da..0000000
--- a/features/stratos/billing/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>billing-feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Stratos - Billing Feature Aggregator Module</name>
-    <url>http://wso2.org</url>
-    <modules>
-        <module>org.wso2.carbon.billing.server.feature/2.1.0</module>
-        <module>org.wso2.carbon.billing.ui.feature/2.1.0</module>
-    </modules>
-</project>
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/cartridge-mgt/org.wso2.carbon.cartridge.mgt.ui.feature/2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/cartridge-mgt/org.wso2.carbon.cartridge.mgt.ui.feature/2.1.1/pom.xml b/features/stratos/cartridge-mgt/org.wso2.carbon.cartridge.mgt.ui.feature/2.1.1/pom.xml
deleted file mode 100644
index 41d2ac2..0000000
--- a/features/stratos/cartridge-mgt/org.wso2.carbon.cartridge.mgt.ui.feature/2.1.1/pom.xml
+++ /dev/null
@@ -1,88 +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>cartridge-mgt-feature</artifactId>
-        <version>2.1.0</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.cartridge.mgt.ui.feature</artifactId>
-    <packaging>pom</packaging>
-    <version>2.1.1</version>
-    <name>WSO2 Carbon - Cartridge Management UI Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the bundles required for Front-end Stratos manager</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.cartridge.mgt.ui</artifactId>
-	    <version>${project.version}</version>
-        </dependency>
-	<dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.adc.mgt.stub</artifactId>
-	    <version>4.1.1</version>	
-        </dependency>
-	<dependency>
-	    <groupId>org.wso2.carbon</groupId>
-	    <artifactId>org.wso2.carbon.adc.reponotification.service.stub</artifactId>
-	    <version>4.1.1</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.cartridge.mgt.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.cartridge.mgt.ui</bundleDef>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.adc.mgt.stub</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.adc.reponotification.service.stub</bundleDef>
-                            </bundles>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/cartridge-mgt/org.wso2.carbon.cartridge.mgt.ui.feature/2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/cartridge-mgt/org.wso2.carbon.cartridge.mgt.ui.feature/2.1.3/pom.xml b/features/stratos/cartridge-mgt/org.wso2.carbon.cartridge.mgt.ui.feature/2.1.3/pom.xml
deleted file mode 100644
index aecbcad..0000000
--- a/features/stratos/cartridge-mgt/org.wso2.carbon.cartridge.mgt.ui.feature/2.1.3/pom.xml
+++ /dev/null
@@ -1,88 +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>cartridge-mgt-feature</artifactId>
-        <version>2.1.0</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.cartridge.mgt.ui.feature</artifactId>
-    <packaging>pom</packaging>
-    <version>2.1.3</version>
-    <name>WSO2 Carbon - Cartridge Management UI Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the bundles required for Front-end Stratos manager</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.cartridge.mgt.ui</artifactId>
-	    <version>${project.version}</version>
-        </dependency>
-	<dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.adc.mgt.stub</artifactId>
-	    <version>4.1.3</version>	
-        </dependency>
-	<dependency>
-	    <groupId>org.wso2.carbon</groupId>
-	    <artifactId>org.wso2.carbon.adc.reponotification.service.stub</artifactId>
-	    <version>4.1.1</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.cartridge.mgt.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.cartridge.mgt.ui:${project.version}</bundleDef>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.adc.mgt.stub:4.1.3</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.adc.reponotification.service.stub:4.1.1</bundleDef>
-                            </bundles>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/cartridge-mgt/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/cartridge-mgt/pom.xml b/features/stratos/cartridge-mgt/pom.xml
deleted file mode 100644
index 327df67..0000000
--- a/features/stratos/cartridge-mgt/pom.xml
+++ /dev/null
@@ -1,55 +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>cartridge-mgt-feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Cartridge Management UI Feature Aggregator Module</name>
-    <url>http://wso2.org</url>
-
-    <modules>
-        <module>org.wso2.carbon.cartridge.mgt.ui.feature/2.1.1</module>
-    </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.cartridge.mgt.ui</artifactId>
-                <version>2.1.1</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.adc.mgt.stub</artifactId>
-                <version>4.1.1</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-</project>
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/features/stratos/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/pom.xml b/features/stratos/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/pom.xml
deleted file mode 100644
index c444792..0000000
--- a/features/stratos/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/pom.xml
+++ /dev/null
@@ -1,282 +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>cloud-controller-feature</artifactId>
-        <version>2.1.0</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <version>2.1.1</version>
-    <artifactId>org.wso2.carbon.stratos.cloud.controller.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Stratos Cloud Controller Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the required bundles for the functionality of Cloud Controller</description>
-    <dependencies>
-	<dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.stratos.cloud.controller</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-           <groupId>org.jclouds</groupId>
-           <artifactId>jclouds-core</artifactId>
-           <version>${jclouds.version}</version>
-        </dependency>
-        <dependency>
-           <groupId>org.jclouds</groupId>
-           <artifactId>jclouds-compute</artifactId>
-           <version>${jclouds.version}</version>
-         </dependency>
-         <dependency>
-           <groupId>org.jclouds.driver</groupId>
-           <artifactId>jclouds-bouncycastle</artifactId>
-           <version>${jclouds.version}</version>
-           <exclusions>
-              <exclusion>
-                 <groupId>org.bouncycastle</groupId>
-                 <artifactId>bcprov-jdk16</artifactId>
-              </exclusion>
-           </exclusions>
-         </dependency>
-         <dependency>
-           <groupId>org.jclouds.driver</groupId>
-           <artifactId>jclouds-sshj</artifactId>
-           <version>${jclouds.version}</version>
-         </dependency>
-         <dependency>
-           <groupId>org.jclouds.driver</groupId>
-           <artifactId>jclouds-log4j</artifactId>
-           <version>${jclouds.version}</version>
-         </dependency>
-         <dependency>
-           <groupId>org.jclouds.driver</groupId>
-           <artifactId>jclouds-enterprise</artifactId>
-           <version>${jclouds.version}</version>
-         </dependency>
-         <dependency>
-           <groupId>org.jclouds.api</groupId>
-           <artifactId>ec2</artifactId>
-           <version>${jclouds.version}</version>
-         </dependency>
-         <dependency>
-           <groupId>org.jclouds.provider</groupId>
-           <artifactId>aws-ec2</artifactId>
-           <version>${jclouds.version}</version>
-         </dependency>
-         <dependency>
-           <groupId>org.jclouds.api</groupId>
-           <artifactId>openstack-nova</artifactId>
-           <version>${jclouds.version}</version>
-         </dependency>
-         <dependency>
-          <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-scriptbuilder</artifactId>
-              <version>${jclouds.version}</version>
-         </dependency>
-         <dependency>
-           <groupId>com.google.guava.wso2</groupId>
-           <artifactId>guava</artifactId>
-           <version>${google.guava.wso2.version}</version>
-         </dependency>
-         <dependency>
-          <groupId>org.jclouds.common</groupId>
-            <artifactId>aws-common</artifactId>
-              <version>${jclouds.version}</version>
-         </dependency>
-         <dependency>
-      	     <groupId>com.jamesmurty.utils.wso2</groupId>
-             <artifactId>java-xmlbuilder</artifactId>
-             <version>0.4.wso2v1</version>
-         </dependency>
-        <dependency>
-            <groupId>org.jclouds.api</groupId>
-            <artifactId>vcloud</artifactId>
-            <version>1.6.0-wso2v1</version>
-        </dependency>
-         <dependency>
-           <groupId>com.google.code.gson</groupId>
-           <artifactId>gson</artifactId>
-           <version>${gson2.version}</version>
-         </dependency>
-         <dependency>
-           <groupId>com.google.guice.wso2</groupId>
-           <artifactId>guice</artifactId>
-           <version>${google.guice.wso2.version}</version>
-         </dependency>
-         <dependency>
-           <groupId>com.google.guice.assistedinject.wso2</groupId>
-           <artifactId>guice-assistedinject</artifactId>
-           <version>${com.google.guice.assistedinject.wso2.version}</version>
-         </dependency>
-         <dependency>
-           <groupId>com.sun.jersey</groupId>
-           <artifactId>jersey-core</artifactId>
-           <version>${sun.jersey.version}</version>
-         </dependency>
-         <dependency>
-          <groupId>net.oauth.core</groupId>
-          <artifactId>oauth</artifactId>
-          <version>20100527</version>
-         </dependency>
-         <dependency>
-           <groupId>commons-io.wso2</groupId>
-           <artifactId>commons-io</artifactId>
-           <version>2.0.0.wso2v1</version>
-         </dependency>
-         <dependency>
-           <groupId>rhino.wso2</groupId>
-           <artifactId>js</artifactId>
-           <version>1.7.0.R1-wso2v3</version>
-         </dependency>
-         <dependency>
-           <groupId>org.wso2.carbon</groupId>
-           <artifactId>org.wso2.carbon.cartridge.messages</artifactId>
-           <version>2.1.1</version>
-         </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-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/qpid-config.xml</include>
-                                        <include>conf/qpid-virtualhosts.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>4-p2-feature-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-feature-gen</goal>
-                        </goals>
-                        <configuration>
-                            <id>org.wso2.carbon.stratos.cloud.controller</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.cartridge.messages:2.1.1</bundleDef>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.stratos.cloud.controller:2.1.1</bundleDef>
-                                <bundleDef>org.jclouds.driver:jclouds-bouncycastle:${jclouds.version}</bundleDef>
-                                <bundleDef>org.jclouds.driver:jclouds-sshj:${jclouds.version}</bundleDef>
-                                <bundleDef>org.jclouds.driver:jclouds-log4j:${jclouds.version}</bundleDef>
-                                <bundleDef>org.jclouds.driver:jclouds-enterprise:${jclouds.version}</bundleDef>
-                                <bundleDef>org.jclouds:jclouds-core:${jclouds.version}</bundleDef>
-                                <bundleDef>org.jclouds:jclouds-compute:${jclouds.version}</bundleDef>
-                                <bundleDef>org.jclouds.api:ec2:${jclouds.version}</bundleDef>
-                                <bundleDef>org.jclouds.api:openstack-nova:${jclouds.version}</bundleDef>
-                                <bundleDef>org.jclouds.api:vcloud:1.6.0-wso2v1</bundleDef>
-                                <bundleDef>com.jamesmurty.utils.wso2:java-xmlbuilder:0.4.wso2v1</bundleDef>
-                                <bundleDef>org.jclouds.common:openstack-common:${jclouds.version}</bundleDef>
-                                <bundleDef>org.jclouds.api:openstack-keystone:${jclouds.version}</bundleDef>
-                                <bundleDef>org.jclouds.provider:aws-ec2:${jclouds.version}</bundleDef>
-                                <bundleDef>com.google.guava.wso2:guava:${google.guava.wso2.version}</bundleDef>
-                                <bundleDef>org.jclouds.common:aws-common:${jclouds.version}</bundleDef>
-                                <bundleDef>com.google.code.gson:gson:${gson2.version}</bundleDef>
-                                <bundleDef>com.google.guice.wso2:guice:${google.guice.wso2.version}</bundleDef>
-                                <bundleDef>com.google.guice.assistedinject.wso2:guice-assistedinject:${com.google.guice.assistedinject.wso2.version}</bundleDef>
-                                <bundleDef>com.sun.jersey:jersey-core:${sun.jersey.version}</bundleDef>
-                                <bundleDef>org.jclouds:jclouds-scriptbuilder:${jclouds.version}</bundleDef>
-                                <bundleDef>org.apache.shindig.wso2:shindig:1.1.0.wso2v6</bundleDef>
-                                <bundleDef>org.99soft.guice.wso2:rocoto:6.1.wso2v1</bundleDef>
-                                <bundleDef>org.bouncycastle.wso2:bcprov-jdk16:1.45.wso2v1</bundleDef>
-                                <bundleDef>net.schmizz:sshj:0.8.0</bundleDef>
-                                <bundleDef>org.jclouds.driver:jclouds-joda:${jclouds.version}</bundleDef>
-                                <bundleDef>com.jcraft.wso2:jzlib:1.0.7.wso2v1</bundleDef>
-                                <bundleDef>org.jclouds.driver:jclouds-netty:${jclouds.version}</bundleDef>
-                                <bundleDef>io.netty:netty:3.3.0.Final</bundleDef>
-                                <bundleDef>commons-io.wso2:commons-io:2.0.0.wso2v1</bundleDef>
-                                <bundleDef>org.slf4j:slf4j-api:1.6.4</bundleDef>
-                                <bundleDef>org.slf4j:slf4j-log4j12:1.6.4</bundleDef>
-                                <bundleDef>org.jclouds.driver:jclouds-slf4j:${jclouds.version}</bundleDef>
-                                <bundleDef>com.google.common.wso2:google-collect:${google.collect.osgi.version}</bundleDef>
-                                <bundleDef>jdom.wso2:jdom:1.0.0.wso2v1</bundleDef>
-                                <bundleDef>org.json.wso2:json:1.0.0.wso2v1</bundleDef>
-                                <!--bundleDef>org.jaggeryjs:0.9.0.ALPHA2-wso2v2</bundleDef-->
-                                
-                            </bundles>
-                            <importBundles>
-                            </importBundles>
-                            <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef>
-                                <importFeatureDef>org.wso2.carbon.lb.common:4.1.1</importFeatureDef>
-                                <importFeatureDef>org.wso2.carbon.ntask.core:${wso2carbon.version}</importFeatureDef> 
-                            </importFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <!--plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <id>clean resources</id>
-                        <phase>install</phase>
-                        <configuration>
-                            <tasks>
-                                <delete dir="src"/>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin-->
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/stratos/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/build.properties b/features/stratos/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/build.properties
deleted file mode 100644
index 93c4b10..0000000
--- a/features/stratos/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-custom = true
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/25ac7c8e/features/stratos/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/cloud-controller.xml
----------------------------------------------------------------------
diff --git a/features/stratos/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/cloud-controller.xml b/features/stratos/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/cloud-controller.xml
deleted file mode 100644
index 9850b53..0000000
--- a/features/stratos/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/cloud-controller.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-  ~ Copyright 2005-2011 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.
-  -->
-  
-<cloudController xmlns:svns="http://org.wso2.securevault/configuration">
-
-	<svns:secureVault
-		provider="org.wso2.securevault.secret.handler.SecretManagerSecretCallbackHandler" />
-
-    <dataPublisher enable="false">
-		<!-- BAM Server Info - default values are 'admin' and 'admin' 
-			 Optional element. -->
-		<bamServer>
-            <!-- BAM server URL should be specified in carbon.xml -->
-			<adminUserName>admin</adminUserName>
-			<adminPassword svns:secretAlias="cloud.controller.bam.server.admin.password">admin</adminPassword>
-		</bamServer>
-		<!-- Default cron expression is '1 * * * * ? *' meaning 'first second of every minute'.
-			 Optional element. -->
-		<cron>1 * * * * ? *</cron>
-		<!-- Cassandra cluster related info -->
-		<!--cassandraInfo>
-			<connectionUrl>localhost:9160</connectionUrl>
-			<userName>admin</userName>
-			<password svns:secretAlias="cloud.controller.cassandra.server.password">admin</password>
-		</cassandraInfo-->
-	</dataPublisher>
-
-    <topologySync enable="true">
-		<!-- MB server info -->
-		<mbServerUrl>localhost:5674</mbServerUrl>
-		<cron>1 * * * * ? *</cron>
-	</topologySync>	
-
-	<!-- Specify the properties that are common to an IaaS here. This element 
-		is not necessary [0..1]. But you can use this section to avoid specifying 
-		same property over and over again. -->
-	<iaasProviders>
-        <!--iaasProvider type="ec2" name="ec2 specific details">
-            <className>org.wso2.carbon.stratos.cloud.controller.iaases.AWSEC2Iaas</className>
-			<provider>aws-ec2</provider>
-			<identity svns:secretAlias="elastic.scaler.openstack.identity">dhsaghfdal</identity>
-			<credential svns:secretAlias="elastic.scaler.openstack.credential">jdkjaskd</credential>
-			<scaleUpOrder>1</scaleUpOrder>
-			<scaleDownOrder>2</scaleDownOrder>
-			<property name="jclouds.ec2.ami-query" value="owner-id=XX-XX-XX;state=available;image-type=machine"/>
-            <property name="availabilityZone" value="us-east-1c"/>
-			<property name="securityGroups" value="manager,cep,mb,default"/>
-            <property name="instanceType" value="m1.large"/>
-            <property name="keyPair" value="nirmal-key"/>
-			<imageId>us-east-1/ami-52409a3b</imageId>
-		</iaasProvider-->
-		<iaasProvider type="openstack" name="openstack specific details">
-            <className>org.wso2.carbon.stratos.cloud.controller.iaases.OpenstackNovaIaas</className>
-			<provider>openstack-nova</provider>
-			<identity svns:secretAlias="cloud.controller.openstack.identity">demo:demo</identity>
-			<credential svns:secretAlias="cloud.controller.openstack.credential">openstack</credential>
-			<property name="jclouds.endpoint" value="http://192.168.16.20:5000/" />
-            <property name="jclouds.openstack-nova.auto-create-floating-ips" value="false"/>
-			<property name="jclouds.api-version" value="2.0/" />
-			<scaleUpOrder>2</scaleUpOrder>
-			<scaleDownOrder>3</scaleDownOrder>
-			<property name="X" value="x" />
-			<property name="Y" value="y" />
-			<imageId>nova/dab37f0e-cf6f-4812-86fc-733acf22d5e6</imageId>
-		</iaasProvider>
-	</iaasProviders>
-</cloudController>