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 2015/05/22 10:11:10 UTC

[1/2] stratos git commit: Remove unrefered poms with components

Repository: stratos
Updated Branches:
  refs/heads/master 75e478d6b -> 208c671a8


Remove unrefered poms with components


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5079a431
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5079a431
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5079a431

Branch: refs/heads/master
Commit: 5079a4317bf3b1a870fd1371723120219d920d09
Parents: 75e478d
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri May 22 13:36:31 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri May 22 13:36:31 2015 +0530

----------------------------------------------------------------------
 .../pom.xml                                     | 122 -------------
 .../resources/build.properties                  |  23 ---
 .../resources/conf/cloud-services-desc.xml      | 172 -------------------
 .../resources/p2.inf                            |  19 --
 .../src/main/resources/build.properties         |  23 ---
 .../main/resources/conf/cloud-services-desc.xml | 172 -------------------
 .../src/main/resources/p2.inf                   |  19 --
 .../pom.xml                                     |  89 ----------
 features/manager/tenant-mgt/pom.xml             |  70 --------
 .../pom.xml                                     |  79 ---------
 .../pom.xml                                     |  91 ----------
 features/manager/throttling/pom.xml             |  38 ----
 .../pom.xml                                     |  81 ---------
 .../org.apache.stratos.usage.feature/pom.xml    |  79 ---------
 .../pom.xml                                     |  80 ---------
 .../org.apache.stratos.usage.ui.feature/pom.xml |  85 ---------
 features/manager/usage/pom.xml                  |  40 -----
 .../docker-images/stratos-docker-images/pom.xml | 101 -----------
 18 files changed, 1383 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/5079a431/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml
