You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2013/07/16 13:51:35 UTC
git commit: Stratos manager status monitor feature refactor
Updated Branches:
refs/heads/master 28a6f82c0 -> 04cb9d795
Stratos manager status monitor feature refactor
Signed-off-by: Lakmal Warusawithana <la...@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/04cb9d79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/04cb9d79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/04cb9d79
Branch: refs/heads/master
Commit: 04cb9d795393e1afc3e7abbd1ba1fe014d6449f1
Parents: 28a6f82
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Jul 16 17:07:58 2013 +0530
Committer: Lakmal Warusawithana <la...@wso2.com>
Committed: Tue Jul 16 17:20:55 2013 +0530
----------------------------------------------------------------------
.../pom.xml | 123 +++++++++++++++++++
.../pom.xml | 90 ++++++++++++++
.../pom.xml | 86 +++++++++++++
.../pom.xml | 85 +++++++++++++
.../2.1.0/pom.xml | 117 ------------------
.../2.1.0/pom.xml | 90 --------------
.../2.1.0/pom.xml | 84 -------------
.../2.1.0/pom.xml | 84 -------------
features/manager/status-monitor/pom.xml | 44 ++++---
9 files changed, 408 insertions(+), 395 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/04cb9d79/features/manager/status-monitor/org.apache.stratos.status.monitor.agent.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/status-monitor/org.apache.stratos.status.monitor.agent.feature/pom.xml b/features/manager/status-monitor/org.apache.stratos.status.monitor.agent.feature/pom.xml
new file mode 100644
index 0000000..a94fdc6
--- /dev/null
+++ b/features/manager/status-monitor/org.apache.stratos.status.monitor.agent.feature/pom.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (c) 2012, 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>status-monitor-feature</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.stratos.status.monitor.agent.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Stratos - Status Monitor Agent Feature</name>
+ <url>http://wso2.org</url>
+ <description>
+ This feature contains the bundles required for Status Monitoring Backend Functionality
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.status.monitor.core</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.status.monitor.agent</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+
+ <!--dependencies for the service service-->
+ <!--dependencies for the Identity Server Client-->
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.authenticator.stub</artifactId>
+ <version>${wso2carbon.version}</version>
+ </dependency>
+
+ <!--dependencies for the CEP Server and MB Client-->
+ <dependency>
+ <groupId>org.apache.geronimo.specs.wso2</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${orbit.version.geronimo-jms_1.1_spec}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.qpid.wso2</groupId>
+ <artifactId>qpid-client</artifactId>
+ <version>0.12.wso2v1</version>
+ </dependency>
+
+ <!--dependencies to invoke the load average service-->
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.load.balance.agent.stub</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.wso2.maven</groupId>
+ <artifactId>carbon-p2-plugin</artifactId>
+ <version>${carbon.p2.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>p2-feature-generation</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-feature-gen</goal>
+ </goals>
+ <configuration>
+ <id>org.apache.stratos.status.monitor.agent</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.status.monitor.core</bundleDef>
+ <bundleDef>org.apache.stratos:org.apache.stratos.status.monitor.agent</bundleDef>
+ <bundleDef>org.wso2.carbon:org.wso2.carbon.authenticator.stub</bundleDef>
+ <bundleDef>org.apache.geronimo.specs.wso2:geronimo-jms_1.1_spec</bundleDef>
+ <bundleDef>org.apache.qpid.wso2:qpid-client</bundleDef>
+ <bundleDef>org.apache.stratos:org.apache.stratos.load.balance.agent.stub</bundleDef>
+ </bundles>
+ <importFeatures>
+ <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef>
+ </importFeatures>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <orbit.version.geronimo-jms_1.1_spec>1.1.0.wso2v1</orbit.version.geronimo-jms_1.1_spec>
+ </properties>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/04cb9d79/features/manager/status-monitor/org.apache.stratos.status.monitor.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/status-monitor/org.apache.stratos.status.monitor.feature/pom.xml b/features/manager/status-monitor/org.apache.stratos.status.monitor.feature/pom.xml
new file mode 100644
index 0000000..a3a8cf1
--- /dev/null
+++ b/features/manager/status-monitor/org.apache.stratos.status.monitor.feature/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (c) 2012, 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>status-monitor-feature</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.stratos.status.monitor.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Stratos - Status Monitor Feature</name>
+ <url>http://apache.org</url>
+ <description>
+ This feature contains the bundles required for the Stratos Status Monitor Functionality
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.status.monitor.server.feature</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.status.monitor.ui.feature</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.status.monitor.agent.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.status.monitor</id>
+ <propertiesFile>../../../etc/feature.properties</propertiesFile>
+ <importFeatures>
+ <importFeatureDef>org.wso2.carbon.core:${wso2carbon.version}</importFeatureDef>
+ </importFeatures>
+ <includedFeatures>
+ <includedFeatureDef>org.apache.stratos:org.apache.stratos.status.monitor.ui.feature</includedFeatureDef>
+ <includedFeatureDef>org.apache.stratos:org.apache.stratos.status.monitor.server.feature</includedFeatureDef>
+ <includedFeatureDef>org.apache.stratos:org.apache.stratos.status.monitor.agent.feature</includedFeatureDef>
+ </includedFeatures>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/04cb9d79/features/manager/status-monitor/org.apache.stratos.status.monitor.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/status-monitor/org.apache.stratos.status.monitor.server.feature/pom.xml b/features/manager/status-monitor/org.apache.stratos.status.monitor.server.feature/pom.xml
new file mode 100644
index 0000000..c154520
--- /dev/null
+++ b/features/manager/status-monitor/org.apache.stratos.status.monitor.server.feature/pom.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (c) 2012, 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>status-monitor-feature</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.stratos.status.monitor.server.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>WSO2 Stratos - Status Monitor Server Feature</name>
+ <url>http://wso2.org</url>
+ <description>
+ This feature contains the bundles required for Status Monitoring Backend Functionality
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.status.monitor.core</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.status.monitor</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.wso2.maven</groupId>
+ <artifactId>carbon-p2-plugin</artifactId>
+ <version>${carbon.p2.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>p2-feature-generation</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-feature-gen</goal>
+ </goals>
+ <configuration>
+ <id>org.apache.stratos.status.monitor.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.status.monitor.core</bundleDef>
+ <bundleDef>org.apache.stratos:org.apache.stratos.status.monitor</bundleDef>
+ </bundles>
+ <importFeatures>
+ <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef>
+ </importFeatures>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/04cb9d79/features/manager/status-monitor/org.apache.stratos.status.monitor.ui.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/status-monitor/org.apache.stratos.status.monitor.ui.feature/pom.xml b/features/manager/status-monitor/org.apache.stratos.status.monitor.ui.feature/pom.xml
new file mode 100644
index 0000000..e3b67c2
--- /dev/null
+++ b/features/manager/status-monitor/org.apache.stratos.status.monitor.ui.feature/pom.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (c) 2012, 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>status-monitor-feature</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.stratos.status.monitor.ui.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Stratos - Status Monitor UI Feature</name>
+ <url>http://apache.org</url>
+ <description>
+ This feature contains the bundles required for the Status Monitor Front End
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.status.monitor.ui</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.status.monitor.stub</artifactId>
+ </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.status.monitor.ui</id>
+ <propertiesFile>../../../etc/feature.properties</propertiesFile>
+ <adviceFile>
+ <properties>
+ <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef>
+ <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
+ </properties>
+ </adviceFile>
+ <bundles>
+ <bundleDef>org.apache.stratos:org.apache.stratos.status.monitor.ui</bundleDef>
+ <bundleDef>org.wso2.carbon:org.wso2.carbon.status.monitor.stub</bundleDef>
+ </bundles>
+ <importFeatures>
+ <importFeatureDef>org.apache.stratos.core.ui:${wso2carbon.version}</importFeatureDef>
+ </importFeatures>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/04cb9d79/features/manager/status-monitor/org.wso2.carbon.status.monitor.agent.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/status-monitor/org.wso2.carbon.status.monitor.agent.feature/2.1.0/pom.xml b/features/manager/status-monitor/org.wso2.carbon.status.monitor.agent.feature/2.1.0/pom.xml
deleted file mode 100644
index be80685..0000000
--- a/features/manager/status-monitor/org.wso2.carbon.status.monitor.agent.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2012, 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>status-monitor-feature</artifactId>
- <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.status.monitor.agent.feature</artifactId>
- <packaging>pom</packaging>
- <name>WSO2 Stratos - Status Monitor Agent Feature</name>
- <url>http://wso2.org</url>
- <description>
- This feature contains the bundles required for Status Monitoring Backend Functionality
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.status.monitor.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.status.monitor.agent</artifactId>
- </dependency>
-
- <!--dependencies for the service service-->
- <!--dependencies for the Identity Server Client-->
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.authenticator.stub</artifactId>
- <version>${wso2carbon.version}</version>
- </dependency>
-
- <!--dependencies for the CEP Server and MB Client-->
- <dependency>
- <groupId>org.apache.geronimo.specs.wso2</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>${orbit.version.geronimo-jms_1.1_spec}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.qpid.wso2</groupId>
- <artifactId>qpid-client</artifactId>
- <version>0.12.wso2v1</version>
- </dependency>
-
- <!--dependencies to invoke the load average service-->
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.load.balance.agent.stub</artifactId>
- <version>${wso2carbon.version}</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.wso2.maven</groupId>
- <artifactId>carbon-p2-plugin</artifactId>
- <version>${carbon.p2.plugin.version}</version>
- <executions>
- <execution>
- <id>p2-feature-generation</id>
- <phase>package</phase>
- <goals>
- <goal>p2-feature-gen</goal>
- </goals>
- <configuration>
- <id>org.wso2.carbon.status.monitor.agent</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.status.monitor.core</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.status.monitor.agent</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.authenticator.stub</bundleDef>
- <bundleDef>org.apache.geronimo.specs.wso2:geronimo-jms_1.1_spec</bundleDef>
- <bundleDef>org.apache.qpid.wso2:qpid-client</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.load.balance.agent.stub</bundleDef>
- </bundles>
- <importFeatures>
- <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef>
- </importFeatures>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/04cb9d79/features/manager/status-monitor/org.wso2.carbon.status.monitor.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/status-monitor/org.wso2.carbon.status.monitor.feature/2.1.0/pom.xml b/features/manager/status-monitor/org.wso2.carbon.status.monitor.feature/2.1.0/pom.xml
deleted file mode 100644
index 80f885a..0000000
--- a/features/manager/status-monitor/org.wso2.carbon.status.monitor.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2012, 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>status-monitor-feature</artifactId>
- <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.status.monitor.feature</artifactId>
- <packaging>pom</packaging>
- <name>WSO2 Stratos - Status Monitor Feature</name>
- <url>http://wso2.org</url>
- <description>
- This feature contains the bundles required for the Stratos Status Monitor Functionality
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.status.monitor.server.feature</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.status.monitor.ui.feature</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.status.monitor.agent.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.status.monitor</id>
- <propertiesFile>../../../etc/feature.properties</propertiesFile>
- <importFeatures>
- <importFeatureDef>org.wso2.carbon.core:${wso2carbon.version}</importFeatureDef>
- </importFeatures>
- <includedFeatures>
- <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.status.monitor.ui.feature</includedFeatureDef>
- <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.status.monitor.server.feature</includedFeatureDef>
- <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.status.monitor.agent.feature</includedFeatureDef>
- </includedFeatures>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/04cb9d79/features/manager/status-monitor/org.wso2.carbon.status.monitor.server.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/status-monitor/org.wso2.carbon.status.monitor.server.feature/2.1.0/pom.xml b/features/manager/status-monitor/org.wso2.carbon.status.monitor.server.feature/2.1.0/pom.xml
deleted file mode 100644
index c1bbe00..0000000
--- a/features/manager/status-monitor/org.wso2.carbon.status.monitor.server.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2012, 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>status-monitor-feature</artifactId>
- <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.status.monitor.server.feature</artifactId>
- <packaging>pom</packaging>
- <name>WSO2 Stratos - Status Monitor Server Feature</name>
- <url>http://wso2.org</url>
- <description>
- This feature contains the bundles required for Status Monitoring Backend Functionality
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.status.monitor.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.status.monitor</artifactId>
- </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.status.monitor.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.status.monitor.core</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.status.monitor</bundleDef>
- </bundles>
- <importFeatures>
- <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef>
- </importFeatures>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/04cb9d79/features/manager/status-monitor/org.wso2.carbon.status.monitor.ui.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/status-monitor/org.wso2.carbon.status.monitor.ui.feature/2.1.0/pom.xml b/features/manager/status-monitor/org.wso2.carbon.status.monitor.ui.feature/2.1.0/pom.xml
deleted file mode 100644
index 5b9f149..0000000
--- a/features/manager/status-monitor/org.wso2.carbon.status.monitor.ui.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2012, 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>status-monitor-feature</artifactId>
- <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.status.monitor.ui.feature</artifactId>
- <packaging>pom</packaging>
- <name>WSO2 Carbon - Status Monitor UI Feature</name>
- <url>http://wso2.org</url>
- <description>
- This feature contains the bundles required for the Status Monitor Front End
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.status.monitor.ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.status.monitor.stub</artifactId>
- </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.status.monitor.ui</id>
- <propertiesFile>../../../etc/feature.properties</propertiesFile>
- <adviceFile>
- <properties>
- <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef>
- <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
- </properties>
- </adviceFile>
- <bundles>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.status.monitor.ui</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.status.monitor.stub</bundleDef>
- </bundles>
- <importFeatures>
- <importFeatureDef>org.wso2.carbon.core.ui:${wso2carbon.version}</importFeatureDef>
- </importFeatures>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/04cb9d79/features/manager/status-monitor/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/status-monitor/pom.xml b/features/manager/status-monitor/pom.xml
index 68d8334..bc36460 100644
--- a/features/manager/status-monitor/pom.xml
+++ b/features/manager/status-monitor/pom.xml
@@ -20,45 +20,45 @@
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>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>status-monitor-feature</artifactId>
<packaging>pom</packaging>
- <name>WSO2 Stratos - Status Monitor Aggregator Module</name>
+ <name>Apache Stratos - Status Monitor Aggregator Module</name>
<url>http://wso2.org</url>
<modules>
- <module>org.wso2.carbon.status.monitor.feature/2.1.0</module>
- <module>org.wso2.carbon.status.monitor.server.feature/2.1.0</module>
- <module>org.wso2.carbon.status.monitor.agent.feature/2.1.0</module>
- <module>org.wso2.carbon.status.monitor.ui.feature/2.1.0</module>
+ <module>org.apache.stratos.status.monitor.feature</module>
+ <module>org.apache.stratos.status.monitor.server.feature</module>
+ <module>org.apache.stratos.status.monitor.agent.feature</module>
+ <module>org.apache.stratos.status.monitor.ui.feature</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.status.monitor</artifactId>
- <version>${stratos.version}</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.status.monitor</artifactId>
+ <version>${apache.stratos.version}</version>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.status.monitor.core</artifactId>
- <version>${stratos.version}</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.status.monitor.core</artifactId>
+ <version>${apache.stratos.version}</version>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.status.monitor.agent</artifactId>
- <version>${stratos.version}</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.status.monitor.agent</artifactId>
+ <version>${apache.stratos.version}</version>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.status.monitor.ui</artifactId>
- <version>${stratos.version}</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.status.monitor.ui</artifactId>
+ <version>${apache.stratos.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
@@ -67,5 +67,9 @@
</dependency>
</dependencies>
</dependencyManagement>
+
+ <properties>
+ <stratos.version>2.1.0</stratos.version>
+ </properties>
</project>