From 876e71a97bd7f4a3c3425d5c176255b74ed598ad Mon Sep 17 00:00:00 2001
From: Manula Thantriwatte <manulac@wso2.com>
Date: Tue, 16 Jul 2013 14:37:17 +0530
Subject: [PATCH] Refactor manager-tenat-activity feature

---
 .../pom.xml                                        |  100 ++++++++++++++++++++
 .../pom.xml                                        |   98 +++++++++++++++++++
 .../2.1.0/pom.xml                                  |  100 --------------------
 .../2.1.0/pom.xml                                  |   98 -------------------
 features/manager/tenant-activity/pom.xml           |   46 ++++-----
 5 files changed, 222 insertions(+), 220 deletions(-)
 create mode 100644 features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml
 create mode 100644 features/manager/tenant-activity/org.apache.stratos.tenant.activity.ui.feature/pom.xml
 delete mode 100644 features/manager/tenant-activity/org.wso2.carbon.tenant.activity.server.feature/2.1.0/pom.xml
 delete mode 100644 features/manager/tenant-activity/org.wso2.carbon.tenant.activity.ui.feature/2.1.0/pom.xml

diff --git a/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml b/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml
new file mode 100644
index 0000000..e571494
--- /dev/null
+++ b/features/manager/tenant-activity/org.apache.stratos.tenant.activity.server.feature/pom.xml
@@ -0,0 +1,100 @@
+<?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-activity-feature</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.stratos.tenant.activity.server.feature</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Stratos - Tenant activity Server Feature</name>
+    <url>http://stratos.org</url>
+    <description>This feature contains the core bundles required for API management back end
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.stratos</groupId>
+            <artifactId>org.apache.stratos.tenant.activity</artifactId>
+            <version>${apache.stratos.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>           
+ <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.1</version>
+                <executions>                  
+                </executions>
+            </plugin>
+
+            <plugin>
+		        <artifactId>maven-resources-plugin</artifactId>
+		        <executions>
+		           
+		        </executions>
+		    </plugin>
+
+
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>4-p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>org.apache.stratos.tenant.activity.server</id>
+                            <propertiesFile>../../../etc/feature.properties</propertiesFile>
+                            <adviceFile>
+                                <properties>
+                                    <propertyDef>org.wso2.carbon.p2.category.type:server
+                                    </propertyDef>
+                                    <propertyDef>org.eclipse.equinox.p2.type.group:false
+                                    </propertyDef>
+                                </properties>
+                            </adviceFile>
+                            <bundles>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.tenant.activity</bundleDef>
+                            </bundles>
+                            <importBundles>
+                            </importBundles>
+                            <importFeatures>
+                            </importFeatures>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/features/manager/tenant-activity/org.apache.stratos.tenant.activity.ui.feature/pom.xml b/features/manager/tenant-activity/org.apache.stratos.tenant.activity.ui.feature/pom.xml
new file mode 100644
index 0000000..75cce5f
--- /dev/null
+++ b/features/manager/tenant-activity/org.apache.stratos.tenant.activity.ui.feature/pom.xml
@@ -0,0 +1,98 @@
+<?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-activity-feature</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.stratos.tenant.activity.ui.feature</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Stratos - Tenant Activity UI Feature</name>
+    <url>http://apache.org</url>
+    <description>This feature contains the bundles required for Tenant Activity front-end functionality
+    </description>
+
+    <dependencies>
+ 	<dependency>
+            <groupId>org.apache.stratos</groupId>
+            <artifactId>org.apache.stratos.tenant.activity.stub</artifactId>
+            <version>${apache.stratos.version}</version>
+        </dependency>
+	<dependency>
+            <groupId>org.apache.stratos</groupId>
+            <artifactId>org.apache.stratos.tenant.activity.ui</artifactId>
+            <version>${apache.stratos.version}</version>
+        </dependency>
+	<dependency>
+            <groupId>org.apache.stratos</groupId>
+            <artifactId>org.apache.stratos.tenant.activity</artifactId>
+            <version>${apache.stratos.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>4-p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>org.apache.stratos.tenant.activity.ui</id>
+                            <propertiesFile>../../../etc/feature.properties</propertiesFile>
+                            <adviceFile>
+                                <properties>
+                                    <propertyDef>org.wso2.carbon.p2.category.type:console
+                                    </propertyDef>
+                                    <propertyDef>org.eclipse.equinox.p2.type.group:false
+                                    </propertyDef>
+                                </properties>
+                            </adviceFile>
+                            <bundles>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.tenant.activity.stub</bundleDef>
+				<bundleDef>org.apache.stratos:org.apache.stratos.tenant.activity.ui</bundleDef>
+				<bundleDef>org.apache.stratos:org.apache.stratos.tenant.activity</bundleDef>
+                            </bundles>
+                            <importBundles>
+                                <!--<importBundleDef>org.wso2.carbon:org.wso2.carbon.identity.core</importBundleDef>-->
+                            </importBundles>
+                            <importFeatures>
+                            </importFeatures>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/features/manager/tenant-activity/org.wso2.carbon.tenant.activity.server.feature/2.1.0/pom.xml b/features/manager/tenant-activity/org.wso2.carbon.tenant.activity.server.feature/2.1.0/pom.xml
deleted file mode 100644
index cedff5a..0000000
--- a/features/manager/tenant-activity/org.wso2.carbon.tenant.activity.server.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2010-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.wso2.carbon</groupId>
-        <artifactId>tenant-activity-feature</artifactId>
-        <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.tenant.activity.server.feature</artifactId>
-    <version>2.1.0</version>
-    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Tenant activity Server Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the core bundles required for API management back end
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.tenant.activity</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>           
- <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-                <executions>                  
-                </executions>
-            </plugin>
-
-            <plugin>
-		        <artifactId>maven-resources-plugin</artifactId>
-		        <executions>
-		           
-		        </executions>
-		    </plugin>
-
-
-            <plugin>
-                <groupId>org.wso2.maven</groupId>
-                <artifactId>carbon-p2-plugin</artifactId>
-                <version>${carbon.p2.plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>4-p2-feature-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-feature-gen</goal>
-                        </goals>
-                        <configuration>
-                            <id>org.wso2.carbon.tenant.activity.server</id>
-                            <propertiesFile>../../../etc/feature.properties</propertiesFile>
-                            <adviceFile>
-                                <properties>
-                                    <propertyDef>org.wso2.carbon.p2.category.type:server
-                                    </propertyDef>
-                                    <propertyDef>org.eclipse.equinox.p2.type.group:false
-                                    </propertyDef>
-                                </properties>
-                            </adviceFile>
-                            <bundles>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.activity</bundleDef>
-                            </bundles>
-                            <importBundles>
-                            </importBundles>
-                            <importFeatures>
-                            </importFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/features/manager/tenant-activity/org.wso2.carbon.tenant.activity.ui.feature/2.1.0/pom.xml b/features/manager/tenant-activity/org.wso2.carbon.tenant.activity.ui.feature/2.1.0/pom.xml
deleted file mode 100644
index b781888..0000000
--- a/features/manager/tenant-activity/org.wso2.carbon.tenant.activity.ui.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.wso2.carbon</groupId>
-        <artifactId>tenant-activity-feature</artifactId>
-        <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.tenant.activity.ui.feature</artifactId>
-    <version>2.1.0</version>
-    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Tenant Activity UI Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the bundles required for Tenant Activity front-end functionality
-    </description>
-
-    <dependencies>
- 	<dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.tenant.activity.stub</artifactId>
-            <version>4.1.0</version>
-        </dependency>
-	<dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.tenant.activity.ui</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-	<dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.tenant.activity</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            
-            <plugin>
-                <groupId>org.wso2.maven</groupId>
-                <artifactId>carbon-p2-plugin</artifactId>
-                <version>${carbon.p2.plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>4-p2-feature-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-feature-gen</goal>
-                        </goals>
-                        <configuration>
-                            <id>org.wso2.carbon.tenant.activity.ui</id>
-                            <propertiesFile>../../../etc/feature.properties</propertiesFile>
-                            <adviceFile>
-                                <properties>
-                                    <propertyDef>org.wso2.carbon.p2.category.type:console
-                                    </propertyDef>
-                                    <propertyDef>org.eclipse.equinox.p2.type.group:false
-                                    </propertyDef>
-                                </properties>
-                            </adviceFile>
-                            <bundles>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.activity.stub</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.activity.ui</bundleDef>
-				<bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.activity</bundleDef>
-                            </bundles>
-                            <importBundles>
-                                <!--<importBundleDef>org.wso2.carbon:org.wso2.carbon.identity.core</importBundleDef>-->
-                            </importBundles>
-                            <importFeatures>
-                            </importFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/features/manager/tenant-activity/pom.xml b/features/manager/tenant-activity/pom.xml
index 44c35fd..03f7598 100644
--- a/features/manager/tenant-activity/pom.xml
+++ b/features/manager/tenant-activity/pom.xml
@@ -1,36 +1,38 @@
 <?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.
--->
+<!-- 
+  #  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.wso2.carbon</groupId>
-        <artifactId>stratos-features</artifactId>
-        <version>2.1.0</version>
-        <relativePath>../../pom.xml</relativePath>
+        <groupId>org.apache.stratos</groupId>
+        <artifactId>stratos-manager-features</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>tenant-activity-feature</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 Stratos - Tenant activity Feature Aggregator Module</name>
+    <name>Apache Stratos - Tenant activity Feature Aggregator Module</name>
     <url>http://wso2.org</url>
     <modules>
-        <module>org.wso2.carbon.tenant.activity.ui.feature/2.1.0</module>
-        <module>org.wso2.carbon.tenant.activity.server.feature/2.1.0</module>
+        <module>org.apache.stratos.tenant.activity.ui.feature</module>
+        <module>org.apache.stratos.tenant.activity.server.feature</module>
     </modules>
 </project>
 
-- 
1.7.9.5