rhq-commits January 2012

rhq-commits@lists.fedorahosted.org

11 participants
173 discussions

[rhq] Branch 'release_jon2.4.2.GA' - modules/cli-tests modules/common modules/core modules/enterprise modules/helpers modules/plugins modules/pom.xml modules/test-utils pom.xml
by rhqci 23 Jan '12

23 Jan '12

modules/cli-tests/pom.xml | 2 +- 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 +- 104 files changed, 104 insertions(+), 104 deletions(-) New commits: commit 5d64633dc816dd4e915070b787e54560a563a79d Author: Hudson <jboss-qa-internal(a)redhat.com> Date: Mon Jan 23 15:34:10 2012 -0500 tag RHQ_3_0_1_JON242_GA diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index 20f1e3c..8d68360 100644 --- a/modules/cli-tests/pom.xml +++ b/modules/cli-tests/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <artifactId>rhq-cli-tests</artifactId> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index e217135..9e85b18 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 499c3c7..1142bfa 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 09d2b30..de73f6f 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 4333650..d72fcfb 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index cef6adb..cb2d087 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 821fd7a..3fd2792 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 92cbd31..eaea6a2 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 8d1407d..743bc69 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 2e8f96e..d6f8396 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index d2f2783..f9fba7b 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index 5858735..67b3838 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 41b5032..e9d85a1 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 4af0ec2..cb8b277 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 21d0d17..d9db30a 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 4085f1e..fbdf3ef 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 754e17c..f2eac27 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index b8befb6..cd971d6 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 196b91f..8915cfd 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index b396975..47bc23d 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 50ddc74..770ffff 100644 --- a/modules/enterprise/gui/base-perspective-jar/pom.xml +++ b/modules/enterprise/gui/base-perspective-jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 e2f11e3..fee340c 100644 --- a/modules/enterprise/gui/base-perspective-war/pom.xml +++ b/modules/enterprise/gui/base-perspective-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 24c150c..7c00862 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index f81fb29..bb3de86 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 a2d8646..8be360e 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 18f5faf..9fe206d 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 7038aa9..14c917e 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 23111ec..16aca09 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 4fc012b..d050076 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 697fc25..4526487 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 d125df1..be3cf45 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <artifactId>rhq-remoting-client-api</artifactId> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 1978a61..4a2c7ee 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <artifactId>rhq-remoting-parent</artifactId> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index d4bbfa4..ca723a9 100644 --- a/modules/enterprise/remoting/webservices/pom.xml +++ b/modules/enterprise/remoting/webservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 a9b86a6..192836e 100644 --- a/modules/enterprise/server/container-lib/pom.xml +++ b/modules/enterprise/server/container-lib/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index d87b3a8..5f551b0 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 6938d3f..92e1873 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index d3e2c61..c4d018a 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 340cb89..ff4ed8e 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 4885fa5..3135d45 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 bcda8f2..fa8cbec 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 02d76c4..69d276c 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 7733355..4aa06f7 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 5e32a63..e3552c3 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 e709690..8cbe65b 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 03d8e10..b97190d 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 4a81543..47caebf 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 071d598..5214721 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 a38341f..5ea374a 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 2ce3dbc..e3e9032 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 6fb5bca..23a8eb8 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 d485c32..fb34937 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 b007fab..f312157 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 496284a..dcb8c9a 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 7bf5285..bd8654f 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 f8ea595..c98c2ea 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 448b63d..5cce22a 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 e39fd97..79a4ead 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 b29d418..e8ceb5d 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 4c9e9ca..099b56f 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index fede9ed..5531eac 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 4443c00..f4b89b0 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index d9c6077..3d3ac05 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 80ba40e..5e0db42 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 228218f..7412383 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index e4cee71..df0d64c 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 4ee1406..ef3090a 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 6a23d9e..a822ab8 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 0698e1e..fd08ccc 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index beaca63..d879477 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index 42e0608..13d3c3f 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 9712ab4..03beb20 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index bb593df..d464b41 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index d4e0180..d9df461 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 9105244..ed5cfb4 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 804b8d6..baffb10 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>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 2c0cc48..f63d05e 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 42002cc..b8fe900 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 87dbfc2..97835f0 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 d7bdcaf..9f2522f 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 3d473fc..2abe0de 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 66751e7..8656715 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 3bdf2dd..b0eef7a 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 279a403..e3bc18a 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index ddfcb1c..38684e0 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 9ecce7a..8147c2d 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index ab2814c..77ef2d4 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index a6a299a..de9bc6d 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 34c8592..654d23e 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 297212b..70a80a1 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 350284c..0db1680 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index d2d6cc8..6a1bdac 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 104b01c..e43228b 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 158dfc4..11521dc 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 048d737..ec50f41 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index bfb8208..c874e1b 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index e0feacd..ac7a7a9 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 776116a..931f8ba 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 7f6cd6f..76157ee 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index df463bb..5de4a62 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 6724b8a..9c9cc4b 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</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 b657cf8..972f4b1 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 4cd70e6..ac0e4ce 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 8d557f7..2c364cf 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index 68aa827..1b80668 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.JON243-SNAPSHOT</version> + <version>3.0.1.JON242.GA</version> <packaging>pom</packaging> <name>RHQ</name>

1 0

[rhq] modules/enterprise
by ips 23 Jan '12

23 Jan '12

