From febcba5d90a3bcae6c24c3323575f0648757ea94 Mon Sep 17 00:00:00 2001
From: Manula Thantriwatte <manulac@wso2.com>
Date: Wed, 17 Jul 2013 15:00:24 +0530
Subject: [PATCH] Refactor feature-manager pom

---
 features/manager/pom.xml                           |   65 ++++++++++----------
 .../pom.xml                                        |    2 +-
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/features/manager/pom.xml b/features/manager/pom.xml
index fb6f4f6..7939d8a 100644
--- a/features/manager/pom.xml
+++ b/features/manager/pom.xml
@@ -46,6 +46,7 @@
 	<module>deployment</module>
 	<module>status-monitor</module>
 	<module>tenant-activity</module>
+	<module>cartridge-mgt</module>
     </modules>
 
     <distributionManagement>
@@ -80,9 +81,9 @@
 <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.activation</artifactId>
-                <version>${stratos.version}</version>
+                <groupId>org.apache.stratos</groupId>
+                <artifactId>org.apache.stratos.activation</artifactId>
+                <version>${apache.stratos.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
@@ -90,49 +91,49 @@
                 <version>${stratos.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.redirector.servlet</artifactId>
-                <version>${stratos.version}</version>
+                <groupId>org.apache.stratos</groupId>
+                <artifactId>org.apache.stratos.redirector.servlet</artifactId>
+                <version>${apache.stratos.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.redirector.servlet.ui</artifactId>
-                <version>${stratos.version}</version>
+                <groupId>org.apache.stratos</groupId>
+                <artifactId>org.apache.stratos.redirector.servlet.ui</artifactId>
+                <version>${apache.stratos.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.stratos.common</artifactId>
-                <version>${stratos.version}</version>
-			</dependency>
-			<dependency>
+                <groupId>org.apache.stratos</groupId>
+                <artifactId>org.apache.stratos.common</artifactId>
+                <version>${apache.stratos.version}</version>
+	    </dependency>
+	    <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.stratos.landing.page.deployer</artifactId>
                 <version>${stratos.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.throttling.agent</artifactId>
-                <version>${stratos.version}</version>
+                <groupId>org.apache.stratos</groupId>
+                <artifactId>org.apache.stratos.throttling.agent</artifactId>
+                <version>${apache.stratos.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.tenant.activity</artifactId>
-                <version>${stratos.version}</version>
+                <groupId>org.apache.stratos</groupId>
+                <artifactId>org.apache.stratos.tenant.activity</artifactId>
+                <version>${apache.stratos.version}</version>
             </dependency>
 	    <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.throttling.agent.stub</artifactId>
-                <version>${wso2carbon.version}</version>
+                <groupId>org.apache.stratos</groupId>
+                <artifactId>org.apache.stratos.throttling.agent.stub</artifactId>
+                <version>${apache.stratos.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.usage.agent</artifactId>
-                <version>${stratos.version}</version>
+                <groupId>org.apache.stratos</groupId>
+                <artifactId>org.apache.stratos.usage.agent</artifactId>
+                <version>${apache.stratos.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.tenant.dispatcher</artifactId>
-                <version>${stratos.version}</version>
+                <groupId>org.apache.stratos</groupId>
+                <artifactId>org.apache.stratos.tenant.dispatcher</artifactId>
+                <version>${apache.stratos.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.quartz-scheduler.wso2</groupId>
@@ -155,9 +156,9 @@
                 <version>${synapse.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.sso.redirector.ui</artifactId>
-                <version>${stratos.version}</version>
+                <groupId>org.apache.stratos</groupId>
+                <artifactId>org.apache.stratos.sso.redirector.ui</artifactId>
+                <version>${apache.stratos.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
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
index f374c7b..16975a4 100644
--- 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
@@ -30,7 +30,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.apache.stratos.tenant.mgt.core.feature</artifactId>
     <packaging>pom</packaging>
-    <name>Apache Stratos - Multitenancy Tenant Management Server Feature</name>
+    <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>
 
-- 
1.7.9.5