rhq-commits November 2011

rhq-commits@lists.fedorahosted.org

12 participants
339 discussions

[rhq] Branch 'release_jon3.0.0.CR3' - 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 30 Nov '11

30 Nov '11

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 4747881a7829f3721b2aea0de7aec3caa427fe8c Author: Hudson <jboss-qa-internal(a)redhat.com> Date: Tue Nov 29 20:18:46 2011 -0500 tag RHQ_4_2_0_JON300_CR3 diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index 3a5f116..ac3f8ef 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 81947ba..418391a 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index 46ad40c..221a0c5 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 89ecf98..5c0e40d 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 f328660..e2fb9f2 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 9830cbb..a974ff9 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index c0ca9be..0e26d22 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index ed0087f..38639ef 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 85a5526..43a3c60 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index ceedba7..9d8be5e 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 086b8fd..da22452 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 3f28672..e14c43c 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index df1a188..e6d9a3f 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index e38ad83..3557f83 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 c143c00..ae4adfd 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 99a1950..e06fbe4 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index a8e5ea6..79bc543 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index b446c3d..46f6d8d 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index cb61cfd..a73a7bc 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 0a9dd46..14331bf 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 ae11a4b..0e335a5 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 759d52d..7460302 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 0066cdd..caa48ec 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 f2919fb..c5cd46f 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index ff5e243..6a4ff80 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 7f79832..a57f209 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index db45111..e623a6c 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 8ea3d46..0dee2d0 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 7f5707c..bb81cf3 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 22a7c7e..ccd4537 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 32921bb..e1f4272 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 257a9dd..a7a5f3f 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 d3dcb79..c8f3517 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 70333b1..b43fe92 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index b225ea1..f6a900a 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 e777e21..e571c22 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 b832b06..353e884 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index f48f998..fecddfa 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 258a946e..6c60e1a 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml index d9d8677..d7e4bd8 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index db286a1..406d891 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 d13ee76..2c50c80 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 d664a1b..5cc537e 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 0f46399..aac44b7 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 b06d1ec..fcfc4b0 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 f6b00e3..d0ac979 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 76e49fa..40cebdd 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 46c3d61..149e647 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 311cfa9..e4c8ca9 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 ff7466d..3230561 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 9ba1fb9..f73ba3f 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 0d36c31..6d8051c 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 1f6e1c4..5a7bcde 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 9fcc685..1d49e0c 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 d2181f1..a328602 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 a1a5025..b8ff71a 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 fcae8eb..6ab95dd 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>groovy-script-server-plugin</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 6fbaef6..1c75ca1 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 d5862ec..f2543b1 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 94a0f6c..2fef184 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 c3d755c..1b8963a 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index ddb8e3a..8f9502e 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 e4c2529..a55302b 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 ede0674..d3c5f78 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 a57d703..68c5b52 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 4b19d90..fbb1816 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index 42d5c4b..9e0c19d 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 3b23fc0..87ad752 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 56f2f99..7497ebc 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index bd52c46..f06dcd7 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 c2aca81..e067c83 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index 9be012c..8b1a39a 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <build> <plugins> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index 3b75eec..8ec5329 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 c98f407..6499a6c 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index c80f26a..d573af3 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 13241f0..935d846 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 ec0c098..6ca0adf 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index 0290729..4c668f3 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 f581033..608115b 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index b00a1ce..1c70548 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 16854fe..086313d 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index f8e88f8..5316f3c 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 37101bb..5aad81f 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index e7da655..47f2879 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 148ad63..e8b5d40 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index a9be07c..8b1edb4 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 6e80698..ee66194 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 131a98f..de5d7d6 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index f30d2fb..21f5091 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 06c6470..0f17e0f 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 9f0aedc..5525602 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index fd0b274..f3637fd 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index c4c5587..efca7bd 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index 506ffeb..b905a10 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 3de6752..fbfea7a 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 e069be3..c647c9f 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index c0292da..d5a4d5a 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 efad67d..52de5b1 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 4ecbee4..ba7cab3 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index e92eb21..473662f 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index bcbb309..23e3879 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index 44fdea9..64eadd3 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 4068435..168383c 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 0bdb176..c481fe5 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 4b52d63..267efaf 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 269b169..afc186f 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index e296f55..721193f 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index f22ac8a..d8b19d0 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 389b69c..4b038d4 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 2582d6b..0fff177 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index a3d5cae..29c1ab8 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 92068fd..dd34c6b 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 86b3f7a..f7e2f9d 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index f30db8f..b57f93c 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 94af3a5..f5a7642 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index f89d6fc..81ff88e 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index eec5fc5..47962e8 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 4ef043f..cd156bb 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 95567bb..1b0f0e6 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 4837c5b..1c6d4a0 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index de46080..900bc22 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</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 fa35f4e..66c5465 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index bb62eee..e7aac1e 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index f0eaeef..04e7538 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 0b19530..e94bf67 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.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index ed424a8..9b6354b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.3.0-SNAPSHOT</version> + <version>4.2.0.JON300.CR3</version> <packaging>pom</packaging> <name>RHQ</name>

1 0

[rhq] 4 commits - modules/core modules/plugins
by Jay Shaughnessy 29 Nov '11

29 Nov '11

modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java | 9 + modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentComponent.java | 28 ++-- modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 30 +++++ modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java | 4 modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml | 60 +++++++--- 5 files changed, 96 insertions(+), 35 deletions(-) New commits: commit 72d6aa5c440900dacaf8f97914ea2e17dea07112 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Nov 29 17:54:29 2011 -0500 Add drift templates to EAR/WAR/Embedded War types for AS-4 plugin - To support this, add new Path trait (via Ian) for embedded war resources diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentComponent.java index 2ed3159..ea8d467 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentComponent.java @@ -33,28 +33,28 @@ import org.rhq.core.pluginapi.measurement.MeasurementFacet; /** * @author Ian Springer */ -public class EmbeddedManagedDeploymentComponent extends AbstractManagedDeploymentComponent - implements MeasurementFacet -{ +public class EmbeddedManagedDeploymentComponent extends AbstractManagedDeploymentComponent implements MeasurementFacet { private static final String CUSTOM_PARENT_TRAIT = "custom.parent"; + private static final String CUSTOM_PATH_TRAIT = "custom.path"; // ------------ MeasurementFacet Implementation ------------ - public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) - throws Exception - { - Set<MeasurementScheduleRequest> remainingRequests = new HashSet(); - for (MeasurementScheduleRequest request : requests) - { + public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) throws Exception { + Set<MeasurementScheduleRequest> remainingRequests = new HashSet<MeasurementScheduleRequest>(); + for (MeasurementScheduleRequest request : requests) { String metricName = request.getName(); - if (metricName.equals(CUSTOM_PARENT_TRAIT)) - { + if (metricName.equals(CUSTOM_PARENT_TRAIT)) { String parentDeploymentName = getManagedDeployment().getParent().getName(); MeasurementDataTrait trait = new MeasurementDataTrait(request, parentDeploymentName); report.addData(trait); - } - else - { + + } else if (metricName.equals(CUSTOM_PATH_TRAIT)) { + boolean exploded = this.deploymentFile.isDirectory(); + if (exploded) { + MeasurementDataTrait trait = new MeasurementDataTrait(request, this.deploymentFile.getPath()); + report.addData(trait); + } + } else { remainingRequests.add(request); } } diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml index 32aca99..470b0f6 100644 --- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml @@ -2313,6 +2313,15 @@ &deploymentContentConfigProps; </content> + <drift-definition + name="Template-Files" + description="Monitor files comprising the enterprise application archive (EAR). Use filters for more fine-grained monitoring. Or, create definitions only on the embedded WAR resources themselves."> + <basedir> + <value-context>measurementTrait</value-context> + <value-name>custom.path</value-name> + </basedir> + </drift-definition> + </service> <service name="Web Application (WAR)" @@ -2364,6 +2373,15 @@ &deploymentContentConfigProps; </content> + <drift-definition + name="Template-Files" + description="Monitor files comprising the web application archive (WAR). Use filters for more fine-grained monitoring."> + <basedir> + <value-context>measurementTrait</value-context> + <value-name>custom.path</value-name> + </basedir> + </drift-definition> + <service name="Web Application Context" class="WebApplicationContextComponent" discovery="WebApplicationContextDiscoveryComponent" @@ -2426,9 +2444,21 @@ <metric property="custom.parent" displayName="Parent" dataType="trait" displayType="summary" description="the name of this WAR's parent deployment"/> + <metric property="custom.path" displayName="Path" + dataType="trait" displayType="summary" + description="the absolute path of this WAR directory (not supported for WAR's embedded in non-exploded EARs)"/> &webApplicationMetrics; + <drift-definition + name="Template-Files" + description="Monitor files comprising the embedded web application archive (WAR). Use filters for more fine-grained monitoring."> + <basedir> + <value-context>measurementTrait</value-context> + <value-name>custom.path</value-name> + </basedir> + </drift-definition> + <service name="Embedded Web Application Context" class="WebApplicationContextComponent" discovery="WebApplicationContextDiscoveryComponent" commit 0ad22b15a3f6d5b700bfec506db74f6a20633f21 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Nov 29 17:53:32 2011 -0500 Add drift templates to EAR/WAR/Embedded War types for AS-4 plugin diff --git a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml index db4b8e5..b5d4bd1 100644 --- a/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml @@ -259,8 +259,9 @@ </configuration> </content> - <drift-definition name="Template-Base Files" - description="Monitor base application server files for drift. It defines monitoring for some standard sub-directories of the HOME directory. Note, it is not recommeded to monitor all files for an application server. There are many files, and many temp files."> + <drift-definition + name="Template-Base Files" + description="Monitor base application server files for drift. It defines monitoring for some standard sub-directories of the HOME directory. Note, it is not recommeded to monitor all files for an application server. There are many files, and many temp files."> <basedir> <value-context>pluginConfiguration</value-context> <value-name>jbossHomeDir</value-name> @@ -2267,6 +2268,15 @@ </configuration> </content> + <drift-definition + name="Template-Files" + description="Monitor files comprising the enterprise application archive (EAR). Use filters for more fine-grained monitoring. Or, create definitions only on the embedded WAR resources themselves."> + <basedir> + <value-context>pluginConfiguration</value-context> + <value-name>filename</value-name> + </basedir> + </drift-definition> + <service name="Embedded Web Application (WAR)" class="org.rhq.plugins.jbossas.WarComponent" discovery="org.rhq.plugins.jbossas.EmbeddedWarDiscoveryComponent" @@ -2384,6 +2394,15 @@ <metric property="Vhost.name" displayName="Vhost" dataType="trait" description="Virtual hosts this app runs on"/> + <drift-definition + name="Template-Files" + description="Monitor files comprising the embedded web application archive (WAR). Use filters for more fine-grained monitoring."> + <basedir> + <value-context>pluginConfiguration</value-context> + <value-name>filename</value-name> + </basedir> + </drift-definition> + </service> </service> @@ -2460,55 +2479,55 @@ dataType="calltime" defaultOn="false" units="milliseconds" destinationType="URL" description="the minimum, maximum, and average response times for HTTP requests serviced by this webapp"/> - <metric property="Servlet.MinResponseTime" displayName="Min. Servlet Resp. Time" + <metric property="Servlet.MinResponseTime" displayName="Min. Servlet Resp. Time" units="milliseconds" description="Minimum response time of a servlet"/> - <metric property="Servlet.AvgResponseTime" displayName="Avg. Servlet Resp. Time" + <metric property="Servlet.AvgResponseTime" displayName="Avg. Servlet Resp. Time" units="milliseconds" description="Average response time of a servlet"/> - <metric property="Servlet.MaxResponseTime" displayName="Max. Servlet Resp. Time" + <metric property="Servlet.MaxResponseTime" displayName="Max. Servlet Resp. Time" units="milliseconds" description="Maximum response time of a servlet"/> - <metric property="Servlet.TotalTime" displayName="Total processing time" + <metric property="Servlet.TotalTime" displayName="Total processing time" units="milliseconds" description="Total processing time of the webapp" measurementType="trendsup"/> - <metric property="Servlet.NumRequests" displayName="Requests served" + <metric property="Servlet.NumRequests" displayName="Requests served" units="none" description="Number of requests served by servlets" measurementType="trendsup" displayType="summary"/> - <metric property="Servlet.NumErrors" displayName="Errors while processing" + <metric property="Servlet.NumErrors" displayName="Errors while processing" units="none" description="Number of errors while processing" measurementType="trendsup" displayType="summary"/> - <metric property="Session.activeSessions" displayName="Currently Active Sessions" + <metric property="Session.activeSessions" displayName="Currently Active Sessions" units="none" description="Number active sessions for the webapp right now" /> - <metric property="Session.maxActive" displayName="Maximum number of Active Sessions" + <metric property="Session.maxActive" displayName="Maximum number of Active Sessions" units="none" description="Maximum number of active sessions for the webapp" /> - <metric property="Session.sessionCounter" displayName="Sessions created" + <metric property="Session.sessionCounter" displayName="Sessions created" units="none" description="Number of sessions created for the webapp" measurementType="trendsup" /> - <metric property="Session.expiredSessions" displayName="Expired Sessions" + <metric property="Session.expiredSessions" displayName="Expired Sessions" units="none" description="Number of expired sessions for the webapp" measurementType="trendsup" /> - <metric property="Session.rejectedSessions" displayName="Rejected Sessions" + <metric property="Session.rejectedSessions" displayName="Rejected Sessions" units="none" description="Number of sessions rejected for the webapp" measurementType="trendsup" /> - <metric property="Session.sessionAverageAliveTime" displayName="Session Average alive time" + <metric property="Session.sessionAverageAliveTime" displayName="Session Average alive time" units="seconds" description="Average alive time of a Sessions" /> - <metric property="Session.sessionMaxAliveTime" displayName="Max Session alive time" + <metric property="Session.sessionMaxAliveTime" displayName="Max Session alive time" units="seconds" description="Maximum alive time of a Sessions" /> - <metric property="Vhost.name" displayName="Vhost" dataType="trait" + <metric property="Vhost.name" displayName="Vhost" dataType="trait" description="Virtual hosts this app runs on"/> <content name="file" displayName="WAR File" category="deployable" isCreationType="true"> @@ -2524,6 +2543,15 @@ </configuration> </content> + <drift-definition + name="Template-Files" + description="Monitor files comprising the web application archive (WAR). Use filters for more fine-grained monitoring."> + <basedir> + <value-context>pluginConfiguration</value-context> + <value-name>filename</value-name> + </basedir> + </drift-definition> + </service> <service name="EJB3 Entity Tree Cache" commit 8c6dcd3817195f9a0f0d9855b3f7b648bd1ada5d Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Nov 29 17:50:22 2011 -0500 Fix issue in AS-4 plugin such that for embedded WAR resources the "filename" plugin config prop and the "Path" trait are set to an actual path (do not use the resource name when constructing the value) diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java index 18a6b38..9ad2fbd 100644 --- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java +++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java @@ -65,7 +65,7 @@ public class EmbeddedWarDiscoveryComponent extends MBeanResourceDiscoveryCompone // Once we've finished making sure the plugin configurations have the data we need: // 1) First the stuff generic to all WARs... - JBossASServerComponent grandparentJBossASComponent = parentEarComponent.getParentResourceComponent(); + JBossASServerComponent<?> grandparentJBossASComponent = parentEarComponent.getParentResourceComponent(); resourceDetails = WarDiscoveryHelper.initPluginConfigurations(grandparentJBossASComponent, resourceDetails, parentEarComponent); @@ -74,7 +74,7 @@ public class EmbeddedWarDiscoveryComponent extends MBeanResourceDiscoveryCompone for (DiscoveredResourceDetails resource : resourceDetails) { Configuration pluginConfiguration = resource.getPluginConfiguration(); pluginConfiguration.put(new PropertySimple(WarComponent.FILE_NAME, parentEarFullFileName - + resource.getResourceName())); + + pluginConfiguration.getSimpleValue(WarComponent.NAME_CONFIG_PROP, ""))); } return resourceDetails; commit 8939b50bf8bee6f4b0037885026abdcd2f79946a Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Nov 29 12:18:17 2011 -0500 [Bug 758261 - A bad drift definition can prevent agent startup] Add more aggressive catching (Throwable) because it's better to skip detection for a problematic definition than it is to prevent agent startup. diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java index c713297..2790f13 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java @@ -152,9 +152,11 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri try { syncWithServer(r, d); schedulesQueue.addSchedule(new DriftDetectionSchedule(r.getId(), d)); - } catch (IOException e) { + + } catch (Throwable t) { + // catch throwable, don't prevent agent startup just due to a bad definition log.error("Failed to sync with server for " + toString(r.getId(), d) + ". Drift detection will not be " - + "scheduled.", e); + + "scheduled.", t); } } @@ -691,7 +693,8 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri // find out the type of base location that is specified by the drift def DriftDefinition.BaseDirectory baseDir = driftDefinition.getBasedir(); if (baseDir == null) { - throw new IllegalArgumentException("Missing basedir in drift definition"); + throw new IllegalArgumentException("Base directory is null for drift definition [" + + driftDefinition.getName() + "]"); } // based on the type of base location, determine the root base directory

1 0

[rhq] Changes to 'release_jon3.0.0.CR3'
by Simeon Pinder 29 Nov '11

29 Nov '11

New branch 'release_jon3.0.0.CR3' available with the following commits:

1 0

[rhq] 2 commits - .classpath modules/enterprise
by mazz 29 Nov '11

29 Nov '11

.classpath | 1 modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java | 94 +++++++--- modules/enterprise/binding/src/test/java/org/rhq/bindings/TabularWriterTest.java | 58 +++++- 3 files changed, 126 insertions(+), 27 deletions(-) New commits: commit f80179210e18065e5d32850726f9b79826dd669b Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Nov 29 17:18:02 2011 -0500 [BZ 756086] allow CLI to support printing of arrays (primitive and object). This only supports single-dimension arrays but none of our APIs return multi-dim arrays AFAIK diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java index 382ce8c..6ead45c 100644 --- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java +++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java @@ -79,6 +79,8 @@ public class TabularWriter { static { SIMPLE_TYPES.add(Byte.class); SIMPLE_TYPES.add(Byte.TYPE); + SIMPLE_TYPES.add(Character.class); + SIMPLE_TYPES.add(Character.TYPE); SIMPLE_TYPES.add(Short.class); SIMPLE_TYPES.add(Short.TYPE); SIMPLE_TYPES.add(Integer.class); @@ -130,7 +132,48 @@ public class TabularWriter { } if (object != null && object.getClass().isArray()) { - print((Object[]) object); + if (!object.getClass().getComponentType().isPrimitive()) { + print((Object[]) object); + } else { + Class<?> oClass = object.getClass(); + // note: we assume single-dimension arrays! + out.println("Array of " + (oClass.getComponentType().getName())); + if (oClass == byte[].class) { + for (byte i : (byte[]) object) { + this.out.println(i); + } + } else if (oClass == short[].class) { + for (short i : (short[]) object) { + this.out.println(i); + } + } else if (oClass == int[].class) { + for (int i : (int[]) object) { + this.out.println(i); + } + } else if (oClass == long[].class) { + for (long i : (long[]) object) { + this.out.println(i); + } + } else if (oClass == char[].class) { + for (char i : (char[]) object) { + this.out.println(i); + } + } else if (oClass == float[].class) { + for (float i : (float[]) object) { + this.out.println(i); + } + } else if (oClass == double[].class) { + for (double i : (double[]) object) { + this.out.println(i); + } + } else if (oClass == boolean[].class) { + for (boolean i : (boolean[]) object) { + this.out.println(i); + } + } else { + this.out.println("*Printing of this data type is not supported*"); + } + } return; } @@ -285,7 +328,7 @@ public class TabularWriter { for (Object object : list) { data[i++][0] = (String) object; } - + this.print(data); } else { if (consistentMaps(list)) { @@ -318,30 +361,33 @@ public class TabularWriter { } } - headers = new String[pdList.size()]; - data = new String[list.size()][pdList.size()]; + if (pdList.isEmpty()) { + printStrings(list); + } else { + headers = new String[pdList.size()]; + data = new String[list.size()][pdList.size()]; - for (PropertyDescriptor pd : pdList) { - headers[i++] = pd.getName(); - } - i = 0; - for (Object row : list) { - int j = 0; for (PropertyDescriptor pd : pdList) { - - Object val = "?"; - val = invoke(row, pd.getReadMethod()); - if (val == null) { - data[i][j++] = ""; - } else { - data[i][j++] = shortVersion(val); + headers[i++] = pd.getName(); + } + i = 0; + for (Object row : list) { + int j = 0; + for (PropertyDescriptor pd : pdList) { + + Object val = "?"; + val = invoke(row, pd.getReadMethod()); + if (val == null) { + data[i][j++] = ""; + } else { + data[i][j++] = shortVersion(val); + } } + i++; } - i++; - } - - this.print(data); + this.print(data); + } } } } catch (Exception e) { @@ -530,13 +576,11 @@ public class TabularWriter { for (Integer col : columns) { actualColumnWidths[col] = maxColumnWidth; } - } - else if (columns.size() == 0) { + } else if (columns.size() == 0) { // If the columns list is empty then that means that there is enough available // space for each column so we are done. return; - } - else if (extraSpace > 0) { + } else if (extraSpace > 0) { // Since we have extra space, we will go ahead and recalculate the widths for // those columns still needing space int newMaxColumnWidth = (maxColumnWidth + extraSpace) / columns.size(); diff --git a/modules/enterprise/binding/src/test/java/org/rhq/bindings/TabularWriterTest.java b/modules/enterprise/binding/src/test/java/org/rhq/bindings/TabularWriterTest.java index a80d2c2..a69f7bf 100644 --- a/modules/enterprise/binding/src/test/java/org/rhq/bindings/TabularWriterTest.java +++ b/modules/enterprise/binding/src/test/java/org/rhq/bindings/TabularWriterTest.java @@ -23,6 +23,8 @@ package org.rhq.bindings; +import static org.testng.Assert.assertEquals; + import java.io.PrintWriter; import java.io.StringWriter; import java.util.ArrayList; @@ -42,8 +44,6 @@ import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.shared.ResourceBuilder; -import static org.testng.Assert.*; - public class TabularWriterTest { StringWriter stringWriter; @@ -57,6 +57,60 @@ public class TabularWriterTest { } @Test + public void testPrintEntityArray() { + User[] users = new User[] { new User(1, "rhqadmin", "rhqadmin"), new User(222, "name", "pw") }; + + writer.print(users); + + assertLineEquals(1, "id password username", "Cannot print entity array header"); + // skip line 2 - its the separator "--------------" + assertLineEquals(3, "1 rhqadmin rhqadmin", "Cannot print first entity array item"); + assertLineEquals(4, "222 pw name ", "Cannot print second entity array item"); + } + + /** + * This tests printing String arrays via the print(Object) API + */ + @Test + public void testPrintStringArray() { + String[] objArray = new String[] { new String("first string"), new String("second string") }; + Object obj = objArray; + writer.print(obj); + + // first two lines are the header and "----" separator + assertLineEquals(3, "first string ", "Cannot print first string array item"); + assertLineEquals(4, "second string", "Cannot print first string array item"); + } + + /** + * This tests printing "primitive object" arrays via the print(Object) API + */ + @Test + public void testPrintObjectArray() { + Integer[] objArray = new Integer[] { new Integer("123"), new Integer("789") }; + Object obj = objArray; + writer.print(obj); + + String expected = "Array of java.lang.Integer\n123\n789\n"; + String actual = stringWriter.toString(); + assertEquals(actual, expected, "Could not print an object Integer array"); + } + + /** + * This tests printing primitive arrays via the print(Object) API + */ + @Test + public void testPrintPrimaryArray() { + byte[] primitiveArray = "abc".getBytes(); + Object obj = primitiveArray; + writer.print(obj); + + String expected = "Array of byte\n" + (int) 'a' + '\n' + (int) 'b' + '\n' + (int) 'c' + '\n'; + String actual = stringWriter.toString(); + assertEquals(actual, expected, "Could not print a primitive byte array"); + } + + @Test public void aByteShouldPrintUnchanged() { byte value = 1; commit 4a30174e4cb99e7290b7f8d7b21be19572ed57e6 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Nov 29 17:15:48 2011 -0500 add bindings test module to eclipse classpath diff --git a/.classpath b/.classpath index 29ff1d4..24fb54d 100644 --- a/.classpath +++ b/.classpath @@ -167,6 +167,7 @@ <classpathentry kind="src" path="modules/enterprise/server/jar/src/main/filtered-sources/java"/> <classpathentry kind="src" path="modules/enterprise/server/jar/target/generated-sources/antlr3"/> <classpathentry kind="src" path="modules/enterprise/binding/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/binding/src/test/java"/> <classpathentry kind="src" path="modules/enterprise/gui/coregui/src/main/java"/> <classpathentry kind="src" path="modules/enterprise/gui/coregui/target/generated-sources/gwt"/> <classpathentry kind="src" path="modules/enterprise/gui/portal-war/src/main/java"/>

1 0

[rhq] modules/enterprise
by ips 29 Nov '11

29 Nov '11

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossRemote.java | 15 ++++++---- 1 file changed, 9 insertions(+), 6 deletions(-) New commits: commit 96fb4fd93fa197a0487674eea9b083db198cd632 Author: Ian Springer <ian.springer(a)redhat.com> Date: Tue Nov 29 14:03:51 2011 -0500 minor - fix javadoc typos diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossRemote.java index b77c025..ee0a1f6 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossRemote.java @@ -39,8 +39,9 @@ import org.rhq.enterprise.server.system.ServerVersion; public interface DiscoveryBossRemote { /** - * Analogous to the GUI feature Import Resources in the auto discovery queue. Note, to query for - * Resources with a specific InnventryStatus see {@link ResourceManagerRemote.findResourcesByCriteria(ResourceCriteria)} + * Analogous to the GUI feature Import Resources in the auto discovery queue. + * Note, to query for Resources with a specific InventoryStatus, see + * {@link org.rhq.enterprise.server.resource.ResourceManagerRemote#findResourcesByCriteria}. * * @param subject * @param resourceIds @@ -50,8 +51,9 @@ public interface DiscoveryBossRemote { @WebParam(name = "resourceIds") int[] resourceIds); /** - * Analogous to the GUI feature Ignore Resources in the auto discovery queue. Note, to query for - * Resources with a specific InnventryStatus see {@link ResourceManagerRemote.findResourcesByCriteria(ResourceCriteria)} + * Analogous to the GUI feature Ignore Resources in the auto discovery queue. + * Note, to query for Resources with a specific InventoryStatus, see + * {@link org.rhq.enterprise.server.resource.ResourceManagerRemote#findResourcesByCriteria}. * * @param subject * @param resourceIds @@ -61,8 +63,9 @@ public interface DiscoveryBossRemote { @WebParam(name = "resourceIds") int[] resourceIds); /** - * Analogous to the GUI feature Unignore Resources in the auto discovery queue. Note, to query for - * Resources with a specific InnventryStatus see {@link ResourceManagerRemote.findResourcesByCriteria(ResourceCriteria)} + * Analogous to the GUI feature Unignore Resources in the auto discovery queue. + * Note, to query for Resources with a specific InventoryStatus, see + * {@link org.rhq.enterprise.server.resource.ResourceManagerRemote#findResourcesByCriteria}. * * @param subject * @param resourceIds

1 0

[rhq] Branch 'release_jon3.x' - modules/enterprise
by mazz 29 Nov '11

29 Nov '11

modules/enterprise/gui/installer-war/src/main/webapp/header.jsp | 2 +- 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 +- 4 files changed, 6 insertions(+), 6 deletions(-) New commits: commit bcb04980f718334c8a100195316a7fee5ac258b9 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Nov 29 12:20:51 2011 -0500 [BZ 756205] installer should go to /coregui explicitly diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp b/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp index 54a35be..673b018 100644 --- a/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp +++ b/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp @@ -63,7 +63,7 @@ { linkText = "${bundle.alreadyInstalledStartedLink}"; document.getElementById('pleasewait-image').src="/images/finished.gif"; - document.getElementById('progressBarMessage').innerHTML='<a class="small" href="/">' + linkText + '<\/a>'; + document.getElementById('progressBarMessage').innerHTML='<a class="small" href="/coregui">' + linkText + '<\/a>'; // this will immediately forward to the start page, uncomment if we want that functionality // window.location.replace( startPage ); } diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html index 9778784..5da4047 100644 --- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html +++ b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title>Welcome to RHQ!</title> +<title>The Server Is Installed!</title> <meta http-equiv="Pragma" content="no-cache" /> <meta http-equiv="Expires" content="-1" /> @@ -11,7 +11,7 @@ </head> <body> <p> </p> - <h1 align="center">RHQ Is Installed!</h1> - <p align="center"><a href="/">Click here to get started!</a></p> + <h1 align="center">The Server Is Installed!</h1> + <p align="center"><a href="/coregui">Click here to get started!</a></p> </body> </html> diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf index 4ce54a0..4e5a220 100644 --- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf +++ b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf @@ -8,6 +8,6 @@ <body> <p> </p> <h1 align="center">The Server Is Installed!</h1> - <p align="center"><a href="/">Click here to get started!</a></p> + <p align="center"><a href="/coregui">Click here to get started!</a></p> </body> </html> diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf index 4ce54a0..4e5a220 100644 --- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf +++ b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf @@ -8,6 +8,6 @@ <body> <p> </p> <h1 align="center">The Server Is Installed!</h1> - <p align="center"><a href="/">Click here to get started!</a></p> + <p align="center"><a href="/coregui">Click here to get started!</a></p> </body> </html>

1 0

[rhq] modules/enterprise
by mazz 29 Nov '11

29 Nov '11

modules/enterprise/gui/installer-war/src/main/webapp/header.jsp | 2 +- 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 +- 4 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 6f563d3e58bc41f2a97ac42619acd912abf49521 Author: John Mazzitelli <mazz(a)redhat.com> Date: Tue Nov 29 12:20:51 2011 -0500 [BZ 756205] installer should go to /coregui explicitly diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp b/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp index 54a35be..673b018 100644 --- a/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp +++ b/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp @@ -63,7 +63,7 @@ { linkText = "${bundle.alreadyInstalledStartedLink}"; document.getElementById('pleasewait-image').src="/images/finished.gif"; - document.getElementById('progressBarMessage').innerHTML='<a class="small" href="/">' + linkText + '<\/a>'; + document.getElementById('progressBarMessage').innerHTML='<a class="small" href="/coregui">' + linkText + '<\/a>'; // this will immediately forward to the start page, uncomment if we want that functionality // window.location.replace( startPage ); } diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html index 9778784..5da4047 100644 --- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html +++ b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title>Welcome to RHQ!</title> +<title>The Server Is Installed!</title> <meta http-equiv="Pragma" content="no-cache" /> <meta http-equiv="Expires" content="-1" /> @@ -11,7 +11,7 @@ </head> <body> <p> </p> - <h1 align="center">RHQ Is Installed!</h1> - <p align="center"><a href="/">Click here to get started!</a></p> + <h1 align="center">The Server Is Installed!</h1> + <p align="center"><a href="/coregui">Click here to get started!</a></p> </body> </html> diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf index 4ce54a0..4e5a220 100644 --- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf +++ b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf @@ -8,6 +8,6 @@ <body> <p> </p> <h1 align="center">The Server Is Installed!</h1> - <p align="center"><a href="/">Click here to get started!</a></p> + <p align="center"><a href="/coregui">Click here to get started!</a></p> </body> </html> diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf index 4ce54a0..4e5a220 100644 --- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf +++ b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf @@ -8,6 +8,6 @@ <body> <p> </p> <h1 align="center">The Server Is Installed!</h1> - <p align="center"><a href="/">Click here to get started!</a></p> + <p align="center"><a href="/coregui">Click here to get started!</a></p> </body> </html>

1 0

[rhq] modules/enterprise
by John Sanda 29 Nov '11

29 Nov '11

modules/enterprise/remoting/cli/src/main/samples/drift.js | 60 +++++--------- 1 file changed, 23 insertions(+), 37 deletions(-) New commits: commit cc717fc0ac9b891306738842910b026d3a485085 Author: John Sanda <jsanda(a)redhat.com> Date: Tue Nov 29 11:01:13 2011 -0500 [BZ 757958] updating script to work with current APIs diff --git a/modules/enterprise/remoting/cli/src/main/samples/drift.js b/modules/enterprise/remoting/cli/src/main/samples/drift.js index ff7c31a..132d5bf 100644 --- a/modules/enterprise/remoting/cli/src/main/samples/drift.js +++ b/modules/enterprise/remoting/cli/src/main/samples/drift.js @@ -21,7 +21,7 @@ /** * description: Generates a snapshot of changes sets belonging to a particular - * drift configuration of a specific resource. By default all change sets are + * drift definition of a specific resource. By default all change sets are * included in the snapshot. An optional third argument can be specified to * limit or control the number of change sets included in the snapshot. * @@ -32,10 +32,11 @@ * arguments: * rid: A resource id, expected to be an integer * - * cname: The drift configuration name as a string + * defName: The drift definition name as a string * - * filters: (optional) A map or JS object that limits the number of - * change sets included in the snapshot + * filter: (optional) A map or JS object that limits the number of + * change sets included in the snapshot. It should specify two + * properties - startVersion and endVersion. * * return: A org.rhq.core.domamin.drift.DriftSnapshot object * @@ -44,48 +45,33 @@ * // mydrift drift configuration. * createSnapshot(123, 'mydrift') * - * // generates a snapshot starting a change set version 3 and including - * // everything more recent than it. - * createSnapshot(123, 'mydrift', {"startVersion": 3}) - * * // generates a snapshot that includes change sets 3 through 5 inclusive. - * createSnapshot(123, 'mydrift', {"startVersion": 3, "endVersion": 5}) - * - * // generates a snaphot that includes everything after the specified - * // timestamp. Note that the timestamp should be specified in milliseconds. - * createSnapshot(123, 'mydrift', {"createdAfter": 1314811734365}) - * - * // generates a snapshot that includes all change sets that were created - * // between the two timestamps. - * createSnapshot(123, 'mydrift', {"createdAfter": 1314811734365, "createdBefore": 9994811734365}) + * createSnapshot(123, 'mydrift', {startVersion: 3, endVersion: 5}) */ -function createSnapshot(rid, cname) { - var config = findDriftConfig(rid, function(c) { return cname.equals(c.name) }); - - var criteria = GenericDriftChangeSetCriteria(); - criteria.addFilterResourceId(rid); - criteria.addFilterDriftConfigurationId(config.id); +function createSnapshot(rid, defName) { + var driftDef = findDriftDefinition(rid, function(d) { return defName.equals(d.name) }); + var snapshotRequest; if (arguments.length > 2) { var filters = arguments[2]; - for (key in filters) { - criteria['addFilter' + key[0].toUpperCase() + key.substring(1)](filters[key]); - } + snapshotRequest = DriftSnapshotRequest(driftDef.id, filters.startVersion, filters.endVersion); + } else { + snapshotRequest = DriftSnapshotRequest(driftDef.id); } - return DriftManager.createSnapshot(criteria); + return DriftManager.getSnapshot(snapshotRequest); } -function findDriftConfig(rid, filter) { +function findDriftDefinition(rid, filter) { var criteria = ResourceCriteria(); criteria.addFilterId(rid); - criteria.fetchDriftConfigurations(true); + criteria.fetchDriftDefinitions(true); var resources = ResourceManager.findResourcesByCriteria(criteria); var resource = resources.get(0); - return find(resource.driftConfigurations, function(config) { - return filter(DriftConfiguration(config)); + return find(resource.driftDefinitions, function(config) { + return filter(DriftDefinition(config)); }); } @@ -111,7 +97,7 @@ function findDriftConfig(rid, filter) { * s2. * * return: This function does not return a useful value. It may be an empty - * string or it could be null. Instead of returns its results, the function + * string or it could be null. Instead of returning its results, the function * prints them to the CLI console. As such, this function is intended for * use from the interactive CLI shell. * @@ -137,8 +123,8 @@ function diff(s1, s2) { } var pathFilter = function(entry) { return entry.path == path; }; - var e1 = find(s1.entries, pathFilter); - var e2 = find(s2.entries, pathFilter); + var e1 = find(s1.driftInstances, pathFilter); + var e2 = find(s2.driftInstances, pathFilter); var fileDiff = DriftManager.generateUnifiedDiff(e1, e2); foreach(fileDiff.diff, println); @@ -190,7 +176,7 @@ function diff(s1, s2) { * $ history.view(1) // returns the full contents of version 1 of the file * $ history.compare(1, 2) // generates and prints a unified diff of versions 1 and 2 */ -function fetchHistory(rid, configName, path) { +function fetchHistory(rid, driftDefName, path) { function History() { var entries = []; @@ -210,7 +196,7 @@ function fetchHistory(rid, configName, path) { var drifts = DriftManager.findDriftsByCriteria(criteria); foreach(drifts, function(drift) { - if (drift.changeSet.driftConfiguration.name == configName && + if (drift.changeSet.driftDefinition.name == driftDefName && drift.path == path) { entries.push(drift); } @@ -234,7 +220,7 @@ function fetchHistory(rid, configName, path) { if (drift == null) { return "Could not find version " + version; } - return DriftManager.getDriftFileBits(drift.newDriftFile.hashId); + return java.lang.String(DriftManager.getDriftFileAsByteArray(drift.newDriftFile.hashId)); } this.compare = function(v1, v2) {

1 0

[rhq] Branch 'release_jon3.x' - modules/enterprise
by John Sanda 29 Nov '11

29 Nov '11

modules/enterprise/remoting/cli/src/main/samples/drift.js | 60 +++++--------- 1 file changed, 23 insertions(+), 37 deletions(-) New commits: commit 6347cab2a33758186d8751d78633cfb9965b2f85 Author: John Sanda <jsanda(a)redhat.com> Date: Tue Nov 29 11:01:13 2011 -0500 [BZ 757958] updating script to work with current APIs diff --git a/modules/enterprise/remoting/cli/src/main/samples/drift.js b/modules/enterprise/remoting/cli/src/main/samples/drift.js index ff7c31a..132d5bf 100644 --- a/modules/enterprise/remoting/cli/src/main/samples/drift.js +++ b/modules/enterprise/remoting/cli/src/main/samples/drift.js @@ -21,7 +21,7 @@ /** * description: Generates a snapshot of changes sets belonging to a particular - * drift configuration of a specific resource. By default all change sets are + * drift definition of a specific resource. By default all change sets are * included in the snapshot. An optional third argument can be specified to * limit or control the number of change sets included in the snapshot. * @@ -32,10 +32,11 @@ * arguments: * rid: A resource id, expected to be an integer * - * cname: The drift configuration name as a string + * defName: The drift definition name as a string * - * filters: (optional) A map or JS object that limits the number of - * change sets included in the snapshot + * filter: (optional) A map or JS object that limits the number of + * change sets included in the snapshot. It should specify two + * properties - startVersion and endVersion. * * return: A org.rhq.core.domamin.drift.DriftSnapshot object * @@ -44,48 +45,33 @@ * // mydrift drift configuration. * createSnapshot(123, 'mydrift') * - * // generates a snapshot starting a change set version 3 and including - * // everything more recent than it. - * createSnapshot(123, 'mydrift', {"startVersion": 3}) - * * // generates a snapshot that includes change sets 3 through 5 inclusive. - * createSnapshot(123, 'mydrift', {"startVersion": 3, "endVersion": 5}) - * - * // generates a snaphot that includes everything after the specified - * // timestamp. Note that the timestamp should be specified in milliseconds. - * createSnapshot(123, 'mydrift', {"createdAfter": 1314811734365}) - * - * // generates a snapshot that includes all change sets that were created - * // between the two timestamps. - * createSnapshot(123, 'mydrift', {"createdAfter": 1314811734365, "createdBefore": 9994811734365}) + * createSnapshot(123, 'mydrift', {startVersion: 3, endVersion: 5}) */ -function createSnapshot(rid, cname) { - var config = findDriftConfig(rid, function(c) { return cname.equals(c.name) }); - - var criteria = GenericDriftChangeSetCriteria(); - criteria.addFilterResourceId(rid); - criteria.addFilterDriftConfigurationId(config.id); +function createSnapshot(rid, defName) { + var driftDef = findDriftDefinition(rid, function(d) { return defName.equals(d.name) }); + var snapshotRequest; if (arguments.length > 2) { var filters = arguments[2]; - for (key in filters) { - criteria['addFilter' + key[0].toUpperCase() + key.substring(1)](filters[key]); - } + snapshotRequest = DriftSnapshotRequest(driftDef.id, filters.startVersion, filters.endVersion); + } else { + snapshotRequest = DriftSnapshotRequest(driftDef.id); } - return DriftManager.createSnapshot(criteria); + return DriftManager.getSnapshot(snapshotRequest); } -function findDriftConfig(rid, filter) { +function findDriftDefinition(rid, filter) { var criteria = ResourceCriteria(); criteria.addFilterId(rid); - criteria.fetchDriftConfigurations(true); + criteria.fetchDriftDefinitions(true); var resources = ResourceManager.findResourcesByCriteria(criteria); var resource = resources.get(0); - return find(resource.driftConfigurations, function(config) { - return filter(DriftConfiguration(config)); + return find(resource.driftDefinitions, function(config) { + return filter(DriftDefinition(config)); }); } @@ -111,7 +97,7 @@ function findDriftConfig(rid, filter) { * s2. * * return: This function does not return a useful value. It may be an empty - * string or it could be null. Instead of returns its results, the function + * string or it could be null. Instead of returning its results, the function * prints them to the CLI console. As such, this function is intended for * use from the interactive CLI shell. * @@ -137,8 +123,8 @@ function diff(s1, s2) { } var pathFilter = function(entry) { return entry.path == path; }; - var e1 = find(s1.entries, pathFilter); - var e2 = find(s2.entries, pathFilter); + var e1 = find(s1.driftInstances, pathFilter); + var e2 = find(s2.driftInstances, pathFilter); var fileDiff = DriftManager.generateUnifiedDiff(e1, e2); foreach(fileDiff.diff, println); @@ -190,7 +176,7 @@ function diff(s1, s2) { * $ history.view(1) // returns the full contents of version 1 of the file * $ history.compare(1, 2) // generates and prints a unified diff of versions 1 and 2 */ -function fetchHistory(rid, configName, path) { +function fetchHistory(rid, driftDefName, path) { function History() { var entries = []; @@ -210,7 +196,7 @@ function fetchHistory(rid, configName, path) { var drifts = DriftManager.findDriftsByCriteria(criteria); foreach(drifts, function(drift) { - if (drift.changeSet.driftConfiguration.name == configName && + if (drift.changeSet.driftDefinition.name == driftDefName && drift.path == path) { entries.push(drift); } @@ -234,7 +220,7 @@ function fetchHistory(rid, configName, path) { if (drift == null) { return "Could not find version " + version; } - return DriftManager.getDriftFileBits(drift.newDriftFile.hashId); + return java.lang.String(DriftManager.getDriftFileAsByteArray(drift.newDriftFile.hashId)); } this.compare = function(v1, v2) {

1 0

[rhq] Branch 'release_jon3.x' - modules/enterprise
by mazz 29 Nov '11

29 Nov '11

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceErrorsView.java | 18 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java | 53 ++++++---- 2 files changed, 50 insertions(+), 21 deletions(-) New commits: commit 2af03f656585a994e8959faca9da0d3d83988c44 Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Nov 14 11:56:16 2011 -0500 [BZ 752893] refresh the resource-errors (yellow triangle) icon after the user deletes one or more resource errors or closes the resource errors modal (https://bugzilla.redhat.com/show_bug.cgi?id=752893) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceErrorsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceErrorsView.java index a2ec59a..977a67b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceErrorsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceErrorsView.java @@ -54,10 +54,16 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHTMLPane; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWindow; public class ResourceErrorsView extends Table<ResourceErrorsDataSource> { + private static final String ERROR_ICON = "[SKIN]/Dialog/warn.png"; - public ResourceErrorsView(String locatorId, String string, Criteria criteria, Object object, String[] strings) { + private ResourceTitleBar titleBar; + + public ResourceErrorsView(String locatorId, Criteria criteria, ResourceTitleBar titleBar) { super(locatorId, MSG.common_title_component_errors(), criteria); + + this.titleBar = titleBar; + setWidth100(); setHeight100(); setShowHeader(false); @@ -144,6 +150,7 @@ public class ResourceErrorsView extends Table<ResourceErrorsDataSource> { for (ListGridRecord record : selection) { resourceErrorIds[i++] = record.getAttributeAsInt(Field.ID); } + GWTServiceLookup.getResourceService().deleteResourceErrors(resourceErrorIds, new AsyncCallback<Void>() { public void onSuccess(Void result) { @@ -162,6 +169,12 @@ public class ResourceErrorsView extends Table<ResourceErrorsDataSource> { }); } + @Override + public void refresh() { + super.refresh(); + this.titleBar.refresh(); + } + private void popupDetails(String details) { final Window winModal = new LocatableWindow(extendLocatorId("errorDetailsWin")); winModal.setTitle(MSG.common_title_component_errors()); @@ -176,9 +189,9 @@ public class ResourceErrorsView extends Table<ResourceErrorsDataSource> { winModal.setCanDragResize(true); winModal.centerInPage(); winModal.addCloseClickHandler(new CloseClickHandler() { - @Override public void onCloseClick(CloseClientEvent event) { winModal.markForDestroy(); + titleBar.refresh(); } }); @@ -190,4 +203,5 @@ public class ResourceErrorsView extends Table<ResourceErrorsDataSource> { winModal.addItem(htmlPane); winModal.show(); } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java index eda0615..49fb719 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java @@ -32,6 +32,8 @@ import com.smartgwt.client.widgets.Img; import com.smartgwt.client.widgets.Window; import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; +import com.smartgwt.client.widgets.events.DoubleClickEvent; +import com.smartgwt.client.widgets.events.DoubleClickHandler; import com.smartgwt.client.widgets.form.DynamicForm; import com.smartgwt.client.widgets.form.fields.SpacerItem; @@ -114,6 +116,11 @@ public class ResourceTitleBar extends LocatableVLayout { this.title.setWidth("*"); this.availabilityImage = new Img(ImageManager.getAvailabilityLargeIcon(null), 24, 24); + this.availabilityImage.addDoubleClickHandler(new DoubleClickHandler() { + public void onDoubleClick(DoubleClickEvent event) { + refresh(); + } + }); this.favoriteButton = new LocatableImg(this.extendLocatorId("Favorite"), NOT_FAV_ICON, 24, 24); @@ -173,22 +180,8 @@ public class ResourceTitleBar extends LocatableVLayout { }); pluginErrors = new Img(PLUGIN_ERRORS_ICON, 24, 24); - pluginErrors.hide(); - GWTServiceLookup.getResourceService().findResourceErrors(resourceComposite.getResource().getId(), - new AsyncCallback<List<ResourceError>>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError( - MSG.dataSource_resourceErrors_error_fetchFailure(String.valueOf(resourceComposite.getResource() - .getId())), caught); - } - - public void onSuccess(List<ResourceError> result) { - if (!result.isEmpty()) { - pluginErrors.show(); - } - markForRedraw(); - } - }); + pluginErrors.setVisible(false); + refreshPluginErrors(); // this is an async call //define tool tip pluginErrors.setPrompt(MSG.view_resource_title_component_errors_tooltip()); @@ -216,9 +209,9 @@ public class ResourceTitleBar extends LocatableVLayout { Resource resource = resourceComposite.getResource(); ResourceErrorsDataSource errors = new ResourceErrorsDataSource(resource.getId()); - ResourceErrorsView errorsGrid = new ResourceErrorsView(extendLocatorId("errors"), MSG - .view_summaryOverview_header_detectedErrors(), null, null, - new String[] { ResourceErrorsDataSource.Field.DETAIL }); + ResourceErrorsView errorsGrid = new ResourceErrorsView(extendLocatorId("errors"), null, + ResourceTitleBar.this); + errorsGrid.setDataSource(errors); form.addMember(errorsGrid); @@ -344,6 +337,27 @@ public class ResourceTitleBar extends LocatableVLayout { return favorites; } + public void refresh() { + refreshPluginErrors(); + } + + private void refreshPluginErrors() { + GWTServiceLookup.getResourceService().findResourceErrors(resourceComposite.getResource().getId(), + new AsyncCallback<List<ResourceError>>() { + public void onFailure(Throwable caught) { + pluginErrors.setVisible(false); + CoreGUI.getErrorHandler().handleError( + MSG.dataSource_resourceErrors_error_fetchFailure(String.valueOf(resourceComposite.getResource() + .getId())), caught); + } + + public void onSuccess(List<ResourceError> result) { + pluginErrors.setVisible(!result.isEmpty()); + markForRedraw(); + } + }); + } + public class UpdateFavoritesCallback implements AsyncCallback<Subject> { public void onSuccess(Subject subject) { String msg = null; @@ -369,4 +383,5 @@ public class ResourceTitleBar extends LocatableVLayout { toggleFavoriteLocally(); } } + } \ No newline at end of file

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits November 2011