September 2011 - rhq-commits - Fedora Mailing-Lists

[rhq] Branch 'release_jon3.0.0_beta1-test-build' - modules/common modules/core modules/enterprise modules/helpers modules/plugins modules/pom.xml modules/test-utils pom.xml

by Simeon Pinder

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 | 8 ++++---- 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/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/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/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/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 +- 119 files changed, 140 insertions(+), 140 deletions(-) New commits: commit 78ede281210fb687150d35f13dbbc844aa703835 Author: Simeon Pinder <spinder(a)redhat.com> Date: Fri Sep 2 17:23:10 2011 -0400 [maven-release-plugin] prepare release RHQ_4_1_1-BETA1 diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 1eb86ef..c7a482f 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index 73ab33a..80e6d65 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 352de33..57fa2b7 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 184c5ad..4c3474f 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index bd88fa0..47c5535 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 9f5f66a..f90deb3 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 5a8b356..4bdd540 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index aa20853..335dff6 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-dbutils</artifactId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 42d28e1..9cd0ba2 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index bb4dc2c..914a15d 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 7d83f3d..a47bf81 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index fc78701..a9876b9 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 5e8397b..8f6a2d8 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index f2953a6..1f1a904 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 62a73be..61c6295 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index dfa5bb8..5d17ff7 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 199a996..aec8050 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -188,9 +188,9 @@ Build-Number=${buildNumber} <property name="jaxb-impl.version" value="${jaxb-impl.version}" /> <property name="jline.version" value="${jline.version}" /> <property name="augeas.version" value="${augeas.version}" /> - <property name="augeas.classifier" value="${augeas.classifier}"/> - <property name="augeas.zip.location" value="${augeas.zip.location}"/> - <property name="augeas.zip.mask" value="${augeas.zip.mask}"/> + <property name="augeas.classifier" value="${augeas.classifier}" /> + <property name="augeas.zip.location" value="${augeas.zip.location}" /> + <property name="augeas.zip.mask" value="${augeas.zip.mask}" /> <property name="augeas.zip.version" value="${augeas.zip.version}" /> </ant> </tasks> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 8b7ffe8..485a79e 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index d96cf83..71bac05 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-script-bindings</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 f424704..a895109 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 cebd439..23b19cb 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 b66da2c..80b21bb 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 db7d757..9eb9c9c 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index de77f3f..9cd93ba 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 900d476..8fdc07e 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 8e8cf66..3e0b1c7 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 4e2ac9f..286b89b 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 01fb7f6..da9d486 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 24fbb60..01c9861 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 1a1c88c..ada9309 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 3fe07b7..5da2901 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index f4b1866..265fcfa 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index dee43bc..02ce1cc 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 c57eaba..15a32c1 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 1aebae1..c7a52f0 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 42cc43c..e054d7f 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 8cdaf8b..68eeb76 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index d2f2bc5..8e783e0 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 b380393..7cbd947 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 e1e1890..3e2d017 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 1b609e1..ab8d837 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 1a27831..5b8e1bd 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 ab68d6b..44da984 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 0adccaf..02fcb76 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 2c9bcfa..9eb3e7c 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 06bab65..021dc8a 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 3763c54..03b1aeb 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 bb595b5..e566893 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 c4e59b2..37c3b3b 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 381f64c..019ae28 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 403ef41..95f29fa 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 9c9d3b6..b287def 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 ad1c570..2dfde0e 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 0d2bf4b..c9beef5 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>groovy-script-server-plugin</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 dacaec2..6701d43 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 9a51242..5168456 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 f73ecb8..64b3881 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 c2d5c7e..8ef3970 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 3fa05d3..91cdcf6 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 04df0b8..226e1dd 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 79ccf2b..a657f95 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 9e221a0..455279f 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 ce8468c..3b9f1ef 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 05cb339..434fa4d 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 00344d4..9be1e89 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 2377858..1f928c1 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 90c0da6..ebbe06a 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index 9e80f1f..b5f2ebb 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <build> <plugins> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index e488bb0..4716515 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 0c73fd3..da93cb6 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 417a3df..9a7a0c6 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index d983b6a..55c5e77 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index ff8c753..b0ebced 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index e68547f..dce6465 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index ff7d21f..4590fc3 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 46bcb55..fce9e17 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index 78156f3..6654e15 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 5f2c454..cad565d 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 6c1812b..2c63916 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index c1e0a3d..a6f0084 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index d197727..985b44d 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index 840e619..4ba3845 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index e482d30..92e17a4 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 0c7ec29..ec7cd5c 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index b097071..edd4a4d 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 2cdc32a..f2b629b 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index edf12ea..044280b 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 6ec0096..d135fa0 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 ca63c5e..408e30c 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 57c8bb3..c9dbafa 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 1a3a1df..d0d137a 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index ae06793..152d019 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 1daf86d..44cd378 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index dc87ed7..9ccd94e 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index 3a6deaa..901f34c 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index d8ebb5d..8c0b60d 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index f1675e4..6f49a19 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 8a3b3c0..aaca2d2 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 6b0791d..f19c719 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 63dd974..c4d6307 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 99f36d0..90a262f 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index f32159e..68814d8 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 2a0eb28..e279435 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index 365f6c4..91e7108 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 60471c2..ac71a33 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index e88b97f..e6cbd4d 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 90337ed..242ba92 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index d31afb9..f9041bb 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 2cf689c..ec6ca02 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 05ed401..ba8606f 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 3a1df45..a56949b 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 9429831..1aae074 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index f6dfebd..6921318 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 50ff9b6..a6f6f6b 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 6565a7b..e5fcd01 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 8700a19..3e56790 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 2b45c62..e90b1d9 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 5c6e85c..a34707c 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index ab342f5..6512559 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <packaging>pom</packaging> <name>RHQ</name>

12 years, 9 months

1
0
0 / 0

[rhq] Branch 'drift' - 5 commits - modules/core modules/enterprise

by Jay Shaughnessy

