From 3b7da611c6ed7ae251a8caa4eae3d97c95982fbb Mon Sep 17 00:00:00 2001
From: Manula Thantriwatte <manulac@wso2.com>
Date: Mon, 15 Jul 2013 19:43:59 +0530
Subject: [PATCH] Refactor load balancer feature

---
 .../pom.xml                                        |    2 +-
 .../4.1.0/pom.xml                                  |   84 -----------------
 .../4.1.1/pom.xml                                  |   84 -----------------
 .../4.1.3/pom.xml                                  |   88 ------------------
 .../org.apache.stratos.lb.common.feature/pom.xml   |   86 ++++++++++++++++++
 .../4.1.0/pom.xml                                  |   89 ------------------
 .../4.1.1/pom.xml                                  |   93 -------------------
 .../4.1.3/pom.xml                                  |   95 --------------------
 .../pom.xml                                        |   93 +++++++++++++++++++
 features/load-balancer/pom.xml                     |    8 +-
 10 files changed, 183 insertions(+), 539 deletions(-)
 delete mode 100644 features/load-balancer/org.apache.stratos.lb.common.feature/4.1.0/pom.xml
 delete mode 100644 features/load-balancer/org.apache.stratos.lb.common.feature/4.1.1/pom.xml
 delete mode 100644 features/load-balancer/org.apache.stratos.lb.common.feature/4.1.3/pom.xml
 create mode 100644 features/load-balancer/org.apache.stratos.lb.common.feature/pom.xml
 delete mode 100644 features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/4.1.0/pom.xml
 delete mode 100644 features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/4.1.1/pom.xml
 delete mode 100644 features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/4.1.3/pom.xml
 create mode 100644 features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/pom.xml