deleted file mode 100644
index 3c4ee55..0000000
--- a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-  #  Licensed to the Apache Software Foundation (ASF) under one
-  #  or more contributor license agreements.  See the NOTICE file
-  #  distributed with this work for additional information
-  #  regarding copyright ownership.  The ASF licenses this file
-  #  to you under the Apache License, Version 2.0 (the
-  #  "License"); you may not use this file except in compliance
-  #  with the License.  You may obtain a copy of the License at
-  #  
-  #  http://www.apache.org/licenses/LICENSE-2.0
-  #  
-  #  Unless required by applicable law or agreed to in writing,
-  #  software distributed under the License is distributed on an
-  #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  #  KIND, either express or implied.  See the License for the
-  #  specific language governing permissions and limitations
-  #  under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-   <parent>
-        <groupId>org.apache.stratos</groupId>
-        <artifactId>tenant-mgt-feature</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apache.stratos.tenant.mgt.core.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Stratos - Multitenancy Tenant Management Core Feature</name>
-    <url>http://apache.org</url>
-    <description>This feature contains the core bundles required for Back-end Multitenancy Tenant Management Core functionality</description>
-
-       <dependencies>
-            <dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.tenant.mgt.core</artifactId>
-		<version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.keystore.mgt</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.theme.mgt</artifactId>
-                <version>2.2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.common</artifactId>
-                <version>${project.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.apache.stratos.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.apache.stratos:org.apache.stratos.common</importBundleDef>
-                                 <importBundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt.core</importBundleDef>
-                                 <importBundleDef>org.wso2.carbon:org.wso2.carbon.theme.mgt</importBundleDef>
-                                 <importBundleDef>org.apache.stratos:org.apache.stratos.keystore.mgt</importBundleDef>
-                            </importBundles>
-                            <importFeatures>
-                               
-                            </importFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/stratos/blob/5079a431/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/build.properties b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/build.properties
deleted file mode 100644
index 3f354cf..0000000
--- a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-
-custom = true
-root.tenant.core=conf

http://git-wip-us.apache.org/repos/asf/stratos/blob/5079a431/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/conf/cloud-services-desc.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/conf/cloud-services-desc.xml b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/conf/cloud-services-desc.xml
deleted file mode 100644
index 5723436..0000000
--- a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/conf/cloud-services-desc.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version='1.0'?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<!-- 
-     This has the configurations for the cloud services. 
-     Label, link, icon, description, and the other similar information for each of the services are
-     given here. 
-  -->
-<cloudServices xmlns="http://wso2.com/carbon/cloud/mgt/services">
-    <cloudService name="Apache Stratos 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/stratos/blob/5079a431/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/p2.inf b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/p2.inf
deleted file mode 100644
index 07df1f8..0000000
--- a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/p2.inf
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.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/stratos/blob/5079a431/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/build.properties b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/build.properties
deleted file mode 100644
index 3f354cf..0000000
--- a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-
-custom = true
-root.tenant.core=conf

http://git-wip-us.apache.org/repos/asf/stratos/blob/5079a431/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/conf/cloud-services-desc.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/conf/cloud-services-desc.xml b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/conf/cloud-services-desc.xml
deleted file mode 100644
index 5723436..0000000
--- a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/conf/cloud-services-desc.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version='1.0'?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<!-- 
-     This has the configurations for the cloud services. 
-     Label, link, icon, description, and the other similar information for each of the services are
-     given here. 
-  -->
-<cloudServices xmlns="http://wso2.com/carbon/cloud/mgt/services">
-    <cloudService name="Apache Stratos 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/stratos/blob/5079a431/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/p2.inf b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/p2.inf
deleted file mode 100644
index 07df1f8..0000000
--- a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/p2.inf
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.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/stratos/blob/5079a431/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.server.feature/pom.xml b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.server.feature/pom.xml
deleted file mode 100644
index ccbfe3c..0000000
--- a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.server.feature/pom.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-  #  Licensed to the Apache Software Foundation (ASF) under one
-  #  or more contributor license agreements.  See the NOTICE file
-  #  distributed with this work for additional information
-  #  regarding copyright ownership.  The ASF licenses this file
-  #  to you under the Apache License, Version 2.0 (the
-  #  "License"); you may not use this file except in compliance
-  #  with the License.  You may obtain a copy of the License at
-  #  
-  #  http://www.apache.org/licenses/LICENSE-2.0
-  #  
-  #  Unless required by applicable law or agreed to in writing,
-  #  software distributed under the License is distributed on an
-  #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  #  KIND, either express or implied.  See the License for the
-  #  specific language governing permissions and limitations
-  #  under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.apache.stratos</groupId>
-        <artifactId>tenant-mgt-feature</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apache.stratos.tenant.mgt.server.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Stratos - Multitenancy Tenant Management Server Feature</name>
-    <url>http://apache.org</url>
-    <description>This feature contains the core bundles required for Back-end Multitenancy Tenant Management Core functionality</description>
-
-    <dependencies>
-            <dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.tenant.mgt.core</artifactId>
-		<version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.tenant.mgt</artifactId>
-		<version>${project.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.email.verification</artifactId>
-		<version>4.2.0</version>
-            </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.wso2.maven</groupId>
-                <artifactId>carbon-p2-plugin</artifactId>
-                <version>${carbon.p2.plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>p2-feature-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-feature-gen</goal>
-                        </goals>
-                        <configuration>
-                            <id>org.apache.stratos.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.apache.stratos:org.apache.stratos.tenant.mgt.core</bundleDef>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.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/stratos/blob/5079a431/features/manager/tenant-mgt/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/pom.xml b/features/manager/tenant-mgt/pom.xml
deleted file mode 100644
index 112882d..0000000
--- a/features/manager/tenant-mgt/pom.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-  #  Licensed to the Apache Software Foundation (ASF) under one
-  #  or more contributor license agreements.  See the NOTICE file
-  #  distributed with this work for additional information
-  #  regarding copyright ownership.  The ASF licenses this file
-  #  to you under the Apache License, Version 2.0 (the
-  #  "License"); you may not use this file except in compliance
-  #  with the License.  You may obtain a copy of the License at
-  #  
-  #  http://www.apache.org/licenses/LICENSE-2.0
-  #  
-  #  Unless required by applicable law or agreed to in writing,
-  #  software distributed under the License is distributed on an
-  #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  #  KIND, either express or implied.  See the License for the
-  #  specific language governing permissions and limitations
-  #  under the License.
-  --> 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.apache.stratos</groupId>
-        <artifactId>stratos-manager-features</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>tenant-mgt-feature</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Stratos - Tenant Management Aggregator Module</name>
-    <url>http://apache.org</url>
-
-    <modules>
-        <module>org.apache.stratos.tenant.mgt.server.feature</module>
-        <module>org.apache.stratos.tenant.mgt.core.feature</module>
-    </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.tenant.mgt</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.tenant.mgt.core</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-	    <dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.keystore.mgt</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.theme.mgt</artifactId>
-                <version>2.2.0</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/stratos/blob/5079a431/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml b/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml
deleted file mode 100644
index a8b47af..0000000
--- a/features/manager/throttling/org.apache.stratos.throttling.agent.feature/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.apache.stratos</groupId>
-        <artifactId>throttling-feature</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apache.stratos.throttling.agent.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Stratos - Throttling Agent Feature</name>
-    <url>http://apache.org</url>
-    <description>This feature contains the bundles required for throttle resource usage</description>
-
-        <dependencies>
- 	<dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.throttling.agent</artifactId>
-                <version>${project.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.apache.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.apache.stratos:org.apache.stratos.throttling.agent:${project.version}</bundleDef>
-				<bundleDef>org.apache.stratos:org.apache.stratos.throttling.agent.stub:${project.version}</bundleDef>
-                            </bundles>             
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/stratos/blob/5079a431/features/manager/throttling/org.apache.stratos.throttling.manager.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/throttling/org.apache.stratos.throttling.manager.feature/pom.xml b/features/manager/throttling/org.apache.stratos.throttling.manager.feature/pom.xml
deleted file mode 100644
index 5c7dba1..0000000
--- a/features/manager/throttling/org.apache.stratos.throttling.manager.feature/pom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.apache.stratos</groupId>
-        <artifactId>throttling-feature</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apache.stratos.throttling.manager.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Stratos - Throttling Manager Feature</name>
-    <url>http://apache.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>${wso2carbon.version}</version>
-        </dependency>
-	<dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.throttling.manager</artifactId>
-                <version>${project.version}</version>
-        </dependency>
-	<dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.throttling.ui</artifactId>
-                <version>${project.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.apache.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.apache.stratos:org.apache.stratos.throttling.manager:${project.version}</bundleDef>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.throttling.ui:${project.version}</bundleDef>								 <bundleDef>org.apache.stratos:org.apache.stratos.throttling.stub:${project.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/stratos/blob/5079a431/features/manager/throttling/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/throttling/pom.xml b/features/manager/throttling/pom.xml
deleted file mode 100644
index 4002df8..0000000
--- a/features/manager/throttling/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you under the Apache License, Version 2.0 (the
-       "License"); you may not use this file except in compliance
-       with the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing,
-       software distributed under the License is distributed on an
-       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <groupId>org.apache.stratos</groupId>
-        <artifactId>stratos-manager-features</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>throttling-feature</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Stratos - Throttling Feature Aggregator Module</name>
-    <url>http://apache.org</url>
-    <modules>
-        <module>org.apache.stratos.throttling.manager.feature</module>
-        <module>org.apache.stratos.throttling.agent.feature</module>
-    </modules>
-</project>
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/5079a431/features/manager/usage/org.apache.stratos.usage.agent.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/usage/org.apache.stratos.usage.agent.feature/pom.xml b/features/manager/usage/org.apache.stratos.usage.agent.feature/pom.xml
deleted file mode 100644
index 6bac2c7..0000000
--- a/features/manager/usage/org.apache.stratos.usage.agent.feature/pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-  #  Licensed to the Apache Software Foundation (ASF) under one
-  #  or more contributor license agreements.  See the NOTICE file
-  #  distributed with this work for additional information
-  #  regarding copyright ownership.  The ASF licenses this file
-  #  to you under the Apache License, Version 2.0 (the
-  #  "License"); you may not use this file except in compliance
-  #  with the License.  You may obtain a copy of the License at
-  #  
-  #  http://www.apache.org/licenses/LICENSE-2.0
-  #  
-  #  Unless required by applicable law or agreed to in writing,
-  #  software distributed under the License is distributed on an
-  #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  #  KIND, either express or implied.  See the License for the
-  #  specific language governing permissions and limitations
-  #  under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.apache.stratos</groupId>
-        <artifactId>usage-feature</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apache.stratos.usage.agent.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Stratos - Usage Agent Feature</name>
-    <url>http://apache.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.apache.stratos</groupId>
-            <artifactId>org.apache.stratos.usage.agent</artifactId>
-            <version>${project.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.apache.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.apache.stratos:org.apache.stratos.usage.agent</bundleDef>
-                            </bundles>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/stratos/blob/5079a431/features/manager/usage/org.apache.stratos.usage.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/usage/org.apache.stratos.usage.feature/pom.xml b/features/manager/usage/org.apache.stratos.usage.feature/pom.xml
deleted file mode 100644
index a636d6a..0000000
--- a/features/manager/usage/org.apache.stratos.usage.feature/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-  #  Licensed to the Apache Software Foundation (ASF) under one
-  #  or more contributor license agreements.  See the NOTICE file
-  #  distributed with this work for additional information
-  #  regarding copyright ownership.  The ASF licenses this file
-  #  to you under the Apache License, Version 2.0 (the
-  #  "License"); you may not use this file except in compliance
-  #  with the License.  You may obtain a copy of the License at
-  #  
-  #  http://www.apache.org/licenses/LICENSE-2.0
-  #  
-  #  Unless required by applicable law or agreed to in writing,
-  #  software distributed under the License is distributed on an
-  #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  #  KIND, either express or implied.  See the License for the
-  #  specific language governing permissions and limitations
-  #  under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.apache.stratos</groupId>
-        <artifactId>usage-feature</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apache.stratos.usage.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Stratos - Usage Composite Feature</name>
-    <url>http://apache.org</url>
-    <description>This feature contains the bundles required for Usage feature</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.stratos</groupId>
-            <artifactId>org.apache.stratos.usage.server.feature</artifactId>
-            <version>${project.version}</version>
-            <type>zip</type>
-            </dependency>
-        <dependency>
-            <groupId>org.apache.stratos</groupId>
-            <artifactId>org.apache.stratos.usage.ui.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.apache.stratos.usage</id>
-                            <propertiesFile>../../../../etc/feature.properties</propertiesFile>
-                            <includedFeatures>
-                                <includedFeatureDef>org.apache.stratos:org.apache.stratos.usage.server.feature:${project.version}</includedFeatureDef>
-				<includedFeatureDef>org.apache.stratos:org.apache.stratos.usage.ui.feature:${project.version}</includedFeatureDef>
-                            </includedFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/stratos/blob/5079a431/features/manager/usage/org.apache.stratos.usage.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/usage/org.apache.stratos.usage.server.feature/pom.xml b/features/manager/usage/org.apache.stratos.usage.server.feature/pom.xml
deleted file mode 100644
index ae855db..0000000
--- a/features/manager/usage/org.apache.stratos.usage.server.feature/pom.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-  #  Licensed to the Apache Software Foundation (ASF) under one
-  #  or more contributor license agreements.  See the NOTICE file
-  #  distributed with this work for additional information
-  #  regarding copyright ownership.  The ASF licenses this file
-  #  to you under the Apache License, Version 2.0 (the
-  #  "License"); you may not use this file except in compliance
-  #  with the License.  You may obtain a copy of the License at
-  #  
-  #  http://www.apache.org/licenses/LICENSE-2.0
-  #  
-  #  Unless required by applicable law or agreed to in writing,
-  #  software distributed under the License is distributed on an
-  #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  #  KIND, either express or implied.  See the License for the
-  #  specific language governing permissions and limitations
-  #  under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.apache.stratos</groupId>
-        <artifactId>usage-feature</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apache.stratos.usage.server.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Stratos - Usage Server Feature</name>
-    <url>http://apache.org</url>
-    <description>This feature contains the bundles required for usage data accumilating and retreiving functionality</description>
-
-        <dependencies>
-	<dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.usage</artifactId>
-                <version>${project.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.apache.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.apache.stratos:org.apache.stratos.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/stratos/blob/5079a431/features/manager/usage/org.apache.stratos.usage.ui.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/usage/org.apache.stratos.usage.ui.feature/pom.xml b/features/manager/usage/org.apache.stratos.usage.ui.feature/pom.xml
deleted file mode 100644
index 14bf386..0000000
--- a/features/manager/usage/org.apache.stratos.usage.ui.feature/pom.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-  #  Licensed to the Apache Software Foundation (ASF) under one
-  #  or more contributor license agreements.  See the NOTICE file
-  #  distributed with this work for additional information
-  #  regarding copyright ownership.  The ASF licenses this file
-  #  to you under the Apache License, Version 2.0 (the
-  #  "License"); you may not use this file except in compliance
-  #  with the License.  You may obtain a copy of the License at
-  #  
-  #  http://www.apache.org/licenses/LICENSE-2.0
-  #  
-  #  Unless required by applicable law or agreed to in writing,
-  #  software distributed under the License is distributed on an
-  #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  #  KIND, either express or implied.  See the License for the
-  #  specific language governing permissions and limitations
-  #  under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.apache.stratos</groupId>
-        <artifactId>usage-feature</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apache.stratos.usage.ui.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Stratos - Usage UI Feature</name>
-    <url>http://apache.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.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.usage.ui</artifactId>
-                <version>${project.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.apache.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.apache.stratos:org.apache.stratos.usage.ui:${project.version}</bundleDef>
-				<bundleDef>org.apache.stratos:org.apache.stratos.usage.stub:${project.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/stratos/blob/5079a431/features/manager/usage/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/usage/pom.xml b/features/manager/usage/pom.xml
deleted file mode 100644
index 2263a38..0000000
--- a/features/manager/usage/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-  #  Licensed to the Apache Software Foundation (ASF) under one
-  #  or more contributor license agreements.  See the NOTICE file
-  #  distributed with this work for additional information
-  #  regarding copyright ownership.  The ASF licenses this file
-  #  to you under the Apache License, Version 2.0 (the
-  #  "License"); you may not use this file except in compliance
-  #  with the License.  You may obtain a copy of the License at
-  #  
-  #  http://www.apache.org/licenses/LICENSE-2.0
-  #  
-  #  Unless required by applicable law or agreed to in writing,
-  #  software distributed under the License is distributed on an
-  #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  #  KIND, either express or implied.  See the License for the
-  #  specific language governing permissions and limitations
-  #  under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <groupId>org.apache.stratos</groupId>
-        <artifactId>stratos-manager-features</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>usage-feature</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Stratos - Usage Feature Aggregator Module</name>
-    <url>http://apache.org</url>
-    <modules>
-        <module>org.apache.stratos.usage.server.feature</module>
-        <module>org.apache.stratos.usage.agent.feature</module>
-	<module>org.apache.stratos.usage.ui.feature</module>
-	<module>org.apache.stratos.usage.feature</module>
-    </modules>
-</project>
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/5079a431/tools/docker-images/stratos-docker-images/pom.xml
----------------------------------------------------------------------
diff --git a/tools/docker-images/stratos-docker-images/pom.xml b/tools/docker-images/stratos-docker-images/pom.xml
deleted file mode 100644
index dc7a81b..0000000
--- a/tools/docker-images/stratos-docker-images/pom.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-  #  Licensed to the Apache Software Foundation (ASF) under one
-  #  or more contributor license agreements.  See the NOTICE file
-  #  distributed with this work for additional information
-  #  regarding copyright ownership.  The ASF licenses this file
-  #  to you under the Apache License, Version 2.0 (the
-  #  "License"); you may not use this file except in compliance
-  #  with the License.  You may obtain a copy of the License at
-  #  
-  #  http://www.apache.org/licenses/LICENSE-2.0
-  #  
-  #  Unless required by applicable law or agreed to in writing,
-  #  software distributed under the License is distributed on an
-  #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  #  KIND, either express or implied.  See the License for the
-  #  specific language governing permissions and limitations
-  #  under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<parent>
-		<groupId>org.apache.stratos</groupId>
-		<artifactId>stratos-tools</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-    	<artifactId>stratos-docker-images</artifactId>
-    	<packaging>pom</packaging>
-    	<name>Apache Stratos - Docker Images</name>
-    	<description>Apache Stratos plafrom docker images</description>
-    	<url>http://apache.org</url>
-	<dependencies>
-	</dependencies>
-
-	<profiles>
-		<!-- Build docker images -->
-		<profile>
-			<id>docker-build</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.3</version>
-						<executions>
-							<execution>
-								<configuration>
-									<executable>bash</executable>
-									<workingDirectory>.</workingDirectory>
-									<arguments>
-										<argument>build-all.sh</argument>
-									</arguments>
-									<environmentVariables>
-										<VERSION>${project.version}</VERSION>
-									</environmentVariables>
-								</configuration>
-								<id>docker-build</id>
-								<phase>install</phase>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<!-- Push docker images -->
-		<profile>
-			<id>docker-push</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.3</version>
-						<executions>
-							<execution>
-								<configuration>
-									<executable>bash</executable>
-									<workingDirectory>.</workingDirectory>
-									<arguments>
-										<argument>push-all.sh</argument>
-									</arguments>
-								</configuration>
-								<id>docker-push</id>
-								<phase>install</phase>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>


[2/2] stratos git commit: s/4.1.0-SNAPSHOT/project.version

Posted by la...@apache.org.
s/4.1.0-SNAPSHOT/project.version


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/208c671a
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/208c671a
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/208c671a

Branch: refs/heads/master
Commit: 208c671a86b3ee8ac5ff4ed1fb4e62f24e45c7ac
Parents: 5079a43
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri May 22 13:38:41 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri May 22 13:38:41 2015 +0530

----------------------------------------------------------------------
 features/cep/org.apache.stratos.event.processor.feature/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/208c671a/features/cep/org.apache.stratos.event.processor.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cep/org.apache.stratos.event.processor.feature/pom.xml b/features/cep/org.apache.stratos.event.processor.feature/pom.xml
index a252780..37caa1d 100644
--- a/features/cep/org.apache.stratos.event.processor.feature/pom.xml
+++ b/features/cep/org.apache.stratos.event.processor.feature/pom.xml
@@ -74,7 +74,7 @@
                             </importFeatures>
                             <includedFeatures>
                                 <includedFeatureDef>
-                                    org.apache.stratos:org.apache.stratos.event.processor.server.feature:4.1.0-SNAPSHOT
+                                    org.apache.stratos:org.apache.stratos.event.processor.server.feature:${project.version}
                                 </includedFeatureDef>
                                 <includedFeatureDef>
                                     org.wso2.carbon:org.wso2.carbon.event.processor.ui.feature:1.0.0