modules/core/client-api/src/main/resources/rhq-plugin.xsd | 19 + modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml | 2 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftChangeSet.java | 22 + modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfiguration.java | 35 ++- modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationComparator.java | 6 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java | 115 ++++++---- modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADriftChangeSet.java | 16 + modules/core/domain/src/main/java/org/rhq/core/domain/drift/dto/DriftChangeSetDTO.java | 13 + modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftConfigurationTest.java | 38 ++- modules/core/domain/src/test/java/org/rhq/core/domain/drift/SnapshotTest.java | 13 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java | 35 +++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java | 15 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerLocal.java | 4 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java | 10 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftChangeSetSummary.java | 11 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/MongoDBDriftServer.java | 3 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/entities/MongoDBChangeSet.java | 13 + 23 files changed, 315 insertions(+), 80 deletions(-) New commits: commit e826430412bf5856edf425906162daccbd843d57 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Sep 2 16:59:59 2011 -0400 comment out some debug messaging that leaked into a previous commit. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java index 6a07ee4..792517c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java @@ -50,8 +50,6 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; -import org.rhq.enterprise.gui.coregui.client.util.message.Message; -import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; /** * This doesn't extend RPCDataSource because it is tree-oriented and behaves differently than normal list data sources @@ -186,47 +184,47 @@ public class ResourceTreeDatasource extends DataSource { */ public static TreeNode[] buildNodes(List<Resource> resources, List<Resource> lockedData) { List<ResourceTreeNode> resourceNodes = new ArrayList<ResourceTreeNode>(resources.size()); - boolean nullFound = false; + // boolean nullFound = false; for (Resource resource : resources) { - if (null != resource.getParentResource() && null == resource.getParentResource().getName()) { - CoreGUI.getMessageCenter().notify( - new Message(" *** Null parent name for " + resource + " parent " + resource.getParentResource(), - Severity.Info)); - nullFound = true; - } + // if (null != resource.getParentResource() && null == resource.getParentResource().getName()) { + // CoreGUI.getMessageCenter().notify( + // new Message(" *** Null parent name for " + resource + " parent " + resource.getParentResource(), + // Severity.Info)); + // nullFound = true; + // } ResourceTreeNode node = new ResourceTreeNode(resource, lockedData.contains(resource)); resourceNodes.add(node); } - if (!nullFound) { - CoreGUI.getMessageCenter().notify(new Message(" *** No Null parent names found", Severity.Info)); - } + // if (!nullFound) { + // CoreGUI.getMessageCenter().notify(new Message(" *** No Null parent names found", Severity.Info)); + // } List<TreeNode> result = introduceTypeAndCategoryNodes(resourceNodes); - nullFound = false; - for (TreeNode node : result) { - if (node instanceof ResourceTreeNode) { - ResourceTreeNode rtNode = (ResourceTreeNode) node; - if (null != rtNode.getResource().getParentResource() - && null == rtNode.getResource().getParentResource().getName()) { - CoreGUI.getMessageCenter().notify( - new Message(" *** Null parent name for resource tree node " + rtNode.getResource() + " parent " - + rtNode.getResource(), Severity.Info)); - nullFound = true; - } - } else if (node instanceof AutoGroupTreeNode) { - AutoGroupTreeNode rtNode = (AutoGroupTreeNode) node; - if (null == rtNode.getParentResource().getName()) { - CoreGUI.getMessageCenter().notify( - new Message(" *** Null parent name for autogroup tree node " + rtNode.getParentResource(), - Severity.Info)); - nullFound = true; - } - } - } - if (!nullFound) { - CoreGUI.getMessageCenter().notify(new Message(" *** No Null tree node parent names found", Severity.Info)); - } + // nullFound = false; + // for (TreeNode node : result) { + // if (node instanceof ResourceTreeNode) { + // ResourceTreeNode rtNode = (ResourceTreeNode) node; + // if (null != rtNode.getResource().getParentResource() + // && null == rtNode.getResource().getParentResource().getName()) { + // CoreGUI.getMessageCenter().notify( + // new Message(" *** Null parent name for resource tree node " + rtNode.getResource() + " parent " + // + rtNode.getResource(), Severity.Info)); + // nullFound = true; + // } + // } else if (node instanceof AutoGroupTreeNode) { + // AutoGroupTreeNode rtNode = (AutoGroupTreeNode) node; + // if (null == rtNode.getParentResource().getName()) { + // CoreGUI.getMessageCenter().notify( + // new Message(" *** Null parent name for autogroup tree node " + rtNode.getParentResource(), + // Severity.Info)); + // nullFound = true; + // } + // } + // } + // if (!nullFound) { + // CoreGUI.getMessageCenter().notify(new Message(" *** No Null tree node parent names found", Severity.Info)); + // } return result.toArray(new TreeNode[result.size()]); } commit d1151c6be3055c96d9d97b472e848f84113d691e Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Sep 2 16:53:26 2011 -0400 Update Mongo plugin with drift handling mode support (still has TODOs) diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftChangeSet.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftChangeSet.java index 5c8fdb5..5ad5796 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftChangeSet.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftChangeSet.java @@ -114,9 +114,9 @@ public interface DriftChangeSet<D extends Drift<?, ?>> { * value set on the owning drift configuration can change, the value must be stored with * the change set such that it can be applied consistently when handling the associated drift. * - * @param mode The {@link DriftConfiguration.DriftHandlingMode} mode + * @param driftHandlingMode The {@link DriftConfiguration.DriftHandlingMode} mode */ - void setDriftHandlingMode(DriftHandlingMode mode); + void setDriftHandlingMode(DriftHandlingMode driftHandlingMode); /** * Returns the id of the owning drift configuration. Note that while server plugins are diff --git a/modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/MongoDBDriftServer.java b/modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/MongoDBDriftServer.java index 644ee60..6c51441 100644 --- a/modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/MongoDBDriftServer.java +++ b/modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/MongoDBDriftServer.java @@ -52,6 +52,7 @@ import org.rhq.core.domain.drift.DriftChangeSetCategory; import org.rhq.core.domain.drift.DriftComposite; import org.rhq.core.domain.drift.DriftFile; import org.rhq.core.domain.drift.DriftSnapshot; +import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode; import org.rhq.core.domain.drift.dto.DriftChangeSetDTO; import org.rhq.core.domain.drift.dto.DriftDTO; import org.rhq.core.domain.drift.dto.DriftFileDTO; @@ -119,6 +120,8 @@ public class MongoDBDriftServer implements DriftServerPluginFacet, ServerPluginC changeSet.setResourceId(resourceId); // TODO Figure out how best to handle drift config reference changeSet.setDriftConfigurationId(1); + // TODO Figure out how best to handle drift config drift handling mode + changeSet.setDriftHandlingMode(DriftHandlingMode.normal); changeSet.setVersion(changeSetVersions++); summary.setCategory(headers.getType()); diff --git a/modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/entities/MongoDBChangeSet.java b/modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/entities/MongoDBChangeSet.java index 61fdad0..0bdd2fd 100644 --- a/modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/entities/MongoDBChangeSet.java +++ b/modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/entities/MongoDBChangeSet.java @@ -31,6 +31,7 @@ import org.bson.types.ObjectId; import org.rhq.core.domain.drift.DriftChangeSet; import org.rhq.core.domain.drift.DriftChangeSetCategory; +import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode; /** * A change set that is stored in a MongoDB database. The change set along with its entries @@ -62,6 +63,8 @@ public class MongoDBChangeSet implements DriftChangeSet<MongoDBChangeSetEntry>, private int configId; + private DriftHandlingMode driftHandlingMode; + private int resourceId; @Embedded("files") @@ -121,6 +124,16 @@ public class MongoDBChangeSet implements DriftChangeSet<MongoDBChangeSetEntry>, } @Override + public DriftHandlingMode getDriftHandlingMode() { + return this.driftHandlingMode; + } + + @Override + public void setDriftHandlingMode(DriftHandlingMode driftHandlingMode) { + this.driftHandlingMode = driftHandlingMode; + } + + @Override public int getResourceId() { return resourceId; } commit 2142f792ace3b914fc53b17019bac2ee9dd76132 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Sep 2 16:42:34 2011 -0400 Change instances of History.newItem to be CoreGUI.goToView to ensure all necessary view processing takes place. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java index ab8491c..530f77a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java @@ -24,7 +24,6 @@ package org.rhq.enterprise.gui.coregui.client.bundle.tree; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.RunAsyncCallback; -import com.google.gwt.user.client.History; import com.smartgwt.client.types.SelectionStyle; import com.smartgwt.client.widgets.grid.events.DataArrivedEvent; import com.smartgwt.client.widgets.grid.events.DataArrivedHandler; @@ -33,6 +32,7 @@ import com.smartgwt.client.widgets.tree.TreeNode; import com.smartgwt.client.widgets.tree.events.NodeClickEvent; import com.smartgwt.client.widgets.tree.events.NodeClickHandler; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.ViewId; import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTreeGrid; @@ -65,7 +65,7 @@ public class BundleTreeView extends LocatableTreeGrid { public void onNodeClick(NodeClickEvent event) { TreeNode node = event.getNode(); String path = node.getAttribute("id").replaceAll("_", "/"); - History.newItem("Bundles/Bundle/" + path); + CoreGUI.goToView("Bundles/Bundle/" + path); } }); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java index 2ccfb53..e662347 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java @@ -23,7 +23,6 @@ package org.rhq.enterprise.gui.coregui.client.components.table; import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.History; import com.smartgwt.client.data.Criteria; import com.smartgwt.client.data.SortSpecifier; import com.smartgwt.client.types.AnimationEffect; @@ -39,6 +38,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord; import com.smartgwt.client.widgets.layout.VLayout; import org.rhq.enterprise.gui.coregui.client.BookmarkableView; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.DetailsView; import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton; @@ -248,7 +248,7 @@ public abstract class AbstractTableSection<DS extends RPCDataSource, ID> extends * @see #showDetails(ListGridRecord) */ public void newDetails() { - History.newItem(basePath + "/0"); // assumes the subclasses will understand "0" means "new details page" + CoreGUI.goToView(basePath + "/0"); // assumes the subclasses will understand "0" means "new details page" } /** diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java index 3eb65c5..3eea53e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java @@ -19,7 +19,6 @@ package org.rhq.enterprise.gui.coregui.client.components.table; -import com.google.gwt.user.client.History; import com.smartgwt.client.data.Criteria; import com.smartgwt.client.data.SortSpecifier; import com.smartgwt.client.widgets.Canvas; @@ -87,7 +86,7 @@ public abstract class TableSection<DS extends RPCDataSource> extends AbstractTab @Override public void showDetails(Integer id) { if (id != null && id.intValue() > 0) { - History.newItem(getBasePath() + "/" + id); + CoreGUI.goToView(getBasePath() + "/" + id); } else { String msg = MSG.view_tableSection_error_badId(this.getClass().toString(), (id == null) ? "null" : id .toString()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeView.java index 79b1162..fac5b79 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeView.java @@ -24,12 +24,12 @@ package org.rhq.enterprise.gui.coregui.client.content.repository.tree; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.RunAsyncCallback; -import com.google.gwt.user.client.History; import com.smartgwt.client.types.SelectionStyle; import com.smartgwt.client.widgets.tree.TreeNode; import com.smartgwt.client.widgets.tree.events.NodeClickEvent; import com.smartgwt.client.widgets.tree.events.NodeClickHandler; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.ViewId; import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTreeGrid; @@ -59,7 +59,7 @@ public class ContentRepositoryTreeView extends LocatableTreeGrid { addNodeClickHandler(new NodeClickHandler() { public void onNodeClick(NodeClickEvent event) { String path = event.getNode().getAttribute("id").replaceAll(":", "/"); - History.newItem("Bundles/Repository/" + path); + CoreGUI.goToView("Bundles/Repository/" + path); } }); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java index 08128de..e286590 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java @@ -205,7 +205,7 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm if (recalc) { recalculate(dynaGroupChildrenView, newGroupDefinition.getId()); } - History.newItem(basePath + "/" + newGroupDefinition.getId()); + CoreGUI.goToView(basePath + "/" + newGroupDefinition.getId()); } } else { dynaGroupChildrenView.refresh(); commit 2c99b6f0b2139ba0a19ed43b6b5b932d6e427b52 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Sep 2 16:41:45 2011 -0400 Planned Drift Support - DriftConfigurationDefinition work - update DriftConfigurationDefinition and the drift xsd to include DriftHandlingMode property (normal | plannedChanges) - update DriftChangeSet (and JPA impl) to persist its driftHandlingMode - update dbsetup as needed (dbupgrade work pending) - update DriftConfigurationTest to include tests for the new property - update DriftConfigurationComparator as well - update DriftChangeSetSummary to hold the handling mode and don't notify alerting in planned changes mode. diff --git a/modules/core/client-api/src/main/resources/rhq-plugin.xsd b/modules/core/client-api/src/main/resources/rhq-plugin.xsd index e02013a..08e2a90 100644 --- a/modules/core/client-api/src/main/resources/rhq-plugin.xsd +++ b/modules/core/client-api/src/main/resources/rhq-plugin.xsd @@ -592,6 +592,25 @@ </xs:documentation> </xs:annotation> </xs:element> + <xs:element name="driftHandlingMode" minOccurs="0" maxOccurs="1" default="normal"> + <xs:annotation> + <xs:documentation> + Specifies the way in which drift occurrences will be handled when reported. Normal + handling implies the reported drift is unexpected and as such can trigger alerts, + will be present in recent drift reports, etc. Setting to "Planned Changes" implies + that the reported drift is happening at a time when drift is expected due to + planned changes in the monitored environment, such as an application deployment, a + configuration change, or something similar. With this setting drift is only reported + for inspection, in the drift history view. + </xs:documentation> + </xs:annotation> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="normal"/> + <xs:enumeration value="plannedChange"/> + </xs:restriction> + </xs:simpleType> + </xs:element> <xs:element name="includes" type="rhq:DriftIncludes" minOccurs="0" maxOccurs="1"> <xs:annotation> <xs:documentation> diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftChangeSet.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftChangeSet.java index 33a78ec..5c8fdb5 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftChangeSet.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftChangeSet.java @@ -20,7 +20,7 @@ package org.rhq.core.domain.drift; import java.util.Set; -import org.rhq.core.domain.drift.DriftConfiguration.Mode; +import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode; /** * A DriftChangeSet is somewhat similar to a commit in version control systems. It contains @@ -99,24 +99,24 @@ public interface DriftChangeSet<D extends Drift<?, ?>> { void setCategory(DriftChangeSetCategory category); /** - * Returns the mode of the owning drift configuration at the time of change set creation. - * Because the value set on the owning drift configuration can change, the value must be - * stored with the change set such that it can be applied consistently when handling the - * associated drift. + * Returns the drift handling mode of the owning drift configuration at the time of change + * set creation. Because the value set on the owning drift configuration can change, the + * value must be stored with the change set such that it can be applied consistently when + * handling the associated drift. * - * @return The {@link DriftConfiguration.Mode} mode + * @return The {@link DriftConfiguration.DriftHandlingMode} mode */ - DriftConfiguration.Mode getDriftConfigurationMode(); + DriftHandlingMode getDriftHandlingMode(); /** - * Sets the drift configuration mode for the change set. It should be set to the owning drift - * configuration mode at the time of change set creation. Because the value set on the owning - * drift configuration can change, the value must be stored with the change set such that it - * can be applied consistently when handling the associated drift. + * Sets the drift handling mode for the change set. It should be set to the owning drift + * configuration's drift handling mode at the time of change set creation. Because the + * value set on the owning drift configuration can change, the value must be stored with + * the change set such that it can be applied consistently when handling the associated drift. * - * @param mode The {@link DriftConfiguration.Mode} mode + * @param mode The {@link DriftConfiguration.DriftHandlingMode} mode */ - void setDriftConfigurationMode(Mode mode); + void setDriftHandlingMode(DriftHandlingMode mode); /** * Returns the id of the owning drift configuration. Note that while server plugins are diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfiguration.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfiguration.java index 40e0403..244b9c0 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfiguration.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfiguration.java @@ -45,6 +45,7 @@ import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.drift.DriftConfigurationDefinition.BaseDirValueContext; +import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode; import org.rhq.core.domain.resource.Resource; /** @@ -82,7 +83,7 @@ public class DriftConfiguration implements Serializable { @Column(name = "MODE", nullable = false) @Enumerated(EnumType.STRING) - private Mode mode; + private DriftHandlingMode driftHandlingMode; // unit = millis @Column(name = "INTERVAL", nullable = false) @@ -151,12 +152,17 @@ public class DriftConfiguration implements Serializable { this.setEnabledProperty(isEnabled); } - public Mode getMode() { - return mode; + public DriftHandlingMode getDriftHandlingMode() { + return driftHandlingMode; } - public void setMode(Mode mode) { - this.mode = mode; + public void setDriftHandlingMode(DriftHandlingMode driftHandlingMode) { + if (null == driftHandlingMode) { + driftHandlingMode = DriftConfigurationDefinition.DEFAULT_DRIFT_HANDLING_MODE; + } + + this.driftHandlingMode = driftHandlingMode; + this.setDriftHandlingModeProperty(driftHandlingMode); } public long getInterval() { @@ -185,6 +191,7 @@ public class DriftConfiguration implements Serializable { this.name = this.getNameProperty(); this.isEnabled = this.getIsEnabledProperty(); this.interval = this.getIntervalProperty(); + this.driftHandlingMode = this.getDriftHandlingModeProperty(); } public Resource getResource() { @@ -341,6 +348,16 @@ public class DriftConfiguration implements Serializable { configuration.put(new PropertySimple(DriftConfigurationDefinition.PROP_INTERVAL, interval.toString())); } + private DriftHandlingMode getDriftHandlingModeProperty() { + return DriftHandlingMode.valueOf(configuration.getSimpleValue( + DriftConfigurationDefinition.PROP_DRIFT_HANDLING_MODE, + DriftConfigurationDefinition.DEFAULT_DRIFT_HANDLING_MODE.name())); + } + + private void setDriftHandlingModeProperty(DriftHandlingMode mode) { + configuration.put(new PropertySimple(DriftConfigurationDefinition.PROP_DRIFT_HANDLING_MODE, mode.name())); + } + private boolean getIsEnabledProperty() { return configuration.getSimpleValue(DriftConfigurationDefinition.PROP_ENABLED, String.valueOf(DriftConfigurationDefinition.DEFAULT_ENABLED)).equals("true"); @@ -401,12 +418,4 @@ public class DriftConfiguration implements Serializable { return filters; } - - // Drift Handling Mode - public enum Mode { - // alerting, included in recent drift reporting - NORMAL, - // no alerting, not included in recent drift reporting, flagged in UI as planned - PLANNED_CHANGES - } } diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationComparator.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationComparator.java index 75098c8..d530ab4 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationComparator.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationComparator.java @@ -33,7 +33,7 @@ public class DriftConfigurationComparator implements Comparator<DriftConfigurati public enum CompareMode { /** - * The comparator will only check the base information: name, enabled, interval. + * The comparator will only check the base information: name, enabled, interval, driftHandlingMode * The basedir/includes-excludes filters will be ignored. */ ONLY_BASE_INFO, @@ -77,6 +77,10 @@ public class DriftConfigurationComparator implements Comparator<DriftConfigurati return dc1.getInterval() < dc2.getInterval() ? -1 : 1; } + if (dc1.getDriftHandlingMode() != dc2.getDriftHandlingMode()) { + return dc1.getDriftHandlingMode().ordinal() < dc2.getDriftHandlingMode().ordinal() ? -1 : 1; + } + if (dc1.isEnabled() != dc2.isEnabled()) { return dc1.isEnabled() ? 1 : -1; // so false sorts before true, seems logical to me } diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java index e669a9a..70c3c84 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java @@ -50,6 +50,7 @@ public class DriftConfigurationDefinition implements Serializable { public static final String PROP_BASEDIR_VALUECONTEXT = "valueContext"; public static final String PROP_BASEDIR_VALUENAME = "valueName"; public static final String PROP_INTERVAL = "interval"; + public static final String PROP_DRIFT_HANDLING_MODE = "driftHandlingMode"; public static final String PROP_INCLUDES = "includes"; public static final String PROP_INCLUDES_INCLUDE = "include"; public static final String PROP_EXCLUDES = "excludes"; @@ -64,6 +65,7 @@ public class DriftConfigurationDefinition implements Serializable { public static final boolean DEFAULT_ENABLED = true; public static final long DEFAULT_INTERVAL = 1800L; + public static final DriftHandlingMode DEFAULT_DRIFT_HANDLING_MODE = DriftHandlingMode.normal; /** * The basedir property is specified in two parts - a "context" and a "name". Taken together @@ -77,6 +79,13 @@ public class DriftConfigurationDefinition implements Serializable { pluginConfiguration, resourceConfiguration, measurementTrait, fileSystem } + /** + * The enumerated values for drift handling mode property + */ + public enum DriftHandlingMode { + normal, plannedChanges + } + private static final ConfigurationDefinition INSTANCE = new ConfigurationDefinition("GLOBAL_DRIFT_CONFIG_DEF", "The drift configuration definition"); @@ -112,24 +121,23 @@ public class DriftConfigurationDefinition implements Serializable { } static { - //INSTANCE.setId(1); INSTANCE.setConfigurationFormat(ConfigurationFormat.STRUCTURED); INSTANCE.put(createName(INSTANCE, false)); INSTANCE.put(createEnabled(INSTANCE)); - INSTANCE.put(createBasedir(INSTANCE, false)); + INSTANCE.put(createDriftHandlingMode(INSTANCE)); INSTANCE.put(createInterval(INSTANCE)); + INSTANCE.put(createBasedir(INSTANCE, false)); INSTANCE.put(createIncludes(INSTANCE, false)); INSTANCE.put(createExcludes(INSTANCE, false)); - //INSTANCE_FOR_EXISTING_CONFIGS.setId(1); INSTANCE_FOR_EXISTING_CONFIGS.setConfigurationFormat(ConfigurationFormat.STRUCTURED); INSTANCE_FOR_EXISTING_CONFIGS.put(createName(INSTANCE_FOR_EXISTING_CONFIGS, true)); INSTANCE_FOR_EXISTING_CONFIGS.put(createEnabled(INSTANCE_FOR_EXISTING_CONFIGS)); - INSTANCE_FOR_EXISTING_CONFIGS.put(createBasedir(INSTANCE_FOR_EXISTING_CONFIGS, true)); + INSTANCE_FOR_EXISTING_CONFIGS.put(createDriftHandlingMode(INSTANCE_FOR_EXISTING_CONFIGS)); INSTANCE_FOR_EXISTING_CONFIGS.put(createInterval(INSTANCE_FOR_EXISTING_CONFIGS)); + INSTANCE_FOR_EXISTING_CONFIGS.put(createBasedir(INSTANCE_FOR_EXISTING_CONFIGS, true)); INSTANCE_FOR_EXISTING_CONFIGS.put(createIncludes(INSTANCE_FOR_EXISTING_CONFIGS, true)); INSTANCE_FOR_EXISTING_CONFIGS.put(createExcludes(INSTANCE_FOR_EXISTING_CONFIGS, true)); - } private static PropertyDefinitionSimple createName(ConfigurationDefinition configDef, boolean readOnly) { @@ -139,7 +147,6 @@ public class DriftConfigurationDefinition implements Serializable { PropertySimpleType type = PropertySimpleType.STRING; PropertyDefinitionSimple pd = new PropertyDefinitionSimple(name, description, required, type); - //pd.setId(1); pd.setDisplayName("Drift Configuration Name"); pd.setReadOnly(readOnly); pd.setSummary(true); @@ -161,7 +168,6 @@ public class DriftConfigurationDefinition implements Serializable { PropertySimpleType type = PropertySimpleType.BOOLEAN; PropertyDefinitionSimple pd = new PropertyDefinitionSimple(name, description, required, type); - //pd.setId(2); pd.setDisplayName("Enabled"); pd.setReadOnly(false); pd.setSummary(true); @@ -172,6 +178,60 @@ public class DriftConfigurationDefinition implements Serializable { return pd; } + private static PropertyDefinitionSimple createDriftHandlingMode(ConfigurationDefinition configDef) { + String name = PROP_DRIFT_HANDLING_MODE; + String description = "" // + + "Specifies the way in which drift occurrences will be handled when reported. Normal " // + + "handling implies the reported drift is unexpected and as such can trigger alerts, " // + + "will be present in recent drift reports, etc. Setting to 'Planned Changes' implies " // + + "that the reported drift is happening at a time when drift is expected due to " // + + "planned changes in the monitored environment, such as an application deployment, a " // + + "configuration change, or something similar. With this setting drift is only reported " // + + " for inspection, in the drift history view."; + boolean required = true; + PropertySimpleType type = PropertySimpleType.STRING; + + PropertyDefinitionSimple pd = new PropertyDefinitionSimple(name, description, required, type); + pd.setDisplayName("Drift Handling Mode"); + pd.setReadOnly(false); + pd.setSummary(true); + pd.setOrder(2); + pd.setConfigurationDefinition(configDef); + + PropertyDefinitionEnumeration normalEnum = new PropertyDefinitionEnumeration(DriftHandlingMode.normal.name(), + DriftHandlingMode.normal.name()); + normalEnum.setOrderIndex(0); + + PropertyDefinitionEnumeration plannedEnum = new PropertyDefinitionEnumeration(DriftHandlingMode.plannedChanges + .name(), DriftHandlingMode.plannedChanges.name()); + plannedEnum.setOrderIndex(1); + + ArrayList<PropertyDefinitionEnumeration> pdEnums = new ArrayList<PropertyDefinitionEnumeration>(2); + pdEnums.add(normalEnum); + pdEnums.add(plannedEnum); + pd.setEnumeratedValues(pdEnums, false); + pd.setDefaultValue(DEFAULT_DRIFT_HANDLING_MODE.name()); + + return pd; + } + + private static PropertyDefinitionSimple createInterval(ConfigurationDefinition configDef) { + String name = PROP_INTERVAL; + String description = "The frequency in seconds in which drift monitoring should run. Defaults to 1800 seconds (i.e. 30 minutes)"; + boolean required = false; + PropertySimpleType type = PropertySimpleType.LONG; + + PropertyDefinitionSimple pd = new PropertyDefinitionSimple(name, description, required, type); + pd.setDisplayName("Interval"); + pd.setReadOnly(false); + pd.setSummary(true); + pd.setOrder(3); + pd.setAllowCustomEnumeratedValue(false); + pd.setConfigurationDefinition(configDef); + pd.setDefaultValue(String.valueOf(DEFAULT_INTERVAL)); + return pd; + } + private static PropertyDefinitionMap createBasedir(ConfigurationDefinition configDef, boolean readOnly) { String name = PROP_BASEDIR; String description = "The root directory from which snapshots will be generated during drift monitoring."; @@ -181,11 +241,10 @@ public class DriftConfigurationDefinition implements Serializable { PropertyDefinitionSimple valueName = createBasedirValueName(readOnly); PropertyDefinitionMap pd = new PropertyDefinitionMap(name, description, required, valueContext, valueName); - //pd.setId(3); pd.setDisplayName("Base Directory"); pd.setReadOnly(readOnly); pd.setSummary(true); - pd.setOrder(2); + pd.setOrder(4); pd.setConfigurationDefinition(configDef); return pd; @@ -198,7 +257,6 @@ public class DriftConfigurationDefinition implements Serializable { PropertySimpleType type = PropertySimpleType.STRING; PropertyDefinitionSimple pd = new PropertyDefinitionSimple(name, description, required, type); - //pd.setId(4); pd.setDisplayName("Value Context"); pd.setReadOnly(readOnly); pd.setSummary(true); @@ -206,22 +264,18 @@ public class DriftConfigurationDefinition implements Serializable { PropertyDefinitionEnumeration pcEnum = new PropertyDefinitionEnumeration( BaseDirValueContext.pluginConfiguration.name(), BaseDirValueContext.pluginConfiguration.name()); - //pcEnum.setId(1); pcEnum.setOrderIndex(0); PropertyDefinitionEnumeration rcEnum = new PropertyDefinitionEnumeration( BaseDirValueContext.resourceConfiguration.name(), BaseDirValueContext.resourceConfiguration.name()); - //rcEnum.setId(2); rcEnum.setOrderIndex(1); PropertyDefinitionEnumeration mtEnum = new PropertyDefinitionEnumeration(BaseDirValueContext.measurementTrait .name(), BaseDirValueContext.measurementTrait.name()); - //mtEnum.setId(3); mtEnum.setOrderIndex(2); PropertyDefinitionEnumeration fsEnum = new PropertyDefinitionEnumeration(BaseDirValueContext.fileSystem.name(), BaseDirValueContext.fileSystem.name()); - //fsEnum.setId(4); fsEnum.setOrderIndex(3); ArrayList<PropertyDefinitionEnumeration> pdEnums = new ArrayList<PropertyDefinitionEnumeration>(4); @@ -236,12 +290,11 @@ public class DriftConfigurationDefinition implements Serializable { private static PropertyDefinitionSimple createBasedirValueName(boolean readOnly) { String name = PROP_BASEDIR_VALUENAME; - String description = "The name of the value as found in the context"; + String description = "The name of the value as found in the context."; boolean required = true; PropertySimpleType type = PropertySimpleType.STRING; PropertyDefinitionSimple pd = new PropertyDefinitionSimple(name, description, required, type); - //pd.setId(5); pd.setDisplayName("Value Name"); pd.setReadOnly(readOnly); pd.setSummary(true); @@ -250,24 +303,6 @@ public class DriftConfigurationDefinition implements Serializable { return pd; } - private static PropertyDefinitionSimple createInterval(ConfigurationDefinition configDef) { - String name = PROP_INTERVAL; - String description = "The frequency in seconds in which drift monitoring should run. Defaults to 1800 seconds (i.e. 30 minutes)"; - boolean required = false; - PropertySimpleType type = PropertySimpleType.LONG; - - PropertyDefinitionSimple pd = new PropertyDefinitionSimple(name, description, required, type); - //pd.setId(6); - pd.setDisplayName("Interval"); - pd.setReadOnly(false); - pd.setSummary(true); - pd.setOrder(3); - pd.setAllowCustomEnumeratedValue(false); - pd.setConfigurationDefinition(configDef); - pd.setDefaultValue(String.valueOf(DEFAULT_INTERVAL)); - return pd; - } - private static PropertyDefinitionList createIncludes(ConfigurationDefinition configDef, boolean readOnly) { String name = PROP_INCLUDES; String description = "A set of patterns that specify files and/or directories to include."; @@ -276,11 +311,10 @@ public class DriftConfigurationDefinition implements Serializable { PropertyDefinitionMap map = createInclude(readOnly); PropertyDefinitionList pd = new PropertyDefinitionList(name, description, required, map); - //pd.setId(7); pd.setDisplayName("Includes"); pd.setReadOnly(readOnly); pd.setSummary(true); - pd.setOrder(4); + pd.setOrder(5); pd.setConfigurationDefinition(configDef); return pd; } @@ -294,7 +328,6 @@ public class DriftConfigurationDefinition implements Serializable { PropertyDefinitionSimple pattern = createIncludePattern(readOnly); PropertyDefinitionMap pd = new PropertyDefinitionMap(name, description, required, path, pattern); - //pd.setId(8); pd.setDisplayName("Include"); pd.setReadOnly(readOnly); pd.setSummary(true); @@ -309,7 +342,6 @@ public class DriftConfigurationDefinition implements Serializable { PropertySimpleType type = PropertySimpleType.STRING; PropertyDefinitionSimple pd = new PropertyDefinitionSimple(name, description, required, type); - //pd.setId(9); pd.setDisplayName("Path"); pd.setReadOnly(readOnly); pd.setSummary(true); @@ -325,7 +357,6 @@ public class DriftConfigurationDefinition implements Serializable { PropertySimpleType type = PropertySimpleType.STRING; PropertyDefinitionSimple pd = new PropertyDefinitionSimple(name, description, required, type); - //pd.setId(10); pd.setDisplayName("Pattern"); pd.setReadOnly(readOnly); pd.setSummary(true); @@ -342,11 +373,10 @@ public class DriftConfigurationDefinition implements Serializable { PropertyDefinitionMap map = createExclude(readOnly); PropertyDefinitionList pd = new PropertyDefinitionList(name, description, required, map); - //pd.setId(11); pd.setDisplayName("Excludes"); pd.setReadOnly(readOnly); pd.setSummary(true); - pd.setOrder(5); + pd.setOrder(6); pd.setConfigurationDefinition(configDef); return pd; } @@ -360,7 +390,6 @@ public class DriftConfigurationDefinition implements Serializable { PropertyDefinitionSimple pattern = createExcludePattern(readOnly); PropertyDefinitionMap pd = new PropertyDefinitionMap(name, description, required, path, pattern); - //pd.setId(12); pd.setDisplayName("Exclude"); pd.setReadOnly(readOnly); pd.setSummary(true); @@ -375,7 +404,6 @@ public class DriftConfigurationDefinition implements Serializable { PropertySimpleType type = PropertySimpleType.STRING; PropertyDefinitionSimple pd = new PropertyDefinitionSimple(name, description, required, type); - //pd.setId(13); pd.setDisplayName("Path"); pd.setReadOnly(readOnly); pd.setSummary(true); @@ -391,7 +419,6 @@ public class DriftConfigurationDefinition implements Serializable { PropertySimpleType type = PropertySimpleType.STRING; PropertyDefinitionSimple pd = new PropertyDefinitionSimple(name, description, required, type); - //pd.setId(14); pd.setDisplayName("Pattern"); pd.setReadOnly(readOnly); pd.setSummary(true); diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADriftChangeSet.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADriftChangeSet.java index a2421a0..1f82848 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADriftChangeSet.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADriftChangeSet.java @@ -44,6 +44,7 @@ import javax.persistence.PrePersist; import javax.persistence.SequenceGenerator; import javax.persistence.Table; +import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode; import org.rhq.core.domain.resource.Resource; /** @@ -98,7 +99,7 @@ public class JPADriftChangeSet implements Serializable, DriftChangeSet<JPADrift> // that is the "live" setting. @Column(name = "DRIFT_CONFIG_MODE", nullable = false) @Enumerated(EnumType.STRING) - private DriftConfiguration.Mode driftConfigurationMode; + private DriftHandlingMode driftHandlingMode; @JoinColumn(name = "RESOURCE_ID", referencedColumnName = "ID", nullable = false) @ManyToOne(optional = false) @@ -116,6 +117,7 @@ public class JPADriftChangeSet implements Serializable, DriftChangeSet<JPADrift> this.version = version; this.category = category; this.driftConfiguration = driftConfiguration; + this.driftHandlingMode = driftConfiguration.getDriftHandlingMode(); } @Override @@ -179,12 +181,12 @@ public class JPADriftChangeSet implements Serializable, DriftChangeSet<JPADrift> this.driftConfiguration = driftConfiguration; } - public DriftConfiguration.Mode getDriftConfigurationMode() { - return driftConfigurationMode; + public DriftHandlingMode getDriftHandlingMode() { + return driftHandlingMode; } - public void setDriftConfigurationMode(DriftConfiguration.Mode driftConfigurationMode) { - this.driftConfigurationMode = driftConfigurationMode; + public void setDriftHandlingMode(DriftHandlingMode driftHandlingMode) { + this.driftHandlingMode = driftHandlingMode; } @Override diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/dto/DriftChangeSetDTO.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/dto/DriftChangeSetDTO.java index 4ace8d1..8912791 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/dto/DriftChangeSetDTO.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/dto/DriftChangeSetDTO.java @@ -6,6 +6,7 @@ import java.util.Set; import org.rhq.core.domain.drift.DriftChangeSet; import org.rhq.core.domain.drift.DriftChangeSetCategory; +import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode; public class DriftChangeSetDTO implements DriftChangeSet<DriftDTO>, Serializable { @@ -21,6 +22,8 @@ public class DriftChangeSetDTO implements DriftChangeSet<DriftDTO>, Serializable private int configId; + private DriftHandlingMode driftHandlingMode; + private int resourceId; private Set<DriftDTO> drifts = new HashSet<DriftDTO>(); @@ -88,4 +91,14 @@ public class DriftChangeSetDTO implements DriftChangeSet<DriftDTO>, Serializable public void setDrifts(Set<DriftDTO> drifts) { this.drifts = drifts; } + + @Override + public DriftHandlingMode getDriftHandlingMode() { + return this.driftHandlingMode; + } + + @Override + public void setDriftHandlingMode(DriftHandlingMode mode) { + this.driftHandlingMode = mode; + } } diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftConfigurationTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftConfigurationTest.java index b59dd01..3540b29 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftConfigurationTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftConfigurationTest.java @@ -1,5 +1,12 @@ package org.rhq.core.domain.drift; +import static java.util.Arrays.asList; +import static org.rhq.core.domain.drift.DriftConfigurationDefinition.PROP_BASEDIR; +import static org.rhq.core.domain.drift.DriftConfigurationDefinition.PROP_BASEDIR_VALUECONTEXT; +import static org.rhq.core.domain.drift.DriftConfigurationDefinition.PROP_BASEDIR_VALUENAME; +import static org.rhq.core.domain.drift.DriftConfigurationDefinition.BaseDirValueContext.fileSystem; +import static org.testng.Assert.assertEquals; + import java.util.List; import org.testng.annotations.Test; @@ -10,13 +17,7 @@ import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.drift.DriftConfigurationComparator.CompareMode; import org.rhq.core.domain.drift.DriftConfigurationDefinition.BaseDirValueContext; - -import static java.util.Arrays.asList; -import static org.rhq.core.domain.drift.DriftConfigurationDefinition.BaseDirValueContext.fileSystem; -import static org.rhq.core.domain.drift.DriftConfigurationDefinition.PROP_BASEDIR; -import static org.rhq.core.domain.drift.DriftConfigurationDefinition.PROP_BASEDIR_VALUECONTEXT; -import static org.rhq.core.domain.drift.DriftConfigurationDefinition.PROP_BASEDIR_VALUENAME; -import static org.testng.Assert.assertEquals; +import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode; public class DriftConfigurationTest { @Test @@ -32,6 +33,7 @@ public class DriftConfigurationTest { assert comparator.compare(dc1, dc2) != 0 : dc1 + " should not equal " + dc2; assert comparator.compare(dc2, dc1) != 0 : dc2 + " should not equal " + dc1; dc1.setInterval(1000L); + dc1.setDriftHandlingMode(DriftHandlingMode.normal); assert comparator.compare(dc1, dc2) != 0 : dc1 + " should not equal " + dc2; assert comparator.compare(dc2, dc1) != 0 : dc2 + " should not equal " + dc1; dc1.setName("the-name"); @@ -40,6 +42,7 @@ public class DriftConfigurationTest { dc2.setEnabled(false); dc2.setInterval(1000L); + dc2.setDriftHandlingMode(DriftHandlingMode.normal); dc2.setName("the-name"); assert comparator.compare(dc1, dc2) == 0 : dc1 + " should equal " + dc2; @@ -52,6 +55,10 @@ public class DriftConfigurationTest { assert comparator.compare(dc1, dc2) > 0 : dc1 + " should have different interval than " + dc2; dc1.setInterval(dc2.getInterval()); // put them back to the same value + dc1.setDriftHandlingMode(DriftHandlingMode.plannedChanges); + assert comparator.compare(dc1, dc2) > 0 : dc1 + " should have different drift handling mode than " + dc2; + + dc1.setDriftHandlingMode(DriftHandlingMode.normal); // put them back to the same value dc1.setName("zzzzz" + dc2.getName()); assert comparator.compare(dc1, dc2) > 0 : dc1 + " should have different name than " + dc2; @@ -84,10 +91,12 @@ public class DriftConfigurationTest { dc1.setEnabled(true); dc1.setInterval(1000L); + dc1.setDriftHandlingMode(DriftHandlingMode.normal); dc1.setName("the-name"); dc2.setEnabled(true); dc2.setInterval(1000L); + dc2.setDriftHandlingMode(DriftHandlingMode.normal); dc2.setName("the-name"); getCompareBaseInfoAndIncludesExcludes(comparator, dc1, dc2); @@ -103,10 +112,12 @@ public class DriftConfigurationTest { dc1.setEnabled(false); dc1.setInterval(1111L); + dc2.setDriftHandlingMode(DriftHandlingMode.normal); dc1.setName("some-name"); dc2.setEnabled(true); dc2.setInterval(2222L); + dc2.setDriftHandlingMode(DriftHandlingMode.plannedChanges); dc2.setName("another-name"); getCompareBaseInfoAndIncludesExcludes(comparator, dc1, dc2); @@ -239,6 +250,19 @@ public class DriftConfigurationTest { } @Test + public void getDriftHandlingMode() { + DriftHandlingMode mode = DriftHandlingMode.normal; + Configuration config = new Configuration(); + config.put(new PropertySimple(DriftConfigurationDefinition.PROP_DRIFT_HANDLING_MODE, mode.name())); + DriftConfiguration driftConfig = new DriftConfiguration(config); + assertEquals(driftConfig.getDriftHandlingMode(), mode, "Failed to get drift configuration drift handling mode"); + + mode = DriftHandlingMode.plannedChanges; + driftConfig.setDriftHandlingMode(mode); + assertEquals(driftConfig.getDriftHandlingMode(), mode, "Failed to get drift configuration drift handling mode"); + } + + @Test public void getIncludes() { String path1 = "lib"; String pattern1 = "*.jar"; diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/drift/SnapshotTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/drift/SnapshotTest.java index 4237f3a..42cf146 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/drift/SnapshotTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/drift/SnapshotTest.java @@ -16,6 +16,8 @@ import java.util.Set; import org.testng.annotations.Test; +import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode; + @SuppressWarnings("unchecked") public class SnapshotTest { @@ -160,6 +162,7 @@ public class SnapshotTest { private int version; private DriftChangeSetCategory category; private int configId; + private DriftHandlingMode mode = DriftHandlingMode.normal; private Set<Drift> drifts = new HashSet<Drift>(); private long ctime = System.currentTimeMillis(); @@ -236,6 +239,16 @@ public class SnapshotTest { drifts.add(drift); return this; } + + @Override + public DriftHandlingMode getDriftHandlingMode() { + return this.mode; + } + + @Override + public void setDriftHandlingMode(DriftHandlingMode mode) { + this.mode = mode; + } } static class FakeDrift implements Drift { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java index 31c7084..61558ae 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java @@ -67,6 +67,7 @@ import org.rhq.core.domain.drift.DriftFile; import org.rhq.core.domain.drift.DriftSnapshot; import org.rhq.core.domain.drift.FileDiffReport; import org.rhq.core.domain.drift.DriftConfigurationComparator.CompareMode; +import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.server.RHQConstants; @@ -364,7 +365,9 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { public DriftChangeSetSummary saveChangeSet(Subject subject, int resourceId, File changeSetZip) throws Exception { DriftServerPluginFacet driftServerPlugin = getServerPlugin(); DriftChangeSetSummary summary = driftServerPlugin.saveChangeSet(subject, resourceId, changeSetZip); - notifyAlertConditionCacheManager("saveChangeSet", summary); + if (DriftHandlingMode.plannedChanges != summary.getDriftHandlingMode()) { + notifyAlertConditionCacheManager("saveChangeSet", summary); + } return summary; } @@ -407,7 +410,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { } @Override - public FileDiffReport generateUnifiedDiff(Drift drift) { + public FileDiffReport generateUnifiedDiff(Drift<?, ?> drift) { log.debug("Generating diff for " + drift); String oldContent = getDriftFileBits(drift.getOldDriftFile().getHashId()); List<String> oldList = asList(oldContent.split("\\n")); @@ -421,7 +424,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { } @Override - public FileDiffReport generateUnifiedDiff(Drift drift1, Drift drift2) { + public FileDiffReport generateUnifiedDiff(Drift<?, ?> drift1, Drift<?, ?> drift2) { String content1 = getDriftFileBits(drift1.getNewDriftFile().getHashId()); List<String> content1List = asList(content1.split("\\n")); @@ -498,7 +501,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { } @Override - public boolean isBinaryFile(Drift drift) { + public boolean isBinaryFile(Drift<?, ?> drift) { String path = drift.getPath(); int index = path.lastIndexOf('.'); @@ -531,7 +534,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { return null; } - Drift drift = results.get(0); + Drift<?, ?> drift = results.get(0); driftDetails.setDrift(drift); try { switch (drift.getCategory()) { @@ -569,7 +572,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote { } } - private DriftChangeSet loadPreviousChangeSet(Subject subject, Drift drift) { + private DriftChangeSet<?> loadPreviousChangeSet(Subject subject, Drift<?, ?> drift) { GenericDriftChangeSetCriteria criteria = new GenericDriftChangeSetCriteria(); criteria.addFilterResourceId(drift.getChangeSet().getResourceId()); criteria.addFilterDriftConfigurationId(drift.getChangeSet().getDriftConfigurationId()); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerLocal.java index 5d9838f..9d8a883 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerLocal.java @@ -129,7 +129,7 @@ public interface DriftManagerLocal extends DriftServerPluginFacet, DriftManagerR * @return A report containing a unified diff of the two versions of the file * referenced by drift */ - FileDiffReport generateUnifiedDiff(Drift drift); + FileDiffReport generateUnifiedDiff(Drift<?, ?> drift); /** * Returns an object that encapsulates the information needed for viewing drift details @@ -140,5 +140,5 @@ public interface DriftManagerLocal extends DriftServerPluginFacet, DriftManagerR */ DriftDetails getDriftDetails(Subject subject, String driftId); - boolean isBinaryFile(Drift drift); + boolean isBinaryFile(Drift<?, ?> drift); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java index c181e51..8bb4590 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java @@ -40,8 +40,8 @@ public interface DriftManagerRemote { * @param criteria * @return The DriftChangeSets matching the criteria */ - PageList<? extends DriftChangeSet<?>> findDriftChangeSetsByCriteria(Subject subject, - DriftChangeSetCriteria criteria) throws Exception; + PageList<? extends DriftChangeSet<?>> findDriftChangeSetsByCriteria(Subject subject, DriftChangeSetCriteria criteria) + throws Exception; /** * Standard criteria based fetch method @@ -68,7 +68,7 @@ public interface DriftManagerRemote { * @return A report containing a unified diff of the two versions of the file * referenced by drift */ - FileDiffReport generateUnifiedDiff(Drift drift); + FileDiffReport generateUnifiedDiff(Drift<?, ?> drift); /** * Generates a unified diff of the two files referenced by drift1 and drift2. More @@ -79,6 +79,6 @@ public interface DriftManagerRemote { * @param drift2 References the second file to be compared * @return A report containing a unified diff of the two files compared */ - FileDiffReport generateUnifiedDiff(Drift drift1, Drift drift2); + FileDiffReport generateUnifiedDiff(Drift<?, ?> drift1, Drift<?, ?> drift2); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java index 2cf2232..f44000f 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java @@ -19,6 +19,9 @@ */ package org.rhq.enterprise.server.drift; +import static javax.ejb.TransactionAttributeType.REQUIRES_NEW; +import static org.rhq.core.domain.drift.DriftFileStatus.LOADED; + import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.File; @@ -77,9 +80,6 @@ import org.rhq.enterprise.server.plugin.pc.drift.DriftChangeSetSummary; import org.rhq.enterprise.server.util.CriteriaQueryGenerator; import org.rhq.enterprise.server.util.CriteriaQueryRunner; -import static javax.ejb.TransactionAttributeType.REQUIRES_NEW; -import static org.rhq.core.domain.drift.DriftFileStatus.LOADED; - /** * The SLSB method implementation needed to support the JPA (RHQ Default) Drift Server Plugin. * @@ -248,13 +248,12 @@ public class JPADriftServerBean implements JPADriftServerLocal { // store the new change set info (not the actual blob) DriftConfiguration config = findDriftConfiguration(resource, reader.getHeaders()); - int version = getChangeSetVersion(resource, config); - if (config == null) { log.error("Unable to locate DriftConfiguration for Resource [" + resource + "]. Change set cannot be saved."); return false; } + int version = getChangeSetVersion(resource, config); DriftChangeSetCategory category = reader.getHeaders().getType(); driftChangeSet = new JPADriftChangeSet(resource, version, category, config); @@ -263,6 +262,7 @@ public class JPADriftServerBean implements JPADriftServerLocal { summary.setCategory(category); summary.setResourceId(resourceId); summary.setDriftConfigurationName(reader.getHeaders().getDriftConfigurationName()); + summary.setDriftHandlingMode(config.getDriftHandlingMode()); summary.setCreatedTime(driftChangeSet.getCtime()); for (FileEntry entry : reader) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftChangeSetSummary.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftChangeSetSummary.java index 535faf9..045a3dc 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftChangeSetSummary.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftChangeSetSummary.java @@ -24,6 +24,7 @@ import java.util.Date; import java.util.List; import org.rhq.core.domain.drift.DriftChangeSetCategory; +import org.rhq.core.domain.drift.DriftConfigurationDefinition.DriftHandlingMode; /** * Provides a summary of a change set. @@ -39,6 +40,7 @@ public class DriftChangeSetSummary { private DriftChangeSetCategory category; private int resourceId; private String driftConfigurationName; + private DriftHandlingMode driftHandlingMode; private List<String> driftPathnames; /** @@ -107,4 +109,13 @@ public class DriftChangeSetSummary { } return driftPathnames; } + + public DriftHandlingMode getDriftHandlingMode() { + return driftHandlingMode; + } + + public void setDriftHandlingMode(DriftHandlingMode driftHandlingMode) { + this.driftHandlingMode = driftHandlingMode; + } + } commit eb8d96f6b388f80c3294cada24745a272a89b549 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Aug 31 15:44:11 2011 -0400 Some initial domain/entity for drift configuration mode (planned changes support) diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml b/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml index a31d6fa..e1875fe 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml @@ -671,6 +671,7 @@ <column name="NAME" type="VARCHAR2" size="512" required="true"/> <column name="INTERVAL" type="LONG" required="true"/> <column name="IS_ENABLED" type="BOOLEAN" required="true"/> + <column name="MODE" type="VARCHAR2" size="20" required="true"/> <column name="CONFIG_ID" type="INTEGER" required="true" references="RHQ_CONFIG"/> <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/> </table> @@ -684,6 +685,7 @@ <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/> <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/> <column name="DRIFT_CONFIG_ID" type="INTEGER" required="true" references="RHQ_DRIFT_CONFIG"/> + <column name="DRIFT_CONFIG_MODE" type="VARCHAR2" size="20" required="true"/> </table>  diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftChangeSet.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftChangeSet.java index c6db79a..33a78ec 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftChangeSet.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftChangeSet.java @@ -20,6 +20,8 @@ package org.rhq.core.domain.drift; import java.util.Set; +import org.rhq.core.domain.drift.DriftConfiguration.Mode; + /** * A DriftChangeSet is somewhat similar to a commit in version control systems. It contains * information about files being monitored or tracked for drift detection. A change set @@ -97,6 +99,26 @@ public interface DriftChangeSet<D extends Drift<?, ?>> { void setCategory(DriftChangeSetCategory category); /** + * Returns the mode of the owning drift configuration at the time of change set creation. + * Because the value set on the owning drift configuration can change, the value must be + * stored with the change set such that it can be applied consistently when handling the + * associated drift. + * + * @return The {@link DriftConfiguration.Mode} mode + */ + DriftConfiguration.Mode getDriftConfigurationMode(); + + /** + * Sets the drift configuration mode for the change set. It should be set to the owning drift + * configuration mode at the time of change set creation. Because the value set on the owning + * drift configuration can change, the value must be stored with the change set such that it + * can be applied consistently when handling the associated drift. + * + * @param mode The {@link DriftConfiguration.Mode} mode + */ + void setDriftConfigurationMode(Mode mode); + + /** * Returns the id of the owning drift configuration. Note that while server plugins are * responsible for managing the persistence of change sets, the RHQ server manages the * persistence of the owning drift configuration. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfiguration.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfiguration.java index d928c6c..40e0403 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfiguration.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfiguration.java @@ -18,6 +18,8 @@ */ package org.rhq.core.domain.drift; +import static java.util.Collections.emptyList; + import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -25,6 +27,8 @@ import java.util.List; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -43,8 +47,6 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.drift.DriftConfigurationDefinition.BaseDirValueContext; import org.rhq.core.domain.resource.Resource; -import static java.util.Collections.emptyList; - /** * This is a convienence wrapper around a Configuration object whose schema is that * of {@link DriftConfigurationDefinition}. @@ -78,6 +80,10 @@ public class DriftConfiguration implements Serializable { @Column(name = "IS_ENABLED", nullable = false) private boolean isEnabled; + @Column(name = "MODE", nullable = false) + @Enumerated(EnumType.STRING) + private Mode mode; + // unit = millis @Column(name = "INTERVAL", nullable = false) private long interval; @@ -145,6 +151,14 @@ public class DriftConfiguration implements Serializable { this.setEnabledProperty(isEnabled); } + public Mode getMode() { + return mode; + } + + public void setMode(Mode mode) { + this.mode = mode; + } + public long getInterval() { return interval; } @@ -387,4 +401,12 @@ public class DriftConfiguration implements Serializable { return filters; } + + // Drift Handling Mode + public enum Mode { + // alerting, included in recent drift reporting + NORMAL, + // no alerting, not included in recent drift reporting, flagged in UI as planned + PLANNED_CHANGES + } } diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADriftChangeSet.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADriftChangeSet.java index f9509bb..a2421a0 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADriftChangeSet.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADriftChangeSet.java @@ -94,6 +94,12 @@ public class JPADriftChangeSet implements Serializable, DriftChangeSet<JPADrift> @ManyToOne(fetch = FetchType.EAGER, optional = false) private DriftConfiguration driftConfiguration; + // Note, this is mode at the time of the changeset processing. We cant use driftConfiguration.mode because + // that is the "live" setting. + @Column(name = "DRIFT_CONFIG_MODE", nullable = false) + @Enumerated(EnumType.STRING) + private DriftConfiguration.Mode driftConfigurationMode; + @JoinColumn(name = "RESOURCE_ID", referencedColumnName = "ID", nullable = false) @ManyToOne(optional = false) private Resource resource; @@ -173,6 +179,14 @@ public class JPADriftChangeSet implements Serializable, DriftChangeSet<JPADrift> this.driftConfiguration = driftConfiguration; } + public DriftConfiguration.Mode getDriftConfigurationMode() { + return driftConfigurationMode; + } + + public void setDriftConfigurationMode(DriftConfiguration.Mode driftConfigurationMode) { + this.driftConfigurationMode = driftConfigurationMode; + } + @Override public int getDriftConfigurationId() { return this.driftConfiguration.getId(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java index 4691f8d..6a07ee4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java @@ -50,6 +50,8 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.StringUtility; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; +import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; /** * This doesn't extend RPCDataSource because it is tree-oriented and behaves differently than normal list data sources @@ -184,13 +186,48 @@ public class ResourceTreeDatasource extends DataSource { */ public static TreeNode[] buildNodes(List<Resource> resources, List<Resource> lockedData) { List<ResourceTreeNode> resourceNodes = new ArrayList<ResourceTreeNode>(resources.size()); + boolean nullFound = false; for (Resource resource : resources) { + if (null != resource.getParentResource() && null == resource.getParentResource().getName()) { + CoreGUI.getMessageCenter().notify( + new Message(" *** Null parent name for " + resource + " parent " + resource.getParentResource(), + Severity.Info)); + nullFound = true; + } ResourceTreeNode node = new ResourceTreeNode(resource, lockedData.contains(resource)); resourceNodes.add(node); } + if (!nullFound) { + CoreGUI.getMessageCenter().notify(new Message(" *** No Null parent names found", Severity.Info)); + } List<TreeNode> result = introduceTypeAndCategoryNodes(resourceNodes); + nullFound = false; + for (TreeNode node : result) { + if (node instanceof ResourceTreeNode) { + ResourceTreeNode rtNode = (ResourceTreeNode) node; + if (null != rtNode.getResource().getParentResource() + && null == rtNode.getResource().getParentResource().getName()) { + CoreGUI.getMessageCenter().notify( + new Message(" *** Null parent name for resource tree node " + rtNode.getResource() + " parent " + + rtNode.getResource(), Severity.Info)); + nullFound = true; + } + } else if (node instanceof AutoGroupTreeNode) { + AutoGroupTreeNode rtNode = (AutoGroupTreeNode) node; + if (null == rtNode.getParentResource().getName()) { + CoreGUI.getMessageCenter().notify( + new Message(" *** Null parent name for autogroup tree node " + rtNode.getParentResource(), + Severity.Info)); + nullFound = true; + } + } + } + if (!nullFound) { + CoreGUI.getMessageCenter().notify(new Message(" *** No Null tree node parent names found", Severity.Info)); + } + return result.toArray(new TreeNode[result.size()]); }

12 years, 9 months

1
0
0 / 0

[rhq] Changes to 'release_jon3.0.0_beta1-test-build'

by Simeon Pinder

New branch 'release_jon3.0.0_beta1-test-build' available with the following commits:

12 years, 9 months

1
0
0 / 0

[rhq] Changes to 'release_jon3.0.0_beta1'

by Simeon Pinder

New branch 'release_jon3.0.0_beta1' available with the following commits: commit 94d57f26ed3a983396f3321e5e75a23d86ca539e Author: Simeon Pinder <spinder(a)redhat.com> Date: Fri Sep 2 15:53:31 2011 -0400 reverting to snapshot versioning for formal release tagging of JON 3.0.0.BETA1.

12 years, 9 months

1
0
0 / 0

[rhq] Branch 'release_jon3.0.0' - 2 commits - modules/plugins release.sh

by Simeon Pinder

modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 6 +++--- release.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 10477dfbbba58f1feb38c056733ee7886b1ef079 Author: Simeon Pinder <spinder(a)redhat.com> Date: Fri Sep 2 14:38:25 2011 -0400 BZ 733019: AS7 host controller node to reflect relevance to AS7. diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 67edbff..21cce29 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -75,7 +75,7 @@ </server> --> - <server name="HostController" + <server name="JBossAS7 Host Controller" discovery="BaseProcessDiscovery" class="HostControllerComponent" description="Domain controller (delegate) for this host" @@ -1903,7 +1903,7 @@ working area for individual server instances</li></ul>"/> description="A named network interface, along with required criteria for determining the IP address to associate with that interface"> <runs-inside> - <parent-resource-type name="HostController" plugin="jboss-as-7"/> + <parent-resource-type name="JBossAS7 Host Controller" plugin="jboss-as-7"/> <parent-resource-type name="Host" plugin="jboss-as-7"/> <parent-resource-type name="JBossAS7-Standalone" plugin="jboss-as-7"/> </runs-inside> @@ -1960,7 +1960,7 @@ working area for individual server instances</li></ul>"/> class="BaseComponent" > <runs-inside> - <parent-resource-type name="HostController" plugin="jboss-as-7"/> + <parent-resource-type name="JBossAS7 Host Controller" plugin="jboss-as-7"/> </runs-inside> commit abf5ec64e0b794fd08a75a38ffb2feafa076ba54 Author: John Sanda <jsanda(a)redhat.com> Date: Fri Sep 2 10:06:38 2011 -0400 Override default tmp directory used during gwt compilation Currently the GWT comopiler generates 25 GB of temporary files which by default are written to the system temp directory. 25 GB exceeds the default size limits for the volume on wnich the system temp directory resides. This change causes the gwt compiler to write temp data to the same volume in which the build is running. diff --git a/release.sh b/release.sh index b26b3ed..479bb4d 100755 --- a/release.sh +++ b/release.sh @@ -304,7 +304,7 @@ cat <<EOF >"${MAVEN_SETTINGS_FILE}" <rhq.testng.excludedGroups>agent-comm,comm-client,postgres-plugin,native-system</rhq.testng.excludedGroups> - <gwt-plugin.extraJvmArgs>-Xms512M -Xmx1024M -XX:PermSize=256M -XX:MaxPermSize=512M</gwt-plugin.extraJvmArgs> + <gwt-plugin.extraJvmArgs>-Xms512M -Xmx1024M -XX:PermSize=256M -XX:MaxPermSize=512M -Djava.io.tmpdir=gwt-tmp</gwt-plugin.extraJvmArgs> </properties> </profile>

12 years, 9 months

1
0
0 / 0

[rhq] modules/enterprise

by snegrea

modules/enterprise/agent/ant-run.xml | 4 ++-- modules/enterprise/server/container/pom.xml | 3 ++- modules/enterprise/server/container/src/main/scripts/rhq-container.assembly.xml | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) New commits: commit 3bd3ba9352513a6e16152747fc175a6729a93044 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Fri Sep 2 12:11:48 2011 -0500 BZ684320 - Updated default permissions one more time to match JBoss AS defaults. diff --git a/modules/enterprise/agent/ant-run.xml b/modules/enterprise/agent/ant-run.xml index 418009d..ddaeeba 100644 --- a/modules/enterprise/agent/ant-run.xml +++ b/modules/enterprise/agent/ant-run.xml @@ -211,7 +211,7 @@ Ant Script that provides ways to package the Agent. <delete file="${basedir}/target/rhq-enterprise-agent-${project.version}.zip" /> <zip destfile="${basedir}/target/rhq-enterprise-agent-${project.version}.zip" >  - <zipfileset dir="${basedir}/target" filemode="744" dirmode="744"> + <zipfileset dir="${basedir}/target" filemode="644" dirmode="755"> <include name="rhq-agent/**"/> <exclude name="rhq-agent/bin/*.sh"/> <exclude name="rhq-agent/lib/*.so"/> @@ -220,7 +220,7 @@ Ant Script that provides ways to package the Agent. <exclude name="rhq-agent/lib/*.dylib"/> <exclude name="rhq-agent/lib/augeas/**" /> </zipfileset> - <zipfileset dir="${basedir}/target" filemode="755" dirmode="744"> + <zipfileset dir="${basedir}/target" filemode="755" dirmode="755"> <include name="rhq-agent/bin/*.sh"/> <include name="rhq-agent/lib/*.so"/> <include name="rhq-agent/lib/*.sl"/> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 42cc43c..62bb471 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -252,7 +252,8 @@ <configuration> <archiverConfig>  - <defaultDirectoryMode>484</defaultDirectoryMode> +  + <defaultDirectoryMode>493</defaultDirectoryMode> </archiverConfig> <descriptors> <descriptor>src/main/scripts/rhq-container.assembly.xml</descriptor> diff --git a/modules/enterprise/server/container/src/main/scripts/rhq-container.assembly.xml b/modules/enterprise/server/container/src/main/scripts/rhq-container.assembly.xml index 816ab0d..6e2c0f7 100644 --- a/modules/enterprise/server/container/src/main/scripts/rhq-container.assembly.xml +++ b/modules/enterprise/server/container/src/main/scripts/rhq-container.assembly.xml @@ -20,8 +20,8 @@ <exclude>**/*.sl</exclude> <exclude>**/*.dylib</exclude> </excludes> - <fileMode>0744</fileMode> - <directoryMode>0744</directoryMode> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> </fileSet> <fileSet> <directory>${project.build.outputDirectory}</directory> @@ -32,8 +32,8 @@ <include>**/*.sl</include> <include>**/*.dylib</include> </includes> - <fileMode>0744</fileMode> - <directoryMode>0744</directoryMode> + <fileMode>0755</fileMode> + <directoryMode>0755</directoryMode> </fileSet> </fileSets> </assembly> \ No newline at end of file