modules/enterprise/agent/src/etc/rhq-agent.bat | 454 ++++++++++++------------- 1 file changed, 227 insertions(+), 227 deletions(-) New commits: commit 459fa871d3808fc03c56bc7930c827a29ade6587 Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Jan 23 15:04:02 2012 -0500 change the line endings back to Windows format (CRLF) (IntelliJ converted them to Unix format (LF) on my last commit) diff --git a/modules/enterprise/agent/src/etc/rhq-agent.bat b/modules/enterprise/agent/src/etc/rhq-agent.bat index fc8bdf1..005e535 100644 --- a/modules/enterprise/agent/src/etc/rhq-agent.bat +++ b/modules/enterprise/agent/src/etc/rhq-agent.bat @@ -1,227 +1,227 @@ -@echo off - -rem =========================================================================== -rem RHQ Agent Windows Startup Script -rem -rem This file is used to execute the RHQ Agent on a Windows platform. -rem Run this script with the --help option for the runtime options. -rem -rem Note that this script can also be used to simply set environment variables -rem that define the agent's environment but it will not actually run the agent. -rem Pass in _SETENV_ONLY as the first argument to this script if you want this -rem behavior. -rem -rem This script is customizable by setting certain environment variables, which -rem are described in comments in rhq-agent-env.bat. The variables can also be -rem set via rhq-agent-env.bat, which is sourced by this script. -rem -rem If the embedded JRE is to be used but is not available, the fallback -rem JRE to be used will be determined by the JAVA_HOME environment variable. -rem =========================================================================== - -setlocal - -if "%1"=="_SETENV_ONLY" ( - set _SETENV_ONLY=true -) else ( - title RHQ Agent -) - -rem if debug variable is set, it is assumed to be on, unless its value is false -if "%RHQ_AGENT_DEBUG%" == "false" ( - set RHQ_AGENT_DEBUG= -) - -rem ---------------------------------------------------------------------- -rem Change directory so the current directory is the Agent home. -rem Here we assume this script is a child directory of the Agent home -rem We also assume our custom environment script is located in the same -rem place as this script. -rem ---------------------------------------------------------------------- - -set RHQ_AGENT_BIN_DIR_PATH=%~dp0 - -if exist "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" ( - if defined RHQ_AGENT_DEBUG echo Loading environment script: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat - call "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" %* -) else ( - if defined RHQ_AGENT_DEBUG echo No environment script found at: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat -) - -rem if debug variable is set, it is assumed to be on, unless its value is false -if "%RHQ_AGENT_DEBUG%" == "false" ( - set RHQ_AGENT_DEBUG= -) - -rem if sigar debug variable is set, it is assumed to be on, unless its value is false -if "%RHQ_AGENT_SIGAR_DEBUG%" == "false" ( - set RHQ_AGENT_SIGAR_DEBUG= -) - -if not defined RHQ_AGENT_HOME ( - cd "%RHQ_AGENT_BIN_DIR_PATH%\.." -) else ( - cd "%RHQ_AGENT_HOME%" || ( - echo Cannot go to the RHQ_AGENT_HOME directory: %RHQ_AGENT_HOME% - exit /B 1 - ) -) - -set RHQ_AGENT_HOME=%CD% - -if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_HOME: %RHQ_AGENT_HOME% - -rem ---------------------------------------------------------------------- -rem Find the Java executable and verify we have a VM available -rem ---------------------------------------------------------------------- - -if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH ( - if not defined RHQ_AGENT_JAVA_HOME call :prepare_embedded_jre -) - -if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH ( - set RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_HOME%\bin\java.exe -) - -if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_HOME: %RHQ_AGENT_JAVA_HOME% -if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_EXE_FILE_PATH: %RHQ_AGENT_JAVA_EXE_FILE_PATH% - -if not exist "%RHQ_AGENT_JAVA_EXE_FILE_PATH%" ( - echo There is no JVM available. - echo Please set RHQ_AGENT_JAVA_HOME or RHQ_AGENT_JAVA_EXE_FILE_PATH appropriately. - exit /B 1 -) - -rem ---------------------------------------------------------------------- -rem Prepare the classpath -rem ---------------------------------------------------------------------- - -set CLASSPATH= -call :append_classpath "%RHQ_AGENT_HOME%\conf" -for /R "%RHQ_AGENT_HOME%\lib" %%G in ("*.jar") do ( - call :append_classpath "%%G" - if defined RHQ_AGENT_DEBUG echo CLASSPATH entry: %%G -) -for %%G in ("%RHQ_AGENT_JAVA_HOME%\lib\tools.jar" "%RHQ_AGENT_JAVA_HOME%\..\lib\tools.jar") do ( - if exist "%%G" ( - call :append_classpath "%%G" - if defined RHQ_AGENT_DEBUG echo CLASSPATH entry: %%G - goto end_classpath - ) -) -:end_classpath - -rem ---------------------------------------------------------------------- -rem Prepare the VM command line options to be passed in -rem ---------------------------------------------------------------------- - -if not defined RHQ_AGENT_JAVA_OPTS ( - set RHQ_AGENT_JAVA_OPTS=-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true -) -if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_OPTS: %RHQ_AGENT_JAVA_OPTS% - -if "%RHQ_AGENT_JAVA_ENDORSED_DIRS%" == "none" ( - if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.endorsed.dirs - goto :skip_java_endorsed_dirs -) -if not defined RHQ_AGENT_JAVA_ENDORSED_DIRS set RHQ_AGENT_JAVA_ENDORSED_DIRS=%RHQ_AGENT_HOME%\lib\endorsed -if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_ENDORSED_DIRS: %RHQ_AGENT_JAVA_ENDORSED_DIRS% -set _JAVA_ENDORSED_DIRS_OPT="-Djava.endorsed.dirs=%RHQ_AGENT_JAVA_ENDORSED_DIRS%" -:skip_java_endorsed_dirs - -if "%RHQ_AGENT_JAVA_LIBRARY_PATH%" == "none" ( - if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.library.path - goto :skip_java_library_path -) -if not defined RHQ_AGENT_JAVA_LIBRARY_PATH set RHQ_AGENT_JAVA_LIBRARY_PATH=%RHQ_AGENT_HOME%\lib -if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_LIBRARY_PATH: %RHQ_AGENT_JAVA_LIBRARY_PATH% -set _JAVA_LIBRARY_PATH_OPT="-Djava.library.path=%RHQ_AGENT_JAVA_LIBRARY_PATH%" -:skip_java_library_path - -if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_ADDITIONAL_JAVA_OPTS: %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% - -rem ---------------------------------------------------------------------- -rem Prepare the command line arguments passed to the RHQ Agent -rem ---------------------------------------------------------------------- - -if not defined RHQ_AGENT_CMDLINE_OPTS ( - set RHQ_AGENT_CMDLINE_OPTS=%* -) - -if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_CMDLINE_OPTS: %RHQ_AGENT_CMDLINE_OPTS% - -rem ---------------------------------------------------------------------- -rem Execute the VM which starts the agent -rem ---------------------------------------------------------------------- - -if defined RHQ_AGENT_DEBUG ( - set _LOG_CONFIG=-Dlog4j.configuration=log4j-debug.xml -Di18nlog.dump-stack-traces=true -) else ( - set _LOG_CONFIG=-Dlog4j.configuration=log4j.xml -) - -rem if sigar debug is enabled, the log configuration is different - sigar debugging is noisy, so it has its own debug var -if defined RHQ_AGENT_SIGAR_DEBUG ( - set _LOG_CONFIG=%_LOG_CONFIG% -Dsigar.nativeLogging=true -) - -rem to support other agents/plugin containers, allow the caller to override the main classname -if not defined RHQ_AGENT_MAINCLASS ( - set RHQ_AGENT_MAINCLASS=org.rhq.enterprise.agent.AgentMain -) - -set CMD="%RHQ_AGENT_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT% %_JAVA_LIBRARY_PATH_OPT% %RHQ_AGENT_JAVA_OPTS% %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% %_LOG_CONFIG% -cp "%CLASSPATH%" %RHQ_AGENT_MAINCLASS% %RHQ_AGENT_CMDLINE_OPTS% - -if not defined _SETENV_ONLY ( - rem log4j 1.2.8 does not create the directory for us (later versions do) - if not exist "%RHQ_AGENT_HOME%\logs" ( - mkdir "%RHQ_AGENT_HOME%\logs" - ) - if defined RHQ_AGENT_DEBUG ( - echo Executing the agent with this command line: - echo %CMD% - ) - cmd.exe /S /C "%CMD%" -) - -goto :done - -rem ---------------------------------------------------------------------- -rem CALL subroutine that appends the first argument to CLASSPATH -rem ---------------------------------------------------------------------- - -:append_classpath -set _entry=%1 -if not defined CLASSPATH ( - set CLASSPATH=%_entry:"=% -) else ( - set CLASSPATH=%CLASSPATH%;%_entry:"=% -) -goto :eof - -rem ---------------------------------------------------------------------- -rem CALL subroutine that prepares to use the embedded JRE -rem ---------------------------------------------------------------------- - -:prepare_embedded_jre -set RHQ_AGENT_JAVA_HOME=%RHQ_AGENT_HOME%\jre -if defined RHQ_AGENT_DEBUG echo Using the embedded JRE -if not exist "%RHQ_AGENT_JAVA_HOME%" ( - if defined RHQ_AGENT_DEBUG echo No embedded JRE found - will try to use JAVA_HOME: %JAVA_HOME% - set RHQ_AGENT_JAVA_HOME=%JAVA_HOME% -) -goto :eof - -rem ---------------------------------------------------------------------- -rem CALL subroutine that exits this script normally -rem ---------------------------------------------------------------------- - -:done -if defined RHQ_AGENT_DEBUG echo %0 done. -if defined _SETENV_ONLY ( -endlocal & SET "RHQ_AGENT_HOME=%RHQ_AGENT_HOME%" & SET "RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_EXE_FILE_PATH%" & SET "RHQ_AGENT_JAVA_OPTS=%RHQ_AGENT_JAVA_OPTS%" & SET "RHQ_AGENT_ADDITIONAL_JAVA_OPTS=%RHQ_AGENT_ADDITIONAL_JAVA_OPTS%" & SET "RHQ_AGENT_BIN_DIR_PATH=%RHQ_AGENT_BIN_DIR_PATH%" -) else ( -endlocal -) - -exit /B 0 +@echo off + +rem =========================================================================== +rem RHQ Agent Windows Startup Script +rem +rem This file is used to execute the RHQ Agent on a Windows platform. +rem Run this script with the --help option for the runtime options. +rem +rem Note that this script can also be used to simply set environment variables +rem that define the agent's environment but it will not actually run the agent. +rem Pass in _SETENV_ONLY as the first argument to this script if you want this +rem behavior. +rem +rem This script is customizable by setting certain environment variables, which +rem are described in comments in rhq-agent-env.bat. The variables can also be +rem set via rhq-agent-env.bat, which is sourced by this script. +rem +rem If the embedded JRE is to be used but is not available, the fallback +rem JRE to be used will be determined by the JAVA_HOME environment variable. +rem =========================================================================== + +setlocal + +if "%1"=="_SETENV_ONLY" ( + set _SETENV_ONLY=true +) else ( + title RHQ Agent +) + +rem if debug variable is set, it is assumed to be on, unless its value is false +if "%RHQ_AGENT_DEBUG%" == "false" ( + set RHQ_AGENT_DEBUG= +) + +rem ---------------------------------------------------------------------- +rem Change directory so the current directory is the Agent home. +rem Here we assume this script is a child directory of the Agent home +rem We also assume our custom environment script is located in the same +rem place as this script. +rem ---------------------------------------------------------------------- + +set RHQ_AGENT_BIN_DIR_PATH=%~dp0 + +if exist "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" ( + if defined RHQ_AGENT_DEBUG echo Loading environment script: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat + call "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" %* +) else ( + if defined RHQ_AGENT_DEBUG echo No environment script found at: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat +) + +rem if debug variable is set, it is assumed to be on, unless its value is false +if "%RHQ_AGENT_DEBUG%" == "false" ( + set RHQ_AGENT_DEBUG= +) + +rem if sigar debug variable is set, it is assumed to be on, unless its value is false +if "%RHQ_AGENT_SIGAR_DEBUG%" == "false" ( + set RHQ_AGENT_SIGAR_DEBUG= +) + +if not defined RHQ_AGENT_HOME ( + cd "%RHQ_AGENT_BIN_DIR_PATH%\.." +) else ( + cd "%RHQ_AGENT_HOME%" || ( + echo Cannot go to the RHQ_AGENT_HOME directory: %RHQ_AGENT_HOME% + exit /B 1 + ) +) + +set RHQ_AGENT_HOME=%CD% + +if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_HOME: %RHQ_AGENT_HOME% + +rem ---------------------------------------------------------------------- +rem Find the Java executable and verify we have a VM available +rem ---------------------------------------------------------------------- + +if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH ( + if not defined RHQ_AGENT_JAVA_HOME call :prepare_embedded_jre +) + +if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH ( + set RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_HOME%\bin\java.exe +) + +if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_HOME: %RHQ_AGENT_JAVA_HOME% +if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_EXE_FILE_PATH: %RHQ_AGENT_JAVA_EXE_FILE_PATH% + +if not exist "%RHQ_AGENT_JAVA_EXE_FILE_PATH%" ( + echo There is no JVM available. + echo Please set RHQ_AGENT_JAVA_HOME or RHQ_AGENT_JAVA_EXE_FILE_PATH appropriately. + exit /B 1 +) + +rem ---------------------------------------------------------------------- +rem Prepare the classpath +rem ---------------------------------------------------------------------- + +set CLASSPATH= +call :append_classpath "%RHQ_AGENT_HOME%\conf" +for /R "%RHQ_AGENT_HOME%\lib" %%G in ("*.jar") do ( + call :append_classpath "%%G" + if defined RHQ_AGENT_DEBUG echo CLASSPATH entry: %%G +) +for %%G in ("%RHQ_AGENT_JAVA_HOME%\lib\tools.jar" "%RHQ_AGENT_JAVA_HOME%\..\lib\tools.jar") do ( + if exist "%%G" ( + call :append_classpath "%%G" + if defined RHQ_AGENT_DEBUG echo CLASSPATH entry: %%G + goto end_classpath + ) +) +:end_classpath + +rem ---------------------------------------------------------------------- +rem Prepare the VM command line options to be passed in +rem ---------------------------------------------------------------------- + +if not defined RHQ_AGENT_JAVA_OPTS ( + set RHQ_AGENT_JAVA_OPTS=-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true +) +if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_OPTS: %RHQ_AGENT_JAVA_OPTS% + +if "%RHQ_AGENT_JAVA_ENDORSED_DIRS%" == "none" ( + if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.endorsed.dirs + goto :skip_java_endorsed_dirs +) +if not defined RHQ_AGENT_JAVA_ENDORSED_DIRS set RHQ_AGENT_JAVA_ENDORSED_DIRS=%RHQ_AGENT_HOME%\lib\endorsed +if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_ENDORSED_DIRS: %RHQ_AGENT_JAVA_ENDORSED_DIRS% +set _JAVA_ENDORSED_DIRS_OPT="-Djava.endorsed.dirs=%RHQ_AGENT_JAVA_ENDORSED_DIRS%" +:skip_java_endorsed_dirs + +if "%RHQ_AGENT_JAVA_LIBRARY_PATH%" == "none" ( + if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.library.path + goto :skip_java_library_path +) +if not defined RHQ_AGENT_JAVA_LIBRARY_PATH set RHQ_AGENT_JAVA_LIBRARY_PATH=%RHQ_AGENT_HOME%\lib +if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_LIBRARY_PATH: %RHQ_AGENT_JAVA_LIBRARY_PATH% +set _JAVA_LIBRARY_PATH_OPT="-Djava.library.path=%RHQ_AGENT_JAVA_LIBRARY_PATH%" +:skip_java_library_path + +if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_ADDITIONAL_JAVA_OPTS: %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% + +rem ---------------------------------------------------------------------- +rem Prepare the command line arguments passed to the RHQ Agent +rem ---------------------------------------------------------------------- + +if not defined RHQ_AGENT_CMDLINE_OPTS ( + set RHQ_AGENT_CMDLINE_OPTS=%* +) + +if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_CMDLINE_OPTS: %RHQ_AGENT_CMDLINE_OPTS% + +rem ---------------------------------------------------------------------- +rem Execute the VM which starts the agent +rem ---------------------------------------------------------------------- + +if defined RHQ_AGENT_DEBUG ( + set _LOG_CONFIG=-Dlog4j.configuration=log4j-debug.xml -Di18nlog.dump-stack-traces=true +) else ( + set _LOG_CONFIG=-Dlog4j.configuration=log4j.xml +) + +rem if sigar debug is enabled, the log configuration is different - sigar debugging is noisy, so it has its own debug var +if defined RHQ_AGENT_SIGAR_DEBUG ( + set _LOG_CONFIG=%_LOG_CONFIG% -Dsigar.nativeLogging=true +) + +rem to support other agents/plugin containers, allow the caller to override the main classname +if not defined RHQ_AGENT_MAINCLASS ( + set RHQ_AGENT_MAINCLASS=org.rhq.enterprise.agent.AgentMain +) + +set CMD="%RHQ_AGENT_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT% %_JAVA_LIBRARY_PATH_OPT% %RHQ_AGENT_JAVA_OPTS% %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% %_LOG_CONFIG% -cp "%CLASSPATH%" %RHQ_AGENT_MAINCLASS% %RHQ_AGENT_CMDLINE_OPTS% + +if not defined _SETENV_ONLY ( + rem log4j 1.2.8 does not create the directory for us (later versions do) + if not exist "%RHQ_AGENT_HOME%\logs" ( + mkdir "%RHQ_AGENT_HOME%\logs" + ) + if defined RHQ_AGENT_DEBUG ( + echo Executing the agent with this command line: + echo %CMD% + ) + cmd.exe /S /C "%CMD%" +) + +goto :done + +rem ---------------------------------------------------------------------- +rem CALL subroutine that appends the first argument to CLASSPATH +rem ---------------------------------------------------------------------- + +:append_classpath +set _entry=%1 +if not defined CLASSPATH ( + set CLASSPATH=%_entry:"=% +) else ( + set CLASSPATH=%CLASSPATH%;%_entry:"=% +) +goto :eof + +rem ---------------------------------------------------------------------- +rem CALL subroutine that prepares to use the embedded JRE +rem ---------------------------------------------------------------------- + +:prepare_embedded_jre +set RHQ_AGENT_JAVA_HOME=%RHQ_AGENT_HOME%\jre +if defined RHQ_AGENT_DEBUG echo Using the embedded JRE +if not exist "%RHQ_AGENT_JAVA_HOME%" ( + if defined RHQ_AGENT_DEBUG echo No embedded JRE found - will try to use JAVA_HOME: %JAVA_HOME% + set RHQ_AGENT_JAVA_HOME=%JAVA_HOME% +) +goto :eof + +rem ---------------------------------------------------------------------- +rem CALL subroutine that exits this script normally +rem ---------------------------------------------------------------------- + +:done +if defined RHQ_AGENT_DEBUG echo %0 done. +if defined _SETENV_ONLY ( +endlocal & SET "RHQ_AGENT_HOME=%RHQ_AGENT_HOME%" & SET "RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_EXE_FILE_PATH%" & SET "RHQ_AGENT_JAVA_OPTS=%RHQ_AGENT_JAVA_OPTS%" & SET "RHQ_AGENT_ADDITIONAL_JAVA_OPTS=%RHQ_AGENT_ADDITIONAL_JAVA_OPTS%" & SET "RHQ_AGENT_BIN_DIR_PATH=%RHQ_AGENT_BIN_DIR_PATH%" +) else ( +endlocal +) + +exit /B 0

1 0

[rhq] 9 commits - modules/core modules/enterprise modules/plugins
by ips 23 Jan '12

23 Jan '12

modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 23 modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java | 2 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceDiscoveryComponent.java | 5 modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/InventoryPrinter.java | 17 modules/enterprise/agent/src/etc/rhq-agent.bat | 446 +++---- modules/enterprise/agent/src/etc/rhq-agent.sh | 9 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingDiscoveryComponent.java | 2 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java | 2 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorDiscoveryComponent.java | 2 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/WarComponent.java | 8 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/DeploymentUtility.java | 4 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/WarDiscoveryHelper.java | 3 modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDiscoveryComponent.java | 2 modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheComponent.java | 2 modules/plugins/jmx/pom.xml | 39 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java | 1 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/InternalJMXServerDiscoveryComponent.java | 30 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java | 599 ++++++---- modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXServerComponent.java | 181 --- modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceDiscoveryComponent.java | 6 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ObjectNameQueryUtility.java | 218 --- modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ParentDefinedJMXServerNamingUtility.java | 57 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ConnectionProviderFactory.java | 218 +++ modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmResourceKey.java | 179 ++ modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmUtility.java | 118 + modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ObjectNameQueryUtility.java | 218 +++ modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ParentDefinedJMXServerNamingUtility.java | 57 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/Socket.java | 120 ++ modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml | 8 modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java | 211 ++- modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/ObjectNameQueryUtilityTest.java | 2 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorComponent.java | 2 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java | 2 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java | 2 34 files changed, 1835 insertions(+), 960 deletions(-) New commits: commit 4673ea4fd280f1073bd92d2aed26ea34c8c23474 Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Jan 23 14:20:29 2012 -0500 [BZ 703557] when possible, auto-discover JVM's not exposing JMX Remoting; as part of this, include the JDK tools.jar in the Agent's classpath when it's available from the Agent's JDK (https://bugzilla.redhat.com/show_bug.cgi?id=703557) diff --git a/modules/enterprise/agent/src/etc/rhq-agent.bat b/modules/enterprise/agent/src/etc/rhq-agent.bat index 59b7676..fc8bdf1 100644 --- a/modules/enterprise/agent/src/etc/rhq-agent.bat +++ b/modules/enterprise/agent/src/etc/rhq-agent.bat @@ -1,219 +1,227 @@ -@echo off - -rem =========================================================================== -rem RHQ Agent Windows Startup Script -rem -rem This file is used to execute the RHQ Agent on a Windows platform. -rem Run this script with the --help option for the runtime options. -rem -rem Note that this script can also be used to simply set environment variables -rem that define the agent's environment but it will not actually run the agent. -rem Pass in _SETENV_ONLY as the first argument to this script if you want this -rem behavior. -rem -rem This script is customizable by setting certain environment variables, which -rem are described in comments in rhq-agent-env.bat. The variables can also be -rem set via rhq-agent-env.bat, which is sourced by this script. -rem -rem If the embedded JRE is to be used but is not available, the fallback -rem JRE to be used will be determined by the JAVA_HOME environment variable. -rem =========================================================================== - -setlocal - -if "%1"=="_SETENV_ONLY" ( - set _SETENV_ONLY=true -) else ( - title RHQ Agent -) - -rem if debug variable is set, it is assumed to be on, unless its value is false -if "%RHQ_AGENT_DEBUG%" == "false" ( - set RHQ_AGENT_DEBUG= -) - -rem ---------------------------------------------------------------------- -rem Change directory so the current directory is the Agent home. -rem Here we assume this script is a child directory of the Agent home -rem We also assume our custom environment script is located in the same -rem place as this script. -rem ---------------------------------------------------------------------- - -set RHQ_AGENT_BIN_DIR_PATH=%~dp0 - -if exist "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" ( - if defined RHQ_AGENT_DEBUG echo Loading environment script: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat - call "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" %* -) else ( - if defined RHQ_AGENT_DEBUG echo No environment script found at: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat -) - -rem if debug variable is set, it is assumed to be on, unless its value is false -if "%RHQ_AGENT_DEBUG%" == "false" ( - set RHQ_AGENT_DEBUG= -) - -rem if sigar debug variable is set, it is assumed to be on, unless its value is false -if "%RHQ_AGENT_SIGAR_DEBUG%" == "false" ( - set RHQ_AGENT_SIGAR_DEBUG= -) - -if not defined RHQ_AGENT_HOME ( - cd "%RHQ_AGENT_BIN_DIR_PATH%\.." -) else ( - cd "%RHQ_AGENT_HOME%" || ( - echo Cannot go to the RHQ_AGENT_HOME directory: %RHQ_AGENT_HOME% - exit /B 1 - ) -) - -set RHQ_AGENT_HOME=%CD% - -if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_HOME: %RHQ_AGENT_HOME% - -rem ---------------------------------------------------------------------- -rem Find the Java executable and verify we have a VM available -rem ---------------------------------------------------------------------- - -if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH ( - if not defined RHQ_AGENT_JAVA_HOME call :prepare_embedded_jre -) - -if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH ( - set RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_HOME%\bin\java.exe -) - -if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_HOME: %RHQ_AGENT_JAVA_HOME% -if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_EXE_FILE_PATH: %RHQ_AGENT_JAVA_EXE_FILE_PATH% - -if not exist "%RHQ_AGENT_JAVA_EXE_FILE_PATH%" ( - echo There is no JVM available. - echo Please set RHQ_AGENT_JAVA_HOME or RHQ_AGENT_JAVA_EXE_FILE_PATH appropriately. - exit /B 1 -) - -rem ---------------------------------------------------------------------- -rem Prepare the classpath -rem ---------------------------------------------------------------------- - -set CLASSPATH= -call :append_classpath "%RHQ_AGENT_HOME%\conf" -for /R "%RHQ_AGENT_HOME%\lib" %%G in ("*.jar") do ( - call :append_classpath "%%G" - if defined RHQ_AGENT_DEBUG echo CLASSPATH entry: %%G -) - -rem ---------------------------------------------------------------------- -rem Prepare the VM command line options to be passed in -rem ---------------------------------------------------------------------- - -if not defined RHQ_AGENT_JAVA_OPTS ( - set RHQ_AGENT_JAVA_OPTS=-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true -) -if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_OPTS: %RHQ_AGENT_JAVA_OPTS% - -if "%RHQ_AGENT_JAVA_ENDORSED_DIRS%" == "none" ( - if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.endorsed.dirs - goto :skip_java_endorsed_dirs -) -if not defined RHQ_AGENT_JAVA_ENDORSED_DIRS set RHQ_AGENT_JAVA_ENDORSED_DIRS=%RHQ_AGENT_HOME%\lib\endorsed -if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_ENDORSED_DIRS: %RHQ_AGENT_JAVA_ENDORSED_DIRS% -set _JAVA_ENDORSED_DIRS_OPT="-Djava.endorsed.dirs=%RHQ_AGENT_JAVA_ENDORSED_DIRS%" -:skip_java_endorsed_dirs - -if "%RHQ_AGENT_JAVA_LIBRARY_PATH%" == "none" ( - if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.library.path - goto :skip_java_library_path -) -if not defined RHQ_AGENT_JAVA_LIBRARY_PATH set RHQ_AGENT_JAVA_LIBRARY_PATH=%RHQ_AGENT_HOME%\lib -if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_LIBRARY_PATH: %RHQ_AGENT_JAVA_LIBRARY_PATH% -set _JAVA_LIBRARY_PATH_OPT="-Djava.library.path=%RHQ_AGENT_JAVA_LIBRARY_PATH%" -:skip_java_library_path - -if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_ADDITIONAL_JAVA_OPTS: %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% - -rem ---------------------------------------------------------------------- -rem Prepare the command line arguments passed to the RHQ Agent -rem ---------------------------------------------------------------------- - -if not defined RHQ_AGENT_CMDLINE_OPTS ( - set RHQ_AGENT_CMDLINE_OPTS=%* -) - -if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_CMDLINE_OPTS: %RHQ_AGENT_CMDLINE_OPTS% - -rem ---------------------------------------------------------------------- -rem Execute the VM which starts the agent -rem ---------------------------------------------------------------------- - -if defined RHQ_AGENT_DEBUG ( - set _LOG_CONFIG=-Dlog4j.configuration=log4j-debug.xml -Di18nlog.dump-stack-traces=true -) else ( - set _LOG_CONFIG=-Dlog4j.configuration=log4j.xml -) - -rem if sigar debug is enabled, the log configuration is different - sigar debugging is noisy, so its got its own debug var -if defined RHQ_AGENT_SIGAR_DEBUG ( - set _LOG_CONFIG=%_LOG_CONFIG% -Dsigar.nativeLogging=true -) - -rem to support other agents/plugin containers, allow the caller to override the main classname -if not defined RHQ_AGENT_MAINCLASS ( - set RHQ_AGENT_MAINCLASS=org.rhq.enterprise.agent.AgentMain -) - -set CMD="%RHQ_AGENT_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT% %_JAVA_LIBRARY_PATH_OPT% %RHQ_AGENT_JAVA_OPTS% %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% %_LOG_CONFIG% -cp "%CLASSPATH%" %RHQ_AGENT_MAINCLASS% %RHQ_AGENT_CMDLINE_OPTS% - -if not defined _SETENV_ONLY ( - rem log4j 1.2.8 does not create the directory for us (later versions do) - if not exist "%RHQ_AGENT_HOME%\logs" ( - mkdir "%RHQ_AGENT_HOME%\logs" - ) - if defined RHQ_AGENT_DEBUG ( - echo Executing the agent with this command line: - echo %CMD% - ) - cmd.exe /S /C "%CMD%" -) - -goto :done - -rem ---------------------------------------------------------------------- -rem CALL subroutine that appends the first argument to CLASSPATH -rem ---------------------------------------------------------------------- - -:append_classpath -set _entry=%1 -if not defined CLASSPATH ( - set CLASSPATH=%_entry:"=% -) else ( - set CLASSPATH=%CLASSPATH%;%_entry:"=% -) -goto :eof - -rem ---------------------------------------------------------------------- -rem CALL subroutine that prepares to use the embedded JRE -rem ---------------------------------------------------------------------- - -:prepare_embedded_jre -set RHQ_AGENT_JAVA_HOME=%RHQ_AGENT_HOME%\jre -if defined RHQ_AGENT_DEBUG echo Using the embedded JRE -if not exist "%RHQ_AGENT_JAVA_HOME%" ( - if defined RHQ_AGENT_DEBUG echo No embedded JRE found - will try to use JAVA_HOME: %JAVA_HOME% - set RHQ_AGENT_JAVA_HOME=%JAVA_HOME% -) -goto :eof - -rem ---------------------------------------------------------------------- -rem CALL subroutine that exits this script normally -rem ---------------------------------------------------------------------- - -:done -if defined RHQ_AGENT_DEBUG echo %0 done. -if defined _SETENV_ONLY ( -endlocal & SET "RHQ_AGENT_HOME=%RHQ_AGENT_HOME%" & SET "RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_EXE_FILE_PATH%" & SET "RHQ_AGENT_JAVA_OPTS=%RHQ_AGENT_JAVA_OPTS%" & SET "RHQ_AGENT_ADDITIONAL_JAVA_OPTS=%RHQ_AGENT_ADDITIONAL_JAVA_OPTS%" & SET "RHQ_AGENT_BIN_DIR_PATH=%RHQ_AGENT_BIN_DIR_PATH%" -) else ( -endlocal -) - -exit /B 0 +@echo off + +rem =========================================================================== +rem RHQ Agent Windows Startup Script +rem +rem This file is used to execute the RHQ Agent on a Windows platform. +rem Run this script with the --help option for the runtime options. +rem +rem Note that this script can also be used to simply set environment variables +rem that define the agent's environment but it will not actually run the agent. +rem Pass in _SETENV_ONLY as the first argument to this script if you want this +rem behavior. +rem +rem This script is customizable by setting certain environment variables, which +rem are described in comments in rhq-agent-env.bat. The variables can also be +rem set via rhq-agent-env.bat, which is sourced by this script. +rem +rem If the embedded JRE is to be used but is not available, the fallback +rem JRE to be used will be determined by the JAVA_HOME environment variable. +rem =========================================================================== + +setlocal + +if "%1"=="_SETENV_ONLY" ( + set _SETENV_ONLY=true +) else ( + title RHQ Agent +) + +rem if debug variable is set, it is assumed to be on, unless its value is false +if "%RHQ_AGENT_DEBUG%" == "false" ( + set RHQ_AGENT_DEBUG= +) + +rem ---------------------------------------------------------------------- +rem Change directory so the current directory is the Agent home. +rem Here we assume this script is a child directory of the Agent home +rem We also assume our custom environment script is located in the same +rem place as this script. +rem ---------------------------------------------------------------------- + +set RHQ_AGENT_BIN_DIR_PATH=%~dp0 + +if exist "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" ( + if defined RHQ_AGENT_DEBUG echo Loading environment script: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat + call "%RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat" %* +) else ( + if defined RHQ_AGENT_DEBUG echo No environment script found at: %RHQ_AGENT_BIN_DIR_PATH%\rhq-agent-env.bat +) + +rem if debug variable is set, it is assumed to be on, unless its value is false +if "%RHQ_AGENT_DEBUG%" == "false" ( + set RHQ_AGENT_DEBUG= +) + +rem if sigar debug variable is set, it is assumed to be on, unless its value is false +if "%RHQ_AGENT_SIGAR_DEBUG%" == "false" ( + set RHQ_AGENT_SIGAR_DEBUG= +) + +if not defined RHQ_AGENT_HOME ( + cd "%RHQ_AGENT_BIN_DIR_PATH%\.." +) else ( + cd "%RHQ_AGENT_HOME%" || ( + echo Cannot go to the RHQ_AGENT_HOME directory: %RHQ_AGENT_HOME% + exit /B 1 + ) +) + +set RHQ_AGENT_HOME=%CD% + +if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_HOME: %RHQ_AGENT_HOME% + +rem ---------------------------------------------------------------------- +rem Find the Java executable and verify we have a VM available +rem ---------------------------------------------------------------------- + +if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH ( + if not defined RHQ_AGENT_JAVA_HOME call :prepare_embedded_jre +) + +if not defined RHQ_AGENT_JAVA_EXE_FILE_PATH ( + set RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_HOME%\bin\java.exe +) + +if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_HOME: %RHQ_AGENT_JAVA_HOME% +if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_EXE_FILE_PATH: %RHQ_AGENT_JAVA_EXE_FILE_PATH% + +if not exist "%RHQ_AGENT_JAVA_EXE_FILE_PATH%" ( + echo There is no JVM available. + echo Please set RHQ_AGENT_JAVA_HOME or RHQ_AGENT_JAVA_EXE_FILE_PATH appropriately. + exit /B 1 +) + +rem ---------------------------------------------------------------------- +rem Prepare the classpath +rem ---------------------------------------------------------------------- + +set CLASSPATH= +call :append_classpath "%RHQ_AGENT_HOME%\conf" +for /R "%RHQ_AGENT_HOME%\lib" %%G in ("*.jar") do ( + call :append_classpath "%%G" + if defined RHQ_AGENT_DEBUG echo CLASSPATH entry: %%G +) +for %%G in ("%RHQ_AGENT_JAVA_HOME%\lib\tools.jar" "%RHQ_AGENT_JAVA_HOME%\..\lib\tools.jar") do ( + if exist "%%G" ( + call :append_classpath "%%G" + if defined RHQ_AGENT_DEBUG echo CLASSPATH entry: %%G + goto end_classpath + ) +) +:end_classpath + +rem ---------------------------------------------------------------------- +rem Prepare the VM command line options to be passed in +rem ---------------------------------------------------------------------- + +if not defined RHQ_AGENT_JAVA_OPTS ( + set RHQ_AGENT_JAVA_OPTS=-Xms64m -Xmx128m -Djava.net.preferIPv4Stack=true +) +if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_OPTS: %RHQ_AGENT_JAVA_OPTS% + +if "%RHQ_AGENT_JAVA_ENDORSED_DIRS%" == "none" ( + if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.endorsed.dirs + goto :skip_java_endorsed_dirs +) +if not defined RHQ_AGENT_JAVA_ENDORSED_DIRS set RHQ_AGENT_JAVA_ENDORSED_DIRS=%RHQ_AGENT_HOME%\lib\endorsed +if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_ENDORSED_DIRS: %RHQ_AGENT_JAVA_ENDORSED_DIRS% +set _JAVA_ENDORSED_DIRS_OPT="-Djava.endorsed.dirs=%RHQ_AGENT_JAVA_ENDORSED_DIRS%" +:skip_java_endorsed_dirs + +if "%RHQ_AGENT_JAVA_LIBRARY_PATH%" == "none" ( + if defined RHQ_AGENT_DEBUG echo Not explicitly setting java.library.path + goto :skip_java_library_path +) +if not defined RHQ_AGENT_JAVA_LIBRARY_PATH set RHQ_AGENT_JAVA_LIBRARY_PATH=%RHQ_AGENT_HOME%\lib +if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_JAVA_LIBRARY_PATH: %RHQ_AGENT_JAVA_LIBRARY_PATH% +set _JAVA_LIBRARY_PATH_OPT="-Djava.library.path=%RHQ_AGENT_JAVA_LIBRARY_PATH%" +:skip_java_library_path + +if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_ADDITIONAL_JAVA_OPTS: %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% + +rem ---------------------------------------------------------------------- +rem Prepare the command line arguments passed to the RHQ Agent +rem ---------------------------------------------------------------------- + +if not defined RHQ_AGENT_CMDLINE_OPTS ( + set RHQ_AGENT_CMDLINE_OPTS=%* +) + +if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_CMDLINE_OPTS: %RHQ_AGENT_CMDLINE_OPTS% + +rem ---------------------------------------------------------------------- +rem Execute the VM which starts the agent +rem ---------------------------------------------------------------------- + +if defined RHQ_AGENT_DEBUG ( + set _LOG_CONFIG=-Dlog4j.configuration=log4j-debug.xml -Di18nlog.dump-stack-traces=true +) else ( + set _LOG_CONFIG=-Dlog4j.configuration=log4j.xml +) + +rem if sigar debug is enabled, the log configuration is different - sigar debugging is noisy, so it has its own debug var +if defined RHQ_AGENT_SIGAR_DEBUG ( + set _LOG_CONFIG=%_LOG_CONFIG% -Dsigar.nativeLogging=true +) + +rem to support other agents/plugin containers, allow the caller to override the main classname +if not defined RHQ_AGENT_MAINCLASS ( + set RHQ_AGENT_MAINCLASS=org.rhq.enterprise.agent.AgentMain +) + +set CMD="%RHQ_AGENT_JAVA_EXE_FILE_PATH%" %_JAVA_ENDORSED_DIRS_OPT% %_JAVA_LIBRARY_PATH_OPT% %RHQ_AGENT_JAVA_OPTS% %RHQ_AGENT_ADDITIONAL_JAVA_OPTS% %_LOG_CONFIG% -cp "%CLASSPATH%" %RHQ_AGENT_MAINCLASS% %RHQ_AGENT_CMDLINE_OPTS% + +if not defined _SETENV_ONLY ( + rem log4j 1.2.8 does not create the directory for us (later versions do) + if not exist "%RHQ_AGENT_HOME%\logs" ( + mkdir "%RHQ_AGENT_HOME%\logs" + ) + if defined RHQ_AGENT_DEBUG ( + echo Executing the agent with this command line: + echo %CMD% + ) + cmd.exe /S /C "%CMD%" +) + +goto :done + +rem ---------------------------------------------------------------------- +rem CALL subroutine that appends the first argument to CLASSPATH +rem ---------------------------------------------------------------------- + +:append_classpath +set _entry=%1 +if not defined CLASSPATH ( + set CLASSPATH=%_entry:"=% +) else ( + set CLASSPATH=%CLASSPATH%;%_entry:"=% +) +goto :eof + +rem ---------------------------------------------------------------------- +rem CALL subroutine that prepares to use the embedded JRE +rem ---------------------------------------------------------------------- + +:prepare_embedded_jre +set RHQ_AGENT_JAVA_HOME=%RHQ_AGENT_HOME%\jre +if defined RHQ_AGENT_DEBUG echo Using the embedded JRE +if not exist "%RHQ_AGENT_JAVA_HOME%" ( + if defined RHQ_AGENT_DEBUG echo No embedded JRE found - will try to use JAVA_HOME: %JAVA_HOME% + set RHQ_AGENT_JAVA_HOME=%JAVA_HOME% +) +goto :eof + +rem ---------------------------------------------------------------------- +rem CALL subroutine that exits this script normally +rem ---------------------------------------------------------------------- + +:done +if defined RHQ_AGENT_DEBUG echo %0 done. +if defined _SETENV_ONLY ( +endlocal & SET "RHQ_AGENT_HOME=%RHQ_AGENT_HOME%" & SET "RHQ_AGENT_JAVA_EXE_FILE_PATH=%RHQ_AGENT_JAVA_EXE_FILE_PATH%" & SET "RHQ_AGENT_JAVA_OPTS=%RHQ_AGENT_JAVA_OPTS%" & SET "RHQ_AGENT_ADDITIONAL_JAVA_OPTS=%RHQ_AGENT_ADDITIONAL_JAVA_OPTS%" & SET "RHQ_AGENT_BIN_DIR_PATH=%RHQ_AGENT_BIN_DIR_PATH%" +) else ( +endlocal +) + +exit /B 0 diff --git a/modules/enterprise/agent/src/etc/rhq-agent.sh b/modules/enterprise/agent/src/etc/rhq-agent.sh index e0122bd..45b99a2 100755 --- a/modules/enterprise/agent/src/etc/rhq-agent.sh +++ b/modules/enterprise/agent/src/etc/rhq-agent.sh @@ -151,6 +151,13 @@ for _JAR in $_JAR_FILES ; do fi debug_msg "CLASSPATH entry: $_JAR" done +for _TOOLS_JAR in "${RHQ_AGENT_JAVA_HOME}/lib/tools.jar" "${RHQ_AGENT_JAVA_HOME}/../lib/tools.jar"; do + if [ -f "${_TOOLS_JAR}" ]; then + debug_msg "CLASSPATH entry: ${_TOOLS_JAR}" + CLASSPATH="${CLASSPATH}:${_TOOLS_JAR}" + break + fi +done # ---------------------------------------------------------------------- # Prepare the VM command line options to be passed in @@ -236,7 +243,7 @@ if [ "x$RHQ_AGENT_DEBUG" != "x" ]; then fi fi -# if sigar debug is enabled, the log configuration is different - sigar debugging is noisy, so its got its own debug var +# if sigar debug is enabled, the log configuration is different - sigar debugging is noisy, so it has its own debug var if [ "x$RHQ_AGENT_SIGAR_DEBUG" != "x" ]; then if [ "$RHQ_AGENT_SIGAR_DEBUG" != "false" ]; then _LOG_CONFIG="$_LOG_CONFIG -Dsigar.nativeLogging=true" diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index e92eb21..8780b32 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -16,11 +16,23 @@ <description>a plugin for managing a generic JMX-enabled application</description> <dependencies> + <dependency> <groupId>mc4j</groupId> <artifactId>org-mc4j-ems</artifactId>  </dependency> + +  + <dependency> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + <version>1.6.0</version> + <scope>system</scope> + <systemPath>${java.home}/../lib/tools.jar</systemPath> + </dependency> + </dependencies> <build> @@ -48,8 +60,8 @@ </execution> </executions> </plugin> -</plugins> - </build> + </plugins> + </build> <profiles> <profile> @@ -146,28 +158,7 @@ </plugins> </build> -</profile> -  - <profile> - <id>default-tools.jar</id> - <activation> - <property> - <name>java.vendor</name> - <value>Sun Microsystems Inc.</value> - </property> - </activation> - - <dependencies> - <dependency> - <groupId>com.sun</groupId> - <artifactId>tools</artifactId> - <version>1.4.2</version> - <scope>system</scope> - <systemPath>${java.home}/../lib/tools.jar</systemPath> - </dependency> - </dependencies> - </profile> + </profile> <profile> <id>dev</id> diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java index ce8631a..a61208d 100644 --- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. + * Copyright (C) 2005-2012 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -23,37 +23,84 @@ package org.rhq.plugins.jmx; import java.io.File; -import java.io.FilenameFilter; +import java.lang.management.ManagementFactory; +import java.lang.management.RuntimeMXBean; +import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Map; import java.util.Set; +import javax.management.MBeanServerConnection; +import javax.management.remote.JMXConnector; +import javax.management.remote.JMXConnectorFactory; +import javax.management.remote.JMXServiceURL; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - +import org.hyperic.sigar.NetConnection; +import org.hyperic.sigar.NetFlags; +import org.hyperic.sigar.Sigar; +import org.hyperic.sigar.SigarException; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.resource.ResourceUpgradeReport; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; +import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; +import org.rhq.core.pluginapi.inventory.ManualAddFacet; import org.rhq.core.pluginapi.inventory.ProcessScanResult; +import org.rhq.core.pluginapi.inventory.ResourceComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; -import org.rhq.core.pluginapi.inventory.ManualAddFacet; -import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; +import org.rhq.core.pluginapi.upgrade.ResourceUpgradeContext; +import org.rhq.core.pluginapi.upgrade.ResourceUpgradeFacet; import org.rhq.core.system.ProcessInfo; +import org.rhq.plugins.jmx.util.ConnectionProviderFactory; +import org.rhq.plugins.jmx.util.JvmResourceKey; +import org.rhq.plugins.jmx.util.JvmUtility; +import org.rhq.plugins.jmx.util.Socket; + +import org.mc4j.ems.connection.EmsConnection; +import org.mc4j.ems.connection.bean.EmsBean; +import org.mc4j.ems.connection.bean.attribute.EmsAttribute; +import org.mc4j.ems.connection.support.ConnectionProvider; +import org.mc4j.ems.connection.support.metadata.J2SE5ConnectionTypeDescriptor; /** - * This component will discover JDK 5 agents running locally that have active JSR-160 connectors defined via system - * properties. + * This component will discover JVM processes that appear to be long-running (i.e. "servers"). Specifically, it will + * discover java processes that: + * <ul> + * <li>have enabled JMX Remoting (JSR-160) via com.sun.management.jmxremote* system properties on their command lines, or</li> + * <li>are Sun/Oracle-compatible java processes accessible via the com.sun.tools.attach API AND specify the + * org.rhq.resourceKey system property on their command lines (e.g. -Dorg.rhq.resourceKey=FOO); the attach API uses IPC + * under the covers, so for a process to be accessible, it either must be running as the same user as the RHQ Agent, + * or the Agent must be running as root<li> + * </ul> + * Some other java processes that do not meet these criteria can be manually added if they expose JMX remotely in + * another supported form (WebLogic, WebSphere, etc.). * * @author Greg Hinkle + * @author Ian Springer */ -public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, ManualAddFacet { //, ClassLoaderFacet { +public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, ManualAddFacet, ResourceUpgradeFacet { //, ClassLoaderFacet { + private static final Log log = LogFactory.getLog(JMXDiscoveryComponent.class); - public static final String VMID_CONFIG_PROPERTY = "vmid"; + // our own private SIGAR + // TODO (ips, 01/05/12): enhance native-system API, then use that instead of using SIGAR directly + private static Sigar SIGAR; + static { + try { + SIGAR = new Sigar(); + } catch (RuntimeException re) { + SIGAR = null; + } + } public static final String COMMAND_LINE_CONFIG_PROPERTY = "commandLine"; @@ -67,120 +114,162 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual public static final String ADDITIONAL_CLASSPATH_ENTRIES = "additionalClassPathEntries"; - /* Ignore certain processes that are managed by their own plugin. For example, the Tomcat plugin will + private static final String SYSPROP_JMXREMOTE_PORT = "com.sun.management.jmxremote.port"; + private static final String SYSPROP_RHQ_JMXPLUGIN_PROCESS_FILTERS = "rhq.jmxplugin.process-filters"; + public static final String SYSPROP_RHQ_RESOURCE_KEY = "org.rhq.resourceKey"; + private static final String SYSPROP_JAVA_VERSION = "java.version"; + + /* + * Ignore certain processes that are managed by their own plugin. For example, the Tomcat plugin will * handle Tomcat processes configured for JMX management. */ - private static final String[] PROCESS_FILTERS; - - static { - String[] processFilters = new String[] { "catalina.startup.Bootstrap", "org.jboss.Main" }; - try { - String env = System.getProperty("rhq.jmxplugin.process-filters"); - if (env != null) { - processFilters = env.split(","); - } - } catch (Throwable t) { - log.error("Can't determine process filters; using default... Cause: " + t); - } finally { - PROCESS_FILTERS = processFilters; - } - } + private static final String[] DEFAULT_PROCESS_EXCLUDES = new String[]{"org.jboss.Main", "catalina.startup.Bootstrap"}; public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext context) { + Set<DiscoveredResourceDetails> discoveredResources = new LinkedHashSet<DiscoveredResourceDetails>(); + Map<String, List<DiscoveredResourceDetails>> duplicatesByKey = new LinkedHashMap<String, List<DiscoveredResourceDetails>>(); - Set<DiscoveredResourceDetails> found = new HashSet<DiscoveredResourceDetails>(); - - // This model of discovery is of questionable usefulness since if you restart your process you'll get a new resource - // Works only on JDK6 and maybe some 64 bit JDK5 See JBNADM-3332. - // - // Map<Integer, LocalVirtualMachine> vms; - // - // try { - // vms = LocalVMFinder.getManageableVirtualMachines(); - // } catch (Exception e) { - // log.info("JMX Platform Autodiscovery only supported on JDK6 and above"); - // return null; - // } - // - // if (vms != null) { - // for (LocalVirtualMachine vm : vms.values()) { - // // TODO: Might want to limit to vms already managed as the other kind are temporary connector addresses - // String resourceKey = (vm.getCommandLine() != null) ? vm.getCommandLine() : vm.getConnectorAddress(); - // DiscoveredResourceDetails s = new DiscoveredResourceDetails(context.getResourceType(), resourceKey, - // "Java VM [" + vm.getVmid() + "]", System.getProperty("java.version"), // TODO Get the vm's version - // vm.getCommandLine(), null, null); - // - // Configuration configuration = s.getPluginConfiguration(); - // configuration.setNotes("Auto-discovered"); - // configuration.put(new PropertySimple(VMID_CONFIG_PROPERTY, String.valueOf(vm.getVmid()))); - // configuration.put(new PropertySimple(CONNECTOR_ADDRESS_CONFIG_PROPERTY, String.valueOf(vm - // .getConnectorAddress()))); - // configuration - // .put(new PropertySimple(COMMAND_LINE_CONFIG_PROPERTY, String.valueOf(vm.getCommandLine()))); - // configuration.put(new PropertySimple(CONNECTION_TYPE, LocalVMTypeDescriptor.class.getName())); - // - // found.add(s); - // } - // - // /* GH: Disabling discovery of the internal VM... Other plugins should probably embed via the internal - // * component above - // * DiscoveredResourceDetails localVM = new DiscoveredResourceDetails(context.getResourceType(), - // * "InternalVM", - // * "Internal Java VM", - // * System.getProperty("java.version"), "VM of - // * plugin container", null, null); Configuration configuration = localVM.getPluginConfiguration(); - // * configuration.put(new PropertySimple(CONNECTOR_ADDRESS_CONFIG_PROPERTY, "Local Connection")); - // * configuration.put(new PropertySimple(CONNECTION_TYPE, InternalVMTypeDescriptor.class.getName())); - // * - // *found.add(localVM);*/ - // } - - try { - List<ProcessScanResult> processes = context.getAutoDiscoveredProcesses(); + // Filter out JBoss, Tomcat, etc. processes, which will be represented by more specific types of Resources + // discovered by other plugins. + List<ProcessScanResult> nonExcludedProcesses = getNonExcludedJavaProcesses(context); - for (ProcessScanResult process : processes) { + for (ProcessScanResult process : nonExcludedProcesses) { + try { ProcessInfo processInfo = process.getProcessInfo(); - DiscoveredResourceDetails details = discoverProcess(context, processInfo); + DiscoveredResourceDetails details = discoverResourceDetails(context, processInfo); if (details != null) { - boolean isFiltered = false; - for (String filter : PROCESS_FILTERS) { - if (details.getResourceName().contains(filter)) { - isFiltered = true; - break; + if (discoveredResources.contains(details)) { + List<DiscoveredResourceDetails> duplicates = duplicatesByKey.get(details.getResourceKey()); + if (duplicates == null) { + duplicates = new ArrayList<DiscoveredResourceDetails>(); + duplicatesByKey.put(details.getResourceKey(), duplicates); } - } - if (!isFiltered) { - found.add(details); - } + duplicates.add(details); + } + discoveredResources.add(details); + } + } catch (RuntimeException re) { + // Don't let a runtime exception for a particular ProcessInfo cause the entire discovery scan to fail. + if (log.isDebugEnabled()) { + log.debug("Error when trying to discover JVM process [" + process + "].", re); + } else { + log.warn("Error when trying to discover JVM process [" + process + "] (enable DEBUG for stack trace): " + re); } } - } catch (Exception e) { - if (log.isDebugEnabled()) { - log.debug("Unable to complete base JMX server discovery.", e); + } + + for (String duplicateKey : duplicatesByKey.keySet()) { + List<DiscoveredResourceDetails> duplicates = duplicatesByKey.get(duplicateKey); + log.error("Multiple Resources with the same key (" + duplicateKey + + ") were discovered - none will be reported to the plugin container! This most likely means that there are multiple java processes running with the same value for the " + + SYSPROP_RHQ_RESOURCE_KEY + " system property specified on their command lines. Here is the list of Resources: " + + duplicates); + discoveredResources.remove(duplicates.get(0)); + } + + return discoveredResources; + } + + private List<ProcessScanResult> getNonExcludedJavaProcesses(ResourceDiscoveryContext context) { + // This is the list of all currently running java processes. + List<ProcessScanResult> javaProcesses = context.getAutoDiscoveredProcesses(); + + List<ProcessScanResult> nonExcludedJavaProcesses = new ArrayList<ProcessScanResult>(); + Set<String> processExcludes = getProcessExcludes(); + for (ProcessScanResult javaProcess : javaProcesses) { + if (javaProcess.getProcessInfo().equals(context.getSystemInformation().getThisProcess())) { + // If the process is our own process (i.e. the RHQ Agent JVM), then skip it, since the rhq-agent + // plugin will handle discovering that. + continue; + } + String[] args = javaProcess.getProcessInfo().getCommandLine(); + StringBuilder buffer = new StringBuilder(); + for (String arg : args) { + buffer.append(arg).append(" "); + } + String commandLine = buffer.toString(); + if (!isExcluded(commandLine, processExcludes)) { + nonExcludedJavaProcesses.add(javaProcess); } else { - log.warn("Unable to complete base JMX server discovery (enable DEBUG for stack): " + e); + if (log.isDebugEnabled()) { + log.debug("Process [" + javaProcess.getProcessInfo() + + "] excluded since its command line contains one of the following: " + processExcludes); + } + } + } + return nonExcludedJavaProcesses; + } + + private boolean isExcluded(String commandLine, Set<String> processExcludes) { + for (String processExclude : processExcludes) { + if (commandLine.contains(processExclude)) { + return true; } } + return false; + } - return found; + protected Set<String> getProcessExcludes() { + Set<String> processExcludes; + String overrideProcessExcludes = System.getProperty(SYSPROP_RHQ_JMXPLUGIN_PROCESS_FILTERS); + if (overrideProcessExcludes != null) { + processExcludes = new HashSet<String>(Arrays.asList(overrideProcessExcludes.split(","))); + } else { + processExcludes = new HashSet<String>(Arrays.asList(DEFAULT_PROCESS_EXCLUDES)); + } + return processExcludes; } + // MANUAL ADD public DiscoveredResourceDetails discoverResource(Configuration pluginConfig, ResourceDiscoveryContext discoveryContext) throws InvalidPluginConfigurationException { - // TODO: Connect to the remote JVM to verify the user-specified conn props are valid, and if connecting - // fails, throw an exception. - String resourceKey = pluginConfig.getSimpleValue(CONNECTOR_ADDRESS_CONFIG_PROPERTY, null); - String connectionType = pluginConfig.getSimpleValue(CONNECTION_TYPE, null); + + String connectorAddress = pluginConfig.getSimpleValue(CONNECTOR_ADDRESS_CONFIG_PROPERTY, null); + if (connectorAddress == null) { + throw new InvalidPluginConfigurationException("A connector address must be specified when manually adding a JMX Server."); + } + + ConnectionProvider connectionProvider; + EmsConnection connection; + try { + connectionProvider = ConnectionProviderFactory.createConnectionProvider(pluginConfig, null, + discoveryContext.getParentResourceContext().getTemporaryDirectory()); + connection = connectionProvider.connect(); + connection.loadSynchronous(false); + } catch (Exception e) { + throw new RuntimeException("Failed to connection to connector address [" + connectorAddress + "].", e); + } + + String key = connectorAddress; + String name = connectorAddress; - // TODO (ips, 09/04/09): We should connect to the remote JVM in order to obtain its version. - String version = null; + String version = getJavaVersion(connection); + if (version == null) { + log.warn("Unable to determine version of JVM with connector address [" + connectorAddress + "]."); + } + + String connectionType = pluginConfig.getSimpleValue(CONNECTION_TYPE, null); + String description = connectionType + " JVM (" + connectorAddress + ")"; DiscoveredResourceDetails resourceDetails = new DiscoveredResourceDetails(discoveryContext.getResourceType(), - resourceKey, "Java VM", version, connectionType + " [" + resourceKey + "]", pluginConfig, null); + key, name, version, description, pluginConfig, null); return resourceDetails; } + private String getJavaVersion(EmsConnection connection) { + String version = null; + EmsBean runtimeMXBean = connection.getBean(ManagementFactory.RUNTIME_MXBEAN_NAME); + if (runtimeMXBean != null) { + EmsAttribute systemPropertiesAttribute = runtimeMXBean.getAttribute("systemProperties"); + if (systemPropertiesAttribute != null) { + Map<String, String> systemProperties = (Map<String, String>) systemPropertiesAttribute.getValue(); + version = systemProperties.get("java.version"); + } + } + return version; + } + // For now, this method is not used. This method is the ClassLoaderFacet method, but I commented // out the fact that this class implements that interface. As of today, 7/20/2009, I'm not sure we really // need to implement the classloader facet since EMS's ability to use additionalClasspathEntries in its @@ -191,11 +280,10 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual // be changed other than to add "implements ClassLoaderFacet" to the class definition). // For now, since we don't want the additional overhead of calling into this method when we currently have // no need for it, we do not implement the ClassLoaderFacet. - public List<URL> getAdditionalClasspathUrls(ResourceDiscoveryContext context, DiscoveredResourceDetails details) - throws Exception { - - List<File> jars = getAdditionalJarsFromConfig(details.getPluginConfiguration()); - if (jars == null || jars.size() == 0) { + public List<URL> getAdditionalClasspathUrls(ResourceDiscoveryContext<ResourceComponent<?>> context, + DiscoveredResourceDetails details) throws Exception { + List<File> jars = ConnectionProviderFactory.getAdditionalJarsFromConfig(details.getPluginConfiguration()); + if (jars == null || jars.isEmpty()) { return null; } @@ -207,113 +295,256 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual return urls; } - protected DiscoveredResourceDetails discoverProcess(ResourceDiscoveryContext context, ProcessInfo process) { - String portProp = "com.sun.management.jmxremote.port"; + @Override + public ResourceUpgradeReport upgrade(ResourceUpgradeContext inventoriedResource) { + JvmResourceKey oldKey = JvmResourceKey.valueOf(inventoriedResource.getResourceKey()); + JvmResourceKey.Type oldKeyType = oldKey.getType(); + if (oldKeyType == JvmResourceKey.Type.Legacy || oldKeyType == JvmResourceKey.Type.JmxRemotingPort) { + if (!inventoriedResource.getSystemInformation().isNative()) { + log.warn("Cannot attempt to upgrade Resource key [" + inventoriedResource.getResourceKey() + + "] of JVM Resource, because this Agent is not running with native system info support (i.e. SIGAR)."); + return null; + } - String port = null; - for (String argument : process.getCommandLine()) { - String cmdLineArg = "-D" + portProp + "="; - if (argument.startsWith(cmdLineArg)) { - port = argument.substring(cmdLineArg.length()); - break; + Configuration pluginConfig = inventoriedResource.getPluginConfiguration(); + String connectorAddress = pluginConfig.getSimpleValue(CONNECTOR_ADDRESS_CONFIG_PROPERTY, null); + JMXServiceURL jmxServiceURL; + try { + jmxServiceURL = new JMXServiceURL(connectorAddress); + } catch (MalformedURLException e) { + throw new RuntimeException("Failed to parse connector address: " + connectorAddress, e); + } + + Long pid; + try { + JMXConnector jmxConnector = JMXConnectorFactory.connect(jmxServiceURL); + MBeanServerConnection mbeanServerConnection = jmxConnector.getMBeanServerConnection(); + RuntimeMXBean runtimeMXBean = ManagementFactory.newPlatformMXBeanProxy(mbeanServerConnection, + ManagementFactory.RUNTIME_MXBEAN_NAME, RuntimeMXBean.class); + pid = getJvmPid(runtimeMXBean); + if (pid == null) { + throw new RuntimeException("Failed to determine JVM pid by parsing JVM name."); + } + } catch (Exception e) { + throw new RuntimeException("Failed to determine JVM pid.", e); } - } - if (port == null) { - port = process.getEnvironmentVariable(portProp); + List<ProcessInfo> processes = inventoriedResource.getSystemInformation().getProcesses( + "process|pid|match=" + pid); + if (processes.size() != 1) { + throw new IllegalStateException("Failed to find process with PID [" + pid + "]."); + } + ProcessInfo process = processes.get(0); + String mainClassName = getJavaMainClassName(process); + String explicitKeyValue = getSystemPropertyValue(process, SYSPROP_RHQ_RESOURCE_KEY); + if (oldKeyType == JvmResourceKey.Type.Legacy || explicitKeyValue != null) { + // We need to upgrade the key. + JvmResourceKey newKey; + if (explicitKeyValue != null) { + newKey = JvmResourceKey.fromExplicitValue(mainClassName, explicitKeyValue); + } else { + newKey = JvmResourceKey.fromJmxRemotingPort(mainClassName, oldKey.getJmxRemotingPort()); + } + + ResourceUpgradeReport resourceUpgradeReport = new ResourceUpgradeReport(); + resourceUpgradeReport.setNewResourceKey(newKey.toString()); + return resourceUpgradeReport; + } } - DiscoveredResourceDetails details = null; - if (port != null) { + return null; + } - String name = "JMX Server"; - for (int i = 1; i < process.getCommandLine().length; i++) { - String arg = process.getCommandLine()[i]; + private static Long getJvmPid(RuntimeMXBean runtimeMXBean) { + Long pid; + String jvmName = runtimeMXBean.getName(); + int atIndex = jvmName.indexOf('@'); + pid = (atIndex != -1) ? Long.valueOf(jvmName.substring(0, atIndex)) : null; + return pid; + } - if (!arg.startsWith("-")) { - if (arg.length() <= 200) { - name = arg; - } else { - // Truncate it if it's really long for a more palatable Resource name. - name = arg.substring(arg.length() - 200); - } - break; - } else if (arg.equals("-cp") || arg.equals("-classpath")) { - // Skip the next arg - it's the classpath, and we don't want that as the name. - i++; + protected DiscoveredResourceDetails discoverResourceDetails(ResourceDiscoveryContext context, ProcessInfo process) { + Integer jmxRemotingPort = getJmxRemotingPort(process); + JMXServiceURL jmxServiceURL; + Set<Socket> serverSockets; + if (jmxRemotingPort != null) { + // Use JMX Remoting when possible, since it doesn't require the RHQ Agent to have OS-level permissions to + // communicate with the remote JVM via IPC. + try { + jmxServiceURL = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://127.0.0.1:" + jmxRemotingPort + "/jmxrmi"); + } catch (MalformedURLException e) { + throw new RuntimeException(e); + } + } else { + // If JMX Remoting is not enabled, it's required that a Resource key is explicitly specified via the org.rhq.resourceKey sysprop. + String keyString = getSystemPropertyValue(process, SYSPROP_RHQ_RESOURCE_KEY); + if (keyString == null || keyString.equals("")) { + serverSockets = getServerSockets(process); + if (!serverSockets.isEmpty()) { + log.info("Server JVM process [" + process.getPid() + "] with command line [" + + Arrays.asList(process.getCommandLine()) + + "] cannot be discovered, because it does not specify either of the following system properties: -D" + + SYSPROP_JMXREMOTE_PORT + "=JMX_REMOTING_PORT, -D" + SYSPROP_RHQ_RESOURCE_KEY + "=UNIQUE_KEY"); + return null; } } - name += " (" + port + ")"; + // Start up a JMX agent within the JVM via the Sun Attach API, and return a URL that can be used to connect + // to that agent. + // Note, this will only work if the remote JVM is Java 6 or later, and maybe some 64 bit Java 5 - see + // JBNADM-3332. Also, the RHQ Agent will have to be running on a JDK, not a JRE, so that we can access + // the JDK's tools.jar, which contains the Sun JVM Attach API classes. + jmxServiceURL = JvmUtility.extractJMXServiceURL(process.getPid()); + } - Configuration config = context.getDefaultPluginConfiguration(); - config.put(new PropertySimple(CONNECTION_TYPE, - "org.mc4j.ems.connection.support.metadata.J2SE5ConnectionTypeDescriptor")); - config.put(new PropertySimple(CONNECTOR_ADDRESS_CONFIG_PROPERTY, "service:jmx:rmi:///jndi/rmi://localhost:" - + port + "/jmxrmi")); - // config.put(new PropertySimple(INSTALL_URI, process.getCurrentWorkingDirectory())); + if (jmxServiceURL != null) { + log.debug("JMX service URL for process [" + process + "] is [" + jmxServiceURL + "]."); + return buildResourceDetails(context, process, jmxServiceURL, jmxRemotingPort); + } else { + return null; + } + } - // TODO (ips, 09/04/09): I think we should connect to the remote JVM in order to obtain its version. - String version = null; + protected DiscoveredResourceDetails buildResourceDetails(ResourceDiscoveryContext context, ProcessInfo process, + JMXServiceURL jmxServiceURL, Integer jmxRemotingPort) { + JvmResourceKey key; + String mainClassName = getJavaMainClassName(process); + String value = getSystemPropertyValue(process, SYSPROP_RHQ_RESOURCE_KEY); + if (value != null && !value.equals("")) { + log.debug("Using explicitly specified Resource key: [" + value + "]..."); + key = JvmResourceKey.fromExplicitValue(mainClassName, value); + } else { + if (jmxRemotingPort != null) { + log.debug("Using JMX remoting port [" + jmxRemotingPort + "] as Resource key..."); + key = JvmResourceKey.fromJmxRemotingPort(mainClassName, jmxRemotingPort); + } else { + log.info("Process [" + process.getPid() + "] with command line [" + Arrays.asList(process.getCommandLine()) + "] cannot be discovered, because it does not specify either of the following system properties: -Dcom.sun.management.jmxremote, -D" + SYSPROP_RHQ_RESOURCE_KEY + "=UNIQUE_KEY"); + return null; + } + } + + String name = buildResourceName(key); - details = new DiscoveredResourceDetails(context.getResourceType(), port, name, version, - "Standalone JVM Process", config, null); + String version; + try { + JMXConnector jmxConnector = JMXConnectorFactory.connect(jmxServiceURL); + MBeanServerConnection mbeanServerConnection = jmxConnector.getMBeanServerConnection(); + RuntimeMXBean runtimeMXBean = ManagementFactory.newPlatformMXBeanProxy(mbeanServerConnection, + ManagementFactory.RUNTIME_MXBEAN_NAME, RuntimeMXBean.class); + version = runtimeMXBean.getSystemProperties().get(SYSPROP_JAVA_VERSION); + if (version == null) { + throw new IllegalStateException("System property " + SYSPROP_JAVA_VERSION + " is not defined."); + } + } catch (Exception e) { + log.error("Failed to determine JVM version.", e); + version = null; } - return details; + String description = "JVM, monitored via " + ((jmxRemotingPort != null) ? "JMX Remoting" : "Sun JVM Attach API"); + + Configuration pluginConfig = context.getDefaultPluginConfiguration(); + pluginConfig.put(new PropertySimple(CONNECTION_TYPE, J2SE5ConnectionTypeDescriptor.class.getName())); + if (jmxRemotingPort != null) { + pluginConfig.put(new PropertySimple(CONNECTOR_ADDRESS_CONFIG_PROPERTY, jmxServiceURL)); + } + + return new DiscoveredResourceDetails(context.getResourceType(), key.toString(), name, version, description, + pluginConfig, process); } - /** - * Examines the plugin configuration and if it defines additional classpath entries, this - * will return a list of files that point to all the jars that need to be added to a classloader - * to support the managed JMX resource. - * - * Note: this is package static scoped so the resource component can use this method. - * - * @param pluginConfiguration - * - * @return list of files pointing to additional jars; will be empty if no additional jars are to be added - */ - static List<File> getAdditionalJarsFromConfig(Configuration pluginConfiguration) { - List<File> jarFiles = new ArrayList<File>(); - - // get the plugin config setting that contains comma-separated list of files/dirs to additional jars - // if no additional classpath entries are specified, we'll return an empty list - PropertySimple prop = pluginConfiguration.getSimple(JMXDiscoveryComponent.ADDITIONAL_CLASSPATH_ENTRIES); - if (prop == null || prop.getStringValue() == null || prop.getStringValue().trim().length() == 0) { - return jarFiles; - } - String[] paths = prop.getStringValue().trim().split(","); - if (paths == null || paths.length == 0) { - return jarFiles; + private String buildResourceName(JvmResourceKey key) { + StringBuilder name = new StringBuilder(); + String mainClassName = key.getMainClassName(); + if (mainClassName != null) { + if (mainClassName.length() <= 200) { + name.append(mainClassName); + } else { + // Truncate it if it's really long for a more palatable Resource name. + name.append(mainClassName.substring(mainClassName.length() - 200)); + } } - // Get all additional classpath entries which can be listed as jar filenames or directories. - // If a directory has "/*.jar" at the end, all jar files found in that directory will be added - // as class path entries. - final class JarFilenameFilter implements FilenameFilter { - public boolean accept(File dir, String name) { - return name.endsWith(".jar"); - } + switch (key.getType()) { + case JmxRemotingPort: + name.append(':').append(key.getJmxRemotingPort()); break; + case Explicit: + name.append(' ').append(key.getExplicitValue()); break; + default: + throw new IllegalStateException("Unsupported key type: " + key.getType()); } - for (String path : paths) { - path = path.trim(); - if (path.length() > 0) { - if (path.endsWith("*.jar")) { - path = path.substring(0, path.length() - 5); - File dir = new File(path); - File[] jars = dir.listFiles(new JarFilenameFilter()); - if (jars != null && jars.length > 0) { - jarFiles.addAll(Arrays.asList(jars)); + return name.toString(); + } + + private Set<Socket> getServerSockets(ProcessInfo process) { + Set<Socket> serverSockets = new HashSet<Socket>(); + if (SIGAR != null) { + // Only request the type of connections we are interested in - TCP and UDP listen sockets. + int netFlags = (NetFlags.CONN_TCP | NetFlags.CONN_UDP | NetFlags.CONN_SERVER); + NetConnection[] connections; + try { + connections = SIGAR.getNetConnectionList(netFlags); + } catch (SigarException e) { + log.debug("Failed to get net connections.", e); + connections = new NetConnection[0]; + } + for (NetConnection connection : connections) { + if (connection.getState() == NetFlags.TCP_LISTEN) { + try { + long pid = SIGAR.getProcPort(connection.getType(), connection.getLocalPort()); + if (pid == process.getPid()) { + Socket.Protocol protocol = (connection.getType() == NetFlags.CONN_UDP) ? + Socket.Protocol.UDP : Socket.Protocol.TCP; + serverSockets.add(new Socket(protocol, connection.getLocalAddress(), + connection.getLocalPort())); + } + } catch (SigarException e) { + log.debug("Failed to get pid for connection [" + connection + "].", e); } - } else { - File pathFile = new File(path); - jarFiles.add(pathFile); } } } + return serverSockets; + } - return jarFiles; + protected String getJavaMainClassName(ProcessInfo process) { + String className = null; + for (int i = 1; i < process.getCommandLine().length; i++) { + String arg = process.getCommandLine()[i]; + + if (!arg.startsWith("-")) { + className = arg; + break; + } else if (arg.equals("-cp") || arg.equals("-classpath")) { + // The next arg is the classpath - skip it. + i++; + } + } + return className; } + + protected Integer getJmxRemotingPort(ProcessInfo process) { + String value = getSystemPropertyValue(process, SYSPROP_JMXREMOTE_PORT); + if (value != null) { + try { + return Integer.valueOf(value); + } catch (NumberFormatException e) { + return null; + } + } else { + return null; + } + } + + protected String getSystemPropertyValue(ProcessInfo process, String systemPropertyName) { + for (String argument : process.getCommandLine()) { + String prefix = "-D" + systemPropertyName + "="; + if (argument.startsWith(prefix)) { + return argument.substring(prefix.length()); + } + } + return null; + } + + } \ No newline at end of file diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXServerComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXServerComponent.java index 1f77f48..a5a7a13 100644 --- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXServerComponent.java +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXServerComponent.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2012 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -22,30 +22,17 @@ */ package org.rhq.plugins.jmx; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.mc4j.ems.connection.ConnectionFactory; + import org.mc4j.ems.connection.EmsConnection; -import org.mc4j.ems.connection.local.LocalVMFinder; -import org.mc4j.ems.connection.local.LocalVirtualMachine; -import org.mc4j.ems.connection.settings.ConnectionSettings; import org.mc4j.ems.connection.support.ConnectionProvider; -import org.mc4j.ems.connection.support.metadata.ConnectionTypeDescriptor; -import org.mc4j.ems.connection.support.metadata.J2SE5ConnectionTypeDescriptor; -import org.mc4j.ems.connection.support.metadata.LocalVMTypeDescriptor; import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.measurement.AvailabilityType; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pluginapi.inventory.ResourceComponent; import org.rhq.core.pluginapi.inventory.ResourceContext; +import org.rhq.plugins.jmx.util.ConnectionProviderFactory; /** * The generic JMX server component used to create and cache a connection to a local or @@ -61,124 +48,50 @@ import org.rhq.core.pluginapi.inventory.ResourceContext; * @author John Mazzitelli */ public class JMXServerComponent<T extends ResourceComponent<?>> implements JMXComponent<T> { + private static Log log = LogFactory.getLog(JMXServerComponent.class); private EmsConnection connection; private ConnectionProvider connectionProvider; /** - * Access to this is deprecated, use #getResourceContext() instead. + * The context of a component that is started. Note, other classes should use #getResourceContext(), rather than + * this field. */ ResourceContext context; public void start(ResourceContext context) throws Exception { this.context = context; - log.info("Starting connection to JMX Server " + context.getResourceKey()); + log.debug("Starting connection to " + context.getResourceType() + "[" + context.getResourceKey() + "]..."); + // If connecting to the EMS fails, log a warning but still succeed in starting. getAvailablity() will keep + // trying to connect each time it is called. try { internalStart(); } catch (Exception e) { - log.warn("JMX Plugin connection failure", e); - // The new model is to always succeed in starting, but warn about the errors (we only do this the first request) - /*throw new Exception("Unable to connect to Java VM [" - + configuration.getSimple(JMXDiscoveryComponent.CONNECTOR_ADDRESS_CONFIG_PROPERTY).getStringValue() - + "]", e);*/ + log.warn("Failed to connect to " + context.getResourceType() + "[" + context.getResourceKey() + "].", e); + } if (connection == null) { - log.warn("Unable to connect to JMX Server " + context.getResourceKey()); + log.warn("Unable to connect to " + context.getResourceType() + "[" + context.getResourceKey() + "]."); } } protected void internalStart() throws Exception { - Configuration configuration = context.getPluginConfiguration(); - - String connectionTypeDescriptorClass = configuration.getSimple(JMXDiscoveryComponent.CONNECTION_TYPE) + Configuration pluginConfig = context.getPluginConfiguration(); + String connectionTypeDescriptorClassName = pluginConfig.getSimple(JMXDiscoveryComponent.CONNECTION_TYPE) .getStringValue(); - - if (LocalVMTypeDescriptor.class.getName().equals(connectionTypeDescriptorClass)) { - String commandLine = configuration.getSimple(JMXDiscoveryComponent.COMMAND_LINE_CONFIG_PROPERTY) - .getStringValue(); - - Map<Integer, LocalVirtualMachine> vms = LocalVMFinder.getManageableVirtualMachines(); - if (vms != null) { - for (LocalVirtualMachine vm : vms.values()) { - if (vm.getCommandLine().equals(commandLine)) { - connectLocal(vm.getVmid()); - } - } - } - } else if (JMXDiscoveryComponent.PARENT_TYPE.equals(connectionTypeDescriptorClass)) { - // We're embedded in another jmx server component without jmxremoting set so just use the parent's connection + if (JMXDiscoveryComponent.PARENT_TYPE.equals(connectionTypeDescriptorClassName)) { + // Our parent is itself a JMX component, so just reuse its connection. this.connection = ((JMXComponent) context.getParentResourceComponent()).getEmsConnection(); this.connectionProvider = this.connection.getConnectionProvider(); - } else if (J2SE5ConnectionTypeDescriptor.class.getName().equals(connectionTypeDescriptorClass)) { - // We're embedded in a J2SE VM with jmxremote defined (e.g. for jconsole usage) - String principal = null; - String credentials = null; - PropertySimple o = configuration.getSimple(JMXComponent.PRINCIPAL_CONFIG_PROP); - if (o != null) { - principal = o.getStringValue(); - } - o = configuration.getSimple(JMXComponent.CREDENTIALS_CONFIG_PROP); - if (o != null) { - credentials = o.getStringValue(); - } - - ConnectionSettings settings = new ConnectionSettings(); - J2SE5ConnectionTypeDescriptor desc = new J2SE5ConnectionTypeDescriptor(); - settings.setConnectionType(desc); - settings.setServerUrl(configuration.getSimple(JMXDiscoveryComponent.CONNECTOR_ADDRESS_CONFIG_PROPERTY) - .getStringValue()); - if (principal != null) { - settings.setPrincipal(principal); - } - if (credentials != null) { - settings.setCredentials(credentials); - } - - prepareConnection(settings); - } else { - // This can handle internal connections (within the same vm as the plugin container) as well as - // any remote connections - ConnectionSettings settings = new ConnectionSettings(); - - String principal = null; - String credentials = null; - PropertySimple o = configuration.getSimple(JMXComponent.PRINCIPAL_CONFIG_PROP); - if (o != null) { - principal = o.getStringValue(); - } - o = configuration.getSimple(JMXComponent.CREDENTIALS_CONFIG_PROP); - if (o != null) { - credentials = o.getStringValue(); - } - - settings.initializeConnectionType((ConnectionTypeDescriptor) Class.forName(connectionTypeDescriptorClass) - .newInstance()); - - settings.setConnectionType((ConnectionTypeDescriptor) Class.forName(connectionTypeDescriptorClass) - .newInstance()); - settings.setServerUrl(configuration.getSimple(JMXDiscoveryComponent.CONNECTOR_ADDRESS_CONFIG_PROPERTY) - .getStringValue()); - - String installPath = configuration.getSimpleValue(JMXDiscoveryComponent.INSTALL_URI, null); - if (installPath != null) { - settings.setLibraryURI(configuration.getSimple(JMXDiscoveryComponent.INSTALL_URI).getStringValue()); - } - - if (principal != null) { - settings.setPrincipal(principal); - } - if (credentials != null) { - settings.setCredentials(credentials); - } - prepareConnection(settings); + this.connectionProvider = ConnectionProviderFactory.createConnectionProvider(pluginConfig, + this.context.getNativeProcess(), this.context.getTemporaryDirectory()); + this.connection = this.connectionProvider.connect(); + this.connection.loadSynchronous(false); } - - this.connection.loadSynchronous(false); - } public void stop() { @@ -192,28 +105,6 @@ public class JMXServerComponent<T extends ResourceComponent<?>> implements JMXCo } } - protected void connectLocal(int vmid) { - // TODO GH: Refactor ems to also accept the vm itself - ConnectionSettings settings = new ConnectionSettings(); - settings.setConnectionType(new LocalVMTypeDescriptor()); - settings.setServerUrl(String.valueOf(vmid)); - prepareConnection(settings); - } - - protected void prepareConnection(ConnectionSettings settings) { - settings.getControlProperties().setProperty(ConnectionFactory.COPY_JARS_TO_TEMP, String.valueOf(Boolean.TRUE)); - settings.getControlProperties().setProperty(ConnectionFactory.JAR_TEMP_DIR, - this.context.getTemporaryDirectory().getAbsolutePath()); - - addAdditionalJarsToConnectionSettings(settings); - - ConnectionFactory cf = new ConnectionFactory(); - cf.discoverServerClasses(settings); - - this.connectionProvider = cf.getConnectionProvider(settings); - this.connection = this.connectionProvider.connect(); - } - public EmsConnection getEmsConnection() { return this.connection; } @@ -223,8 +114,8 @@ public class JMXServerComponent<T extends ResourceComponent<?>> implements JMXCo try { internalStart(); } catch (Exception e) { - log.debug("Still unable to reconnect resource: " + context.getResourceKey() + " due to error: " - + e.getMessage()); + log.debug("Still unable to reconnect to " + context.getResourceType() + "[" + context.getResourceKey() + + "] due to error: " + e); } } @@ -236,32 +127,4 @@ public class JMXServerComponent<T extends ResourceComponent<?>> implements JMXCo return this.context; } - public List<Resource> discoverServices(ResourceType type, Configuration defaultPluginConfiguration) { - defaultPluginConfiguration.getSimple("objectName").getStringValue(); - - return null; - } - - private void addAdditionalJarsToConnectionSettings(ConnectionSettings settings) { - // get the additional jars from the config - Configuration pluginConfiguration = getResourceContext().getPluginConfiguration(); - List<File> additionalEntries = JMXDiscoveryComponent.getAdditionalJarsFromConfig(pluginConfiguration); - if (additionalEntries == null || additionalEntries.size() == 0) { - return; // nothing to do, there are no additional entries to add - } - - // get the setting's current list of classpath entries - we are going to add to these - List<File> settingsEntries = settings.getClassPathEntries(); - if (settingsEntries == null) { - settingsEntries = new ArrayList<File>(); - } - - // append the additional entries to the end of the setting's current entries - settingsEntries.addAll(additionalEntries); - - // now that we've appended our additional jars, tell the connection settings about the new list - settings.setClassPathEntries(settingsEntries); - - return; - } } \ No newline at end of file diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ConnectionProviderFactory.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ConnectionProviderFactory.java new file mode 100644 index 0000000..5c29673 --- /dev/null +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ConnectionProviderFactory.java @@ -0,0 +1,218 @@ +package org.rhq.plugins.jmx.util; + +import java.io.File; +import java.io.FilenameFilter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +import javax.management.remote.JMXServiceURL; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; +import org.rhq.core.system.ProcessInfo; +import org.rhq.plugins.jmx.JMXComponent; +import org.rhq.plugins.jmx.JMXDiscoveryComponent; + +import org.mc4j.ems.connection.ConnectionFactory; +import org.mc4j.ems.connection.local.LocalVMFinder; +import org.mc4j.ems.connection.local.LocalVirtualMachine; +import org.mc4j.ems.connection.settings.ConnectionSettings; +import org.mc4j.ems.connection.support.ConnectionProvider; +import org.mc4j.ems.connection.support.metadata.ConnectionTypeDescriptor; +import org.mc4j.ems.connection.support.metadata.J2SE5ConnectionTypeDescriptor; +import org.mc4j.ems.connection.support.metadata.LocalVMTypeDescriptor; + +/** + * A factory that can construct an EMS {@link ConnectionProvider} for a JMX Server Resource from that Resource's plugin + * configuration. + * + * @author Ian Springer + */ +public class ConnectionProviderFactory { + + public static ConnectionProvider createConnectionProvider(Configuration pluginConfig, ProcessInfo process, + File tempDir) throws Exception { + String connectionTypeDescriptorClassName = pluginConfig.getSimple(JMXDiscoveryComponent.CONNECTION_TYPE) + .getStringValue(); + + Class<?> connectionTypeDescriptorClass; + try { + connectionTypeDescriptorClass = Class.forName(connectionTypeDescriptorClassName); + } catch (ClassNotFoundException e) { + throw new InvalidPluginConfigurationException("Invalid connection type - class [" + connectionTypeDescriptorClassName + + "] not found."); + } + if (!(ConnectionTypeDescriptor.class.isAssignableFrom(connectionTypeDescriptorClass))) { + throw new InvalidPluginConfigurationException("Invalid connection type - class [" + connectionTypeDescriptorClassName + + "] does not implement the " + ConnectionTypeDescriptor.class.getName() + " interface."); + } + ConnectionTypeDescriptor connectionTypeDescriptor; + try { + connectionTypeDescriptor = (ConnectionTypeDescriptor) connectionTypeDescriptorClass.newInstance(); + } catch (Exception e) { + throw new RuntimeException("Failed to instantiate connection type descriptor of type [" + connectionTypeDescriptorClassName + "].", e); + } + + ConnectionSettings settings = new ConnectionSettings(); + settings.initializeConnectionType(connectionTypeDescriptor); + + // Set principal and credentials. + String principal = pluginConfig.getSimpleValue(JMXComponent.PRINCIPAL_CONFIG_PROP, null); + settings.setPrincipal(principal); + String credentials = pluginConfig.getSimpleValue(JMXComponent.CREDENTIALS_CONFIG_PROP, null); + settings.setCredentials(credentials); + + if (connectionTypeDescriptor instanceof LocalVMTypeDescriptor) { + // NOTE (ips, 01/19/12): This is not very reliable for long-term management of a JVM, since it uses the + // command line from the time the JVM was originally discovered, which may have changed. + String commandLine = pluginConfig.getSimpleValue(JMXDiscoveryComponent.COMMAND_LINE_CONFIG_PROPERTY, null); + if (commandLine == null) { + throw new InvalidPluginConfigurationException("A command line is required for the " + + connectionTypeDescriptorClassName + " connection type."); + } + + Map<Integer, LocalVirtualMachine> vms = LocalVMFinder.getManageableVirtualMachines(); + LocalVirtualMachine targetVm = null; + if (vms != null) { + for (LocalVirtualMachine vm : vms.values()) { + if (vm.getCommandLine().equals(commandLine)) { + targetVm = vm; + break; + } + } + } + if (targetVm == null) { + // This could just be because the JVM is not currently running. + throw new Exception("JVM with command line [" + commandLine + "] not found."); + } + String vmId = String.valueOf(targetVm.getVmid()); + settings.setServerUrl(vmId); + } else if (connectionTypeDescriptor instanceof J2SE5ConnectionTypeDescriptor) { + // Connect via JMX Remoting, using the JVM Attach API to start up a JMX Remoting Agent if necessary. + String jmxConnectorAddress = getJmxConnectorAddress(pluginConfig, process); + settings.setServerUrl(jmxConnectorAddress); + } else { + // Handle internal connections (InternalVMTypeDescriptor) (i.e. the RHQ plugin container's own JVM), as + // well as miscellaneous types of remote connections - WebSphere, WebLogic, etc. + String connectorAddress = pluginConfig.getSimpleValue(JMXDiscoveryComponent.CONNECTOR_ADDRESS_CONFIG_PROPERTY, + null); + if (connectorAddress == null) { + throw new InvalidPluginConfigurationException("A connector address is required for the " + + connectionTypeDescriptorClassName + " connection type."); + } + settings.setServerUrl(connectorAddress); + String installURI = pluginConfig.getSimpleValue(JMXDiscoveryComponent.INSTALL_URI, null); + settings.setLibraryURI(installURI); + } + + addAdditionalJarsToConnectionSettings(settings, pluginConfig); + + return createConnectionProvider(settings, tempDir); + } + + private static ConnectionProvider createConnectionProvider(ConnectionSettings settings, File tempDir) { + settings.getControlProperties().setProperty(ConnectionFactory.COPY_JARS_TO_TEMP, String.valueOf(Boolean.TRUE)); + settings.getControlProperties().setProperty(ConnectionFactory.JAR_TEMP_DIR, + tempDir.getAbsolutePath()); + + ConnectionFactory connectionFactory = new ConnectionFactory(); + connectionFactory.discoverServerClasses(settings); + + return connectionFactory.getConnectionProvider(settings); + } + + private static void addAdditionalJarsToConnectionSettings(ConnectionSettings settings, Configuration pluginConfig) { + + List<File> additionalEntries = getAdditionalJarsFromConfig(pluginConfig); + if (additionalEntries == null || additionalEntries.size() == 0) { + return; // nothing to do, there are no additional entries to add + } + + // get the setting's current list of classpath entries - we are going to add to these + List<File> settingsEntries = settings.getClassPathEntries(); + if (settingsEntries == null) { + settingsEntries = new ArrayList<File>(); + } + + // append the additional entries to the end of the setting's current entries + settingsEntries.addAll(additionalEntries); + + // now that we've appended our additional jars, tell the connection settings about the new list + settings.setClassPathEntries(settingsEntries); + } + + private static String getJmxConnectorAddress(Configuration pluginConfig, ProcessInfo process) throws Exception { + String connectorAddress = pluginConfig.getSimpleValue(JMXDiscoveryComponent.CONNECTOR_ADDRESS_CONFIG_PROPERTY, + null); + if (connectorAddress == null) { + // No JMX connector address defined - try to connect via Attach API. + if (process == null) { + throw new Exception("Could not find java process for JVM."); + } + JMXServiceURL jmxServiceURL = JvmUtility.extractJMXServiceURL(process.getPid()); + if (jmxServiceURL == null) { + throw new Exception("Could not obtain JMX service URL via Attach API for JVM [" + process + "]."); + } + connectorAddress = jmxServiceURL.toString(); + } + return connectorAddress; + } + + /** + * Examines the plugin configuration and if it defines additional classpath entries, this + * will return a list of files that point to all the jars that need to be added to a classloader + * to support the managed JMX resource. + * + * Note: this is package static scoped so the resource component can use this method. + * + * @param pluginConfiguration + * + * @return list of files pointing to additional jars; will be empty if no additional jars are to be added + */ + public static List<File> getAdditionalJarsFromConfig(Configuration pluginConfiguration) { + List<File> jarFiles = new ArrayList<File>(); + + // get the plugin config setting that contains comma-separated list of files/dirs to additional jars + // if no additional classpath entries are specified, we'll return an empty list + PropertySimple prop = pluginConfiguration.getSimple(JMXDiscoveryComponent.ADDITIONAL_CLASSPATH_ENTRIES); + if (prop == null || prop.getStringValue() == null || prop.getStringValue().trim().length() == 0) { + return jarFiles; + } + String[] paths = prop.getStringValue().trim().split(","); + if (paths == null || paths.length == 0) { + return jarFiles; + } + + // Get all additional classpath entries which can be listed as jar file names or directories. + // If a directory has ".jar" at the end, all jar files found in that directory will be added + // as class path entries. + final class JarFilenameFilter implements FilenameFilter { + public boolean accept(File dir, String name) { + return name.endsWith(".jar"); + } + } + + for (String path : paths) { + path = path.trim(); + if (path.length() > 0) { + if (path.endsWith("*.jar")) { + path = path.substring(0, path.length() - 5); + File dir = new File(path); + File[] jars = dir.listFiles(new JarFilenameFilter()); + if (jars != null && jars.length > 0) { + jarFiles.addAll(Arrays.asList(jars)); + } + } else { + File pathFile = new File(path); + jarFiles.add(pathFile); + } + } + } + + return jarFiles; + } + +} diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmResourceKey.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmResourceKey.java new file mode 100644 index 0000000..70053cb --- /dev/null +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmResourceKey.java @@ -0,0 +1,179 @@ +/* + * RHQ Management Platform + * Copyright (C) 2012 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.plugins.jmx.util; + +/** + * @author Ian Springer + */ +public class JvmResourceKey { + + private String mainClassName; + private String explicitValue; + private Integer jmxRemotingPort; + private String connectorAddress; + private transient Type type; + + public static JvmResourceKey fromExplicitValue(String mainClassName, String explicitValue) { + JvmResourceKey instance = new JvmResourceKey(mainClassName); + instance.explicitValue = explicitValue; + instance.type = Type.Explicit; + return instance; + } + + public static JvmResourceKey fromJmxRemotingPort(String mainClassName, int jmxRemotingPort) { + JvmResourceKey instance = new JvmResourceKey(mainClassName); + instance.jmxRemotingPort = jmxRemotingPort; + instance.type = (mainClassName != null) ? Type.JmxRemotingPort : Type.Legacy; + return instance; + } + + public static JvmResourceKey fromConnectorAddress(String connectorAddress) { + JvmResourceKey instance = new JvmResourceKey(null); + instance.connectorAddress = connectorAddress; + instance.type = Type.ConnectorAddress; + return instance; + } + + public static JvmResourceKey valueOf(String string) { + JvmResourceKey instance; + if (string.contains("{") && string.endsWith("}")) { + String mainClassName = string.substring(0, string.indexOf('{')); + String explicitValue = string.substring(string.indexOf('{') + 1, string.length() - 1); + instance = JvmResourceKey.fromExplicitValue(mainClassName, explicitValue); + } else if (string.contains("(") && string.endsWith(")")) { + String mainClassName = string.substring(0, string.indexOf('(')); + String value = string.substring(string.indexOf('(') + 1, string.length() - 1); + int jmxRemotingPort = Integer.parseInt(value); + instance = JvmResourceKey.fromJmxRemotingPort(mainClassName, jmxRemotingPort); + } else { + + try { + int jmxRemotingPort = Integer.parseInt(string); + // It's a legacy key, e.g. "9999". + instance = JvmResourceKey.fromJmxRemotingPort(null, jmxRemotingPort); + } catch (NumberFormatException e) { + // At this point, assume it's a connector address, e.g. + // "service:jmx:iiop://127.0.0.1:7001/jndi/weblogic.management.mbeanservers.runtime". + instance = JvmResourceKey.fromConnectorAddress(string); + } + } + return instance; + } + + public String getMainClassName() { + return mainClassName; + } + + public String getExplicitValue() { + return explicitValue; + } + + public Integer getJmxRemotingPort() { + return jmxRemotingPort; + } + + public String getConnectorAddress() { + return connectorAddress; + } + + public Type getType() { + return type; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + JvmResourceKey that = (JvmResourceKey) o; + + if (connectorAddress != null ? !connectorAddress.equals(that.connectorAddress) : that.connectorAddress != null) + return false; + if (explicitValue != null ? !explicitValue.equals(that.explicitValue) : that.explicitValue != null) + return false; + if (jmxRemotingPort != null ? !jmxRemotingPort.equals(that.jmxRemotingPort) : that.jmxRemotingPort != null) + return false; + if (mainClassName != null ? !mainClassName.equals(that.mainClassName) : that.mainClassName != null) + return false; + + return true; + } + + @Override + public int hashCode() { + int result = mainClassName != null ? mainClassName.hashCode() : 0; + result = 31 * result + (explicitValue != null ? explicitValue.hashCode() : 0); + result = 31 * result + (jmxRemotingPort != null ? jmxRemotingPort.hashCode() : 0); + result = 31 * result + (connectorAddress != null ? connectorAddress.hashCode() : 0); + return result; + } + + @Override + public String toString() { + String string; + switch (this.type) { + case Legacy: + string = this.jmxRemotingPort.toString(); + break; + case ConnectorAddress: + string = this.connectorAddress; + break; + case JmxRemotingPort: + string = this.mainClassName + "(" + this.jmxRemotingPort + ")"; + break; + case Explicit: + string = this.mainClassName + "{" + this.explicitValue + "}"; + break; + default: + throw new IllegalStateException("Unsupported key type: " + this.type); + } + return string; + } + + public enum Type { + /** + * The legacy format is a simple integer representing the JVM's JMX remoting port, e.g. "9999" + */ + Legacy, + /** + * Manually added JVM's use the JMX connector address as the key, e.g. + * "service:jmx:iiop://127.0.0.1:7001/jndi/weblogic.management.mbeanservers.runtime" + */ + ConnectorAddress, + /** + * The successor of the legacy format; includes the main class name in addition to the JMX remoting port, + * e.g. "org.example.Main(9999)" + */ + JmxRemotingPort, + /** + * This format is used when a key is explicitly specified on the JVM's command line via the org.rhq.resourceKey + * sysprop; the main class name is also included, e.g. "org.example.Main{foo}" + */ + Explicit + } + + private JvmResourceKey(String mainClassName) { + this.mainClassName = mainClassName; + } + +} diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmUtility.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmUtility.java new file mode 100644 index 0000000..c4c93b3 --- /dev/null +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmUtility.java @@ -0,0 +1,118 @@ +/* + * RHQ Management Platform + * Copyright (C) 2011-2012 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.plugins.jmx.util; + +import java.io.File; +import java.io.IOException; + +import javax.management.remote.JMXServiceURL; + +import com.sun.tools.attach.VirtualMachine; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.rhq.plugins.jmx.MBeanResourceComponent; + +/** + * @author Ian Springer + */ +public class JvmUtility { + + private static final Log LOG = LogFactory.getLog(MBeanResourceComponent.class); + + private static final String AGENT_PROP_JMXREMOTE_LOCAL_CONNECTOR_ADDRESS = + "com.sun.management.jmxremote.localConnectorAddress"; + + private static boolean attachApiAvailable; + + static { + try { + Class.forName("com.sun.tools.attach.VirtualMachine"); + attachApiAvailable = true; + } catch (ClassNotFoundException e) { + LOG.warn("JDK tools.jar not found on system classpath - cannot discover JVMs using Sun JVM Attach API; " + + "to fix this, run the RHQ Agent on a JDK, rather than a JRE."); + } + } + + /** + * TODO + * + * @param pid the process ID of a JVM (java*) process + * + * @return + * + * @throws Exception + */ + public static JMXServiceURL extractJMXServiceURL(long pid) { + if (!attachApiAvailable) { + LOG.debug("Returning null since the Attach API is not available..."); + return null; + } + LOG.debug("Attaching to JVM for java process with PID [" + pid + "]..."); + JMXServiceURL url; + try { + VirtualMachine vm = VirtualMachine.attach(String.valueOf(pid)); + LOG.debug("Attached to JVM [" + vm + "]."); + + String jmxConnectorAddress = vm.getAgentProperties().getProperty(AGENT_PROP_JMXREMOTE_LOCAL_CONNECTOR_ADDRESS); + LOG.debug("Connector address for JVM [" + vm + "] is [" + jmxConnectorAddress + "]."); + if (jmxConnectorAddress == null) { + // java.home always points to the jre dir (e.g. /usr/java/default/jre). + String jreDir = vm.getSystemProperties().getProperty("java.home"); + // management-agent.jar is included with the v6 JRE, so we can rely on it always being there. + File jmxAgentJarFile = new File(jreDir, "lib/management-agent.jar"); + String jmxAgentJar = jmxAgentJarFile.getCanonicalPath(); + try { + vm.loadAgent(jmxAgentJar); + } catch (Exception e) { + throw new RuntimeException("Failed to load JVM agent from [" + jmxAgentJar + "].", e); + } + + // JMX agent is started - get the connector address. + LOG.debug("JMX agent started - getting the connector address..."); + jmxConnectorAddress = vm.getAgentProperties().getProperty(AGENT_PROP_JMXREMOTE_LOCAL_CONNECTOR_ADDRESS); + if (jmxConnectorAddress == null) { + throw new RuntimeException("Failed to determine JMX connector address."); + } + } + + try { + vm.detach(); + } catch (Exception e) { + // We already succeeded in obtaining the connector address, so just log this, rather than throwing an exception. + LOG.error("Failed to detach from JVM [" + vm + "].", e); + } + + url = new JMXServiceURL(jmxConnectorAddress); + } catch (Exception e) { + throw new RuntimeException("Failed to extract JMX service URL for process with PID [" + pid + "].", e); + } + + LOG.debug("JMX service URL for java process with PID [" + pid + "]: " + url); + return url; + } + + private JvmUtility() { + } + +} diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/Socket.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/Socket.java new file mode 100644 index 0000000..142cf1c --- /dev/null +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/Socket.java @@ -0,0 +1,120 @@ +/* + * RHQ Management Platform + * Copyright (C) 2011-2012 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +package org.rhq.plugins.jmx.util; + +/** + * @author Ian Springer + */ +public class Socket implements Comparable<Socket> { + + private static final String STRING_DELIMITER = "/"; + + private Protocol protocol; + private String host; // either an IP address or a host name + private long port; + + public static Socket valueOf(String string) { + String[] values = string.split(STRING_DELIMITER); + Protocol protocol = Protocol.valueOf(values[0]); + String host = values[1]; + long port = Long.valueOf(values[2]); + + return new Socket(protocol, host, port); + } + + public Socket(Protocol protocol, String host, long port) { + if (protocol == null) { + throw new IllegalArgumentException("protocol must be non-null."); + } + if (host == null) { + throw new IllegalArgumentException("host must be non-null."); + } + if (port < 0 || port > 65535) { + throw new IllegalArgumentException("invalid port: " + port); + } + + this.protocol = protocol; + this.host = host; + this.port = port; + } + + public Protocol getProtocol() { + return protocol; + } + + public String getHost() { + return host; + } + + public long getPort() { + return port; + } + + public enum Protocol { TCP, UDP } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + Socket that = (Socket) o; + + if (port != that.port) return false; + if (!host.equals(that.host)) return false; + if (protocol != that.protocol) return false; + + return true; + } + + @Override + public int hashCode() { + int result = protocol.hashCode(); + result = 31 * result + host.hashCode(); + result = 31 * result + (int) (port ^ (port >>> 32)); + return result; + } + + @Override + public String toString() { + return this.protocol + STRING_DELIMITER + this.host + STRING_DELIMITER + this.port; + } + + @Override + public int compareTo(Socket that) { + if (this == that) { + return 0; + } + + int result = this.protocol.compareTo(that.protocol); + if (result == 0) { + result = this.host.compareTo(that.host); + if (result == 0) { + result = Long.valueOf(this.port).compareTo(that.port); + + } + } + return result; + } + +} diff --git a/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java b/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java index 791a578..ee172ba 100644 --- a/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java +++ b/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. + * Copyright (C) 2005-2012 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -28,13 +28,22 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintWriter; +import java.lang.management.ManagementFactory; +import java.lang.management.RuntimeMXBean; +import java.net.ServerSocket; +import java.net.Socket; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.resource.ResourceCategory; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.plugins.jmx.JMXDiscoveryComponent; +import org.rhq.plugins.jmx.util.JvmResourceKey; import org.testng.annotations.AfterSuite; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; @@ -61,38 +70,38 @@ import org.rhq.core.pluginapi.operation.OperationFacet; * Integration test for the JMX plugin. * * @author Greg Hinkle + * @author Ian Springer */ public class JMXPluginTest { - static final String PROGRAM_CLASS = "org.rhq.plugins.jmx.test.JMXPluginTest$TestProgram"; - static final String MONITORABLE = "-Dcom.sun.management.jmxremote.port=9921 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false"; - static final String MBEAN_SERVER_ADDRESS = "service:jmx:rmi:///jndi/rmi://localhost:9921/jmxrmi"; - static final String PROJECT_ARTIFACT_ID_SYSPROP = "project.artifactId"; - static final String PROJECT_VERSION_SYSPROP = "project.version"; + private static final int JMX_REMOTING_PORT1 = 9921; + private static final int JMX_REMOTING_PORT2 = 9922; - private Process testProgram; - private InventoryManager inventoryManager; private static final String PLUGIN_NAME = "JMX"; + private static final String SERVER_TYPE_NAME = "JMX Server"; + private static final String EXPLICIT_RESOURCE_KEY1 = "foo1"; + private static final String EXPLICIT_RESOURCE_KEY2 = "foo2"; + private List<Process> testServerJvms = new ArrayList<Process>(); + + private InventoryManager inventoryManager; + @BeforeSuite public void start() { try { - String javaHome = System.getProperty("java.home"); - String javaCmd = javaHome + "/bin/java"; + // Start the test server JVMs. + this.testServerJvms.add(startTestServerJvm("-Dcom.sun.management.jmxremote.port=" + JMX_REMOTING_PORT1, + "-Dcom.sun.management.jmxremote.ssl=false", "-Dcom.sun.management.jmxremote.authenticate=false")); - ProcessBuilder processBuilder = new ProcessBuilder(javaCmd, "-cp", "target/test-classes", - "-Dcom.sun.management.jmxremote.port=9921", "-Dcom.sun.management.jmxremote.ssl=false", - "-Dcom.sun.management.jmxremote.authenticate=false", PROGRAM_CLASS); - processBuilder.redirectErrorStream(true); - testProgram = processBuilder.start(); + this.testServerJvms.add(startTestServerJvm("-D" + JMXDiscoveryComponent.SYSPROP_RHQ_RESOURCE_KEY + "=" + + EXPLICIT_RESOURCE_KEY1)); - OutputReader or = new OutputReader(testProgram.getInputStream()); - Thread ort = new Thread(or); - ort.setDaemon(true); - ort.start(); + this.testServerJvms.add(startTestServerJvm("-Dcom.sun.management.jmxremote.port=" + JMX_REMOTING_PORT2, + "-Dcom.sun.management.jmxremote.ssl=false", "-Dcom.sun.management.jmxremote.authenticate=false", + "-D" + JMXDiscoveryComponent.SYSPROP_RHQ_RESOURCE_KEY + "=" + EXPLICIT_RESOURCE_KEY2)); - // Give it time to start - Thread.sleep(2000); + // Give them time to fully start. + Thread.sleep(3000); File pluginDir = new File("target/itest/plugins"); PluginContainerConfiguration pcConfig = new PluginContainerConfiguration(); @@ -102,10 +111,9 @@ public class JMXPluginTest { PluginContainer.getInstance().setConfiguration(pcConfig); PluginContainer.getInstance().initialize(); - System.out.println("PC Started"); - for (String plugin : PluginContainer.getInstance().getPluginManager().getMetadataManager().getPluginNames()) { - System.out.println("PLUGIN: " + plugin); - } + + Set<String> pluginNames = PluginContainer.getInstance().getPluginManager().getMetadataManager().getPluginNames(); + System.out.println("PC started with plugins " + pluginNames + "."); this.inventoryManager = PluginContainer.getInstance().getInventoryManager(); } catch (Throwable t) { @@ -116,17 +124,43 @@ public class JMXPluginTest { } } + private Process startTestServerJvm(String... jvmArgs) throws IOException { + String javaHome = System.getProperty("java.home"); + String javaCmd = javaHome + "/bin/java"; + + List<String> args = new ArrayList<String>(); + args.add(javaCmd); + args.add("-cp"); + args.add("target/test-classes"); + args.addAll(Arrays.asList(jvmArgs)); + args.add(TestProgram.class.getName()); + + ProcessBuilder processBuilder = new ProcessBuilder(args); + processBuilder.redirectErrorStream(true); + Process process = processBuilder.start(); + + OutputReader outputReader = new OutputReader(process.getInputStream()); + Thread outputReaderThread = new Thread(outputReader); + outputReaderThread.setDaemon(true); + outputReaderThread.start(); + + return process; + } + @AfterSuite - public void stop() { + public void stop() { PluginContainer.getInstance().shutdown(); - testProgram.destroy(); + + for (Process process : this.testServerJvms) { + process.destroy(); + } } @Test public void testPluginLoad() { PluginManager pluginManager = PluginContainer.getInstance().getPluginManager(); PluginEnvironment pluginEnvironment = pluginManager.getPlugin(PLUGIN_NAME); - assert pluginEnvironment != null : "Null environment, plugin not loaded"; + assert (pluginEnvironment != null) : "Null environment, plugin not loaded"; assert (pluginEnvironment.getPluginName().equals(PLUGIN_NAME)); } @@ -135,9 +169,43 @@ public class JMXPluginTest { InventoryReport report = PluginContainer.getInstance().getInventoryManager().executeServerScanImmediately(); assert report != null; System.out.println("Discovery took: " + (report.getEndTime() - report.getStartTime()) + "ms"); + Resource platform = PluginContainer.getInstance().getInventoryManager().getPlatform(); - Set<Resource> servers = platform.getChildResources(); - System.out.println("Found " + servers.size() + " servers"); + + Set<Resource> jmxServers = getChildResourcesOfType(platform, new ResourceType(SERVER_TYPE_NAME, PLUGIN_NAME, + ResourceCategory.SERVER, null)); + System.out.println("Found " + jmxServers.size() + " JMX Servers:"); + + boolean foundJmxRemotingServer = false; + boolean foundExplicitKey1Server = false; + boolean foundExplicitKey2Server = false; + for (Resource jmxServer : jmxServers) { + System.out.println(" * " + jmxServer); + JvmResourceKey key = JvmResourceKey.valueOf(jmxServer.getResourceKey()); + switch (key.getType()) { + case Explicit: + if (key.getExplicitValue().equals(EXPLICIT_RESOURCE_KEY1)) { + assert key.getMainClassName().equals(TestProgram.class.getName()); + foundExplicitKey1Server = true; + } else if (key.getExplicitValue().equals(EXPLICIT_RESOURCE_KEY2)) { + assert key.getMainClassName().equals(TestProgram.class.getName()); + foundExplicitKey2Server = true; + } + break; + case JmxRemotingPort: + if (key.getMainClassName().equals(TestProgram.class.getName()) && + key.getJmxRemotingPort().equals(JMX_REMOTING_PORT1)) { + assert key.getMainClassName().equals(TestProgram.class.getName()); + foundJmxRemotingServer = true; + } + break; + default: + throw new IllegalStateException("Unsupported key type: " + key.getType()); + } + } + assert foundJmxRemotingServer : "JMX Remoting server not found."; + assert foundExplicitKey1Server : "Explicit key server not found."; + assert foundExplicitKey2Server : "JMX Remoting + explicit key server not found."; } @Test(dependsOnMethods = "testServerDiscovery") @@ -147,27 +215,20 @@ public class JMXPluginTest { Resource platform = PluginContainer.getInstance().getInventoryManager().getPlatform(); assert platform != null; - Set<Resource> childResources = platform.getChildResources(); - assert childResources != null; - - /*System.out.println("RUNTIME SERVERS: " + childResources.size()); - * for (Resource server : platform.getChildResources()) { System.out.println("Server: " + server.toString()); - * System.out.println("Found with " + server.getChildResources().size() + " child services");}*/ - InventoryPrinter.outputInventory(new PrintWriter(System.out), false); - } - @Test(dependsOnMethods = "testServerDiscovery") - public void testNumberOfServers() throws Exception { - InventoryReport report = PluginContainer.getInstance().getInventoryManager().executeServiceScanImmediately(); - assert report != null; - Resource platform = PluginContainer.getInstance().getInventoryManager().getPlatform(); + Set<Resource> jmxServers = getChildResourcesOfType(platform, new ResourceType(SERVER_TYPE_NAME, PLUGIN_NAME, + ResourceCategory.SERVER, null)); - assert platform != null; - Set<Resource> childResources = platform.getChildResources(); - assert childResources != null; + for (Resource jmxServer : jmxServers) { + Set<Resource> childResources = jmxServer.getChildResources(); + // Each JMX Server should have exactly six singleton child Resources with the following types: + // Operating System, Threading, VM Class Loading System, VM Compilation System, VM Memory System, and + // java.util.logging. + assert childResources.size() == 6 : jmxServer + " does not have 6 child Resources - child Resources: " + + childResources; + } - // TODO GH: ccrouch... why would this be two now? - //assert childResources.size() == 2 : "Not all Server instances were found."; + InventoryPrinter.outputInventory(new PrintWriter(System.out), false); } @Test(dependsOnMethods = "testServiceDiscovery") @@ -198,8 +259,6 @@ public class JMXPluginTest { @Test(dependsOnMethods = "testServiceDiscovery") public void testOperation() throws Exception { - // TODO GH: Test only runs when tested on JDK 6 as the JVM services aren't detected - // currently for the test platform Resource platform = PluginContainer.getInstance().getInventoryManager().getPlatform(); for (Resource server : platform.getChildResources()) { List<Resource> services = new ArrayList<Resource>(server.getChildResources()); @@ -253,6 +312,19 @@ public class JMXPluginTest { * } } */ + private static Set<Resource> getChildResourcesOfType(Resource platform, ResourceType resourceType) { + Set<Resource> childResources = platform.getChildResources(); + Set<Resource> results = new HashSet<Resource>(); + for (Resource resource : childResources) { + ResourceType childResourceType = resource.getResourceType(); + if (childResourceType.getPlugin().equals(resourceType.getPlugin()) && + childResourceType.getName().equals(resourceType.getName())) { + results.add(resource); + } + } + return results; + } + public static class OutputReader implements Runnable { InputStream inputStream; @@ -262,10 +334,10 @@ public class JMXPluginTest { public void run() { try { - BufferedReader r = new BufferedReader(new InputStreamReader(inputStream)); + BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream)); String line; - while ((line = r.readLine()) != null) { + while ((line = reader.readLine()) != null) { System.out.println("__" + line); } } catch (IOException e) { @@ -277,8 +349,35 @@ public class JMXPluginTest { public static class TestProgram implements Runnable { long started = System.currentTimeMillis(); - public static void main(String[] args) { - System.out.println("Test program running..."); + public static void main(String[] args) { + final ServerSocket serverSocket; + try { + serverSocket = new ServerSocket(0); + } catch (IOException e) { + throw new RuntimeException(e); + } + + RuntimeMXBean runtimeMXBean = ManagementFactory.getRuntimeMXBean(); + String jvmName = runtimeMXBean.getName(); + int atIndex = jvmName.indexOf('@'); + String pid = (atIndex != -1) ? jvmName.substring(0, atIndex) : "?"; + + System.out.println("Test server JVM with pid [" + pid + "] listening on port [" + + serverSocket.getLocalPort() + "]..."); + Runnable runnable = new Runnable() { + public void run() { + Socket socket; + try { + while ((socket = serverSocket.accept()) != null) { + socket.close(); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } + }; + runnable.run(); + TestProgram tp = new TestProgram(); tp.run(); } @@ -289,8 +388,10 @@ public class JMXPluginTest { try { Thread.sleep(5000); } catch (InterruptedException e) { + // ignore } } } } -} \ No newline at end of file + +} commit f83f9b96e135f7f6e4dbc505c24218103847835c Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Jan 23 14:12:11 2012 -0500 move ObjectNameQueryUtility and ParentDefinedJMXServerNamingUtility classes to util subpackage (missed files from earlier commit); minor code cleanup in InternalJMXServerDiscoveryComponent diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/InternalJMXServerDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/InternalJMXServerDiscoveryComponent.java index fcd16fc..ca5e5e5 100644 --- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/InternalJMXServerDiscoveryComponent.java +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/InternalJMXServerDiscoveryComponent.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2011 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -25,8 +25,6 @@ package org.rhq.plugins.jmx; import java.util.HashSet; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.mc4j.ems.connection.support.metadata.InternalVMTypeDescriptor; import org.rhq.core.domain.configuration.Configuration; @@ -34,24 +32,32 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; +import org.rhq.plugins.jmx.util.ParentDefinedJMXServerNamingUtility; +/** + * Discovers a singleton Resource representing the local JVM (i.e. the JVM in which the RHQ Plugin Container is running). + */ public class InternalJMXServerDiscoveryComponent implements ResourceDiscoveryComponent { - private static final Log log = LogFactory.getLog(InternalJMXServerDiscoveryComponent.class); + + private static final String RESOURCE_KEY = "InternalVM"; + private static final String DEFAULT_RESOURCE_DESCRIPTION = "JVM of RHQ Plugin Container"; public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext context) { - Set<DiscoveredResourceDetails> found = new HashSet<DiscoveredResourceDetails>(); + Set<DiscoveredResourceDetails> discoveredResources = new HashSet<DiscoveredResourceDetails>(1); - DiscoveredResourceDetails localVM = new DiscoveredResourceDetails(context.getResourceType(), "InternalVM", - ParentDefinedJMXServerNamingUtility.getJVMName(context), System.getProperty("java.version"), - "VM of plugin container", null, null); + String name = ParentDefinedJMXServerNamingUtility.getJVMName(context); + String version = System.getProperty("java.version"); + DiscoveredResourceDetails localVM = new DiscoveredResourceDetails(context.getResourceType(), RESOURCE_KEY, + name, version, DEFAULT_RESOURCE_DESCRIPTION, context.getDefaultPluginConfiguration(), + context.getSystemInformation().getThisProcess()); Configuration configuration = localVM.getPluginConfiguration(); configuration.put(new PropertySimple(JMXDiscoveryComponent.CONNECTOR_ADDRESS_CONFIG_PROPERTY, "Local Connection")); configuration.put(new PropertySimple(JMXDiscoveryComponent.CONNECTION_TYPE, InternalVMTypeDescriptor.class .getName())); + discoveredResources.add(localVM); - found.add(localVM); - - return found; + return discoveredResources; } -} \ No newline at end of file + +} diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceDiscoveryComponent.java index 471dcbe..8cf89de 100644 --- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceDiscoveryComponent.java +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceDiscoveryComponent.java @@ -38,6 +38,7 @@ import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; +import org.rhq.plugins.jmx.util.ObjectNameQueryUtility; /** * This is meant to be a generic discovery component for MBeans. In order to use it you configure your resource @@ -87,8 +88,9 @@ public class MBeanResourceDiscoveryComponent<T extends JMXComponent<?>> implemen // Public -------------------------------------------- /** - * Same as {@link discoverResources(ResourceDiscoveryContext<T>)} with additional param. - * @param skipUnknownProps Should we skip over MBeans that have unknown properties in their ObjectName + * Same as {@link #discoverResources(ResourceDiscoveryContext<T>)} with additional param. + * + * @param skipUnknownProps if true, skip over MBeans that have unknown properties in their ObjectName */ public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext<T> context, boolean skipUnknownProps) { commit 01eb02937bb322f4efb53224bbd7889498f9df2d Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Jan 23 12:12:21 2012 -0500 add 'commandLine' prop to plugin config def for JMX Server type (this prop was already being used in the plugin's code) diff --git a/modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml index 5572bf0..97a4025 100644 --- a/modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml @@ -6,7 +6,6 @@ description="Supports management of JMX MBean Servers via various remoting systems." pluginLifecycleListener="JMXPluginLifecycleListener" ampsVersion="2.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:xmlns:rhq-plugin" xmlns:c="urn:xmlns:rhq-configuration"> @@ -40,11 +39,12 @@ </c:property-options> </c:simple-property> - <c:simple-property name="connectorAddress" required="true" type="string" description="The connection url in the form of a JMXServiceURL"/> - <c:simple-property name="installURI" required="false" type="string" description="The installation path for the selected server type which will be used to find client libraries (if appropriate)."/> + <c:simple-property name="connectorAddress" required="false" type="string" description="The connection url in the form of a JMXServiceURL - this should only be set if the JVM has JMX Remoting enabled"/> + <c:simple-property name="installURI" required="false" type="string" description="The installation path for the selected server type which will be used to find client libraries (if appropriate)"/> <c:simple-property name="principal" required="false" description="The login principal/username"/> <c:simple-property name="credentials" required="false" type="password" description="The login credentials/password"/> <c:simple-property name="additionalClassPathEntries" required="false" type="string" description="Comma-separated list of directories and filenames that contain resources and classes needed to communicate with the JMX Server and its MBeans. If you specify 'some/directory/*.jar', all jars found in the given directory will be added."/> + <c:simple-property name="commandLine" required="false" type="string" description="the command line of the JVM at the time it was discovered - only used by JVMs with type Local; if the command line of the JVM changes, this property's value will need to be updated accordingly in order for RHQ to connect to the JVM"/> <c:template name="JDK 5" description="Connect to JDK 5"> <c:simple-property name="type" default="org.mc4j.ems.connection.support.metadata.J2SE5ConnectionTypeDescriptor"/> @@ -79,7 +79,7 @@ In order to do this, you must pass in some system properties when starting your application's Java virtual machine. - To run a JVM with JMX remoting enabled without authentication, you must pass in the following system + To run a JVM with JMX remoting enabled without authentication, you must pass in the following system properties: <ul> commit c56e22e9227dd87f5411ef7dbd17c03833dbea8c Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Jan 23 12:10:57 2012 -0500 move ObjectNameQueryUtility and ParentDefinedJMXServerNamingUtility classes to util subpackage (missed file from earlier commit) diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java index 4b48067..58f7698 100644 --- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java @@ -37,6 +37,7 @@ import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.core.system.ProcessInfo; +import org.rhq.plugins.jmx.util.ParentDefinedJMXServerNamingUtility; /** * This discovery component can be used to include JVM information under a parent Process oriented server that supports commit ebe55c758809eb79b4fd6bbbf01413ae76aef646 Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Jan 20 17:48:30 2012 -0500 cosmetic: minor tweak to comment 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 219d828..04600b7 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 @@ -844,7 +844,7 @@ public class ResourceType implements Serializable, Comparable<ResourceType> { // NOTE: It's vital that compareTo() is consistent with equals(), otherwise TreeSets containing ResourceTypes, or // TreeMaps with ResourceTypes as keys, will not work reliably. See the Javadoc for Comparable for a precise - // definition of consistent with equals(). + // definition of "consistent with equals()". @Override public int compareTo(ResourceType that) { if (this.name == null) { commit e80d575b40ee51b6bf81e4525d853b728f0ced71 Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Jan 20 17:47:49 2012 -0500 make Resource's compareTo impl consistent with its equals() impl, so Resources can be reliably added to TreeSets and TreeMaps; update "inventory" Agent prompt command to sort sibling Resources by type and then by name, rather than just by name - this makes the output much more readable diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java index c90ed4e..a403cd4 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java @@ -1789,8 +1789,29 @@ public class Resource implements Comparable<Resource>, Serializable { driftDefinition.setResource(this); } + // NOTE: It's vital that compareTo() is consistent with equals(), otherwise TreeSets containing Resources, or + // TreeMaps with Resources as keys, will not work reliably. See the Javadoc for Comparable for a precise + // definition of "consistent with equals()". + @Override public int compareTo(Resource that) { - return this.name.compareTo(that.getName()); + if (this == that) { + return 0; + } + int result; + if (this.name != null) { + result = (that.name != null) ? this.name.compareTo(that.name) : -1; + } else { + result = (that.name == null) ? 0 : 1; + } + if (result == 0) { + // The names are equal - compare the UUIDs to break the tie. + if (this.uuid != null) { + result = (that.uuid != null) ? this.uuid.compareTo(that.uuid) : -1; + } else { + result = (that.uuid == null) ? 0 : 1; + } + } + return result; } @Override diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/InventoryPrinter.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/InventoryPrinter.java index e02cd34..4b1fe14 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/InventoryPrinter.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/InventoryPrinter.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2012 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -24,11 +24,12 @@ package org.rhq.core.pc.util; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.Comparator; import java.util.Date; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.TreeSet; import org.rhq.core.domain.measurement.Availability; import org.rhq.core.domain.measurement.AvailabilityType; @@ -282,7 +283,17 @@ public class InventoryPrinter { } if (recurseChildren) { - Set<Resource> children = new HashSet(resource.getChildResources()); // wrap in new HashSet to avoid CCMEs + Set<Resource> children = new TreeSet<Resource>(new Comparator<Resource>() { + public int compare(Resource o1, Resource o2) { + int result = o1.getResourceType().compareTo(o2.getResourceType()); + if (result == 0) { + // The types are the same - let the Resource.compareTo() break the tie. + result = o1.compareTo(o2); + } + return result; + } + }); // wrap in new TreeSet to avoid CCMEs and to sort by type + children.addAll(resource.getChildResources()); for (Resource child : children) { ResourceContainer childContainer; commit 4e2594029b4d3368b671b6eef722ede8f7e62efa Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Jan 20 17:44:53 2012 -0500 move ObjectNameQueryUtility and ParentDefinedJMXServerNamingUtility classes to util subpackage (missed this file in my last commit) diff --git a/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/ObjectNameQueryUtilityTest.java b/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/ObjectNameQueryUtilityTest.java index e9849b7..a7e9f77 100644 --- a/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/ObjectNameQueryUtilityTest.java +++ b/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/ObjectNameQueryUtilityTest.java @@ -27,11 +27,11 @@ import java.util.Collections; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; +import org.rhq.plugins.jmx.util.ObjectNameQueryUtility; import org.testng.annotations.Test; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.plugins.jmx.ObjectNameQueryUtility; public class ObjectNameQueryUtilityTest { @Test commit d06bde3ab789c06f603836525d7281e7a96bad85 Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Jan 20 17:43:25 2012 -0500 move ObjectNameQueryUtility and ParentDefinedJMXServerNamingUtility classes to util subpackage diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingDiscoveryComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingDiscoveryComponent.java index 4d1d19d..3de8057 100644 --- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingDiscoveryComponent.java +++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingDiscoveryComponent.java @@ -38,7 +38,7 @@ import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.plugins.jmx.JMXComponent; import org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent; -import org.rhq.plugins.jmx.ObjectNameQueryUtility; +import org.rhq.plugins.jmx.util.ObjectNameQueryUtility; /** * Abstract base class to discover JBossMessaging and JBossMQ related stuff diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java index 9cc19bc..3169376 100644 --- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java +++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java @@ -114,7 +114,7 @@ import org.rhq.plugins.jbossas.util.JarContentDelegate; import org.rhq.plugins.jbossas.util.XMLConfigurationEditor; import org.rhq.plugins.jmx.JMXComponent; import org.rhq.plugins.jmx.JMXDiscoveryComponent; -import org.rhq.plugins.jmx.ObjectNameQueryUtility; +import org.rhq.plugins.jmx.util.ObjectNameQueryUtility; /** * Resource component for managing JBoss AS 3.2.3 through 4.2.x, and JBoss EAP and SOA-P 4.x. diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorDiscoveryComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorDiscoveryComponent.java index 30068e8..0adc4db 100644 --- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorDiscoveryComponent.java +++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorDiscoveryComponent.java @@ -40,7 +40,7 @@ import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.plugins.jmx.JMXComponent; import org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent; -import org.rhq.plugins.jmx.ObjectNameQueryUtility; +import org.rhq.plugins.jmx.util.ObjectNameQueryUtility; /** * Plugin discovery component for JBoss Web (embedded Tomcat) connectors. The bulk of the discovery is performed by the diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/WarComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/WarComponent.java index b3d218c..1993e7b 100644 --- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/WarComponent.java +++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/WarComponent.java @@ -24,13 +24,9 @@ package org.rhq.plugins.jbossas; import java.io.File; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import java.util.Set; import org.apache.commons.logging.Log; @@ -57,9 +53,9 @@ import org.rhq.core.pluginapi.util.ResponseTimeLogParser; import org.rhq.plugins.jbossas.util.DeploymentUtility; import org.rhq.plugins.jbossas.util.WarDeploymentInformation; import org.rhq.plugins.jbossas.util.WarDiscoveryHelper; -import org.rhq.plugins.jmx.ObjectNameQueryUtility; +import org.rhq.plugins.jmx.util.ObjectNameQueryUtility; -/** + /** * A resource component for managing a web application (WAR) deployed to a JBossAS server. * * @author Ian Springer diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/DeploymentUtility.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/DeploymentUtility.java index d915ff0..0a8e8c8 100644 --- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/DeploymentUtility.java +++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/DeploymentUtility.java @@ -48,9 +48,9 @@ import org.mc4j.ems.connection.bean.EmsBean; import org.mc4j.ems.connection.bean.attribute.EmsAttribute; import org.mc4j.ems.connection.bean.operation.EmsOperation; -import org.rhq.plugins.jmx.ObjectNameQueryUtility; +import org.rhq.plugins.jmx.util.ObjectNameQueryUtility; -/** + /** * Accesses the MainDeployer mbean to find the deployment files behind services. * * @author Greg Hinkle diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/WarDiscoveryHelper.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/WarDiscoveryHelper.java index 964223f..48d4c46 100644 --- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/WarDiscoveryHelper.java +++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/WarDiscoveryHelper.java @@ -42,6 +42,8 @@ import org.apache.commons.logging.LogFactory; import org.mc4j.ems.connection.EmsConnection; import org.mc4j.ems.connection.bean.EmsBean; import org.mc4j.ems.connection.bean.attribute.EmsAttribute; + +import org.rhq.plugins.jmx.util.ObjectNameQueryUtility; import org.xml.sax.InputSource; import org.rhq.core.domain.configuration.Configuration; @@ -53,7 +55,6 @@ import org.rhq.plugins.jbossas.JBossASServerComponent; import org.rhq.plugins.jbossas.WarComponent; import org.rhq.plugins.jbossas.WarDiscoveryComponent; import org.rhq.plugins.jmx.MBeanResourceComponent; -import org.rhq.plugins.jmx.ObjectNameQueryUtility; /** * Provides helper methods that are used by both {@link WarDiscoveryComponent} and {@link EmbeddedWarDiscoveryComponent} diff --git a/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDiscoveryComponent.java b/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDiscoveryComponent.java index 86bd02f..bfc3fc4 100644 --- a/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDiscoveryComponent.java +++ b/modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDiscoveryComponent.java @@ -40,7 +40,7 @@ import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.plugins.jbossas5.ProfileServiceComponent; -import org.rhq.plugins.jmx.ObjectNameQueryUtility; +import org.rhq.plugins.jmx.util.ObjectNameQueryUtility; /** * diff --git a/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheComponent.java b/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheComponent.java index 3ec0276..68050e0 100644 --- a/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheComponent.java +++ b/modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheComponent.java @@ -63,7 +63,7 @@ import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; import org.rhq.plugins.jbossas.util.DeploymentUtility; import org.rhq.plugins.jmx.JMXComponent; -import org.rhq.plugins.jmx.ObjectNameQueryUtility; +import org.rhq.plugins.jmx.util.ObjectNameQueryUtility; /** * Get statistic for JBossCache instances diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ObjectNameQueryUtility.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ObjectNameQueryUtility.java deleted file mode 100644 index a3f46ed..0000000 --- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ObjectNameQueryUtility.java +++ /dev/null @@ -1,218 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.rhq.plugins.jmx; - -import org.rhq.core.domain.configuration.Configuration; - -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.HashSet; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * A utility class to help in querying object names and utilizing parts of the object name for setting configuration - * values and changing string messages. A template that you'd build this utility with could look like - * "foo:name=%myName%,type=myType". This will be "translated" into a valid JMX objectName Query of the form - * "foo:type=myType,*". It will also detect that we've got a variable defined as "myName" that we'd like to later match - * to. - * - * We can then find beans with the query and apply their objectName properties to the object and use those found - * values to rewrite strings or setup configuration properities. For example, we've got a detected object name for the - * above template "foo:name=bar,type=myType". We set its detected keys against this utility and we now have a variable - * defined as the key "myName" and the value of "bar". Then I can call formatMessage with "A foo called {myName}" which - * will be translated into "A foo called bar". This can be useful for naming resources and descriptions using parts of a - * mapped ObjectName. - * - * @author Greg Hinkle - */ -public class ObjectNameQueryUtility { - private String queryTemplate; - - private Map<String, String> variableProperties = new HashMap<String, String>(); - - private Map<String, String> variableValues = new HashMap<String, String>(); - - private Set<String> nonVariableProperties = new HashSet<String>(); - - private String translatedQuery; - - /** - * Builds a mapped query utility object and finds the variables in the supplied object name query template. - * - * @param objectNameQueryTemplate string of form "a:b=%c%,d=e,f=%g%" - */ - public ObjectNameQueryUtility(String objectNameQueryTemplate) { - this.queryTemplate = objectNameQueryTemplate; - buildMatchMap(queryTemplate); - } - - /** - * Builds a mapped query utility object and finds the variables in the supplied object name query template. - * This version first translates the objectName template for defined values in provided configuration. This - * is explicitly built for hierarchical objectName models to find the children of parents. - * - * @param objectNameQueryTemplate string of form "a:b=%c%,d=e,f=%g%,h={myParentsH}" - * @param parentConfiguration the config holding the matched values for the object name key property variables - */ - public ObjectNameQueryUtility(String objectNameQueryTemplate, Configuration parentConfiguration) { - - Pattern p = Pattern.compile("\\{([^\\{\\}]*)\\}"); - Matcher m = p.matcher(objectNameQueryTemplate); - while (m.find()) { - String objectNameKeyPropVariableName = m.group(1); - String value = parentConfiguration.getSimple(objectNameKeyPropVariableName).getStringValue(); - objectNameQueryTemplate = objectNameQueryTemplate.replaceAll("\\{" + objectNameKeyPropVariableName + "\\}", value); - } - - this.queryTemplate = objectNameQueryTemplate; - buildMatchMap(this.queryTemplate); - } - - /** - * Set values for properties from an objectName. These are first translated into the "real" keys. e.g. foo:bar=%baz% - * In this case, the property of the bar objectName property will be set into the properties keyed against "baz" - * which is the real key. - * - * @param keyProperties properties from the found objectName to apply - * - * @return true if the objectName properties contained all variable properties or false if some where missing (e.g. - * foo:A=%a%,B=%b% is the queryTemplate but objectName found is foo:A=alpha) - */ - public boolean setMatchedKeyValues(Map<String, String> keyProperties) { - for (String key : keyProperties.keySet()) { - if (this.variableProperties.containsKey(key)) { - String realKey = this.variableProperties.get(key); - String value = keyProperties.get(key); - - this.variableValues.put(realKey, value); - } - } - - // Return true if there are key properties for every variable in the template and false otherwise - return (keyProperties.keySet().containsAll(this.variableProperties.keySet())); - } - - /** - * Format a message with {<key>} formatted replacement keys. - * - * @param message the message to format - * - * @return the formatted text with variables replaced - */ - public String formatMessage(String message) { - for (String key : variableValues.keySet()) { - message = message.replaceAll("\\{" + key + "\\}", this.variableValues.get(key)); - } - - return message; - } - - /** - * Clears out variables so that a new found bean can be used against the same utility object again. - */ - public void resetVariables() { - this.variableValues.clear(); - } - - public String getQueryTemplate() { - return queryTemplate; - } - - public Map<String, String> getVariableProperties() { - return variableProperties; - } - - public Map<String, String> getVariableValues() { - return variableValues; - } - - public String getTranslatedQuery() { - return translatedQuery; - } - - /** - * Detects the mapped variable object name properties and the resulting object name query that can find matching - * beans. - * - * @param objectNameQueryTemplate a template of the form foo:bar=%baz% - */ - private void buildMatchMap(String objectNameQueryTemplate) { - StringBuilder queryBuilder = new StringBuilder(); - - Pattern p = Pattern.compile("^([^:]*\\:)(.*)$"); - Matcher m = p.matcher(objectNameQueryTemplate); - if (!m.find()) { - assert false : "ObjectName did not match expected regular expression: " + objectNameQueryTemplate; - } - - queryBuilder.append(m.group(1)); - String keyProps = m.group(2); - String[] keys = keyProps.split(","); - - boolean firstVar = true; - boolean onlyVar = true; - for (String key : keys) { - Pattern p2 = Pattern.compile("^([^=]*)=\\%(.*)\\%$"); - Matcher m2 = p2.matcher(key); - if (m2.find()) { - variableProperties.put(m2.group(1), m2.group(2)); - } else { - Pattern p3 = Pattern.compile("^([^=]*)=(.*)$"); - Matcher m3 = p3.matcher(key); - if (m3.find()) { - nonVariableProperties.add(m3.group(1)); - } - - onlyVar = false; - if (firstVar) { - firstVar = false; - } else { - queryBuilder.append(","); - } - - queryBuilder.append(key); - } - } - - if (variableProperties.size() > 0) { - if (!onlyVar) { - queryBuilder.append(","); - } - - queryBuilder.append("*"); - } - - this.translatedQuery = queryBuilder.toString(); - } - - public boolean isContainsExtraKeyProperties(Set<String> strings) { - for (String key : strings) { - if (!nonVariableProperties.contains(key) && !variableProperties.containsKey(key)) { - return true; - } - } - return false; - } -} \ No newline at end of file diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ParentDefinedJMXServerNamingUtility.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ParentDefinedJMXServerNamingUtility.java deleted file mode 100644 index 8817fa7..0000000 --- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ParentDefinedJMXServerNamingUtility.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package org.rhq.plugins.jmx; - -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; - -/** - * A simple utility class to extract the name of a JMX server from the parent resource's plugin configuration. - * - * @author Lukas Krejci - */ -public class ParentDefinedJMXServerNamingUtility { - public static final String PROPERTY_CHILD_JMX_SERVER_NAME = "childJmxServerName"; - - /** - * Checks if the parent resource's plugin configuration contains a property called {@link #PROPERTY_CHILD_JMX_SERVER_NAME}. - * If such property exists and its value is non-empty, its value is returned. Otherwise the name of the provided - * resource type is returned. - * - * @param context the discovery context to get the parent plugin configuration and current resource type from. - * @return the name that can be used for the JVM - */ - public static String getJVMName(ResourceDiscoveryContext<?> context) { - Configuration parentPluginConfiguration = context.getParentResourceContext().getPluginConfiguration(); - PropertySimple nameProperty = parentPluginConfiguration.getSimple(PROPERTY_CHILD_JMX_SERVER_NAME); - if (nameProperty == null || nameProperty.getStringValue() == null - || nameProperty.getStringValue().trim().length() == 0) { - - return context.getResourceType().getName(); - } else { - return nameProperty.getStringValue(); - } - } -} diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ObjectNameQueryUtility.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ObjectNameQueryUtility.java new file mode 100644 index 0000000..b8454d7 --- /dev/null +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ObjectNameQueryUtility.java @@ -0,0 +1,218 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.plugins.jmx.util; + +import org.rhq.core.domain.configuration.Configuration; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.HashSet; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * A utility class to help in querying object names and utilizing parts of the object name for setting configuration + * values and changing string messages. A template that you'd build this utility with could look like + * "foo:name=%myName%,type=myType". This will be "translated" into a valid JMX objectName Query of the form + * "foo:type=myType,*". It will also detect that we've got a variable defined as "myName" that we'd like to later match + * to. + * + * We can then find beans with the query and apply their objectName properties to the object and use those found + * values to rewrite strings or setup configuration properties. For example, we've got a detected object name for the + * above template "foo:name=bar,type=myType". We set its detected keys against this utility and we now have a variable + * defined as the key "myName" and the value of "bar". Then I can call formatMessage with "A foo called {myName}" which + * will be translated into "A foo called bar". This can be useful for naming resources and descriptions using parts of a + * mapped ObjectName. + * + * @author Greg Hinkle + */ +public class ObjectNameQueryUtility { + private String queryTemplate; + + private Map<String, String> variableProperties = new HashMap<String, String>(); + + private Map<String, String> variableValues = new HashMap<String, String>(); + + private Set<String> nonVariableProperties = new HashSet<String>(); + + private String translatedQuery; + + /** + * Builds a mapped query utility object and finds the variables in the supplied object name query template. + * + * @param objectNameQueryTemplate string of form "a:b=%c%,d=e,f=%g%" + */ + public ObjectNameQueryUtility(String objectNameQueryTemplate) { + this.queryTemplate = objectNameQueryTemplate; + buildMatchMap(queryTemplate); + } + + /** + * Builds a mapped query utility object and finds the variables in the supplied object name query template. + * This version first translates the objectName template for defined values in provided configuration. This + * is explicitly built for hierarchical objectName models to find the children of parents. + * + * @param objectNameQueryTemplate string of form "a:b=%c%,d=e,f=%g%,h={myParentsH}" + * @param parentConfiguration the config holding the matched values for the object name key property variables + */ + public ObjectNameQueryUtility(String objectNameQueryTemplate, Configuration parentConfiguration) { + + Pattern p = Pattern.compile("\\{([^\\{\\}]*)\\}"); + Matcher m = p.matcher(objectNameQueryTemplate); + while (m.find()) { + String objectNameKeyPropVariableName = m.group(1); + String value = parentConfiguration.getSimple(objectNameKeyPropVariableName).getStringValue(); + objectNameQueryTemplate = objectNameQueryTemplate.replaceAll("\\{" + objectNameKeyPropVariableName + "\\}", value); + } + + this.queryTemplate = objectNameQueryTemplate; + buildMatchMap(this.queryTemplate); + } + + /** + * Set values for properties from an objectName. These are first translated into the "real" keys. e.g. foo:bar=%baz% + * In this case, the property of the bar objectName property will be set into the properties keyed against "baz" + * which is the real key. + * + * @param keyProperties properties from the found objectName to apply + * + * @return true if the objectName properties contained all variable properties or false if some where missing (e.g. + * foo:A=%a%,B=%b% is the queryTemplate but objectName found is foo:A=alpha) + */ + public boolean setMatchedKeyValues(Map<String, String> keyProperties) { + for (String key : keyProperties.keySet()) { + if (this.variableProperties.containsKey(key)) { + String realKey = this.variableProperties.get(key); + String value = keyProperties.get(key); + + this.variableValues.put(realKey, value); + } + } + + // Return true if there are key properties for every variable in the template and false otherwise + return (keyProperties.keySet().containsAll(this.variableProperties.keySet())); + } + + /** + * Format a message with {<key>} formatted replacement keys. + * + * @param message the message to format + * + * @return the formatted text with variables replaced + */ + public String formatMessage(String message) { + for (String key : variableValues.keySet()) { + message = message.replaceAll("\\{" + key + "\\}", this.variableValues.get(key)); + } + + return message; + } + + /** + * Clears out variables so that a new found bean can be used against the same utility object again. + */ + public void resetVariables() { + this.variableValues.clear(); + } + + public String getQueryTemplate() { + return queryTemplate; + } + + public Map<String, String> getVariableProperties() { + return variableProperties; + } + + public Map<String, String> getVariableValues() { + return variableValues; + } + + public String getTranslatedQuery() { + return translatedQuery; + } + + /** + * Detects the mapped variable object name properties and the resulting object name query that can find matching + * beans. + * + * @param objectNameQueryTemplate a template of the form foo:bar=%baz% + */ + private void buildMatchMap(String objectNameQueryTemplate) { + StringBuilder queryBuilder = new StringBuilder(); + + Pattern p = Pattern.compile("^([^:]*\\:)(.*)$"); + Matcher m = p.matcher(objectNameQueryTemplate); + if (!m.find()) { + assert false : "ObjectName did not match expected regular expression: " + objectNameQueryTemplate; + } + + queryBuilder.append(m.group(1)); + String keyProps = m.group(2); + String[] keys = keyProps.split(","); + + boolean firstVar = true; + boolean onlyVar = true; + for (String key : keys) { + Pattern p2 = Pattern.compile("^([^=]*)=\\%(.*)\\%$"); + Matcher m2 = p2.matcher(key); + if (m2.find()) { + variableProperties.put(m2.group(1), m2.group(2)); + } else { + Pattern p3 = Pattern.compile("^([^=]*)=(.*)$"); + Matcher m3 = p3.matcher(key); + if (m3.find()) { + nonVariableProperties.add(m3.group(1)); + } + + onlyVar = false; + if (firstVar) { + firstVar = false; + } else { + queryBuilder.append(","); + } + + queryBuilder.append(key); + } + } + + if (variableProperties.size() > 0) { + if (!onlyVar) { + queryBuilder.append(","); + } + + queryBuilder.append("*"); + } + + this.translatedQuery = queryBuilder.toString(); + } + + public boolean isContainsExtraKeyProperties(Set<String> strings) { + for (String key : strings) { + if (!nonVariableProperties.contains(key) && !variableProperties.containsKey(key)) { + return true; + } + } + return false; + } +} \ No newline at end of file diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ParentDefinedJMXServerNamingUtility.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ParentDefinedJMXServerNamingUtility.java new file mode 100644 index 0000000..118debc --- /dev/null +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ParentDefinedJMXServerNamingUtility.java @@ -0,0 +1,57 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +package org.rhq.plugins.jmx.util; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; + +/** + * A simple utility class to extract the name of a JMX server from the parent resource's plugin configuration. + * + * @author Lukas Krejci + */ +public class ParentDefinedJMXServerNamingUtility { + public static final String PROPERTY_CHILD_JMX_SERVER_NAME = "childJmxServerName"; + + /** + * Checks if the parent resource's plugin configuration contains a property called {@link #PROPERTY_CHILD_JMX_SERVER_NAME}. + * If such property exists and its value is non-empty, its value is returned. Otherwise the name of the provided + * resource type is returned. + * + * @param context the discovery context to get the parent plugin configuration and current resource type from. + * @return the name that can be used for the JVM + */ + public static String getJVMName(ResourceDiscoveryContext<?> context) { + Configuration parentPluginConfiguration = context.getParentResourceContext().getPluginConfiguration(); + PropertySimple nameProperty = parentPluginConfiguration.getSimple(PROPERTY_CHILD_JMX_SERVER_NAME); + if (nameProperty == null || nameProperty.getStringValue() == null + || nameProperty.getStringValue().trim().length() == 0) { + + return context.getResourceType().getName(); + } else { + return nameProperty.getStringValue(); + } + } +} diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorComponent.java index 4f334a4..ab3e829 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorComponent.java @@ -45,7 +45,7 @@ import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.plugins.jmx.MBeanResourceComponent; -import org.rhq.plugins.jmx.ObjectNameQueryUtility; +import org.rhq.plugins.jmx.util.ObjectNameQueryUtility; /** * Plugin component for representing Tomcat connectors. Much of the functionality is left to the super class, diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java index 0940910..e6e95ee 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java @@ -39,7 +39,7 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent; -import org.rhq.plugins.jmx.ObjectNameQueryUtility; +import org.rhq.plugins.jmx.util.ObjectNameQueryUtility; /** * JON plugin discovery component for Tomcat connectors. The bulk of the discovery is performed by the super class. This diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java index d1c0f59..75f8e92 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java @@ -74,7 +74,7 @@ import org.rhq.core.util.ZipUtil; import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.core.util.file.JarContentFileInfo; import org.rhq.plugins.jmx.MBeanResourceComponent; -import org.rhq.plugins.jmx.ObjectNameQueryUtility; +import org.rhq.plugins.jmx.util.ObjectNameQueryUtility; /** * A resource component for managing a web application (WAR) deployed to a Tomcat server. commit 55d2403c5e1c0dceab624242e849cdda9b65f9dc Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Jan 20 17:39:10 2012 -0500 improve javadoc diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceDiscoveryComponent.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceDiscoveryComponent.java index b695290..3f6da9a 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceDiscoveryComponent.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceDiscoveryComponent.java @@ -76,8 +76,9 @@ public interface ResourceDiscoveryComponent<T extends ResourceComponent<?>> { * * @return a set of discovered resource details that were discovered and can be imported/merged into inventory * - * @throws InvalidPluginConfigurationException if a plugin configuration found in the context was somehow invalid - * and thus caused a failure to connect to a resource + * @throws InvalidPluginConfigurationException (used only be the deprecated manual add API) if the plugin + * configuration found in the context was somehow invalid and thus + * caused a failure to connect to a managed resource * @throws Exception if a generic error occurred that caused the discovery to abort */ Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext<T> context)

1 0

[rhq] Branch 'rc/jon3.0.1.GA' - modules/cli-tests modules/common modules/core modules/enterprise modules/helpers modules/integration-tests modules/plugins modules/pom.xml modules/test-utils pom.xml
by rhqci 23 Jan '12

23 Jan '12

modules/cli-tests/pom.xml | 2 +- modules/common/ant-bundle/pom.xml | 2 +- modules/common/drift/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/pom.xml | 2 +- modules/core/util/pom.xml | 2 +- modules/enterprise/agent/pom.xml | 2 +- modules/enterprise/agentupdate/pom.xml | 2 +- modules/enterprise/binding/pom.xml | 4 ++-- 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/rest-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/client-deps/pom.xml | 2 +- modules/enterprise/remoting/pom.xml | 2 +- modules/enterprise/remoting/webservices/pom.xml | 2 +- modules/enterprise/server/client-api/pom.xml | 4 ++-- 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/itests/pom.xml | 2 +- modules/enterprise/server/jar/pom.xml | 2 +- modules/enterprise/server/plugins/alert-cli/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-email/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-irc/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-operations/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-roles/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-subject/pom.xml | 4 ++-- modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/cobbler/pom.xml | 4 ++-- modules/enterprise/server/plugins/disk/pom.xml | 2 +- modules/enterprise/server/plugins/drift-rhq/pom.xml | 2 +- modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/groovy-script/pom.xml | 4 ++-- modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +- modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 ++-- 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/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/bundleGen/pom.xml | 4 ++-- modules/helpers/perftest-support/pom.xml | 4 ++-- modules/helpers/pom.xml | 2 +- modules/helpers/rtfilter/pom.xml | 2 +- modules/integration-tests/apache-plugin-test/pom.xml | 2 +- modules/integration-tests/jboss-as-7-plugin-test/pom.xml | 2 +- modules/integration-tests/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/byteman/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/hadoop/pom.xml | 2 +- modules/plugins/hibernate/pom.xml | 2 +- modules/plugins/hosts/pom.xml | 2 +- modules/plugins/hudson/pom.xml | 4 ++-- modules/plugins/iis/pom.xml | 2 +- modules/plugins/irc/pom.xml | 2 +- modules/plugins/jboss-as-5/pom.xml | 2 +- modules/plugins/jboss-as-7/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/kickstart/pom.xml | 2 +- modules/plugins/mod-cluster/pom.xml | 2 +- modules/plugins/mysql/pom.xml | 2 +- modules/plugins/netservices/pom.xml | 2 +- modules/plugins/oracle/pom.xml | 2 +- modules/plugins/pattern-generator/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/script2/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/plugins/virt/pom.xml | 2 +- modules/pom.xml | 2 +- modules/test-utils/pom.xml | 2 +- pom.xml | 2 +- 126 files changed, 144 insertions(+), 144 deletions(-) New commits: commit dc1deaf1195f6cecf8469abfc6e02e4df4927c3c Author: Hudson <jboss-qa-internal(a)redhat.com> Date: Mon Jan 23 14:10:33 2012 -0500 development RHQ_4.2.0.JON.3.0.1-SNAPSHOT diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index 3167d39..ab99195 100644 --- a/modules/cli-tests/pom.xml +++ b/modules/cli-tests/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 1e93560..220a98c 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index 198d9bc..a9feac0 100644 --- a/modules/common/drift/pom.xml +++ b/modules/common/drift/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 972a5a2..9eedad5 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 91f9d94..26e1cdc 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 262a9f7..0e962fa 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 2f2f2b3..93a1639 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 5442ad3..73212d2 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index c425953..3b8f993 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index ed95c9c..2103f84 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 848940f..afe9c89 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index c741bd1..7ca6e93 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index 1c16c09..4a0de0e 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index a8475ca..e951b80 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 1ce1e2c..da6acda 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 4aa616d..29644f0 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index eaa3727..3335f88 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 93a6f6b..9d863f7 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 24c2281..43e309b 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 4182380..6731f5b 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <name>RHQ Script Bindings</name> <description>Abstraction of different facilities and default configurations for script bindings</description> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index be3e3a8..613ea49 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index 7db2560..4ee4e30 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml index a2ad386..4d7ba82 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index f1af689..f18e4f8 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index b202e1f..7fceba9 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 3d1c787..c6bef48 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 5def783..aa7e09e 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index d840e09..26a5e78 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml index dc59c86..c4a3a0c 100644 --- a/modules/enterprise/gui/rest-war/pom.xml +++ b/modules/enterprise/gui/rest-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 638f32c..6016352 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index a84be24f..ff46085 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index ebb80cc..3827b41 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml index 5db71e7..7008072 100644 --- a/modules/enterprise/remoting/client-deps/pom.xml +++ b/modules/enterprise/remoting/client-deps/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index a9be89d..b074322 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index 049e375..bbcf6d8 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index e8a1e84..2256028 100644 --- a/modules/enterprise/server/client-api/pom.xml +++ b/modules/enterprise/server/client-api/pom.xml @@ -5,13 +5,13 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <name>RHQ Enterprise Server Client API</name> <description>The implementation of the client API when accessing the server locally</description> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index e7612ee..3cb73a3 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 70427bf..cac1f0d 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 8f44df2..65b08d1 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml index b7cfdcf..821fa76 100644 --- a/modules/enterprise/server/itests/pom.xml +++ b/modules/enterprise/server/itests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 61fe184..67254f5 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index 84f1702..2890d4f 100644 --- a/modules/enterprise/server/plugins/alert-cli/pom.xml +++ b/modules/enterprise/server/plugins/alert-cli/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-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> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index aa5328b..7be793c 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <name>RHQ Enterprise Server Email Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 878c288..c3dfac4 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml index c22ce1a..eb5465a 100644 --- a/modules/enterprise/server/plugins/alert-log4j/pom.xml +++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <name>RHQ Enterprise Server Log4J Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index 452d62a..4c62251 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index a30f495..f1cccee 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index 6ffab76..01b24f3 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,14 +2,14 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <name>RHQ Enterprise Server Opertions Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 69f4c4b..8e80a11 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <name>RHQ Enterprise Server Roles Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index 9ccda53..44bacb8 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index b1b56d0..3a60731 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 6a7d56d..e26a76f 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-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 1282542..36c376b 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <name>RHQ Enterprise Server Cobbler Plugin</name> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 5815d72..c80c517 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml index 47f753e..9c05951 100644 --- a/modules/enterprise/server/plugins/drift-rhq/pom.xml +++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-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 cc629bf..506701b 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml index 5f5509f..704c9d7 100644 --- a/modules/enterprise/server/plugins/groovy-script/pom.xml +++ b/modules/enterprise/server/plugins/groovy-script/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>groovy-script-server-plugin</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <name>RHQ Enterprise Server Groovy Script Plugin</name> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 733c73e..8e861bb 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml index 57ec9b0..02e95b4 100644 --- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml +++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index 492c91c..ddfc97f 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index 253d03f..00570be 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 364d1c5..5ceffeb 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index 2c0a623..7fe0007 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-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 f67dc29..e7d38d2 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-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 999bb39..9b4f371 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-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 b67cfb7..7fef94f 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index 5212bac..5ed59ab 100644 --- a/modules/enterprise/server/pom.xml +++ b/modules/enterprise/server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 872737a..f4daf69 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 1837a58..180153e 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index fb0b291..86176d3 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index c7d0dce..14f1af3 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index 9902ea8..bdc8fb8 100644 --- a/modules/helpers/bundleGen/pom.xml +++ b/modules/helpers/bundleGen/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <build> <plugins> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index c5aeb57..121eb84 100644 --- a/modules/helpers/perftest-support/pom.xml +++ b/modules/helpers/perftest-support/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <name>Performance Testing Support</name> <description>To support performance testing, this is a basic tool to support extracting and later reimporting of data from/to a database. diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 0261e21..1e1fc8b 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index c9bf1ce..aa11ee5 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index 3cdb7de..c2d92bb 100644 --- a/modules/integration-tests/apache-plugin-test/pom.xml +++ b/modules/integration-tests/apache-plugin-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml index 26957d6..85d8db9 100644 --- a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml +++ b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-integration-tests</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index b177e34..af5afda 100644 --- a/modules/integration-tests/pom.xml +++ b/modules/integration-tests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 488cf6b..3187560 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 0344994..168e602 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 6c3464e..105313b 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index a11d7ae..459145e 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 0518035..2a763d7 100644 --- a/modules/plugins/byteman/pom.xml +++ b/modules/plugins/byteman/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index b19fc30..b2ee37b 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 4c61b27..5e45df5 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 35b0bd9..aaf41d9 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 057ac66..035a549 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 8c46656..d419f5c 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index b1c024a..a5f251b 100644 --- a/modules/plugins/hadoop/pom.xml +++ b/modules/plugins/hadoop/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index d487017..894a486 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 9a967d1..869c1d4 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index bd67dd4..105b759 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 930af72..fd6c214 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index 4bd81f0..e961cba 100644 --- a/modules/plugins/irc/pom.xml +++ b/modules/plugins/irc/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-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 0fff9eb..64a5224 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index 04f2c6d..e22ab0d 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 3035090..ec76d69 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-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 3a1120c..24177f9 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-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 dc08ac6..6c1e3bf 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 56bdd06..fb3d651 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index ee74e39..699c361 100644 --- a/modules/plugins/kickstart/pom.xml +++ b/modules/plugins/kickstart/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index 8dfbf66..a6e8df7 100644 --- a/modules/plugins/mod-cluster/pom.xml +++ b/modules/plugins/mod-cluster/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 5fddda4..f6115d4 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 9e1965c..e9a3825 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 46abf88..9b321c9 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 6935ffb..3a58b73 100644 --- a/modules/plugins/pattern-generator/pom.xml +++ b/modules/plugins/pattern-generator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 549daf1..5301544 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 05c6699..470d1b5 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 96fe70d..39362b4 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 54ac7dc..fc0f246 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index c0b4e13..4a0ef91 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 032969c..bf10a67 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 7673396..d80ddad 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 2add38e..60f52e9 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 9116f34..ddd89ae 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 03323d1..7360008 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index c02a3a2..2ac3880 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 58001eb..e827a6f 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index fc4cc67..c3f9556 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 287e029..e6f3fa9 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 0fcd691..ddfa15b 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-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 60aabe3..ba8ee84 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.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 8f21c6f..6c36e70 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index ec51642..ce2901c 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 5f60d61..ed35f94 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index 3f99eff..ee58b36 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.2.0.JON.3.0.1.GA</version> + <version>4.2.0.JON.3.0.1-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name>

1 0

[rhq] Changes to 'refs/tags/RHQ_4_2_0_JON_3_0_1_GA'
by rhqci 23 Jan '12

23 Jan '12

Changes since RHQ_3_0_0-BETA1: Heiko W. Rupp (87): Very basic initial working version of a REST interface. Allow to output xml and json for Availability. Add the rest war to the container build. Move the REST interface over to the server jar. Adding REST libs to the container build. Add another provider for metrics (dummy for now) Enable the metric provide in web.xml. Otherwise it can't be found. Provide a ResourceWithType as sort of a DAO for rest. Emit Schedules and metric data for schedules. Obtain single schedules. Merge branch 'master' into heiko-rest Add a filter to check the authorization of the request. Merge branch 'master' into heiko-rest Add standard web authentication, as this puts the principal trhough to the EJB layer, where an interceptor then populates the 'caller' variable with the subject of the caller. Argh, the Interceptors annotation had vanished - readding. Move the REST 'domain' classes into the server package, as they are only needed there. Auth filter is not needed anymore. Better URIs for resources, handling of favorite resources. Merge branch 'master' into heiko-rest Add some handling around alerts, system status and Exceptions. Add time and description of alert. Add more linking. Move base url to /rest/1. Add a 'landing page'. Some better treatment of the parent resource. Turn primitives to Objects as this way they may be skipped when marshalling. Merge branch 'master' into heiko-rest Better schedule and data handling. Merge remote-tracking branch 'origin/master' into heiko-rest Improve status display. Add some graphing of values as examples. Hide empty values and improve display somewhat. Start some support for HTML output of data. Freemarker ftw! Fix the url to fetch the data from (this must be relative so that the browser can prepend the host and port). Further improve html display for mere humans. Add some code to display resource trees. Still unfinished. Add a resource tree browser. Put tree code in a separate file. Fix some fallout from type-detection. Merge branch 'master' into heiko-rest Merge branch 'master' into heiko-rest Start support for updating of schedules. BZ 741855 - use standard conforming escapes in Postgres 9.1+ BZ 738029 - partially revert the change of BZ 536496, so that plugins that still use the deprecated (and useless) attribute can be deployed. Spit out a warning to the console. BZ 734135 -- Don't accept dynagroups with <,$,',[,{ in the name and < in the expression. Merge remote-tracking branch 'origin/master' into heiko-rest BZ 742614 filter out < in messages so that the message content is not treated as html and interpreted by the browser. Merge branch 'master' into heiko-rest Make some tweaks to build REST nicely and also add the links library to the container build that was missing in heiko-rest branch. Depending on the system, the schedule ids may map to other metrics, so remove the naming. Add a note about the API not being stable. BZ 694741 filter destinations according to user roles (and thus visible resource groups) BZ 743559 Fix link from Inventory summary portlet to DynaGroup definitions Add the developer group from nexus, in the hope that the jsp compiler can be found again. Pass the RESTeasy version to the ant task that builds the container. Try to access nexus via https. Only use the language code without country for the installer translations. Disable JSP compilation in the hope to get the build to go again. There are no JSPs in here. Remove that part. Re-enable jsp compilation to see if the needed jars can be resolved now. Add an ID column to RHQ_DRIFT_DEF_TEMPLATE in the upgrade script. BZ 739629 - make sure ant-contrib.jar gets included. BZ 683556 - Don't display links to pages of the old UI. That are wrong and not needed anyway. BZ 744770 - Don't put html in the message, as the sanitizer would not allow to render it. A few more German translations. BZ 743221 catch some rare occurrences where not all fields were in preferences and use the default in that case. BZ 728274 - add a message that the user needs to wait for the purge to complete before re-adding the plugin. Add a description to the plugin descriptor. Skip the two tests that only work on Linux instead of letting the build fail on them if not on Linux. BZ 738642 Try to resolve ${} expressions for the management port. Fix a small typo and add a link to the forums. BZ 734895 cli samples no longer throw an error when being run on the command line of the CLI. Also add links to blog post that discusses them. BZ 734592 make the details r/o for autogroups. Some more translations BZ 747681 Fix Microblog plugin to use the already provided keys. Also disable on initial load, as the user has to configure it before first usage. BZ 747922 Prevent a NPE when the valuesList is null. Add some comments + do some cleanup on the samples. BZ 751016 - set content type,as as7 requires this now.(cherry picked from commit 0b363407c23241cb3323300b3aa91487c6f65669) BZ 751065 better detect the version and mark EAP servers as such. BZ 736481 - Fix the missing ':' errors.(cherry picked from commit e1ae664a1474a18a74f02f720c21aa016bbb0fae) BZ 638181 Don't print server side stack traces on stdout of the CLI. Check for username + password being present before to prevent ArrayIndexOufOfBound exceptions.(cherry picked from commit aba8b66bcc9dfb864a369167c55bc6a42098fe19) BZ 750241 remove insufficient <http-method> entries in web.xml so that they don't trigger CVE-2010-0738 by accident.(cherry picked from commit f0585d1c2e41087f0130aee1b66b9e1eb1683326) BZ 751065 prepend "EAP " to the names of server(s) and host controllers.(cherry picked from commit 94059b0de8a15cdf76135f3b3c7cd3f34d98276c) BZ 715404 prevent creation of groups with duplicate names BZ 751065 prepend "EAP " to the names of server(s) and host controllers. Be careful with the resource key. Revert " [BZ 750240] comment out all Struts actions that are no longer needed by the new SmartGWT GUI (https://bugzilla.redhat.com/show_bug.cgi?id=750240)" BZ 750240 - escape <,",>,&,',/ to prevent html injection attacks(cherry picked from commit faa248b) BZ 754838 - if no host name or port are found, use a default for now. BZ 755544 prevent NPE when no resource or group or metric were selected.(cherry picked from commit f6cee08) BZ 757178 If we can't read the file return to prevent an Exception later. BZ 757175 Prevent a NPE by missing directory listing rights. Hudson (7): development RHQ_4.3.0-SNAPSHOT tag RHQ_4_2_0 tag RHQ_4_2_0_JON300_CR1 development RHQ_4.2.0.JON300-SNAPSHOT tag RHQ_4_2_0_JON300_GA development RHQ_4.2.0.JON310-SNAPSHOT tag RHQ_4_2_0_JON_3_0_1_GA Ian Springer (128): add more detailed logging of SQLExceptions in a couple places tweak the metric collection intervals in the configurable-5 scenario to [BZ 676761] add better error handling when user enters an invalid search expression on the Inventory>Children subtab (https://bugzilla.redhat.com/show_bug.cgi?id=676761) add support for dev profile to perftest plugin's pom [BZ 722548] add new #Test/Rpc view that can be used to invoke a new sleep() RPC [BZ 734610] remove validator on username field that was disallowing usernames [BZ 608798, 608803] changes to LoginView and MenuBarView to allow RHQ logos to [BZ 735232] Message portlet should not be displayed on default dashboard in JON include exception in logged error when adding a ResourceError fails document what the default collection interval will default to if the defaultInterval attribute is not specified for a metric in an Agent plugin descriptor make various improvements to the server-a resourceType used by the configurable-1 scenario, including setting up resource subCategories; add generic support to PerfTestComponent for simulating operation execution; make minor Javadoc improvement in PerfTestEventPoller [BZ 553034] fix so Solaris lofs and tmpfs fielsystems are discovered guard against possible NPE; extract constants for fs sys type names [BZ 736439] prevent potential timeout of overlord session Merge branch 'master' into feature/performance [BZ 736848] add new method to LinkManager that can return the appropriate form of group URL given an EntityContext; update several spots in the code to start using this new method to ensure the correct form of URL is used for the different types of compat groups (https://bugzilla.redhat.com/show_bug.cgi?id=736848) [BZ 736848] add new method to LinkManager that can return the appropriate form of group URL given an EntityContext; update several spots in the code to start using this new method to ensure the correct form of URL is used for the different types of compat groups (https://bugzilla.redhat.com/show_bug.cgi?id=736848) [BZ 738031] upgrade EMS from 1.2.15.1 to 1.2.16 to fix failure of as5 plugin to initialize the EMS connection to an AS 6.0 instance (https://bugzilla.redhat.com/show_bug.cgi?id=738031) [BZ 738050] prior to invoking plugin API methods on discovery components, make sure the context classloader is set correctly; specifically, it must be set to the parent resource component's classloader, except for platform discovery, where it must be set to the platform-plugin classloader) (https://bugzilla.redhat.com/show_bug.cgi?id=738050) add traits and operations to the server-a/service-a resource types used by configurable-1 scenario, and add metric and trait generators to that scenario; make SimpleNumericMeasurementFactory and SimpleTraitFactory return more realistic metric and trait values [BZ 738050] prior to invoking plugin API methods on discovery components, make sure the context classloader is set correctly; specifically, it must be set to the parent resource component's classloader, except for platform discovery, where it must be set to the platform-plugin classloader) (https://bugzilla.redhat.com/show_bug.cgi?id=738050) [BZ 738031] upgrade EMS from 1.2.15.1 to 1.2.16 to fix failure of as5 plugin to initialize the EMS connection to an AS 6.0 instance (https://bugzilla.redhat.com/show_bug.cgi?id=738031) Merge branch 'master' into feature/performance fix minor bug where as/as5 server discovery failed to parse the --properties fix minor bug where as/as5 server discovery failed to parse the --properties Merge branch 'master' into feature/performance disable footer controls on metric schedules list view after Set Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq add commented out skipTests=true prop in overrides profile Merge branch 'master' into feature/performance add commented lines that can be uncommented to enable JProfiler agent update the pattern-generator plugin so it can be used to reproduce [BZ 736517] remove unnecessary loading of grandchildren Resources in [BZ 739529] fix a regression that was causing the group Configuration tab to fix typo in comment [BZ 737121] fix sorting bug for Type, Children, and Descendants columns on Resource group list views (https://bugzilla.redhat.com/show_bug.cgi?id=737121) fix javadoc generation remove an unused param; misc cosmetic tweaks [BZ 736848] fix links to autogroups and cluster groups in various places where [BZ 727869] load ConfigurationUpdate.configuration entity field lazily in order upgrade to surefire plugin 2.10 and TestNG 6.2; use useSystemClassloader=true, fix test failures caused by TestNG upgrade optimize imports, in particular removing illegal import of non-public class downgrade testng from 6.2 to 6.1.1 to prevent server-jar test failures [BZ 734599] fix "Could not enlist in transaction on entering meta-aware object!" disable annotation processing in default compiler plugin config [BZ 743271] Fix LazyInitializationException that occurred when going to the [BZ 743683] prevent NPEs in Message constructor Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq [BZ 744003] log an INFO message once the Server is fully started; use [BZ 738798] dynamically calculate RPC timeout for calls to delete-all and acknowledge-all alerts to ensure timeout is long enough when deleting or acknowledging a large number of alerts (https://bugzilla.redhat.com/show_bug.cgi?id=738798) [BZ 720786] fix NPE that occurred when hovering over an ancestry cell in a ListGrid before the grid's data was loaded (https://bugzilla.redhat.com/show_bug.cgi?id=720786) [BZ 738798] for delete-all or acknowledge-all actions on alert list views, calculate thr RPC timeout dynamically based on the total number of alerts (https://bugzilla.redhat.com/show_bug.cgi?id=738798) add a ds field for "id", so the ds has a primary key field defined; optimize fetch by not specifying a priorities filter if all three priorities were specified by the user optimize fetch by not specifying a severities filter if all five severities were specified by the user fetch condition logs by default on fetch requests, log the PageControl being used at debug level; also, log a warning if getFetchCriteria() returns a null criteria (since this means there would be no paging of the fetch results) [BZ 720826] for Tables that have an initialCriteria, don't use autoFetch, since it causes the ListGrid to set the page size to 1000, rather than the specified page size, on the initial fetch request (https://bugzilla.redhat.com/show_bug.cgi?id=720826); turn off group-by by default on the ListGrid; set the max group-by records to 200, rather than the default of 1000, to prevent group-by attempts from loading too many records [BZ 720786] fix a 2nd potential NPE in AncestryUtil (https://bugzilla.redhat.com/show_bug.cgi?id=720786) for BZ 720826 (https://bugzilla.redhat.com/show_bug.cgi?id=720826): update setFirstRecord(), reset(), and toString() to support the recently added optional 'firstRecord' field hide the suggestion box when user clicks Enter in the search form item to submit a search request [BZ 746277] on alerts list view, after a delete-all call completes, reset sorting and paging before refreshing to avoid invalid PageControl exception from occurring on the Server side (https://bugzilla.redhat.com/show_bug.cgi?id=746277); on alerts list view, call refreshTableInfo() upon failure of any action (Delete, Delete All, etc.) so Table buttons will get re-enabled; in Tables with search support, when user clicks Enter in the search form item, only submit a fetch request if the search expression has changed; in RPCDataSource, when a fetch request is initiated, reset PageControl to first page if the criteria has changed since the last fetch request - this prevent invalid PageControl exceptions on the Server side (https://bugzilla.redhat.com/show_bug.cgi?id=720490); turn down verbositoy of DEBUG logging in RPCDataSource; add new setPagingInfo method in RPCDataSource and begin refactoring subclasses to use it; add a new CriteriaUtility class containing utility methods for working with SmartGWT Criteri [BZ 720826] fix bug introduced in Table.refresh() by a recent commit of mine - invalidateCache() and fetchData() should only be called when the Table's ListGrid is DataSource-backed, otherwise NPEs occur for Tables that are not DataSource-backed; make Table and AbstractTableSection implement InitializableView so users of the class can determine when onInit() is done; when rendering an alert templates view for a particular restype, do not call renderView() on the alert templates view until its onInit() is done (this prevents a potential NPE in renderView()) cosmetic - improve a log message; remove two unnecessary null checks [BZ 720826] fix bug introduced in Table.refresh() by a recent commit of mine - do not assume this.listGrid is non-null in fetchData() callback, since if the user went off to another view before the fetch completed, the Table widget could have been destroyed by our Selenium locator infrastructure and this.listGrid could have been nulled out was using the wrong QueryImpl class in DEBUG logging in findAlertsByCriteria() - use org.hibernate.ejb.QueryImpl from hibernate-entitymanager.jar, not org.hibernate.impl.QueryImpl from hibernate3.jar (minor) fix bug in logic that determines whether to add a Back to List button on [BZ 746669] make sure that Table uses getDataSource(), rather than this.datasource, when it needs its dataSource, in case a subclass has overridden getDataSource(), instead of calling super.setDatasource() (https://bugzilla.redhat.com/show_bug.cgi?id=746669) [BZ 737191] stop grouping rows, since it can cause too many records to be fetched resulting in perf issues (https://bugzilla.redhat.com/show_bug.cgi?id=737191) misc minor remove redundant test-scoped hibernate-entitymanager dep (made redundant by the recently added provided-scoped hibernate-entitymanager dep); group all test-scoped deps together optimize equals() method by adding an == check at the very top replace clearSortingAndPaging() method in Table with a new refresh(boolean resetPaging) method, which refreshes the data, and if resetPaging=true, also resets paging; paging is reset via the listGrid.scrollToRow(), rather than the listGrid.clearSort() hack that was used by clearSortingAndPaging() [BZ 746670] add new createListGrid() to Table to clearly separate the ListGrid specify setInitialCriteriaFixed(false) in ResourceSearchView, and pass in several fixes to SmartGWT-war Maven archetype [BZ 746347] allow a user w/ MANAGE_SECURITY to edit the assigned roles of an LDAP-authenticated user if LDAP authorization is not enabled in the system settings (https://bugzilla.redhat.com/show_bug.cgi?id=746347) update comment describing gwt.userAgent prop upgrade twitter4j from 2.1.2 to 2.2.4 to fix compile errors in alert-microblog [BZ 717284] prevent NumberFormatException from occurring when a non-numeric [BZ 738325] prevent "JavaScriptException:(TypeError): listGridRecord is null" fix compilation errors and deprecation warnings in twitter plugin misc minor improvements fix recent regression where Resource Inventory > Child Resources subtab was fix recent regression that caused group Inventory > Members subtab to list all inventoried Resources, rather than just the group member Resources reset this.initialized to false in destroy() to prevent potential NPEs if refresh() is called after a Table is destroyed minor improvement to log messages if any of the RPC calls fail during init, abort rendering of the editor update all places that use the "CAM_JAAS_PROVIDER" system setting to assume its update all places that use the "CAM_LDAP_PROTOCOL" system setting to assume its [BZ 747678] increase the maximum number of available items listed on the left in selectors and display a warning message to the user if that number ends up being less than the total number of items in the DB (https://bugzilla.redhat.com/show_bug.cgi?id=747678) minor - javadoc fixes etc. various minor fixes to exception handing in our GWT RPC services [BZ 748002] fix NPE that occurred upon hovering over the Category column (https://bugzilla.redhat.com/show_bug.cgi?id=748002) [BZ 748003] fix NPE that occurs if RPC call to load global perms fails (https://bugzilla.redhat.com/show_bug.cgi?id=748003) interpret this.dataPageSize == null as paging disabled [BZ 734231] set max lengths on input fields in group definition detail view to prevent user from entering illegal values (https://bugzilla.redhat.com/show_bug.cgi?id=734231) [BZ 734073] set max length of dashboard name input field to 200 to prevent user from entering an illegal value (https://bugzilla.redhat.com/show_bug.cgi?id=734073) [BZ 736836] in the config editor, properly handle editing values of simple props [BZ 748111] fix bug where when a prop became invalid, the fired prop value changed event incorrectly indicated that the set of invalid props had not changed (https://bugzilla.redhat.com/show_bug.cgi?id=748111) fix minor bug where when a green message got replaced by a red one (or vice simplify logic increase timeout in test from 2s to 3s in hopes of getting it to pass in jenkins [BZ 734064] don't allow multiple dashboards with the same name on the global minor - make non-unique-dashboard-name error message transient [BZ 734438] don't allow user to set the # of columns on a dashboard to 0 increase timeout of event test from 3s to 4s, since the test is still failing [BZ 737159] fix a number of major bugs in jboss-cache resource config loading [BZ 736836] fix recent regression caused by recent switch to using SpinnerItems there is a bug in the RHQ criteria API, where when an unlimited [BZ 749277] fix bug where the ""Only 1 out of 2 available items are listed - [BZ 749654] (stopgap workaround for RHQ 4.2) for selectors with no filters, set the available record page size to 500, rather than 100, to minimize the chances of use not being able to view some available items (https://bugzilla.redhat.com/show_bug.cgi?id=749654) [BZ 749657] display not-all-available-records-loaded warning message within selector widget itself, rather than in the main message bar (https://bugzilla.redhat.com/show_bug.cgi?id=749657) minor - fix a couple typos fix ordering of modules so a clean mvn install can be done from the root dir [BZ 701375] upgrade EMS from 1.2.16 to 1.3 in order to prevent exceptions in [BZ 751421] fix so two ResourceTypes with same name [BZ 752814] fix broken detail links in recent operations portlets [BZ 752399] fix bug in property adapter framework that was causing datasource resource creation to fail (https://bugzilla.redhat.com/show_bug.cgi?id=752399) [BZ 750240] comment out all Struts actions that are no longer needed by the new SmartGWT GUI (https://bugzilla.redhat.com/show_bug.cgi?id=750240) [BZ 634306] increase the max length of a product version from 50 to 100, so it [BZ 753883] require a user to have MODIFY_RESOURCE perm on a Resource in order [BZ 712433] ProductInfo.properties file is now included in installer.war; this file is read in to determine if the current product is RHQ or JON; if JON, server properties that are not supported in JON (namely, unsupported DB types and embedded-agent related props) are not displayed in the installer GUI (https://bugzilla.redhat.com/show_bug.cgi?id=712433) Merge branch 'release_jon3.x' of ssh://git.fedorahosted.org/git/rhq/rhq into release_jon3.x [BZ 756106] ensure resource classloader is initialized in processSyncInfo() prior to making any resource component facet [BZ 620603] turn log level down from WARN to ERROR for org.hibernate.hql.ast.QueryTranslatorImpl [BZ 752893] refresh the resource-errors (yellow triangle) icon after the user Jay Shaughnessy (138): [BZ 695889 - Search Bar Saved Search issues] [BZ 733144 - links to non-default subtabs don't work] [BZ 734034 - Saved search name should be removed from search bar after user deletes it] [BZ 734092 - 'Discovery Queue' portlet refresh is not working on dashboard] [BZ 34054 - Throws 'Globally uncaught exception' while adding 'Platform Utilization' on dashboard] [BZ 733613 - Add button got disabled, if user cancel the drift creation] [BZ 734879 - Drift display issue ... Change Sets-->Context Menu--->Details] Some initial domain/entity for drift configuration mode (planned changes support) Planned Drift Support - DriftConfigurationDefinition work Change instances of History.newItem to be CoreGUI.goToView to ensure Update Mongo plugin with drift handling mode support (still has TODOs) comment out some debug messaging that leaked into a previous commit. Add DriftHandlingMode filtering to DriftCriteria in order to filter out To ensure we don't accidentally cancel our drift detection job due Expand the drift configuration nodes by default, so you can see the Add Drift Handling column to the drift configuration list view. Fix the drift config list view column sort options Protect drift detector from nonexistent base directories and throw a [BZ 736050 - Domain jar being packaged in rhq.ear lib directory] fix the element name to match our convention. dbupgrade addition for drift config's drift handling mode support Reflect in the GUI when a changeset contains planned changes. It is Som boilerplate for group level drift tab [BZ 736685 - cannot uninventory resource that has condition log not associated with an alert] merge two antrun plugin sections into one with two executions Change rhq_drift_config.mode column to rhq_drift_config.drift_handling_mode Fix issue setting default value for enumerated value property in Convert drift I18N properties to use updated terminology. Additionally, made Add a drift profile that basically builds the agent, coregui and drift More terminology changes, this time the canned dift config def. First pass at Drift Carousel view, this is a work in progress! Fix a variety of merge issues. Hopefully got them all. Make sure our renamed resource field does not get wiped when sent to the Add null protection for fileUtil.useForwardSlash() Normalize drift file entries to use forward slash for safer comparison Protect certain tests from the fact that windows flavors don't support A second wave of refactor updates moving code from "drift config" to Fix filtering issues in drift carousel Drift Carousel Work Drift carousel tweaks Drift GUI Work Drift GUI work, some cleanup Remove the Drift snapshots subtab and the supporting tree display code. Remove unused imports and fix some formatting Add Eclipse dependencies for building REST interface Complete merge work for building snapshots given the new initial Drift Snapshot work: make sure to fetch drifts in order to calculate snapshot. Trivial - Fix several "@{link" instances to correctly be "{@link". Added a utility to get filename from a path string. And then realized Protect Table against possible NPE in rare circumstances. Add new "Pinned?" column to Drift Def List View. This indicates pinning and Rework snapshot view to correctly get the directory-specific stuff. This Fix issue with getCurrentSnapshot impl Fix some broken tests. Make sure drift def names are trimmed, both for correctness and to solve Drift work Split admin templates view into three parts, one for each kind of template: merge in changes from e96159b835e481fb6059c3dd22882beeb363c084 and Drift: Fix table column name using oracle reserved word. Drift Admin Template Work - *not yet ready for use* Fix issue in sequence name in the upgrade and the entity. More incremental work on the Drift template add wizard Finish adding support for drift definition descriptions. One more thing to support drift definition descriptions Started Pin to Template Work (in progress) Fill out the Pin Template Wizard Drift pin to template wizard wired to call SLSB. Ensure getSnapshot returns a DriftSnapshot object. It was incorrectly When pinning a template ensure the potential templates have the correct BZ 734592 - Make sure when computing the tree the first time (and thus computing the name of the AG), the parent is fetched to determine the correct name for the AG. Add support to wizard framework for skipping steps if the step returns a make the drift pin template wizard more robust, allowing the ability Update eclipse .classpath with new twitter4j version fix error in twitter4j pom, it was missing a groupId element value drift, fix a few seeming build issues and remove a few warnings Beef up the drift pin to template wizard with more help and better titles. trivia - remove some unused code / warnings Dial down this new logging from ERROR to DEBUG since it seems on windows Drift templates view work I18N fix. Hopefully this does not adversely affect other eclipse users. Get rid of Fix array index issue when there are no macthing existing templates. Add support for display of pinned snapshot for a template. - Working version of SnapshotView for pinned template [Bug 714277 - Consider redesigning Administration-->Templates UI] trivial - add license header Add findDriftDefinitionCompositesByCriteria in order to fetch a more Change the carousel start filter from a text box to a spinner so it can Comment out the Drift History subtab to simplify the drift - Enhance the titles on the snapshot view to give better context PageControl - Add ability to remove an OrderingField. With this the - Use new DriftDefinitionComposite fetch to display information about Drift - Move some local slsb methods to the remote Drift fix for accidentally reassigning a drift's changeset id in Fix snapshot directory view, removing bad assumption about what will Drift Defs View, make sure ATTR_ENTITY is properly set for use by Drift, fix diffs involving new and removed files. Drift - Make JPADrift.changeSet not null. This field should never be Add optional fetch for DriftDefinitionTemplate.resourceType Coregui: Add the ability for the ResourceType cache to provide non-cached Fix subtle caching issues suffered by the drift template wizards because Coregui: add ability to get the current viewpath index. Without this [BZ 749432 - Drift detail view navigation issues] A post 4.2 TODO for Table Update plugins supporting drift to use better template names Rework drift metadata update for changes to plugin defined drift templates. Fix issue in handling of non-cached metadata types in type repo. Also, Log failures to reschedule EJB timers. If they don't get rescheduled bad Change DriftSnapshotView to inline drift details via another level of [751091 - Resource tree fails to render for non inventory manager] Remove the ":" character from the plugin defined drift template names as [BZ 738369 - a user with "Manage Drift" permissions of "Read" (implied) cannot view Drift] [745236 - JON3 BETA2 ...WARN messages after clean install, drift related] [Bug 734592 - in summary header for autogroups, Name, Description, and Recursive fields are editable and for some autogroups, the Name field contains the string "null (...)] Revert "[BZ 751914] Adding compliance column to resource list table" Change some stuff around so that only the Inventory Report resource list Remove the Drift tab from compatible group views (for the valid types). Initial work for db upgrade issues [Bug 751778] make in Compliance column wider so column header isn't clipped. more work for [bug 753000 - Error on the initial snapshot when creating a drift profile on Windows] Fix to QUERY_RESOURCE_VERSION_AND_DRIFT_IN_COMPLIANCE to ensure we [bug 750917 - Can't update a drift template] [bug 669521-getting agent clients is now too restrictive] Related to Bug 669521 [Bug 754382 - Login after session timeout does not (re)display the portlets on summary tab] db-upgrade changes Related to bug 753000, prevent paths and filter patterns that will Fix oracle syntax for sequence renaming in drift upgrade. - make sure to protect against null *and* empty path or pattern fields Remove superfluous not null assignment in spec version 115. Oracle [Bug 755712 - Drift carousel view previous button generates exception] Create new Drift Compliance Report [Bug 753659 - Exception thrown when clicking Back to List after pinning snapshot to template] [Bug 756171 - The UI does not have a way to see the template from which a drift definition is derived] [Bug 758565 - Add drift templates to JBAS WAR/EAR resources] [Bug 758261 - A bad drift definition can prevent agent startup] [Bug 758724 - Transaction timing can prevent drift file content from being persisted] [Bug 771201 - EPP 5.2 discovery fails with java.lang.StringIndexOutOfBoundsException] John Mazzitelli (95): create/delete child history has its own inventory filter - will add more timeline markers for inventory shortly add inventory data to timeline (when resource was discovered and when it was inventoried) add drift to timeline clean up some of the timeline we have create-child and delete-child icons - use those rather than re-use the inventory icons start of drift alerting support. Merge commit 'origin/master' into drift-alert Merge commit 'origin/master' into drift-alert set the data directory so we don't get changesets directory outside of the target/ dir have eclipse use skipTests when doing full builds after we persist a drift change set, hand off the summary data to the alert condition cache manager to check to see if drift alerts need to be fired Merge commit 'origin/master' into drift Merge commit 'origin/master' into drift [BZ 735230] initial attempt at alerting on drift for certain drift configs and certain pathnames of files [BZ 735230] provide better messages in ui Merge commit 'origin/master' into drift fix the error log to include the stack. add debug message so we know we got the message this gets JMS messages to flow in our test embedded container test log4j.xml hides the TIMER SERVICE IS NOT INSTALLED warning - we know embedded EJB3 container doesn't support timers this completes the integration of JMS into the server/jar test embedded container. start alert unit tests. this commit causes one test failure. need to fix 736685 create the server entity with a custom name so it doesn't clash with a possibly already existing default one make test better add test that shows bug BZ-736685 refactor to make some of the helper methods more generic [BZ 735262] to support range alert definitions, we now have a "RANGE" conditional. Merge commit 'origin/master' into drift BZ 737565 - do not allow user to pick multiple conditions using the same metric if using ALL conjunction upgrade ems version in eclipse classpath fix version in pom remove the Refresh button since there is nothing to refresh (the table is always fully populated) make sure we show the proper values in the alert conditions, formatted based on their units. trivial - clean up imports, add TODO to mark a possible duplicate class [BZ 698600] fix UI so users can enter units and see units in alert condition UI [BZ 698600] do some null checks, because i am paranoid don't show the refresh button in the alert details view - they don't do anything and when you click it, they get disabled and never enabled again. make the test group names unique from other tests so we can tell what tests created what groups don't throw exception if a bad jobID is given, just log a message. this also fixes an error in our unit tests that couldn't clean up rename AlertManagerBeanTest to DeleteAlertsTest - it is still disabled, some other test isn't cleaning up properly and causing bad data to be sitting in the DB that this test fails on [BZ 738614] fix condition pretty printing - this is for email alert messages and other notifications add configurability to the logging of the hibernate detach utility. with this checkin, the following happens: make sure we re-enable the table buttons this method still needs to do something - it has to set the label of the title bar, even if it shouldn't set the window title. putting some of this back. [BZ 741691] make sure the plugin XML descriptor accepts all units that the code can support Merge commit 'origin/master' [BZ 681708] allow upload of bundle distro files as byte array to support CLI. note this requires the file to be loaded in memory which can cause OOM in either the server OR the CLI. framework to get large groups. extend LargeGroupTestBase to access API to create and destroy large groups fix the names given to the entities trivial change to test warning message Merge commit 'origin/master' [BZ 737196] refactor the code that checks to see if there is an INPROGRESS plugin config update trivial - no code changes, just correcting format fix test utils - create resources as committed and spit out some more messages so we know the test is doing something [BZ 737196] use JPQL to get the explicit member size, rather than using .size() to make things a bit faster [BZ 737196] fix the queries for getting both resource and plugin config updates by adding ORDER BY clause do unauthz testing for large group plugin config access NPE checks [BZ 736802] test large group resource config updates fix eclipse classpath [BZ 743742] first attempt at getting group members properties editor to work. looks good from the test page's group config editors. the stack trace in message details is sanitized but this makes sure the indentation is preserved add new scenario to perftest plugin to test all types of configuration properties [BZ 743742] the new group member values editor remove the {0} placeholder, we don't use that anymore for this message [BZ 743423] canceling group membership dialog now ensures the footer buttons are re-enabled. trivial fixes to javadoc [BZ 683543] new confirmation messages warning user when disabling/deleting plugins code no longer passes {0} to the message - we took out the link there is no plugin config for the filetemplate server plugin [BZ 747626] [BZ 747611] do not bomb out the entire master server plugin container if a single plugin fails to load. capture the error and report it, but keep going and allow other plugins to start when possible. add javadoc to explain the version format [BZ 748024] fix plugin upload - the file name needs to be passed to the servlet [BZ 748511] check for null [BZ 749824] fix login logo so it isn't clipped. we now have two logo files - one 40px high and the other 28px high (40 for login screen, 28 for top menu bar) [BZ 749560] make it clear that "deleting" bundle entities only removes them from the DB, the remote content is not purged. [BZ 745456] catch exceptions in the EventJSON jsp pages so we don't blow up the Timeline component [BZ 748474] add a fixed criteria and blank out the search bar. users find this more intuitive. [BZ 741331] no metrics on by default in hardware plugin [BZ 741331] just some very limited number of metrics to be enabled out of box - mainly in platform plugin [BZ 741331] turn off all plugin metrics by default, up all default collection intervals [BZ 750224] NPE check [BZ 741331] change default intervals [BZ 751128] missing calltime alert stats. also adds "total cache element count" as well. [BZ 741331] go through plugins and switch some services' metrics away from being "summary" to detail (this is the displayType attribute) [BZ 751177] make sure the buttons in the footer are re-enabled. [BZ 751231] delay the initial collection to avoid missing it the first time through [BZ 751424] make sure to re-enable footer buttons [BZ 747925] revert the changes that BZ 741331 made to the JMX plugin rhq-plugin.xml that materially affects the metadata. [BZ 753959] do not add dup menu items [BZ 753947] fix the selector so there isn't abnormal whitespace. Reduce the warning message so it is on a single line and add a yellow warning icon to bring the message to the attention of the user [BZ 753585] fix group metric and ops portlets for auto-group/cluster [BZ 754556] strip paths from uploaded file names [BZ 755564] null check to avoid NPE. summary must be non-null as per data model(cherry picked from commit 6fd3fb7) [BZ 756205] installer should go to /coregui explicitly [BZ 759173] rename package name so we don't have the same package in different signed jars John Sanda (194): Check to see if a schedule has been removed before sending change set to server Updating clean up code in DriftManager to not delete files until streams are closed [BZ 732078] Adding support for detecting "viewable" files Enable drift configurations by default Package sample/demo scripts with CLI [BZ 734194] Check that content is loaded in db on drift details view fixing test failures [BZ 734842] Adding more detailed logging around drift detection [BZ 734814] Adding docs [BZ 734881] Need to check for empty content because oracle blobs don't handle it Fixing syntax error Override default tmp directory used during gwt compilation Update the resource container when a drift config is deleted Adding support for syncing drift configs when agent starts with --cleanconfig Detect deleted drift configs during inventory sync Fix test failure No need to reschedule drift configs that have not changed Add change set version to headers in change set report Removing commented out, obsolete code fixing test failure Adding more detailed logging Do not purge change set directories for configs that have not been deleted Adding more logging around drift detection and inventory sync Filter queue by resource id when checking for deleted configs Refactoring drift config sync code out of InventoryManager adding javadocs Update test/example to write and read file using GridFS Initial commit for FileDAO and FileDAO test Have the agent track and store the change set version number Updating test to set change set version from headers Merge branch 'mongodb-drift' Set the change set version from the headers Updating MongoDB drift plugin to store file contents. Adding more drift criteria query support Adding more drift criteria query support First pass at using $slice operator to fetch drift entries by id Adding error handling logic on the agent during drift detection Server now sends acknowledgement to agent when change set content is persisted Scan for change set content at start up that needs to be resent to server Resend change set content during inventory sync [BZ 727959] Check to make sure files are readable during drift detection First, (very) rough cut of support for pinned snapshots Merge branch 'master' into pinned-snapshot more merge clean up Merge branch 'master' into mongodb-drift Adding support for fetching drift entries by id using the $slice operator Adding more filterin support for drift criteria queries Adding initial suport for filtering on change set and entry fiels in drift criteria queries Adding better support for filtering change set entries in memory Adding support for filtering on creation time and path for drift criteria queries Merge branch 'master' into pinned-snapshot Adding a new change set header, "repeated" Refactoring file permission logic into a help method Updating logic for drift detection with a pinned snapshot Updating inventory sync logic to handle pinned snapshots Updating drift def comparator and tests to handle new pinned snapshot fields Merge branch 'master' into pinned-snapshot Removing repeat change set header as it is not needed updating dbupgrade with new columns for rhq_drift_config table fixing dbupgrade error Initial commit for DriftDefinitionTemplate Updating usage of ResourceType.driftDefinitionTemplates Updating dbupgrade with rhq_drift_def_template table Adding assocation between DriftDefinition and DriftDefinitionTemplate Refactoring the template <---> definition association fixing dbupgrade script with template id column in drift_config table Iniital commit for DriftSet entity Adding rhq_drift_set to dbupgrade script adding some docs Updating javadocs and adding logic for accessing drifts of the initial change set Removing pinned version from drift definition data model Updating logic JPADriftServerBean to use JPADriftSet for initial change set Updating logic for querying change sets. Adding javadocs Refactoring snapshot generation logic in DriftManagerBean Merge branch 'master' into feature/drift Initial commit for DriftDefinitionTemplate Updating usage of ResourceType.driftDefinitionTemplates Updating dbupgrade with rhq_drift_def_template table Adding assocation between DriftDefinition and DriftDefinitionTemplate Refactoring the template <---> definition association fixing dbupgrade script with template id column in drift_config table Iniital commit for DriftSet entity Adding rhq_drift_set to dbupgrade script adding some docs Updating javadocs and adding logic for accessing drifts of the initial change set Removing pinned version from drift definition data model Updating logic JPADriftServerBean to use JPADriftSet for initial change set Updating logic for querying change sets. Adding javadocs Refactoring snapshot generation logic in DriftManagerBean Removing createSnapshot method. fixing test failure and dbupgrade script typos fixing another dbupgrade error Stubbing out test code temporarily fixing test failure fixing more dbupgrade errors First pass at SLSB code creating a drift template Merge branch 'master' into feature/drift Attemmpting to fix test failure Adding description field to DriftDefinition Debugging jenkins test failure Attempting to fix test failure that may be due to a surefire bug fixing oracle dbupgrade error First pass at SLSB code creating a drift template fixing oracle dbupgrade error Hopefully resolving weird test failure Refactoring drift db set up/tear down code into common base class Merge branch 'master' into feature/drift Add temlateDefinition property to DriftDefinitionTemplate Updating drift meta data parser to use new templateDefinition property fixing tests Initial commit for DriftDefinitionTemplateCriteria Fixing drift template criteria filters Adding some test and preliminary code for updating templates Set directory property of Drift entity so that we have better test coverage Adding server side logic for pinning snapshots re-enabling test send request to agent to pin snapshot in DriftManagerBean.pinSnapshot [BZ 738346] handle non-existent base directory during drift detection fixing tests that broke as a result of db table name change fixing logic for persisting pinned snapshot fixing failing test trying to get drift server tests passing on hudson Attempting to clean up, simplify tests Initial server support for pinning a drift template fixing mistake from merge conflict more post-merge clean up drift handling mode flag was wrong on the change for the pinned template Updating and adding tests in JPADriftServerBean Adding initial impl of JPADriftServerBean.copyChangeSet Changing signature of createTemplate so that it returns the template Call EntityManager.persist to get id for template returned from createTemplate Removing redundant call to EntityManager.persist Copy the pinned snapshot when definition is created from pinned template Addding support for generating snapshot for definition created from pinned template Adding support for generating snapshot that is not tied to a defnintion fixing logic for generating snapshot when creating drift definition Only look at directory specs when generating list of templates for wizard Pass the right template to the server when pinning a snapshot Initial support for propagating changes to defs when pinning a template Adding attached flag to drift definition Set the template reference of definitions when pinning a template Do not modify detached definitions when pinning a template Fixing bug in resource-level pinning first pass at template deletion Adding inital support for updating templates Do not allow template name to be changed Adding support for updating template fields that can be modidied. Propagate template updates to attached definitions Adding test to verify that template updates are not propagated to detached definitions Fixing bug where I was passing an attached entity to the agent fixing another detached/persist exception Handle detached definitions when deleting a template [BZ 749415] Control drift def fields that are rendered and editable fixing/updating tests [BZ 749415] check the right entity context to determine which drift config def to use Temporarily disabling drift tests due to test dependency issue fixing failing tests Initial commit for integration-tests module Renaming module integration-tests to itests removing unnecessary dependencies no longer need to exclude drift tests in server/jar upping module version fixing compilation errors that resulted from itests refactoring Bumping versions up to 4.2.1-SNAPSHOT fixing mbean interface name that was causing test failures [BZ 749899] Adding support for deleting drift templates [BZ 750895] Update the attached field when the definitions configuration is updated [BZ 750886] drift detection needs to handle resource going back into compliance [BZ 738404] Disable 'Detect Now' button for disabled definitons Do not enlist the SLSB call in the same txn context as the MDB [BZ 7517474] Initial support for tracking compliance [BZ 7517474] Adding compliance field to drift definitions view [BZ 7517474] Incorporate missing base directory into compliance [BZ 7517474] Updating compliance status when a definition is unpinned [BZ 749415] Making the pinned field editable [BZ 751914] Show compliance at the resource type level [BZ 751914] Adding compliance column to resource list table [BZ 753000] Normalize on using forward slashes in path names [BZ 749419] Do not allow pinned definition to be re-pinned [BZ 749419] We still want to allow pinning a snapshot to a template Make sure streams are closed make sure file streams get closed [BZ 753827] Do not allow templates to be created with duplicate names Make DriftTemplateManager available to server-side scripts [BZ 753827] Fixing regression for pinning snapshot to existing template Adding method to retrieve drift content as byte array Fixing issue with duplicate snapshot getting reported Handle agent being down when pinning snapshot to definition [BZ 757758] Adding logic to filter out binary content [BZ 757758] make property name/values consistent with other server properties [BZ 757958] updating script to work with current APIs [BZ 761320] Only update the detection schedule if drift detection runs Larry O'Leary (2): Bug 736792 - CLI retrieveBackingContent gives a file not found exception on the agent [Bug 769470] TomcatWarDiscoveryComponent excludes valid WAR deployments due to eager host name regular expression Lukas Krejci (41): Merge branch 'master' into code-smell Merge branch 'master' into code-smell BZ 707669 - The bundled native augeas libraries have been bumped to version 0.9.0. BZ 707669 - Forgot to check in the plugin-container pom that actually fetches the augeas-native as its dependency. BZ 737996 - Working around the property names inconsistency in the clustered web app contexts. Added support for using the import configuration specified in the export Some amendments to the perftest-support database state export algorithms: BZ-735810 - make sure to reload the system config cache after its update. BZ 740582 - generate correct group URLs in the JSF-based metric graphs page in various contexts. BZ 743632, BZ 634648 Generics cleanup and formatting BZ 743379 - Make sure to initialize the script engine with as much bindings Added support for calling overloaded methods using the global indirection BZ 711502 - make sure the availability collectors are initialized before any resource component is started. BZ 728292 - Restore the behaviour from RHQ3 where we showed just an info BZ 745488 - make sure the JSP and JSF resource name disambiguation components generate links to GWT GUI. BZ 730335 - The system properties are now actually enumerated so that no other property names are possible. The values are validated at 2 places. Fix the config-sync tests. some more hardening of system settings validation. fixing the server/jar unit tests to account for the fact that the system manager now depends on there being drift server plugin service installed and running to be able to determine the installed drift plugins. Renaming SystemProperty to SystemSetting. Fixing the messed up merge of SystemProperty -> SystemSetting renaming. BZ 747709 - Making the user editor show itself for non-admin users. SystemManagerRemote.getSystemConfiguration() now returns data in the same Adding support for mocking the drift server service to the PluginContainerTest. Making the LdapGroupManagerBeanTest pass... DataPurgeJobTest now passes Formatting BZ 687992 - A final touch on making the apache config file parsing BZ 717787 - Making sure augeas is only ever used if the apache resource BZ 697585 - A better warning message if an absolute path of httpd BZ 698474 - Work around the limitations in PIQL so that we don't try to [BZ 749126] - Loosening validation requirements on import. [BZ 751246] - Sample scripts for deploying apps to JBAS. [BZ 753225] - removing the unused "directive index" property from [BZ 751246] - do NOT include implicit resources in the list of resource [BZ 755653] - Make sure role membership is not updated through [BZ 688800] - More robust detection of EWS tomcat installation dirs. [BZ 751248] - in JON 3.0.0 we are going to make the script downloadable but [BZ 760148] - Use the unprivileged method introduced by the commit [BZ 746113] - increasing the maximum wait time for the tomcat start/stop Rafael Soares (5): still working on pt translation... Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq adding OAuth support to microblog alert-sender plugin adding OAuth support to microblog alert-sender plugin Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq Robert Buck (48): Add rpc timeout capability so users can specify an override timeout via query string parameters. The new query string parameter is rpcTimeout, the type an integer, and the units are expressed in seconds. Re rpcTimeout, trap numeric exceptions and fallback if a user does not provide an integer value. Merge branch 'master' into rbuck/rpctimeout [BZ 722600] Add index to RHQ_MEASUREMENT_SCHED.RESOURCE_ID column as recommended by Oracle EM to improve performance. Hide Eclipse plugin .metadata directory from Git. [BZ 726524] Consider adding an index for the RHQ_ALERT_CONDITION_LOG.CONDITION_ID to optimize queries. Merge branch 'master' into feature/performance Merge branch 'master' into feature/performance Merge branch 'master' into feature/performance Merge branch 'master' into feature/performance Merge branch 'master' into code-smell [BZ 726434] Fix io stream resource leak; also fixed a javadoc issue that caused code-red. [BZ 726435][coverity 13283] Fix Coverity identified RESOURCE_LEAK; close some IO streams. [BZ 726435][coverity 13112, 13113, 13276, 13277, 13041, 13025, 13005, 13012] Fix Coverity identified RESOURCE_LEAK; close some IO streams. [BZ 726435][coverity 13231,13284,13288,13343,13344,13361,13417,13424,13504,13521,13527,13542,14054] Fix Coverity identified RESOURCE_LEAK; close some IO streams. [BZ 726435][coverity 13171] Fix Coverity identified REVERSE_INULL. Fix unnecessary boxing of '0' to Integer object returns. [BZ 726435][coverity 13546 12979 12996] Fix Coverity identified FORWARD_NULL. Also, fixed several bitwise-and uses on booleans, switching to logical-and. [BZ 726435] Fixed several bitwise-or uses on booleans, switching to logical-or. [BZ 726435][coverity] Fix Coverity identified RESOURCE_LEAK; close some IO streams. [BZ 726435][coverity 13064, 13106, 13115, 13231, 13232, 13283, 13346] Fix Coverity identified RESOURCE_LEAK; close some IO streams. merged Merge branch 'master' into feature/performance Merge branch 'master' into feature/performance [BZ 734599] Change notification of schedule updates to agents so it uses quartz, reducing the time to update a metric schedule on a compat group with 1,000 members from 14s to 1.5s. oracle em cites lots of open cursor issues; fix open cursor leaks by closing result sets and prepared statements in finally blocks. [bz 734599] fix schedule update changes per code review [bz 734599] fix schedule update changes per code review; added doc and renamed method [BZ 734599] Change notification of schedule updates to agents so it uses quartz, reducing the time to update a metric schedule on a compat group with 1,000 members from 14s to 1.5s. [BZ 734599] Change notification of schedule updates to agents so it uses quartz; use unique quartz job and trigger names to avoid conflicts. merged master to feature/performance merge master to code-smell revert some inlining; some folks seem to prefer non-inlined returns as a breakpoint spot revert inlined returns to non-inlined returns so folks can place a breakpoint on the return Merge branch 'master' into code-smell [BZ 741971] Agent measurement schedules list becomes broken after a change on the UI; the resource container code replaced the prior collection with the subset. Instead, we simply need to update (always). remove unnecessary workaround for jdk 1.5 as we no longer support that and later jdks have the patch that resolves the underlying issues in priority queue remove methods remove unnecessary workaround for jdk 1.5 as we no longer support that and later jdks have the patch that resolves the underlying issues in priority queue remove methods Remove redundant groupId declarations; these declarations are bound to the parent so they are unnecessary. The redundant declarations reduces the IntelliJ usage solely as an editor, unable to use most of its features that best Eclipse. [BZ 721121] Fix IO stream resource leak. [BZ 721117] Fix IO stream resource leak; I fixed this previously, but as I was in here I fixed a few minor issues, making it code-green. Remove redundant groupId declarations; these declarations are bound to the parent so they are unnecessary. The redundant declarations reduces the IntelliJ usage solely as an editor, unable to use most of its features that best Eclipse. fix an obvious mistake in some old code; missing a throw before construction of an exception type [BZ 736802] Improve displayed message in GUI when outstanding autogroup async configuration updates are pending. [BZ 720794] Decrease user perceived latency when importing lots of resources by scheduling all server-agent communication as a background quartz task. [BZ 728547] Make SEQID cache sizes configurable; the new solution supports NOCACHE and CACHE semantics, it supports factory default sizes; for cases where factory default sizes are larger than the previous default value of 10, we opt for the factory default sizes. [BZ 751873] Prevent JBoss log spew and undeploy issues; w/o this fix after a bundle is deployed to an EAP cluster and a war is updated, it is no longer possible to undeploy via rm -fr on the command line. [BZ 752408] Back out change to dbupgrade to make sequences configurable from product release branch. [BZ 751065] - Add EAP monicker to EAP6 server resource names. Simeon Pinder (39): [maven-release-plugin] prepare for next development iteration disabling mongodb server side plugin for a)cause problematic brew Merge branch 'release_jon3.0.0-test-build' of ssh://git.fedorahosted.org/git/rhq/rhq into release_jon3.0.0-test-build [maven-release-plugin] prepare release RHQ_4_1_1-BETA1 [maven-release-plugin] prepare for next development iteration Revert "[maven-release-plugin] prepare for next development iteration" Disabling 'plugindoc' plugin which generated DocBook and Confluence docs off the plugin.xmls. Causing brew dependency issues and doesn't appear to be used. -applying missing brew patches to master. Somehow these got lost in translation. Merge branch 'jon3_test-build' into track_master4 removing JAVA5 backwards compatiblity support. Only commenting out logic as similar logic needed for JDK6 vs JDK7 in the near future. also removing JAVA5 logic from publish_release. Same reason as earlier commit. reverting back to SNAPSHOT version. inserting missing profile. Make sure release number gets included in BZ:733019: changed i)plugin display name to be more consistent with AS4 and AS5 refactor to use one build-property file. Update to use the right build property for brew. BZ 736077: applied patches from bz and one other fix(to disable TitleBar from hardcoding RHQ) to get JON and not RHQ in browser titles. BZ 735403 : repackaging to avoid signed jar issues causing ClassNotFound errors. Reverting CustomJaasDeploymentService logic to use string values again. use exact matching value check. BZ 747995: Making findSubjectByName deterministic by enabling strict query criteria for usernames. trivial comment cleanup. BZ 707047: merging LDAP group member search escape logic to master. disable test for now. Needs more work. BZ 748966: moving LDAP test and utils into server/jar instead. Fixing productization issue for new LDAP registration. [BZ 746658] reverting RHQ-1415 as it lays down unsigned elements to file system which breaks signed builds for portal.war. Updating POM versions for release_jon3.x. consitent with following direction: moving build number logic out of profiles and back into core build since brew now supports access to git exe. fix error in release script. [BZ 753211] removing remote agent install from non-rhq builds. [BZ 731864] Enable Tags removal from RHQ. Requires CoreGUI enable/disable in src, but rest is maven command line parameter configurable. [BZ 731864] flipping bit to disable tags on release branch. Fixing a number of lingering productization strings. [BZ 743986] insert branded content in mashup portlet for product releases. missed a translation file. add tag removal parameters for enterprise runs. Revert "development RHQ_4.2.0.JON310-SNAPSHOT" [BZ 781621] fixing ldap ssl issue. Users unable to configure SSL support. Stefan Negrea (139): Get the integration tests to compile and run again by creating the maven module and deploying the correct resources to target folder. Add jar dependencies for testing with JBoss 5&6. With JBoss 5, the timeout is blocking the operation call for the period set. Reduce this period for these integration tests. Enable mod_cluster support for JBoss 5&6 with simple and HA configuration listeners. Also, added metric collections and configuration save to bean file. The JBoss server home directory is now correctly retrieved from the parent resource component. Included some other minor code tweaks and refactorings. Updates to support integration with JBoss' mod_cluster module for AS6 and EAP5.1.x Renaming mod_cluster components to match their explicit purpose. More updates to the naming of each plugin component to match the intent and purpose. Also updated the integration tests to test each resource type. Added the proxyInfo metric back to Catalina service context since it is readly available. Small refactoring and code formating change to make the class easier to read and understand. Get the integration tests to compile and run again by creating the maven module and deploying the correct resources to target folder. Add jar dependencies for testing with JBoss 5&6. With JBoss 5, the timeout is blocking the operation call for the period set. Reduce this period for these integration tests. Enable mod_cluster support for JBoss 5&6 with simple and HA configuration listeners. Also, added metric collections and configuration save to bean file. The JBoss server home directory is now correctly retrieved from the parent resource component. Included some other minor code tweaks and refactorings. Updates to support integration with JBoss' mod_cluster module for AS6 and EAP5.1.x Renaming mod_cluster components to match their explicit purpose. More updates to the naming of each plugin component to match the intent and purpose. Also updated the integration tests to test each resource type. Added the proxyInfo metric back to Catalina service context since it is readly available. Small refactoring and code formating change to make the class easier to read and understand. Merge branch 'mod_cluster_plugin' of ssh://git.fedorahosted.org/git/rhq/rhq into mod_cluster_plugin Merge branch 'mod_cluster_plugin' Moved private method at the bottom fo the file to follow standard java file structure. Add property persistance functionality to catalina JMX listener for mod_cluster by saving the configuration directly into the server.xml file. All the node lists are zero based index. Fixing for the incorrect indexing of lists. Refactoring configuration file classes to accept files in the constructor to allow testing. Also, added basic configuration files for testing. Merge branch 'mod_cluster_plugin' BZ728621 - The correct procedure to update mod_cluster properties for JBoss 42 is: Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq BZ729051 - Extended the default MBean resource component implementation to support TimeUnit arguments. BZ727963 - Updated the code to declare the logger locally before using it. The logger declared at parent level was issuing usage warnings on the agent container. BZ733775 - Update the plugin configuration file to have correct descriptions for each service available. Also added a new class to verify the availability of a className mbean resource. Add proxy information metric to make the mod_cluster component dyna group friendly for complex queries (eg. group based on httpd proxy). Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq BZ684320 - Updated permissions only for the zip archives of server and agent to 744. BZ684320 - Updated default permissions one more time to match JBoss AS defaults. Clip an unnecessary system.out statement that was forgotten from unit testing. Adding wsprovide to the list of libs for Eclipse. Abstract and simplify a couple of portions of the publish release script. No need to cleanout maven repos from within the script. This should be done at system level. Move more parts around to allow function declarations at the start of the script. Move argument validation to its own function. Maven purge interval no longer needed. Moving environment variable setup into its own function. Integration tests for mod_cluster should be run on JBoss AS6 Final going forward. First set of wildcard generic updates. The change was mainly done in the plugin-api module but updated all the code directly affected by the change. Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq More wildcard updates propagated upwards from the agent api. More refactoring for the publish and release scripts. Added two ignores required by the release scripts to prevent environment files to get committed to the repo. One more ignore added to git to avoid committing files used only for ci. Merge branch 'master' into mod_cluster_plugin Format messy pom.xml file in preparation for more updates. Enable mod_cluster plugin for Tomcat. Also added a couple of integration tests for the resource. Add SSL configuration for JBoss 5.x and 6.0. Without this configuration the SSL boolean property is not usable. Take out the settings file from the actual release script. No reason to override anything, the settings have should have been pre-configured to support a release. Move environment setup in a function to make the code more readable. Removed the git cloning option from the scripts. The scripts do not exist unless the git repo was already cloned. Update the git script to function on the assumption that the current folder is a git folder and the folder to build from. Replace maven release plugin with versions plugin. Also removed all the code that will not be use going forward. Added documentation for existing functions. Also, done a little refactoring to make the main script more legible. Introduce the concept of script mode and add it to the command line arguments. Abort the script if local or remote tags already exist. This should never happen regardless of the script mode. Added rough tagging and versioning algorithm for cases when tagging is the only operation to be performed. Small updates to get the script ready for live test runs. Make an explicit call to pull the release branch and not the entire repo. Updating if/then statements after a bash syntax error. Remove WORKING_DIR concept, the current folder is working folder. Simplify the assumptions for maven to run either Hudson or default local methods. The work is done on the build branch, so push the build branch when everything is done. Update the code to remove local tags. If the tag is just local that means there were errors during the build process and the tag was published. Add code to push the tag too. Since the original push was just for the build branch the tag was not pushed to the git. Added standard option parsing to the script. Updated the usage text. Create a function for tag verification. A couple more updates to make the script more readable. Move some sections of code to applicable functions to clean the main script flow. Moved the release info to its own function. Updated the script documentation and formatting. Moved the last two pieces of the release script into functions. Split the tagging and development version updates into two separate functions. Verify the tags before doing anything. Add support for branching for release. Add support to change the development version on the originating branch. A couple more updates and cleanup around variable setup. Simplify tag only option to just tag. Make the community release default. Added scm-strategy as a supertype for branch and tag options to accommodate running this script from Hudson. Updated script mode options to support Hudson builds by adding a supertype. Also, changed the default script mode to the more conservative test value. Take into account the script mode before updating the release branch for developments updates. Minor formatting updates to replace tabs with spaces. Updates to the usage text after updating the actual option parsing. Git username no longer need after all the updates and changes to the initial script assumptions. First, perform a clean install instead of clean and then an install. Added an option to allow users to augment the set of maven profiles used by the script. Fix a small variable naming mistake. Enable tests for the maven builds run from this script. Cleanup local variables that are no longer needed. Moved variables next to the context where they are used. Updated function names to be more descriptive of what they do. Move abort function to the common library. The function is identical in the two scripts. Create local maven folder and explicitly set it in the maven arguments. Added a script option to be enable maven debug mode. Modified sed to replace dots and dashes with underscore for the tag version. Fix a syntax error. Merge branch 'stefan/release_updates' Merge branch 'mod_cluster_plugin' Added comments for each function in the bash library. The script was testing the wrong directory before attempting to create the maven local repo dir. This was a non-issue because the hudson workspace was empty. Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq BZ564514 - Updated the JMX plugin code to gracefully handle the case when the ems connection is null due to missing JMX credentials. Also, updated mod_cluster plugin code that was using a similar implementation of loadBean method. Update usage of generics after refactoring loadBean method. BZ564543 - Updated the description for Script Prefix to clarify the concept. Replaced unreliable and recursive resource discovery method with a linear tree traversal method. Updated script usage documentation, extra profile was missing argument. BZ564538 - Removed broken View link from the Content page since the functionality is not supported. Also, removed a relative path link that was pointing to the old UI. Make the entire path to mod_cluster configuration file configurable by the user. Add debug mode support to the bash library. Update script to avoid platforms compatibility issues. Add debug mode support for the release script. Add parsing for debug mode. Activate profiles in a consistent order with other the build environments. Update the publish script to use a maven repo folder under the workspace folder. Checkout the release branch regardless... Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq Revert "development RHQ_4.3.0-SNAPSHOT" [BZ 743437] Transformed Type Mapping into a simple text box. All the other implementations considered are currently not supported by the underlying structure. [BZ 743437] Add default type mappings to the property description to make it easier for users to select a predefined type mapping. Add tag override to the release script to replace an existing tag with this new one. Remove Git ignores for essential Eclipse files. When branching the name of the branch should be similar to the release version and not tag version. Improve release script output/debug by echoing the function being executed. Echo out the steps being executed by the complicated release specific functions to facilitate debug. Add workspace override option to better facilitate local script runs. Move publishing code out of the release script. The code is commented out in the publish release script to include it at a later time. Added a pull from origin right before pushing changes. The script will fail in the event a manual merge is required. Make push commands to use explicit refs for branch and tag disambiguation. Also simplify the checkout command to allow automatic branch name resolution. Remove version information from the actual plugin descriptor. [BZ 747430] Add support for loading help view content from product info file. [BZ 747430] Update the code that defaults the icon to document.png to check for nulls. The exception path is specific to I18N implementation. Have a fallback method if the remote branch is already tracked in the local repo. Make the output a little bit nicer by adding a function execution marker. [BZ 765795] Removed the recursive call that was creating StackOverflowError and added the correct call to create a resource. Ted Won 원종석 (4): First batch of Korean translations for the installer. More translations for Korean language More Korean translations Final translations to Korean. Make them display via charset = UTF-8 --- .classpath | 16 .gitignore | 7 .settings/org.eclipse.jdt.ui.prefs | 236 dev/null |binary etc/cli-scripts/drift.js | 164 etc/cli-scripts/measurement_utils.js | 134 etc/cli-scripts/util.js | 95 etc/dev-utils/setup-rest/setup.sh | 17 etc/eclipse-tools/maven/RHQ | 4 etc/m2/settings.xml | 1 etc/m2/smartgwt-war-archetype/pom.xml | 23 etc/m2/smartgwt-war-archetype/src/main/resources/archetype-resources/pom.xml | 23 etc/samples/skeleton-plugin/src/main/resources/META-INF/rhq-plugin.xml | 5 modules/cli-tests/pom.xml | 2 modules/common/ant-bundle/pom.xml | 3 modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java | 17 modules/common/drift/pom.xml | 3 modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetReaderImpl.java | 35 modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriter.java | 7 modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriterImpl.java | 5 modules/common/drift/src/main/java/org/rhq/common/drift/FileEntry.java | 19 modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java | 50 modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetReaderImplTest.java | 31 modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetWriterImplTest.java | 59 modules/common/filetemplate-bundle/pom.xml | 3 modules/common/jboss-as/pom.xml | 7 modules/common/pom.xml | 2 modules/core/client-api/pom.xml | 2 modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/drift/DriftAgentService.java | 68 modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/ConfigurationMetadataParser.java | 11 modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/DriftMetadataParser.java | 41 modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/MetricsMetadataParser.java | 43 modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java | 16 modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/drift/DriftServerService.java | 95 modules/core/client-api/src/main/resources/rhq-configuration.xsd | 15 modules/core/client-api/src/main/resources/rhq-plugin.xsd | 44 modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerTest.java | 27 modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/PluginMetadataParserTest.java | 143 modules/core/comm-api/pom.xml | 2 modules/core/dbutils/pom.xml | 12 modules/core/dbutils/src/main/java/org/rhq/core/db/Postgresql91DatabaseType.java | 16 modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml | 77 modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml | 2 modules/core/dbutils/src/main/scripts/dbsetup/obsolete-schema.xml | 5 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 457 - modules/core/dbutils/src/test/java/org/rhq/core/db/AbstractDatabaseTestUtil.java | 2 modules/core/dbutils/src/test/java/org/rhq/core/db/DatabaseTest.java | 16 modules/core/domain/pom.xml | 14 modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java | 61 modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionCategory.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java | 15 modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java | 2 modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionDriftCategoryComposite.java | 40 modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionRangeCategoryComposite.java | 48 modules/core/domain/src/main/java/org/rhq/core/domain/common/EntityContext.java | 20 modules/core/domain/src/main/java/org/rhq/core/domain/common/ProductInfo.java | 12 modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java | 200 modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSettings.java | 100 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/AbstractConfigurationUpdate.java | 2 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java | 5 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PluginConfigurationUpdate.java | 6 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AbstractConfigurationUpdateCriteria.java | 27 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AbstractGroupConfigurationUpdateCriteria.java | 8 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java | 7 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java | 2 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BaseCriteria.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftChangeSetCriteria.java | 159 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftConfigurationCriteria.java | 87 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftCriteria.java | 13 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionCriteria.java | 96 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionTemplateCriteria.java | 63 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GenericDriftChangeSetCriteria.java | 67 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GenericDriftCriteria.java | 50 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GroupPluginConfigurationUpdateCriteria.java | 6 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GroupResourceConfigurationUpdateCriteria.java | 6 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java | 111 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftCriteria.java | 53 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDataTraitCriteria.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java | 6 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java | 6 modules/core/domain/src/main/java/org/rhq/core/domain/drift/Drift.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftChangeSet.java | 63 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftChangeSetCategory.java | 2 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftComplianceStatus.java | 37 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftComposite.java | 33 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfiguration.java | 390 - modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationComparator.java | 136 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java | 339 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinition.java | 512 + modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinitionComparator.java | 162 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinitionComposite.java | 60 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinitionTemplate.java | 285 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDetails.java | 126 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftSnapshot.java | 184 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftSnapshotRequest.java | 187 modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADrift.java | 22 modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADriftChangeSet.java | 141 modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADriftSet.java | 69 modules/core/domain/src/main/java/org/rhq/core/domain/drift/dto/DriftChangeSetDTO.java | 22 modules/core/domain/src/main/java/org/rhq/core/domain/drift/dto/DriftDTO.java | 12 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/Availability.java | 584 - modules/core/domain/src/main/java/org/rhq/core/domain/plugin/PluginKey.java | 23 modules/core/domain/src/main/java/org/rhq/core/domain/plugin/ServerPluginControlDefinition.java | 73 modules/core/domain/src/main/java/org/rhq/core/domain/plugin/ServerPluginControlResults.java | 93 modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 58 modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceError.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java | 57 modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceInstallCount.java | 39 modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceTypeTemplateCountComposite.java | 19 modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java | 31 modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ResourceGroupComposite.java | 2 modules/core/domain/src/main/java/org/rhq/core/domain/sync/ImportReport.java | 44 modules/core/domain/src/main/java/org/rhq/core/domain/util/PageControl.java | 44 modules/core/domain/src/main/java/org/rhq/core/domain/util/UnlimitedPageControl.java | 2 modules/core/domain/src/main/java/org/rhq/core/server/EntitySerializer.java | 29 modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftConfigurationTest.java | 298 modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftDataAccessTest.java | 62 modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftDefinitionTemplateTest.java | 326 modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftDefinitionTest.java | 397 + modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftFileTest.java | 52 modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftSnapshotTest.java | 469 + modules/core/domain/src/test/java/org/rhq/core/domain/drift/JPADriftChangeSetTest.java | 157 modules/core/domain/src/test/java/org/rhq/core/domain/drift/SnapshotTest.java | 390 - modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java | 2 modules/core/domain/src/test/java/org/rhq/core/domain/resource/ResourceTypeTest.java | 4 modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceGroupTest.java | 2 modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java | 13 modules/core/domain/src/test/java/org/rhq/core/domain/test/QueriesTest.java | 5 modules/core/gui/pom.xml | 2 modules/core/native-system/pom.xml | 60 modules/core/plugin-api/pom.xml | 43 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventResourceComponentHelper.java | 24 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ClassLoaderFacet.java | 2 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ManualAddFacet.java | 2 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceComponent.java | 2 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java | 14 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceDiscoveryComponent.java | 2 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceDiscoveryContext.java | 13 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeContext.java | 27 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeFacet.java | 2 modules/core/plugin-container/pom.xml | 9 modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java | 20 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ChangeSetManager.java | 26 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ChangeSetManagerImpl.java | 45 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftClient.java | 18 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetectionSchedule.java | 22 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetectionSummary.java | 108 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java | 558 + modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftFilesSender.java | 28 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftInputStream.java | 93 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java | 611 + modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/FilterFileVisitor.java | 8 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ScheduleQueue.java | 74 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ScheduleQueueImpl.java | 167 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/DriftSyncManager.java | 174 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/DriftSynchronizer.java | 92 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/DriftSynchronizerFactory.java | 37 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/RuntimeSynchronizer.java | 140 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/StartupSynchronizer.java | 137 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryFile.java | 23 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 183 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java | 29 modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java | 9 modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginClassLoader.java | 32 modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginComponentFactory.java | 24 modules/core/plugin-container/src/main/java/org/rhq/core/pc/standaloneContainer/History.java | 23 modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeDelegate.java | 28 modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/DiscoveryComponentProxyFactory.java | 25 modules/core/plugin-container/src/test/java/org/rhq/core/pc/PluginContainerTest.java | 51 modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/ChangeSetManagerImplTest.java | 24 modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftClientTestStub.java | 44 modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java | 787 +- modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java | 26 modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftManagerTest.java | 281 modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftTest.java | 74 modules/core/plugin-container/src/test/java/org/rhq/core/pc/inventory/ResourceContainerTest.java | 11 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/AbstractResourceUpgradeHandlingTest.java | 130 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeFailureHandlingTest.java | 96 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeProgressHandlingTest.java | 19 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/failing/DiscComponent.java | 14 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/failing/ResComponent.java | 14 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/multi/base/BaseDiscoveryComponent.java | 2 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/multi/base/BaseResourceComponent.java | 54 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/multi/base/BaseUpgradingDiscoveryComponent.java | 10 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/multi/base/NothingDiscoveringDiscoveryComponent.java | 3 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/v1/DiscComponent.java | 4 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/v1/ResComponent.java | 4 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/v2/DiscComponent.java | 8 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/v2/ResComponent.java | 4 modules/core/plugin-container/src/test/java/org/rhq/test/pc/PluginContainerTest.java | 10 modules/core/plugin-validator/pom.xml | 2 modules/core/plugindoc/pom.xml | 38 modules/core/plugindoc/src/main/java/org/rhq/core/tool/plugindoc/PluginDocGenerator.java | 14 modules/core/plugindoc/src/main/java/org/rhq/core/tool/plugindoc/VelocityTemplateProcessor.java | 14 modules/core/pom.xml | 5 modules/core/util/pom.xml | 3 modules/core/util/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java | 9 modules/core/util/src/main/java/org/rhq/core/util/PropertiesFileUpdate.java | 24 modules/core/util/src/main/java/org/rhq/core/util/ZipUtil.java | 33 modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java | 79 modules/core/util/src/main/java/org/rhq/core/util/jdbc/JDBCUtil.java | 15 modules/core/util/src/main/java/org/rhq/core/util/maven/MavenArtifactProperties.java | 6 modules/enterprise/agent/ant-run.xml | 15 modules/enterprise/agent/pom.xml | 40 modules/enterprise/agentupdate/pom.xml | 2 modules/enterprise/agentupdate/src/main/java/org/rhq/enterprise/agent/update/AgentUpdate.java | 25 modules/enterprise/binding/pom.xml | 105 modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java | 101 modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardBindings.java | 25 modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java | 8 modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManagers.java | 73 modules/enterprise/binding/src/main/java/org/rhq/bindings/engine/JsEngineInitializer.java | 43 modules/enterprise/binding/src/main/java/org/rhq/bindings/engine/ScriptEngineInitializer.java | 15 modules/enterprise/binding/src/main/java/org/rhq/bindings/util/NoTopLevelIndirection.java | 41 modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ScriptAssert.java | 1 modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ScriptUtil.java | 12 modules/enterprise/comm/pom.xml | 2 modules/enterprise/gui/base-perspective-jar/pom.xml | 2 modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveResourceUIBean.java | 2 modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveClientUIBean.java | 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 | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 66 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java | 73 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java | 172 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 29 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewPath.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java | 97 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginDetailView.java | 152 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginTableView.java | 402 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginControlView.java | 252 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginDetailView.java | 372 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginTableView.java | 430 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java | 601 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java | 81 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java | 20 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java | 18 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java | 16 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java | 213 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java | 228 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java | 188 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java | 37 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java | 375 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/TemplateSchedulesView.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java | 67 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java | 54 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java | 197 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java | 48 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java | 362 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsAlertDefinitionForm.java | 43 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java | 124 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/DampeningAlertDefinitionForm.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java | 563 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/file/FileListView.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java | 74 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/TitleBar.java | 15 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/buttons/BackButton.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/BookmarkableCarousel.java | 216 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/Carousel.java | 1121 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/CarouselMember.java | 35 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/CarouselWidget.java | 28 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 151 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java | 616 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java | 26 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/IsLongValidator.java | 121 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/NumberWithUnitsValidator.java | 112 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java | 40 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java | 32 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AuthorizedTableAction.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/StringIDTableSection.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 355 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/PluginFileUploadForm.java | 34 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java | 63 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardContainer.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java | 40 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java | 71 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java | 22 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java | 23 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupGraphPortlet.java | 41 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceGraphPortlet.java | 46 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformMetricDataSource.java | 17 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java | 80 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java | 26 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/RecentDriftsPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/TagCloudPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MessagePortlet.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/AbstractDriftChangeSetsTreeDataSource.java | 212 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/AbstractDriftChangeSetsTreeView.java | 419 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java | 255 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java | 421 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftChangeSetsView.java | 86 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftConfigurationDataSource.java | 268 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftConfigurationEditView.java | 194 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftConfigurationView.java | 240 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDataSource.java | 44 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java | 456 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionEditView.java | 198 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateDataSource.java | 312 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateEditView.java | 186 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateSnapshotView.java | 50 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java | 211 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionsView.java | 284 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java | 268 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java | 101 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotDataSource.java | 200 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotDriftDetailsView.java | 82 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java | 531 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftChangeSetsTreeDataSource.java | 84 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftChangeSetsTreeView.java | 99 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftChangeSetsView.java | 40 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftConfigurationView.java | 40 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftDefinitionsView.java | 40 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/AbstractDriftAddConfigWizard.java | 93 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/AbstractDriftAddDefinitionWizard.java | 104 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/AbstractDriftPinTemplateWizard.java | 110 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddConfigWizard.java | 159 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddConfigWizardConfigStep.java | 76 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddConfigWizardInfoStep.java | 125 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizard.java | 193 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java | 111 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardInfoStep.java | 157 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizard.java | 166 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardConfigStep.java | 126 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardInfoStep.java | 238 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/footer/FavoritesButton.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertDefinitionGWTService.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertTemplateGWTService.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ContentGWTService.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/DriftGWTService.java | 90 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java | 19 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/PluginGWTService.java | 189 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/TestGWTService.java | 34 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java | 76 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java | 47 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleListView.java | 13 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/UpdateCollectionIntervalWidget.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java | 22 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/monitoring/IFrameWithMeasurementRangeEditorView.java | 68 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java | 31 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java | 19 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupDataSourceField.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java | 77 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionExpressionBuilder.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java | 26 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 111 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java | 15 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java | 11 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationSettings.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricGraphView.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableDataSource.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMonitoringTablesView.java | 54 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java | 15 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/AbstractGroupCreateWizard.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java | 63 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AncestryUtil.java | 63 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java | 90 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryDetails.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryView.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java | 15 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 91 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceErrorsView.java | 30 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java | 62 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java | 53 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 229 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java | 40 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryListView.java | 206 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java | 176 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java | 176 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java | 101 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java | 11 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryDataSource.java | 178 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryListView.java | 101 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDataSource.java | 25 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryListView.java | 103 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryView.java | 103 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeDataSource.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableDataSource.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java | 15 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/AutodiscoveryQueueDataSource.java | 21 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java | 39 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java | 192 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 19 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReport.java | 301 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReportResourceSearchView.java | 191 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java | 35 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java | 31 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java | 71 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestDataSourceResponseStatisticsView.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestNumberFormatView.java | 78 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestRemoteServiceStatisticsView.java | 11 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestRpcView.java | 52 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java | 16 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationFactory.java | 21 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/CriteriaUtility.java | 125 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java | 33 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/GwtRelativeDurationConverter.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/MeasurementConverterClient.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java | 139 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/measurement/GwtMeasurementConverter.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/measurement/MeasurementParser.java | 121 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java | 23 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AgentGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertTemplateGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AuthorizationGWTServiceImpl.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AvailabilityGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleDistributionFileUploadServlet.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleFileUploadServlet.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java | 40 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ClusterGWTServiceImpl.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ContentGWTServiceImpl.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/DashboardGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/DriftGWTServiceImpl.java | 155 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/FileUploadServlet.java | 18 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/GroupAlertDefinitionGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/GroupDefinitionExpressionBuilderGWTServiceImpl.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/LdapGWTServiceImpl.java | 33 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementChartsGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementScheduleGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/PackageVersionFileUploadServlet.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/PluginFileUploadServlet.java | 113 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/PluginGWTServiceImpl.java | 508 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RemoteInstallGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RepoGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceBossGWTServiceImpl.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java | 31 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceTypeGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RoleGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SystemGWTServiceImpl.java | 62 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/TagGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/TestGWTServiceImpl.java | 43 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/util/SerialUtility.java | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 8 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 315 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 1371 ++- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 303 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 430 - modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 291 modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html | 2 modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml | 16 modules/enterprise/gui/coregui/src/main/webapp/css/search.css | 7 modules/enterprise/gui/coregui/src/main/webapp/images/header/rhq_logo_40px.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/resources/all_resources.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/CreateChild_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/CreateChild_failed_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/CreateChild_success_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/DeleteChild_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/DeleteChild_failed_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/DeleteChild_success_16.png |binary modules/enterprise/gui/installer-war/pom.xml | 2 modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ConfigurationBean.java | 36 modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/PropertyItem.java | 17 modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerInformation.java | 79 modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java | 9 modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_ko.properties | 256 modules/enterprise/gui/installer-war/src/main/resources/org/rhq/enterprise/installer/ProductInfo.properties | 9 modules/enterprise/gui/installer-war/src/main/webapp/WEB-INF/faces-config.xml | 1 modules/enterprise/gui/installer-war/src/main/webapp/header.jsp | 16 modules/enterprise/gui/pom.xml | 8 modules/enterprise/gui/portal-war/pom.xml | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/DownloadsUIBean.java | 15 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/config/SystemConfigForm.java | 18 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/InstalledPluginsUIBean.java | 6 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/ServerPluginControlUIBean.java | 9 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/agentupdate/AgentUpdateServlet.java | 24 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/AuthenticateUserAction.java | 8 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/client/RemoteClientServlet.java | 32 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/upload/FileUploadUIBean.java | 4 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java | 97 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/download/DownloadServlet.java | 12 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewPackageChildResourceUIBean.java | 108 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/DisambiguatedResourceLineageRenderer.java | 8 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/BaseDispatchAction.java | 7 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewChartAction.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewDesignatedChartAction.java | 147 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/group/inventory/GroupForm.java | 38 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/hub/HubForm.java | 14 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/display/DisambiguatedResourceNameTag.java | 8 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/util/ContextUtils.java | 18 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/graphs/IndicatorChartsUIBean.java | 17 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/ExternalizableStrategyCommandListener.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java | 101 modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties | 4 modules/enterprise/gui/portal-war/src/main/webapp/common/GenericError.jsp | 44 modules/enterprise/gui/portal-war/src/main/webapp/images/icn_create_child.png |binary modules/enterprise/gui/portal-war/src/main/webapp/images/icn_create_child_failed.png |binary modules/enterprise/gui/portal-war/src/main/webapp/images/icn_create_child_success.png |binary modules/enterprise/gui/portal-war/src/main/webapp/images/icn_delete_child.png |binary modules/enterprise/gui/portal-war/src/main/webapp/images/icn_delete_child_failed.png |binary modules/enterprise/gui/portal-war/src/main/webapp/images/icn_delete_child_success.png |binary modules/enterprise/gui/portal-war/src/main/webapp/images/icons/Drift_16.png |binary modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp | 12 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp | 7 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp | 15 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp | 28 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventDriftJSON.jsp | 64 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp | 40 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventInventoryJSON.jsp | 52 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp | 20 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp | 10 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventsView.jsp | 40 modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/error.xhtml | 20 modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/graphs-plain.xhtml | 65 modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/measurement/data-plain.xhtml | 17 modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/response-plain.xhtml | 63 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/audit-trail-item-plain.xhtml | 7 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/audit-trail-item.xhtml | 7 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create-plain.xhtml | 19 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create.xhtml | 19 modules/enterprise/gui/rest-war/pom.xml | 303 modules/enterprise/gui/rest-war/src/main/java/org/rhq/enterprise/rest/AuthFilter.java | 86 modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/jboss-web.xml | 6 modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/web.xml | 90 modules/enterprise/gui/rest-war/src/main/webapp/bars_simple.html | 123 modules/enterprise/gui/rest-war/src/main/webapp/index.html | 31 modules/enterprise/gui/rest-war/src/main/webapp/js/d3.behavior.js | 198 modules/enterprise/gui/rest-war/src/main/webapp/js/d3.chart.js | 984 ++ modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js | 3592 ++++++++++ modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js | 1923 +++++ modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js | 660 + modules/enterprise/gui/rest-war/src/main/webapp/js/resource_tree.js | 66 modules/enterprise/gui/rest-war/src/main/webapp/js/whisker.js | 92 modules/enterprise/gui/rest-war/src/main/webapp/stacked1.html | 125 modules/enterprise/gui/rest-war/src/main/webapp/stacked2.html | 125 modules/enterprise/gui/rest-war/src/main/webapp/tree.html | 44 modules/enterprise/gui/rest-war/src/main/webapp/whisker.html | 109 modules/enterprise/gui/rest-war/src/main/webapp/whisker2.html | 70 modules/enterprise/gui/webdav-war/pom.xml | 1 modules/enterprise/pom.xml | 2 modules/enterprise/remoting/cli/pom.xml | 2 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java | 33 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/InteractiveJavascriptCompletor.java | 51 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java | 28 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ScriptCommand.java | 54 modules/enterprise/remoting/cli/src/main/samples/README.txt | 25 modules/enterprise/remoting/cli/src/main/samples/bundles.js | 153 modules/enterprise/remoting/cli/src/main/samples/deploy-to-and-restart-JBAS.js | 244 modules/enterprise/remoting/cli/src/main/samples/drift.js | 243 modules/enterprise/remoting/cli/src/main/samples/measurement_utils.js | 144 modules/enterprise/remoting/cli/src/main/samples/util.js | 286 modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml | 11 modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/commands/ScriptCommandTest.java | 2 modules/enterprise/remoting/client-api/pom.xml | 15 modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java | 499 - modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClientProxy.java | 96 modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClient.java | 506 + modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClientProxy.java | 101 modules/enterprise/remoting/client-deps/pom.xml | 2 modules/enterprise/remoting/pom.xml | 2 modules/enterprise/remoting/webservices/pom.xml | 2 modules/enterprise/server/client-api/pom.xml | 4 modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java | 5 modules/enterprise/server/container-lib/pom.xml | 2 modules/enterprise/server/container/pom.xml | 93 modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh | 8 modules/enterprise/server/container/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js | 467 + modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-log4j.xml | 6 modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/login-config.xml | 16 modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/alert-cache-service.xml | 11 modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml | 78 modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jmx-console.war.rej/WEB-INF/web.xml | 107 modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-mdb-service.xml | 40 modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html | 6 modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf | 2 modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf | 2 modules/enterprise/server/container/src/main/scripts/rhq-container.assembly.xml | 5 modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 77 modules/enterprise/server/ear/pom.xml | 22 modules/enterprise/server/itests/pom.xml | 263 modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerPluginService.java | 146 modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerPluginServiceMBean.java | 25 modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerTest.java | 241 modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java | 618 + modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/InitDB.java | 32 modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java | 309 modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java | 254 modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java | 275 modules/enterprise/server/itests/src/test/resources/META-INF/ejb-jar.xml | 28 modules/enterprise/server/itests/src/test/resources/binary-blob-sample.jar |binary modules/enterprise/server/itests/src/test/resources/default.persistence.properties | 22 modules/enterprise/server/itests/src/test/resources/ejb3-interceptors-aop.xml | 360 + modules/enterprise/server/itests/src/test/resources/embedded-jboss-beans.xml | 160 modules/enterprise/server/itests/src/test/resources/jboss-jms-beans.xml | 132 modules/enterprise/server/itests/src/test/resources/jms-ra.rar |binary modules/enterprise/server/itests/src/test/resources/jndi.properties | 2 modules/enterprise/server/itests/src/test/resources/log4j.xml | 74 modules/enterprise/server/itests/src/test/resources/login-config.xml | 72 modules/enterprise/server/itests/src/test/resources/rhq-mdb-beans.xml | 25 modules/enterprise/server/itests/src/test/resources/security-beans.xml | 13 modules/enterprise/server/itests/src/test/resources/test-assist-color-number.txt | 46 modules/enterprise/server/itests/src/test/resources/test-ldap.properties | 2 modules/enterprise/server/itests/src/test/resources/test-scheduler.properties | 29 modules/enterprise/server/itests/src/test/resources/testng.xml | 12 modules/enterprise/server/jar/pom.xml | 203 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java | 73 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/agentclient/impl/AgentClientImpl.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionManagerBean.java | 6 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java | 4 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 499 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java | 20 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/AlertConditionCacheManagerBean.java | 7 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/AlertConditionCacheManagerLocal.java | 9 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AbstractConditionCache.java | 25 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AgentConditionCache.java | 126 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AlertConditionCacheCoordinator.java | 44 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AlertConditionCacheUtils.java | 22 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java | 6 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/mbean/AlertConditionCacheMonitor.java | 62 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/mbean/AlertConditionCacheMonitorMBean.java | 22 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AbstractCacheElement.java | 6 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/DriftCacheElement.java | 103 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/MeasurementNumericCacheElement.java | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/MeasurementRangeNumericCacheElement.java | 95 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/i18n/AlertI18NResourceKeys.java | 189 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java | 52 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerRemote.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java | 128 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerLocal.java | 72 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java | 27 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleServerServiceImpl.java | 4 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/CacheConsistencyManagerBean.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java | 11 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 213 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java | 29 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java | 34 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java | 66 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CustomJaasDeploymentService.java | 36 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/PluginDeploymentScanner.java | 17 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ServerPluginScanner.java | 41 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/AgentInventoryStatusUpdateJob.java | 94 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 109 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftChangesetBean.java | 10 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftFileBean.java | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java | 639 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerLocal.java | 123 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java | 65 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java | 94 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java | 217 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerLocal.java | 34 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerRemote.java | 44 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftUploadRequest.java | 19 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftUtil.java | 59 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java | 370 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java | 34 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementPreferences.java | 31 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java | 190 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerLocal.java | 6 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/NotifyAgentsOfScheduleUpdatesJob.java | 44 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/DataInserter.java | 19 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/DataReader.java | 84 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java | 26 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java | 48 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java | 24 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractTypeServerPluginContainer.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java | 25 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java | 36 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginManager.java | 22 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftChangeSetSummary.java | 129 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftServerPluginFacet.java | 67 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/perspective/PerspectiveServerPluginManager.java | 24 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteWsInvocationHandler.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceAvailabilityManagerBean.java | 7 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java | 4 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 111 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java | 17 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LDAPStringUtil.java | 100 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java | 93 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java | 93 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java | 18 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/framework/ExpressionEvaluator.java | 31 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java | 13 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerLocal.java | 16 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java | 146 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java | 95 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertHandlerBean.java | 185 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertHandlerLocal.java | 84 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java | 50 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java | 175 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java | 82 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/RHQApplication.java | 30 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java | 220 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerLocal.java | 113 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/SetCallerInterceptor.java | 93 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/StatusHandlerBean.java | 105 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/StatusHandlerLocal.java | 46 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/StuffNotFoundException.java | 34 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/UserHandlerBean.java | 139 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/UserHandlerLocal.java | 54 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/AlertDefinitionRest.java | 87 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/AlertRest.java | 152 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/AvailabilityRest.java | 79 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/MetricAggregate.java | 178 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/MetricSchedule.java | 121 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/ResourceWithChildren.java | 65 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/ResourceWithType.java | 135 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/Status.java | 96 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/EnhancedScheduler.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/AsyncResourceDeleteJob.java | 22 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java | 121 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/DefaultImportConfigurationDescriptor.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/ExportingInputStream.java | 100 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/MetricTemplateSynchronizer.java | 17 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SynchronizationConstants.java | 112 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SynchronizationManagerBean.java | 250 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SynchronizationManagerLocal.java | 16 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SynchronizationManagerRemote.java | 9 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SynchronizedEntity.java | 10 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SynchronizerFactory.java | 42 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SystemSettingsSynchronizer.java | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/importers/Importer.java | 15 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/importers/MetricTemplateImporter.java | 56 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/importers/SystemSettingsImporter.java | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/ConsistencyValidator.java | 36 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/DeployedAgentPluginsValidator.java | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/EntityValidator.java | 52 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/MaxCountValidator.java | 52 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/MetricTemplateValidator.java | 121 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/SystemSettingsValidator.java | 48 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/UniquenessValidator.java | 50 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java | 312 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java | 6 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerRemote.java | 36 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java | 27 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java | 6 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java | 39 modules/enterprise/server/jar/src/main/resources/rest_templates/listMetricSchedule.ftl | 32 modules/enterprise/server/jar/src/main/resources/rest_templates/listResourceWithType.ftl | 32 modules/enterprise/server/jar/src/main/resources/rest_templates/metricData.ftl | 67 modules/enterprise/server/jar/src/main/resources/rest_templates/metricSchedule.ftl | 52 modules/enterprise/server/jar/src/main/resources/rest_templates/resourceWithType.ftl | 53 modules/enterprise/server/jar/src/main/resources/rest_templates/status.ftl | 49 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/engine/model/MeasurementRangeNumericCacheElementTest.java | 96 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java | 442 + modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerBeanTest.java | 487 + modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/DeleteAlertsTest.java | 123 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java | 64 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/LargeGroupPluginConfigurationTest.java | 235 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/LargeGroupResourceConfigurationTest.java | 227 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java | 205 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java | 76 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/TestDefService.java | 72 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/inventory/UninventoryTest.java | 48 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java | 10 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LDAPStringUtilTest.java | 50 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java | 507 + modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java | 122 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/PluginDescriptorValidationTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/SubcategoryTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateConfigurationSubsystemTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateContentSubsystemTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateEventsSubsystemTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateMeasurementSubsystemTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateNativesSubsystemTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateOperationsSubsystemTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java | 446 + modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceSubsystemTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceTypeSubsystemTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java | 407 - modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java | 25 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java | 18 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/DeployedAgentPluginsValidatorTest.java | 3 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/ExportingInputStreamTest.java | 32 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/MaxCountValidatorTest.java | 52 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/MetricTemplateExporterTest.java | 26 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/MetricTemplateImporterTest.java | 42 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/MetricTemplateValidatorTest.java | 161 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SynchronizationManagerBeanTest.java | 745 ++ modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SystemSettingsExporterTest.java | 5 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SystemSettingsImporterTest.java | 1 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SystemSettingsValidatorTest.java | 22 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/UniquenessValidatorTest.java | 51 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/system/SystemManagerBeanTest.java | 97 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 87 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/DataAccessTest.java | 8 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/LargeGroupTestBase.java | 309 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java | 27 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java | 113 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginServiceMBean.java | 25 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java | 2950 ++++++++ modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapCtxFactory.java | 61 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/ldap/FakeNamingEnumeration.java | 76 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java | 54 modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml | 177 modules/enterprise/server/jar/src/test/resources/jboss-jms-beans.xml | 102 modules/enterprise/server/jar/src/test/resources/jms-ra.rar |binary modules/enterprise/server/jar/src/test/resources/log4j.xml | 14 modules/enterprise/server/jar/src/test/resources/login-config.xml | 9 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml | 2 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml | 3 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataTest.xml | 36 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml | 8 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml | 8 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml | 8 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml | 4 modules/enterprise/server/jar/src/test/resources/rhq-mdb-beans.xml | 25 modules/enterprise/server/jar/src/test/resources/test-ldap.properties | 2 modules/enterprise/server/jar/src/test/resources/test/metadata/alerts/type-with-metric.xml | 14 modules/enterprise/server/plugins/alert-cli/pom.xml | 4 modules/enterprise/server/plugins/alert-email/pom.xml | 4 modules/enterprise/server/plugins/alert-irc/pom.xml | 7 modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 modules/enterprise/server/plugins/alert-microblog/pom.xml | 10 modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java | 107 modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogServerPluginComponent.java | 183 modules/enterprise/server/plugins/alert-microblog/src/main/resources/META-INF/rhq-serverplugin.xml | 41 modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 modules/enterprise/server/plugins/alert-operations/pom.xml | 4 modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/PrintTokens.java | 11 modules/enterprise/server/plugins/alert-roles/pom.xml | 4 modules/enterprise/server/plugins/alert-scriptlang/pom.xml | 4 modules/enterprise/server/plugins/alert-sms/pom.xml | 4 modules/enterprise/server/plugins/alert-snmp/pom.xml | 6 modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java | 54 modules/enterprise/server/plugins/alert-subject/pom.xml | 4 modules/enterprise/server/plugins/ant-bundle/pom.xml | 6 modules/enterprise/server/plugins/cloud/pom.xml | 4 modules/enterprise/server/plugins/cobbler/pom.xml | 6 modules/enterprise/server/plugins/disk/pom.xml | 2 modules/enterprise/server/plugins/drift-mongodb/pom.xml | 23 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/MongoDBDriftServer.java | 118 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/CategoryFilter.java | 42 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/ChangeSetDAO.java | 107 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/ChangeSetEntryFilter.java | 28 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/ChangeSetEntryFilters.java | 45 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/CreatedAfterFilter.java | 37 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/CreatedBeforeFilter.java | 36 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/FileDAO.java | 59 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/PathFilter.java | 37 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/entities/MongoDBChangeSet.java | 31 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/entities/MongoDBChangeSetEntry.java | 34 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/entities/MongoDBFile.java | 12 modules/enterprise/server/plugins/drift-mongodb/src/test/java/org/rhq/enterprise/server/plugins/drift/mongodb/GridFSTest.java | 63 modules/enterprise/server/plugins/drift-mongodb/src/test/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/ChangeSetDAOTest.java | 306 modules/enterprise/server/plugins/drift-mongodb/src/test/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/FileDAOTest.java | 161 modules/enterprise/server/plugins/drift-rhq/pom.xml | 2 modules/enterprise/server/plugins/drift-rhq/src/main/java/org/rhq/enterprise/server/plugins/drift/JPADriftServerPluginComponent.java | 36 modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 6 modules/enterprise/server/plugins/filetemplate-bundle/src/main/java/org/rhq/enterprise/server/plugins/filetemplate/BundleServerPluginComponent.java | 16 modules/enterprise/server/plugins/filetemplate-bundle/src/main/resources/META-INF/rhq-serverplugin.xml | 8 modules/enterprise/server/plugins/groovy-script/pom.xml | 5 modules/enterprise/server/plugins/jboss-software/pom.xml | 2 modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 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 | 8 modules/enterprise/server/plugins/rhnhosted/pom.xml | 2 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNHelper.java | 8 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/PublicKeyRing.java | 18 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/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/Repo.java | 8 modules/enterprise/server/pom.xml | 3 modules/enterprise/server/safe-invoker/pom.xml | 2 modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/safeinvoker/EJB3SafeEndpointInvoker.java | 58 modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/safeinvoker/EJB3SafeEndpointInvokerDeploymentAspect.java | 59 modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/safeinvoker/HibernateDetachUtility.java | 610 + modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/EJB3SafeEndpointInvoker.java | 58 modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/EJB3SafeEndpointInvokerDeploymentAspect.java | 59 modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java | 569 - modules/enterprise/server/safe-invoker/src/test/java/org/rhq/enterprise/server/safeinvoker/HibernateDetachUtilityTest.java | 142 modules/enterprise/server/safe-invoker/src/test/java/org/rhq/enterprise/server/util/HibernateDetachUtilityTest.java | 141 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/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/ConfigurationInstanceDescriptorUtil.java | 650 + modules/enterprise/server/xml-schemas/src/test/java/org/rhq/enterprise/server/xmlschema/ConfigurationInstanceDescriptorUtilTest.java | 212 modules/helpers/bundleGen/pom.xml | 4 modules/helpers/bundleGen/src/main/java/org/rhq/helpers/bundleGen/BundleGen.java | 39 modules/helpers/perftest-support/data.sh | 2 modules/helpers/perftest-support/pom.xml | 4 modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/Exporter.java | 13 modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/dbsetup/DbSetup.java | 15 modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/dbunit/EntityRelationshipFilter.java | 98 modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/jpa/mapping/MappingTranslator.java | 4 modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/testng/DatabaseSetupInterceptor.java | 8 modules/helpers/perftest-support/src/test/java/org/rhq/helpers/perftest/test/DummyTest.java | 1 modules/helpers/perftest-support/src/test/java/org/rhq/helpers/perftest/test/ExcelExporterTest.java | 27 modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java | 1 modules/helpers/pom.xml | 2 modules/helpers/rtfilter/pom.xml | 2 modules/integration-tests/apache-plugin-test/pom.xml | 6 modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/setup/ApacheTestSetup.java | 14 modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/upgrade/UpgradeTestBase.java | 3 modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java | 43 modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java | 4 modules/integration-tests/jboss-as-7-plugin-test/pom.xml | 4 modules/integration-tests/mod_cluster-plugin-test/pom.xml | 369 + modules/integration-tests/mod_cluster-plugin-test/src/test/java/org/rhq/plugins/modcluster/test/ModClusterPluginIntegrationTest.java | 250 modules/integration-tests/mod_cluster-plugin-test/src/test/java/org/rhq/plugins/modcluster/test/ModclusterPluginTest.java | 210 modules/integration-tests/pom.xml | 2 modules/jopr/dist/server/pom.xml | 4 modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java | 17 modules/plugins/JBossOSGi/pom.xml | 2 modules/plugins/aliases/pom.xml | 4 modules/plugins/ant-bundle/pom.xml | 4 modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java | 20 modules/plugins/apache/pom.xml | 10 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java | 16 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryDiscoveryComponent.java | 2 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleComponent.java | 17 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryComponent.java | 9 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApachePluginLifecycleListener.java | 132 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java | 40 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java | 125 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java | 38 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java | 8 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ModJKComponent.java | 78 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasConfigurationApache.java | 33 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMapIndex.java | 4 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java | 4 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheDirectiveRegExpression.java | 2 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/SpecificParams.java | 6 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheConfigWriter.java | 102 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheDirective.java | 2 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheParserImpl.java | 124 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/AugeasNodeSearch.java | 4 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/RuntimeApacheConfiguration.java | 341 modules/plugins/apache/src/main/java/org/rhq/plugins/www/snmp/SNMPClient.java | 7 modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml | 43 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/RuntimeConfigurationTest.java | 30 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/SnmpMappingTest.java | 13 modules/plugins/augeas/pom.xml | 8 modules/plugins/augeas/src/main/java/org/rhq/augeas/tree/AugeasNodeBuffer.java | 2 modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/AugeasConfigurationComponent.java | 24 modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/AugeasConfigurationDiscoveryComponent.java | 10 modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/ConfigurationToAugeasSimple.java | 10 modules/plugins/byteman/pom.xml | 4 modules/plugins/byteman/src/main/resources/META-INF/rhq-plugin.xml | 15 modules/plugins/cobbler/pom.xml | 7 modules/plugins/cron/pom.xml | 6 modules/plugins/database/pom.xml | 2 modules/plugins/database/src/main/java/org/rhq/plugins/database/AbstractDatabaseComponent.java | 3 modules/plugins/database/src/main/java/org/rhq/plugins/database/CustomTableComponent.java | 25 modules/plugins/database/src/main/java/org/rhq/plugins/database/CustomTableDiscoveryComponent.java | 6 modules/plugins/database/src/main/java/org/rhq/plugins/database/CustomTableRowDiscoveryComponent.java | 4 modules/plugins/database/src/main/java/org/rhq/plugins/database/DatabaseComponent.java | 3 modules/plugins/filetemplate-bundle/pom.xml | 4 modules/plugins/grub/pom.xml | 4 modules/plugins/hadoop/pom.xml | 2 modules/plugins/hardware/src/main/resources/META-INF/rhq-plugin.xml | 28 modules/plugins/hibernate/pom.xml | 8 modules/plugins/hibernate/src/main/java/org/rhq/plugins/hibernate/EntityComponent.java | 48 modules/plugins/hibernate/src/main/java/org/rhq/plugins/hibernate/EntityDiscoveryComponent.java | 50 modules/plugins/hibernate/src/main/java/org/rhq/plugins/hibernate/StatisticsComponent.java | 60 modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml | 24 modules/plugins/hosts/pom.xml | 4 modules/plugins/hudson/pom.xml | 4 modules/plugins/hudson/src/main/java/org/rhq/plugins/hudson/HudsonServerComponent.java | 14 modules/plugins/iis/pom.xml | 2 modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISServerComponent.java | 3 modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISVHostComponent.java | 10 modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISVHostDiscoveryComponent.java | 4 modules/plugins/iis/src/main/resources/META-INF/rhq-plugin.xml | 38 modules/plugins/irc/pom.xml | 5 modules/plugins/irc/src/main/java/org/rhq/plugins/irc/IRCServerComponent.java | 2 modules/plugins/irc/src/main/resources/META-INF/rhq-plugin.xml | 3 modules/plugins/jboss-as-5/pom.xml | 5 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedComponent.java | 26 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java | 17 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentDiscoveryComponent.java | 115 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java | 17 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerContentFacetDelegate.java | 1 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java | 51 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java | 10 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingDiscoveryComponent.java | 4 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossWebComponent.java | 22 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossWebDiscoveryComponent.java | 4 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JmsDestinationDiscoveryComponent.java | 2 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java | 58 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentDiscoveryComponent.java | 13 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedDeploymentDiscoveryComponent.java | 4 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/PlatformComponent.java | 397 - modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/PlatformDiscoveryComponent.java | 128 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ProfileServiceComponent.java | 2 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/StandaloneManagedDeploymentComponent.java | 14 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java | 217 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/PropertyMapToCompositeValueSupportAdapter.java | 7 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ManagedComponentDeployer.java | 14 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstallationInfo.java | 12 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstanceInfo.java | 9 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptComponent.java | 64 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptDiscoveryComponent.java | 23 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JBossConfigurationUtility.java | 2 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JnpConfig.java | 24 modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 237 modules/plugins/jboss-as-5/testsuite/pom.xml | 3 modules/plugins/jboss-as-7/d2d.sh | 2 modules/plugins/jboss-as-7/pom.xml | 9 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java | 2 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java | 93 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java | 7 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java | 43 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/LoggerComponent.java | 20 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java | 18 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterComponent.java | 41 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java | 82 modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 25 modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml | 2 modules/plugins/jboss-as/pom.xml | 4 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingComponent.java | 58 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingDiscoveryComponent.java | 4 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ApplicationComponent.java | 2 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ApplicationDiscoveryComponent.java | 16 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ConnectionFactoryComponent.java | 4 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/DatasourceComponent.java | 4 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EJB2BeanComponent.java | 2 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EJB3BeanComponent.java | 2 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java | 19 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBMDestinationDiscoveryComponent.java | 4 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java | 88 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java | 20 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorDiscoveryComponent.java | 24 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatDiscoveryComponent.java | 54 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatServerComponent.java | 8 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatVHostDiscoveryService.java | 4 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatVHostService.java | 46 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossMQDiscoveryComponent.java | 2 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossMessagingComponent.java | 49 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossMessagingDiscoveryComponent.java | 2 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JMSComponent.java | 53 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/WarDiscoveryComponent.java | 2 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossInstallationInfo.java | 75 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossInstanceInfo.java | 9 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/script/ScriptComponent.java | 7 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/script/ScriptDiscoveryComponent.java | 75 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/FileContentDelegate.java | 14 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JBossConfigurationUtility.java | 2 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JnpConfig.java | 24 modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml | 181 modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/JBossASPluginTest.java | 7 modules/plugins/jboss-cache-v3/pom.xml | 4 modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheComponent.java | 60 modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDetailComponent.java | 8 modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDetailDiscoveryComponent.java | 4 modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDiscoveryComponent.java | 4 modules/plugins/jboss-cache-v3/src/main/resources/META-INF/rhq-plugin.xml | 8 modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/TestHelper.java | 2 modules/plugins/jboss-cache/pom.xml | 2 modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/CacheConfigurationHelper.java | 89 modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheComponent.java | 43 modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheDiscoveryComponent.java | 6 modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheSubsystemComponent.java | 2 modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheSubsystemDiscovery.java | 4 modules/plugins/jboss-cache/src/main/resources/META-INF/rhq-plugin.xml | 47 modules/plugins/jdbctrace/pom.xml | 2 modules/plugins/jira/pom.xml | 6 modules/plugins/jmx/pom.xml | 8 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java | 16 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/InternalJMXServerDiscoveryComponent.java | 4 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXComponent.java | 2 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXServerComponent.java | 3 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java | 41 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceDiscoveryComponent.java | 41 modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml | 42 modules/plugins/kickstart/pom.xml | 2 modules/plugins/lsof/pom.xml | 2 modules/plugins/mod-cluster/pom.xml | 66 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/CatalinaServiceComponent.java | 121 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ClassNameMBeanComponent.java | 63 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ClassNameMBeanDiscoveryComponent.java | 87 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ContextComponent.java | 102 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ContextDiscoveryComponent.java | 118 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/FileConfiguredMBeanResourceComponent.java | 153 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/LoadMetricDiscoveryComponent.java | 59 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ModClusterDiscoveryComponent.java | 85 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ModClusterServerComponent.java | 70 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ModClusterServiceComponent.java | 51 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ModclusterServerComponent.java | 45 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ProxyInfo.java | 310 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/WebappContextComponent.java | 117 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/WebappContextDiscoveryComponent.java | 117 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/config/AbstractConfigurationFile.java | 81 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/config/JBossWebServerFile.java | 92 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/config/ModClusterBeanFile.java | 253 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/helper/JBossHelper.java | 49 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/model/ProxyInfo.java | 310 modules/plugins/mod-cluster/src/main/resources/META-INF/rhq-plugin.xml | 616 + modules/plugins/mod-cluster/src/test/java/org/rhq/plugins/modcluster/test/ProxyInfoTest.java | 2 modules/plugins/mod-cluster/src/test/java/org/rhq/plugins/modcluster/test/ServerConfigTest.java | 91 modules/plugins/mod-cluster/src/test/resources/xml_config/mod_cluster-jboss-beans.xml | 337 modules/plugins/mod-cluster/src/test/resources/xml_config/server.xml | 157 modules/plugins/mysql/pom.xml | 6 modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java | 3 modules/plugins/mysql/src/main/resources/META-INF/rhq-plugin.xml | 26 modules/plugins/netservices/pom.xml | 8 modules/plugins/netservices/src/main/resources/META-INF/rhq-plugin.xml | 6 modules/plugins/onewire/pom.xml | 2 modules/plugins/onewire/src/main/resources/META-INF/rhq-plugin.xml | 2 modules/plugins/oracle/pom.xml | 6 modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml | 38 modules/plugins/pattern-generator/pom.xml | 2 modules/plugins/pattern-generator/src/main/java/org/rhq/plugins/pattern/PatternComponent.java | 79 modules/plugins/pattern-generator/src/main/java/org/rhq/plugins/pattern/PatternDiscovery.java | 2 modules/plugins/pattern-generator/src/main/resources/META-INF/rhq-plugin.xml | 15 modules/plugins/perftest/pom.xml | 78 modules/plugins/perftest/src/main/java/org/rhq/plugins/perftest/PerfTestComponent.java | 19 modules/plugins/perftest/src/main/java/org/rhq/plugins/perftest/configuration/SimpleConfigurationFactory.java | 27 modules/plugins/perftest/src/main/java/org/rhq/plugins/perftest/event/PerfTestEventPoller.java | 2 modules/plugins/perftest/src/main/java/org/rhq/plugins/perftest/measurement/SimpleNumericMeasurementFactory.java | 16 modules/plugins/perftest/src/main/java/org/rhq/plugins/perftest/trait/SimpleTraitFactory.java | 20 modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml | 415 - modules/plugins/perftest/src/main/resources/all-config.xml | 17 modules/plugins/perftest/src/main/resources/configurable-1.xml | 4 modules/plugins/perftest/src/main/resources/configurable-5.xml | 12 modules/plugins/platform/pom.xml | 6 modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemDiscoveryComponent.java | 78 modules/plugins/platform/src/main/java/org/rhq/plugins/platform/PlatformComponent.java | 7 modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml | 88 modules/plugins/pom.xml | 4 modules/plugins/postfix/pom.xml | 4 modules/plugins/postfix/src/main/java/org/rhq/plugins/postfix/PostfixAccessDiscoveryComponent.java | 5 modules/plugins/postgres/pom.xml | 8 modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDatabaseComponent.java | 25 modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDatabaseDiscoveryComponent.java | 10 modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresServerComponent.java | 28 modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresTableComponent.java | 38 modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresUserComponent.java | 6 modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresUserDiscoveryComponent.java | 6 modules/plugins/postgres/src/main/resources/META-INF/rhq-plugin.xml | 10 modules/plugins/raw-config-test/pom.xml | 2 modules/plugins/rhq-agent/pom.xml | 6 modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentEnvironmentScriptComponent.java | 4 modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentEnvironmentScriptDiscoveryComponent.java | 8 modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentJavaServiceWrapperComponent.java | 8 modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentJavaServiceWrapperDiscoveryComponent.java | 8 modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentLauncherScriptComponent.java | 6 modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentLauncherScriptDiscoveryComponent.java | 8 modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentServerComponent.java | 5 modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml | 68 modules/plugins/rhq-server/pom.xml | 7 modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml | 90 modules/plugins/samba/pom.xml | 4 modules/plugins/samba/src/main/java/org/rhq/plugins/samba/SambaServerComponent.java | 39 modules/plugins/script/pom.xml | 2 modules/plugins/script/src/main/resources/META-INF/rhq-plugin.xml | 2 modules/plugins/script2/pom.xml | 4 modules/plugins/script2/src/main/java/org/rhq/modules/plugins/script2/ScriptComponent.java | 31 modules/plugins/services/pom.xml | 1 modules/plugins/snmptrapd/pom.xml | 5 modules/plugins/snmptrapd/src/main/java/org/rhq/plugins/snmptrapd/SnmpTrapdComponent.java | 2 modules/plugins/snmptrapd/src/test/java/org/rhq/plugins/snmptrapd/SnmpTrapdComponentTest.java | 46 modules/plugins/sshd/pom.xml | 4 modules/plugins/sudoers/pom.xml | 6 modules/plugins/tomcat/pom.xml | 6 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorComponent.java | 6 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java | 5 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java | 39 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java | 16 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java | 2 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java | 4 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java | 7 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostDiscoveryComponent.java | 11 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarDiscoveryComponent.java | 4 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java | 2 modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml | 15 modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/TomcatPluginTest.java | 35 modules/plugins/twitter/pom.xml | 4 modules/plugins/twitter/src/main/java/org/rhq/plugins/twitter/FeedComponent.java | 7 modules/plugins/twitter/src/main/java/org/rhq/plugins/twitter/TwitterComponent.java | 31 modules/plugins/twitter/src/main/resources/META-INF/rhq-plugin.xml | 6 modules/plugins/validate-all-plugins/pom.xml | 2 modules/plugins/virt/pom.xml | 4 modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationHostComponent.java | 2 modules/plugins/virt/src/main/resources/META-INF/rhq-plugin.xml | 12 modules/pom.xml | 32 modules/test-utils/pom.xml | 2 modules/test-utils/src/main/java/org/rhq/test/JPAUtils.java | 79 modules/test-utils/src/main/java/org/rhq/test/TransactionCallbackWithContext.java | 10 pom.xml | 283 publish_release.sh | 413 - release.sh | 980 +- rhq_bash.lib | 253 1257 files changed, 70988 insertions(+), 21698 deletions(-) ---

1 0

23 Jan '12

modules/cli-tests/pom.xml | 2 +- modules/common/ant-bundle/pom.xml | 2 +- modules/common/drift/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/pom.xml | 2 +- modules/core/util/pom.xml | 2 +- modules/enterprise/agent/pom.xml | 2 +- modules/enterprise/agentupdate/pom.xml | 2 +- modules/enterprise/binding/pom.xml | 4 ++-- 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/rest-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/client-deps/pom.xml | 2 +- modules/enterprise/remoting/pom.xml | 2 +- modules/enterprise/remoting/webservices/pom.xml | 2 +- modules/enterprise/server/client-api/pom.xml | 4 ++-- 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/itests/pom.xml | 2 +- modules/enterprise/server/jar/pom.xml | 2 +- modules/enterprise/server/plugins/alert-cli/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-email/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-irc/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-operations/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-roles/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-subject/pom.xml | 4 ++-- modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/cobbler/pom.xml | 4 ++-- modules/enterprise/server/plugins/disk/pom.xml | 2 +- modules/enterprise/server/plugins/drift-rhq/pom.xml | 2 +- modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/groovy-script/pom.xml | 4 ++-- modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +- modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 ++-- 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/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/bundleGen/pom.xml | 4 ++-- modules/helpers/perftest-support/pom.xml | 4 ++-- modules/helpers/pom.xml | 2 +- modules/helpers/rtfilter/pom.xml | 2 +- modules/integration-tests/apache-plugin-test/pom.xml | 2 +- modules/integration-tests/jboss-as-7-plugin-test/pom.xml | 2 +- modules/integration-tests/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/byteman/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/hadoop/pom.xml | 2 +- modules/plugins/hibernate/pom.xml | 2 +- modules/plugins/hosts/pom.xml | 2 +- modules/plugins/hudson/pom.xml | 4 ++-- modules/plugins/iis/pom.xml | 2 +- modules/plugins/irc/pom.xml | 2 +- modules/plugins/jboss-as-5/pom.xml | 2 +- modules/plugins/jboss-as-7/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/kickstart/pom.xml | 2 +- modules/plugins/mod-cluster/pom.xml | 2 +- modules/plugins/mysql/pom.xml | 2 +- modules/plugins/netservices/pom.xml | 2 +- modules/plugins/oracle/pom.xml | 2 +- modules/plugins/pattern-generator/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/script2/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/plugins/virt/pom.xml | 2 +- modules/pom.xml | 2 +- modules/test-utils/pom.xml | 2 +- pom.xml | 2 +- 126 files changed, 144 insertions(+), 144 deletions(-) New commits: commit 5cde18231a11e28f699368fcb510f2ba7999a3d0 Author: Hudson <jboss-qa-internal(a)redhat.com> Date: Mon Jan 23 14:09:27 2012 -0500 tag RHQ_4_2_0_JON_3_0_1_GA diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index a4fa33b..3167d39 100644 --- a/modules/cli-tests/pom.xml +++ b/modules/cli-tests/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 9941d34..1e93560 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index b91cc8d..198d9bc 100644 --- a/modules/common/drift/pom.xml +++ b/modules/common/drift/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 43a9b48..972a5a2 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 805604c..91f9d94 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index ff822e6..262a9f7 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 0a537be..2f2f2b3 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 297ca34..5442ad3 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index b298636..c425953 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 587cc05..ed95c9c 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index a57fc21..848940f 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 0a715e7..c741bd1 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index 268fce0..1c16c09 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index c4f9cb2..a8475ca 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 9aa043f..1ce1e2c 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index e0d02d5..4aa616d 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index e4f77df..eaa3727 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index a1110c9..93a6f6b 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 4b41835..24c2281 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 59cb2f0..4182380 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <name>RHQ Script Bindings</name> <description>Abstraction of different facilities and default configurations for script bindings</description> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 3d7d3d4..be3e3a8 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index c97f2cc..7db2560 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml index 0cc3546..a2ad386 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 64c27e4..f1af689 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index efd7283..b202e1f 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 8b6da84..3d1c787 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 1aeaac2..5def783 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 552b8ce..d840e09 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml index 5b9977d..dc59c86 100644 --- a/modules/enterprise/gui/rest-war/pom.xml +++ b/modules/enterprise/gui/rest-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 719a355..638f32c 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index d94c40b..a84be24f 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index a7ba702..ebb80cc 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml index b0b00f4..5db71e7 100644 --- a/modules/enterprise/remoting/client-deps/pom.xml +++ b/modules/enterprise/remoting/client-deps/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 51d4e41..a9be89d 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index ea129d8..049e375 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index 0ec74f9..e8a1e84 100644 --- a/modules/enterprise/server/client-api/pom.xml +++ b/modules/enterprise/server/client-api/pom.xml @@ -5,13 +5,13 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <name>RHQ Enterprise Server Client API</name> <description>The implementation of the client API when accessing the server locally</description> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index 07a7d9b..e7612ee 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 752c8c9..70427bf 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 7ff87a2..8f44df2 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml index 817c02c..b7cfdcf 100644 --- a/modules/enterprise/server/itests/pom.xml +++ b/modules/enterprise/server/itests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 9a9ba84..61fe184 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index 972a086..84f1702 100644 --- a/modules/enterprise/server/plugins/alert-cli/pom.xml +++ b/modules/enterprise/server/plugins/alert-cli/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</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> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index a943723..aa5328b 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <name>RHQ Enterprise Server Email Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 5d2b0cb..878c288 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml index 3576159..c22ce1a 100644 --- a/modules/enterprise/server/plugins/alert-log4j/pom.xml +++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <name>RHQ Enterprise Server Log4J Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index f669945..452d62a 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 757d6e8..a30f495 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index 635425d..6ffab76 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,14 +2,14 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <name>RHQ Enterprise Server Opertions Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 102b734..69f4c4b 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <name>RHQ Enterprise Server Roles Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index 5409807..9ccda53 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index 06c43ce..b1b56d0 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index c5fc147..6a7d56d 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</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 077d3de..1282542 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <name>RHQ Enterprise Server Cobbler Plugin</name> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 0e2e79a..5815d72 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml index f329331..47f753e 100644 --- a/modules/enterprise/server/plugins/drift-rhq/pom.xml +++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</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 f01db61..cc629bf 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml index c29fdfd..5f5509f 100644 --- a/modules/enterprise/server/plugins/groovy-script/pom.xml +++ b/modules/enterprise/server/plugins/groovy-script/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>groovy-script-server-plugin</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <name>RHQ Enterprise Server Groovy Script Plugin</name> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 4e18bc0..733c73e 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml index 7cc0e5e..57ec9b0 100644 --- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml +++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index b3163d5..492c91c 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index e088ed0..253d03f 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 39e4039..364d1c5 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index 6d06970..2c0a623 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</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 6f4c763..f67dc29 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</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 2cd3c56..999bb39 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</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 8ec68f7..b67cfb7 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index 9c43783..5212bac 100644 --- a/modules/enterprise/server/pom.xml +++ b/modules/enterprise/server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index fe5fec3..872737a 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 2daae03..1837a58 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 8b88383..fb0b291 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index d6c9466..c7d0dce 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index fcba87a..9902ea8 100644 --- a/modules/helpers/bundleGen/pom.xml +++ b/modules/helpers/bundleGen/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <build> <plugins> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index 4b78e17..c5aeb57 100644 --- a/modules/helpers/perftest-support/pom.xml +++ b/modules/helpers/perftest-support/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <name>Performance Testing Support</name> <description>To support performance testing, this is a basic tool to support extracting and later reimporting of data from/to a database. diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index d9590c2..0261e21 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 33093c6..c9bf1ce 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index ef83b24..3cdb7de 100644 --- a/modules/integration-tests/apache-plugin-test/pom.xml +++ b/modules/integration-tests/apache-plugin-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml index 0e4665a..26957d6 100644 --- a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml +++ b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-integration-tests</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index d3b2b85..b177e34 100644 --- a/modules/integration-tests/pom.xml +++ b/modules/integration-tests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 9138b4c..488cf6b 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index daa31ea..0344994 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index e920179..6c3464e 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 385c717..a11d7ae 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 2438ea8..0518035 100644 --- a/modules/plugins/byteman/pom.xml +++ b/modules/plugins/byteman/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index f04209c..b19fc30 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 0fa5355..4c61b27 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 0e98e7e..35b0bd9 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index c0aa0c3..057ac66 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 9fde785..8c46656 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index 87eb4b2..b1c024a 100644 --- a/modules/plugins/hadoop/pom.xml +++ b/modules/plugins/hadoop/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 72f5c39..d487017 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index f92799a..9a967d1 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index b897a84..bd67dd4 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 164c1d8..930af72 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index 4844d1f..4bd81f0 100644 --- a/modules/plugins/irc/pom.xml +++ b/modules/plugins/irc/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</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 d2bb70c..0fff9eb 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index 1cbe657..04f2c6d 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 34dae94..3035090 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</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 828419d..3a1120c 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index a0bd77b..dc08ac6 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 26e54c8..56bdd06 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index 2da6f23..ee74e39 100644 --- a/modules/plugins/kickstart/pom.xml +++ b/modules/plugins/kickstart/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index 467779f..8dfbf66 100644 --- a/modules/plugins/mod-cluster/pom.xml +++ b/modules/plugins/mod-cluster/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 7973bd5..5fddda4 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 953c485..9e1965c 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 34e1fd6..46abf88 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 0ad418b..6935ffb 100644 --- a/modules/plugins/pattern-generator/pom.xml +++ b/modules/plugins/pattern-generator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 93283be..549daf1 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index d3205a4..05c6699 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index ba3c88d..96fe70d 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index c95310c..54ac7dc 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index 27cce27..c0b4e13 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index eb14dae..032969c 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index e765cc6..7673396 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index fbec16d..2add38e 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 5507748..9116f34 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 3254843..03323d1 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 3b42e61..c02a3a2 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 46d8116..58001eb 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 3216cde..fc4cc67 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 22bc91b..287e029 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index ba0e3b1..0fcd691 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</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 ecd75f9..60aabe3 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.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index ab104d8..8f21c6f 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index b1306f2..ec51642 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 367d0a2..5f60d61 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index d94116b..3f99eff 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.2.0.JON300.GA</version> + <version>4.2.0.JON.3.0.1.GA</version> <packaging>pom</packaging> <name>RHQ</name>

1 0

[rhq] Branch 'release_jon2.4.2.GA' - modules/enterprise
by Simeon Pinder 23 Jan '12

23 Jan '12

modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java | 2 - modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 2 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java | 12 ++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) New commits: commit 56426f4db93d40c251e18f260b44ff599e938016 Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Jan 23 12:09:18 2012 -0500 [BZ 784006] rename agent option to --fullcleanconfig and change the error you get so the user knows the command line argument to pass to set the token. diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index 47c1a44..720b356 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -2750,7 +2750,7 @@ public class AgentMain { new LongOpt("console", LongOpt.REQUIRED_ARGUMENT, null, 'e'), new LongOpt("daemon", LongOpt.NO_ARGUMENT, null, 'd'), new LongOpt("cleanconfig", LongOpt.NO_ARGUMENT, null, 'l'), - new LongOpt("cleanallconfig", LongOpt.NO_ARGUMENT, null, 'L'), + new LongOpt("fullcleanconfig", LongOpt.NO_ARGUMENT, null, 'L'), new LongOpt("advanced", LongOpt.NO_ARGUMENT, null, 'a'), new LongOpt("setup", LongOpt.NO_ARGUMENT, null, 's'), new LongOpt("nostart", LongOpt.NO_ARGUMENT, null, 'n'), diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java index de24731..8f1d5f2 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java @@ -596,7 +596,7 @@ public interface AgentI18NResourceKeys { + "\\ -h, --help Shows this help message (default)\\n\\\n" + "\\ -i, --input=<filename> Specifies a script file to be used for input\\n\\\n" + "\\ -l, --cleanconfig Clears out existing configuration and data files, except for the security token.\\n\\\n" - + "\\ -L, --cleanallconfig Clears out all existing configuration and data files so the agent starts with a totally clean slate\\n\\\n" + + "\\ -L, --fullcleanconfig Clears out all existing configuration and data files so the agent starts with a totally clean slate\\n\\\n" + "\\ -n, --nostart If specified, the agent will not be automatically started\\n\\\n" + "\\ -o, --output=<filename> Specifies a file to write all output (excluding log messages)\\n\\\n" + "\\ -p, --pref=<preferences name> Specifies the agent preferences name used to identify what configuration to use\\n\\\n" diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java index 75c4d65..9afc3b9 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java @@ -135,9 +135,11 @@ public class CoreServerServiceImpl implements CoreServerService { if (agentByName != null) { // the agent request provided a name that already is in use by an agent. However, the request // provided a security token that was not assigned to any agent! How can this be? Something is fishy. - String msg = "The agent asking for registration under the name [" + request.getName() + String msg = "The agent asking for registration under the name [" + + request.getName() + "] provided an invalid security token. This request will fail. " - + "Please consult an administrator to reconfigure this agent with its proper security token."; + + "Please consult an administrator to obtain the agent's proper security token " + + "and restart the agent with the option \"-Drhq.agent.security-token=<the valid security token>\""; throw new AgentRegistrationException(msg); } Agent agentByAddressPort = getAgentManager().getAgentByAddressAndPort(request.getAddress(), @@ -172,9 +174,11 @@ public class CoreServerServiceImpl implements CoreServerService { + " and same security token."; throw new AgentRegistrationException(msg); } else { - String msg = "The agent [" + request.getName() + String msg = "The agent [" + + request.getName() + "] is attempting to re-register without a security token. " - + "Please consult an administrator to reconfigure this agent with its proper security token."; + + "Please consult an administrator to obtain the agent's proper security token " + + "and restart the agent with the option \"-Drhq.agent.security-token=<the valid security token>\""; throw new AgentRegistrationException(msg); }

1 0

[rhq] Branch 'release-3.0.1' - modules/enterprise
by mazz 23 Jan '12

23 Jan '12

modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java | 2 - modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 2 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java | 12 ++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) New commits: commit 1f42ac3aba5851a205b408d24b35ef8b99a08c71 Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Jan 23 12:09:18 2012 -0500 [BZ 784006] rename agent option to --fullcleanconfig and change the error you get so the user knows the command line argument to pass to set the token. diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index 47c1a44..720b356 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -2750,7 +2750,7 @@ public class AgentMain { new LongOpt("console", LongOpt.REQUIRED_ARGUMENT, null, 'e'), new LongOpt("daemon", LongOpt.NO_ARGUMENT, null, 'd'), new LongOpt("cleanconfig", LongOpt.NO_ARGUMENT, null, 'l'), - new LongOpt("cleanallconfig", LongOpt.NO_ARGUMENT, null, 'L'), + new LongOpt("fullcleanconfig", LongOpt.NO_ARGUMENT, null, 'L'), new LongOpt("advanced", LongOpt.NO_ARGUMENT, null, 'a'), new LongOpt("setup", LongOpt.NO_ARGUMENT, null, 's'), new LongOpt("nostart", LongOpt.NO_ARGUMENT, null, 'n'), diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java index de24731..8f1d5f2 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java @@ -596,7 +596,7 @@ public interface AgentI18NResourceKeys { + "\\ -h, --help Shows this help message (default)\\n\\\n" + "\\ -i, --input=<filename> Specifies a script file to be used for input\\n\\\n" + "\\ -l, --cleanconfig Clears out existing configuration and data files, except for the security token.\\n\\\n" - + "\\ -L, --cleanallconfig Clears out all existing configuration and data files so the agent starts with a totally clean slate\\n\\\n" + + "\\ -L, --fullcleanconfig Clears out all existing configuration and data files so the agent starts with a totally clean slate\\n\\\n" + "\\ -n, --nostart If specified, the agent will not be automatically started\\n\\\n" + "\\ -o, --output=<filename> Specifies a file to write all output (excluding log messages)\\n\\\n" + "\\ -p, --pref=<preferences name> Specifies the agent preferences name used to identify what configuration to use\\n\\\n" diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java index 75c4d65..9afc3b9 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java @@ -135,9 +135,11 @@ public class CoreServerServiceImpl implements CoreServerService { if (agentByName != null) { // the agent request provided a name that already is in use by an agent. However, the request // provided a security token that was not assigned to any agent! How can this be? Something is fishy. - String msg = "The agent asking for registration under the name [" + request.getName() + String msg = "The agent asking for registration under the name [" + + request.getName() + "] provided an invalid security token. This request will fail. " - + "Please consult an administrator to reconfigure this agent with its proper security token."; + + "Please consult an administrator to obtain the agent's proper security token " + + "and restart the agent with the option \"-Drhq.agent.security-token=<the valid security token>\""; throw new AgentRegistrationException(msg); } Agent agentByAddressPort = getAgentManager().getAgentByAddressAndPort(request.getAddress(), @@ -172,9 +174,11 @@ public class CoreServerServiceImpl implements CoreServerService { + " and same security token."; throw new AgentRegistrationException(msg); } else { - String msg = "The agent [" + request.getName() + String msg = "The agent [" + + request.getName() + "] is attempting to re-register without a security token. " - + "Please consult an administrator to reconfigure this agent with its proper security token."; + + "Please consult an administrator to obtain the agent's proper security token " + + "and restart the agent with the option \"-Drhq.agent.security-token=<the valid security token>\""; throw new AgentRegistrationException(msg); }

1 0

[rhq] modules/enterprise
by mazz 23 Jan '12

23 Jan '12

modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java | 2 - modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 2 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java | 12 ++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) New commits: commit 1189549551b1c290e8ff6989ba3a23719eb0a1b8 Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Jan 23 12:09:18 2012 -0500 [BZ 784006] rename agent option to --fullcleanconfig and change the error you get so the user knows the command line argument to pass to set the token. diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index c7e0cfc..805d280 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -2917,7 +2917,7 @@ public class AgentMain { new LongOpt("console", LongOpt.REQUIRED_ARGUMENT, null, 'e'), new LongOpt("daemon", LongOpt.NO_ARGUMENT, null, 'd'), new LongOpt("cleanconfig", LongOpt.NO_ARGUMENT, null, 'l'), - new LongOpt("cleanallconfig", LongOpt.NO_ARGUMENT, null, 'L'), + new LongOpt("fullcleanconfig", LongOpt.NO_ARGUMENT, null, 'L'), new LongOpt("advanced", LongOpt.NO_ARGUMENT, null, 'a'), new LongOpt("setup", LongOpt.NO_ARGUMENT, null, 's'), new LongOpt("nostart", LongOpt.NO_ARGUMENT, null, 'n'), diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java index 0b41bb7..8ba3100 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java @@ -614,7 +614,7 @@ public interface AgentI18NResourceKeys { + "\\ -h, --help Shows this help message (default)\\n\\\n" + "\\ -i, --input=<filename> Specifies a script file to be used for input\\n\\\n" + "\\ -l, --cleanconfig Clears out existing configuration and data files, except for the security token.\\n\\\n" - + "\\ -L, --cleanallconfig Clears out all existing configuration and data files so the agent starts with a totally clean slate\\n\\\n" + + "\\ -L, --fullcleanconfig Clears out all existing configuration and data files so the agent starts with a totally clean slate\\n\\\n" + "\\ -n, --nostart If specified, the agent will not be automatically started\\n\\\n" + "\\ -o, --output=<filename> Specifies a file to write all output (excluding log messages)\\n\\\n" + "\\ -p, --pref=<preferences name> Specifies the agent preferences name used to identify what configuration to use\\n\\\n" diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java index 75c4d65..9afc3b9 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java @@ -135,9 +135,11 @@ public class CoreServerServiceImpl implements CoreServerService { if (agentByName != null) { // the agent request provided a name that already is in use by an agent. However, the request // provided a security token that was not assigned to any agent! How can this be? Something is fishy. - String msg = "The agent asking for registration under the name [" + request.getName() + String msg = "The agent asking for registration under the name [" + + request.getName() + "] provided an invalid security token. This request will fail. " - + "Please consult an administrator to reconfigure this agent with its proper security token."; + + "Please consult an administrator to obtain the agent's proper security token " + + "and restart the agent with the option \"-Drhq.agent.security-token=<the valid security token>\""; throw new AgentRegistrationException(msg); } Agent agentByAddressPort = getAgentManager().getAgentByAddressAndPort(request.getAddress(), @@ -172,9 +174,11 @@ public class CoreServerServiceImpl implements CoreServerService { + " and same security token."; throw new AgentRegistrationException(msg); } else { - String msg = "The agent [" + request.getName() + String msg = "The agent [" + + request.getName() + "] is attempting to re-register without a security token. " - + "Please consult an administrator to reconfigure this agent with its proper security token."; + + "Please consult an administrator to obtain the agent's proper security token " + + "and restart the agent with the option \"-Drhq.agent.security-token=<the valid security token>\""; throw new AgentRegistrationException(msg); }

1 0

[rhq] Changes to 'rc/jon3.0.1.GA'
by Simeon Pinder 23 Jan '12

23 Jan '12

New branch 'rc/jon3.0.1.GA' available with the following commits:

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits January 2012