diff --git a/features/autoscaler/org.apache.stratos.mediator.autoscale.feature/pom.xml b/features/autoscaler/org.apache.stratos.mediator.autoscale.feature/pom.xml
index 3183584..5287e8d 100644
--- a/features/autoscaler/org.apache.stratos.mediator.autoscale.feature/pom.xml
+++ b/features/autoscaler/org.apache.stratos.mediator.autoscale.feature/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>autoscaler-feature</artifactId>
-	<version>3.0.0-SNAPSHOT</version>
+	<versioin>3.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/features/load-balancer/org.apache.stratos.lb.common.feature/4.1.0/pom.xml b/features/load-balancer/org.apache.stratos.lb.common.feature/4.1.0/pom.xml
deleted file mode 100644
index c31b686..0000000
--- a/features/load-balancer/org.apache.stratos.lb.common.feature/4.1.0/pom.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2009-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.wso2.carbon</groupId>
-        <artifactId>loadbalancer-features</artifactId>
-        <version>4.1.0</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <version>4.1.0</version>
-    <artifactId>org.wso2.carbon.lb.common.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Carbon - LB Common Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the common bundle for loadbalancer features</description>
-
-    <dependencies>
-	<dependency>
-	    <groupId>org.wso2.carbon</groupId>
-	    <artifactId>org.wso2.carbon.lb.common</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>4-p2-feature-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-feature-gen</goal>
-                        </goals>
-                        <configuration>
-                            <id>org.wso2.carbon.lb.common</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.load.balance.agent.stub</bundleDef>
-                                -->
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.lb.common</bundleDef>
-                                <bundleDef>org.slf4j:slf4j-api:1.6.4</bundleDef>
-                                <bundleDef>org.slf4j:slf4j-log4j12:1.6.4</bundleDef>
-                            </bundles>
-                            <importFeatures>
-                                <importFeatureDef>org.apache.synapse.wso2:${synapse.version}</importFeatureDef>
-                            </importFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/features/load-balancer/org.apache.stratos.lb.common.feature/4.1.1/pom.xml b/features/load-balancer/org.apache.stratos.lb.common.feature/4.1.1/pom.xml
deleted file mode 100644
index 1c6f8ec..0000000
--- a/features/load-balancer/org.apache.stratos.lb.common.feature/4.1.1/pom.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2009-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.wso2.carbon</groupId>
-        <artifactId>loadbalancer-features</artifactId>
-        <version>4.1.0</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <version>4.1.1</version>
-    <artifactId>org.wso2.carbon.lb.common.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Carbon - LB Common Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the common bundle for loadbalancer features</description>
-
-    <dependencies>
-	<dependency>
-	    <groupId>org.wso2.carbon</groupId>
-	    <artifactId>org.wso2.carbon.lb.common</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>4-p2-feature-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-feature-gen</goal>
-                        </goals>
-                        <configuration>
-                            <id>org.wso2.carbon.lb.common</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.load.balance.agent.stub</bundleDef>
-                                -->
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.lb.common</bundleDef>
-                                <bundleDef>org.slf4j:slf4j-api:1.6.4</bundleDef>
-                                <bundleDef>org.slf4j:slf4j-log4j12:1.6.4</bundleDef>
-                            </bundles>
-                            <importFeatures>
-                                <importFeatureDef>org.apache.synapse.wso2:2.1.1-wso2v4</importFeatureDef>
-                            </importFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/features/load-balancer/org.apache.stratos.lb.common.feature/4.1.3/pom.xml b/features/load-balancer/org.apache.stratos.lb.common.feature/4.1.3/pom.xml
deleted file mode 100644
index 1858400..0000000
--- a/features/load-balancer/org.apache.stratos.lb.common.feature/4.1.3/pom.xml
+++ /dev/null
@@ -1,88 +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>loadbalancer-features</artifactId>
-        <version>4.1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <version>4.1.3</version>
-    <artifactId>org.apache.stratos.lb.common.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>LB Common Feature</name>
-    <url>http://apache.org</url>
-    <description>This feature contains the common bundle for loadbalancer features</description>
-
-    <dependencies>
-	<dependency>
-	    <groupId>org.apache.stratos</groupId>
-	    <artifactId>org.apache.stratos.lb.common</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>4-p2-feature-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-feature-gen</goal>
-                        </goals>
-                        <configuration>
-                            <id>org.apache.stratos.lb.common</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.load.balance.agent.stub</bundleDef>
-                                -->
-                                <bundleDef>org.apache.stratos:org.apache.stratos.lb.common:${project.version}</bundleDef>
-                                <bundleDef>org.slf4j:slf4j-api:1.6.4</bundleDef>
-                                <bundleDef>org.slf4j:slf4j-log4j12:1.6.4</bundleDef>
-                            </bundles>
-                            <importFeatures>
-                                <importFeatureDef>org.apache.synapse.wso2:${synapse.wso2.version}</importFeatureDef>
-                            </importFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/features/load-balancer/org.apache.stratos.lb.common.feature/pom.xml b/features/load-balancer/org.apache.stratos.lb.common.feature/pom.xml
new file mode 100644
index 0000000..6a978ce
--- /dev/null
+++ b/features/load-balancer/org.apache.stratos.lb.common.feature/pom.xml
@@ -0,0 +1,86 @@
+<?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>loadbalancer-features</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.stratos.lb.common.feature</artifactId>
+    <packaging>pom</packaging>
+    <name>LB Common Feature</name>
+    <url>http://apache.org</url>
+    <description>This feature contains the common bundle for loadbalancer features</description>
+
+    <dependencies>
+	<dependency>
+	    <groupId>org.apache.stratos</groupId>
+	    <artifactId>org.apache.stratos.lb.common</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.lb.common</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.load.balance.agent.stub</bundleDef>
+                                -->
+                                <bundleDef>org.apache.stratos:org.apache.stratos.lb.common:${project.version}</bundleDef>
+                                <bundleDef>org.slf4j:slf4j-api:1.6.4</bundleDef>
+                                <bundleDef>org.slf4j:slf4j-log4j12:1.6.4</bundleDef>
+                            </bundles>
+                            <importFeatures>
+                                <importFeatureDef>org.apache.synapse.wso2:${synapse.wso2.version}</importFeatureDef>
+                            </importFeatures>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/4.1.0/pom.xml b/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/4.1.0/pom.xml
deleted file mode 100644
index 960cfb8..0000000
--- a/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/4.1.0/pom.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2009-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.wso2.carbon</groupId>
-        <artifactId>loadbalancer-feature</artifactId>
-        <version>4.1.0</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.lb.endpoint.server.feature</artifactId>
-    <packaging>pom</packaging>
-    <version>4.1.0</version>
-    <name>WSO2 Carbon - Loadbalancer Endpoint Management Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the required bundles for loadbalancer endpoint management functionality</description>
-
-    <dependencies>
-	<!--dependency>
-	    <groupId>org.wso2.carbon</groupId>
-	    <artifactId>org.wso2.carbon.lb.common</artifactId>
-	    <version>${project.version}</version>
-	</dependency-->
-	<dependency>
-	    <groupId>org.wso2.carbon</groupId>
-	    <artifactId>org.wso2.carbon.lb.endpoint</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>4-p2-feature-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-feature-gen</goal>
-                        </goals>
-                        <configuration>
-                            <id>org.wso2.carbon.lb.endpoint.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.lb.common</bundleDef-->
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.lb.endpoint</bundleDef>
-                            </bundles>
-                            <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef>
-                                <importFeatureDef>org.apache.synapse.wso2:${synapse.version}</importFeatureDef>
-                                <!--importFeatureDef>org.wso2.carbon.mediation.initializer.server:${mediation.initializer.feature.version}</importFeatureDef-->
-                                <importFeatureDef>org.wso2.carbon.lb.common</importFeatureDef>
-                            </importFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/4.1.1/pom.xml b/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/4.1.1/pom.xml
deleted file mode 100644
index 1e09cb8..0000000
--- a/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/4.1.1/pom.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2009-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.wso2.carbon</groupId>
-        <artifactId>loadbalancer-feature</artifactId>
-        <version>4.1.0</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.lb.endpoint.server.feature</artifactId>
-    <packaging>pom</packaging>
-    <version>4.1.1</version>
-    <name>WSO2 Carbon - Loadbalancer Endpoint Management Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the required bundles for loadbalancer endpoint management functionality</description>
-
-    <dependencies>
-	<!--dependency>
-	    <groupId>org.wso2.carbon</groupId>
-	    <artifactId>org.wso2.carbon.lb.common</artifactId>
-	    <version>${project.version}</version>
-	</dependency-->
-	<dependency>
-	    <groupId>org.wso2.carbon</groupId>
-	    <artifactId>org.wso2.carbon.lb.endpoint</artifactId>
-	    <version>${carbon.patch.version.4.1.1}</version>	
-	</dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.wso2.maven</groupId>
-                <artifactId>carbon-p2-plugin</artifactId>
-                <version>${carbon.p2.plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>4-p2-feature-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-feature-gen</goal>
-                        </goals>
-                        <configuration>
-                            <id>org.wso2.carbon.lb.endpoint.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.lb.common</bundleDef-->
-                                <bundleDef>org.wso2.carbon:org.wso2.carbon.lb.endpoint:${carbon.patch.version.4.1.1}</bundleDef>
-                            </bundles>
-                            <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef>
-                                <importFeatureDef>org.apache.synapse.wso2:2.1.1-wso2v4</importFeatureDef>
-                                <!--importFeatureDef>org.wso2.carbon.mediation.initializer.server:${mediation.initializer.feature.version}</importFeatureDef-->
-                                <importFeatureDef>org.wso2.carbon.lb.common:${carbon.version}</importFeatureDef>
-                            </importFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-<properties>
-	<carbon.version>4.1.0</carbon.version>
-	<carbon.patch.version.4.1.1>4.1.1</carbon.patch.version.4.1.1>
-</properties>
-
-</project>
diff --git a/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/4.1.3/pom.xml b/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/4.1.3/pom.xml
deleted file mode 100644
index 8b1c3a3..0000000
--- a/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/4.1.3/pom.xml
+++ /dev/null
@@ -1,95 +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>loadbalancer-feature</artifactId>
-        <version>4.1.3</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apache.stratos.lb.endpoint.server.feature</artifactId>
-    <packaging>pom</packaging>
-    <version>4.1.3</version>
-    <name>Loadbalancer Endpoint Management Feature</name>
-    <url>http://apache.org</url>
-    <description>This feature contains the required bundles for loadbalancer endpoint management functionality</description>
-
-    <dependencies>
-	<!--dependency>
-	    <groupId>org.wso2.carbon</groupId>
-	    <artifactId>org.wso2.carbon.lb.common</artifactId>
-	    <version>${project.version}</version>
-	</dependency-->
-	<dependency>
-	    <groupId>org.apache.stratos</groupId>
-	    <artifactId>org.apache.stratos.lb.endpoint</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>4-p2-feature-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-feature-gen</goal>
-                        </goals>
-                        <configuration>
-                            <id>org.apache.stratos.lb.endpoint.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.lb.endpoint:${project.version}</bundleDef>
-                            </bundles>
-                            <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.patch.version}</importFeatureDef>
-                                <importFeatureDef>org.apache.synapse.wso2:${synapse.wso2.version}</importFeatureDef>
-                                <importFeatureDef>org.apache.stratos.lb.common:${project.version}</importFeatureDef>
-                            </importFeatures>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-<properties>
-	<carbon.version>4.1.0</carbon.version>
-	<carbon.patch.version.4.1.1>4.1.1</carbon.patch.version.4.1.1>
-</properties>
-
-</project>
diff --git a/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/pom.xml b/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/pom.xml
new file mode 100644
index 0000000..67442be
--- /dev/null
+++ b/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/pom.xml
@@ -0,0 +1,93 @@
+<?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>loadbalancer-features</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.stratos.lb.endpoint.server.feature</artifactId>
+    <packaging>pom</packaging>
+    <name>Loadbalancer Endpoint Management Feature</name>
+    <url>http://apache.org</url>
+    <description>This feature contains the required bundles for loadbalancer endpoint management functionality</description>
+
+    <dependencies>
+	<!--dependency>
+	    <groupId>org.wso2.carbon</groupId>
+	    <artifactId>org.wso2.carbon.lb.common</artifactId>
+	    <version>${project.version}</version>
+	</dependency-->
+	<dependency>
+	    <groupId>org.apache.stratos</groupId>
+	    <artifactId>org.apache.stratos.lb.endpoint</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.lb.endpoint.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.lb.endpoint:${apache.stratos.version}</bundleDef>
+                            </bundles>
+                            <importFeatures>
+                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.patch.version}</importFeatureDef>
+                                <importFeatureDef>org.apache.synapse.wso2:${synapse.wso2.version}</importFeatureDef>
+                                <importFeatureDef>org.apache.stratos.lb.common:${apache.stratos.version}</importFeatureDef>
+                            </importFeatures>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+<properties>
+	<carbon.version>4.1.0</carbon.version>
+	<carbon.patch.version.4.1.1>4.1.1</carbon.patch.version.4.1.1>
+</properties>
+
+</project>
diff --git a/features/load-balancer/pom.xml b/features/load-balancer/pom.xml
index 01e660d..9a9b0b0 100644
--- a/features/load-balancer/pom.xml
+++ b/features/load-balancer/pom.xml
@@ -24,20 +24,18 @@
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-features-parent</artifactId>
-        <version>2.0.0</version>
-        <relativePath>../pom.xml</relativePath>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>loadbalancer-features</artifactId>
-    <version>4.1.3</version>
     <packaging>pom</packaging>
     <name>Apache Stratos Load Balancer Module</name>
     <url>http://apache.org</url>
 
     <modules>
-        <module>org.apache.stratos.lb.common.feature/4.1.3</module>
-	<module>org.apache.stratos.lb.endpoint.server.feature/4.1.3</module>
+        <module>org.apache.stratos.lb.common.feature</module>
+	<module>org.apache.stratos.lb.endpoint.server.feature</module>
     </modules>
 </project>
 
-- 
1.7.9.5