From f81f366a7b588314a049dfbc95557ac662244ca1 Mon Sep 17 00:00:00 2001
From: Manula Thantriwatte <manulac@wso2.com>
Date: Tue, 16 Jul 2013 12:24:56 +0530
Subject: [PATCH] Refactor manager-deployment feature

---
 features/manager/deployment/2.1.0/pom.xml |   74 -----------------------------
 features/manager/deployment/pom.xml       |   74 +++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 74 deletions(-)
 delete mode 100644 features/manager/deployment/2.1.0/pom.xml
 create mode 100644 features/manager/deployment/pom.xml

diff --git a/features/manager/deployment/2.1.0/pom.xml b/features/manager/deployment/2.1.0/pom.xml
deleted file mode 100644
index f1d4bf7..0000000
--- a/features/manager/deployment/2.1.0/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<!--
- ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. licenses this file to you under the Apache License,
- ~ Version 2.0 (the "License"); you may not use this file except
- ~ in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~    http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied.  See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-   <parent>
-        <groupId>org.wso2.carbon</groupId>
-        <artifactId>stratos-features</artifactId>
-        <version>2.1.0</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.stratos.deployment.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Stratos - Deployment Features</name>
-    <url>http://wso2.org</url>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.stratos.deployment</artifactId>
-            <version>${stratos.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <plugins>
-            <plugin>
-                <groupId>org.wso2.maven</groupId>
-                <artifactId>carbon-p2-plugin</artifactId>
-                <version>${carbon.p2.plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>p2-feature-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-feature-gen</goal>
-                        </goals>
-                        <configuration>
-                            <id>org.wso2.carbon.stratos.deployment</id>
-                            <propertiesFile>../../../../etc/feature.properties</propertiesFile>
-                            <adviceFile>
-                                <properties>
-                                    <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef>
-                                </properties>
-                            </adviceFile>                            
-                            <bundles>
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.stratos.deployment</bundleDef>
-                            </bundles>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/features/manager/deployment/pom.xml b/features/manager/deployment/pom.xml
new file mode 100644
index 0000000..400ad97
--- /dev/null
+++ b/features/manager/deployment/pom.xml
@@ -0,0 +1,74 @@
+<!-- 
+  #  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>3.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.stratos.deployment.feature</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Stratos - Deployment Features</name>
+    <url>http://apache.org</url>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.stratos</groupId>
+            <artifactId>org.apache.stratos.deployment</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>p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>org.apache.stratos.deployment</id>
+                            <propertiesFile>../../../../etc/feature.properties</propertiesFile>
+                            <adviceFile>
+                                <properties>
+                                    <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef>
+                                </properties>
+                            </adviceFile>                            
+                            <bundles>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.deployment</bundleDef>
+                            </bundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
-- 
1.7.9.5