rhq-commits January 2011

rhq-commits@lists.fedorahosted.org

8 participants
141 discussions

[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 John Sanda 17 Jan '11

17 Jan '11

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 4cf7be04b320179ede274020d45b3c3ecb781dc6 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jan 17 11:01:17 2011 -0500 [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 6479a13..0833b2a 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>4.0.0.QA</version> + <version>4.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 59e5802..7f7127c 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>4.0.0.QA</version> + <version>4.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 45c4f50..d69311c 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index dec6fd5..c6a6dab 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>4.0.0.QA</version> + <version>4.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 b513ee5..ae391f8 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>4.0.0.QA</version> + <version>4.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 60d3e07..f52e92d 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index c16f709..7892321 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index bac6316..700912d 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index f8c262e..5293ae1 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>4.0.0.QA</version> + <version>4.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 9b3197e..b3a20e2 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>4.0.0.QA</version> + <version>4.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 90fba0e..d9c8d4c 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>4.0.0.QA</version> + <version>4.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 afd763d..bc886fe 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>4.0.0.QA</version> + <version>4.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 67d1da9..dfcdfde 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index b426bcb..5831bc4 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index e754b38..b895d04 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 6761e16..405eaed 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index e258e39..70d6f6e 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 605b27d..342369a 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index d851e50..93931da 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>4.0.0.QA</version> + <version>4.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 737fed8..172ba27 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>4.0.0.QA</version> + <version>4.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 cc6da1b..d3c0764 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>4.0.0.QA</version> + <version>4.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 f67485c..57a30b9 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>4.0.0.QA</version> + <version>4.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 17b8008..82cddb6 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>4.0.0.QA</version> + <version>4.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 53318ad..9a29f14 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 96820af..072ac8f 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>4.0.0.QA</version> + <version>4.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 70ba9e9..cd485f1 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>4.0.0.QA</version> + <version>4.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 eea48bd..095ada1 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index a7a0de3..89f283c 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>4.0.0.QA</version> + <version>4.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 2dd7010..5453a41 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>4.0.0.QA</version> + <version>4.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 4d9b29b..1bc500a 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>4.0.0.QA</version> + <version>4.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 44f056d..3879afd 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>4.0.0.QA</version> + <version>4.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 bd168be..393d2e9 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>4.0.0.QA</version> + <version>4.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 89de04e..9a2a929 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>4.0.0.QA</version> + <version>4.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 f39320e..4748aa3 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>4.0.0.QA</version> + <version>4.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 b4e152d..5e8343f 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>4.0.0.QA</version> + <version>4.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 4e7d957..a897a53 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>4.0.0.QA</version> + <version>4.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 16d1c57..b51ba25 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>4.0.0.QA</version> + <version>4.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 8df30ea..471e73f 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>4.0.0.QA</version> + <version>4.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 75ef3eb..c8235e7 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>4.0.0.QA</version> + <version>4.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 43679f4..40bc578 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>4.0.0.QA</version> + <version>4.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 ce2aa4c..232f907 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>4.0.0.QA</version> + <version>4.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 fabe19a..43cd398 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>4.0.0.QA</version> + <version>4.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 19f9532..7e6da01 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>4.0.0.QA</version> + <version>4.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 103332f..6ba6f85 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>4.0.0.QA</version> + <version>4.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 a5502ab..45280cd 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>4.0.0.QA</version> + <version>4.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 6ac95b6..d816e25 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>4.0.0.QA</version> + <version>4.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 1091107..621f3e5 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>4.0.0.QA</version> + <version>4.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 87ddd11..da8e8e7 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>4.0.0.QA</version> + <version>4.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 c76da08..8d1e368 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>4.0.0.QA</version> + <version>4.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 25b65b0..f5fbeb1 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>4.0.0.QA</version> + <version>4.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 ca1bd76..b7f3be7 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>4.0.0.QA</version> + <version>4.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 db1c2b0..07be817 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>4.0.0.QA</version> + <version>4.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 ac0a8a7..c1187d1 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>4.0.0.QA</version> + <version>4.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 4e4c973..9ada86c 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>4.0.0.QA</version> + <version>4.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 ac80b24..ab4f217 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>4.0.0.QA</version> + <version>4.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 94e8fe0..243eed4 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>4.0.0.QA</version> + <version>4.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 75a3ba8..24dd98a 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>4.0.0.QA</version> + <version>4.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 99d3efd..e933c81 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>4.0.0.QA</version> + <version>4.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 f78308e..786cead 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>4.0.0.QA</version> + <version>4.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 94f0b1c..5990106 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index 226e657..8dab254 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>4.0.0.QA</version> + <version>4.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 78376ca..41d2820 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 23489ee..154fc0f 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>4.0.0.QA</version> + <version>4.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 0590691..99ece1c 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 668b04f..0370302 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>4.0.0.QA</version> + <version>4.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 bc39c40..d7e6d8a 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index b233031..9f46fc9 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 326d781..4a78b61 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index 38facb0..1082bb3 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 4339a94..9371766 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 41c5e57..c72f79a 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>4.0.0.QA</version> + <version>4.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 d80f1ab..0b85a57 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index c4fd8da..d783ffc 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index d9fcc13..a7bac31 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>4.0.0.QA</version> + <version>4.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 a317231..ef32374 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 84acc4d..285f316 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 0d3a151..ad90e83 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>4.0.0.QA</version> + <version>4.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 12f7eb1..2766efd 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>4.0.0.QA</version> + <version>4.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 a12be62..31d5fbc 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>4.0.0.QA</version> + <version>4.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 f3f9e8b..b09a9aa 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>4.0.0.QA</version> + <version>4.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 f57dc5c..e9dca27 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>4.0.0.QA</version> + <version>4.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 4445455..83e3030 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index a6cedd0..5152236 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 04b4394..67d24a0 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 25f88ff..be37d2b 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 45527e8..136770c 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index b4c643c..5597a30 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 5928440..4859ad7 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 9f193c9..2130abe 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index d72ce50..beab355 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>4.0.0.QA</version> + <version>4.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 4e545b3..3aa3bb6 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>4.0.0.QA</version> + <version>4.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 5e3af16..d0ef9fe 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>4.0.0.QA</version> + <version>4.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 59bc78f..a338a98 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index ba0ce39..05cb816 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index dd4b39d..89178cc 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>4.0.0.QA</version> + <version>4.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 30decd7..a68e444 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 6e28cce..0353f4f 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index f40e5d7..4c93bb3 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>4.0.0.QA</version> + <version>4.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 cf40656..9adaca6 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>4.0.0.QA</version> + <version>4.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 dcf2aa5..4f1c4c3 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index d163344..e363555 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index da3a64b..5f96131 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>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index da17bca..46ae63b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.0.0.QA</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name>

1 0

[rhq] Changes to 'refs/tags/RHQ_4_0_0_QA'
by John Sanda 17 Jan '11

17 Jan '11

Tag 'RHQ_4_0_0_QA' created by John Sanda <jsanda(a)redhat.com> at 2011-01-17 16:01 +0000 [maven-release-plugin] copy for tag RHQ_4_0_0_QA Changes since 3_0_1_EC2_B01: Filip Drabek (14): BZ - 617603,617649,617653 - permission checks. Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0 BZ-617649 'DELETE SELECTED' button visible only when you can MODIFY_RESOURCE. BZ-617649 permissions update BZ-550046 (httpd) new virtual host creation fails if Resource Name is string. reverting of BZ-648790 - user needs only View Group permission to see Group Plugin Configuration Update BZ-618314 - fix of apache tests BZ-642641 fix issue in collecting metrics after metric template update. Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0 BZ-655149 Deleting resource plugin config update from audit trail checks wrong permission. BZ 535772 Internet Explorer (IE) problem with Advanced Settings BZ 638216 - (AS5 plugin) Reconecting to profile service when connection is defunct. Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0 BZ 638216 - fix for AS4 messaging components - logging and collection of metrics Heiko W. Rupp (3): BZ 614300 - Add a notification type for the trap itself BZ 663987 - disable direct path insert for the key, as direct path insert does not support select(<same table>) in the same Tx. Enable tests again and pull over some fixes that have been issued on master already. Ian Springer (4): make PC more forgiving if a discovery component returns a Resource details only ask discovery components for additional classpath URLs (i.e. client jars) if per-resource classloaders are enabled in the plugin container config jboss-as-5 plugin: jboss-reflect.jar is required by some profileservice client calls and so should be included in the list of client jars returned by ApplicationServerDiscoveryComponent.getAdditionalClasspathUrls() (https://bugzilla.redhat.com/show_bug.cgi?id=647669) comment out some code that was causing the following unit test failure: Jay Shaughnessy (5): Perf Work on the AS-5 Plugin to try and reduce avail and metric gathering Fix dependency remove explicit path from dep lib [BZ 655187] [BZ-610859] Fix issue in AS5 plugin discovery component that initializes John Mazzitelli (6): BZ 650201 - increase collection intervals - they should be no less than 10m we need to remove the disabled resource's IDs from the callers set - removing resources from our internal resource set is useless clean up some things that we forgot to clean up at shutdown - to help GC BZ 615377 workaround sun bug http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6727821 BZ 615377 - use a new feature in EMS 1.2.13 that lets us clear the EMS classloader factory cache of classloaders and jar files. we now do this in the jmx plugin lifecycle listener. paranoia - we might hit sun bug http://bugs.sun.com/view_bug.do?bug_id=6735255 so we explicitly close the input stream prior to closing the jar file John Sanda (15): [maven-release-plugin] prepare for next development iteration [BZ 536549] Removing unused js code Revert "[maven-release-plugin] prepare release 3_0_1_EC2_B01" Merge branch 'ec2' into release-3.0.0 Putting build number generation plugins in profile to facilitate building in mead Adding profile to generate build number by specifying it manually [BZ 614251] Making multiple changes so that live metric data can be fetched and displayed [BZ 614251] Forgot to include updated interface in previous commit [BZ 619781] Handling more scenarios for settting connection properties to default values Adding version to gmaven plugin in pluginManagement section Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0 Applying brew build patches Upgrading release plugin to version 2.1 Make sure release number gets included in artifacts in brew builds [maven-release-plugin] prepare release RHQ_4_0_0_QA Joseph Marques (2): BZ-649057: re-introduce AvailabilityReport customized serialization for performance BZ-661203: improve inventory browser load efficiency Lukas Krejci (33): fix for the rare NPE in the disambiguation which could happen in the views that contained multiple results for single resource (e.g. list of alert history across all resources) BZ 642588 - config is reloaded if ServerRoot is redefined in config BZ 642591 - make sure we always have the same resource keys as in old plugin version. BZ 642610 - directives found in included files aren't duplicated anymore BZ 642622 - Adding the ability to extract the scheme and port from the ServerName so that proper ping URLs can be discovered. BZ 617218 - always passing in the -d <serverroot> -f <conf-file> as parameters to the apache control script so that a correct instance is acted upon. formatting Refactored the ScriptDiscoveryComponent to use ManulAddFacet instead of the deprecated mechanism. formatting BZ 568917 - Enable creation of as5 scripts by uploading them to the server's bin. Also added support to delete arbitrary script. removed a wrong @Override annotation so that this actually compiles in Java5. BZ 651826 - Do not log the connection failures during auto-discovery on INFO level. Code formatting Removed unnecessary method in the postgres discovery component. mvn package apparently isn't enough to check that something compiles :( BZ 568917 - Implementing ContentFacet on ScriptComponent so that the support for uploading a new script is complete. BZ 643919 - Unspecified condition (that appears after clicking "Add Another Condition") doesn't cause an exception on alert saving. A proper error message appears instead. BZ 655156 - cherrypick of commit f6409557d36ab77f8baa69cb4dc4d11c5fedc39c with a couple of robustness enhancements to the apache plugin: BZ 657232 BZ 618214 - Create a temporary entry in RHQ_PLUGIN table for the snmp-alert plugin in case we need to add something to its configuration during db-upgrade. BZ 659578 - Upgrade the Seam version to 2.2.1.CR2 to address the security vulnerability https://jira.jboss.org/browse/JBSEAM-4676. Also remove the custom SeamELResolver.class that contained a couple of fixes not present in 2.1.0.SP1. BZ 610859 - Deleting an entry from a property list doesn't confuse the unset properties anymore. BZ 659778 - fixing an NPE while adding a new entry into an open map. BZ 662662 - restore the ability to view/edit open maps by "faking" property definitions for the individual properties in the open map. BZ 663377 - Updating group config doesn't introduce "foreign" properties in open maps of individual resources. BZ 656471 - add index on the timestamp of the RHQ_MEASUREMENT_DATA_NUM_1D table to speed up the data compression BZ 663745 - refactor the apache discovery to continue processing the rest of process scan results after an error during processing one of them. BZ 656471 - adding missing index definition in db setup. BZ 665215 - xml-escaping the stacktraces to protect against XSS via malicious code inserted into the exception messages. code formatting BZ 665855 - try to find the control script file only on the OSes that actually have a chance of having it. BZ 663998 - Write out an INFO message when a database plugin is about to be updated by a new version with different file name. root (2): [maven-release-plugin] prepare release RHQ_4_0_0_QA [maven-release-plugin] prepare for next development iteration --- .classpath | 2 dev/null |binary 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/client-api/src/main/java/org/rhq/core/clientapi/agent/measurement/MeasurementAgentService.java | 4 modules/core/comm-api/pom.xml | 2 modules/core/dbutils/pom.xml | 4 modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java | 163 modules/core/dbutils/src/main/scripts/dbsetup/cluster-schema.xml | 2 modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml | 5 modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml | 4 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 55 modules/core/domain/pom.xml | 2 modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleResourceDeployment.java | 3 modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleResourceDeploymentHistory.java | 6 modules/core/domain/src/main/java/org/rhq/core/domain/discovery/AvailabilityReport.java | 141 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataRequest.java | 61 modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 16 modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceComposite.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/Group.java | 65 modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ResourceGroupComposite.java | 33 modules/core/domain/src/test/java/org/rhq/core/domain/test/SerializableTest.java | 2 modules/core/gui/pom.xml | 4 modules/core/gui/src/main/java/org/rhq/core/gui/configuration/ConfigRenderer.java | 6 modules/core/gui/src/main/java/org/rhq/core/gui/configuration/helper/ConfigurationUtility.java | 11 modules/core/gui/src/main/java/org/rhq/core/gui/configuration/helper/PropertyRenderingUtility.java | 8 modules/core/gui/src/main/java/org/rhq/core/gui/configuration/propset/ConfigurationSet.java | 75 modules/core/gui/src/main/java/org/rhq/core/gui/configuration/propset/PropertySetRenderer.java | 2 modules/core/native-system/pom.xml | 2 modules/core/plugin-api/pom.xml | 2 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DiscoveredResourceDetails.java | 41 modules/core/plugin-container/pom.xml | 2 modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainer.java | 23 modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java | 8 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 30 modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java | 13 modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/ClassLoaderManager.java | 15 modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginComponentFactory.java | 7 modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java | 7 modules/core/plugin-validator/pom.xml | 2 modules/core/plugindoc/pom.xml | 38 modules/core/pom.xml | 2 modules/core/util/pom.xml | 2 modules/enterprise/agent/pom.xml | 40 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentManagement.java | 16 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/AvailabilityPromptCommand.java | 20 modules/enterprise/agentupdate/pom.xml | 2 modules/enterprise/comm/pom.xml | 2 modules/enterprise/gui/base-perspective-jar/pom.xml | 6 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 | 4 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/metric/MetricRenderer.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/EditGroupResourceConfigurationUIBean.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationAddNewOpenMapMemberPropertyUIBean.java | 18 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationViewer.java | 3 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/test/EditTestConfigurationUIBean.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/EditGroupPluginConfigurationUIBean.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ResourceGroupUIBean.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourceUIBean.java | 10 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/GroupController.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/ConverterValidatorManager.java | 7 modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties | 1 modules/enterprise/gui/portal-war/src/main/webapp/common/Error.jsp | 8 modules/enterprise/gui/portal-war/src/main/webapp/common/GenericError.jsp | 6 modules/enterprise/gui/portal-war/src/main/webapp/js/popup.js | 118 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/DefinitionCondition.jsp | 4 modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/inventory/connectionHistory.xhtml | 3 modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/inventory/view.xhtml | 3 modules/enterprise/gui/webdav-war/pom.xml | 2 modules/enterprise/pom.xml | 2 modules/enterprise/remoting/cli/pom.xml | 2 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/proxy/ResourceClientProxy.java | 4 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 | 4 modules/enterprise/server/container/src/main/resources/etc/RHQ-mib.txt | 58 modules/enterprise/server/ear/pom.xml | 4 modules/enterprise/server/jar/pom.xml | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 159 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationDefinitionUpdateReport.java | 17 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBean.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java | 12 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/AgentPluginScanner.java | 15 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 9 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java | 20 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java | 17 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java | 6 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 67 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/disambiguation/Disambiguator.java | 15 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/disambiguation/MutableDisambiguationReport.java | 25 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java | 65 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java | 19 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/DiscoveryTestBean.java | 6 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java | 36 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java | 8 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java | 7 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 | 3 modules/enterprise/server/plugins/alert-roles/pom.xml | 3 modules/enterprise/server/plugins/alert-snmp/pom.xml | 2 modules/enterprise/server/plugins/alert-subject/pom.xml | 3 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 | 23 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java | 77 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java | 197 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerOperationsDelegate.java | 29 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java | 125 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java | 91 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/ApacheAugeasNode.java | 12 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasConfigurationApache.java | 61 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasTreeBuilderApache.java | 10 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheParserImpl.java | 4 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdAddressUtility.java | 170 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApacheAugeasTest.java | 11 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java | 13 modules/plugins/augeas/pom.xml | 2 modules/plugins/augeas/src/main/java/org/rhq/augeas/util/Glob.java | 4 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-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java | 10 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java | 129 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java | 86 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java | 14 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java | 80 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java | 42 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/AbstractDeployer.java | 196 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/LocalDeployer.java | 56 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/LocalDownloader.java | 42 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ManagedComponentDeployer.java | 183 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/PackageDownloader.java | 36 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/RemoteDeployer.java | 144 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/RemoteDownloader.java | 121 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ScriptDeployer.java | 151 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/CreateChildResourceFacetDelegate.java | 32 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptComponent.java | 479 +- modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptDiscoveryComponent.java | 193 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptFileFinder.java | 100 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/ManagedComponentUtils.java | 99 modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 93 modules/plugins/jboss-as-5/testsuite/src/main/java/org/rhq/plugins/jbossas5/JBossServerTest.java | 13 modules/plugins/jboss-as/pom.xml | 2 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingComponent.java | 8 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java | 14 modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml | 16 modules/plugins/jboss-cache-v3/pom.xml | 2 modules/plugins/jboss-cache/pom.xml | 2 modules/plugins/jmx/pom.xml | 2 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXPluginLifecycleListener.java | 52 modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml | 1 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/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDatabaseComponent.java | 13 modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDiscoveryComponent.java | 107 modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresServerComponent.java | 4 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 | 2275 +++++----- 215 files changed, 4404 insertions(+), 3121 deletions(-) ---

1 0

[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 John Sanda 17 Jan '11

17 Jan '11

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 a7720105f7386957e9e51b3f8931a9dd7fb440a9 Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jan 17 11:00:59 2011 -0500 [maven-release-plugin] prepare release RHQ_4_0_0_QA diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 0833b2a..6479a13 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 7f7127c..59e5802 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index d69311c..45c4f50 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index c6a6dab..dec6fd5 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index ae391f8..b513ee5 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index f52e92d..60d3e07 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 7892321..c16f709 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 700912d..bac6316 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 5293ae1..f8c262e 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index b3a20e2..9b3197e 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index d9c8d4c..90fba0e 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index bc886fe..afd763d 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index dfcdfde..67d1da9 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 5831bc4..b426bcb 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index b895d04..e754b38 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 405eaed..6761e16 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 70d6f6e..e258e39 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 342369a..605b27d 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 93931da..d851e50 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 172ba27..737fed8 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 d3c0764..cc6da1b 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 57a30b9..f67485c 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 82cddb6..17b8008 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 9a29f14..53318ad 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 072ac8f..96820af 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 cd485f1..70ba9e9 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 095ada1..eea48bd 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 89f283c..a7a0de3 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 5453a41..2dd7010 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 1bc500a..4d9b29b 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <artifactId>rhq-remoting-client-api</artifactId> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 3879afd..44f056d 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 393d2e9..bd168be 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 9a2a929..89de04e 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 4748aa3..f39320e 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 5e8343f..b4e152d 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index a897a53..4e7d957 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 b51ba25..16d1c57 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 471e73f..8df30ea 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 c8235e7..75ef3eb 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 40bc578..43679f4 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 232f907..ce2aa4c 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 43cd398..fabe19a 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 7e6da01..19f9532 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 6ba6f85..103332f 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 45280cd..a5502ab 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 d816e25..6ac95b6 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 621f3e5..1091107 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 da8e8e7..87ddd11 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 8d1e368..c76da08 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 f5fbeb1..25b65b0 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 b7f3be7..ca1bd76 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 07be817..db1c2b0 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 c1187d1..ac0a8a7 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 9ada86c..4e4c973 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 ab4f217..ac80b24 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 243eed4..94e8fe0 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 24dd98a..75a3ba8 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 e933c81..99d3efd 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 786cead..f78308e 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 5990106..94f0b1c 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index 8dab254..226e657 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 41d2820..78376ca 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 154fc0f..23489ee 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 99ece1c..0590691 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 0370302..668b04f 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index d7e6d8a..bc39c40 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 9f46fc9..b233031 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 4a78b61..326d781 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index 1082bb3..38facb0 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 9371766..4339a94 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index c72f79a..41c5e57 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 0b85a57..d80f1ab 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index d783ffc..c4fd8da 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index a7bac31..d9fcc13 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index ef32374..a317231 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 285f316..84acc4d 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index ad90e83..0d3a151 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 2766efd..12f7eb1 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 31d5fbc..a12be62 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 b09a9aa..f3f9e8b 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 e9dca27..f57dc5c 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 83e3030..4445455 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 5152236..a6cedd0 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 67d24a0..04b4394 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index be37d2b..25f88ff 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 136770c..45527e8 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 5597a30..b4c643c 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 4859ad7..5928440 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 2130abe..9f193c9 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index beab355..d72ce50 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 3aa3bb6..4e545b3 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index d0ef9fe..5e3af16 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index a338a98..59bc78f 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 05cb816..ba0ce39 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 89178cc..dd4b39d 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index a68e444..30decd7 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 0353f4f..6e28cce 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 4c93bb3..f40e5d7 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 9adaca6..cf40656 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.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 4f1c4c3..dcf2aa5 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index e363555..d163344 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 5f96131..da3a64b 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>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index 46ae63b..da17bca 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.QA</version> <packaging>pom</packaging> <name>RHQ</name>

1 0

[rhq] Branch 'cli-alert-notifs' - modules/enterprise
by lkrejci 17 Jan '11

17 Jan '11

modules/enterprise/binding/pom.xml | 583 +++++++++++++------- modules/enterprise/server/client-api/pom.xml | 243 +++++++- modules/enterprise/server/plugins/alert-cli/pom.xml | 256 ++++++++ 3 files changed, 846 insertions(+), 236 deletions(-) New commits: commit 8e95ac8a1089cbef1e69976a4376cb5fe16adaed Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jan 17 16:24:52 2011 +0100 dev profile and cobertura support in the new maven modules. diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 661af79..7e6b120 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -1,200 +1,387 @@ <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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>rhq-enterprise-parent</artifactId> - <groupId>org.rhq</groupId> - <version>4.0.0-SNAPSHOT</version> - </parent> - <groupId>org.rhq</groupId> - <artifactId>rhq-script-bindings</artifactId> - <version>4.0.0-SNAPSHOT</version> - <name>RHQ Script Bindings</name> - <description>Abstraction of different facilities and default configurations for script bindings</description> - - <properties> - <persistence-api.version>1.0</persistence-api.version> - <opencsv.version>1.8</opencsv.version> - </properties> - - <dependencies> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>rhq-core-domain</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>hibernate</groupId> - <artifactId>hibernate3</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>${groupId}</groupId> - <artifactId>rhq-core-domain</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>rhq-enterprise-server</artifactId> - <version>${project.version}</version> - <type>ejb-client</type> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - <exclusion> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </exclusion> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - <exclusion> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </exclusion> - <exclusion> - <groupId>commons-validator</groupId> - <artifactId>commons-validator</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - <exclusion> - <groupId>gnu-getopt</groupId> - <artifactId>getopt</artifactId> - </exclusion> - <exclusion> - <groupId>jboss</groupId> - <artifactId>jboss-cache</artifactId> - </exclusion> - <exclusion> - <groupId>jboss</groupId> - <artifactId>jbpm</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>org.rhq</groupId> - <artifactId>rhq-core-client-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.rhq</groupId> - <artifactId>rhq-core-dbutils</artifactId> - </exclusion> - <exclusion> - <groupId>org.rhq</groupId> - <artifactId>rhq-enterprise-server-xml-schemas</artifactId> - </exclusion> - <exclusion> - <groupId>org.rhq</groupId> - <artifactId>safe-invoker</artifactId> - </exclusion> - <exclusion> - <groupId>org.rhq</groupId> - <artifactId>test-utils</artifactId> - </exclusion> - <exclusion> - <groupId>org.snmp4j</groupId> - <artifactId>snmp4j</artifactId> - </exclusion> - <exclusion> - <groupId>oswego-concurrent</groupId> - <artifactId>concurrent</artifactId> - </exclusion> - <exclusion> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - </exclusion> - <exclusion> - <groupId>rss4j</groupId> - <artifactId>rss4j</artifactId> - </exclusion> - <exclusion> - <groupId>jboss</groupId> - <artifactId>jboss-common</artifactId> - </exclusion> - <exclusion> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - </exclusion> - <exclusion> - <groupId>jboss</groupId> - <artifactId>jboss-remoting</artifactId> - </exclusion> - <exclusion> - <groupId>jboss</groupId> - <artifactId>jboss-serialization</artifactId> - </exclusion> - <exclusion> - <groupId>org.antlr</groupId> - <artifactId>antlr</artifactId> - </exclusion> - <exclusion> - <groupId>com.jcraft</groupId> - <artifactId>jsch</artifactId> - </exclusion> - <exclusion> - <groupId>org.rhq</groupId> - <artifactId>rhq-enterprise-comm</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>${persistence-api.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> -  - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>${testng.version}</version> - <scope>compile</scope>  - </dependency> - - <dependency> - <groupId>net.sf.opencsv</groupId> - <artifactId>opencsv</artifactId> - <version>${opencsv.version}</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </dependency> - </dependencies> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>rhq-enterprise-parent</artifactId> + <groupId>org.rhq</groupId> + <version>4.0.0-SNAPSHOT</version> + </parent> + <groupId>org.rhq</groupId> + <artifactId>rhq-script-bindings</artifactId> + <version>4.0.0-SNAPSHOT</version> + <name>RHQ Script Bindings</name> + <description>Abstraction of different facilities and default configurations for script bindings</description> + + <properties> + <persistence-api.version>1.0</persistence-api.version> + <opencsv.version>1.8</opencsv.version> + </properties> + + <dependencies> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-core-domain</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>${groupId}</groupId> + <artifactId>rhq-core-domain</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-enterprise-server</artifactId> + <version>${project.version}</version> + <type>ejb-client</type> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </exclusion> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </exclusion> + <exclusion> + <groupId>commons-validator</groupId> + <artifactId>commons-validator</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + <exclusion> + <groupId>gnu-getopt</groupId> + <artifactId>getopt</artifactId> + </exclusion> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-cache</artifactId> + </exclusion> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jbpm</artifactId> + </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + <exclusion> + <groupId>org.rhq</groupId> + <artifactId>rhq-core-client-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.rhq</groupId> + <artifactId>rhq-core-dbutils</artifactId> + </exclusion> + <exclusion> + <groupId>org.rhq</groupId> + <artifactId>rhq-enterprise-server-xml-schemas</artifactId> + </exclusion> + <exclusion> + <groupId>org.rhq</groupId> + <artifactId>safe-invoker</artifactId> + </exclusion> + <exclusion> + <groupId>org.rhq</groupId> + <artifactId>test-utils</artifactId> + </exclusion> + <exclusion> + <groupId>org.snmp4j</groupId> + <artifactId>snmp4j</artifactId> + </exclusion> + <exclusion> + <groupId>oswego-concurrent</groupId> + <artifactId>concurrent</artifactId> + </exclusion> + <exclusion> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + </exclusion> + <exclusion> + <groupId>rss4j</groupId> + <artifactId>rss4j</artifactId> + </exclusion> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-common</artifactId> + </exclusion> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-jmx</artifactId> + </exclusion> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-remoting</artifactId> + </exclusion> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-serialization</artifactId> + </exclusion> + <exclusion> + <groupId>org.antlr</groupId> + <artifactId>antlr</artifactId> + </exclusion> + <exclusion> + <groupId>com.jcraft</groupId> + <artifactId>jsch</artifactId> + </exclusion> + <exclusion> + <groupId>org.rhq</groupId> + <artifactId>rhq-enterprise-comm</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>${persistence-api.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>hibernate-annotations</groupId> + <artifactId>hibernate-annotations</artifactId> +  + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>${testng.version}</version> + <scope>compile</scope>  + </dependency> + + <dependency> + <groupId>net.sf.opencsv</groupId> + <artifactId>opencsv</artifactId> + <version>${opencsv.version}</version> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> +  + </configuration> + </plugin> + + </plugins> + </build> + + <profiles> + + <profile> + <id>dev</id> + + <properties> + <rhq.rootDir>../../..</rhq.rootDir> + <rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir> + <rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/lib</rhq.deploymentDir> + </properties> + + <build> + <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.1</version> + <executions> + + <execution> + <id>deploy</id> + <phase>compile</phase> + <configuration> + <tasks> + <mkdir dir="${rhq.deploymentDir}" /> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <echo>*** Updating + ${deployment.file}...</echo> + <jar destfile="${deployment.file}" + basedir="${project.build.outputDirectory}" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <execution> + <id>undeploy</id> + <phase>clean</phase> + <configuration> + <tasks> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <echo>*** Deleting + ${deployment.file}...</echo> + <delete file="${deployment.file}" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + </executions> + </plugin> + + </plugins> + </build> + </profile> + + <profile> + <id>cobertura-plugins</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <dependencies> + <dependency> + <groupId>net.sourceforge.cobertura</groupId> + <artifactId>cobertura</artifactId> + <version>1.9.4.1</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>cobertura-instrument</id> + <phase>pre-integration-test</phase> + <configuration> + <tasks> +  + <mkdir dir="target/cobertura" /> + <mkdir dir="target/cobertura/backup" /> +  + <copy toDir="target/cobertura/backup" + verbose="true" overwrite="true"> + <fileset dir="target/classes"> + <include name="**/*.class" /> + </fileset> + </copy> +  + <touch + file="target/classes/cobertura.properties" /> + <echo + file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo> + <taskdef + classpathref="maven.plugin.classpath" + resource="tasks.properties" /> +  + <cobertura-instrument + datafile="${project.build.directory}/cobertura/cobertura.ser" + todir="${project.build.directory}/classes"> + <fileset + dir="${project.build.directory}/classes"> + <include name="**/*.class" /> + </fileset> + </cobertura-instrument> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>cobertura-report</id> + <phase>post-integration-test</phase> + <configuration> + <tasks> + <taskdef + classpathref="maven.plugin.classpath" + resource="tasks.properties" /> +  + <mkdir dir="target/cobertura" /> + <mkdir dir="target/site/cobertura" /> +  + <copy toDir="target/classes" + verbose="true" overwrite="true"> + <fileset + dir="target/cobertura/backup"> + <include name="**/*.class" /> + </fileset> + </copy> +  + <delete + dir="target/cobertura/backup" /> +  + <cobertura-report + format="html" + datafile="${project.build.directory}/cobertura/cobertura.ser" + destdir="${project.build.directory}/site/cobertura"> + <fileset + dir="${basedir}/src/main/java"> + <include name="**/*.java" /> + </fileset> + </cobertura-report> +  + <delete + file="target/classes/cobertura.properties" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> \ No newline at end of file diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index 47d1f6b..d605b1c 100644 --- a/modules/enterprise/server/client-api/pom.xml +++ b/modules/enterprise/server/client-api/pom.xml @@ -1,21 +1,228 @@ -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>rhq-enterprise-server-parent</artifactId> +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>rhq-enterprise-server-parent</artifactId> + <groupId>org.rhq</groupId> + <version>4.0.0-SNAPSHOT</version> + </parent> <groupId>org.rhq</groupId> + <artifactId>rhq-server-client-api</artifactId> <version>4.0.0-SNAPSHOT</version> - </parent> - <groupId>org.rhq</groupId> - <artifactId>rhq-server-client-api</artifactId> - <version>4.0.0-SNAPSHOT</version> - <name>RHQ Enterprise Server Client API</name> - <description>The implementation of the client API when accessing the server locally</description> - <dependencies> - <dependency> - <groupId>org.rhq</groupId> - <artifactId>rhq-script-bindings</artifactId> - <version>4.0.0-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - </dependencies> + <name>RHQ Enterprise Server Client API</name> + <description>The implementation of the client API when accessing the server locally</description> + + <properties> + <persistence-api.version>1.0</persistence-api.version> + </properties> + + <dependencies> + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-script-bindings</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>${persistence-api.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>hibernate-annotations</groupId> + <artifactId>hibernate-annotations</artifactId> +  + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <plugins> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> +  + </configuration> + </plugin> + + </plugins> + </build> + + <profiles> + + <profile> + <id>dev</id> + + <properties> + <rhq.rootDir>../../..</rhq.rootDir> + <rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir> + <rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/lib</rhq.deploymentDir> + </properties> + + <build> + <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.1</version> + <executions> + + <execution> + <id>deploy</id> + <phase>compile</phase> + <configuration> + <tasks> + <mkdir dir="${rhq.deploymentDir}" /> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <echo>*** Updating + ${deployment.file}...</echo> + <jar destfile="${deployment.file}" + basedir="${project.build.outputDirectory}" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <execution> + <id>undeploy</id> + <phase>clean</phase> + <configuration> + <tasks> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <echo>*** Deleting + ${deployment.file}...</echo> + <delete file="${deployment.file}" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + </executions> + </plugin> + + </plugins> + </build> + </profile> + + <profile> + <id>cobertura-plugins</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <dependencies> + <dependency> + <groupId>net.sourceforge.cobertura</groupId> + <artifactId>cobertura</artifactId> + <version>1.9.4.1</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>cobertura-instrument</id> + <phase>pre-integration-test</phase> + <configuration> + <tasks> +  + <mkdir dir="target/cobertura" /> + <mkdir dir="target/cobertura/backup" /> +  + <copy toDir="target/cobertura/backup" + verbose="true" overwrite="true"> + <fileset dir="target/classes"> + <include name="**/*.class" /> + </fileset> + </copy> +  + <touch + file="target/classes/cobertura.properties" /> + <echo + file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo> + <taskdef + classpathref="maven.plugin.classpath" + resource="tasks.properties" /> +  + <cobertura-instrument + datafile="${project.build.directory}/cobertura/cobertura.ser" + todir="${project.build.directory}/classes"> + <fileset + dir="${project.build.directory}/classes"> + <include name="**/*.class" /> + </fileset> + </cobertura-instrument> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>cobertura-report</id> + <phase>post-integration-test</phase> + <configuration> + <tasks> + <taskdef + classpathref="maven.plugin.classpath" + resource="tasks.properties" /> +  + <mkdir dir="target/cobertura" /> + <mkdir dir="target/site/cobertura" /> +  + <copy toDir="target/classes" + verbose="true" overwrite="true"> + <fileset + dir="target/cobertura/backup"> + <include name="**/*.class" /> + </fileset> + </copy> +  + <delete + dir="target/cobertura/backup" /> +  + <cobertura-report + format="html" + datafile="${project.build.directory}/cobertura/cobertura.ser" + destdir="${project.build.directory}/site/cobertura"> + <fileset + dir="${basedir}/src/main/java"> + <include name="**/*.java" /> + </fileset> + </cobertura-report> +  + <delete + file="target/classes/cobertura.properties" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> \ No newline at end of file diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index 5349beb..7b71a2f 100644 --- a/modules/enterprise/server/plugins/alert-cli/pom.xml +++ b/modules/enterprise/server/plugins/alert-cli/pom.xml @@ -1,4 +1,5 @@ -<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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> @@ -10,23 +11,238 @@ <version>4.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server CLI Script Alert Plugin</name> <description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description> - - <scm> - <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/enterprise/server/pl…</connection> - <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/enterprise/server/pl…</developerConnection> - </scm> - - <dependencies> - <dependency> - <groupId>org.rhq</groupId> - <artifactId>rhq-server-client-api</artifactId> - <version>4.0.0-SNAPSHOT</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - </dependencies> - <properties> - <scm.module.path>modules/enterprise/server/plugins/alert-cli/</scm.module.path> - </properties> - + + <properties> + <scm.module.path>modules/enterprise/server/plugins/alert-cli/</scm.module.path> + </properties> + + <scm> + <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/enterprise/server/pl…</connection> + <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/enterprise/server/pl…</developerConnection> + </scm> + + <dependencies> + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-server-client-api</artifactId> + <version>4.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + </dependencies> + + <build> + <plugins> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> +  + </configuration> + </plugin> + + </plugins> + </build> + + <profiles> + + <profile> + <id>dev</id> + + <properties> + <rhq.rootDir>../../../../..</rhq.rootDir> + <rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir> + <rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/rhq-serverplugins</rhq.deploymentDir> + </properties> + + <build> + <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.1</version> + <executions> + + <execution> + <id>deploy</id> + <phase>compile</phase> + <configuration> + <tasks> + <mkdir dir="${rhq.deploymentDir}" /> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <echo>*** Updating + ${deployment.file}...</echo> + <jar destfile="${deployment.file}" + basedir="${project.build.outputDirectory}" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <execution> + <id>undeploy</id> + <phase>clean</phase> + <configuration> + <tasks> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <echo>*** Deleting + ${deployment.file}...</echo> + <delete file="${deployment.file}" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <execution> + <id>deploy-jar-meta-inf</id> + <phase>package</phase> + <configuration> + <tasks> + <property name="deployment.file" + location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <echo>*** Updating META-INF dir + in ${deployment.file}...</echo> + <unjar + src="${project.build.directory}/${project.build.finalName}.jar" + dest="${project.build.outputDirectory}"> + <patternset> + <include name="META-INF/**" /> + </patternset> + </unjar> + <jar destfile="${deployment.file}" + manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + update="true"> + </jar> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + </executions> + </plugin> + + </plugins> + </build> + </profile> + + <profile> + <id>cobertura-plugins</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <dependencies> + <dependency> + <groupId>net.sourceforge.cobertura</groupId> + <artifactId>cobertura</artifactId> + <version>1.9.4.1</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>cobertura-instrument</id> + <phase>pre-integration-test</phase> + <configuration> + <tasks> +  + <mkdir dir="target/cobertura" /> + <mkdir dir="target/cobertura/backup" /> +  + <copy toDir="target/cobertura/backup" + verbose="true" overwrite="true"> + <fileset dir="target/classes"> + <include name="**/*.class" /> + </fileset> + </copy> +  + <touch + file="target/classes/cobertura.properties" /> + <echo + file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo> + <taskdef + classpathref="maven.plugin.classpath" + resource="tasks.properties" /> +  + <cobertura-instrument + datafile="${project.build.directory}/cobertura/cobertura.ser" + todir="${project.build.directory}/classes"> + <fileset + dir="${project.build.directory}/classes"> + <include name="**/*.class" /> + </fileset> + </cobertura-instrument> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>cobertura-report</id> + <phase>post-integration-test</phase> + <configuration> + <tasks> + <taskdef + classpathref="maven.plugin.classpath" + resource="tasks.properties" /> +  + <mkdir dir="target/cobertura" /> + <mkdir dir="target/site/cobertura" /> +  + <copy toDir="target/classes" + verbose="true" overwrite="true"> + <fileset + dir="target/cobertura/backup"> + <include name="**/*.class" /> + </fileset> + </copy> +  + <delete + dir="target/cobertura/backup" /> +  + <cobertura-report + format="html" + datafile="${project.build.directory}/cobertura/cobertura.ser" + destdir="${project.build.directory}/site/cobertura"> + <fileset + dir="${basedir}/src/main/java"> + <include name="**/*.java" /> + </fileset> + </cobertura-report> +  + <delete + file="target/classes/cobertura.properties" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> \ No newline at end of file

1 0

[rhq] Branch 'refs/tags/RHQ_4_0_0_QA' - 0 commits -
by John Sanda 17 Jan '11

17 Jan '11

Rebased ref, commits from common ancestor:

1 0

[rhq] Changes to 'release-3.0.0-test-build'
by John Sanda 17 Jan '11

17 Jan '11

New branch 'release-3.0.0-test-build' available with the following commits:

1 0

[rhq] Branch 'cli-alert-notifs' - 5 commits - modules/core modules/enterprise
by lkrejci 14 Jan '11

14 Jan '11

modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java | 2 modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java | 2 modules/enterprise/binding/src/main/java/org/rhq/bindings/client/AbstractRhqFacadeProxy.java | 103 ++++ modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClientProxy.java | 85 +-- modules/enterprise/server/client-api/pom.xml | 21 modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java | 223 ++++++++++ modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java | 67 +++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java | 19 modules/enterprise/server/plugins/alert-cli/pom.xml | 9 modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java | 112 +++++ modules/enterprise/server/plugins/alert-cli/src/main/resources/META-INF/rhq-serverplugin.xml | 26 + modules/enterprise/server/plugins/pom.xml | 1 12 files changed, 592 insertions(+), 78 deletions(-) New commits: commit 31fada88661aba7a52d79519e32b9742224ffcb0 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Sat Jan 15 00:39:26 2011 +0100 Some initial code for the alert-cli plugin. diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index 55aa5d3..5349beb 100644 --- a/modules/enterprise/server/plugins/alert-cli/pom.xml +++ b/modules/enterprise/server/plugins/alert-cli/pom.xml @@ -16,6 +16,15 @@ <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/enterprise/server/pl…</developerConnection> </scm> + <dependencies> + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-server-client-api</artifactId> + <version>4.0.0-SNAPSHOT</version> + <type>jar</type> + <scope>compile</scope> + </dependency> + </dependencies> <properties> <scm.module.path>modules/enterprise/server/plugins/alert-cli/</scm.module.path> </properties> diff --git a/modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java b/modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java new file mode 100644 index 0000000..64d1a22 --- /dev/null +++ b/modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java @@ -0,0 +1,112 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 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 as published by + * the Free Software Foundation version 2 of the License. + * + * 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 for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.enterprise.server.plugins.alertCli; + +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.Collections; + +import javax.script.ScriptEngine; +import javax.script.ScriptException; + +import org.apache.commons.logging.LogFactory; + +import org.apache.commons.logging.Log; + +import org.rhq.bindings.ScriptEngineFactory; +import org.rhq.bindings.StandardBindings; +import org.rhq.bindings.util.PackageFinder; +import org.rhq.core.domain.alert.Alert; +import org.rhq.core.domain.alert.notification.SenderResult; +import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.enterprise.client.LocalClient; +import org.rhq.enterprise.server.plugin.pc.ServerPluginComponent; +import org.rhq.enterprise.server.plugin.pc.alert.AlertSender; +import org.rhq.enterprise.server.util.LookupUtil; + +/** + * Uses CLI to perform the alert notification. + * + * @author Lukas Krejci + */ +public class CliSender extends AlertSender<ServerPluginComponent> { + private static final Log LOG = LogFactory.getLog(CliSender.class); + + public SenderResult send(Alert alert) { + SenderResult result = new SenderResult(); + BufferedReader reader = null; + try { + ScriptEngine engine = getScriptEngine(alert); + + PropertySimple packageIdProp = alertParameters.getSimple("packageId"); + + if (packageIdProp == null) { + return SenderResult.getSimpleFailure("The configuration doesn't contain the mandatory 'packageId' property. This should not happen."); + } + + Integer packageId = packageIdProp.getIntegerValue(); + + if (packageId == null) { + return SenderResult.getSimpleFailure("No script defined."); + } + + //TODO getting the package bits is going to require changes to the content manager + //this is gonna have to be asynchronous because the package bits are possibly + //only going to be downloaded. + InputStream packageBits = null; + + reader = new BufferedReader(new InputStreamReader(packageBits)); + + Object ret = engine.eval(reader); + + //TODO what to do with the return value, if any + + return result; + } catch (Exception e) { + //TODO I don't like this + return SenderResult.getSimpleFailure(e.getMessage()); + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e) { + LOG.error("Failed to close the script reader.", e); + } + } + } + } + + private ScriptEngine getScriptEngine(Alert alert) throws ScriptException, IOException { + Subject overlord = LookupUtil.getSubjectManager().getOverlord(); + + LocalClient client = new LocalClient(overlord); + + //TODO define some meaningful printwriter + StandardBindings bindings = new StandardBindings(null, client); + bindings.put("alert", alert); + + return ScriptEngineFactory.getScriptEngine("JavaScript", new PackageFinder(Collections.<File> emptyList()), + bindings); + } +} diff --git a/modules/enterprise/server/plugins/alert-cli/src/main/resources/META-INF/rhq-serverplugin.xml b/modules/enterprise/server/plugins/alert-cli/src/main/resources/META-INF/rhq-serverplugin.xml new file mode 100644 index 0000000..ffcbb4b --- /dev/null +++ b/modules/enterprise/server/plugins/alert-cli/src/main/resources/META-INF/rhq-serverplugin.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<alert-plugin + name="alert-cli" + displayName="Alert:CLI" + xmlns="urn:xmlns:rhq-serverplugin.alert" + xmlns:c="urn:xmlns:rhq-configuration" + xmlns:serverplugin="urn:xmlns:rhq-serverplugin" + package="org.rhq.enterprise.server.plugins.alertCli" + description="Alert sender plugin that can execute a CLI script." + > + + <serverplugin:help> + Used to execute a CLI script. + </serverplugin:help> + +  + <short-name>CLI Script</short-name> + +  + <plugin-class>CliSender</plugin-class> + + <alert-configuration> + <c:simple-property name="packageId" type="integer" required="true" description="The id of the package containing the script to execute."/> + </alert-configuration> +</alert-plugin> \ No newline at end of file diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 29d09dd..86d8cfe 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -80,6 +80,7 @@ --> <module>alert-snmp</module> <module>alert-subject</module> + <module>alert-cli</module> <module>cobbler</module> <module>filetemplate-bundle</module> <module>ant-bundle</module> commit 85a908e58fd9f691c6e730ec7a358e3b97a9ca7c Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Sat Jan 15 00:37:43 2011 +0100 Defining a new implementation of the RhqFacade that uses the local SLSBs and created a new server/client-api module for it to be used for running the server-side CLI scripts. diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/AbstractRhqFacadeProxy.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/AbstractRhqFacadeProxy.java new file mode 100644 index 0000000..bacdafb --- /dev/null +++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/AbstractRhqFacadeProxy.java @@ -0,0 +1,103 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 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 as published by + * the Free Software Foundation version 2 of the License. + * + * 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 for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.bindings.client; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; + +import org.rhq.bindings.util.InterfaceSimplifier; +import org.rhq.core.domain.auth.Subject; + +/** + * An abstract {@link InvocationHandler} to help the script users create proxies to actually call the + * correct methods on RHQ. This base implementation provides its inheritors with the facade impl and the concrete + * manager they should invoke the methods on and does the "de-simplification" of the arguments (i.e. the opposite of {@link InterfaceSimplifier#simplify(Class)}. + * + * @author Lukas Krejci + */ +public abstract class AbstractRhqFacadeProxy<T extends RhqFacade> implements InvocationHandler { + + private T facade; + private RhqManagers manager; + + protected AbstractRhqFacadeProxy(T facade, RhqManagers manager) { + this.facade = facade; + this.manager = manager; + } + + protected T getRhqFacade() { + return facade; + } + + protected RhqManagers getManager() { + return manager; + } + + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + Class<?>[] params = method.getParameterTypes(); + + try { + Class<?>[] interfaces = method.getDeclaringClass().getInterfaces(); + + Class<?> originalClass; + if (interfaces != null && interfaces.length > 0) { + originalClass = interfaces[0]; + } else { + originalClass = method.getDeclaringClass(); + } + + // See if this method really exists or if its a simplified set of parameters + originalClass.getMethod(method.getName(), method.getParameterTypes()); + + } catch (Exception e) { + // If this was not in the original interface it must've been added in the Simplifier... add back the subject argument + int numArgs = (null == args) ? 0 : args.length; + Object[] newArgs = new Object[numArgs + 1]; + if (numArgs > 0) { + System.arraycopy(args, 0, newArgs, 1, numArgs); + } + newArgs[0] = getRhqFacade().getSubject(); + args = newArgs; + + int numParams = (null == params) ? 0 : params.length; + Class<?>[] newParams = new Class[numParams + 1]; + if (numParams > 0) { + System.arraycopy(params, 0, newParams, 1, numParams); + } + newParams[0] = Subject.class; + params = newParams; + } + + return doInvoke(proxy, method, params, args); + } + + /** + * This method actually calls the method according to the RhqFacade's implementation. The <code>argTypes</code> + * and <code>args</code> are de-simplified (and thus the method can't be supplied just as a simple {@link Method} instance). + * + * @param proxy the proxy the method is executing on + * @param method the original method + * @param argTypes the de-simplified argument types + * @param args the de-simplified argumens + * @return the result of the invocation + * @throws Throwable if invocation throws an error + */ + protected abstract Object doInvoke(Object proxy, Method originalMethod, Class<?>[] argTypes, Object[] args) throws Throwable; +} diff --git a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClientProxy.java b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClientProxy.java index 5e897cb..2d57488 100644 --- a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClientProxy.java +++ b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClientProxy.java @@ -18,18 +18,14 @@ */ package org.rhq.enterprise.client; -import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import org.jboss.remoting.invocation.NameBasedInvocation; +import org.rhq.bindings.client.AbstractRhqFacadeProxy; import org.rhq.bindings.client.RhqManagers; import org.rhq.bindings.util.InterfaceSimplifier; -import org.rhq.core.domain.auth.Subject; import org.rhq.core.server.ExternalizableStrategy; /** @@ -37,19 +33,16 @@ import org.rhq.core.server.ExternalizableStrategy; * to SLSB Remotes over a remoting invoker. * * @author Greg Hinkle + * @author Lukas Krejci */ -public class RemoteClientProxy implements InvocationHandler { - private RemoteClient client; - private RhqManagers manager; +public class RemoteClientProxy extends AbstractRhqFacadeProxy<RemoteClient> { - // public RHQRemoteClientProxy(RHQRemoteClient client, Class targetClass) { public RemoteClientProxy(RemoteClient client, RhqManagers manager) { - this.client = client; - this.manager = manager; + super(client, manager); } public Class<?> getRemoteInterface() { - return this.manager.remote(); + return this.getManager().remote(); } @SuppressWarnings("unchecked") @@ -57,7 +50,7 @@ public class RemoteClientProxy implements InvocationHandler { try { RemoteClientProxy gpc = new RemoteClientProxy(remoteClient, manager); - Class<?> intf = InterfaceSimplifier.simplify(gpc.manager.remote()); + Class<?> intf = InterfaceSimplifier.simplify(manager.remote()); return (T) Proxy .newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class<?>[] { intf }, gpc); @@ -67,62 +60,32 @@ public class RemoteClientProxy implements InvocationHandler { } public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - try { - // make sure we're serializing in Remote Client mode for rich serialization - ExternalizableStrategy.setStrategy(ExternalizableStrategy.Subsystem.REFLECTIVE_SERIALIZATION); - - String methodName = manager.beanName() + ":" + method.getName(); - - Class<?>[] params = method.getParameterTypes(); - - try { - Class<?>[] interfaces = method.getDeclaringClass().getInterfaces(); - - Class<?> originalClass; - if (interfaces != null && interfaces.length > 0) { - originalClass = interfaces[0]; - } else { - originalClass = method.getDeclaringClass(); - } - - // See if this method really exists or if its a simplified set of parameters - originalClass.getMethod(method.getName(), method.getParameterTypes()); + return super.invoke(proxy, method, args); + } catch (Throwable t) { + t.printStackTrace(); + throw t; + } + } - } catch (Exception e) { - // If this was not in the original interface it must've been added in the Simplifier... add back the subject argument - int numArgs = (null == args) ? 0 : args.length; - Object[] newArgs = new Object[numArgs + 1]; - if (numArgs > 0) { - System.arraycopy(args, 0, newArgs, 1, numArgs); - } - newArgs[0] = client.getSubject(); - args = newArgs; + protected Object doInvoke(Object proxy, Method originalMethod, java.lang.Class<?>[] argTypes, Object[] args) throws Throwable { + ExternalizableStrategy.setStrategy(ExternalizableStrategy.Subsystem.REFLECTIVE_SERIALIZATION); - int numParams = (null == params) ? 0 : params.length; - Class<?>[] newParams = new Class[numParams + 1]; - if (numParams > 0) { - System.arraycopy(params, 0, newParams, 1, numParams); - } - newParams[0] = Subject.class; - params = newParams; - } + String methodName = getManager().beanName() + ":" + originalMethod.getName(); - String[] paramSig = createParamSignature(params); - NameBasedInvocation request = new NameBasedInvocation(methodName, args, paramSig); + String[] paramSig = createParamSignature(argTypes); + + NameBasedInvocation request = new NameBasedInvocation(methodName, args, paramSig); - Object response = client.getRemotingClient().invoke(request); + Object response = getRhqFacade().getRemotingClient().invoke(request); - if (response instanceof Throwable) { - throw (Throwable) response; - } - return response; - } catch (Throwable t) { - t.printStackTrace(); - throw t; + if (response instanceof Throwable) { + throw (Throwable) response; } + + return response; } - + private String[] createParamSignature(Class<?>[] types) { String[] paramSig = new String[types.length]; for (int x = 0; x < types.length; x++) { diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml new file mode 100644 index 0000000..47d1f6b --- /dev/null +++ b/modules/enterprise/server/client-api/pom.xml @@ -0,0 +1,21 @@ +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>rhq-enterprise-server-parent</artifactId> + <groupId>org.rhq</groupId> + <version>4.0.0-SNAPSHOT</version> + </parent> + <groupId>org.rhq</groupId> + <artifactId>rhq-server-client-api</artifactId> + <version>4.0.0-SNAPSHOT</version> + <name>RHQ Enterprise Server Client API</name> + <description>The implementation of the client API when accessing the server locally</description> + <dependencies> + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-script-bindings</artifactId> + <version>4.0.0-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file diff --git a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java new file mode 100644 index 0000000..0462638 --- /dev/null +++ b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java @@ -0,0 +1,223 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 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 as published by + * the Free Software Foundation version 2 of the License. + * + * 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 for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.enterprise.client; + +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.rhq.bindings.client.RhqFacade; +import org.rhq.bindings.client.RhqManagers; +import org.rhq.core.domain.auth.Subject; +import org.rhq.enterprise.server.alert.AlertDefinitionManagerRemote; +import org.rhq.enterprise.server.alert.AlertManagerRemote; +import org.rhq.enterprise.server.auth.SubjectManagerRemote; +import org.rhq.enterprise.server.authz.RoleManagerRemote; +import org.rhq.enterprise.server.bundle.BundleManagerRemote; +import org.rhq.enterprise.server.configuration.ConfigurationManagerRemote; +import org.rhq.enterprise.server.content.ContentManagerRemote; +import org.rhq.enterprise.server.content.RepoManagerRemote; +import org.rhq.enterprise.server.discovery.DiscoveryBossRemote; +import org.rhq.enterprise.server.event.EventManagerRemote; +import org.rhq.enterprise.server.install.remote.RemoteInstallManagerRemote; +import org.rhq.enterprise.server.measurement.AvailabilityManagerRemote; +import org.rhq.enterprise.server.measurement.CallTimeDataManagerRemote; +import org.rhq.enterprise.server.measurement.MeasurementBaselineManagerRemote; +import org.rhq.enterprise.server.measurement.MeasurementDataManagerRemote; +import org.rhq.enterprise.server.measurement.MeasurementDefinitionManagerRemote; +import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerRemote; +import org.rhq.enterprise.server.operation.OperationManagerRemote; +import org.rhq.enterprise.server.report.DataAccessManagerRemote; +import org.rhq.enterprise.server.resource.ResourceFactoryManagerRemote; +import org.rhq.enterprise.server.resource.ResourceManagerRemote; +import org.rhq.enterprise.server.resource.ResourceTypeManagerRemote; +import org.rhq.enterprise.server.resource.group.ResourceGroupManagerRemote; +import org.rhq.enterprise.server.search.SavedSearchManagerRemote; +import org.rhq.enterprise.server.support.SupportManagerRemote; +import org.rhq.enterprise.server.system.SystemManagerRemote; +import org.rhq.enterprise.server.tagging.TagManagerRemote; +import org.rhq.enterprise.server.util.LookupUtil; + +/** + * + * + * @author Lukas Krejci + */ +public class LocalClient implements RhqFacade { + + private static final Log LOG = LogFactory.getLog(LocalClient.class); + + private Subject subject; + private Map<String, Object> managers; + + public LocalClient(Subject subject) { + this.subject = subject; + } + + public Subject getSubject() { + return subject; + } + + public Subject login(String user, String password) throws Exception { + return subject; + } + + public void logout() { + } + + public boolean isLoggedIn() { + return true; + } + + public AlertManagerRemote getAlertManager() { + return getProxy(LookupUtil.getAlertManager(), AlertManagerRemote.class); + } + + public AlertDefinitionManagerRemote getAlertDefinitionManager() { + return getProxy(LookupUtil.getAlertDefinitionManager(), AlertDefinitionManagerRemote.class); + } + + public AvailabilityManagerRemote getAvailabilityManager() { + return getProxy(LookupUtil.getAvailabilityManager(), AvailabilityManagerRemote.class); + } + + public BundleManagerRemote getBundleManager() { + return getProxy(LookupUtil.getBundleManager(), BundleManagerRemote.class); + } + + public CallTimeDataManagerRemote getCallTimeDataManager() { + return getProxy(LookupUtil.getCallTimeDataManager(), CallTimeDataManagerRemote.class); + } + + public RepoManagerRemote getRepoManager() { + return getProxy(LookupUtil.getRepoManagerLocal(), RepoManagerRemote.class); + } + + public ConfigurationManagerRemote getConfigurationManager() { + return getProxy(LookupUtil.getConfigurationManager(), ConfigurationManagerRemote.class); + } + + public ContentManagerRemote getContentManager() { + return getProxy(LookupUtil.getContentManager(), ContentManagerRemote.class); + } + + public DataAccessManagerRemote getDataAccessManager() { + return getProxy(LookupUtil.getDataAccessManager(), DataAccessManagerRemote.class); + } + + public DiscoveryBossRemote getDiscoveryBoss() { + return getProxy(LookupUtil.getDiscoveryBoss(), DiscoveryBossRemote.class); + } + + public EventManagerRemote getEventManager() { + return getProxy(LookupUtil.getEventManager(), EventManagerRemote.class); + } + + public MeasurementBaselineManagerRemote getMeasurementBaselineManager() { + return getProxy(LookupUtil.getMeasurementBaselineManager(), MeasurementBaselineManagerRemote.class); + } + + public MeasurementDataManagerRemote getMeasurementDataManager() { + return getProxy(LookupUtil.getMeasurementDataManager(), MeasurementDataManagerRemote.class); + } + + public MeasurementDefinitionManagerRemote getMeasurementDefinitionManager() { + return getProxy(LookupUtil.getMeasurementDefinitionManager(), MeasurementDefinitionManagerRemote.class); + } + + public MeasurementScheduleManagerRemote getMeasurementScheduleManager() { + return getProxy(LookupUtil.getMeasurementScheduleManager(), MeasurementScheduleManagerRemote.class); + } + + public OperationManagerRemote getOperationManager() { + return getProxy(LookupUtil.getOperationManager(), OperationManagerRemote.class); + } + + public ResourceManagerRemote getResourceManager() { + return getProxy(LookupUtil.getResourceManager(), ResourceManagerRemote.class); + } + + public ResourceFactoryManagerRemote getResourceFactoryManager() { + return getProxy(LookupUtil.getResourceFactoryManager(), ResourceFactoryManagerRemote.class); + } + + public ResourceGroupManagerRemote getResourceGroupManager() { + return getProxy(LookupUtil.getResourceGroupManager(), ResourceGroupManagerRemote.class); + } + + public ResourceTypeManagerRemote getResourceTypeManager() { + return getProxy(LookupUtil.getResourceTypeManager(), ResourceTypeManagerRemote.class); + } + + public RoleManagerRemote getRoleManager() { + return getProxy(LookupUtil.getRoleManager(), RoleManagerRemote.class); + } + + public SavedSearchManagerRemote getSavedSearchManager() { + return getProxy(LookupUtil.getSavedSearchManager(), SavedSearchManagerRemote.class); + } + + public SubjectManagerRemote getSubjectManager() { + return getProxy(LookupUtil.getSubjectManager(), SubjectManagerRemote.class); + } + + public SupportManagerRemote getSupportManager() { + return getProxy(LookupUtil.getSupportManager(), SupportManagerRemote.class); + } + + public SystemManagerRemote getSystemManager() { + return getProxy(LookupUtil.getSystemManager(), SystemManagerRemote.class); + } + + public RemoteInstallManagerRemote getRemoteInstallManager() { + return getProxy(LookupUtil.getRemoteInstallManager(), RemoteInstallManagerRemote.class); + } + + public TagManagerRemote getTagManager() { + return getProxy(LookupUtil.getTagManager(), TagManagerRemote.class); + } + + public Map<String, Object> getManagers() { + if (managers == null) { + + managers = new HashMap<String, Object>(); + + for (RhqManagers manager : RhqManagers.values()) { + try { + Method m = getClass().getMethod("get" + manager.name()); + managers.put(manager.name(), m.invoke(this)); + } catch (Throwable e) { + LOG.error("Failed to load manager " + manager + " due to missing class.", e); + } + } + } + + return managers; + } + + private <T> T getProxy(Object slsb, Class<T> iface) { + RhqManagers manager = RhqManagers.forInterface(iface); + + return iface.cast(new LocalClientProxy(slsb, this, manager)); + } +} diff --git a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java new file mode 100644 index 0000000..5f3ff90 --- /dev/null +++ b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java @@ -0,0 +1,67 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 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 as published by + * the Free Software Foundation version 2 of the License. + * + * 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 for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.enterprise.client; + +import java.lang.reflect.Method; +import java.util.Arrays; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.rhq.bindings.client.AbstractRhqFacadeProxy; +import org.rhq.bindings.client.RhqManagers; + +/** + * This is a proxy interface that simply calls given (de-simplified) method on a provided object. + * The use-case here is to invoke a method from a remote interface on the local SLSB. + * + * @author Lukas Krejci + */ +public class LocalClientProxy extends AbstractRhqFacadeProxy<LocalClient> { + + private static final Log LOG = LogFactory.getLog(LocalClientProxy.class); + + private Object localSLSB; + + public LocalClientProxy(Object localSLSB, LocalClient client, RhqManagers manager) { + super(client, manager); + this.localSLSB = localSLSB; + } + + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + try { + return super.invoke(proxy, method, args); + } catch (Throwable t) { + LOG.warn("Proxied invocation of method [" + method + "] on [" + getManager() + "] failed.", t); + throw t; + } + } + + protected Object doInvoke(Object proxy, Method originalMethod, java.lang.Class<?>[] argTypes, Object[] args) throws Throwable { + try { + Method realMethod = localSLSB.getClass().getMethod(originalMethod.getName(), argTypes); + + return realMethod.invoke(localSLSB, args); + } catch (NoSuchMethodException e) { + throw new IllegalArgumentException("Method [" + originalMethod + "] does not have a desimplified counterpart with arguments " + Arrays.asList(argTypes) + ".", e); + } + }; + +} commit f099315a543671acf0098838b6ccded98b591091 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Sat Jan 15 00:33:54 2011 +0100 remove unused imports diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java index 0fdf46a..7472953 100644 --- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java +++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java @@ -37,9 +37,7 @@ import org.apache.commons.logging.LogFactory; import org.rhq.bindings.engine.JsEngineInitializer; import org.rhq.bindings.engine.ScriptEngineInitializer; -import org.rhq.bindings.export.Exporter; import org.rhq.bindings.util.PackageFinder; -import org.rhq.core.domain.util.PageControl; /** * This is RHQ specific imitation of ScriptEngineFactory. commit a825962db3c7bacf83f3c7f5bf11f33dc8b2ebb1 Merge: c240a5c... 4d895c6... Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Fri Jan 14 14:26:22 2011 +0100 Merge branch 'master' into cli-alert-notifs commit 4d895c6794fc8b746e4f8c2f7593b7deaa083d76 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Fri Jan 14 14:25:40 2011 +0100 Fix the discrepancy between the return type of the query ResourceType.FIND_ALL_TEMPLATE_COUNT_COMPOSITES and the type expected in the code. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java index 947bf62..9e0ce28 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java @@ -96,8 +96,6 @@ import org.rhq.core.domain.util.Summary; @NamedQuery(name = ResourceType.FIND_CHILDREN_BY_PARENT, query = "SELECT DISTINCT rt FROM ResourceType AS rt " + "JOIN FETCH rt.parentResourceTypes AS pa " + // also fetch parents, as we need them later "WHERE rt.deleted = false and pa IN (:resourceType)"), - // template count composites need the parent types fetched; however, because of a quirk in hibernate, - // we can't use the template component constructor in the select, we'll build the composites in our code @NamedQuery(name = ResourceType.FIND_ALL_TEMPLATE_COUNT_COMPOSITES, query = "" // + "SELECT new org.rhq.core.domain.resource.composite.ResourceTypeTemplateCountComposite" // + "(" // diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java index b4086b9..e225f7e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java @@ -391,23 +391,19 @@ public class ResourceTypeManagerBean implements ResourceTypeManagerLocal, Resour ResourceFacetsCache.getSingleton().reload(facets); } - @SuppressWarnings("unchecked") public Map<Integer, ResourceTypeTemplateCountComposite> getTemplateCountCompositeMap() { Query templateCountQuery = entityManager.createNamedQuery(ResourceType.FIND_ALL_TEMPLATE_COUNT_COMPOSITES); - // the weirdness here is because we needed to JOIN FETCH the parent types, but hibernate bombs when you do that - // and try to use a composite constructor in the query itself. We need to build the composites here. - // Our results will be a list of arrays that we'll build into the composite below - List<?> results = templateCountQuery.getResultList(); + + @SuppressWarnings("unchecked") + List<ResourceTypeTemplateCountComposite> results = (List<ResourceTypeTemplateCountComposite>) templateCountQuery.getResultList(); // we don't need to send all the data in resource types over the wire, so we'll be scrubbing the types // to avoid the scrubbed types getting persisted back to the db, let's clear the persistence context entityManager.clear(); Map<Integer, ResourceTypeTemplateCountComposite> compositeMap = new HashMap<Integer, ResourceTypeTemplateCountComposite>(); - for (Object result : results) { - Object[] array = (Object[]) result; - - ResourceType type = (ResourceType) array[0]; + for (ResourceTypeTemplateCountComposite result : results) { + ResourceType type = result.getType(); // scrub it to avoid sending data over the wire we don't need // some of these are eagerly loaded, but my paranoia says assume everything is eagerly loaded to purge it all @@ -427,10 +423,7 @@ public class ResourceTypeManagerBean implements ResourceTypeManagerLocal, Resour type.setResources(null); type.setSubCategory(null); - ResourceTypeTemplateCountComposite composite = new ResourceTypeTemplateCountComposite(type, - ((Number) array[1]).longValue(), ((Number) array[2]).longValue(), ((Number) array[3]).longValue(), - ((Number) array[4]).longValue()); - compositeMap.put(composite.getType().getId(), composite); + compositeMap.put(type.getId(), result); } return compositeMap;

1 0

[rhq] modules/enterprise
by ips 14 Jan '11

14 Jan '11

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/BooleanCellFormatter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 917f52644a84f3bed85ff35e9ddd6ca13d10c759 Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Jan 14 17:25:10 2011 -0500 fix bug where enabled icon was used for false and disabled icon for true, rather than the other way around diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/BooleanCellFormatter.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/BooleanCellFormatter.java index 1b709f3..1d3e13f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/BooleanCellFormatter.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/BooleanCellFormatter.java @@ -21,7 +21,7 @@ public class BooleanCellFormatter implements CellFormatter { if (value == null) { imageUrl = ICON_URL_NULL; } else if (value instanceof Boolean) { - imageUrl = ((Boolean) value) ? ICON_URL_FALSE : ICON_URL_TRUE; + imageUrl = ((Boolean) value) ? ICON_URL_TRUE : ICON_URL_FALSE; } else { throw new IllegalArgumentException("value parameter is not a Boolean."); }

1 0

[rhq] modules/enterprise
by John Sanda 14 Jan '11

14 Jan '11

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBean.java | 6 ++++++ 1 file changed, 6 insertions(+) New commits: commit 16f1caf77a3f0121530caebb737066191aa87cb3 Author: John Sanda <jsanda(a)redhat.com> Date: Fri Jan 14 16:17:21 2011 -0500 [BZ 669567] Don't update package types for a bundle plugin Package types are not applicable to bundle plugins so we do not even need to compare package type between the old and the new plugins. The new bundle plugin will also have zero package types. The old plugin will have pakcage types associated with it if there are deployed bundles. This was resulting in our incorrectly deleting package types. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBean.java index e091828..d264bd8 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBean.java @@ -43,6 +43,8 @@ public class ContentMetadataManagerBean implements ContentMetadataManagerLocal { public void updateMetadata(ResourceType existingType, ResourceType newType) { log.debug("Updating bundle type and package types for " + existingType); + existingType = entityMgr.find(ResourceType.class, existingType.getId()); + // set the bundle type if one is defined BundleType newBundleType = newType.getBundleType(); if (newBundleType != null) { @@ -56,6 +58,10 @@ public class ContentMetadataManagerBean implements ContentMetadataManagerLocal { log.debug("Updating bundle type to " + newBundleType); } existingType.setBundleType(newBundleType); + + // If bundleType is not null then this in a bundle plugin and we do not need to do any further + // processing because a bundle plugin cannot define any other content. + return; } else { if (log.isDebugEnabled()) { log.debug("Removing bundle type");

1 0

[rhq] modules/enterprise
by Simeon Pinder 14 Jan '11

14 Jan '11

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceAgentView.java | 26 +++++++--- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 1 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/PingAgentUIBean.java | 5 + modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StatusManagerBean.java | 6 +- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java | 15 +++-- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java | 6 +- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 18 +++--- 8 files changed, 48 insertions(+), 31 deletions(-) New commits: commit 12e0188663cf0f6956b94f0ce2e59d24359ca112 Author: Simeon Pinder <spinder(a)redhat.com> Date: Fri Jan 14 09:11:50 2011 -0500 BZ 669521: relaxing permissions requirement for AgentManagerBean.getAgentByResourceId() to require MANAGE_SETTINGS instead of MANAGE_INVENTORY and updated AgentView messages to better reflect insufficient permissions. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceAgentView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceAgentView.java index 227eac9..e1c16de 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceAgentView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceAgentView.java @@ -23,6 +23,7 @@ import java.util.Date; import java.util.List; import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.form.fields.FormItem; import com.smartgwt.client.widgets.form.fields.FormItemIcon; import com.smartgwt.client.widgets.form.fields.HeaderItem; @@ -102,16 +103,15 @@ public class ResourceResourceAgentView extends LocatableVLayout implements Refre // Agent Status agentStatusIcon = new FormItemIcon(); agentStatusIcon.setSrc(ImageManager.getAvailabilityLargeIcon(null)); - StaticTextItem agentStatus = - new StaticTextItem("agent-comm-status", MSG.view_inventory_summary_agent_status_title()); + StaticTextItem agentStatus = new StaticTextItem("agent-comm-status", MSG + .view_inventory_summary_agent_status_title()); agentStatus.setIcons(agentStatusIcon); agentStatus.setWrapTitle(false); formItems.add(agentStatus); // Last Received Avail report String lastAvailReport = "last-avail-report"; - lastAvailReportValue = new StaticTextItem(lastAvailReport, MSG - .view_inventory_summary_agent_last_title()); + lastAvailReportValue = new StaticTextItem(lastAvailReport, MSG.view_inventory_summary_agent_last_title()); lastAvailReportValue.setWrapTitle(false); formItems.add(lastAvailReportValue); @@ -127,7 +127,19 @@ public class ResourceResourceAgentView extends LocatableVLayout implements Refre GWTServiceLookup.getAgentService().getAgentForResource(this.resourceId, new AsyncCallback<Agent>() { @Override public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_inventory_summary_agent_error1() + resourceId + ".", caught); + //Permissions failure, generate message to that effect + for (Canvas child : form.getChildren()) { + child.destroy(); + } + + HeaderItem headerItem = new HeaderItem("header", MSG.view_inventory_summary_agent_title()); + headerItem.setValue(MSG.view_inventory_summary_agent_title()); + StaticTextItem permissionsMessage = new StaticTextItem("permissions", "permissionsFailure"); + permissionsMessage.setShowTitle(false); + permissionsMessage.setValue(MSG.view_inventory_summary_agent_error3()); + permissionsMessage.setWrap(false); + form.setFields(headerItem, new SpacerItem(), permissionsMessage); + form.markForRedraw(); } @Override @@ -135,8 +147,8 @@ public class ResourceResourceAgentView extends LocatableVLayout implements Refre GWTServiceLookup.getAgentService().pingAgentForResource(resourceId, new AsyncCallback<Boolean>() { @Override public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_inventory_summary_agent_error2() + resourceId + ".", - caught); + CoreGUI.getErrorHandler().handleError( + MSG.view_inventory_summary_agent_error2() + " " + resourceId + ".", caught); agentStatusIcon.setSrc(ImageManager.getAvailabilityLargeIcon(null)); form.markForRedraw(); } diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 4322960..a7de6fa 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -1270,6 +1270,7 @@ view_inventory_servers = Servers view_inventory_services = Services view_inventory_summary_agent_error1 = Failed to locate agent managing resource id view_inventory_summary_agent_error2 = Failed to ping agent managing resource id +view_inventory_summary_agent_error3 = You do not have permission to view details for this Agent. view_inventory_summary_agent_fullEnpoint = Full Endpoint view_inventory_summary_agent_fullEnpoint_err1 = !No remote endpoint associated with this resource! view_inventory_summary_agent_last_title = Last Received Availability Report diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/PingAgentUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/PingAgentUIBean.java index 989d10d..941aed7 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/PingAgentUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/PingAgentUIBean.java @@ -21,8 +21,8 @@ package org.rhq.enterprise.gui.inventory.resource; import org.rhq.core.domain.resource.Agent; import org.rhq.core.gui.util.FacesContextUtility; import org.rhq.enterprise.gui.legacy.ParamConstants; -import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; import org.rhq.enterprise.server.agentclient.AgentClient; +import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.core.AgentManagerLocal; import org.rhq.enterprise.server.util.LookupUtil; @@ -37,6 +37,7 @@ public class PingAgentUIBean { private Boolean pingResults = null; private Agent agent = null; private AgentManagerLocal agentManager = LookupUtil.getAgentManager(); + private SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager(); public PingAgentUIBean() { } @@ -76,7 +77,7 @@ public class PingAgentUIBean { try { int resourceId = FacesContextUtility.getRequiredRequestParameter(ParamConstants.RESOURCE_ID_PARAM, Integer.class); - agent = agentManager.getAgentByResourceId(EnterpriseFacesContextUtility.getSubject(), resourceId); + agent = agentManager.getAgentByResourceId(subjectManager.getOverlord(), resourceId); if (agent == null) { throw new IllegalStateException("No agent is associated with the resource with id " + resourceId + "."); } diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java index 6b8af11..d7b6339 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java @@ -80,7 +80,7 @@ public class ResourceTreeModelUIBean { HibernatePerformanceMonitor.get().stop(monitorId, "ResourceTree root resource"); log.debug("Found root resource in " + (end - start)); - Agent agent = agentManager.getAgentByResourceId(EnterpriseFacesContextUtility.getSubject(), rootResource + Agent agent = agentManager.getAgentByResourceId(LookupUtil.getSubjectManager().getOverlord(), rootResource .getId()); start = System.currentTimeMillis(); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StatusManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StatusManagerBean.java index 737e378..dfd1990 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StatusManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StatusManagerBean.java @@ -43,6 +43,7 @@ import org.rhq.enterprise.server.alert.AlertDefinitionManagerLocal; import org.rhq.enterprise.server.cloud.instance.CacheConsistencyManagerBean; import org.rhq.enterprise.server.cloud.instance.ServerManagerLocal; import org.rhq.enterprise.server.core.AgentManagerLocal; +import org.rhq.enterprise.server.util.LookupUtil; /** * There are various changes that can occur in the system that make the alertscondition cache stale. @@ -126,7 +127,7 @@ public class StatusManagerBean implements StatusManagerLocal { * this is informational debugging only - do NOT change the status bits here */ if (log.isDebugEnabled()) { - Agent agent = agentManager.getAgentByResourceId(subject, resourceId); + Agent agent = agentManager.getAgentByResourceId(LookupUtil.getSubjectManager().getOverlord(), resourceId); log.debug("Marking status, agent[id=" + agent.getId() + ", status=" + agent.getStatus() + "] for resource[id=" + resourceId + "]"); @@ -160,7 +161,8 @@ public class StatusManagerBean implements StatusManagerLocal { */ if (log.isDebugEnabled()) { AlertDefinition definition = entityManager.find(AlertDefinition.class, alertDefinitionId); - Agent agent = agentManager.getAgentByResourceId(subject, definition.getResource().getId()); + Agent agent = agentManager.getAgentByResourceId(LookupUtil.getSubjectManager().getOverlord(), definition + .getResource().getId()); log.debug("Marking status, agent[id=" + agent.getId() + ", status=" + agent.getStatus() + "] for alertDefinition[id=" + alertDefinitionId + "]"); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java index f47fba6..25db8ff 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java @@ -157,7 +157,9 @@ public class AgentManagerBean implements AgentManagerLocal { return client; } - @ExcludeDefaultInterceptors + /* + * Removed ExcludeDefaultInterceptors annotation to enable permission and session check by the container. + */ public AgentClient getAgentClient(Subject subject, int resourceId) { Agent agent = getAgentByResourceId(subject, resourceId); @@ -355,16 +357,17 @@ public class AgentManagerBean implements AgentManagerLocal { return agent; } - @ExcludeDefaultInterceptors + /* + * Removed ExcludeDefaultInterceptors annotation to enable permission and session check by the container. + */ public Agent getAgentByResourceId(Subject subject, int resourceId) { Agent agent; try { - //insert logged in check and view resources perm check as method calld from GWT*Service - if ((subject != null) - && (!authorizationManager.hasResourcePermission(subject, Permission.MANAGE_INVENTORY, resourceId))) { + //insert logged in check and view resources perm check as method called from GWT*Service + if ((subject != null) && (!authorizationManager.hasGlobalPermission(subject, Permission.MANAGE_SETTINGS))) { throw new PermissionException("Can not get agent details - " + subject + " lacks " - + Permission.MANAGE_INVENTORY + " for resource[id=" + resourceId + "]"); + + Permission.MANAGE_SETTINGS + " for resource[id=" + resourceId + "]"); } Query query = entityManager.createNamedQuery(Agent.QUERY_FIND_BY_RESOURCE_ID); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java index 602d2c3..98110ac 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java @@ -307,13 +307,13 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage return; } - @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_INVENTORY), + @RequiredPermissions( { @RequiredPermission(Permission.MANAGE_INVENTORY), @RequiredPermission(Permission.MANAGE_SETTINGS) }) public void disableAllDefaultCollections(Subject subject) { entityManager.createNamedQuery(MeasurementDefinition.DISABLE_ALL).executeUpdate(); } - @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_INVENTORY), + @RequiredPermissions( { @RequiredPermission(Permission.MANAGE_INVENTORY), @RequiredPermission(Permission.MANAGE_SETTINGS) }) public void disableAllSchedules(Subject subject) { entityManager.createNamedQuery(MeasurementSchedule.DISABLE_ALL).executeUpdate(); @@ -496,7 +496,7 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage // The number of Agents is manageable, so we can work with entities here for (Integer resourceId : reqMap.keySet()) { - Agent agent = agentManager.getAgentByResourceId(subject, resourceId); + Agent agent = agentManager.getAgentByResourceId(subjectManager.getOverlord(), resourceId); Set<ResourceMeasurementScheduleRequest> agentUpdate = agentUpdates.get(agent); if (agentUpdate == null) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java index f4c0a94..5f62fa9 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java @@ -269,7 +269,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage if (resource.getParentResource() == null) { try { // note, this needs to be done before the marking because the agent reference is going to be set to null - doomedAgent = agentManager.getAgentByResourceId(user, resourceId); + doomedAgent = agentManager.getAgentByResourceId(subjectManager.getOverlord(), resourceId); } catch (Exception e) { doomedAgent = null; log.warn("This warning should occur in TEST code only! " + e); @@ -403,7 +403,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage } // one more thing, delete any autogroup backing groups - if (attachedResource!=null) { + if (attachedResource != null) { List<ResourceGroup> backingGroups = attachedResource.getAutoGroupBackingGroups(); if (null != backingGroups && !backingGroups.isEmpty()) { int size = backingGroups.size(); @@ -417,8 +417,8 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage if (log.isDebugEnabled()) { log.error("Bulk delete error for autogroup backing group deletion for " + backingGroupIds, t); } else { - log.error("Bulk delete error for autogroup backing group deletion for " + backingGroupIds + ": " - + t.getMessage()); + log.error("Bulk delete error for autogroup backing group deletion for " + backingGroupIds + + ": " + t.getMessage()); } } } @@ -2332,15 +2332,13 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage @SuppressWarnings("unchecked") public List<Integer> findIdsByTypeIds(List<Integer> resourceTypeIds) { - return entityManager.createNamedQuery(Resource.QUERY_FIND_IDS_BY_TYPE_IDS) - .setParameter("resourceTypeIds", resourceTypeIds) - .getResultList(); + return entityManager.createNamedQuery(Resource.QUERY_FIND_IDS_BY_TYPE_IDS).setParameter("resourceTypeIds", + resourceTypeIds).getResultList(); } @Override public Integer getResourceCount(List<Integer> resourceTypeIds) { - return (Integer) entityManager.createNamedQuery(Resource.QUERY_FIND_COUNT_BY_TYPES) - .setParameter("resourceTypeIds", resourceTypeIds) - .getSingleResult(); + return (Integer) entityManager.createNamedQuery(Resource.QUERY_FIND_COUNT_BY_TYPES).setParameter( + "resourceTypeIds", resourceTypeIds).getSingleResult(); } }

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits January 2011