You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/07/15 16:24:20 UTC
[1/2] git commit: removing version directories of adc.mgt and fixing
parent poms
Updated Branches:
refs/heads/master f32a7d0c2 -> 66245dff6
removing version directories of adc.mgt and fixing parent poms
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/36cb9129
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/36cb9129
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/36cb9129
Branch: refs/heads/master
Commit: 36cb9129b22c235a6b3cda962611c9d6e836ad7e
Parents: b7bc1c7
Author: Isuru <is...@wso2.com>
Authored: Mon Jul 15 19:53:18 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Mon Jul 15 19:53:18 2013 +0530
----------------------------------------------------------------------
.../2.1.1/pom.xml | 78 ----------
.../2.1.3/pom.xml | 78 ----------
.../org.apache.stratos.adc.mgt.feature/pom.xml | 79 ++++++++++
.../2.1.1/pom.xml | 119 ---------------
.../2.1.3/pom.xml | 143 ------------------
.../2.1.3/src/main/resources/build.properties | 1 -
.../resources/conf/cartridge-config.properties | 38 -----
.../src/main/resources/conf/etc/policies.xsd | 36 -----
.../2.1.3/src/main/resources/conf/policies.xml | 22 ---
.../2.1.3/src/main/resources/p2.inf | 5 -
.../pom.xml | 144 +++++++++++++++++++
.../src/main/resources/build.properties | 1 +
.../resources/conf/cartridge-config.properties | 38 +++++
.../src/main/resources/conf/etc/policies.xsd | 36 +++++
.../src/main/resources/conf/policies.xml | 22 +++
.../src/main/resources/p2.inf | 5 +
.../2.1.1/pom.xml | 82 -----------
.../2.1.3/pom.xml | 82 -----------
.../pom.xml | 83 +++++++++++
features/adc/pom.xml | 39 ++---
20 files changed, 428 insertions(+), 703 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/org.apache.stratos.adc.mgt.feature/2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.feature/2.1.1/pom.xml b/features/adc/org.apache.stratos.adc.mgt.feature/2.1.1/pom.xml
deleted file mode 100644
index b93b0a2..0000000
--- a/features/adc/org.apache.stratos.adc.mgt.feature/2.1.1/pom.xml
+++ /dev/null
@@ -1,78 +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>adc-mgt-feature</artifactId>
- <version>2.1.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.adc.mgt.feature</artifactId>
- <packaging>pom</packaging>
- <version>2.1.1</version>
- <name>WSO2 Carbon - ADC Management Composite Feature</name>
- <url>http://wso2.org</url>
- <description>This feature contains the core bundles required for Artifact Deployment Controller</description>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.adc.mgt.server.feature</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.adc.topology.mgt.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.wso2.carbon.adc.mgt</id>
- <propertiesFile>../../../../etc/feature.properties</propertiesFile>
- <includedFeatures>
- <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.adc.mgt.server.feature:${project.version}</includedFeatureDef>
- <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.adc.topology.mgt.feature:${project.version}</includedFeatureDef>
- </includedFeatures>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/org.apache.stratos.adc.mgt.feature/2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.feature/2.1.3/pom.xml b/features/adc/org.apache.stratos.adc.mgt.feature/2.1.3/pom.xml
deleted file mode 100644
index 4df4e17..0000000
--- a/features/adc/org.apache.stratos.adc.mgt.feature/2.1.3/pom.xml
+++ /dev/null
@@ -1,78 +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.apache.stratos</groupId>
- <artifactId>adc-mgt-feature</artifactId>
- <version>2.1.3</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.stratos.adc.mgt.feature</artifactId>
- <packaging>pom</packaging>
- <version>2.1.3</version>
- <name>Apache Stratos - ADC Management Composite Feature</name>
- <url>http://apache.org</url>
- <description>This feature contains the core bundles required for Artifact Deployment Controller</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.adc.mgt.server.feature</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.adc.topology.mgt.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.adc.mgt</id>
- <propertiesFile>../../../../etc/feature.properties</propertiesFile>
- <includedFeatures>
- <includedFeatureDef>org.apache.stratos:org.apache.stratos.adc.mgt.server.feature:${project.version}</includedFeatureDef>
- <includedFeatureDef>org.apache.stratos:org.apache.stratos.adc.topology.mgt.feature:${project.version}</includedFeatureDef>
- </includedFeatures>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/org.apache.stratos.adc.mgt.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.feature/pom.xml b/features/adc/org.apache.stratos.adc.mgt.feature/pom.xml
new file mode 100644
index 0000000..a284415
--- /dev/null
+++ b/features/adc/org.apache.stratos.adc.mgt.feature/pom.xml
@@ -0,0 +1,79 @@
+<?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>adc-mgt-feature</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.stratos.adc.mgt.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Stratos - ADC Management Composite Feature</name>
+ <url>http://apache.org</url>
+ <description>This feature contains the core bundles required for Artifact Deployment Controller</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.adc.mgt.server.feature</artifactId>
+ <version>${apache.stratos.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.adc.topology.mgt.feature</artifactId>
+ <version>${apache.stratos.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.adc.mgt</id>
+ <propertiesFile>../../../../etc/feature.properties</propertiesFile>
+ <includedFeatures>
+ <includedFeatureDef>org.apache.stratos:org.apache.stratos.adc.mgt.server.feature:${apache.stratos.version}</includedFeatureDef>
+ <includedFeatureDef>org.apache.stratos:org.apache.stratos.adc.topology.mgt.feature:${apache.stratos.version}</includedFeatureDef>
+ </includedFeatures>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.1/pom.xml b/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.1/pom.xml
deleted file mode 100644
index 2ddf1f3..0000000
--- a/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.1/pom.xml
+++ /dev/null
@@ -1,119 +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>adc-mgt-feature</artifactId>
- <version>2.1.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.adc.mgt.server.feature</artifactId>
- <packaging>pom</packaging>
- <version>2.1.1</version>
- <name>WSO2 Carbon - ADC Management Core Feature</name>
- <url>http://wso2.org</url>
- <description>This feature contains the core bundles required for Artifact Deployment Controller</description>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.adc.mgt</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.load.balance.cartridge.autoscaler.service.stub</artifactId>
- <version>4.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.andes.wso2</groupId>
- <artifactId>andes-client</artifactId>
- <version>0.13.wso2v6</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.adc.mgt.stub</artifactId>
- <version>4.1.1</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>prefilter-resources</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>src/main/resources</outputDirectory>
- <resources>
- <resource>
- <directory>resources</directory>
- <includes>
- <include>conf/agent.properties</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.wso2.carbon.adc.mgt.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.adc.mgt:${project.version}</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.adc.mgt.stub:4.1.1</bundleDef>
- <bundleDef>org.wso2.andes.wso2:andes-client:0.13.wso2v6</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.load.balance.cartridge.autoscaler.service.stub:4.1.1</bundleDef>
- </bundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/pom.xml b/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/pom.xml
deleted file mode 100644
index 6144114..0000000
--- a/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/pom.xml
+++ /dev/null
@@ -1,143 +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.apache.stratos</groupId>
- <artifactId>adc-mgt-feature</artifactId>
- <version>2.1.3</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.stratos.adc.mgt.server.feature</artifactId>
- <packaging>pom</packaging>
- <version>2.1.3</version>
- <name>Apache Stratos - ADC Management Core Feature</name>
- <url>http://apache.org</url>
- <description>This feature contains the core bundles required for Artifact Deployment Controller</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.adc.mgt</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.load.balance.cartridge.autoscaler.service.stub</artifactId>
- <version>4.1.3</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.andes.wso2</groupId>
- <artifactId>andes-client</artifactId>
- <version>0.13.wso2v6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.adc.mgt.stub</artifactId>
- <version>4.1.3</version>
- </dependency>
- <dependency>
- <groupId>com.gitblit</groupId>
- <artifactId>gitblit</artifactId>
- <version>1.2.0.wso2v1</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jgit</groupId>
- <artifactId>org.eclipse.jgit</artifactId>
- <version>2.1.0.wso2v1</version>
- </dependency>
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>0.1.49.wso2v1</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>prefilter-resources</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>src/main/resources</outputDirectory>
- <resources>
- <resource>
- <directory>resources</directory>
- <includes>
- <include>conf/agent.properties</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.adc.mgt.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.adc.mgt:${project.version}</bundleDef>
- <bundleDef>org.apache.stratos:org.apache.stratos.adc.mgt.stub:4.1.3</bundleDef>
- <bundleDef>org.wso2.andes.wso2:andes-client:0.13.wso2v6</bundleDef>
- <bundleDef>org.apache.stratos:org.apache.stratos.load.balance.cartridge.autoscaler.service.stub:4.1.3</bundleDef>
- <bundleDef>com.gitblit:gitblit:1.2.0.wso2v1</bundleDef>
- <bundleDef>com.google.code.gson:gson:2.1</bundleDef>
- <bundleDef>org.eclipse.jgit:org.eclipse.jgit:2.1.0.wso2v1</bundleDef>
- <bundleDef>com.jcraft:jsch:0.1.49.wso2v1</bundleDef>
- </bundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/build.properties b/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/build.properties
deleted file mode 100644
index 93c4b10..0000000
--- a/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-custom = true
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/conf/cartridge-config.properties
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/conf/cartridge-config.properties b/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/conf/cartridge-config.properties
deleted file mode 100644
index b495014..0000000
--- a/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/conf/cartridge-config.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-# Configuration properties
-
-sc.ip=s2_ip
-autoscalerService.url=https://cc.wso2.com:9444/services/CloudControllerService/
-autoscaler.time.out=190000
-cartridge.agent.epr=https://s2_ip:9447/services/CartridgeAgentService
-git.host.name=s2_hostname
-git.host.ip=s2_ip
-git.repo.notification.url=https://sc.wso2.com:9445/services/RepoNotificationService/
-identity.server.url=https://sc.wso2.com:9447/services/RepoNotificationService/
-
-adc.jdbc.url=jdbc:h2:repository/database/WSO2S2_DB
-adc.jdbc.username=wso2carbon
-adc.jdbc.password=wso2carbon
-adc.jdbc.driver=org.h2.Driver
-
-mb.server.ip=cc.wso2.com:5673
-
-feature.externalrepo.validation.enabled=true
-feature.internalrepo.enabled=false
-feature.multitenant.multiplesubscription.enabled=false
-
-internal.repo.username=admin
-internal.repo.password=admin
-
-append.script=SCRIPT_PATH/add_entry_zone_file.sh
-remove.script=SCRIPT_PATH/remove_entry_zone_file.sh
-bind.file.path=/etc/bind/db.STRATOS_DOMAIN
-elb.ip=s2_ip
-
-bam.ip=s2_ip
-bam.port=7714
-
-max.attempts=1000
-
-cartridge.key=KEYPATH
-
-repository.info.epr=https://s2_ip:9445/services/RepositoryInformationService
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/conf/etc/policies.xsd
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/conf/etc/policies.xsd b/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/conf/etc/policies.xsd
deleted file mode 100644
index 87f7b58..0000000
--- a/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/conf/etc/policies.xsd
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<xs:schema attributeFormDefault="unqualified"
- elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="policies">
- <xs:annotation>
- <xs:documentation>Use below section to specify auto-scaling policies
- for cartridges.
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="policy" maxOccurs="unbounded"
- minOccurs="1">
- <xs:annotation>
- <xs:documentation>You can have 1..n policy elements.
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element type="xs:string" name="description" />
- <xs:element type="xs:integer" name="min_app_instances" />
- <xs:element type="xs:integer" name="max_app_instances" />
- <xs:element type="xs:integer" name="max_requests_per_second" />
- <xs:element type="xs:decimal" name="alarming_upper_rate" />
- <xs:element type="xs:decimal" name="alarming_lower_rate" />
- <xs:element type="xs:decimal" name="scale_down_factor" />
- <xs:element type="xs:integer" name="rounds_to_average" />
- </xs:sequence>
- <xs:attribute type="xs:string" name="name" use="required" />
- <xs:attribute type="xs:boolean" name="isDefault" use="required" />
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-</xs:schema>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/conf/policies.xml
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/conf/policies.xml b/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/conf/policies.xml
deleted file mode 100644
index 7dd37d5..0000000
--- a/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/conf/policies.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<policies>
- <policy name="single" isDefault="true">
- <description>Single - Instances: Min 1, Max 1</description>
- <min_app_instances>1</min_app_instances>
- <max_app_instances>1</max_app_instances>
- <max_requests_per_second>5</max_requests_per_second>
- <alarming_upper_rate>0.7</alarming_upper_rate>
- <alarming_lower_rate>0.2</alarming_lower_rate>
- <scale_down_factor>0.25</scale_down_factor>
- <rounds_to_average>2</rounds_to_average>
- </policy>
- <policy name="elastic" isDefault="false">
- <description>Elastic - Instances: Min 1, Max 4</description>
- <min_app_instances>1</min_app_instances>
- <max_app_instances>4</max_app_instances>
- <max_requests_per_second>5</max_requests_per_second>
- <alarming_upper_rate>0.7</alarming_upper_rate>
- <alarming_lower_rate>0.2</alarming_lower_rate>
- <scale_down_factor>0.25</scale_down_factor>
- <rounds_to_average>2</rounds_to_average>
- </policy>
-</policies>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/p2.inf b/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/p2.inf
deleted file mode 100644
index 6b92fd6..0000000
--- a/features/adc/org.apache.stratos.adc.mgt.server.feature/2.1.3/src/main/resources/p2.inf
+++ /dev/null
@@ -1,5 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.adc.mgt.server_${feature.version}/conf/cartridge-config.properties,target:${installFolder}/../conf/cartridge-config.properties,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.adc.mgt.server_${feature.version}/conf/policies.xml,target:${installFolder}/../conf/policies.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.adc.mgt.server_${feature.version}/conf/etc/policies.xsd,target:${installFolder}/../conf/etc/policies.xsd,overwrite:true);\
-
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/org.apache.stratos.adc.mgt.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.server.feature/pom.xml b/features/adc/org.apache.stratos.adc.mgt.server.feature/pom.xml
new file mode 100644
index 0000000..392cfff
--- /dev/null
+++ b/features/adc/org.apache.stratos.adc.mgt.server.feature/pom.xml
@@ -0,0 +1,144 @@
+<?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>adc-mgt-feature</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.stratos.adc.mgt.server.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Stratos - ADC Management Core Feature</name>
+ <url>http://apache.org</url>
+ <description>This feature contains the core bundles required for Artifact Deployment Controller</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.adc.mgt</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.load.balance.cartridge.autoscaler.service.stub</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.andes.wso2</groupId>
+ <artifactId>andes-client</artifactId>
+ <version>0.13.wso2v6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.adc.mgt.stub</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.gitblit</groupId>
+ <artifactId>gitblit</artifactId>
+ <version>1.2.0.wso2v1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jgit</groupId>
+ <artifactId>org.eclipse.jgit</artifactId>
+ <version>2.1.0.wso2v1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>0.1.49.wso2v1</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prefilter-resources</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>src/main/resources</outputDirectory>
+ <resources>
+ <resource>
+ <directory>resources</directory>
+ <includes>
+ <include>conf/agent.properties</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.adc.mgt.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.adc.mgt:${apache.stratos.version}</bundleDef>
+ <bundleDef>org.apache.stratos:org.apache.stratos.adc.mgt.stub:${apache.stratos.version}</bundleDef>
+ <bundleDef>org.wso2.andes.wso2:andes-client:0.13.wso2v6</bundleDef>
+ <bundleDef>org.apache.stratos:org.apache.stratos.load.balance.cartridge.autoscaler.service.stub:${apache.stratos.version}</bundleDef>
+ <bundleDef>com.gitblit:gitblit:1.2.0.wso2v1</bundleDef>
+ <bundleDef>com.google.code.gson:gson:2.1</bundleDef>
+ <bundleDef>org.eclipse.jgit:org.eclipse.jgit:2.1.0.wso2v1</bundleDef>
+ <bundleDef>com.jcraft:jsch:0.1.49.wso2v1</bundleDef>
+ </bundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/build.properties b/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/build.properties
new file mode 100644
index 0000000..93c4b10
--- /dev/null
+++ b/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/build.properties
@@ -0,0 +1 @@
+custom = true
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/cartridge-config.properties
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/cartridge-config.properties b/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/cartridge-config.properties
new file mode 100644
index 0000000..b495014
--- /dev/null
+++ b/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/cartridge-config.properties
@@ -0,0 +1,38 @@
+# Configuration properties
+
+sc.ip=s2_ip
+autoscalerService.url=https://cc.wso2.com:9444/services/CloudControllerService/
+autoscaler.time.out=190000
+cartridge.agent.epr=https://s2_ip:9447/services/CartridgeAgentService
+git.host.name=s2_hostname
+git.host.ip=s2_ip
+git.repo.notification.url=https://sc.wso2.com:9445/services/RepoNotificationService/
+identity.server.url=https://sc.wso2.com:9447/services/RepoNotificationService/
+
+adc.jdbc.url=jdbc:h2:repository/database/WSO2S2_DB
+adc.jdbc.username=wso2carbon
+adc.jdbc.password=wso2carbon
+adc.jdbc.driver=org.h2.Driver
+
+mb.server.ip=cc.wso2.com:5673
+
+feature.externalrepo.validation.enabled=true
+feature.internalrepo.enabled=false
+feature.multitenant.multiplesubscription.enabled=false
+
+internal.repo.username=admin
+internal.repo.password=admin
+
+append.script=SCRIPT_PATH/add_entry_zone_file.sh
+remove.script=SCRIPT_PATH/remove_entry_zone_file.sh
+bind.file.path=/etc/bind/db.STRATOS_DOMAIN
+elb.ip=s2_ip
+
+bam.ip=s2_ip
+bam.port=7714
+
+max.attempts=1000
+
+cartridge.key=KEYPATH
+
+repository.info.epr=https://s2_ip:9445/services/RepositoryInformationService
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/etc/policies.xsd
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/etc/policies.xsd b/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/etc/policies.xsd
new file mode 100644
index 0000000..87f7b58
--- /dev/null
+++ b/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/etc/policies.xsd
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<xs:schema attributeFormDefault="unqualified"
+ elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="policies">
+ <xs:annotation>
+ <xs:documentation>Use below section to specify auto-scaling policies
+ for cartridges.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="policy" maxOccurs="unbounded"
+ minOccurs="1">
+ <xs:annotation>
+ <xs:documentation>You can have 1..n policy elements.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element type="xs:string" name="description" />
+ <xs:element type="xs:integer" name="min_app_instances" />
+ <xs:element type="xs:integer" name="max_app_instances" />
+ <xs:element type="xs:integer" name="max_requests_per_second" />
+ <xs:element type="xs:decimal" name="alarming_upper_rate" />
+ <xs:element type="xs:decimal" name="alarming_lower_rate" />
+ <xs:element type="xs:decimal" name="scale_down_factor" />
+ <xs:element type="xs:integer" name="rounds_to_average" />
+ </xs:sequence>
+ <xs:attribute type="xs:string" name="name" use="required" />
+ <xs:attribute type="xs:boolean" name="isDefault" use="required" />
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/policies.xml
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/policies.xml b/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/policies.xml
new file mode 100644
index 0000000..7dd37d5
--- /dev/null
+++ b/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/policies.xml
@@ -0,0 +1,22 @@
+<policies>
+ <policy name="single" isDefault="true">
+ <description>Single - Instances: Min 1, Max 1</description>
+ <min_app_instances>1</min_app_instances>
+ <max_app_instances>1</max_app_instances>
+ <max_requests_per_second>5</max_requests_per_second>
+ <alarming_upper_rate>0.7</alarming_upper_rate>
+ <alarming_lower_rate>0.2</alarming_lower_rate>
+ <scale_down_factor>0.25</scale_down_factor>
+ <rounds_to_average>2</rounds_to_average>
+ </policy>
+ <policy name="elastic" isDefault="false">
+ <description>Elastic - Instances: Min 1, Max 4</description>
+ <min_app_instances>1</min_app_instances>
+ <max_app_instances>4</max_app_instances>
+ <max_requests_per_second>5</max_requests_per_second>
+ <alarming_upper_rate>0.7</alarming_upper_rate>
+ <alarming_lower_rate>0.2</alarming_lower_rate>
+ <scale_down_factor>0.25</scale_down_factor>
+ <rounds_to_average>2</rounds_to_average>
+ </policy>
+</policies>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/p2.inf b/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/p2.inf
new file mode 100644
index 0000000..6b92fd6
--- /dev/null
+++ b/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/p2.inf
@@ -0,0 +1,5 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.adc.mgt.server_${feature.version}/conf/cartridge-config.properties,target:${installFolder}/../conf/cartridge-config.properties,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.adc.mgt.server_${feature.version}/conf/policies.xml,target:${installFolder}/../conf/policies.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.adc.mgt.server_${feature.version}/conf/etc/policies.xsd,target:${installFolder}/../conf/etc/policies.xsd,overwrite:true);\
+
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/org.apache.stratos.adc.topology.mgt.feature/2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.topology.mgt.feature/2.1.1/pom.xml b/features/adc/org.apache.stratos.adc.topology.mgt.feature/2.1.1/pom.xml
deleted file mode 100644
index 20ceaa3..0000000
--- a/features/adc/org.apache.stratos.adc.topology.mgt.feature/2.1.1/pom.xml
+++ /dev/null
@@ -1,82 +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>adc-mgt-feature</artifactId>
- <version>2.1.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.adc.topology.mgt.feature</artifactId>
- <version>2.1.1</version>
- <packaging>pom</packaging>
- <name>WSO2 Carbon - ADC Topology Management Feature</name>
- <url>http://wso2.org</url>
- <description>This feature contains the bundles required for Topology Management in ADC</description>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.adc.topology.mgt</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.lb.common</artifactId>
- <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>p2-feature-generation</id>
- <phase>package</phase>
- <goals>
- <goal>p2-feature-gen</goal>
- </goals>
- <configuration>
- <id>org.wso2.carbon.adc.topology.mgt</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.adc.topology.mgt:${project.version}</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.lb.common:4.1.1</bundleDef>
- </bundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/org.apache.stratos.adc.topology.mgt.feature/2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.topology.mgt.feature/2.1.3/pom.xml b/features/adc/org.apache.stratos.adc.topology.mgt.feature/2.1.3/pom.xml
deleted file mode 100644
index a05388b..0000000
--- a/features/adc/org.apache.stratos.adc.topology.mgt.feature/2.1.3/pom.xml
+++ /dev/null
@@ -1,82 +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.apache.stratos</groupId>
- <artifactId>adc-mgt-feature</artifactId>
- <version>2.1.3</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.stratos.adc.topology.mgt.feature</artifactId>
- <version>2.1.3</version>
- <packaging>pom</packaging>
- <name>Apache Stratos - ADC Topology Management Feature</name>
- <url>http://apache.org</url>
- <description>This feature contains the bundles required for Topology Management in ADC</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.adc.topology.mgt</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.lb.common</artifactId>
- <version>4.1.3</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.adc.topology.mgt</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.adc.topology.mgt:${project.version}</bundleDef>
- <bundleDef>org.apache.stratos:org.apache.stratos.lb.common:4.1.3</bundleDef>
- </bundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/org.apache.stratos.adc.topology.mgt.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.topology.mgt.feature/pom.xml b/features/adc/org.apache.stratos.adc.topology.mgt.feature/pom.xml
new file mode 100644
index 0000000..4456f78
--- /dev/null
+++ b/features/adc/org.apache.stratos.adc.topology.mgt.feature/pom.xml
@@ -0,0 +1,83 @@
+<?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>adc-mgt-feature</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.stratos.adc.topology.mgt.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Stratos - ADC Topology Management Feature</name>
+ <url>http://apache.org</url>
+ <description>This feature contains the bundles required for Topology Management in ADC</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.adc.topology.mgt</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+ <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>p2-feature-generation</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-feature-gen</goal>
+ </goals>
+ <configuration>
+ <id>org.apache.stratos.adc.topology.mgt</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.adc.topology.mgt:${apache.stratos.version}</bundleDef>
+ <bundleDef>org.apache.stratos:org.apache.stratos.lb.common:${apache.stratos.version}</bundleDef>
+ </bundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/36cb9129/features/adc/pom.xml
----------------------------------------------------------------------
diff --git a/features/adc/pom.xml b/features/adc/pom.xml
index 5fa6529..9b369ec 100644
--- a/features/adc/pom.xml
+++ b/features/adc/pom.xml
@@ -1,18 +1,21 @@
<?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"
@@ -22,21 +25,19 @@
<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>adc-mgt-feature</artifactId>
- <version>2.1.3</version>
<packaging>pom</packaging>
<name>Apache Stratos - ADC Management Feature Aggregator Module</name>
<url>http://apache.org</url>
<modules>
- <module>org.apache.stratos.adc.mgt.server.feature/2.1.3</module>
- <module>org.apache.stratos.adc.topology.mgt.feature/2.1.3</module>
- <module>org.apache.stratos.adc.mgt.feature/2.1.3</module>
+ <module>org.apache.stratos.adc.mgt.server.feature</module>
+ <module>org.apache.stratos.adc.topology.mgt.feature</module>
+ <module>org.apache.stratos.adc.mgt.feature</module>
</modules>
</project>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos into features
Posted by is...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into features
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/66245dff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/66245dff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/66245dff
Branch: refs/heads/master
Commit: 66245dff616a9c929883e14483570db45d7a751e
Parents: 36cb912 f32a7d0
Author: Isuru <is...@wso2.com>
Authored: Mon Jul 15 19:53:31 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Mon Jul 15 19:53:31 2013 +0530
----------------------------------------------------------------------
.../4.1.0/pom.xml | 96 --------------------
.../4.1.1/pom.xml | 96 --------------------
.../4.1.3/pom.xml | 93 -------------------
.../pom.xml | 91 +++++++++++++++++++
features/autoscaler/pom.xml | 6 +-
5 files changed, 93 insertions(+), 289 deletions(-)
----------------------------------------------------------------------