[rhq] Branch 'release-3.0.0-test-build' - modules/common modules/core modules/enterprise modules/helpers modules/plugins modules/pom.xml modules/test-utils pom.xml
by ips
modules/common/ant-bundle/pom.xml | 2 +-
modules/common/filetemplate-bundle/pom.xml | 2 +-
modules/common/jboss-as/pom.xml | 2 +-
modules/common/pom.xml | 2 +-
modules/core/client-api/pom.xml | 2 +-
modules/core/comm-api/pom.xml | 2 +-
modules/core/dbutils/pom.xml | 2 +-
modules/core/domain/pom.xml | 2 +-
modules/core/gui/pom.xml | 2 +-
modules/core/native-system/pom.xml | 2 +-
modules/core/plugin-api/pom.xml | 2 +-
modules/core/plugin-container/pom.xml | 2 +-
modules/core/plugin-validator/pom.xml | 2 +-
modules/core/plugindoc/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/core/util/pom.xml | 2 +-
modules/enterprise/agent/pom.xml | 2 +-
modules/enterprise/agentupdate/pom.xml | 2 +-
modules/enterprise/comm/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-war/pom.xml | 2 +-
modules/enterprise/gui/content_http-war/pom.xml | 2 +-
modules/enterprise/gui/coregui/pom.xml | 2 +-
modules/enterprise/gui/installer-war/pom.xml | 2 +-
modules/enterprise/gui/pom.xml | 2 +-
modules/enterprise/gui/portal-war/pom.xml | 2 +-
modules/enterprise/gui/webdav-war/pom.xml | 2 +-
modules/enterprise/pom.xml | 2 +-
modules/enterprise/remoting/cli/pom.xml | 2 +-
modules/enterprise/remoting/client-api/pom.xml | 2 +-
modules/enterprise/remoting/pom.xml | 2 +-
modules/enterprise/remoting/webservices/pom.xml | 2 +-
modules/enterprise/server/container-lib/pom.xml | 2 +-
modules/enterprise/server/container/pom.xml | 2 +-
modules/enterprise/server/ear/pom.xml | 2 +-
modules/enterprise/server/jar/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-email/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-irc/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-microblog/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-operations/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-roles/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-snmp/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-subject/pom.xml | 2 +-
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/cobbler/pom.xml | 2 +-
modules/enterprise/server/plugins/disk/pom.xml | 2 +-
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 +-
modules/enterprise/server/plugins/pom.xml | 2 +-
modules/enterprise/server/plugins/rhnhosted/pom.xml | 2 +-
modules/enterprise/server/plugins/url/pom.xml | 2 +-
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +-
modules/enterprise/server/plugins/yum/pom.xml | 2 +-
modules/enterprise/server/safe-invoker/pom.xml | 2 +-
modules/enterprise/server/sars/agent-sar/pom.xml | 2 +-
modules/enterprise/server/sars/pom.xml | 2 +-
modules/enterprise/server/xml-schemas/pom.xml | 2 +-
modules/helpers/pluginAnnotations/pom.xml | 2 +-
modules/helpers/pluginGen/pom.xml | 2 +-
modules/helpers/pom.xml | 2 +-
modules/helpers/rtfilter/pom.xml | 2 +-
modules/plugins/aliases/pom.xml | 2 +-
modules/plugins/ant-bundle/pom.xml | 2 +-
modules/plugins/apache/pom.xml | 2 +-
modules/plugins/augeas/pom.xml | 2 +-
modules/plugins/cobbler/pom.xml | 2 +-
modules/plugins/cron/pom.xml | 2 +-
modules/plugins/database/pom.xml | 2 +-
modules/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/plugins/grub/pom.xml | 2 +-
modules/plugins/hibernate/pom.xml | 2 +-
modules/plugins/hosts/pom.xml | 2 +-
modules/plugins/hudson/pom.xml | 2 +-
modules/plugins/iis/pom.xml | 2 +-
modules/plugins/jboss-as-5/pom.xml | 2 +-
modules/plugins/jboss-as/pom.xml | 2 +-
modules/plugins/jboss-cache-v3/pom.xml | 2 +-
modules/plugins/jboss-cache/pom.xml | 2 +-
modules/plugins/jmx/pom.xml | 2 +-
modules/plugins/mysql/pom.xml | 2 +-
modules/plugins/netservices/pom.xml | 2 +-
modules/plugins/oracle/pom.xml | 2 +-
modules/plugins/perftest/pom.xml | 2 +-
modules/plugins/platform/pom.xml | 2 +-
modules/plugins/pom.xml | 2 +-
modules/plugins/postfix/pom.xml | 2 +-
modules/plugins/postgres/pom.xml | 2 +-
modules/plugins/rhq-agent/pom.xml | 2 +-
modules/plugins/rhq-server/pom.xml | 2 +-
modules/plugins/samba/pom.xml | 2 +-
modules/plugins/script/pom.xml | 2 +-
modules/plugins/snmptrapd/pom.xml | 2 +-
modules/plugins/sshd/pom.xml | 2 +-
modules/plugins/sudoers/pom.xml | 2 +-
modules/plugins/tomcat/pom.xml | 2 +-
modules/plugins/twitter/pom.xml | 2 +-
modules/plugins/validate-all-plugins/pom.xml | 2 +-
modules/pom.xml | 2 +-
modules/test-utils/pom.xml | 2 +-
pom.xml | 2 +-
103 files changed, 103 insertions(+), 103 deletions(-)
New commits:
commit d99113fbda07c0878bfe869b9961e6871bb38aef
Author: hudson auto <wnstb(a)yahoo.com>
Date: Thu Jul 22 14:21:09 2010 -0400
[maven-release-plugin] prepare release RHQ_3_0_0_GA_QA
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index eda9133..6d440ef 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index bc7965b..dbd8dd6 100644
--- a/modules/common/filetemplate-bundle/pom.xml
+++ b/modules/common/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index 2cf950b..1077987 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index ee81a94..751726e 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index d177f9e..78d1f23 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index a51f92b..f6fadb5 100644
--- a/modules/core/comm-api/pom.xml
+++ b/modules/core/comm-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 7ff6a10..02c37b4 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index e0ced84..96cbc8e 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index 0911918..0df3808 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index d47d4c8..558b9a2 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index e1ce7ef..ba389df 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index 2e58102..a570e19 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index 7739177..c721f21 100644
--- a/modules/core/plugin-validator/pom.xml
+++ b/modules/core/plugin-validator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml
index eeb7e81..9e92634 100644
--- a/modules/core/plugindoc/pom.xml
+++ b/modules/core/plugindoc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 7aad64c..47cb583 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index bc41dc5..cee7efe 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index d9f1c1c..f917e15 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 8942239..c569283 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index 8b9da9c..88ef26e 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index 611eb9d..6a09d32 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml
index 798a8ca..643d41e 100644
--- a/modules/enterprise/gui/base-perspective-war/pom.xml
+++ b/modules/enterprise/gui/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index df05645..3068b31 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-gui-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index acbe21f..ae74c0a 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index 1beadca..e908b75 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index 0c529ba..f01ec85 100644
--- a/modules/enterprise/gui/pom.xml
+++ b/modules/enterprise/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index a794cd6..1fd209d 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml
index aa880be..bdef75c 100644
--- a/modules/enterprise/gui/webdav-war/pom.xml
+++ b/modules/enterprise/gui/webdav-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 3b0dbb8..c3fc4fa 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index 05187c7..b1d1044 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<artifactId>rhq-remoting-cli</artifactId>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index e86ef41..2188cb3 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<artifactId>rhq-remoting-client-api</artifactId>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index 910b617..1feb631 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<artifactId>rhq-remoting-parent</artifactId>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index 2ea73ee..a4d9ed6 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<artifactId>rhq-remoting-webservices</artifactId>
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index 2c98817..c2acfe1 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index 3fd11e8..aee0070 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index bf15866..6956e3c 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 79fdc38..0714f9d 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml
index dd5bc18..b05532d 100644
--- a/modules/enterprise/server/plugins/alert-email/pom.xml
+++ b/modules/enterprise/server/plugins/alert-email/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml
index c0973f3..988e2e3 100644
--- a/modules/enterprise/server/plugins/alert-irc/pom.xml
+++ b/modules/enterprise/server/plugins/alert-irc/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml
index a62fee8..b9f3d0c 100644
--- a/modules/enterprise/server/plugins/alert-microblog/pom.xml
+++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
index 3193539..8a0c7c9 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
+++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index e69bfbc..bf7fe01 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index ca33bb7..466b99a 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml
index af75153..b743122 100644
--- a/modules/enterprise/server/plugins/alert-snmp/pom.xml
+++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml
index 09839b8..97c50f4 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index 73f405e..8abb60d 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml
index 4c44f10..ce9b430 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
index 0033d1b..86a21ef 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
index 61965f2..b83824c 100644
--- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml
index 7451668..b8bba65 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
index 0ac61d3..a53f3ad 100644
--- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml
index 5a78451..ab30954 100644
--- a/modules/enterprise/server/plugins/perspectives/core/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 2b16f4a..8b6a170 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml
index e4ab9b2..9a96ab0 100644
--- a/modules/enterprise/server/plugins/rhnhosted/pom.xml
+++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index a6cba32..3a96e6d 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
index 9c7cc74..8bcdcea 100644
--- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
+++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml
index ebdd3da..2dce331 100644
--- a/modules/enterprise/server/plugins/yum/pom.xml
+++ b/modules/enterprise/server/plugins/yum/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml
index 06c8981..3fd87f6 100644
--- a/modules/enterprise/server/safe-invoker/pom.xml
+++ b/modules/enterprise/server/safe-invoker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index aa278b8..7ecbbad 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index 0cc2084..cadb656 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index 14738d0..8df64c1 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml
index d056f74..031c90d 100644
--- a/modules/helpers/pluginAnnotations/pom.xml
+++ b/modules/helpers/pluginAnnotations/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml
index 28dc9b1..ba37942 100644
--- a/modules/helpers/pluginGen/pom.xml
+++ b/modules/helpers/pluginGen/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index a0721a9..762f318 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index 5d327ee..e17c9d8 100644
--- a/modules/helpers/rtfilter/pom.xml
+++ b/modules/helpers/rtfilter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index c37598e..7006ed8 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index cc160c9..851c129 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 700a6af..90c725f 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 915106a..a6f56dc 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index d920440..1e8011a 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index d5aaad5..6ee0662 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 30889f7..7d98f84 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index b79645d..05ac956 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index f7cf265..1c68b9b 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index acb08ef..35fd599 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. -->
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index 7dd0fde..eddd3ed 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index 65fa7b8..5d79625 100644
--- a/modules/plugins/hudson/pom.xml
+++ b/modules/plugins/hudson/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index 853c020..7e17c2b 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index a0ade77..ceb58be 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index b9ed2b3..54536d9 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index b3846fa..f276b7d 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index 443e524..f1aa8f9 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index ac9885a..6bc1bfa 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index d0c9053..e488d56 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 06ae2ae..37d84af 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 1acdb0f..75a1aff 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 39c75da..4e78da5 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index 97b83b0..87ba78d 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 85d6105..4873dae 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 283ab6a..1e95ca3 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index 5a4466c..daf3133 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index a190dcd..b0c26a5 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index 8f4e675..98333bb 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index 0d41574..d0d0d63 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index 7719b14..7189f74 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index 2d9d715..fdb421d 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index 3579496..9c38247 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index 41df1b8..7932012 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index 205d5b0..03e2df8 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index e299efa..cab4269 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml
index b3d5e87..4f886fd 100644
--- a/modules/plugins/validate-all-plugins/pom.xml
+++ b/modules/plugins/validate-all-plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index bc96ae3..9a28ce8 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 2235687..07130df 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-modules-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
</parent>
<artifactId>test-utils</artifactId>
<name>RHQ Test Utils</name>
diff --git a/pom.xml b/pom.xml
index 7ff85bb..a6cca85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA_QA</version>
<packaging>pom</packaging>
<name>RHQ</name>
13 years, 10 months
[rhq] Branch 'release-3.0.0-test-build' - 5 commits - modules/enterprise modules/plugins
by ips
modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml | 2
modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml | 2
modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml | 2
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelComponent.java | 64 ++++
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelDiscovery.java | 143 ++++++++++
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoComponent.java | 64 ----
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoDiscovery.java | 143 ----------
modules/plugins/jboss-cache/src/main/resources/META-INF/rhq-plugin.xml | 106 +++----
8 files changed, 263 insertions(+), 263 deletions(-)
New commits:
commit 79863a566959bc6454aa50c536a354ecc2a62aa8
Merge: 8d6b4f8... 9c23ce1...
Author: hudson auto <wnstb(a)yahoo.com>
Date: Thu Jul 22 13:34:52 2010 -0400
Merge branch 'release-3.0.0-test-build' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0-test-build
commit 8d6b4f8b43d62b7375468b363af0c1841c7d3a05
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Jul 22 18:52:14 2010 +0200
BZ 601744 - backing out the position:relative part of the original fix in main.xhtml. This effectively reverts the page to the state it was before we had the rich:tabPanel, which was eventually removed.
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml
index e249621..aa9f90d 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml
@@ -50,7 +50,7 @@ id - the id of the Resource being accessed
</div>
<div id="centerContent" class="column" style="width: #{100 - UserPreferencesUIBean.leftResourceNavState}%;">
<div id="centerContentWrapper" class="content-right">
- <div style="left: 0; right: 0; height: 100%; position: relative">
+ <div style="left: 0; right: 0; height: 100%;">
<ui:insert name="summary"><p>Default Entity Summary</p></ui:insert>
<ui:insert name="tabBar"><p>Default Entity TabBar</p></ui:insert>
<ui:insert name="content"><p>Default Entity Content</p></ui:insert>
commit 9ed8f96c231bdce5ca78f3b2ea32b7ef5949e2fb
Author: Joseph Marques <joseph(a)redhat.com>
Date: Thu Jul 22 12:20:34 2010 -0400
BZ-617257: windows does not open on IE if name includes whitespace
diff --git a/modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml b/modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml
index 2eb3f88..0502e73 100644
--- a/modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml
+++ b/modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml
@@ -21,7 +21,7 @@
<h:panelGroup rendered="#{operationsBean.selectionMode eq 'SPECIFIC'}">
<h:inputText value="#{operationsBean.resourceId}" id="resourceId" />
<a href="#"
- onclick="window.open('/rhq/inventory/resourcePicker.xhtml?nomenu=true&fieldId=customContentForm:resourceId', 'Pick a resource','width=1000,height=700,scrollbars=yes,toolbar=no,resizable=yes,location=no,status=no,left=100,top=100'); return false;"
+ onclick="window.open('/rhq/inventory/resourcePicker.xhtml?nomenu=true&fieldId=customContentForm:resourceId', 'ResourcePicker','width=1000,height=700,scrollbars=yes,toolbar=no,resizable=yes,location=no,status=no,left=100,top=100'); return false;"
class="buttonmed">Pick</a>
</h:panelGroup>
commit 67994d4d27d36390317e91a3e472adc29267a017
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu Jul 22 11:40:07 2010 -0400
fix error in description of snmpAgentPort plugin config prop
diff --git a/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml
index 9119de3..b3f5aa3 100644
--- a/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml
@@ -277,7 +277,7 @@
<c:simple-property name="snmpAgentHost" displayName="SNMP Agent Host" default="127.0.0.1"
description="the host name or IP address of the Apache SNMP agent (typically '127.0.0.1')"/>
<c:simple-property name="snmpAgentPort" displayName="SNMP Agent Port" type="integer" default="1610"
- description="the TCP port of the Apache SNMP agent (typically '1610')"/>
+ description="the UDP port of the Apache SNMP agent (typically '1610')"/>
<c:simple-property name="snmpAgentCommunity" displayName="SNMP Agent Community" default="public"
description="the SNMP community of the Apache SNMP agent (typically 'public')"/>
commit f0b6101bf98bac9c3a64a625ba84692770bdb7e0
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Jul 22 11:41:45 2010 +0200
BZ 617131 - roll back the 'channel' -> 'repo' renaming introduced in 29a4fadac497136b7a6360eed0821984baf35c55
diff --git a/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelComponent.java b/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelComponent.java
new file mode 100644
index 0000000..4bf06a9
--- /dev/null
+++ b/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelComponent.java
@@ -0,0 +1,64 @@
+/*
+ * Jopr Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.plugins.jbosscache;
+
+import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.pluginapi.inventory.ResourceComponent;
+import org.rhq.core.pluginapi.inventory.ResourceContext;
+
+/**
+ * Resource component that deals with JGroups channels
+ *
+ * @author Heiko W. Rupp
+ */
+public class JGroupsChannelComponent implements ResourceComponent<JBossCacheComponent> {
+
+ ResourceContext<JBossCacheComponent> context;
+
+ /**
+ * This one does not (yet) have an availability of its own, but just follows the
+ * JBossCache instance it is associated with.
+ * @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability()
+ */
+ public AvailabilityType getAvailability() {
+ return context.getParentResourceComponent().getAvailability();
+ }
+
+ /* (non-Javadoc)
+ * @see org.rhq.core.pluginapi.inventory.ResourceComponent#start(org.rhq.core.pluginapi.inventory.ResourceContext)
+ */
+ public void start(ResourceContext<JBossCacheComponent> context) throws Exception {
+ // TODO Auto-generated method stub
+ this.context = context;
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.rhq.core.pluginapi.inventory.ResourceComponent#stop()
+ */
+ public void stop() {
+ // TODO Auto-generated method stub
+
+ }
+
+}
diff --git a/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelDiscovery.java b/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelDiscovery.java
new file mode 100644
index 0000000..ccfb985
--- /dev/null
+++ b/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelDiscovery.java
@@ -0,0 +1,143 @@
+/*
+ * Jopr Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.plugins.jbosscache;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jdom.JDOMException;
+import org.jdom.input.SAXBuilder;
+import org.mc4j.ems.connection.EmsConnection;
+
+import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+import org.rhq.plugins.jbossas.util.DeploymentUtility;
+
+/**
+ * This component will discover JGroups channels within a JBoss Cache instance.
+ * The deal here is that we want to have zero or one JGroups channels per cache.
+ * We will look at the Cache config and see if it contains a
+ * <attribute name="ClusterConfig"> element. If so, we return a JGroups instance,
+ * else we return nothing.
+ *
+ * @author Heiko W. Rupp
+ */
+public class JGroupsChannelDiscovery implements ResourceDiscoveryComponent {
+
+ private final Log log = LogFactory.getLog(JGroupsChannelDiscovery.class);
+
+ /* (non-Javadoc)
+ * @see org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent#discoverResources(org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext)
+ */
+ public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext context)
+ throws InvalidPluginConfigurationException, Exception {
+
+ JBossCacheComponent parent = (JBossCacheComponent) context.getParentResourceComponent();
+ EmsConnection emsConnection = parent.getEmsConnection();
+ String resKey = context.getParentResourceContext().getResourceKey();
+ File file = DeploymentUtility.getDescriptorFile(emsConnection, resKey);
+ if (file == null) {
+ log.warn("File is null for " + resKey);
+ return null;
+ }
+
+ boolean found = false;
+ try {
+ SAXBuilder builder = new SAXBuilder();
+ Document doc = builder.build(file);
+
+ // Get the root element
+ Element root = doc.getRootElement();
+
+ // XPath xpath = XPathFactory.newInstance().newXPath();
+ // TODO this expression would need to work against non-normalized versions of the name attribute
+ // XPathExpression xp = xpath
+ // .compile("/server/mbean[@name='" + resKey + "']/attribute[@name='ClusterConfig']");
+ // InputSource inputSource = new InputSource(new FileInputStream(file));
+ // NodeList cconfig = (NodeList) xp.evaluate(inputSource, XPathConstants.NODESET);
+ // if (cconfig != null && cconfig.getLength() > 0)
+ // found = true;
+
+ // First look for the right mbean of *our* cache - the file may contain more than one
+
+ // TODO move code in helper, as we'll need it later again
+ // TODO replace the access of 'our' ClusterConfig attribute with an XPath expression
+ for (Object mbeanObj : root.getChildren("mbean")) {
+ if (mbeanObj instanceof Element) {
+ Element mbean = (Element) mbeanObj;
+ String nameAttrib = mbean.getAttributeValue("name");
+ try {
+ ObjectName on = new ObjectName(nameAttrib);
+ nameAttrib = on.getCanonicalName();
+ } catch (MalformedObjectNameException e) {
+ log.warn("Can't canonicalize " + nameAttrib);
+ }
+ if (nameAttrib.equals(resKey)) {
+ // our cache instance, look for the right attribute
+ List children = mbean.getChildren("attribute");
+ for (Object childObj : children) {
+ if (childObj instanceof Element) {
+ Element child = (Element) childObj;
+ String name = child.getAttributeValue("name");
+ if (name.equals("ClusterConfig"))
+ found = true;
+ }
+ }
+ }
+ }
+ }
+ } catch (IOException e) {
+ log.error("IO error occurred while reading file: " + file, e);
+ } catch (JDOMException e) {
+ log.error("Parsing error occurred while reading file: " + file, e);
+ }
+
+ if (found) {
+ DiscoveredResourceDetails detail = new DiscoveredResourceDetails(context.getResourceType(), // Resource Type
+ resKey + "jgroupsChannel", // ResourceKey TODO good choice ?
+ "JGroups channel", // resource name
+ null, // Version
+ "JGroups config for parent JBossCache", // description
+ context.getDefaultPluginConfiguration(), // config
+ null); // process info
+ Set<DiscoveredResourceDetails> res = new HashSet<DiscoveredResourceDetails>(1);
+ res.add(detail);
+ return res;
+ }
+
+ return null;
+ }
+
+}
diff --git a/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoComponent.java b/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoComponent.java
deleted file mode 100644
index 85375ac..0000000
--- a/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoComponent.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Jopr Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.rhq.plugins.jbosscache;
-
-import org.rhq.core.domain.measurement.AvailabilityType;
-import org.rhq.core.pluginapi.inventory.ResourceComponent;
-import org.rhq.core.pluginapi.inventory.ResourceContext;
-
-/**
- * Resource component that deals with JGroups repos
- *
- * @author Heiko W. Rupp
- */
-public class JGroupsRepoComponent implements ResourceComponent<JBossCacheComponent> {
-
- ResourceContext<JBossCacheComponent> context;
-
- /**
- * This one does not (yet) have an availability of its own, but just follows the
- * JBossCache instance it is associated with.
- * @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability()
- */
- public AvailabilityType getAvailability() {
- return context.getParentResourceComponent().getAvailability();
- }
-
- /* (non-Javadoc)
- * @see org.rhq.core.pluginapi.inventory.ResourceComponent#start(org.rhq.core.pluginapi.inventory.ResourceContext)
- */
- public void start(ResourceContext<JBossCacheComponent> context) throws Exception {
- // TODO Auto-generated method stub
- this.context = context;
-
- }
-
- /* (non-Javadoc)
- * @see org.rhq.core.pluginapi.inventory.ResourceComponent#stop()
- */
- public void stop() {
- // TODO Auto-generated method stub
-
- }
-
-}
diff --git a/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoDiscovery.java b/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoDiscovery.java
deleted file mode 100644
index 3436aa1..0000000
--- a/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoDiscovery.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Jopr Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.rhq.plugins.jbosscache;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
-import org.mc4j.ems.connection.EmsConnection;
-
-import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
-import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
-import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
-import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
-import org.rhq.plugins.jbossas.util.DeploymentUtility;
-
-/**
- * This component will discover JGroups repos within a JBoss Cache instance.
- * The deal here is that we want to have zero or one JGroups repos per cache.
- * We will look at the Cache config and see if it contains a
- * <attribute name="ClusterConfig"> element. If so, we return a JGroups instance,
- * else we return nothing.
- *
- * @author Heiko W. Rupp
- */
-public class JGroupsRepoDiscovery implements ResourceDiscoveryComponent {
-
- private final Log log = LogFactory.getLog(JGroupsRepoDiscovery.class);
-
- /* (non-Javadoc)
- * @see org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent#discoverResources(org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext)
- */
- public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext context)
- throws InvalidPluginConfigurationException, Exception {
-
- JBossCacheComponent parent = (JBossCacheComponent) context.getParentResourceComponent();
- EmsConnection emsConnection = parent.getEmsConnection();
- String resKey = context.getParentResourceContext().getResourceKey();
- File file = DeploymentUtility.getDescriptorFile(emsConnection, resKey);
- if (file == null) {
- log.warn("File is null for " + resKey);
- return null;
- }
-
- boolean found = false;
- try {
- SAXBuilder builder = new SAXBuilder();
- Document doc = builder.build(file);
-
- // Get the root element
- Element root = doc.getRootElement();
-
- // XPath xpath = XPathFactory.newInstance().newXPath();
- // TODO this expression would need to work against non-normalized versions of the name attribute
- // XPathExpression xp = xpath
- // .compile("/server/mbean[@name='" + resKey + "']/attribute[@name='ClusterConfig']");
- // InputSource inputSource = new InputSource(new FileInputStream(file));
- // NodeList cconfig = (NodeList) xp.evaluate(inputSource, XPathConstants.NODESET);
- // if (cconfig != null && cconfig.getLength() > 0)
- // found = true;
-
- // First look for the right mbean of *our* cache - the file may contain more than one
-
- // TODO move code in helper, as we'll need it later again
- // TODO replace the access of 'our' ClusterConfig attribute with an XPath expression
- for (Object mbeanObj : root.getChildren("mbean")) {
- if (mbeanObj instanceof Element) {
- Element mbean = (Element) mbeanObj;
- String nameAttrib = mbean.getAttributeValue("name");
- try {
- ObjectName on = new ObjectName(nameAttrib);
- nameAttrib = on.getCanonicalName();
- } catch (MalformedObjectNameException e) {
- log.warn("Can't canonicalize " + nameAttrib);
- }
- if (nameAttrib.equals(resKey)) {
- // our cache instance, look for the right attribute
- List children = mbean.getChildren("attribute");
- for (Object childObj : children) {
- if (childObj instanceof Element) {
- Element child = (Element) childObj;
- String name = child.getAttributeValue("name");
- if (name.equals("ClusterConfig"))
- found = true;
- }
- }
- }
- }
- }
- } catch (IOException e) {
- log.error("IO error occurred while reading file: " + file, e);
- } catch (JDOMException e) {
- log.error("Parsing error occurred while reading file: " + file, e);
- }
-
- if (found) {
- DiscoveredResourceDetails detail = new DiscoveredResourceDetails(context.getResourceType(), // Resource Type
- resKey + "jgroupsRepo", // ResourceKey TODO good choice ?
- "JGroups repo", // resource name
- null, // Version
- "JGroups config for parent JBossCache", // description
- context.getDefaultPluginConfiguration(), // config
- null); // process info
- Set<DiscoveredResourceDetails> res = new HashSet<DiscoveredResourceDetails>(1);
- res.add(detail);
- return res;
- }
-
- return null;
- }
-
-}
diff --git a/modules/plugins/jboss-cache/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-cache/src/main/resources/META-INF/rhq-plugin.xml
index fe28e78..2ef0f4f 100644
--- a/modules/plugins/jboss-cache/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-cache/src/main/resources/META-INF/rhq-plugin.xml
@@ -16,8 +16,8 @@
discovery="JBossCacheSubsystemDiscovery"
description="The JBoss Cache instances on this server"
singleton="true"
- >
-
+ >
+
<runs-inside>
<parent-resource-type name="JBossAS Server" plugin="JBossAS"/>
</runs-inside>
@@ -28,28 +28,28 @@
description="Statistics for JBossCache"
createDeletePolicy="create-only"
>
-
+
<plugin-configuration>
<c:simple-property name="objectName" readOnly="true" default="*:cache-interceptor=CacheMgmtInterceptor,*|*:treecache-interceptor=CacheMgmtInterceptor,*"/>
<c:simple-property name="isTreeCache" readOnly="true" type="boolean" default="false" description="Is this a TreeCache instance or a POJO Cache"/>
</plugin-configuration>
-
+
<operation name="resetStatistics" displayName="Reset Statistics" description="Resets all statistics" />
<operation name="listAssociatedMBeans" displayName="List associated MBeans" description="List all MBeans that form this Cache instance">
<results><c:simple-property name="mbeans"></c:simple-property></results>
</operation>
-
+
<metric property=":numberOfNodes" displayName="Number of Nodes" displayType="summary" />
-
- <metric property="ActivationInterceptor:activations" displayName="Activations"
+
+ <metric property="ActivationInterceptor:activations" displayName="Activations"
description="Number of passivated nodes that have been activated."/>
-
- <metric property="CacheLoaderInterceptor:cacheLoaderLoads" displayName="Cache Loader Loads"
+
+ <metric property="CacheLoaderInterceptor:cacheLoaderLoads" displayName="Cache Loader Loads"
measurementType="trendsup" description="Number of nodes loaded through a cache loader."/>
<metric property="CacheLoaderInterceptor:cacheLoaderMisses" displayName="Cache Loader Misses"
measurementType="trendsup" description="Number of unsuccessful attempts to load a node through a cache loader."/>
-
- <metric property="CacheMgmtInterceptor:hits" displayName="Cache Hits" category="performance"
+
+ <metric property="CacheMgmtInterceptor:hits" displayName="Cache Hits" category="performance"
measurementType="trendsup" description="Number of successful attribute retrievals."/>
<metric property="CacheMgmtInterceptor:misses" displayName="Cache Misses" category="performance"
measurementType="trendsup" description="Number of unsuccessful attribute retrievals."/>
@@ -57,44 +57,44 @@
description="Ratio of hits to hits and misses. A hit is a get attribute operation that results in an object being returned to the client. The retrieval may be from a cache loader if the entry isn't in the local cache."/>
<metric property="CacheMgmtInterceptor:readWriteRatio" displayName="Read-write-ratio" displayType="summary"
description="Ratio of read operations to write operations. This is the ratio of cache hits and misses to cache stores."/>
- <metric property="CacheMgmtInterceptor:stores" displayName="Cache Stores" category="performance"
+ <metric property="CacheMgmtInterceptor:stores" displayName="Cache Stores" category="performance"
measurementType="trendsup" description="Number of attribute store operations."/>
- <metric property="CacheMgmtInterceptor:evictions" displayName="Cache Evictions" category="performance"
+ <metric property="CacheMgmtInterceptor:evictions" displayName="Cache Evictions" category="performance"
measurementType="trendsup" description="Number of node evictions."/>
- <metric property="CacheMgmtInterceptor:numberOfAttributes" displayName="Number of Attributes"
+ <metric property="CacheMgmtInterceptor:numberOfAttributes" displayName="Number of Attributes"
category="performance" description="Number of attributes currently cached." />
- <metric property="CacheMgmtInterceptor:numberOfNodes" displayName="Number of Nodes cached"
+ <metric property="CacheMgmtInterceptor:numberOfNodes" displayName="Number of Nodes cached"
category="performance" description="Number of nodes currently cached."/>
- <metric property="CacheMgmtInterceptor:elapsedTime" displayName="Elapsed Time" category="utilization"
- measurementType="trendsup" description="Number of seconds that the cache has been running."
+ <metric property="CacheMgmtInterceptor:elapsedTime" displayName="Elapsed Time" category="utilization"
+ measurementType="trendsup" description="Number of seconds that the cache has been running."
units="seconds"/>
- <metric property="CacheMgmtInterceptor:timeSinceReset" displayName="Time since reset" category="utilization"
- measurementType="trendsup" description="Number of seconds since the cache statistics have been reset."
+ <metric property="CacheMgmtInterceptor:timeSinceReset" displayName="Time since reset" category="utilization"
+ measurementType="trendsup" description="Number of seconds since the cache statistics have been reset."
units="seconds"/>
- <metric property="CacheMgmtInterceptor:averageReadTime" displayName="Average Read Time" category="performance"
- description="Average time in milliseconds to retrieve a cache attribute, including unsuccessful attribute retrievals."
+ <metric property="CacheMgmtInterceptor:averageReadTime" displayName="Average Read Time" category="performance"
+ description="Average time in milliseconds to retrieve a cache attribute, including unsuccessful attribute retrievals."
units="milliseconds"/>
- <metric property="CacheMgmtInterceptor:averageWriteTime" displayName="Average Write Time"
- category="performance" description="Average time in milliseconds to write a cache attribute."
+ <metric property="CacheMgmtInterceptor:averageWriteTime" displayName="Average Write Time"
+ category="performance" description="Average time in milliseconds to write a cache attribute."
units="milliseconds"/>
-
- <metric property="CacheStoreInterceptor:cacheLoaderStores" displayName="Cache Loader Stores"
+
+ <metric property="CacheStoreInterceptor:cacheLoaderStores" displayName="Cache Loader Stores"
category="utilization" description="Number of nodes written to the cache loader." measurementType="trendsup" />
-
- <metric property="InvalidationInterceptor:invalidations" displayName="Invalidataions"
- category="utilization" description="Number of cached nodes that have been invalidated."
+
+ <metric property="InvalidationInterceptor:invalidations" displayName="Invalidataions"
+ category="utilization" description="Number of cached nodes that have been invalidated."
measurementType="trendsup" />
-
- <metric property="PassivationInterceptor:passivations" displayName="Passivations" category="utilization"
+
+ <metric property="PassivationInterceptor:passivations" displayName="Passivations" category="utilization"
description="Number of cached nodes that have been passivated." measurementType="trendsup"/>
-
- <metric property="TxInterceptor:prepares" displayName="Tx prepares"
- description="Number of transaction prepare operations performed." measurementType="trendsup" />
- <metric property="TxInterceptor:commits" displayName="Tx commits"
- description="Number of transaction commit operations performed." measurementType="trendsup" />
- <metric property="TxInterceptor:rollbacks" displayName="Tx rollbacks"
- description="Number of transaction rollback operations performed." measurementType="trendsup" />
-
+
+ <metric property="TxInterceptor:prepares" displayName="Tx prepares"
+ description="Number of transaction prepare operations performed." measurementType="trendsup" />
+ <metric property="TxInterceptor:commits" displayName="Tx commits"
+ description="Number of transaction commit operations performed." measurementType="trendsup" />
+ <metric property="TxInterceptor:rollbacks" displayName="Tx rollbacks"
+ description="Number of transaction rollback operations performed." measurementType="trendsup" />
+
<resource-configuration>
<c:simple-property name="Flavour" default="treecache"
description="Is this going to be a Pojo Cache or a Tree Cache">
@@ -103,7 +103,7 @@
<c:option name="Tree Cache" value="treecache" default="true"/>
</c:property-options>
</c:simple-property>
- <c:simple-property name="TransactionManagerLookupClass"
+ <c:simple-property name="TransactionManagerLookupClass"
default="org.jboss.cache.JBossTransactionManagerLookup"
description="What class should be used to get a transaction manager instance"/>
<c:simple-property name="IsolationLevel" default="REPEATABLE_READ"
@@ -132,39 +132,39 @@
<c:simple-property name="UseReplQueue" type="boolean" default="false"
description="Just used for async repl: use a replication queue "/>
<c:simple-property name="ReplQueueInterval" type="integer" default="100"
- description="Replication interval for replication queue (in ms) "/>
+ description="Replication interval for replication queue (in ms) "/>
<c:simple-property name="ReplQueueMaxElements" type="integer" default="10"
description="Max number of elements which trigger replication" />
<c:simple-property name="ClusterName" default="DefaultPartition"
description="Name of cluster. Needs to be the same for all clusters, in order to find each other"/>
-
- <c:simple-property name="FetchStateOnStartup" type="boolean" default="true"
+
+ <c:simple-property name="FetchStateOnStartup" type="boolean" default="true"
description="Whether or not to fetch state on joining a cluster"/>
- <c:simple-property name="InitialStateRetrievalTimeout" type="long"
+ <c:simple-property name="InitialStateRetrievalTimeout" type="long"
description=" The max amount of time (in milliseconds) we wait until the
initial state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment" default="5000"/>
+ existing members in a clustered environment" default="5000"/>
<c:simple-property name="SyncReplTimeout" type="long" default="15000"
description="Number of milliseconds to wait until all responses for a
synchronous call have been received."/>
<c:simple-property name="LockAcquisitionTimeout" type="long" default="10000"
description="Max number of milliseconds to wait for a lock acquisition."/>
-
+
</resource-configuration>
<help>
<![CDATA[
- <p>Please note that the number of possible metrics varies depending on the configuration and flavour of
+ <p>Please note that the number of possible metrics varies depending on the configuration and flavour of
Cache used.</p>
]]>
</help>
-
- <service name="JGroupsRepo"
- description="The underlying JGroups repo for this cache instance"
- class="JGroupsRepoComponent"
- discovery="JGroupsRepoDiscovery">
+
+ <service name="JGroupsChannel"
+ description="The underlying JGroups channel for this cache instance"
+ class="JGroupsChannelComponent"
+ discovery="JGroupsChannelDiscovery">
</service>
</service>
-
+
</server>
-
+
</plugin>
\ No newline at end of file
13 years, 10 months
[rhq] Branch 'release-3.0.0' - modules/enterprise
by lkrejci
modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8d6b4f8b43d62b7375468b363af0c1841c7d3a05
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Jul 22 18:52:14 2010 +0200
BZ 601744 - backing out the position:relative part of the original fix in main.xhtml. This effectively reverts the page to the state it was before we had the rich:tabPanel, which was eventually removed.
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml
index e249621..aa9f90d 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml
@@ -50,7 +50,7 @@ id - the id of the Resource being accessed
</div>
<div id="centerContent" class="column" style="width: #{100 - UserPreferencesUIBean.leftResourceNavState}%;">
<div id="centerContentWrapper" class="content-right">
- <div style="left: 0; right: 0; height: 100%; position: relative">
+ <div style="left: 0; right: 0; height: 100%;">
<ui:insert name="summary"><p>Default Entity Summary</p></ui:insert>
<ui:insert name="tabBar"><p>Default Entity TabBar</p></ui:insert>
<ui:insert name="content"><p>Default Entity Content</p></ui:insert>
13 years, 10 months
[rhq] Branch 'release-3.0.0' - modules/enterprise
by Joseph Marques
modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9ed8f96c231bdce5ca78f3b2ea32b7ef5949e2fb
Author: Joseph Marques <joseph(a)redhat.com>
Date: Thu Jul 22 12:20:34 2010 -0400
BZ-617257: windows does not open on IE if name includes whitespace
diff --git a/modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml b/modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml
index 2eb3f88..0502e73 100644
--- a/modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml
+++ b/modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml
@@ -21,7 +21,7 @@
<h:panelGroup rendered="#{operationsBean.selectionMode eq 'SPECIFIC'}">
<h:inputText value="#{operationsBean.resourceId}" id="resourceId" />
<a href="#"
- onclick="window.open('/rhq/inventory/resourcePicker.xhtml?nomenu=true&fieldId=customContentForm:resourceId', 'Pick a resource','width=1000,height=700,scrollbars=yes,toolbar=no,resizable=yes,location=no,status=no,left=100,top=100'); return false;"
+ onclick="window.open('/rhq/inventory/resourcePicker.xhtml?nomenu=true&fieldId=customContentForm:resourceId', 'ResourcePicker','width=1000,height=700,scrollbars=yes,toolbar=no,resizable=yes,location=no,status=no,left=100,top=100'); return false;"
class="buttonmed">Pick</a>
</h:panelGroup>
13 years, 10 months
[rhq] Branch 'release-3.0.0' - modules/plugins
by ips
modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 67994d4d27d36390317e91a3e472adc29267a017
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu Jul 22 11:40:07 2010 -0400
fix error in description of snmpAgentPort plugin config prop
diff --git a/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml
index 9119de3..b3f5aa3 100644
--- a/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml
@@ -277,7 +277,7 @@
<c:simple-property name="snmpAgentHost" displayName="SNMP Agent Host" default="127.0.0.1"
description="the host name or IP address of the Apache SNMP agent (typically '127.0.0.1')"/>
<c:simple-property name="snmpAgentPort" displayName="SNMP Agent Port" type="integer" default="1610"
- description="the TCP port of the Apache SNMP agent (typically '1610')"/>
+ description="the UDP port of the Apache SNMP agent (typically '1610')"/>
<c:simple-property name="snmpAgentCommunity" displayName="SNMP Agent Community" default="public"
description="the SNMP community of the Apache SNMP agent (typically 'public')"/>
13 years, 10 months
[rhq] Branch 'nagios' - modules/core modules/enterprise modules/plugins
by Alexander Kiefer
modules/core/plugin-api/pom.xml | 101 ++++
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ChildResourceTypeDiscoveryFacet.java | 40 +
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java | 111 +++++
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 19
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/AddResourceTypePromptCommand.java | 23 +
modules/enterprise/gui/portal-war/src/main/webapp/admin/test/ResourceTypeCreator.jsp | 62 ---
modules/plugins/hadoop/pom.xml | 6
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java | 94 ++--
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorDiscovery.java | 81 +--
modules/plugins/perftest/pom.xml | 142 ++++++
modules/plugins/pom.xml | 205 ++++++++++
11 files changed, 729 insertions(+), 155 deletions(-)
New commits:
commit 65d71aac8eef3e6fa0ec01205f26c89fe7a2514c
Author: Alexander Kiefer <alexander.kiefer(a)dillinger.biz>
Date: Thu Jul 22 16:13:07 2010 +0200
Several changes necessary to create new ResourceTypes within the
NagiosPlugin and make them work in Agent and Server
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
new file mode 100644
index 0000000..9def010
--- /dev/null
+++ b/modules/core/plugin-api/pom.xml
@@ -0,0 +1,101 @@
+<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">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-parent</artifactId>
+ <version>3.0.0.B04</version>
+ </parent>
+
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-core-plugin-api</artifactId>
+ <packaging>jar</packaging>
+
+ <name>RHQ Plugin API</name>
+ <description>RHQ Plugin API used to write custom plugins</description>
+
+ <scm>
+ <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/core/plugin-api</connection>
+ <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/core/plugin-api</developerConnection>
+ </scm>
+
+ <properties>
+ <scm.module.path>modules/core/plugin-api/</scm.module.path>
+ </properties>
+
+ <dependencies>
+
+ <!-- Internal Deps -->
+
+ <dependency>
+ <groupId>${rhq.groupId}</groupId>
+ <artifactId>rhq-core-domain</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${rhq.groupId}</groupId>
+ <artifactId>rhq-core-native-system</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- 3rd Party Deps -->
+
+ <!-- TODO: This is a fix for the Javac bug requiring annotations to be
+ available when compiling dependent classes. It is fixed in JDK 6 -->
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jboss-embeddable-ejb3</groupId>
+ <artifactId>hibernate-all</artifactId>
+ <version>1.0.0.Alpha9</version>
+ <scope>provided</scope> <!-- by ON Container -->
+ <!-- needed for referenced domain entities that use Hibernate annotations -->
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ <!--<scope>test</scope> not sure about this -->
+ </dependency>
+
+ </dependencies>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>java.net</id>
+ <name>java.net Maven Repository</name>
+ <url>http://download.java.net/maven/1/</url>
+ <layout>legacy</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <name>java.net Maven Repository</name>
+ <url>http://download.java.net/maven/1/</url>
+ <layout>legacy</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+</project>
diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ChildResourceTypeDiscoveryFacet.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ChildResourceTypeDiscoveryFacet.java
new file mode 100644
index 0000000..cf88165
--- /dev/null
+++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ChildResourceTypeDiscoveryFacet.java
@@ -0,0 +1,40 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.rhq.core.pluginapi.inventory;
+
+import java.util.Set;
+
+import org.rhq.core.domain.resource.ResourceType;
+
+/**
+ * Interface defines method to discover ChildResourceTypes of existing parentType
+ *
+ * @author Alexander Kiefer
+ * @param <ResourceType>
+ */
+public interface ChildResourceTypeDiscoveryFacet {
+
+ //ParentResourceType will be given within start method of each Plugin from the context
+ Set<ResourceType> discoverChildResourceTypes();
+}
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java
new file mode 100644
index 0000000..792a97a
--- /dev/null
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java
@@ -0,0 +1,111 @@
+package org.rhq.core.pc.inventory;
+
+import java.util.Set;
+import java.util.concurrent.Callable;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.pc.PluginContainer;
+import org.rhq.core.pc.util.ComponentUtil;
+import org.rhq.core.pc.util.FacetLockType;
+import org.rhq.core.pluginapi.inventory.ChildResourceTypeDiscoveryFacet;
+import org.rhq.core.util.exception.ThrowableUtil;
+
+public class ChildResourceTypeDiscoveryRunner implements Callable<Set<ResourceType>>, Runnable {
+
+ private Log log = LogFactory.getLog(ChildResourceTypeDiscoveryRunner.class);
+ //private MeasurementManager measurementManager;
+ private int resourceId;
+
+ //TODO: maybe to be implemented for later usage
+ // public ChildResourceTypeDiscoveryRunner(MeasurementManager measurementManager) {
+ //
+ // }
+
+ public ChildResourceTypeDiscoveryRunner(int resourceId) {
+ this.resourceId = resourceId;
+ }
+
+ public void run() {
+ try {
+ call();
+ } catch (Exception e) {
+ log.error("Could not get measurement report.", e);
+ }
+ }
+
+ public Set<ResourceType> call() {
+
+ Set<ResourceType> resourceTypes = null;
+
+ try {
+ //TODO:
+ //this.measurementManager.getLock().readLock().lock();
+ //report = this.measurementManager.getActiveReport();
+
+ long start = System.currentTimeMillis();
+
+ InventoryManager im = PluginContainer.getInstance().getInventoryManager();
+
+ //Set<ScheduledMeasurementInfo> requests = this.measurementManager.getNextScheduledSet();
+ // if (requests != null) {
+ // if ((System.currentTimeMillis() - 30000L) > requests.iterator().next().getNextCollection()) {
+ // this.measurementManager.incrementLateCollections(requests.size());
+ // log.debug("Measurement collection is falling behind... Missed requested time by ["
+ // + (System.currentTimeMillis() - requests.iterator().next().getNextCollection()) + "ms]");
+ //
+ // this.measurementManager.reschedule(requests);
+ // return report;
+ // }
+ //Integer resourceId = requests.iterator().next().getResourceId();
+
+ ResourceContainer container = im.getResourceContainer(this.resourceId);
+
+ if (container.getResourceComponentState() != ResourceContainer.ResourceComponentState.STARTED
+ || container.getAvailability() == null
+ || container.getAvailability().getAvailabilityType() == AvailabilityType.DOWN) {
+ // Don't collect metrics for resources that are down
+ if (log.isDebugEnabled()) {
+ log.debug("ChildType not discoverd for inactive resource component: " + container.getResource());
+ }
+ } else {
+ ChildResourceTypeDiscoveryFacet discoveryComponent = ComponentUtil.getComponent(resourceId,
+ ChildResourceTypeDiscoveryFacet.class, FacetLockType.READ, 30 * 1000, true, true);
+
+ resourceTypes = discoverChildResourceTypes(discoveryComponent);
+ }
+
+ } catch (Throwable t) {
+ log.error("Failed to run ChildType discovery", t);
+ }
+ return resourceTypes;
+ }
+
+ /**
+ *
+ * @param discoveryComponent
+ * @return
+ */
+ private Set<ResourceType> discoverChildResourceTypes(ChildResourceTypeDiscoveryFacet discoveryComponent) {
+
+ Set<ResourceType> resourceTypes = null;
+ try {
+ long start = System.currentTimeMillis();
+ resourceTypes = discoveryComponent.discoverChildResourceTypes();
+ long duration = (System.currentTimeMillis() - start);
+
+ if (duration > 2000) {
+ log.info("[PERF] Discovery of childResourceTypes for [" + discoveryComponent + "] took [" + duration
+ + "ms]");
+ }
+ } catch (Throwable t) {
+
+ log.warn("Failure to discover childResourceType data - cause: " + ThrowableUtil.getAllMessages(t));
+ }
+
+ return resourceTypes;
+ }
+}
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
index 222d5a5..ea9a4e4 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
@@ -997,6 +997,25 @@ public class InventoryManager extends AgentService implements ContainerService,
} catch (Exception e) {
throw new RuntimeException("Error submitting service scan", e);
}
+
+ /**
+ * Usage of new implemented ChildResourceTypeDiscoveryRunner
+ */
+ ChildResourceTypeDiscoveryRunner childDiscoveryRunner = new ChildResourceTypeDiscoveryRunner(resourceId);
+ try {
+ //get Set<ResourceType>
+ Set<ResourceType> resourceTypes = inventoryThreadPoolExecutor.submit(
+ (Callable<Set<ResourceType>>) childDiscoveryRunner).get();
+
+ //Iterate over all the ResourceTypes contained in the Set
+ for (ResourceType type : resourceTypes) {
+ //Create a new ResourceType in the DB for the selected type
+ this.createNewResourceType(type.getName(), type.getName() + "Metric");
+ }
+
+ } catch (Exception e) {
+ throw new RuntimeException("Error submitting service scan", e);
+ }
}
@Nullable
diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/AddResourceTypePromptCommand.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/AddResourceTypePromptCommand.java
index 774e7f8..89a22ba 100644
--- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/AddResourceTypePromptCommand.java
+++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/AddResourceTypePromptCommand.java
@@ -1,3 +1,26 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
package org.rhq.enterprise.agent.promptcmd;
import java.io.PrintWriter;
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/ResourceTypeCreator.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/ResourceTypeCreator.jsp
index 218c66d..24f96fe 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/ResourceTypeCreator.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/ResourceTypeCreator.jsp
@@ -15,7 +15,8 @@
<%@page import="org.rhq.enterprise.server.resource.ResourceTypeManagerBean"%>
<%@page import="org.apache.commons.logging.*"%>
-<%@page import="org.rhq.enterprise.server.util.LookupUtil"%><html>
+<%@page import="org.rhq.enterprise.server.util.LookupUtil"%>
+<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>ResourceTypeCreator</title>
@@ -55,65 +56,6 @@
out.println("Please insert the name of the new ResourceType");
}
%>
-
-</body>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
-<%@page import="javax.naming.*"%>
-<%@page import="javax.ejb.*"%>
-<%@page import="java.rmi.*"%>
-<%@page import="java.util.*"%>
-<%@page import="org.rhq.enterprise.server.resource.metadata.*"%>
-<%@page import="org.rhq.core.domain.plugin.*"%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-
-<%@page import="org.rhq.core.domain.resource.ResourceType"%>
-<%@page import="org.rhq.core.domain.resource.ResourceCategory"%>
-<%@page import="javax.persistence.NoResultException"%>
-<%@page import="org.rhq.enterprise.server.resource.ResourceTypeManagerLocal"%>
-<%@page import="org.rhq.enterprise.server.resource.ResourceTypeManagerBean"%>
-<%@page import="org.apache.commons.logging.*"%>
-
-<%@page import="org.rhq.enterprise.server.util.LookupUtil"%><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>ResourceTypeCreator</title>
-</head>
-<body>
- <h1>ResourceTypeCreator JSP Page</h1>
-
- <form action="ResourceTypeCreator.jsp" method="post">
-
- Enter the name of the new RessourceType:
- <input type="text" name="resourceTypeName" width="150px" height="35px"><br>
- <!-- Enter the name of first metric:
- <input type="text" name="resourceTypeMetric1Input" width="150px" height="35px"><br>
- Enter the name of second metric:
- <input type="text" name="resourceTypeMetric2Input" width="150px" height="35px"><br>
- Enter the name third metric:
- <input type="text" name="resourceTypeMetric3Input" width="150px" height="35px"><br>
- -->
-
- <input type="submit" value="Create new ResourceType">
-
- </form>
-
- <%
- /** Creation of parameters for the new ResourceType */
- String resourceTypeName = request.getParameter("resourceTypeName");
- if( resourceTypeName != null )
- {
- //After name of new resourceType has been given
- out.println("Input:" + resourceTypeName);
-
- LookupUtil.getResourceMetadataManager().addNewResourceType(resourceTypeName);
- }
- else
- {
- out.println("Please insert the name of the new ResourceType");
- }
- %>
-
</body>
</html>
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index f5bfd9a..4065ead 100644
--- a/modules/plugins/hadoop/pom.xml
+++ b/modules/plugins/hadoop/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version><!-- TODO adjust RHQ version -->
+ <version>3.0.0.B04</version><!-- TODO adjust RHQ version -->
</parent>
<groupId>org.rhq</groupId>
@@ -21,7 +21,7 @@
<properties>
<scm.module.path>TODO</scm.module.path>
- <rhq.version>3.0.0-SNAPSHOT</rhq.version> <!-- TODO adjust, see above too -->
+ <rhq.version>3.0.0.B04</rhq.version> <!-- TODO adjust, see above too -->
</properties>
<build>
@@ -182,4 +182,4 @@
<!-- TODO add your dependencies here -->
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java b/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java
index f3f6d54..e5b67b4 100644
--- a/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java
+++ b/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java
@@ -1,4 +1,5 @@
package org.rhq.plugins.nagios;
+
/*
* RHQ Management Platform
* Copyright (C) 2005-2008 Red Hat, Inc.
@@ -18,6 +19,7 @@ package org.rhq.plugins.nagios;
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+import java.util.HashSet;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -25,19 +27,22 @@ import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.rhq.core.domain.measurement.DataType;
-import org.rhq.plugins.nagios.controller.NagiosManagementInterface;
-import org.rhq.plugins.nagios.data.NagiosSystemData;
import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.measurement.MeasurementDataNumeric;
import org.rhq.core.domain.measurement.MeasurementDataTrait;
import org.rhq.core.domain.measurement.MeasurementReport;
import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
+import org.rhq.core.domain.resource.ResourceCategory;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.pluginapi.inventory.ChildResourceTypeDiscoveryFacet;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
import org.rhq.core.pluginapi.inventory.ResourceComponent;
import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.core.pluginapi.measurement.MeasurementFacet;
+import org.rhq.plugins.nagios.controller.NagiosManagementInterface;
+import org.rhq.plugins.nagios.data.NagiosSystemData;
import org.rhq.plugins.nagios.error.NagiosException;
/**
@@ -48,9 +53,8 @@ import org.rhq.plugins.nagios.error.NagiosException;
*
* @author Alexander Kiefer
*/
-public class NagiosMonitorComponent implements ResourceComponent, MeasurementFacet
-{
- private final Log log = LogFactory.getLog(this.getClass());
+public class NagiosMonitorComponent implements ResourceComponent, MeasurementFacet, ChildResourceTypeDiscoveryFacet {
+ private final Log log = LogFactory.getLog(this.getClass());
public static final String DEFAULT_NAGIOSIP = "127.0.0.1";
public static final String DEFAULT_NAGIOSPORT = "6557";
@@ -64,13 +68,12 @@ public class NagiosMonitorComponent implements ResourceComponent, MeasurementFac
* Return availability of this resource
* @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability()
*/
- public AvailabilityType getAvailability()
- {
+ public AvailabilityType getAvailability() {
if (context.getParentResourceComponent() instanceof NagiosMonitorComponent) {
return AvailabilityType.UP; // TODO get from parent?
} else {
boolean available = false;
- if (nagiosManagementInterface!=null)
+ if (nagiosManagementInterface != null)
available = nagiosManagementInterface.pingNagios();
if (available)
@@ -83,14 +86,14 @@ public class NagiosMonitorComponent implements ResourceComponent, MeasurementFac
* Start the resource connection
* @see org.rhq.core.pluginapi.inventory.ResourceComponent#start(org.rhq.core.pluginapi.inventory.ResourceContext)
*/
- public void start(ResourceContext context) throws InvalidPluginConfigurationException, Exception
- {
- //get context of this component instance
- this.context = context;
+ public void start(ResourceContext context) throws InvalidPluginConfigurationException, Exception {
+ //get context of this component instance
+ this.context = context;
- //get config
+ //get config
if (context.getParentResourceComponent() instanceof NagiosMonitorComponent) {
NagiosMonitorComponent parent = (NagiosMonitorComponent) context.getParentResourceComponent();
+
nagiosHost = parent.getNagiosHost();
nagiosPort = parent.getNagiosPort();
} else {
@@ -103,16 +106,14 @@ public class NagiosMonitorComponent implements ResourceComponent, MeasurementFac
//Interface class to the nagios system
nagiosManagementInterface = new NagiosManagementInterface(nagiosHost, nagiosPort);
- //log.info("nagios Plugin started");
+ //log.info("nagios Plugin started");
}
-
/**
* Tear down the rescource connection
* @see org.rhq.core.pluginapi.inventory.ResourceComponent#stop()
*/
- public void stop()
- {
+ public void stop() {
}
@@ -120,32 +121,26 @@ public class NagiosMonitorComponent implements ResourceComponent, MeasurementFac
* Gather measurement data
* @see org.rhq.core.pluginapi.measurement.MeasurementFacet#getValues(org.rhq.core.domain.measurement.MeasurementReport, java.util.Set)
*/
- public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics)
- {
+ public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) {
NagiosSystemData nagiosSystemData = null;
String serviceName = this.context.getResourceType().getName();
log.info("getValues() of ResourceType: " + serviceName);
- try
- {
+ try {
//Getting all Nagios system information
- nagiosSystemData = nagiosManagementInterface.createNagiosSystemData();
- }
- catch (Exception e)
- {
+ nagiosSystemData = nagiosManagementInterface.createNagiosSystemData();
+ } catch (Exception e) {
log.warn(" Can not get information from Nagios: ", e);
return;
}
//iterating over the metrics
- for (MeasurementScheduleRequest req : metrics)
- {
- try
- { // Don't let one bad egg spoil the cake
+ for (MeasurementScheduleRequest req : metrics) {
+ try { // Don't let one bad egg spoil the cake
- String[] splitter = req.getName().split("\\|");
- String property = splitter[1];
- String pattern = splitter[2];
+ String[] splitter = req.getName().split("\\|");
+ String property = splitter[1];
+ String pattern = splitter[2];
if (log.isDebugEnabled()) {
log.debug("Name of Metric: " + property);
@@ -153,7 +148,8 @@ public class NagiosMonitorComponent implements ResourceComponent, MeasurementFac
}
// Get "raw" data from nagios data structures - we need to pick our value below
- String value = nagiosSystemData.getSingleHostServiceMetric(property, serviceName, "localhost").getValue(); // TODO use 'real' host
+ String value = nagiosSystemData.getSingleHostServiceMetric(property, serviceName, "localhost")
+ .getValue(); // TODO use 'real' host
Pattern p = Pattern.compile(pattern);
Matcher m = p.matcher(value);
@@ -164,20 +160,16 @@ public class NagiosMonitorComponent implements ResourceComponent, MeasurementFac
if (req.getDataType() == DataType.MEASUREMENT) {
MeasurementDataNumeric res = new MeasurementDataNumeric(req, Double.valueOf(val));
report.addData(res);
- }
- else if(req.getDataType() == DataType.TRAIT) {
+ } else if (req.getDataType() == DataType.TRAIT) {
MeasurementDataTrait res = new MeasurementDataTrait(req, val);
report.addData(res);
- }
- else
+ } else
log.error("Unknown DataType for request " + req);
+ } else {
+ log.warn("Pattern >>" + pattern + "<< did not match for input >>" + value + "<< and request: >>"
+ + req.getName());
}
- else {
- log.warn("Pattern >>" + pattern + "<< did not match for input >>" + value + "<< and request: >>" + req.getName());
- }
- }
- catch (NagiosException e)
- {
+ } catch (NagiosException e) {
log.error(e);
}
}
@@ -190,4 +182,16 @@ public class NagiosMonitorComponent implements ResourceComponent, MeasurementFac
public int getNagiosPort() {
return nagiosPort;
}
+
+ public Set<ResourceType> discoverChildResourceTypes() {
+
+ ResourceType parentType = this.context.getResourceType();
+ ResourceType resourceType = new ResourceType("NewChild", parentType.getPlugin(), ResourceCategory.SERVICE,
+ parentType);
+
+ Set<ResourceType> resourceTypes = new HashSet<ResourceType>();
+ resourceTypes.add(resourceType);
+
+ return resourceTypes;
+ }
}
\ No newline at end of file
diff --git a/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorDiscovery.java b/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorDiscovery.java
index 8f0a879..fd79f3b 100644
--- a/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorDiscovery.java
+++ b/modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorDiscovery.java
@@ -1,4 +1,5 @@
package org.rhq.plugins.nagios;
+
/*
* RHQ Management Platform
* Copyright (C) 2005-2008 Red Hat, Inc.
@@ -20,6 +21,7 @@ package org.rhq.plugins.nagios;
import java.util.HashSet;
import java.util.Set;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -31,18 +33,17 @@ import org.rhq.core.pluginapi.inventory.ManualAddFacet;
import org.rhq.core.pluginapi.inventory.ResourceComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+import org.rhq.plugins.nagios.NagiosMonitorComponent;
import org.rhq.plugins.nagios.network.NetworkConnection;
import org.rhq.plugins.nagios.reply.LqlReply;
import org.rhq.plugins.nagios.request.LqlResourceTypeRequest;
-
/**
* Discovery class
*
*@author Alexander Kiefer
*/
-public class NagiosMonitorDiscovery implements ResourceDiscoveryComponent, ManualAddFacet
-{
+public class NagiosMonitorDiscovery implements ResourceDiscoveryComponent, ManualAddFacet {
private final Log log = LogFactory.getLog(this.getClass());
/**
@@ -52,20 +53,15 @@ public class NagiosMonitorDiscovery implements ResourceDiscoveryComponent, Manua
* @return Our server type
* @throws org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException
*/
- public DiscoveredResourceDetails discoverResource(Configuration configuration, ResourceDiscoveryContext resourceDiscoveryContext) throws InvalidPluginConfigurationException {
-
- String nagiosHost = configuration.getSimpleValue("nagiosHost",NagiosMonitorComponent.DEFAULT_NAGIOSIP);
- String nagiosPort = configuration.getSimpleValue("nagiosPort",NagiosMonitorComponent.DEFAULT_NAGIOSPORT);
-
- DiscoveredResourceDetails detail = new DiscoveredResourceDetails (
- resourceDiscoveryContext.getResourceType(),
- "nagios@"+nagiosHost+":"+nagiosPort,
- "Nagios@"+nagiosHost+":"+nagiosPort,
- null,
- "Nagios server @ " + nagiosHost + ":" + nagiosPort,
- configuration,
- null
- );
+ public DiscoveredResourceDetails discoverResource(Configuration configuration,
+ ResourceDiscoveryContext resourceDiscoveryContext) throws InvalidPluginConfigurationException {
+
+ String nagiosHost = configuration.getSimpleValue("nagiosHost", NagiosMonitorComponent.DEFAULT_NAGIOSIP);
+ String nagiosPort = configuration.getSimpleValue("nagiosPort", NagiosMonitorComponent.DEFAULT_NAGIOSPORT);
+
+ DiscoveredResourceDetails detail = new DiscoveredResourceDetails(resourceDiscoveryContext.getResourceType(),
+ "nagios@" + nagiosHost + ":" + nagiosPort, "Nagios@" + nagiosHost + ":" + nagiosPort, null,
+ "Nagios server @ " + nagiosHost + ":" + nagiosPort, configuration, null);
log.info("Adding NagiosMonitor " + detail);
return detail;
@@ -79,7 +75,7 @@ public class NagiosMonitorDiscovery implements ResourceDiscoveryComponent, Manua
// If we have no parent, it means the NagioMonitoring server type is not yet up.
ResourceComponent tmpComponent = discoveryContext.getParentResourceComponent();
- if (tmpComponent ==null || !(tmpComponent instanceof NagiosMonitorComponent))
+ if (tmpComponent == null || !(tmpComponent instanceof NagiosMonitorComponent))
return discoveredResources;
NagiosMonitorComponent parentComponent = (NagiosMonitorComponent) tmpComponent;
@@ -91,50 +87,41 @@ public class NagiosMonitorDiscovery implements ResourceDiscoveryComponent, Manua
// the resource type we are interested in this invocation
ResourceType wanted = discoveryContext.getResourceType();
- //for each available service
- for(int i = 0; i < resourceTypeReply.getLqlReply().size(); i++)
- {
+ //for each available service
+ for (int i = 0; i < resourceTypeReply.getLqlReply().size(); i++) {
String nagiosType = resourceTypeReply.getLqlReply().get(i);
if (!nagiosType.equals(wanted.getName()))
- continue;
+ continue;
//create new DiscoveredResourceDetails instance
- DiscoveredResourceDetails detail = new DiscoveredResourceDetails
- (
- //new ResourceType instance per service
- wanted,
- "nagiosKey@" + "Nr:" + i + ":" + resourceTypeReply.getLqlReply().get(i),
- "Nagios@" + "Nr:" + i + ":" + resourceTypeReply.getLqlReply().get(i),
- null,
- "NagiosService: " + resourceTypeReply.getLqlReply().get(i),
- null,
- null
- );
-
- //add DiscoveredResourceDetails instance to Set
- discoveredResources.add(detail);
+ DiscoveredResourceDetails detail = new DiscoveredResourceDetails(
+ //new ResourceType instance per service
+ wanted, "nagiosKey@" + "Nr:" + i + ":" + resourceTypeReply.getLqlReply().get(i), "Nagios@" + "Nr:" + i
+ + ":" + resourceTypeReply.getLqlReply().get(i), null, "NagiosService: "
+ + resourceTypeReply.getLqlReply().get(i), null, null);
+
+ //add DiscoveredResourceDetails instance to Set
+ discoveredResources.add(detail);
log.info("Discovered a nagios service: " + detail);
- }
+ }
- return discoveredResources;
- }
+ return discoveredResources;
+ }
/**
* Don't run the auto-discovery of this "nagios" server type,
* as we probably won't have one on each platform. Rather have the admin
* explicitly add it to one platform.
*/
+ private LqlReply getResourceTypeInformation(String nagiosIp, int nagiosPort) {
+ LqlResourceTypeRequest resourceTypeRequest = new LqlResourceTypeRequest();
+ LqlReply resourceTypeReply;
- private LqlReply getResourceTypeInformation(String nagiosIp, int nagiosPort)
- {
- LqlResourceTypeRequest resourceTypeRequest = new LqlResourceTypeRequest();
- LqlReply resourceTypeReply;
-
- NetworkConnection connection = new NetworkConnection(nagiosIp, nagiosPort);
- resourceTypeReply = connection.sendAndReceive(resourceTypeRequest);
+ NetworkConnection connection = new NetworkConnection(nagiosIp, nagiosPort);
+ resourceTypeReply = connection.sendAndReceive(resourceTypeRequest);
- return resourceTypeReply;
+ return resourceTypeReply;
}
}
\ No newline at end of file
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
new file mode 100644
index 0000000..7e6310b
--- /dev/null
+++ b/modules/plugins/perftest/pom.xml
@@ -0,0 +1,142 @@
+<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">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-plugins-parent</artifactId>
+ <version>3.0.0.B04</version>
+ </parent>
+
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-perftest-plugin</artifactId>
+ <packaging>jar</packaging>
+
+ <name>RHQ Performance Test Plugin</name>
+ <description>a plugin for performance testing</description>
+
+ <scm>
+ <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/plugins/perftest</connection>
+ <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/plugins/perftest</developerConnection>
+ </scm>
+
+ <properties>
+ <scm.module.path>modules/plugins/perftest/</scm.module.path>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.sun.tools.xjc.maven2</groupId>
+ <artifactId>maven-jaxb-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <generatePackage>org.rhq.plugins.perftest.scenario</generatePackage>
+ <generateDirectory>${basedir}/target/generated-sources/xjc</generateDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0</version>
+ <executions>
+ <execution>
+ <id>copy-jaxb-deps</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>${maven.test.skip}</skip>
+ <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ <argLine>-Djava.library.path=${basedir}/target/itest/lib</argLine>
+ <!--
+ <argLine>-Djava.library.path=${basedir}/target/itest/lib -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine>
+ -->
+
+ <systemProperties>
+ <property>
+ <name>project.artifactId</name>
+ <value>${project.artifactId}</value>
+ </property>
+ <property>
+ <name>project.version</name>
+ <value>${project.version}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>java.net</id>
+ <name>java.net Maven Repository</name>
+ <url>http://download.java.net/maven/1/</url>
+ <layout>legacy</layout>
+ </pluginRepository>
+ </pluginRepositories>
+
+</project>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
new file mode 100644
index 0000000..204c00c
--- /dev/null
+++ b/modules/plugins/pom.xml
@@ -0,0 +1,205 @@
+<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">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-parent</artifactId>
+ <version>3.0.0.B04</version>
+ </parent>
+
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-plugins-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <name>RHQ Plugins</name>
+ <description>parent POM for all RHQ plugins</description>
+
+ <scm>
+ <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/plugins</connection>
+ <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/plugins</developerConnection>
+ </scm>
+
+ <properties>
+ <scm.module.path>modules/plugins/</scm.module.path>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>${rhq.groupId}</groupId>
+ <artifactId>rhq-core-domain</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope> <!-- by PC -->
+ </dependency>
+
+ <dependency>
+ <groupId>${rhq.groupId}</groupId>
+ <artifactId>rhq-core-plugin-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope> <!-- by PC -->
+ </dependency>
+
+ <dependency>
+ <groupId>${rhq.groupId}</groupId>
+ <artifactId>rhq-core-native-system</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope> <!-- by PC -->
+ </dependency>
+
+ <dependency>
+ <groupId>${rhq.groupId}</groupId>
+ <artifactId>rhq-core-plugin-container</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!--
+ TODO: This is a fix for the Javac bug requiring annotations to be available when compiling dependent classes.
+ It is fixed in JDK 6.
+ -->
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope> <!-- by RHQ container -->
+ </dependency>
+
+ <!--
+ TODO: This is a fix for the Javac bug requiring annotations to be available when compiling dependent classes;
+ it is fixed in JDK 6.
+ -->
+ <dependency>
+ <groupId>jboss.jboss-embeddable-ejb3</groupId>
+ <artifactId>hibernate-all</artifactId>
+ <version>1.0.0.Alpha9</version>
+ <scope>provided</scope> <!-- by RHQ container -->
+ </dependency>
+
+ </dependencies>
+
+ <!-- !!! -->
+ <!-- These profile groupings need to also be mirrored in server/ear/pom.xml -->
+ <!-- !!! -->
+
+ <modules>
+ <!-- core plugins -->
+ <module>platform</module>
+ <module>rhq-agent</module>
+ <module>jmx</module>
+ <module>nagios</module>
+ </modules>
+
+ <profiles>
+
+ <profile>
+ <id>jboss-plugins</id>
+ <activation>
+ <property>
+ <name>java.home</name>
+ </property>
+ </activation>
+
+ <modules>
+ <!-- NOTE: Order is important. -->
+ <module>augeas</module>
+ <module>apache</module>
+ <module>tomcat</module>
+ <module>jboss-as</module>
+ <module>hibernate</module>
+ <module>rhq-server</module>
+ <module>jboss-cache</module>
+ <module>jboss-as-5</module>
+ <module>jboss-cache-v3</module>
+ <!-- was not in Jopr build at merge time <module>jbossOSGi</module> -->
+ </modules>
+ </profile>
+
+ <profile>
+ <id>bundle-plugins</id>
+ <activation>
+ <property>
+ <name>java.home</name>
+ </property>
+ </activation>
+
+ <modules>
+ <module>filetemplate-bundle</module>
+ <module>ant-bundle</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>linux-plugins</id>
+ <activation>
+ <property>
+ <name>java.home</name>
+ </property>
+ </activation>
+
+ <modules>
+ <module>augeas</module>
+ <module>cron</module>
+ <module>script</module>
+ <module>grub</module>
+ <!-- not behaving <module>hardware</module> -->
+ <module>hosts</module>
+ <module>cobbler</module>
+ <module>sudoers</module>
+ <module>netservices</module>
+ <module>samba</module>
+ <module>postfix</module>
+ <module>aliases</module>
+ <module>sshd</module>
+ </modules>
+ </profile>
+
+
+ <profile>
+ <id>misc-plugins</id>
+ <activation>
+ <property>
+ <name>java.home</name>
+ </property>
+ </activation>
+
+ <modules>
+ <module>byteman</module>
+
+ <module>iis</module>
+ <module>database</module>
+ <module>postgres</module>
+ <module>hadoop</module>
+ <module>hudson</module>
+ <!-- error in code generation (see RHQ-1225) <module>jira</module> -->
+ <module>mysql</module>
+ <!-- non-public dependency <module>onewire</module> -->
+ <module>oracle</module>
+ <module>perftest</module>
+ <module>script2</module>
+ <module>snmptrapd</module>
+ <!--<module>twitter</module>-->
+ <module>virt</module>
+ <module>kickstart</module>
+
+ </modules>
+ </profile>
+
+ <profile>
+ <id>validate-plugins</id>
+ <activation>
+ <property>
+ <name>java.home</name>
+ </property>
+ </activation>
+
+ <modules>
+ <!-- make this the last - it will validate all the plugins -->
+ <module>validate-all-plugins</module>
+ </modules>
+ </profile>
+
+ </profiles>
+
+</project>
+
13 years, 10 months
[rhq] Branch 'release-3.0.0' - modules/plugins
by Heiko W. Rupp
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelComponent.java | 64 ++++
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelDiscovery.java | 143 ++++++++++
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoComponent.java | 64 ----
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoDiscovery.java | 143 ----------
modules/plugins/jboss-cache/src/main/resources/META-INF/rhq-plugin.xml | 106 +++----
5 files changed, 260 insertions(+), 260 deletions(-)
New commits:
commit f0b6101bf98bac9c3a64a625ba84692770bdb7e0
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Jul 22 11:41:45 2010 +0200
BZ 617131 - roll back the 'channel' -> 'repo' renaming introduced in 29a4fadac497136b7a6360eed0821984baf35c55
diff --git a/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelComponent.java b/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelComponent.java
new file mode 100644
index 0000000..4bf06a9
--- /dev/null
+++ b/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelComponent.java
@@ -0,0 +1,64 @@
+/*
+ * Jopr Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.plugins.jbosscache;
+
+import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.pluginapi.inventory.ResourceComponent;
+import org.rhq.core.pluginapi.inventory.ResourceContext;
+
+/**
+ * Resource component that deals with JGroups channels
+ *
+ * @author Heiko W. Rupp
+ */
+public class JGroupsChannelComponent implements ResourceComponent<JBossCacheComponent> {
+
+ ResourceContext<JBossCacheComponent> context;
+
+ /**
+ * This one does not (yet) have an availability of its own, but just follows the
+ * JBossCache instance it is associated with.
+ * @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability()
+ */
+ public AvailabilityType getAvailability() {
+ return context.getParentResourceComponent().getAvailability();
+ }
+
+ /* (non-Javadoc)
+ * @see org.rhq.core.pluginapi.inventory.ResourceComponent#start(org.rhq.core.pluginapi.inventory.ResourceContext)
+ */
+ public void start(ResourceContext<JBossCacheComponent> context) throws Exception {
+ // TODO Auto-generated method stub
+ this.context = context;
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.rhq.core.pluginapi.inventory.ResourceComponent#stop()
+ */
+ public void stop() {
+ // TODO Auto-generated method stub
+
+ }
+
+}
diff --git a/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelDiscovery.java b/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelDiscovery.java
new file mode 100644
index 0000000..ccfb985
--- /dev/null
+++ b/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelDiscovery.java
@@ -0,0 +1,143 @@
+/*
+ * Jopr Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.plugins.jbosscache;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jdom.JDOMException;
+import org.jdom.input.SAXBuilder;
+import org.mc4j.ems.connection.EmsConnection;
+
+import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+import org.rhq.plugins.jbossas.util.DeploymentUtility;
+
+/**
+ * This component will discover JGroups channels within a JBoss Cache instance.
+ * The deal here is that we want to have zero or one JGroups channels per cache.
+ * We will look at the Cache config and see if it contains a
+ * <attribute name="ClusterConfig"> element. If so, we return a JGroups instance,
+ * else we return nothing.
+ *
+ * @author Heiko W. Rupp
+ */
+public class JGroupsChannelDiscovery implements ResourceDiscoveryComponent {
+
+ private final Log log = LogFactory.getLog(JGroupsChannelDiscovery.class);
+
+ /* (non-Javadoc)
+ * @see org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent#discoverResources(org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext)
+ */
+ public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext context)
+ throws InvalidPluginConfigurationException, Exception {
+
+ JBossCacheComponent parent = (JBossCacheComponent) context.getParentResourceComponent();
+ EmsConnection emsConnection = parent.getEmsConnection();
+ String resKey = context.getParentResourceContext().getResourceKey();
+ File file = DeploymentUtility.getDescriptorFile(emsConnection, resKey);
+ if (file == null) {
+ log.warn("File is null for " + resKey);
+ return null;
+ }
+
+ boolean found = false;
+ try {
+ SAXBuilder builder = new SAXBuilder();
+ Document doc = builder.build(file);
+
+ // Get the root element
+ Element root = doc.getRootElement();
+
+ // XPath xpath = XPathFactory.newInstance().newXPath();
+ // TODO this expression would need to work against non-normalized versions of the name attribute
+ // XPathExpression xp = xpath
+ // .compile("/server/mbean[@name='" + resKey + "']/attribute[@name='ClusterConfig']");
+ // InputSource inputSource = new InputSource(new FileInputStream(file));
+ // NodeList cconfig = (NodeList) xp.evaluate(inputSource, XPathConstants.NODESET);
+ // if (cconfig != null && cconfig.getLength() > 0)
+ // found = true;
+
+ // First look for the right mbean of *our* cache - the file may contain more than one
+
+ // TODO move code in helper, as we'll need it later again
+ // TODO replace the access of 'our' ClusterConfig attribute with an XPath expression
+ for (Object mbeanObj : root.getChildren("mbean")) {
+ if (mbeanObj instanceof Element) {
+ Element mbean = (Element) mbeanObj;
+ String nameAttrib = mbean.getAttributeValue("name");
+ try {
+ ObjectName on = new ObjectName(nameAttrib);
+ nameAttrib = on.getCanonicalName();
+ } catch (MalformedObjectNameException e) {
+ log.warn("Can't canonicalize " + nameAttrib);
+ }
+ if (nameAttrib.equals(resKey)) {
+ // our cache instance, look for the right attribute
+ List children = mbean.getChildren("attribute");
+ for (Object childObj : children) {
+ if (childObj instanceof Element) {
+ Element child = (Element) childObj;
+ String name = child.getAttributeValue("name");
+ if (name.equals("ClusterConfig"))
+ found = true;
+ }
+ }
+ }
+ }
+ }
+ } catch (IOException e) {
+ log.error("IO error occurred while reading file: " + file, e);
+ } catch (JDOMException e) {
+ log.error("Parsing error occurred while reading file: " + file, e);
+ }
+
+ if (found) {
+ DiscoveredResourceDetails detail = new DiscoveredResourceDetails(context.getResourceType(), // Resource Type
+ resKey + "jgroupsChannel", // ResourceKey TODO good choice ?
+ "JGroups channel", // resource name
+ null, // Version
+ "JGroups config for parent JBossCache", // description
+ context.getDefaultPluginConfiguration(), // config
+ null); // process info
+ Set<DiscoveredResourceDetails> res = new HashSet<DiscoveredResourceDetails>(1);
+ res.add(detail);
+ return res;
+ }
+
+ return null;
+ }
+
+}
diff --git a/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoComponent.java b/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoComponent.java
deleted file mode 100644
index 85375ac..0000000
--- a/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoComponent.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Jopr Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.rhq.plugins.jbosscache;
-
-import org.rhq.core.domain.measurement.AvailabilityType;
-import org.rhq.core.pluginapi.inventory.ResourceComponent;
-import org.rhq.core.pluginapi.inventory.ResourceContext;
-
-/**
- * Resource component that deals with JGroups repos
- *
- * @author Heiko W. Rupp
- */
-public class JGroupsRepoComponent implements ResourceComponent<JBossCacheComponent> {
-
- ResourceContext<JBossCacheComponent> context;
-
- /**
- * This one does not (yet) have an availability of its own, but just follows the
- * JBossCache instance it is associated with.
- * @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability()
- */
- public AvailabilityType getAvailability() {
- return context.getParentResourceComponent().getAvailability();
- }
-
- /* (non-Javadoc)
- * @see org.rhq.core.pluginapi.inventory.ResourceComponent#start(org.rhq.core.pluginapi.inventory.ResourceContext)
- */
- public void start(ResourceContext<JBossCacheComponent> context) throws Exception {
- // TODO Auto-generated method stub
- this.context = context;
-
- }
-
- /* (non-Javadoc)
- * @see org.rhq.core.pluginapi.inventory.ResourceComponent#stop()
- */
- public void stop() {
- // TODO Auto-generated method stub
-
- }
-
-}
diff --git a/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoDiscovery.java b/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoDiscovery.java
deleted file mode 100644
index 3436aa1..0000000
--- a/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoDiscovery.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Jopr Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.rhq.plugins.jbosscache;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
-import org.mc4j.ems.connection.EmsConnection;
-
-import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
-import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
-import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
-import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
-import org.rhq.plugins.jbossas.util.DeploymentUtility;
-
-/**
- * This component will discover JGroups repos within a JBoss Cache instance.
- * The deal here is that we want to have zero or one JGroups repos per cache.
- * We will look at the Cache config and see if it contains a
- * <attribute name="ClusterConfig"> element. If so, we return a JGroups instance,
- * else we return nothing.
- *
- * @author Heiko W. Rupp
- */
-public class JGroupsRepoDiscovery implements ResourceDiscoveryComponent {
-
- private final Log log = LogFactory.getLog(JGroupsRepoDiscovery.class);
-
- /* (non-Javadoc)
- * @see org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent#discoverResources(org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext)
- */
- public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext context)
- throws InvalidPluginConfigurationException, Exception {
-
- JBossCacheComponent parent = (JBossCacheComponent) context.getParentResourceComponent();
- EmsConnection emsConnection = parent.getEmsConnection();
- String resKey = context.getParentResourceContext().getResourceKey();
- File file = DeploymentUtility.getDescriptorFile(emsConnection, resKey);
- if (file == null) {
- log.warn("File is null for " + resKey);
- return null;
- }
-
- boolean found = false;
- try {
- SAXBuilder builder = new SAXBuilder();
- Document doc = builder.build(file);
-
- // Get the root element
- Element root = doc.getRootElement();
-
- // XPath xpath = XPathFactory.newInstance().newXPath();
- // TODO this expression would need to work against non-normalized versions of the name attribute
- // XPathExpression xp = xpath
- // .compile("/server/mbean[@name='" + resKey + "']/attribute[@name='ClusterConfig']");
- // InputSource inputSource = new InputSource(new FileInputStream(file));
- // NodeList cconfig = (NodeList) xp.evaluate(inputSource, XPathConstants.NODESET);
- // if (cconfig != null && cconfig.getLength() > 0)
- // found = true;
-
- // First look for the right mbean of *our* cache - the file may contain more than one
-
- // TODO move code in helper, as we'll need it later again
- // TODO replace the access of 'our' ClusterConfig attribute with an XPath expression
- for (Object mbeanObj : root.getChildren("mbean")) {
- if (mbeanObj instanceof Element) {
- Element mbean = (Element) mbeanObj;
- String nameAttrib = mbean.getAttributeValue("name");
- try {
- ObjectName on = new ObjectName(nameAttrib);
- nameAttrib = on.getCanonicalName();
- } catch (MalformedObjectNameException e) {
- log.warn("Can't canonicalize " + nameAttrib);
- }
- if (nameAttrib.equals(resKey)) {
- // our cache instance, look for the right attribute
- List children = mbean.getChildren("attribute");
- for (Object childObj : children) {
- if (childObj instanceof Element) {
- Element child = (Element) childObj;
- String name = child.getAttributeValue("name");
- if (name.equals("ClusterConfig"))
- found = true;
- }
- }
- }
- }
- }
- } catch (IOException e) {
- log.error("IO error occurred while reading file: " + file, e);
- } catch (JDOMException e) {
- log.error("Parsing error occurred while reading file: " + file, e);
- }
-
- if (found) {
- DiscoveredResourceDetails detail = new DiscoveredResourceDetails(context.getResourceType(), // Resource Type
- resKey + "jgroupsRepo", // ResourceKey TODO good choice ?
- "JGroups repo", // resource name
- null, // Version
- "JGroups config for parent JBossCache", // description
- context.getDefaultPluginConfiguration(), // config
- null); // process info
- Set<DiscoveredResourceDetails> res = new HashSet<DiscoveredResourceDetails>(1);
- res.add(detail);
- return res;
- }
-
- return null;
- }
-
-}
diff --git a/modules/plugins/jboss-cache/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-cache/src/main/resources/META-INF/rhq-plugin.xml
index fe28e78..2ef0f4f 100644
--- a/modules/plugins/jboss-cache/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-cache/src/main/resources/META-INF/rhq-plugin.xml
@@ -16,8 +16,8 @@
discovery="JBossCacheSubsystemDiscovery"
description="The JBoss Cache instances on this server"
singleton="true"
- >
-
+ >
+
<runs-inside>
<parent-resource-type name="JBossAS Server" plugin="JBossAS"/>
</runs-inside>
@@ -28,28 +28,28 @@
description="Statistics for JBossCache"
createDeletePolicy="create-only"
>
-
+
<plugin-configuration>
<c:simple-property name="objectName" readOnly="true" default="*:cache-interceptor=CacheMgmtInterceptor,*|*:treecache-interceptor=CacheMgmtInterceptor,*"/>
<c:simple-property name="isTreeCache" readOnly="true" type="boolean" default="false" description="Is this a TreeCache instance or a POJO Cache"/>
</plugin-configuration>
-
+
<operation name="resetStatistics" displayName="Reset Statistics" description="Resets all statistics" />
<operation name="listAssociatedMBeans" displayName="List associated MBeans" description="List all MBeans that form this Cache instance">
<results><c:simple-property name="mbeans"></c:simple-property></results>
</operation>
-
+
<metric property=":numberOfNodes" displayName="Number of Nodes" displayType="summary" />
-
- <metric property="ActivationInterceptor:activations" displayName="Activations"
+
+ <metric property="ActivationInterceptor:activations" displayName="Activations"
description="Number of passivated nodes that have been activated."/>
-
- <metric property="CacheLoaderInterceptor:cacheLoaderLoads" displayName="Cache Loader Loads"
+
+ <metric property="CacheLoaderInterceptor:cacheLoaderLoads" displayName="Cache Loader Loads"
measurementType="trendsup" description="Number of nodes loaded through a cache loader."/>
<metric property="CacheLoaderInterceptor:cacheLoaderMisses" displayName="Cache Loader Misses"
measurementType="trendsup" description="Number of unsuccessful attempts to load a node through a cache loader."/>
-
- <metric property="CacheMgmtInterceptor:hits" displayName="Cache Hits" category="performance"
+
+ <metric property="CacheMgmtInterceptor:hits" displayName="Cache Hits" category="performance"
measurementType="trendsup" description="Number of successful attribute retrievals."/>
<metric property="CacheMgmtInterceptor:misses" displayName="Cache Misses" category="performance"
measurementType="trendsup" description="Number of unsuccessful attribute retrievals."/>
@@ -57,44 +57,44 @@
description="Ratio of hits to hits and misses. A hit is a get attribute operation that results in an object being returned to the client. The retrieval may be from a cache loader if the entry isn't in the local cache."/>
<metric property="CacheMgmtInterceptor:readWriteRatio" displayName="Read-write-ratio" displayType="summary"
description="Ratio of read operations to write operations. This is the ratio of cache hits and misses to cache stores."/>
- <metric property="CacheMgmtInterceptor:stores" displayName="Cache Stores" category="performance"
+ <metric property="CacheMgmtInterceptor:stores" displayName="Cache Stores" category="performance"
measurementType="trendsup" description="Number of attribute store operations."/>
- <metric property="CacheMgmtInterceptor:evictions" displayName="Cache Evictions" category="performance"
+ <metric property="CacheMgmtInterceptor:evictions" displayName="Cache Evictions" category="performance"
measurementType="trendsup" description="Number of node evictions."/>
- <metric property="CacheMgmtInterceptor:numberOfAttributes" displayName="Number of Attributes"
+ <metric property="CacheMgmtInterceptor:numberOfAttributes" displayName="Number of Attributes"
category="performance" description="Number of attributes currently cached." />
- <metric property="CacheMgmtInterceptor:numberOfNodes" displayName="Number of Nodes cached"
+ <metric property="CacheMgmtInterceptor:numberOfNodes" displayName="Number of Nodes cached"
category="performance" description="Number of nodes currently cached."/>
- <metric property="CacheMgmtInterceptor:elapsedTime" displayName="Elapsed Time" category="utilization"
- measurementType="trendsup" description="Number of seconds that the cache has been running."
+ <metric property="CacheMgmtInterceptor:elapsedTime" displayName="Elapsed Time" category="utilization"
+ measurementType="trendsup" description="Number of seconds that the cache has been running."
units="seconds"/>
- <metric property="CacheMgmtInterceptor:timeSinceReset" displayName="Time since reset" category="utilization"
- measurementType="trendsup" description="Number of seconds since the cache statistics have been reset."
+ <metric property="CacheMgmtInterceptor:timeSinceReset" displayName="Time since reset" category="utilization"
+ measurementType="trendsup" description="Number of seconds since the cache statistics have been reset."
units="seconds"/>
- <metric property="CacheMgmtInterceptor:averageReadTime" displayName="Average Read Time" category="performance"
- description="Average time in milliseconds to retrieve a cache attribute, including unsuccessful attribute retrievals."
+ <metric property="CacheMgmtInterceptor:averageReadTime" displayName="Average Read Time" category="performance"
+ description="Average time in milliseconds to retrieve a cache attribute, including unsuccessful attribute retrievals."
units="milliseconds"/>
- <metric property="CacheMgmtInterceptor:averageWriteTime" displayName="Average Write Time"
- category="performance" description="Average time in milliseconds to write a cache attribute."
+ <metric property="CacheMgmtInterceptor:averageWriteTime" displayName="Average Write Time"
+ category="performance" description="Average time in milliseconds to write a cache attribute."
units="milliseconds"/>
-
- <metric property="CacheStoreInterceptor:cacheLoaderStores" displayName="Cache Loader Stores"
+
+ <metric property="CacheStoreInterceptor:cacheLoaderStores" displayName="Cache Loader Stores"
category="utilization" description="Number of nodes written to the cache loader." measurementType="trendsup" />
-
- <metric property="InvalidationInterceptor:invalidations" displayName="Invalidataions"
- category="utilization" description="Number of cached nodes that have been invalidated."
+
+ <metric property="InvalidationInterceptor:invalidations" displayName="Invalidataions"
+ category="utilization" description="Number of cached nodes that have been invalidated."
measurementType="trendsup" />
-
- <metric property="PassivationInterceptor:passivations" displayName="Passivations" category="utilization"
+
+ <metric property="PassivationInterceptor:passivations" displayName="Passivations" category="utilization"
description="Number of cached nodes that have been passivated." measurementType="trendsup"/>
-
- <metric property="TxInterceptor:prepares" displayName="Tx prepares"
- description="Number of transaction prepare operations performed." measurementType="trendsup" />
- <metric property="TxInterceptor:commits" displayName="Tx commits"
- description="Number of transaction commit operations performed." measurementType="trendsup" />
- <metric property="TxInterceptor:rollbacks" displayName="Tx rollbacks"
- description="Number of transaction rollback operations performed." measurementType="trendsup" />
-
+
+ <metric property="TxInterceptor:prepares" displayName="Tx prepares"
+ description="Number of transaction prepare operations performed." measurementType="trendsup" />
+ <metric property="TxInterceptor:commits" displayName="Tx commits"
+ description="Number of transaction commit operations performed." measurementType="trendsup" />
+ <metric property="TxInterceptor:rollbacks" displayName="Tx rollbacks"
+ description="Number of transaction rollback operations performed." measurementType="trendsup" />
+
<resource-configuration>
<c:simple-property name="Flavour" default="treecache"
description="Is this going to be a Pojo Cache or a Tree Cache">
@@ -103,7 +103,7 @@
<c:option name="Tree Cache" value="treecache" default="true"/>
</c:property-options>
</c:simple-property>
- <c:simple-property name="TransactionManagerLookupClass"
+ <c:simple-property name="TransactionManagerLookupClass"
default="org.jboss.cache.JBossTransactionManagerLookup"
description="What class should be used to get a transaction manager instance"/>
<c:simple-property name="IsolationLevel" default="REPEATABLE_READ"
@@ -132,39 +132,39 @@
<c:simple-property name="UseReplQueue" type="boolean" default="false"
description="Just used for async repl: use a replication queue "/>
<c:simple-property name="ReplQueueInterval" type="integer" default="100"
- description="Replication interval for replication queue (in ms) "/>
+ description="Replication interval for replication queue (in ms) "/>
<c:simple-property name="ReplQueueMaxElements" type="integer" default="10"
description="Max number of elements which trigger replication" />
<c:simple-property name="ClusterName" default="DefaultPartition"
description="Name of cluster. Needs to be the same for all clusters, in order to find each other"/>
-
- <c:simple-property name="FetchStateOnStartup" type="boolean" default="true"
+
+ <c:simple-property name="FetchStateOnStartup" type="boolean" default="true"
description="Whether or not to fetch state on joining a cluster"/>
- <c:simple-property name="InitialStateRetrievalTimeout" type="long"
+ <c:simple-property name="InitialStateRetrievalTimeout" type="long"
description=" The max amount of time (in milliseconds) we wait until the
initial state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment" default="5000"/>
+ existing members in a clustered environment" default="5000"/>
<c:simple-property name="SyncReplTimeout" type="long" default="15000"
description="Number of milliseconds to wait until all responses for a
synchronous call have been received."/>
<c:simple-property name="LockAcquisitionTimeout" type="long" default="10000"
description="Max number of milliseconds to wait for a lock acquisition."/>
-
+
</resource-configuration>
<help>
<![CDATA[
- <p>Please note that the number of possible metrics varies depending on the configuration and flavour of
+ <p>Please note that the number of possible metrics varies depending on the configuration and flavour of
Cache used.</p>
]]>
</help>
-
- <service name="JGroupsRepo"
- description="The underlying JGroups repo for this cache instance"
- class="JGroupsRepoComponent"
- discovery="JGroupsRepoDiscovery">
+
+ <service name="JGroupsChannel"
+ description="The underlying JGroups channel for this cache instance"
+ class="JGroupsChannelComponent"
+ discovery="JGroupsChannelDiscovery">
</service>
</service>
-
+
</server>
-
+
</plugin>
\ No newline at end of file
13 years, 10 months
[rhq] 2 commits - modules/core modules/enterprise
by Joseph Marques
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java | 8
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java | 109 +++++++---
2 files changed, 90 insertions(+), 27 deletions(-)
New commits:
commit 22aba8e0ae4db5d976807ceaa1e051f0a9e92771
Author: Joseph Marques <joseph(a)redhat.com>
Date: Thu Jul 22 01:23:35 2010 -0400
add the ability to sort the ResourceGroupCriteria object by plugin name
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java
index 67a66a9..7544422 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java
@@ -67,6 +67,7 @@ public class ResourceGroupCriteria extends TaggedCriteria {
private PageOrdering sortName;
private PageOrdering sortResourceTypeName; // requires overrides
+ private PageOrdering sortPluginName; // requires overrides
public ResourceGroupCriteria() {
filterOverrides.put("resourceTypeId", "resourceType.id = ?");
@@ -110,7 +111,7 @@ public class ResourceGroupCriteria extends TaggedCriteria {
filterOverrides.put("groupDefinitionId", "groupDefinition.id = ?");
sortOverrides.put("resourceTypeName", "resourceType.name");
-
+ sortOverrides.put("pluginName", "resourceType.plugin");
}
@Override
@@ -238,6 +239,11 @@ public class ResourceGroupCriteria extends TaggedCriteria {
this.sortResourceTypeName = sortResourceTypeName;
}
+ public void addSortPluginName(PageOrdering sortPluginName) {
+ addSortField("pluginName");
+ this.sortPluginName = sortPluginName;
+ }
+
/** subclasses should override as necessary */
@Override
public boolean isSecurityManagerRequired() {
commit 26c62395c00fd7917693a3a103298428f2f1c86e
Author: Joseph Marques <joseph(a)redhat.com>
Date: Thu Jul 22 01:23:18 2010 -0400
BZ-616634: support criteria-based sorting by nullable path expressions
* for each ordering token, decide whether it's a path expression
* if it is, determine if it has at least 3 parts (criteriaAlias + path + leaf)
* if it does, add left join for part that precedes the leaf, and generate an alias for this path
** only add the join clause if it doesn't already exist in the generated query
* finally, add the order by clause, with the generated path aliases as necessary
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
index 6c43b46..3216ec7 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
@@ -42,6 +42,7 @@ import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.criteria.AlertCriteria;
import org.rhq.core.domain.criteria.Criteria;
import org.rhq.core.domain.criteria.ResourceCriteria;
+import org.rhq.core.domain.criteria.ResourceGroupCriteria;
import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria;
import org.rhq.core.domain.criteria.SubjectCriteria;
import org.rhq.core.domain.operation.OperationRequestStatus;
@@ -321,6 +322,58 @@ public final class CriteriaQueryGenerator {
results.append(authorizationJoinFragment);
}
+ // figure out the 'LEFT JOIN's needed for 'ORDER BY' tokens
+ PageControl pc = getPageControl(criteria);
+ List<String> orderingFieldRequiredJoins = new ArrayList<String>();
+ List<String> orderingFieldTokens = new ArrayList<String>();
+
+ for (OrderingField orderingField : pc.getOrderingFields()) {
+ PageOrdering ordering = orderingField.getOrdering();
+ String fieldName = orderingField.getField();
+ String override = criteria.getJPQLSortOverride(fieldName);
+ String suffix = (override == null) ? fieldName : override;
+
+ /*
+ * do not prefix the alias when:
+ *
+ * 1) if the suffix is numerical, which allows usto sort by column ordinal
+ * 2) if the user wants full control and has explicitly chosen to disable alias prepending
+ */
+ boolean doNotPrefixAlias = isNumber(suffix) || criteria.hasCustomizedSorting();
+ String sortFragment = doNotPrefixAlias ? suffix : (alias + "." + suffix);
+
+ int lastDelimiterIndex = sortFragment.lastIndexOf('.');
+ if (lastDelimiterIndex == -1) {
+ // does not require joins, just add the ordering field token directly
+ orderingFieldTokens.add(sortFragment + " " + ordering);
+ continue;
+ }
+
+ int firstDelimiterIndex = sortFragment.indexOf('.');
+ if (firstDelimiterIndex == lastDelimiterIndex) {
+ // only one dot implies its a property/field directly off of the primary alias
+ // thus, also does not require joins, just add the ordering field token directly
+ orderingFieldTokens.add(sortFragment + " " + ordering);
+ continue;
+ }
+
+ String expressionRoot = sortFragment.substring(0, lastDelimiterIndex);
+ String expressionLeaf = sortFragment.substring(lastDelimiterIndex + 1);
+ int expressionRootIndex = orderingFieldRequiredJoins.indexOf(expressionRoot);
+
+ String joinAlias = null;
+ if (expressionRootIndex == -1) {
+ // new join
+ joinAlias = "orderingField" + orderingFieldRequiredJoins.size();
+ orderingFieldRequiredJoins.add(expressionRoot);
+ results.append("LEFT JOIN ").append(expressionRoot).append(" ").append(joinAlias).append(NL);
+ } else {
+ joinAlias = "orderingField" + expressionRootIndex;
+ }
+
+ orderingFieldTokens.add(joinAlias + "." + expressionLeaf + " " + ordering);
+ }
+
Map<String, Object> filterFields = getFilterFields(criteria);
if (filterFields.size() > 0 || authorizationJoinFragment != null || searchExpressionWhereClause != null) {
results.append("WHERE ");
@@ -410,36 +463,19 @@ public final class CriteriaQueryGenerator {
results.append(NL).append("HAVING ").append(havingClause);
}
- // order by clause
- PageControl pc = getPageControl(criteria);
-
+ // ordering clause
boolean first = true;
- for (OrderingField orderingField : pc.getOrderingFields()) {
+ for (String next : orderingFieldTokens) {
if (first) {
results.append(NL).append("ORDER BY ");
first = false;
} else {
results.append(", ");
}
-
- String fieldName = orderingField.getField();
- String override = criteria.getJPQLSortOverride(fieldName);
- String suffix = (override == null) ? fieldName : override;
-
- /*
- * do not prefix the alias when:
- *
- * 1) if the suffix is numerical, which allows usto sort by column ordinal
- * 2) if the user wants full control and has explicitly chosen to disable alias prepending
- */
- boolean doNotPrefixAlias = isNumber(suffix) || criteria.hasCustomizedSorting();
- String sortFragment = doNotPrefixAlias ? suffix : (alias + "." + suffix);
-
- PageOrdering ordering = orderingField.getOrdering();
-
- results.append(sortFragment).append(' ').append(ordering);
+ results.append(next);
}
}
+
results.append(NL);
LOG.debug(results);
@@ -532,8 +568,8 @@ public final class CriteriaQueryGenerator {
try {
Class<?> entityClass = criteria.getPersistentClass();
- SearchTranslationManager searchManager = new SearchTranslationManager(subject, SearchSubsystem
- .get(entityClass));
+ SearchTranslationManager searchManager = new SearchTranslationManager(subject,
+ SearchSubsystem.get(entityClass));
searchManager.setExpression(searchExpression);
// translate first, if there was an error we won't add the dangling 'AND' to the where clause
@@ -696,7 +732,8 @@ public final class CriteriaQueryGenerator {
//testSubjectCriteria();
//testAlertCriteria();
//testInheritanceCriteria();
- testResourceCriteria();
+ //testResourceCriteria();
+ testResourceGroupCriteria();
}
public static void testSubjectCriteria() {
@@ -747,6 +784,26 @@ public final class CriteriaQueryGenerator {
System.out.println(generator.getQueryString(true));
}
+ public static void testResourceGroupCriteria() {
+ ResourceGroupCriteria groupCriteria = new ResourceGroupCriteria();
+ groupCriteria.addSortName(PageOrdering.DESC);
+ groupCriteria.addSortResourceTypeName(PageOrdering.ASC);
+ groupCriteria.addSortPluginName(PageOrdering.DESC);
+
+ CriteriaQueryGenerator generator = new CriteriaQueryGenerator(new Subject(), groupCriteria);
+ System.out.println(generator.getQueryString(false));
+ System.out.println(generator.getQueryString(true));
+
+ PageControl customPC = new PageControl();
+ customPC.addDefaultOrderingField("0", PageOrdering.DESC);
+ customPC.addDefaultOrderingField("name", PageOrdering.DESC);
+ customPC.addDefaultOrderingField("resourceType.name", PageOrdering.ASC);
+ groupCriteria.setPageControl(customPC);
+
+ System.out.println(generator.getQueryString(false));
+ System.out.println(generator.getQueryString(true));
+ }
+
public static void testResourceCriteria() {
ResourceCriteria resourceCriteria = new ResourceCriteria();
resourceCriteria.addFilterResourceCategory(ResourceCategory.SERVER);
@@ -758,8 +815,8 @@ public final class CriteriaQueryGenerator {
Subject overlord = LookupUtil.getSubjectManager().getOverlord();
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(overlord, resourceCriteria);
- generator.getQueryString(false);
- generator.getQueryString(true);
+ System.out.println(generator.getQueryString(false));
+ System.out.println(generator.getQueryString(true));
}
public static PageControl getPageControl(Criteria criteria) {
13 years, 10 months
[rhq] Branch 'release-3.0.0-test-build' - modules/common modules/core modules/enterprise modules/helpers modules/plugins modules/pom.xml modules/test-utils pom.xml
by ips
modules/common/ant-bundle/pom.xml | 2 +-
modules/common/filetemplate-bundle/pom.xml | 2 +-
modules/common/jboss-as/pom.xml | 2 +-
modules/common/pom.xml | 2 +-
modules/core/client-api/pom.xml | 2 +-
modules/core/comm-api/pom.xml | 2 +-
modules/core/dbutils/pom.xml | 2 +-
modules/core/domain/pom.xml | 2 +-
modules/core/gui/pom.xml | 2 +-
modules/core/native-system/pom.xml | 2 +-
modules/core/plugin-api/pom.xml | 2 +-
modules/core/plugin-container/pom.xml | 2 +-
modules/core/plugin-validator/pom.xml | 2 +-
modules/core/plugindoc/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/core/util/pom.xml | 2 +-
modules/enterprise/agent/pom.xml | 2 +-
modules/enterprise/agentupdate/pom.xml | 2 +-
modules/enterprise/comm/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-war/pom.xml | 2 +-
modules/enterprise/gui/content_http-war/pom.xml | 2 +-
modules/enterprise/gui/coregui/pom.xml | 2 +-
modules/enterprise/gui/installer-war/pom.xml | 2 +-
modules/enterprise/gui/pom.xml | 2 +-
modules/enterprise/gui/portal-war/pom.xml | 2 +-
modules/enterprise/gui/webdav-war/pom.xml | 2 +-
modules/enterprise/pom.xml | 2 +-
modules/enterprise/remoting/cli/pom.xml | 2 +-
modules/enterprise/remoting/client-api/pom.xml | 2 +-
modules/enterprise/remoting/pom.xml | 2 +-
modules/enterprise/remoting/webservices/pom.xml | 2 +-
modules/enterprise/server/container-lib/pom.xml | 2 +-
modules/enterprise/server/container/pom.xml | 2 +-
modules/enterprise/server/ear/pom.xml | 2 +-
modules/enterprise/server/jar/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-email/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-irc/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-microblog/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-operations/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-roles/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-snmp/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-subject/pom.xml | 2 +-
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/cobbler/pom.xml | 2 +-
modules/enterprise/server/plugins/disk/pom.xml | 2 +-
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 +-
modules/enterprise/server/plugins/pom.xml | 2 +-
modules/enterprise/server/plugins/rhnhosted/pom.xml | 2 +-
modules/enterprise/server/plugins/url/pom.xml | 2 +-
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +-
modules/enterprise/server/plugins/yum/pom.xml | 2 +-
modules/enterprise/server/safe-invoker/pom.xml | 2 +-
modules/enterprise/server/sars/agent-sar/pom.xml | 2 +-
modules/enterprise/server/sars/pom.xml | 2 +-
modules/enterprise/server/xml-schemas/pom.xml | 2 +-
modules/helpers/pluginAnnotations/pom.xml | 2 +-
modules/helpers/pluginGen/pom.xml | 2 +-
modules/helpers/pom.xml | 2 +-
modules/helpers/rtfilter/pom.xml | 2 +-
modules/plugins/aliases/pom.xml | 2 +-
modules/plugins/ant-bundle/pom.xml | 2 +-
modules/plugins/apache/pom.xml | 2 +-
modules/plugins/augeas/pom.xml | 2 +-
modules/plugins/cobbler/pom.xml | 2 +-
modules/plugins/cron/pom.xml | 2 +-
modules/plugins/database/pom.xml | 2 +-
modules/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/plugins/grub/pom.xml | 2 +-
modules/plugins/hibernate/pom.xml | 2 +-
modules/plugins/hosts/pom.xml | 2 +-
modules/plugins/hudson/pom.xml | 2 +-
modules/plugins/iis/pom.xml | 2 +-
modules/plugins/jboss-as-5/pom.xml | 2 +-
modules/plugins/jboss-as/pom.xml | 2 +-
modules/plugins/jboss-cache-v3/pom.xml | 2 +-
modules/plugins/jboss-cache/pom.xml | 2 +-
modules/plugins/jmx/pom.xml | 2 +-
modules/plugins/mysql/pom.xml | 2 +-
modules/plugins/netservices/pom.xml | 2 +-
modules/plugins/oracle/pom.xml | 2 +-
modules/plugins/perftest/pom.xml | 2 +-
modules/plugins/platform/pom.xml | 2 +-
modules/plugins/pom.xml | 2 +-
modules/plugins/postfix/pom.xml | 2 +-
modules/plugins/postgres/pom.xml | 2 +-
modules/plugins/rhq-agent/pom.xml | 2 +-
modules/plugins/rhq-server/pom.xml | 2 +-
modules/plugins/samba/pom.xml | 2 +-
modules/plugins/script/pom.xml | 2 +-
modules/plugins/snmptrapd/pom.xml | 2 +-
modules/plugins/sshd/pom.xml | 2 +-
modules/plugins/sudoers/pom.xml | 2 +-
modules/plugins/tomcat/pom.xml | 2 +-
modules/plugins/twitter/pom.xml | 2 +-
modules/plugins/validate-all-plugins/pom.xml | 2 +-
modules/pom.xml | 2 +-
modules/test-utils/pom.xml | 2 +-
pom.xml | 2 +-
103 files changed, 103 insertions(+), 103 deletions(-)
New commits:
commit 9c23ce1cfb337aeb524c607285a0a08416a7422c
Author: hudson auto <wnstb(a)yahoo.com>
Date: Wed Jul 21 23:14:58 2010 -0400
[maven-release-plugin] prepare for next development iteration
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 6d440ef..eda9133 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index dbd8dd6..bc7965b 100644
--- a/modules/common/filetemplate-bundle/pom.xml
+++ b/modules/common/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index 1077987..2cf950b 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index 751726e..ee81a94 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index 78d1f23..d177f9e 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index f6fadb5..a51f92b 100644
--- a/modules/core/comm-api/pom.xml
+++ b/modules/core/comm-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 02c37b4..7ff6a10 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 96cbc8e..e0ced84 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index 0df3808..0911918 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index 558b9a2..d47d4c8 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index ba389df..e1ce7ef 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index a570e19..2e58102 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index c721f21..7739177 100644
--- a/modules/core/plugin-validator/pom.xml
+++ b/modules/core/plugin-validator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml
index 9e92634..eeb7e81 100644
--- a/modules/core/plugindoc/pom.xml
+++ b/modules/core/plugindoc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 47cb583..7aad64c 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index cee7efe..bc41dc5 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index f917e15..d9f1c1c 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index c569283..8942239 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index 88ef26e..8b9da9c 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index 6a09d32..611eb9d 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml
index 643d41e..798a8ca 100644
--- a/modules/enterprise/gui/base-perspective-war/pom.xml
+++ b/modules/enterprise/gui/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index 3068b31..df05645 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-gui-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index ae74c0a..acbe21f 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index e908b75..1beadca 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index f01ec85..0c529ba 100644
--- a/modules/enterprise/gui/pom.xml
+++ b/modules/enterprise/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index 1fd209d..a794cd6 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml
index bdef75c..aa880be 100644
--- a/modules/enterprise/gui/webdav-war/pom.xml
+++ b/modules/enterprise/gui/webdav-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index c3fc4fa..3b0dbb8 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index b1d1044..05187c7 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-remoting-cli</artifactId>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index 2188cb3..e86ef41 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-remoting-client-api</artifactId>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index 1feb631..910b617 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-remoting-parent</artifactId>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index a4d9ed6..2ea73ee 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-remoting-webservices</artifactId>
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index c2acfe1..2c98817 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index aee0070..3fd11e8 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 6956e3c..bf15866 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 0714f9d..79fdc38 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml
index b05532d..dd5bc18 100644
--- a/modules/enterprise/server/plugins/alert-email/pom.xml
+++ b/modules/enterprise/server/plugins/alert-email/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml
index 988e2e3..c0973f3 100644
--- a/modules/enterprise/server/plugins/alert-irc/pom.xml
+++ b/modules/enterprise/server/plugins/alert-irc/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml
index b9f3d0c..a62fee8 100644
--- a/modules/enterprise/server/plugins/alert-microblog/pom.xml
+++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
index 8a0c7c9..3193539 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
+++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index bf7fe01..e69bfbc 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index 466b99a..ca33bb7 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml
index b743122..af75153 100644
--- a/modules/enterprise/server/plugins/alert-snmp/pom.xml
+++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml
index 97c50f4..09839b8 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index 8abb60d..73f405e 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml
index ce9b430..4c44f10 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
index 86a21ef..0033d1b 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
index b83824c..61965f2 100644
--- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml
index b8bba65..7451668 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
index a53f3ad..0ac61d3 100644
--- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml
index ab30954..5a78451 100644
--- a/modules/enterprise/server/plugins/perspectives/core/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 8b6a170..2b16f4a 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml
index 9a96ab0..e4ab9b2 100644
--- a/modules/enterprise/server/plugins/rhnhosted/pom.xml
+++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index 3a96e6d..a6cba32 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
index 8bcdcea..9c7cc74 100644
--- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
+++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml
index 2dce331..ebdd3da 100644
--- a/modules/enterprise/server/plugins/yum/pom.xml
+++ b/modules/enterprise/server/plugins/yum/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml
index 3fd87f6..06c8981 100644
--- a/modules/enterprise/server/safe-invoker/pom.xml
+++ b/modules/enterprise/server/safe-invoker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index 7ecbbad..aa278b8 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index cadb656..0cc2084 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index 8df64c1..14738d0 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml
index 031c90d..d056f74 100644
--- a/modules/helpers/pluginAnnotations/pom.xml
+++ b/modules/helpers/pluginAnnotations/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml
index ba37942..28dc9b1 100644
--- a/modules/helpers/pluginGen/pom.xml
+++ b/modules/helpers/pluginGen/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index 762f318..a0721a9 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index e17c9d8..5d327ee 100644
--- a/modules/helpers/rtfilter/pom.xml
+++ b/modules/helpers/rtfilter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index 7006ed8..c37598e 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 851c129..cc160c9 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 90c725f..700a6af 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index a6f56dc..915106a 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index 1e8011a..d920440 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index 6ee0662..d5aaad5 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 7d98f84..30889f7 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index 05ac956..b79645d 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index 1c68b9b..f7cf265 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index 35fd599..acb08ef 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. -->
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index eddd3ed..7dd0fde 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index 5d79625..65fa7b8 100644
--- a/modules/plugins/hudson/pom.xml
+++ b/modules/plugins/hudson/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index 7e17c2b..853c020 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index ceb58be..a0ade77 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 54536d9..b9ed2b3 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index f276b7d..b3846fa 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index f1aa8f9..443e524 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index 6bc1bfa..ac9885a 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index e488d56..d0c9053 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 37d84af..06ae2ae 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 75a1aff..1acdb0f 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 4e78da5..39c75da 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index 87ba78d..97b83b0 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 4873dae..85d6105 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 1e95ca3..283ab6a 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index daf3133..5a4466c 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index b0c26a5..a190dcd 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index 98333bb..8f4e675 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index d0d0d63..0d41574 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index 7189f74..7719b14 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index fdb421d..2d9d715 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index 9c38247..3579496 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index 7932012..41df1b8 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index 03e2df8..205d5b0 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index cab4269..e299efa 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml
index 4f886fd..b3d5e87 100644
--- a/modules/plugins/validate-all-plugins/pom.xml
+++ b/modules/plugins/validate-all-plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index 9a28ce8..bc96ae3 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 07130df..2235687 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-modules-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>test-utils</artifactId>
<name>RHQ Test Utils</name>
diff --git a/pom.xml b/pom.xml
index a6cca85..7ff85bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA_QA</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RHQ</name>
13 years, 10 months