12 years, 9 months

1
0
0 / 0

[rhq] Branch 'drift' - 6 commits - modules/enterprise publish_release.sh release.sh

by mazz

modules/enterprise/agent/ant-run.xml | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 26 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 10 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java | 73 +++------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java | 28 ++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java | 20 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 15 +- modules/enterprise/server/container/pom.xml | 6 modules/enterprise/server/container/src/main/scripts/rhq-container.assembly.xml | 7 publish_release.sh | 2 release.sh | 2 12 files changed, 112 insertions(+), 85 deletions(-) New commits: commit aa4f67538e5828f4d4117e39884dad27eebc185d Merge: fbc77d4 f2bb553 Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Sep 2 10:15:04 2011 -0400 Merge commit 'origin/master' into drift commit f2bb553c2dcbf77e48ff80e5b0fdf0cc1da72dcd Author: John Sanda <jsanda(a)redhat.com> Date: Fri Sep 2 10:06:38 2011 -0400 Override default tmp directory used during gwt compilation Currently the GWT comopiler generates 25 GB of temporary files which by default are written to the system temp directory. 25 GB exceeds the default size limits for the volume on wnich the system temp directory resides. This change causes the gwt compiler to write temp data to the same volume in which the build is running. diff --git a/release.sh b/release.sh index b26b3ed..479bb4d 100755 --- a/release.sh +++ b/release.sh @@ -304,7 +304,7 @@ cat <<EOF >"${MAVEN_SETTINGS_FILE}" <rhq.testng.excludedGroups>agent-comm,comm-client,postgres-plugin,native-system</rhq.testng.excludedGroups> - <gwt-plugin.extraJvmArgs>-Xms512M -Xmx1024M -XX:PermSize=256M -XX:MaxPermSize=512M</gwt-plugin.extraJvmArgs> + <gwt-plugin.extraJvmArgs>-Xms512M -Xmx1024M -XX:PermSize=256M -XX:MaxPermSize=512M -Djava.io.tmpdir=gwt-tmp</gwt-plugin.extraJvmArgs> </properties> </profile> commit 85ccbd1698c68a5a7850a32fe364973a5ef704be Author: Ian Springer <ian.springer(a)redhat.com> Date: Thu Sep 1 16:55:06 2011 -0400 [BZ 735232] Message portlet should not be displayed on default dashboard in JON (https://bugzilla.redhat.com/show_bug.cgi?id=735232); fix layout issues in About modal window; load ProductInfo once in CoreGUI init and cache it diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java index 2a52e4d..88801e0 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java @@ -33,6 +33,7 @@ import com.google.gwt.user.client.History; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.Window.Location; +import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.core.KeyIdentifier; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.util.KeyCallback; @@ -41,10 +42,12 @@ import com.smartgwt.client.util.SC; import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.layout.VLayout; +import org.rhq.core.domain.common.ProductInfo; import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView; import org.rhq.enterprise.gui.coregui.client.alert.AlertHistoryView; import org.rhq.enterprise.gui.coregui.client.bundle.BundleTopView; import org.rhq.enterprise.gui.coregui.client.dashboard.DashboardsView; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.help.HelpView; import org.rhq.enterprise.gui.coregui.client.inventory.InventoryView; import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.ResourceGroupDetailView; @@ -109,6 +112,7 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String>, Event.Na private MenuBarView menuBarView; private Footer footer; private int rpcTimeout; + private ProductInfo productInfo; public void onModuleLoad() { String hostPageBaseURL = GWT.getHostPageBaseURL(); @@ -262,6 +266,28 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String>, Event.Na return coreGUI; } + public void init() { + if (productInfo == null) { + GWTServiceLookup.getSystemService().getProductInfo(new AsyncCallback<ProductInfo>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_aboutBox_failedToLoad(), caught); + buildCoreUI(); + } + + public void onSuccess(ProductInfo result) { + productInfo = result; + buildCoreUI(); + } + }); + } else { + buildCoreUI(); + } + } + + public ProductInfo getProductInfo() { + return productInfo; + } + public void buildCoreUI() { // If the core gui is already built (eg. from previous login) skip the build and just refire event if (rootCanvas == null) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java index 56c3658..7bdcb6e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java @@ -84,7 +84,7 @@ public class UserSessionManager { // We want the CoreGUI session timeout to rule them all. The rhq subject session is refreshed on each SLSB // call. But the HTTP session will die after 30 minutes. Keep it alive until logout by pinging SessionAccessServlet - // occasionaly, as specified by this interval (which must be less than the 30 minutes). + // occasionally, as specified by this interval (which must be less than the 30 minutes). // Currently: 20 minutes private static int SESSION_ACCESS_REFRESH = 20 * 60 * 1000; @@ -454,7 +454,7 @@ public class UserSessionManager { scheduleWebUserUpdate(loggedInSubject); } - CoreGUI.get().buildCoreUI(); + CoreGUI.get().init(); } public void onFailure(Throwable caught) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java index 6a614bb..b476f66 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2010 Red Hat, Inc. + * Copyright (C) 2010-2011 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -18,25 +18,18 @@ */ package org.rhq.enterprise.gui.coregui.client.components; -import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.Version; import com.smartgwt.client.types.Alignment; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.types.VerticalAlignment; -import com.smartgwt.client.widgets.Button; -import com.smartgwt.client.widgets.Canvas; -import com.smartgwt.client.widgets.HTMLFlow; -import com.smartgwt.client.widgets.IButton; -import com.smartgwt.client.widgets.Window; +import com.smartgwt.client.widgets.HTMLPane; import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; -import com.smartgwt.client.widgets.layout.HLayout; import com.smartgwt.client.widgets.layout.VLayout; import org.rhq.core.domain.common.ProductInfo; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.Messages; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; @@ -52,8 +45,6 @@ public class AboutModalWindow extends LocatableWindow { private static final Messages MSG = CoreGUI.getMessages(); - private static ProductInfo PRODUCT_INFO; - /** * <pre> * ID Format: "simpleClassname_locatorId" @@ -78,37 +69,19 @@ public class AboutModalWindow extends LocatableWindow { @Override protected void onInit() { - super.onInit(); - - if (PRODUCT_INFO == null) { - GWTServiceLookup.getSystemService().getProductInfo(new AsyncCallback<ProductInfo>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_aboutBox_failedToLoad(), caught); - } - - public void onSuccess(ProductInfo result) { - PRODUCT_INFO = result; - setTitle(MSG.view_aboutBox_title(PRODUCT_INFO.getFullName())); + ProductInfo productInfo = CoreGUI.get().getProductInfo(); - finishOnInit(); - } - }); - } else { - finishOnInit(); - } - } + setTitle(MSG.view_aboutBox_title(productInfo.getFullName())); - private void finishOnInit() { LocatableVLayout contentPane = new LocatableVLayout(extendLocatorId("Content")); - contentPane.setPadding(13); - contentPane.setMembersMargin(25); - - HTMLFlow htmlFlow = new HTMLFlow(); - String html = "\n" + " <a href=\"" + PRODUCT_INFO.getUrl() + "\" title=\"" - + PRODUCT_INFO.getFullName() + " " + PRODUCT_INFO.getUrl() + "\" target=\"_blank\">" - + PRODUCT_INFO.getFullName() + "</a>\n" + " \n" + "" - + MSG.view_aboutBox_version() + " " + PRODUCT_INFO.getVersion() + " \n" - + "" + MSG.view_aboutBox_buildNumber() + " " + PRODUCT_INFO.getBuildNumber() + contentPane.setPadding(10); + + HTMLPane htmlPane = new HTMLPane(); + String html = "\n" + " <a href=\"" + productInfo.getUrl() + "\" title=\"" + + productInfo.getFullName() + " " + productInfo.getUrl() + "\" target=\"_blank\">" + + productInfo.getFullName() + "</a>\n" + " \n" + "" + + MSG.view_aboutBox_version() + " " + productInfo.getVersion() + " \n" + + "" + MSG.view_aboutBox_buildNumber() + " " + productInfo.getBuildNumber() + "\n" + "GWT " + MSG.common_title_version() + ": " + MSG.common_buildInfo_gwtVersion() + " \n" + "SmartGWT " + MSG.common_title_version() + ": " + Version.getVersion() + " \n" @@ -116,17 +89,19 @@ public class AboutModalWindow extends LocatableWindow { + " <img height=\"55\" alt=\"" + MSG.view_aboutBox_jbossByRedHat() + "\" src=\"/images/jboss_logo.png\">\n" + "</a>\n" + "<div style=\"top-margin: 10px\">" + MSG.view_aboutBox_allRightsReserved() + "</div>\n"; - htmlFlow.setContents(html); - contentPane.addMember(htmlFlow); + htmlPane.setContents(html); + htmlPane.setHeight(220); + contentPane.addMember(htmlPane); LocatableHLayout buttonBar = new LocatableHLayout(contentPane.extendLocatorId("ButtonBar")); + buttonBar.setHeight(30); buttonBar.setAlign(Alignment.RIGHT); LocatableIButton closeButton = new LocatableIButton(buttonBar.extendLocatorId("Close"), MSG.common_button_close()); closeButton.setShowRollOver(true); closeButton.setShowDown(true); - closeButton.setWidth("60"); + closeButton.setWidth(60); closeButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent event) { hide(); @@ -143,4 +118,5 @@ public class AboutModalWindow extends LocatableWindow { // Layout class. addItem(contentPane); } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java index 7d0ec7a..424b256 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2009 Red Hat, Inc. + * Copyright (C) 2005-2011 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -45,6 +45,7 @@ import com.smartgwt.client.widgets.tab.events.TabSelectedEvent; import com.smartgwt.client.widgets.tab.events.TabSelectedHandler; import org.rhq.core.domain.authz.Permission; +import org.rhq.core.domain.common.ProductInfo; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.criteria.DashboardCriteria; import org.rhq.core.domain.dashboard.Dashboard; @@ -361,21 +362,32 @@ public class DashboardsView extends LocatableVLayout implements DashboardContain dashboard.setColumnWidths("32%"); dashboard.getConfiguration().put(new PropertySimple(Dashboard.CFG_BACKGROUND, "#F1F2F3")); + ProductInfo productInfo = CoreGUI.get().getProductInfo(); + boolean isRHQ = (productInfo != null) && "RHQ".equals(productInfo.getShortName()); + // Left Column - DashboardPortlet welcome = new DashboardPortlet(MessagePortlet.NAME, MessagePortlet.KEY, 250); - dashboard.addPortlet(welcome, 0, 0); + int columnIndex = 0; + int rowIndex = 0; + + if (isRHQ) { + DashboardPortlet welcome = new DashboardPortlet(MessagePortlet.NAME, MessagePortlet.KEY, 250); + dashboard.addPortlet(welcome, columnIndex, rowIndex++); + } DashboardPortlet summary = new DashboardPortlet(InventorySummaryPortlet.NAME, InventorySummaryPortlet.KEY, 250); - dashboard.addPortlet(summary, 0, 1); + dashboard.addPortlet(summary, columnIndex, rowIndex++); DashboardPortlet news = new DashboardPortlet(MashupPortlet.NAME, MashupPortlet.KEY, 300); news.getConfiguration().put( new PropertySimple("address", "http://rhq-project.org/display/RHQ/RHQ+News?decorator=popup")); - dashboard.addPortlet(news, 0, 2); + dashboard.addPortlet(news, columnIndex, rowIndex++); // Right Column + columnIndex = 1; + rowIndex = 0; + DashboardPortlet recentAlerts = new DashboardPortlet(RecentAlertsPortlet.NAME, RecentAlertsPortlet.KEY, 250); - dashboard.addPortlet(recentAlerts, 1, 0); + dashboard.addPortlet(recentAlerts, columnIndex, rowIndex++); DashboardPortlet problemResources = new DashboardPortlet(ProblemResourcesPortlet.NAME, ProblemResourcesPortlet.KEY, 250); @@ -388,11 +400,11 @@ public class DashboardsView extends LocatableVLayout implements DashboardContain .put( new PropertySimple(ProblemResourcesPortlet.PROBLEM_RESOURCE_SHOW_HRS, ProblemResourcesPortlet.defaultValue)); - dashboard.addPortlet(problemResources, 1, 1); + dashboard.addPortlet(problemResources, columnIndex, rowIndex++); DashboardPortlet operations = new DashboardPortlet(OperationHistoryPortlet.NAME, OperationHistoryPortlet.KEY, 200); - dashboard.addPortlet(operations, 1, 2); + dashboard.addPortlet(operations, columnIndex, rowIndex++); return dashboard; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java index 22a0c13..8f4df4b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. + * Copyright (C) 2005-2011 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.List; import java.util.MissingResourceException; -import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.Label; @@ -41,7 +40,6 @@ import org.rhq.enterprise.gui.coregui.client.components.view.NavigationItem; import org.rhq.enterprise.gui.coregui.client.components.view.NavigationSection; import org.rhq.enterprise.gui.coregui.client.components.view.ViewFactory; import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; -import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; /** @@ -96,20 +94,8 @@ public class HelpView extends AbstractSectionedLeftNavigationView { "[SKIN]/../actions/help.png", new ViewFactory() { public Canvas createView() { final AboutModalWindow aboutModalWindow = new AboutModalWindow(extendLocatorId("AboutModalWindow")); - if (PRODUCT_INFO == null) { - GWTServiceLookup.getSystemService().getProductInfo(new AsyncCallback<ProductInfo>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_aboutBox_failedToLoad(), caught); - } - - public void onSuccess(ProductInfo result) { - PRODUCT_INFO = result; - aboutModalWindow.setTitle(MSG.view_aboutBox_title(PRODUCT_INFO.getFullName())); - } - }); - } else { - aboutModalWindow.setTitle(MSG.view_aboutBox_title(PRODUCT_INFO.getFullName())); - } + ProductInfo productInfo = CoreGUI.get().getProductInfo(); + aboutModalWindow.setTitle(MSG.view_aboutBox_title(productInfo.getFullName())); aboutModalWindow.show(); return aboutModalWindow; } commit 6f0df962341bc372463d2b2444a8626b0f472985 Author: John Sanda <jsanda(a)redhat.com> Date: Thu Sep 1 15:55:25 2011 -0400 Fixing syntax error diff --git a/publish_release.sh b/publish_release.sh index 3a12b7a..2be9db9 100755 --- a/publish_release.sh +++ b/publish_release.sh @@ -219,7 +219,7 @@ export LANG echo echo "========================== Environment Variables ==============================" echo "JAVA_HOME=$JAVA_HOME" -[ "$RELEASE_TYPE" = "enterprise" ]" +[ "$RELEASE_TYPE" = "enterprise" ] #[ "$RELEASE_TYPE" = "enterprise" ] && echo "JAVA5_HOME=$JAVA5_HOME" echo "M2_HOME=$M2_HOME" echo "MAVEN_OPTS=$MAVEN_OPTS" commit 723ed5e890b66339daa4a20170afcea4343629dd Author: Ian Springer <ian.springer(a)redhat.com> Date: Thu Sep 1 13:30:39 2011 -0400 [BZ 608798, 608803] changes to LoginView and MenuBarView to allow RHQ logos to be replaced with JON logos, even if the JON logo images are not the same width and height as the RHQ logo images diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java index 5e915c6..c5b8f43 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java @@ -35,6 +35,7 @@ import com.google.gwt.http.client.URL; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.types.Alignment; import com.smartgwt.client.types.FormErrorOrientation; +import com.smartgwt.client.types.ImageStyle; import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.HTMLFlow; import com.smartgwt.client.widgets.IButton; @@ -119,9 +120,16 @@ public class LoginView extends LocatableCanvas { form.setShowErrorText(true); form.setErrorOrientation(FormErrorOrientation.BOTTOM); + // NOTE: This image will either be an RHQ logo or a JON logo. + Img logoImg = new Img("header/rhq_logo_28px.png"); + // NOTE: Don't explicitly specify a width, so the width will be scaled proportionally to the height. + logoImg.setImageType(ImageStyle.NORMAL); + logoImg.setImageHeight(40); + CanvasItem logo = new CanvasItem(); - logo.setCanvas(new Img("header/rhq_logo_28px.png", 80, 28)); logo.setShowTitle(false); + logo.setHeight(logoImg.getImageHeight() + 4); + logo.setCanvas(logoImg); HeaderItem header = new HeaderItem(); header.setValue(MSG.view_login_prompt()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java index 5687c75..6a614bb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java @@ -20,6 +20,7 @@ package org.rhq.enterprise.gui.coregui.client.components; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.Version; +import com.smartgwt.client.types.Alignment; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.Button; @@ -99,12 +100,12 @@ public class AboutModalWindow extends LocatableWindow { private void finishOnInit() { LocatableVLayout contentPane = new LocatableVLayout(extendLocatorId("Content")); - contentPane.setPadding(15); + contentPane.setPadding(13); contentPane.setMembersMargin(25); HTMLFlow htmlFlow = new HTMLFlow(); String html = "\n" + " <a href=\"" + PRODUCT_INFO.getUrl() + "\" title=\"" - + PRODUCT_INFO.getFullName() + " " + MSG.view_aboutBox_homepage() + "\" target=\"_blank\">" + + PRODUCT_INFO.getFullName() + " " + PRODUCT_INFO.getUrl() + "\" target=\"_blank\">" + PRODUCT_INFO.getFullName() + "</a>\n" + " \n" + "" + MSG.view_aboutBox_version() + " " + PRODUCT_INFO.getVersion() + " \n" + "" + MSG.view_aboutBox_buildNumber() + " " + PRODUCT_INFO.getBuildNumber() @@ -119,12 +120,7 @@ public class AboutModalWindow extends LocatableWindow { contentPane.addMember(htmlFlow); LocatableHLayout buttonBar = new LocatableHLayout(contentPane.extendLocatorId("ButtonBar")); - buttonBar.setAlign(VerticalAlignment.BOTTOM); - contentPane.addMember(buttonBar); - - Canvas spacer = new Canvas(); - spacer.setWidth("*"); - buttonBar.addMember(spacer); + buttonBar.setAlign(Alignment.RIGHT); LocatableIButton closeButton = new LocatableIButton(buttonBar.extendLocatorId("Close"), MSG.common_button_close()); @@ -138,6 +134,11 @@ public class AboutModalWindow extends LocatableWindow { }); buttonBar.addMember(closeButton); + VLayout bottom = new VLayout(); + bottom.setAlign(VerticalAlignment.BOTTOM); + bottom.addMember(buttonBar); + contentPane.addMember(bottom); + // NOTE: Since this is a subclass of Window, we MUST use addItem(), rather than addMember() from the // Layout class. addItem(contentPane); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java index f138f6a..3bd11d2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java @@ -22,6 +22,8 @@ import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.user.client.History; import com.smartgwt.client.types.Alignment; +import com.smartgwt.client.types.ImageStyle; +import com.smartgwt.client.types.Overflow; import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.Img; @@ -99,13 +101,22 @@ public class MenuBarView extends LocatableVLayout { private Canvas getLogoSection() { final AboutModalWindow aboutModalWindow = new AboutModalWindow(extendLocatorId("AboutModalWindow")); - Img logo = new Img("header/rhq_logo_28px.png", 80, 28); + HLayout logoSection = new HLayout(); + logoSection.setOverflow(Overflow.VISIBLE); + + // NOTE: This image will either be an RHQ logo or a JON logo. + Img logo = new Img("header/rhq_logo_28px.png"); + // NOTE: Don't explicitly specify a width, so the width will be scaled proportionally to the height. + logo.setImageType(ImageStyle.NORMAL); + logo.setImageHeight(28); logo.addClickHandler(new ClickHandler() { public void onClick(ClickEvent event) { aboutModalWindow.show(); } }); - return logo; + + logoSection.addMember(logo); + return logoSection; } private Canvas getLinksSection() { commit 8b92144361a72e581ed0106c56e848bb7a0a7415 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Thu Sep 1 12:37:01 2011 -0500 BZ684320 - Updated permissions only for the zip archives of server and agent to 744. diff --git a/modules/enterprise/agent/ant-run.xml b/modules/enterprise/agent/ant-run.xml index 384e283..418009d 100644 --- a/modules/enterprise/agent/ant-run.xml +++ b/modules/enterprise/agent/ant-run.xml @@ -211,7 +211,7 @@ Ant Script that provides ways to package the Agent. <delete file="${basedir}/target/rhq-enterprise-agent-${project.version}.zip" /> <zip destfile="${basedir}/target/rhq-enterprise-agent-${project.version}.zip" >  - <zipfileset dir="${basedir}/target"> + <zipfileset dir="${basedir}/target" filemode="744" dirmode="744"> <include name="rhq-agent/**"/> <exclude name="rhq-agent/bin/*.sh"/> <exclude name="rhq-agent/lib/*.so"/> @@ -220,7 +220,7 @@ Ant Script that provides ways to package the Agent. <exclude name="rhq-agent/lib/*.dylib"/> <exclude name="rhq-agent/lib/augeas/**" /> </zipfileset> - <zipfileset dir="${basedir}/target" filemode="755"> + <zipfileset dir="${basedir}/target" filemode="755" dirmode="744"> <include name="rhq-agent/bin/*.sh"/> <include name="rhq-agent/lib/*.so"/> <include name="rhq-agent/lib/*.sl"/> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index d27c157..42cc43c 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -8,7 +8,7 @@ <version>4.1.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> - + <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-container</artifactId> <packaging>pom</packaging> @@ -250,6 +250,10 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> + <archiverConfig> +  + <defaultDirectoryMode>484</defaultDirectoryMode> + </archiverConfig> <descriptors> <descriptor>src/main/scripts/rhq-container.assembly.xml</descriptor> </descriptors> diff --git a/modules/enterprise/server/container/src/main/scripts/rhq-container.assembly.xml b/modules/enterprise/server/container/src/main/scripts/rhq-container.assembly.xml index a6dbf98..816ab0d 100644 --- a/modules/enterprise/server/container/src/main/scripts/rhq-container.assembly.xml +++ b/modules/enterprise/server/container/src/main/scripts/rhq-container.assembly.xml @@ -20,8 +20,10 @@ <exclude>**/*.sl</exclude> <exclude>**/*.dylib</exclude> </excludes> + <fileMode>0744</fileMode> + <directoryMode>0744</directoryMode> </fileSet> - <fileSet> + <fileSet> <directory>${project.build.outputDirectory}</directory> <outputDirectory>/</outputDirectory> <includes> @@ -30,7 +32,8 @@ <include>**/*.sl</include> <include>**/*.dylib</include> </includes> - <fileMode>0755</fileMode> + <fileMode>0744</fileMode> + <directoryMode>0744</directoryMode> </fileSet> </fileSets> </assembly> \ No newline at end of file

12 years, 9 months

1
0
0 / 0

[rhq] release.sh

by John Sanda

release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f2bb553c2dcbf77e48ff80e5b0fdf0cc1da72dcd Author: John Sanda <jsanda(a)redhat.com> Date: Fri Sep 2 10:06:38 2011 -0400 Override default tmp directory used during gwt compilation Currently the GWT comopiler generates 25 GB of temporary files which by default are written to the system temp directory. 25 GB exceeds the default size limits for the volume on wnich the system temp directory resides. This change causes the gwt compiler to write temp data to the same volume in which the build is running. diff --git a/release.sh b/release.sh index b26b3ed..479bb4d 100755 --- a/release.sh +++ b/release.sh @@ -304,7 +304,7 @@ cat <<EOF >"${MAVEN_SETTINGS_FILE}" <rhq.testng.excludedGroups>agent-comm,comm-client,postgres-plugin,native-system</rhq.testng.excludedGroups> - <gwt-plugin.extraJvmArgs>-Xms512M -Xmx1024M -XX:PermSize=256M -XX:MaxPermSize=512M</gwt-plugin.extraJvmArgs> + <gwt-plugin.extraJvmArgs>-Xms512M -Xmx1024M -XX:PermSize=256M -XX:MaxPermSize=512M -Djava.io.tmpdir=gwt-tmp</gwt-plugin.extraJvmArgs> </properties> </profile>

12 years, 9 months

1
0
0 / 0

[rhq] Branch 'release_jon3.0.0' - 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 Simeon Pinder

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/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/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 +- 124 files changed, 142 insertions(+), 142 deletions(-) New commits: commit 0ecf0db70d92ae9f4a90090ad3db83657ad968fc Author: Simeon Pinder <spinder(a)redhat.com> Date: Thu Sep 1 20:09:47 2011 -0400 set release version for brew builds of 4.1.1-BETA1 diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index b080025..f70061f 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 1eb86ef..c7a482f 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index 73ab33a..80e6d65 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 352de33..57fa2b7 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 184c5ad..4c3474f 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index bd88fa0..47c5535 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 9f5f66a..f90deb3 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 5a8b356..4bdd540 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index aa20853..335dff6 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-dbutils</artifactId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 42d28e1..9cd0ba2 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index bb4dc2c..914a15d 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 7d83f3d..a47bf81 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index fc78701..a9876b9 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 5e8397b..8f6a2d8 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index f2953a6..1f1a904 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 62a73be..61c6295 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index dfa5bb8..5d17ff7 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 199a996..82dd16d 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 8b7ffe8..485a79e 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index d96cf83..71bac05 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-script-bindings</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 f424704..a895109 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 cebd439..23b19cb 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 b66da2c..80b21bb 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 db7d757..9eb9c9c 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index de77f3f..9cd93ba 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 900d476..8fdc07e 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 8e8cf66..3e0b1c7 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 4e2ac9f..286b89b 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 01fb7f6..da9d486 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 24fbb60..01c9861 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 1a1c88c..ada9309 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 3fe07b7..5da2901 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index f4b1866..265fcfa 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index dee43bc..02ce1cc 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 c57eaba..15a32c1 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 1aebae1..c7a52f0 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 42cc43c..e054d7f 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 8cdaf8b..68eeb76 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index d2f2bc5..8e783e0 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 b380393..7cbd947 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 e1e1890..3e2d017 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 1b609e1..ab8d837 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 1a27831..5b8e1bd 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 ab68d6b..44da984 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 0adccaf..02fcb76 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 2c9bcfa..9eb3e7c 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 06bab65..021dc8a 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 3763c54..03b1aeb 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 bb595b5..e566893 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 c4e59b2..37c3b3b 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 381f64c..019ae28 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 403ef41..95f29fa 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 9c9d3b6..b287def 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 ad1c570..2dfde0e 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 0d2bf4b..c9beef5 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>groovy-script-server-plugin</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 dacaec2..6701d43 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 9a51242..5168456 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 f73ecb8..64b3881 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 c2d5c7e..8ef3970 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 3fa05d3..91cdcf6 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 04df0b8..226e1dd 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 79ccf2b..a657f95 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 9e221a0..455279f 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 ce8468c..3b9f1ef 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index 517be69..1e7bfac 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 05cb339..434fa4d 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 00344d4..9be1e89 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 2377858..1f928c1 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 90c0da6..ebbe06a 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index 9e80f1f..b5f2ebb 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <build> <plugins> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index e488bb0..4716515 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 0c73fd3..da93cb6 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 417a3df..9a7a0c6 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 206a7a7..abe0acc 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 cc68acd..bbf6c80 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index 1b41b08..ed5df02 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 d983b6a..55c5e77 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index ff8c753..b0ebced 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index e68547f..dce6465 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index ff7d21f..4590fc3 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 46bcb55..fce9e17 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index 78156f3..6654e15 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 5f2c454..cad565d 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 6c1812b..2c63916 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index c1e0a3d..a6f0084 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index d197727..985b44d 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index 840e619..4ba3845 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index e482d30..92e17a4 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 0c7ec29..ec7cd5c 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index b097071..edd4a4d 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 2cdc32a..f2b629b 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index edf12ea..044280b 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 6ec0096..d135fa0 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 ca63c5e..408e30c 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 57c8bb3..c9dbafa 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 1a3a1df..d0d137a 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index ae06793..152d019 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 1daf86d..44cd378 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index dc87ed7..9ccd94e 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index 3a6deaa..901f34c 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index d8ebb5d..8c0b60d 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index f1675e4..6f49a19 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 8a3b3c0..aaca2d2 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 6b0791d..f19c719 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 63dd974..c4d6307 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 99f36d0..90a262f 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index f32159e..68814d8 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 2a0eb28..e279435 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index 365f6c4..91e7108 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 60471c2..ac71a33 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index e88b97f..e6cbd4d 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 90337ed..242ba92 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index d31afb9..f9041bb 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 2cf689c..ec6ca02 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 05ed401..ba8606f 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 3a1df45..a56949b 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 9429831..1aae074 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index f6dfebd..6921318 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 50ff9b6..a6f6f6b 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</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 6565a7b..e5fcd01 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 8700a19..3e56790 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 2b45c62..e90b1d9 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 5c6e85c..a34707c 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.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index ab342f5..6512559 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.1-BETA1</version> <packaging>pom</packaging> <name>RHQ</name>

12 years, 9 months

1
0
0 / 0

[rhq] Branch 'refs/tags/RHQ_4_1_1-BETA1' - 0 commits -

by Simeon Pinder

Rebased ref, commits from common ancestor:

12 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits September 2011