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 17:11:09 UTC
git commit: committing cartridge agent features
Updated Branches:
refs/heads/master 85e5f1436 -> 33b78e13b
committing cartridge agent 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/33b78e13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/33b78e13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/33b78e13
Branch: refs/heads/master
Commit: 33b78e13b7202932c22875ae23c3b43b92459598
Parents: 85e5f14
Author: Isuru <is...@wso2.com>
Authored: Mon Jul 15 20:40:34 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Mon Jul 15 20:40:34 2013 +0530
----------------------------------------------------------------------
.../org.apache.stratos.cartridge.agent/pom.xml | 1 -
.../2.1.1/pom.xml | 78 ---------
.../2.1.3/pom.xml | 78 ---------
.../pom.xml | 79 ++++++++++
.../2.1.1/pom.xml | 158 -------------------
.../2.1.1/src/main/resources/build.properties | 2 -
.../src/main/resources/conf/agent.properties | 25 ---
.../2.1.1/src/main/resources/p2.inf | 3 -
.../2.1.3/pom.xml | 158 -------------------
.../2.1.3/src/main/resources/build.properties | 2 -
.../src/main/resources/conf/agent.properties | 25 ---
.../2.1.3/src/main/resources/p2.inf | 3 -
.../pom.xml | 156 ++++++++++++++++++
.../src/main/resources/build.properties | 2 +
.../src/main/resources/conf/agent.properties | 25 +++
.../src/main/resources/p2.inf | 3 +
.../2.1.1/pom.xml | 83 ----------
.../pom.xml | 84 ++++++++++
features/cartridge-agent/pom.xml | 38 ++---
features/pom.xml | 5 +
20 files changed, 374 insertions(+), 634 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/components/org.apache.stratos.cartridge.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/pom.xml b/components/org.apache.stratos.cartridge.agent/pom.xml
index 28062ee..6705050 100644
--- a/components/org.apache.stratos.cartridge.agent/pom.xml
+++ b/components/org.apache.stratos.cartridge.agent/pom.xml
@@ -30,7 +30,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stratos.cartridge.agent</artifactId>
<packaging>bundle</packaging>
- <version>2.1.3</version>
<name>Apache Stratos Cartridge Agent - agent</name>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/features/cartridge-agent/org.apache.stratos.cartridge.agent.feature/2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.agent.feature/2.1.1/pom.xml b/features/cartridge-agent/org.apache.stratos.cartridge.agent.feature/2.1.1/pom.xml
deleted file mode 100644
index 016a36a..0000000
--- a/features/cartridge-agent/org.apache.stratos.cartridge.agent.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>cartridge-agent</artifactId>
- <version>2.1.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.cartridge.agent.feature</artifactId>
- <packaging>pom</packaging>
- <version>2.1.1</version>
- <name>WSO2 Cartridge Agent - Composite Feature</name>
- <url>http://wso2.org</url>
- <description>This feature contains the bundles required for cartridge agent feature</description>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.cartridge.messages.feature</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.cartridge.agent.server.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.cartridge.agent</id>
- <propertiesFile>../../../../etc/feature.properties</propertiesFile>
- <includedFeatures>
- <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.cartridge.agent.server.feature:${project.version}</includedFeatureDef>
- <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.cartridge.messages.feature:${project.version}</includedFeatureDef>
- </includedFeatures>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/features/cartridge-agent/org.apache.stratos.cartridge.agent.feature/2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.agent.feature/2.1.3/pom.xml b/features/cartridge-agent/org.apache.stratos.cartridge.agent.feature/2.1.3/pom.xml
deleted file mode 100644
index 90ad905..0000000
--- a/features/cartridge-agent/org.apache.stratos.cartridge.agent.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>cartridge-agent</artifactId>
- <version>2.0.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.cartridge.agent.feature</artifactId>
- <packaging>pom</packaging>
- <version>2.1.3</version>
- <name>WSO2 Cartridge Agent - Composite Feature</name>
- <url>http://wso2.org</url>
- <description>This feature contains the bundles required for cartridge agent feature</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.cartridge.messages.feature</artifactId>
- <version>2.1.1</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.cartridge.agent.server.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.cartridge.agent</id>
- <propertiesFile>../../../../etc/feature.properties</propertiesFile>
- <includedFeatures>
- <includedFeatureDef>org.apache.stratos:org.apache.stratos.cartridge.agent.server.feature:${project.version}</includedFeatureDef>
- <includedFeatureDef>org.apache.stratos:org.apache.stratos.cartridge.messages.feature:2.1.1</includedFeatureDef>
- </includedFeatures>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/features/cartridge-agent/org.apache.stratos.cartridge.agent.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.agent.feature/pom.xml b/features/cartridge-agent/org.apache.stratos.cartridge.agent.feature/pom.xml
new file mode 100644
index 0000000..7fdc8b0
--- /dev/null
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.agent.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>cartridge-agent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.cartridge.agent.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Stratos Cartridge Agent - Composite Feature</name>
+ <url>http://apache.org</url>
+ <description>This feature contains the bundles required for cartridge agent feature</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.cartridge.messages.feature</artifactId>
+ <version>${apache.stratos.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.cartridge.agent.server.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.cartridge.agent</id>
+ <propertiesFile>../../../../etc/feature.properties</propertiesFile>
+ <includedFeatures>
+ <includedFeatureDef>org.apache.stratos:org.apache.stratos.cartridge.agent.server.feature:${apache.stratos.version}</includedFeatureDef>
+ <includedFeatureDef>org.apache.stratos:org.apache.stratos.cartridge.messages.feature:${apache.stratos.version}</includedFeatureDef>
+ </includedFeatures>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/pom.xml b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/pom.xml
deleted file mode 100644
index b2fd118..0000000
--- a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/pom.xml
+++ /dev/null
@@ -1,158 +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>cartridge-agent</artifactId>
- <version>2.1.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.cartridge.agent.server.feature</artifactId>
- <packaging>pom</packaging>
- <version>2.1.1</version>
- <name>WSO2 Carbon - Cartridge Agent Feature</name>
- <url>http://wso2.org</url>
- <description>This feature contains the bundles required for agent functionality</description>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.cartridge.agent</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2.wso2</groupId>
- <artifactId>axis2</artifactId>
- <version>1.6.1.wso2v8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom.wso2</groupId>
- <artifactId>axiom</artifactId>
- <version>1.2.11.wso2v4</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.adc.instanceinfo.mgt.stub</artifactId>
- <version>4.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>3.5.0.v20090311-1300</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>org.eclipse.osgi.services</artifactId>
- <version>3.3.0.v20110513</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.utils</artifactId>
- <version>4.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.rampart.wso2</groupId>
- <artifactId>rampart-policy</artifactId>
- <version>1.6.1.wso2v8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.rampart.wso2</groupId>
- <artifactId>rampart-core</artifactId>
- <version>1.6.1.wso2v8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.rampart.wso2</groupId>
- <artifactId>rampart-trust</artifactId>
- <version>1.6.1.wso2v8</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.cartridge.agent.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.cartridge.agent</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.utils:4.1.0</bundleDef>
- <bundleDef>org.eclipse.osgi:org.eclipse.osgi.services</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.adc.instanceinfo.mgt.stub</bundleDef>
- <bundleDef>org.apache.axis2.wso2:axis2</bundleDef>
- <bundleDef>org.apache.rampart.wso2:rampart-policy</bundleDef>
- <bundleDef>org.apache.rampart.wso2:rampart-core</bundleDef>
- <bundleDef>org.apache.rampart.wso2:rampart-trust</bundleDef>
- </bundles>
- <!--includedFeatures>
- <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.cartridge.messages.feature</includedFeatureDef>
- </includedFeatures-->
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/src/main/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/src/main/resources/build.properties b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/src/main/resources/build.properties
deleted file mode 100644
index 74258d5..0000000
--- a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/src/main/resources/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-custom = true
-root.stratos=conf
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/src/main/resources/conf/agent.properties
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/src/main/resources/conf/agent.properties b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/src/main/resources/conf/agent.properties
deleted file mode 100644
index 9c42c6a..0000000
--- a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/src/main/resources/conf/agent.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-loadBalancerDomain=wso2.carbon.lb.domain
-
-# Registrant health check interval in seconds
-registrant.heathCheckInterval=10
-registrant.healthCheckThreadPoolSize=2000
-
-# Clustering parameters of Cartridge agent member
-clustering.membershipScheme=wka
-clustering.maxRetries=10
-clustering.localMemberHost=localhost
-#clustering.localMemberHost=10.100.2.139
-#clustering.localMemberBindPort=4026
-clustering.localMemberPort=4025
-
-# ELB members
-members.1.host=localhost
-#members.1.host=10.100.2.139
-members.1.port=4000
-
-# TRustrore
-wso2.carbon.truststore=/var/lib/opt/ADS/repository/resources/security/wso2carbon.jks
-
-# Instance State Notification Service
-adc.host=ADC_HOSTNAME
-adc.port=ADC_PORT
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/src/main/resources/p2.inf b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/src/main/resources/p2.inf
deleted file mode 100644
index 5eec6fa..0000000
--- a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/src/main/resources/p2.inf
+++ /dev/null
@@ -1,3 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.cartridge.agent.server_${feature.version}/conf/agent.properties,target:${installFolder}/../conf/agent.properties,overwrite:true);\
-
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/pom.xml b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/pom.xml
deleted file mode 100644
index 6c67324..0000000
--- a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/pom.xml
+++ /dev/null
@@ -1,158 +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>cartridge-agent</artifactId>
- <version>2.0.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.stratos.cartridge.agent.server.feature</artifactId>
- <packaging>pom</packaging>
- <version>2.1.3</version>
- <name>Apache Cartridge Agent Feature</name>
- <url>http://apache.org</url>
- <description>This feature contains the bundles required for agent functionality</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.cartridge.agent</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2.wso2</groupId>
- <artifactId>axis2</artifactId>
- <version>1.6.1.wso2v8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom.wso2</groupId>
- <artifactId>axiom</artifactId>
- <version>1.2.11.wso2v4</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.adc.instanceinfo.mgt.stub</artifactId>
- <version>4.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>3.5.0.v20090311-1300</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>org.eclipse.osgi.services</artifactId>
- <version>3.3.0.v20110513</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.utils</artifactId>
- <version>4.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.rampart.wso2</groupId>
- <artifactId>rampart-policy</artifactId>
- <version>1.6.1.wso2v8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.rampart.wso2</groupId>
- <artifactId>rampart-core</artifactId>
- <version>1.6.1.wso2v8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.rampart.wso2</groupId>
- <artifactId>rampart-trust</artifactId>
- <version>1.6.1.wso2v8</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.cartridge.agent.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.cartridge.agent</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.utils:4.1.0</bundleDef>
- <bundleDef>org.eclipse.osgi:org.eclipse.osgi.services</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.adc.instanceinfo.mgt.stub</bundleDef>
- <bundleDef>org.apache.axis2.wso2:axis2</bundleDef>
- <bundleDef>org.apache.rampart.wso2:rampart-policy</bundleDef>
- <bundleDef>org.apache.rampart.wso2:rampart-core</bundleDef>
- <bundleDef>org.apache.rampart.wso2:rampart-trust</bundleDef>
- </bundles>
- <!--includedFeatures>
- <includedFeatureDef>org.apache.stratos:org.apache.stratos.cartridge.messages.feature</includedFeatureDef>
- </includedFeatures-->
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/src/main/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/src/main/resources/build.properties b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/src/main/resources/build.properties
deleted file mode 100644
index 74258d5..0000000
--- a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/src/main/resources/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-custom = true
-root.stratos=conf
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/src/main/resources/conf/agent.properties
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/src/main/resources/conf/agent.properties b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/src/main/resources/conf/agent.properties
deleted file mode 100644
index 9c42c6a..0000000
--- a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/src/main/resources/conf/agent.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-loadBalancerDomain=wso2.carbon.lb.domain
-
-# Registrant health check interval in seconds
-registrant.heathCheckInterval=10
-registrant.healthCheckThreadPoolSize=2000
-
-# Clustering parameters of Cartridge agent member
-clustering.membershipScheme=wka
-clustering.maxRetries=10
-clustering.localMemberHost=localhost
-#clustering.localMemberHost=10.100.2.139
-#clustering.localMemberBindPort=4026
-clustering.localMemberPort=4025
-
-# ELB members
-members.1.host=localhost
-#members.1.host=10.100.2.139
-members.1.port=4000
-
-# TRustrore
-wso2.carbon.truststore=/var/lib/opt/ADS/repository/resources/security/wso2carbon.jks
-
-# Instance State Notification Service
-adc.host=ADC_HOSTNAME
-adc.port=ADC_PORT
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/src/main/resources/p2.inf b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/src/main/resources/p2.inf
deleted file mode 100644
index 1afc945..0000000
--- a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/src/main/resources/p2.inf
+++ /dev/null
@@ -1,3 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.cartridge.agent.server_${feature.version}/conf/agent.properties,target:${installFolder}/../conf/agent.properties,overwrite:true);\
-
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/pom.xml b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/pom.xml
new file mode 100644
index 0000000..b643c2c
--- /dev/null
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/pom.xml
@@ -0,0 +1,156 @@
+<?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>cartridge-agent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.stratos.cartridge.agent.server.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Cartridge Agent Feature</name>
+ <url>http://apache.org</url>
+ <description>This feature contains the bundles required for agent functionality</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.cartridge.agent</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2.wso2</groupId>
+ <artifactId>axis2</artifactId>
+ <version>${axis2.wso2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom.wso2</groupId>
+ <artifactId>axiom</artifactId>
+ <version>${axiom.wso2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.adc.instanceinfo.mgt.stub</artifactId>
+ <version>4.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.5.0.v20090311-1300</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi.services</artifactId>
+ <version>3.3.0.v20110513</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.utils</artifactId>
+ <version>${wso2carbon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart.wso2</groupId>
+ <artifactId>rampart-policy</artifactId>
+ <version>1.6.1.wso2v8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart.wso2</groupId>
+ <artifactId>rampart-core</artifactId>
+ <version>1.6.1.wso2v8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart.wso2</groupId>
+ <artifactId>rampart-trust</artifactId>
+ <version>1.6.1.wso2v8</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.cartridge.agent.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.cartridge.agent</bundleDef>
+ <bundleDef>org.wso2.carbon:org.wso2.carbon.utils:4.1.0</bundleDef>
+ <bundleDef>org.eclipse.osgi:org.eclipse.osgi.services</bundleDef>
+ <bundleDef>org.wso2.carbon:org.wso2.carbon.adc.instanceinfo.mgt.stub</bundleDef>
+ <bundleDef>org.apache.axis2.wso2:axis2</bundleDef>
+ <bundleDef>org.apache.rampart.wso2:rampart-policy</bundleDef>
+ <bundleDef>org.apache.rampart.wso2:rampart-core</bundleDef>
+ <bundleDef>org.apache.rampart.wso2:rampart-trust</bundleDef>
+ </bundles>
+ <!--includedFeatures>
+ <includedFeatureDef>org.apache.stratos:org.apache.stratos.cartridge.messages.feature</includedFeatureDef>
+ </includedFeatures-->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/src/main/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/src/main/resources/build.properties b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/src/main/resources/build.properties
new file mode 100644
index 0000000..74258d5
--- /dev/null
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/src/main/resources/build.properties
@@ -0,0 +1,2 @@
+custom = true
+root.stratos=conf
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/src/main/resources/conf/agent.properties
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/src/main/resources/conf/agent.properties b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/src/main/resources/conf/agent.properties
new file mode 100644
index 0000000..9c42c6a
--- /dev/null
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/src/main/resources/conf/agent.properties
@@ -0,0 +1,25 @@
+loadBalancerDomain=wso2.carbon.lb.domain
+
+# Registrant health check interval in seconds
+registrant.heathCheckInterval=10
+registrant.healthCheckThreadPoolSize=2000
+
+# Clustering parameters of Cartridge agent member
+clustering.membershipScheme=wka
+clustering.maxRetries=10
+clustering.localMemberHost=localhost
+#clustering.localMemberHost=10.100.2.139
+#clustering.localMemberBindPort=4026
+clustering.localMemberPort=4025
+
+# ELB members
+members.1.host=localhost
+#members.1.host=10.100.2.139
+members.1.port=4000
+
+# TRustrore
+wso2.carbon.truststore=/var/lib/opt/ADS/repository/resources/security/wso2carbon.jks
+
+# Instance State Notification Service
+adc.host=ADC_HOSTNAME
+adc.port=ADC_PORT
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/src/main/resources/p2.inf b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/src/main/resources/p2.inf
new file mode 100644
index 0000000..1afc945
--- /dev/null
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/src/main/resources/p2.inf
@@ -0,0 +1,3 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.cartridge.agent.server_${feature.version}/conf/agent.properties,target:${installFolder}/../conf/agent.properties,overwrite:true);\
+
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/features/cartridge-agent/org.apache.stratos.cartridge.messages.feature/2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.messages.feature/2.1.1/pom.xml b/features/cartridge-agent/org.apache.stratos.cartridge.messages.feature/2.1.1/pom.xml
deleted file mode 100644
index 8998b99..0000000
--- a/features/cartridge-agent/org.apache.stratos.cartridge.messages.feature/2.1.1/pom.xml
+++ /dev/null
@@ -1,83 +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>cartridge-agent</artifactId>
- <version>2.0.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.stratos.cartridge.messages.feature</artifactId>
- <packaging>pom</packaging>
- <version>2.1.1</version>
- <name>WSO2 Carbon - Cartridge Messages Feature</name>
- <url>http://wso2.org</url>
- <description>This feature contains the bundles required for agent messages</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.cartridge.messages</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2.wso2</groupId>
- <artifactId>axis2</artifactId>
- <version>1.6.1.wso2v8</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.cartridge.messages</id>
- <propertiesFile>../../etc/feature.properties</propertiesFile>
- <adviceFile>
- <properties>
- <propertyDef>org.apache.stratos.p2.category.type:server</propertyDef>
- <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
- </properties>
- </adviceFile>
- <bundles>
- <bundleDef>org.apache.stratos:org.apache.stratos.cartridge.messages</bundleDef>
- <bundleDef>org.apache.axis2.wso2:axis2</bundleDef>
- </bundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/features/cartridge-agent/org.apache.stratos.cartridge.messages.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.apache.stratos.cartridge.messages.feature/pom.xml b/features/cartridge-agent/org.apache.stratos.cartridge.messages.feature/pom.xml
new file mode 100644
index 0000000..9022062
--- /dev/null
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.messages.feature/pom.xml
@@ -0,0 +1,84 @@
+<?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>cartridge-agent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.stratos.cartridge.messages.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>WSO2 Carbon - Cartridge Messages Feature</name>
+ <url>http://wso2.org</url>
+ <description>This feature contains the bundles required for agent messages</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.cartridge.messages</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2.wso2</groupId>
+ <artifactId>axis2</artifactId>
+ <version>${axis2.wso2.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.cartridge.messages</id>
+ <propertiesFile>../../etc/feature.properties</propertiesFile>
+ <adviceFile>
+ <properties>
+ <propertyDef>org.apache.stratos.p2.category.type:server</propertyDef>
+ <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
+ </properties>
+ </adviceFile>
+ <bundles>
+ <bundleDef>org.apache.stratos:org.apache.stratos.cartridge.messages:${apache.stratos.version}</bundleDef>
+ <bundleDef>org.apache.axis2.wso2:axis2:${axis2.wso2.version}</bundleDef>
+ </bundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/features/cartridge-agent/pom.xml
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/pom.xml b/features/cartridge-agent/pom.xml
index 783ceab..4027758 100644
--- a/features/cartridge-agent/pom.xml
+++ b/features/cartridge-agent/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,8 +25,7 @@
<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>
@@ -33,9 +35,9 @@
<url>http://wso2.org</url>
<modules>
- <module>org.apache.stratos.cartridge.messages.feature/2.1.1</module>
- <module>org.apache.stratos.cartridge.agent.server.feature/2.1.3</module>
- <module>org.apache.stratos.cartridge.agent.feature/2.1.3</module>
+ <module>org.apache.stratos.cartridge.messages.feature</module>
+ <module>org.apache.stratos.cartridge.agent.server.feature</module>
+ <module>org.apache.stratos.cartridge.agent.feature</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/33b78e13/features/pom.xml
----------------------------------------------------------------------
diff --git a/features/pom.xml b/features/pom.xml
index d90e0f5..520dcf6 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -57,6 +57,9 @@
<!-- ADC -->
<module>adc</module>
+
+ <!-- Coud Controller -->
+ <module>cloud-controller</module>
</modules>
<build>
@@ -91,6 +94,8 @@
<sun.jersey.version>1.12</sun.jersey.version>
<gson2.version>2.2</gson2.version>
<google.collect.osgi.version>1.0.0.wso2v2</google.collect.osgi.version>
+ <axis2.wso2.version>1.6.1.wso2v9</axis2.wso2.version>
+ <axiom.wso2.version>1.2.11.wso2v4</axiom.wso2.version>
</properties>
</project>