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/05 15:06:37 UTC
git commit: Cartridge agent feature refactor
Updated Branches:
refs/heads/master 5bf000f2b -> 3c2e37f90
Cartridge agent feature refactor
Signed-off-by: Isuru <is...@wso2.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3c2e37f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3c2e37f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3c2e37f9
Branch: refs/heads/master
Commit: 3c2e37f90f9b258ca05c9f8a5b65246420898572
Parents: 5bf000f
Author: Udara Liyanage <ud...@wso2.com>
Authored: Fri Jul 5 18:17:22 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Fri Jul 5 18:35:55 2013 +0530
----------------------------------------------------------------------
.../2.1.1/pom.xml | 78 +++++++++
.../2.1.3/pom.xml | 78 +++++++++
.../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 +
.../2.1.1/pom.xml | 83 ++++++++++
.../2.1.1/pom.xml | 78 ---------
.../2.1.3/pom.xml | 78 ---------
.../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 -
.../2.1.1/pom.xml | 83 ----------
features/cartridge-agent/pom.xml | 12 +-
features/cloud-controller/pom.xml | 12 +-
24 files changed, 622 insertions(+), 632 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3c2e37f9/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
new file mode 100644
index 0000000..016a36a
--- /dev/null
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.agent.feature/2.1.1/pom.xml
@@ -0,0 +1,78 @@
+<?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/3c2e37f9/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
new file mode 100644
index 0000000..90ad905
--- /dev/null
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.agent.feature/2.1.3/pom.xml
@@ -0,0 +1,78 @@
+<?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/3c2e37f9/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
new file mode 100644
index 0000000..b2fd118
--- /dev/null
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/pom.xml
@@ -0,0 +1,158 @@
+<?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/3c2e37f9/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
new file mode 100644
index 0000000..74258d5
--- /dev/null
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/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/3c2e37f9/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
new file mode 100644
index 0000000..9c42c6a
--- /dev/null
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/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/3c2e37f9/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
new file mode 100644
index 0000000..5eec6fa
--- /dev/null
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.1/src/main/resources/p2.inf
@@ -0,0 +1,3 @@
+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/3c2e37f9/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
new file mode 100644
index 0000000..6c67324
--- /dev/null
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/pom.xml
@@ -0,0 +1,158 @@
+<?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/3c2e37f9/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
new file mode 100644
index 0000000..74258d5
--- /dev/null
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/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/3c2e37f9/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
new file mode 100644
index 0000000..9c42c6a
--- /dev/null
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/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/3c2e37f9/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
new file mode 100644
index 0000000..1afc945
--- /dev/null
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.agent.server.feature/2.1.3/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/3c2e37f9/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
new file mode 100644
index 0000000..8998b99
--- /dev/null
+++ b/features/cartridge-agent/org.apache.stratos.cartridge.messages.feature/2.1.1/pom.xml
@@ -0,0 +1,83 @@
+<?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/3c2e37f9/features/cartridge-agent/org.wso2.carbon.cartridge.agent.feature/2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.wso2.carbon.cartridge.agent.feature/2.1.1/pom.xml b/features/cartridge-agent/org.wso2.carbon.cartridge.agent.feature/2.1.1/pom.xml
deleted file mode 100644
index 016a36a..0000000
--- a/features/cartridge-agent/org.wso2.carbon.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/3c2e37f9/features/cartridge-agent/org.wso2.carbon.cartridge.agent.feature/2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.wso2.carbon.cartridge.agent.feature/2.1.3/pom.xml b/features/cartridge-agent/org.wso2.carbon.cartridge.agent.feature/2.1.3/pom.xml
deleted file mode 100644
index fa3e310..0000000
--- a/features/cartridge-agent/org.wso2.carbon.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.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.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.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.cartridge.messages.feature</artifactId>
- <version>2.1.1</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:2.1.1</includedFeatureDef>
- </includedFeatures>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3c2e37f9/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.1/pom.xml b/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.1/pom.xml
deleted file mode 100644
index b2fd118..0000000
--- a/features/cartridge-agent/org.wso2.carbon.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/3c2e37f9/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.1/src/main/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.1/src/main/resources/build.properties b/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.1/src/main/resources/build.properties
deleted file mode 100644
index 74258d5..0000000
--- a/features/cartridge-agent/org.wso2.carbon.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/3c2e37f9/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.1/src/main/resources/conf/agent.properties
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.1/src/main/resources/conf/agent.properties b/features/cartridge-agent/org.wso2.carbon.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.wso2.carbon.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/3c2e37f9/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.1/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.1/src/main/resources/p2.inf b/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.1/src/main/resources/p2.inf
deleted file mode 100644
index 5eec6fa..0000000
--- a/features/cartridge-agent/org.wso2.carbon.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/3c2e37f9/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.3/pom.xml b/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.3/pom.xml
deleted file mode 100644
index 31ca49b..0000000
--- a/features/cartridge-agent/org.wso2.carbon.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.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.3</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/3c2e37f9/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.3/src/main/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.3/src/main/resources/build.properties b/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.3/src/main/resources/build.properties
deleted file mode 100644
index 74258d5..0000000
--- a/features/cartridge-agent/org.wso2.carbon.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/3c2e37f9/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.3/src/main/resources/conf/agent.properties
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.3/src/main/resources/conf/agent.properties b/features/cartridge-agent/org.wso2.carbon.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.wso2.carbon.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/3c2e37f9/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.3/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.3/src/main/resources/p2.inf b/features/cartridge-agent/org.wso2.carbon.cartridge.agent.server.feature/2.1.3/src/main/resources/p2.inf
deleted file mode 100644
index 5eec6fa..0000000
--- a/features/cartridge-agent/org.wso2.carbon.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.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/3c2e37f9/features/cartridge-agent/org.wso2.carbon.cartridge.messages.feature/2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/org.wso2.carbon.cartridge.messages.feature/2.1.1/pom.xml b/features/cartridge-agent/org.wso2.carbon.cartridge.messages.feature/2.1.1/pom.xml
deleted file mode 100644
index 8fc766d..0000000
--- a/features/cartridge-agent/org.wso2.carbon.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.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.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.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.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.wso2.carbon.cartridge.messages</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.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/3c2e37f9/features/cartridge-agent/pom.xml
----------------------------------------------------------------------
diff --git a/features/cartridge-agent/pom.xml b/features/cartridge-agent/pom.xml
index cb00625..783ceab 100644
--- a/features/cartridge-agent/pom.xml
+++ b/features/cartridge-agent/pom.xml
@@ -20,9 +20,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>stratos-features</artifactId>
- <version>2.1.0</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>stratos-features-parent</artifactId>
+ <version>2.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -33,9 +33,9 @@
<url>http://wso2.org</url>
<modules>
- <module>org.wso2.carbon.cartridge.messages.feature/2.1.1</module>
- <module>org.wso2.carbon.cartridge.agent.server.feature/2.1.1</module>
- <module>org.wso2.carbon.cartridge.agent.feature/2.1.1</module>
+ <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>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3c2e37f9/features/cloud-controller/pom.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/pom.xml b/features/cloud-controller/pom.xml
index aaf6ae8..4b7d982 100644
--- a/features/cloud-controller/pom.xml
+++ b/features/cloud-controller/pom.xml
@@ -37,19 +37,9 @@
<module>org.apache.stratos.cloud.controller.feature/2.1.3</module>
</modules>
-<!-- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.stratos.cloud.controller</artifactId>
- <version>${wso2carbon.version.cc.mgt}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<properties>
<wso2carbon.version.cc.mgt>2.1.1</wso2carbon.version.cc.mgt>
- </properties>-->
+ </properties>
</project>