October 2011 - rhq-commits - Fedora Mailing-Lists

[rhq] modules/cli-tests modules/common modules/core modules/enterprise modules/helpers modules/integration-tests modules/plugins modules/pom.xml modules/test-utils pom.xml

by rhqci

modules/cli-tests/pom.xml | 2 +- modules/common/ant-bundle/pom.xml | 2 +- modules/common/drift/pom.xml | 2 +- modules/common/filetemplate-bundle/pom.xml | 2 +- modules/common/jboss-as/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/core/client-api/pom.xml | 2 +- modules/core/comm-api/pom.xml | 2 +- modules/core/dbutils/pom.xml | 2 +- modules/core/domain/pom.xml | 2 +- modules/core/gui/pom.xml | 2 +- modules/core/native-system/pom.xml | 2 +- modules/core/plugin-api/pom.xml | 2 +- modules/core/plugin-container/pom.xml | 2 +- modules/core/plugin-validator/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/util/pom.xml | 2 +- modules/enterprise/agent/pom.xml | 2 +- modules/enterprise/agentupdate/pom.xml | 2 +- modules/enterprise/binding/pom.xml | 4 ++-- modules/enterprise/comm/pom.xml | 2 +- modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +- modules/enterprise/gui/base-perspective-war/pom.xml | 2 +- modules/enterprise/gui/content_http-war/pom.xml | 2 +- modules/enterprise/gui/coregui/pom.xml | 2 +- modules/enterprise/gui/installer-war/pom.xml | 2 +- modules/enterprise/gui/pom.xml | 2 +- modules/enterprise/gui/portal-war/pom.xml | 2 +- modules/enterprise/gui/rest-war/pom.xml | 2 +- modules/enterprise/pom.xml | 2 +- modules/enterprise/remoting/cli/pom.xml | 2 +- modules/enterprise/remoting/client-api/pom.xml | 2 +- modules/enterprise/remoting/client-deps/pom.xml | 2 +- modules/enterprise/remoting/pom.xml | 2 +- modules/enterprise/remoting/webservices/pom.xml | 2 +- modules/enterprise/server/client-api/pom.xml | 4 ++-- modules/enterprise/server/container-lib/pom.xml | 2 +- modules/enterprise/server/container/pom.xml | 2 +- modules/enterprise/server/ear/pom.xml | 2 +- modules/enterprise/server/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 +- 125 files changed, 143 insertions(+), 143 deletions(-) New commits: commit ef0818dff9a528b71ac354ae1968077118037751 Author: Hudson <jboss-qa-internal(a)redhat.com> Date: Fri Oct 28 00:51:30 2011 -0400 development RHQ_4.3.0-SNAPSHOT diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index b080025..3a5f116 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.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 13cd80a..550ddfd 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index a5c0981..6a9bcf2 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.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 6273a4f..d645c7a 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.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index dfd8e5a..a999e68 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.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index bd88fa0..d7eedff 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.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 9f5f66a..c0ca9be 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 5a8b356..7eab16a 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index aa20853..dd75181 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.3.0-SNAPSHOT</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 bd0fdb4..164f5ad 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.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index bb4dc2c..e2b1d14 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 4a24392..151521d 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.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index 6b633bb..e01941d 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 25ae021..9718b0e 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.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index f2953a6..c143c00 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 62a73be..002912b 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.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index d388ca8..11efd74 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.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 199a996..88827a8 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.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 8b7ffe8..83aefb4 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.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index a6d3985..798353c 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Script Bindings</name> <description>Abstraction of different facilities and default configurations for script bindings</description> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index f424704..af241d2 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.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index cebd439..ce48f40 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.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml index b66da2c..e47afba 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.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index db7d757..e0c53c8 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index afb2fec..cecb704 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.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 900d476..0e65e6a 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.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index ecb02d5..bfac4e7 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 4e2ac9f..6c48f27 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.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml index 9ab5090..e828fbf 100644 --- a/modules/enterprise/gui/rest-war/pom.xml +++ b/modules/enterprise/gui/rest-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 01fb7f6..2627ebf 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.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 24fbb60..d2990f3 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.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index bacb64b..344f171 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.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml index 3fe07b7..d3dcb79 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.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index f4b1866..70333b1 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.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index dee43bc..28a0f43 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.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index c57eaba..e777e21 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.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Client API</name> <description>The implementation of the client API when accessing the server locally</description> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index 1aebae1..2139374 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.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 8b3a73a..1e55e08 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.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 18a7436..32ce3d3 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.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index f5ba55f..7206726 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.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index b380393..3d64b03 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server CLI Script Alert Plugin</name> <description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index e1e1890..103f28f 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.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Email Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index c38aff4..a63eeaf 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.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml index 1a27831..4bfdad5 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.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Log4J Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index 8574c9f..d9f7e6e 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.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 0adccaf..3a50667 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.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index 2c9bcfa..0fe30c2 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.3.0-SNAPSHOT</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.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Opertions Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 06bab65..86907a4 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.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Roles Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index bdee60f..8d255a1 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.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index bb595b5..8ba0b56 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.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 26f4409..65eccd7 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index bdfe647..be0f5ef 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.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Cobbler Plugin</name> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 403ef41..17ca168 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml index 9c9d3b6..9100ee7 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index 8cae6d5..936f60d 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml index 83bb64a..742e49c 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.3.0-SNAPSHOT</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.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server Groovy Script Plugin</name> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index dacaec2..327171a 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml index 9a51242..de0163a 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.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index f73ecb8..94a0f6c 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.3.0-SNAPSHOT</version> <relativePath>../../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index c2d5c7e..34e879a 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.3.0-SNAPSHOT</version> <relativePath>../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 3fa05d3..1e7d64d 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.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index 04df0b8..4dff432 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 79ccf2b..6669606 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 9e221a0..1cfef10 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index ce8468c..d24447a 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index 517be69..fed4410 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.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 05cb339..22faa19 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.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 00344d4..9d67aa1 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 2377858..0b54ce9 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.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 90c0da6..b071f6f 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.3.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index 9e80f1f..9be012c 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.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <build> <plugins> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index e488bb0..3b75eec 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <name>Performance Testing Support</name> <description>To support performance testing, this is a basic tool to support extracting and later reimporting of data from/to a database. diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 0c73fd3..92da29b 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.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 417a3df..93928a6 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index 206a7a7..9feecf3 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jboss-as-7-plugin-test/pom.xml b/modules/integration-tests/jboss-as-7-plugin-test/pom.xml index 95c697b..2744b37 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.3.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index 1b41b08..277fdc3 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.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index d983b6a..270330d 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index c62f40e..0c5505d 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 95ab8f8..e5d95e2 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index ff7d21f..f8e88f8 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 5037c78..331acc2 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index cb99a8c..9c12590 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 370b2de..d2c9331 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 6c1812b..a9be07c 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 700e775..1d6f220 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index d197727..f964998 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index 840e619..af68966 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 08f6555..6c647fb 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.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 0c7ec29..33eee7a 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index b097071..fd0b274 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.3.0-SNAPSHOT</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 2cdc32a..d3eaebb 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index 3632ceb..506ffeb 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index aba88a7..cfd2e9c 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.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index 389eba3..826861b 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 3e3432d..bd22e2f 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.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 56efc5b..84d7f79 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.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index ae06793..30ee17f 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.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index e042824..989825b 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index dc87ed7..bcbb309 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index 3a6deaa..7364fe3 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 835c57b..4919620 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 970f3ed..8b00d6a 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index ea74b9f..deb44d3 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 6b0791d..eb40cae 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 63dd974..670f437 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 003e77e..87206a7 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index f32159e..1ebba64 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.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 2a0eb28..dc905e9 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index d70ba83..d3ad8ac 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 19776c2..27aa74e 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index b1c3d22..0d72160 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.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 90337ed..cdb7869 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index d31afb9..c1b3fb2 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index e218ca8..472c868 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index a52a978..8317bdc 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.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 3a1df45..649d707 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 78ad464..ecf8343 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 1ae57af..01b7c6e 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.3.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index a13f91c..be036d3 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index 6565a7b..b83736c 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index e2fb957..116bbe5 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index c846655..179a29d 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.3.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 5c6e85c..0b19530 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.3.0-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index 45a9c14..040e7e6 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.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name>

12 years, 6 months

1
0
0 / 0

[rhq] Changes to 'refs/tags/RHQ_4_2_0'

by rhqci

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

12 years, 6 months

1
0
0 / 0

[rhq] Changes to 'release-4_2_0'

by rhqci

New branch 'release-4_2_0' available with the following commits: commit 57087e1a32fdd431a3ce6d88de1be54b39f1af13 Author: Hudson <jboss-qa-internal(a)redhat.com> Date: Fri Oct 28 00:49:16 2011 -0400 tag RHQ_4_2_0

12 years, 6 months

1
0
0 / 0

[rhq] release.sh

by snegrea

release.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit afa1c480da2e9a6db61a891df15a41ac9898287b Author: Stefan Negrea <snegrea(a)redhat.com> Date: Thu Oct 27 19:36:30 2011 -0500 Activate profiles in a consistent order with other the build environments. diff --git a/release.sh b/release.sh index 27da8aa..65a9596 100755 --- a/release.sh +++ b/release.sh @@ -242,13 +242,16 @@ set_local_and_environment_variables() MAVEN_SETTINGS_FILE="$HOME/.m2/settings.xml" fi - MAVEN_ARGS="--settings $MAVEN_SETTINGS_FILE -Dmaven.repo.local=$MAVEN_LOCAL_REPO_DIR --batch-mode --errors -Penterprise,dist,release" + MAVEN_ARGS="--settings $MAVEN_SETTINGS_FILE -Dmaven.repo.local=$MAVEN_LOCAL_REPO_DIR --batch-mode --errors" if [ -n "$EXTRA_MAVEN_PROFILE" ]; then - MAVEN_ARGS="$MAVEN_ARGS,$EXTRA_MAVEN_PROFILE" + MAVEN_ARGS="$MAVEN_ARGS --activate-profiles $EXTRA_MAVEN_PROFILE,enterprise,dist,release" + else + MAVEN_ARGS="$MAVEN_ARGS --activate-profiles enterprise,dist,release" fi + if [ "$RELEASE_TYPE" = "enterprise" ]; then MAVEN_ARGS="$MAVEN_ARGS -Dexclude-webdav "

12 years, 6 months

1
0
0 / 0

[rhq] modules/enterprise

by ips

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java | 20 ++++++---- 1 file changed, 13 insertions(+), 7 deletions(-) New commits: commit c0e659bb46582f44b1c61deca572345b422b6a95 Author: Ian Springer <ian.springer(a)redhat.com> Date: Thu Oct 27 16:53:07 2011 -0400 [BZ 749657] display not-all-available-records-loaded warning message within selector widget itself, rather than in the main message bar (https://bugzilla.redhat.com/show_bug.cgi?id=749657) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java index b75fe75..4ed99cf 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java @@ -38,6 +38,7 @@ import com.smartgwt.client.types.ListGridFieldType; import com.smartgwt.client.types.SelectionStyle; import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.ImgProperties; +import com.smartgwt.client.widgets.Label; import com.smartgwt.client.widgets.TransferImgButton; import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; @@ -62,9 +63,7 @@ import com.smartgwt.client.widgets.layout.SectionStack; import com.smartgwt.client.widgets.layout.SectionStackSection; import com.smartgwt.client.widgets.layout.VStack; -import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; -import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableSectionStack; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTransferImgButton; @@ -103,6 +102,7 @@ public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria protected Criteria latestCriteria; private boolean isReadOnly; + private Label messageLayout; public AbstractSelector(String locatorId) { this(locatorId, false); @@ -187,6 +187,9 @@ public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria if (!this.isReadOnly) { // LEFT SIDE + this.messageLayout = new Label(); + this.messageLayout.setMargin(3); + addMember(this.messageLayout); this.availableFilterForm = getAvailableFilterForm(); if (this.availableFilterForm != null) { addMember(this.availableFilterForm); @@ -373,13 +376,16 @@ public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria int totalAvailableRecords = totalRecords - assignedRecords.length; if (availableRecords.size() < totalAvailableRecords) { // TODO: i18n - Message message = new Message("Only " + availableRecords.size() + " out of " + messageLayout.setContents("<b>Note:</b> Only " + availableRecords.size() + " out of " + totalAvailableRecords + " available " + getItemTitle() - + " are listed - please specify one or more filters to find the " + getItemTitle() - + " for which you are looking.", - Message.Severity.Warning); - CoreGUI.getMessageCenter().notify(message); + + " are listed - please specify more specific filters below to find the " + getItemTitle() + + " for which you are looking."); + } else { + // Clear the warning message, if any, from the previous fetch. + // Note, surprisingly, setContents(null) doesn't work. + messageLayout.setContents(" "); } + messageLayout.markForRedraw(); availableGrid.setData(availableRecords.toArray(new Record[availableRecords.size()])); } finally { updateButtonEnablement();

12 years, 6 months

1
0
0 / 0

[rhq] modules/enterprise

by ips

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java | 5 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java | 5 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java | 5 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java | 5 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java | 2 +- 5 files changed, 21 insertions(+), 1 deletion(-) New commits: commit 4d7897515f1dd0d381cfcc12bc2fd8a8750785dd Author: Ian Springer <ian.springer(a)redhat.com> Date: Thu Oct 27 15:45:03 2011 -0400 [BZ 749654] (stopgap workaround for RHQ 4.2) for selectors with no filters, set the available record page size to 500, rather than 100, to minimize the chances of use not being able to view some available items (https://bugzilla.redhat.com/show_bug.cgi?id=749654) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java index bf82a12..d1358e5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java @@ -60,6 +60,11 @@ public class RoleSubjectSelector extends AbstractSelector<Subject, SubjectCriter } @Override + protected int getMaxAvailableRecords() { + return 500; + } + + @Override protected Criteria getLatestCriteria(DynamicForm availableFilterForm) { return null; // No Filters Currently } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java index 1c27994..44c2188 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java @@ -49,6 +49,11 @@ public class SubjectRoleSelector extends AbstractSelector<Role, RoleCriteria> { } @Override + protected int getMaxAvailableRecords() { + return 500; + } + + @Override protected RPCDataSource<Role, RoleCriteria> getDataSource() { return new RolesDataSource(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java index c4a7c51..2ba41e1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java @@ -181,6 +181,11 @@ public class SystemRolesNotificationSenderForm extends AbstractNotificationSende } @Override + protected int getMaxAvailableRecords() { + return 500; + } + + @Override protected Criteria getLatestCriteria(DynamicForm availableFilterForm) { return null; // No Filters Currently } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java index e7139a7..dbf1a8c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java @@ -192,6 +192,11 @@ public class SystemUsersNotificationSenderForm extends AbstractNotificationSende } @Override + protected int getMaxAvailableRecords() { + return 500; + } + + @Override protected Criteria getLatestCriteria(DynamicForm availableFilterForm) { return null; // No Filters Currently } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java index 9b9f4c4..b75fe75 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java @@ -315,7 +315,7 @@ public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria }); } this.datasource = getDataSource(); - this.datasource.setDataPageSize(MAX_AVAILABLE_RECORDS); + this.datasource.setDataPageSize(getMaxAvailableRecords()); populateAvailableGrid((null == latestCriteria) ? new Criteria() : latestCriteria); // Add event handlers.

12 years, 6 months

1
0
0 / 0

[rhq] modules/enterprise

by John Sanda

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 670c2a76b570312eedc71e6d1bffaaadae39e2d1 Author: John Sanda <jsanda(a)redhat.com> Date: Thu Oct 27 15:28:16 2011 -0400 [BZ 749415] check the right entity context to determine which drift config def to use diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java index 9b0c9d9..0815405 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java @@ -21,6 +21,7 @@ package org.rhq.enterprise.gui.coregui.client.drift.wizard; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.widgets.Canvas; +import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.drift.DriftConfigurationDefinition; @@ -64,7 +65,7 @@ public class DriftAddDefinitionWizardConfigStep extends AbstractWizardStep { } private ConfigurationDefinition getDriftConfigDef() { - if (wizard.getEntityContext().isSubsystemView()) { + if (wizard.getEntityContext().getType() == EntityContext.Type.ResourceTemplate) { return DriftConfigurationDefinition.getNewTemplateInstance(); }

12 years, 6 months

1
0
0 / 0

[rhq] modules/core modules/enterprise

by John Sanda

modules/core/domain/src/test/java/org/rhq/core/domain/drift/JPADriftChangeSetTest.java | 37 ++++--- modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java | 48 ++++++---- modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java | 5 - modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java | 16 +-- modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java | 39 ++++---- 5 files changed, 82 insertions(+), 63 deletions(-) New commits: commit 00ac4e3e4b027cb02a29ebf35766e96c15d35df9 Author: John Sanda <jsanda(a)redhat.com> Date: Thu Oct 27 14:50:14 2011 -0400 fixing/updating tests In a previous commit, the JPADrift.changeSet property was made required. This required a number of tests to be updated. diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/drift/JPADriftChangeSetTest.java b/modules/core/domain/src/test/java/org/rhq/core/domain/drift/JPADriftChangeSetTest.java index 89789ff..b2eddb3 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/drift/JPADriftChangeSetTest.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/drift/JPADriftChangeSetTest.java @@ -119,35 +119,38 @@ public class JPADriftChangeSetTest extends DriftDataAccessTest { @Test(groups = {"JPADriftChangeSet", "drift.ejb"}) public void saveAndLoadInitialChangeSet() { - JPADrift drift = new JPADrift(null, "drift.1", FILE_ADDED, null, null); - drift.setDirectory("/basedir"); - - JPADriftSet driftSet = new JPADriftSet(); - driftSet.addDrift(drift); - - final JPADriftChangeSet changeSet = new JPADriftChangeSet(); - changeSet.setCategory(COVERAGE); - changeSet.setVersion(0); - changeSet.setDriftDefinition(definition); - changeSet.setDriftHandlingMode(DriftHandlingMode.normal); - changeSet.setResource(resource); - changeSet.setInitialDriftSet(driftSet); - executeInTransaction(new TransactionCallback() { @Override public void execute() throws Exception { EntityManager em = getEntityManager(); + + JPADriftChangeSet changeSet = new JPADriftChangeSet(); + changeSet.setCategory(COVERAGE); + changeSet.setVersion(0); + changeSet.setDriftDefinition(definition); + changeSet.setDriftHandlingMode(DriftHandlingMode.normal); + changeSet.setResource(resource); + em.persist(changeSet); em.flush(); + + JPADriftSet driftSet = new JPADriftSet(); + driftSet.addDrift(new JPADrift(changeSet, "drift.1", FILE_ADDED, null, null)); + + em.persist(driftSet); + changeSet.setInitialDriftSet(driftSet); + em.merge(changeSet); + em.flush(); em.clear(); + JPADriftChangeSet savedChangeSet = em .find(JPADriftChangeSet.class, Integer.parseInt(changeSet.getId())); assertNotNull("Failed to persist change set", savedChangeSet); - JPADriftSet driftSet = savedChangeSet.getInitialDriftSet(); - assertNotNull("Failed to persist drift set", driftSet); - assertEquals("Failed to persist drift belonging to drift set", 1, driftSet.getDrifts().size()); + JPADriftSet savedDriftSet = savedChangeSet.getInitialDriftSet(); + assertNotNull("Failed to persist drift set", savedDriftSet); + assertEquals("Failed to persist drift belonging to drift set", 1, savedDriftSet.getDrifts().size()); } }); } diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java index a39faa0..125dfb3 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java @@ -278,15 +278,14 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest { final DriftDefinition detachedDef2 = createDefinition(template, "detachedDef2", false); // create initial change set from which the snapshot will be generated + final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(resource, 0, COVERAGE, attachedDef1); + driftFile1 = new JPADriftFile("a1b2c3"); - drift1 = new JPADrift(null, "drift.1", FILE_ADDED, null, driftFile1); + drift1 = new JPADrift(changeSet0, "drift.1", FILE_ADDED, null, driftFile1); - JPADriftSet driftSet = new JPADriftSet(); + final JPADriftSet driftSet = new JPADriftSet(); driftSet.addDrift(drift1); - final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(resource, 0, COVERAGE, attachedDef1); - changeSet0.setInitialDriftSet(driftSet); - // create change set v1 driftFile2 = new JPADriftFile("1a2b3c"); final JPADriftChangeSet changeSet1 = new JPADriftChangeSet(resource, 1, DRIFT, attachedDef1); @@ -296,13 +295,19 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest { @Override public void execute() throws Exception { EntityManager em = getEntityManager(); + em.persist(attachedDef1); + em.persist(driftFile1); em.persist(driftFile2); - em.persist(drift1); - em.persist(drift2); + em.persist(changeSet0); + em.persist(driftSet); + changeSet0.setInitialDriftSet(driftSet); + em.merge(changeSet0); + em.persist(changeSet1); + em.persist(drift2); em.persist(attachedDef2); em.persist(detachedDef1); @@ -404,39 +409,44 @@ public class DriftTemplateManagerBeanTest extends DriftServerTest { final DriftDefinition detachedDef2 = createDefinition(template, "detachedDef2", false); // create some change sets + final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(resource, 0, COVERAGE, attachedDef1); + driftFile1 = new JPADriftFile("a1b2c3"); - drift1 = new JPADrift(null, "drift.1", FILE_ADDED, null, driftFile1); + drift1 = new JPADrift(changeSet0, "drift.1", FILE_ADDED, null, driftFile1); - JPADriftSet driftSet0 = new JPADriftSet(); + final JPADriftSet driftSet0 = new JPADriftSet(); driftSet0.addDrift(drift1); - final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(resource, 0, COVERAGE, attachedDef1); - changeSet0.setInitialDriftSet(driftSet0); - + final JPADriftChangeSet changeSet1 = new JPADriftChangeSet(resource, 0, DRIFT, detachedDef1); driftFile2 = new JPADriftFile("1a2b3c"); - drift2 = new JPADrift(null, "drift.2", FILE_ADDED, null, driftFile2); + drift2 = new JPADrift(changeSet1, "drift.2", FILE_ADDED, null, driftFile2); - JPADriftSet driftSet1 = new JPADriftSet(); + final JPADriftSet driftSet1 = new JPADriftSet(); driftSet1.addDrift(drift2); - final JPADriftChangeSet changeSet1 = new JPADriftChangeSet(resource, 0, DRIFT, detachedDef1); - changeSet1.setInitialDriftSet(driftSet1); - executeInTransaction(new TransactionCallback() { @Override public void execute() throws Exception { EntityManager em = getEntityManager(); + em.persist(attachedDef1); em.persist(attachedDef2); em.persist(detachedDef1); em.persist(detachedDef2); + em.persist(driftFile1); em.persist(driftFile2); - em.persist(drift1); - em.persist(drift2); + em.persist(changeSet0); + em.persist(driftSet0); + changeSet0.setInitialDriftSet(driftSet0); + em.merge(changeSet0); + em.persist(changeSet1); + em.persist(driftSet1); + changeSet1.setInitialDriftSet(driftSet1); + em.merge(changeSet1); } }); diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java index 5afca31..2b3b33a 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java @@ -260,10 +260,11 @@ public class JPADriftServerBeanTest extends DriftServerTest { @Override public void execute() throws Exception { EntityManager em = getEntityManager(); - em.persist(driftSet); - changeSet.setInitialDriftSet(driftSet); em.persist(changeSet); em.persist(driftDef); + em.persist(driftSet); + changeSet.setInitialDriftSet(driftSet); + em.merge(changeSet); } }); diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java index cfcc4ba..1353293 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java @@ -103,20 +103,19 @@ public class ManageDriftDefinitionsTest extends DriftServerTest { // and persisting the pinned change set. // first create the change set + final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(null, 0, COVERAGE, null); + changeSet0.setDriftHandlingMode(DriftConfigurationDefinition.DriftHandlingMode.normal); + final JPADriftFile driftFile1 = new JPADriftFile("a1b2c3"); final JPADriftFile driftFile2 = new JPADriftFile("1a2b3c"); - JPADrift drift1 = new JPADrift(null, "drift.1", FILE_ADDED, null, driftFile1); - JPADrift drift2 = new JPADrift(null, "drift.2", FILE_ADDED, null, driftFile2); + JPADrift drift1 = new JPADrift(changeSet0, "drift.1", FILE_ADDED, null, driftFile1); + JPADrift drift2 = new JPADrift(changeSet0, "drift.2", FILE_ADDED, null, driftFile2); - JPADriftSet driftSet = new JPADriftSet(); + final JPADriftSet driftSet = new JPADriftSet(); driftSet.addDrift(drift1); driftSet.addDrift(drift2); - final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(null, 0, COVERAGE, null); - changeSet0.setInitialDriftSet(driftSet); - changeSet0.setDriftHandlingMode(DriftConfigurationDefinition.DriftHandlingMode.normal); - // create the template final DriftDefinition templateDef = new DriftDefinition(new Configuration()); templateDef.setName("test_createUnpinnedDefinition"); @@ -137,6 +136,9 @@ public class ManageDriftDefinitionsTest extends DriftServerTest { em.persist(driftFile1); em.persist(driftFile2); em.persist(changeSet0); + em.persist(driftSet); + changeSet0.setInitialDriftSet(driftSet); + em.merge(changeSet0); // setting the change set id on the template is the last and the // most important step in making the template pinned diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java index dbab012..190df2f 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java @@ -45,11 +45,8 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.criteria.GenericDriftChangeSetCriteria; import org.rhq.core.domain.drift.Drift; import org.rhq.core.domain.drift.DriftChangeSet; -import org.rhq.core.domain.drift.DriftConfigurationDefinition; import org.rhq.core.domain.drift.DriftDefinition; -import org.rhq.core.domain.drift.DriftDefinitionTemplate; import org.rhq.core.domain.drift.DriftSnapshot; -import org.rhq.core.domain.drift.DriftSnapshotRequest; import org.rhq.core.domain.drift.JPADrift; import org.rhq.core.domain.drift.JPADriftChangeSet; import org.rhq.core.domain.drift.JPADriftFile; @@ -74,21 +71,23 @@ public class ManageSnapshotsTest extends DriftServerTest { final DriftDefinition driftDef = createAndPersistDriftDef("test::setPinnedFlag"); // create initial change set + final JPADriftChangeSet changeSet = new JPADriftChangeSet(resource, 0, COVERAGE, driftDef); + final JPADriftFile driftFile1 = new JPADriftFile("a1b2c3"); - JPADrift drift = new JPADrift(null, "drift.1", FILE_ADDED, null, driftFile1); + JPADrift drift = new JPADrift(changeSet, "drift.1", FILE_ADDED, null, driftFile1); - JPADriftSet driftSet = new JPADriftSet(); + final JPADriftSet driftSet = new JPADriftSet(); driftSet.addDrift(drift); - final JPADriftChangeSet changeSet = new JPADriftChangeSet(resource, 0, COVERAGE, driftDef); - changeSet.setInitialDriftSet(driftSet); - executeInTransaction(new TransactionCallback() { @Override public void execute() throws Exception { EntityManager em = getEntityManager(); em.persist(driftFile1); em.persist(changeSet); + em.persist(driftSet); + changeSet.setInitialDriftSet(driftSet); + em.merge(changeSet); } }); @@ -104,15 +103,14 @@ public class ManageSnapshotsTest extends DriftServerTest { final DriftDefinition driftDef = createAndPersistDriftDef("test::makeSnapshotVersionZero"); // create initial change set + final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(resource, 0, COVERAGE, driftDef); + final JPADriftFile driftFile1 = new JPADriftFile("a1b2c3"); - JPADrift drift1 = new JPADrift(null, "drift.1", FILE_ADDED, null, driftFile1); + JPADrift drift1 = new JPADrift(changeSet0, "drift.1", FILE_ADDED, null, driftFile1); - JPADriftSet driftSet = new JPADriftSet(); + final JPADriftSet driftSet = new JPADriftSet(); driftSet.addDrift(drift1); - final JPADriftChangeSet changeSet0 = new JPADriftChangeSet(resource, 0, COVERAGE, driftDef); - changeSet0.setInitialDriftSet(driftSet); - // create change set v1 final JPADriftFile driftFile2 = new JPADriftFile("1a2b3c"); final JPADriftChangeSet changeSet1 = new JPADriftChangeSet(resource, 1, DRIFT, driftDef); @@ -125,6 +123,9 @@ public class ManageSnapshotsTest extends DriftServerTest { em.persist(driftFile1); em.persist(driftFile2); em.persist(changeSet0); + em.persist(driftSet); + changeSet0.setInitialDriftSet(driftSet); + em.merge(changeSet0); em.persist(changeSet1); em.persist(drift2); } @@ -168,21 +169,23 @@ public class ManageSnapshotsTest extends DriftServerTest { final DriftDefinition driftDef = createAndPersistDriftDef("test::setPinnedFlag"); // create initial change set + final JPADriftChangeSet changeSet = new JPADriftChangeSet(resource, 0, COVERAGE, driftDef); + final JPADriftFile driftFile1 = new JPADriftFile("a1b2c3"); - JPADrift drift = new JPADrift(null, "drift.1", FILE_ADDED, null, driftFile1); + JPADrift drift = new JPADrift(changeSet, "drift.1", FILE_ADDED, null, driftFile1); - JPADriftSet driftSet = new JPADriftSet(); + final JPADriftSet driftSet = new JPADriftSet(); driftSet.addDrift(drift); - final JPADriftChangeSet changeSet = new JPADriftChangeSet(resource, 0, COVERAGE, driftDef); - changeSet.setInitialDriftSet(driftSet); - executeInTransaction(new TransactionCallback() { @Override public void execute() throws Exception { EntityManager em = getEntityManager(); em.persist(driftFile1); em.persist(changeSet); + em.persist(driftSet); + changeSet.setInitialDriftSet(driftSet); + em.merge(changeSet); } });

12 years, 6 months

1
0
0 / 0

[rhq] 7 commits - modules/core modules/enterprise

by Jay Shaughnessy

modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml | 2 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 1 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionTemplateCriteria.java | 21 +- modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADrift.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java | 45 +++++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewPath.java | 10 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java | 14 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateDataSource.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java | 16 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java | 73 ---------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java | 48 ++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizard.java | 51 +++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizard.java | 32 +--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java | 32 +++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java | 17 +- 23 files changed, 216 insertions(+), 177 deletions(-) New commits: commit 1c2862f3392862f2a3e379cb28a80911c8028852 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Oct 27 11:52:10 2011 -0400 A post 4.2 TODO for Table diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java index 8d6e3a4..2fa8985 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java @@ -228,6 +228,8 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements this.flexRowDisplay = flexRowDisplay; } + // TODO: I think this should just be a simple getter. Returning the canvas before we're initialized is likely + // a bad thing. -Jay. Will do after the 4.2 release as it doesn't seem to bite us at the moment. /** * Returns the encompassing canvas that contains all content for this table component. * This content includes the list grid, the buttons, etc. @@ -407,7 +409,6 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements drawFooter(); } - if (!autoFetchData && (initialCriteria != null)) { refresh(); } @@ -1073,7 +1074,6 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements field.setHidden(true); } - // -------------- Inner utility classes ------------- // /** commit f86c826a01b08f27ccae0c1b5c7ad174d950a459 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Oct 27 11:51:58 2011 -0400 [BZ 749432 - Drift detail view navigation issues] Provide a temporary solution for navigating to Drift detail from various places in the drift gui. As it stands the DriftSnapshotView does not offer support for proper Master-Detail and this is complicated by the various ways in which the SnapshotView is embedded into the gui, at the resource and template levels. The basic fallout is that the backButton for the drift detail page is not going to bring you back to the snapshot page, but rather that page's parent view. My plan is to hopefully embed the detail view into the snapshot view (via expanding rows), making the whole navigation issue moot. But that is post RHQ 4.2 diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java index 4bc881d..1985cd4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java @@ -25,6 +25,7 @@ package org.rhq.enterprise.gui.coregui.client; import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.enterprise.gui.coregui.client.admin.roles.RolesView; +import org.rhq.enterprise.gui.coregui.client.admin.templates.DriftDefinitionTemplateTypeView; import org.rhq.enterprise.gui.coregui.client.admin.users.UsersView; import org.rhq.enterprise.gui.coregui.client.components.table.StringIDTableSection; @@ -395,7 +396,7 @@ public class LinkManager { } } - public static String getAdminTemplatesEditLink(String viewName, String typeId) { + public static String getAdminTemplatesEditLink(String viewName, int typeId) { if (GWT) { return "#Administration/Configuration/" + viewName + "/" + typeId; } else { @@ -516,15 +517,51 @@ public class LinkManager { return "#Resource/" + resourceId + "/Drift/Definitions/" + driftDefId + "/Edit"; } - public static String getDriftHistoryLink(int resourceId, int driftDefId, String driftId) { + public static String getDriftCarouselDriftLink(int resourceId, int driftDefId, String driftId) { if (!driftId.startsWith(StringIDTableSection.ID_PREFIX)) { driftId = StringIDTableSection.ID_PREFIX + driftId; } - return "#Resource/" + resourceId + "/Drift/Definitions/" + driftDefId + "/History/" + driftId; + return "#Resource/" + resourceId + "/Drift/Definitions/" + driftDefId + "/Drift/" + driftId; } - public static String getDriftSnapshotLink(int resourceId, int driftDefId, int version) { + public static String getDriftCarouselSnapshotLink(int resourceId, int driftDefId, int version) { return "#Resource/" + resourceId + "/Drift/Definitions/" + driftDefId + "/Snapshot/" + version; } + public static String getDriftCarouselSnapshotDriftLink(int resourceId, int driftDefId, int version, String driftId) { + if (!driftId.startsWith(StringIDTableSection.ID_PREFIX)) { + driftId = StringIDTableSection.ID_PREFIX + driftId; + } + + // TODO: for now, just make this the same as the carousel drift link. The downside is that the back button + // will bring us back to the carousel and not the snapshot view. Eventually would like another + // master-detail relationship here, but it's hairy to get this working. + // + // return "#Resource/" + resourceId + "/Drift/Definitions/" + driftDefId + "/Snapshot/" + version + "/" + driftId; + + return getDriftCarouselDriftLink(resourceId, driftDefId, driftId); + } + + public static String getDriftTemplateLink(int typeId, int templateId) { + String result = getAdminTemplatesEditLink(DriftDefinitionTemplateTypeView.VIEW_ID.getName(), typeId); + + return result + "/" + templateId; + } + + public static String getDriftTemplateSnapshotLink(int typeId, int templateId) { + String result = getDriftTemplateLink(typeId, templateId); + + return result + "/Snapshot"; + } + + public static String getDriftTemplateSnapshotDriftLink(int typeId, int templateId, String driftId) { + String result = getDriftTemplateSnapshotLink(typeId, templateId); + + if (!driftId.startsWith(StringIDTableSection.ID_PREFIX)) { + driftId = StringIDTableSection.ID_PREFIX + driftId; + } + + return result + "/" + driftId; + } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java index 0c495b5..a4da48b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java @@ -71,7 +71,7 @@ public class AlertDefinitionTemplateTypeView extends ResourceTypeTreeView { return LinkManager.getAdminTemplatesLink(VIEW_ID.getName()); } - return LinkManager.getAdminTemplatesEditLink(VIEW_ID.getName(), typeId); + return LinkManager.getAdminTemplatesEditLink(VIEW_ID.getName(), Integer.valueOf(typeId)); } @Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java index 72f11a2..ea18a4e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java @@ -74,7 +74,7 @@ public class DriftDefinitionTemplateTypeView extends ResourceTypeTreeView { return LinkManager.getAdminTemplatesLink(VIEW_ID.getName()); } - return LinkManager.getAdminTemplatesEditLink(VIEW_ID.getName(), typeId); + return LinkManager.getAdminTemplatesEditLink(VIEW_ID.getName(), Integer.valueOf(typeId)); } @Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java index 6296c42..858bc8d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java @@ -69,7 +69,7 @@ public class MetricTemplateTypeView extends ResourceTypeTreeView { return LinkManager.getAdminTemplatesLink(VIEW_ID.getName()); } - return LinkManager.getAdminTemplatesEditLink(VIEW_ID.getName(), typeId); + return LinkManager.getAdminTemplatesEditLink(VIEW_ID.getName(), Integer.valueOf(typeId)); } @Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java index d8371db..7872a0c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java @@ -94,8 +94,7 @@ public class ResourceAlertDefinitionsDataSource extends AbstractAlertDefinitions } else { if (parentId != null && parentId.intValue() != 0) { record.setAttribute(FIELD_PARENT, LinkManager.getAdminTemplatesEditLink( - AlertDefinitionTemplateTypeView.VIEW_ID.getName(), String.valueOf(this.resource.getResourceType() - .getId())) + AlertDefinitionTemplateTypeView.VIEW_ID.getName(), this.resource.getResourceType().getId()) + "/" + parentId); record.setLinkText(MSG.view_alert_definition_for_type()); } else { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java index fbf4123..47b5d3d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java @@ -103,7 +103,7 @@ public class DriftCarouselMemberView extends DriftHistoryView implements Carouse Integer resourceId = record.getAttributeAsInt(AncestryUtil.RESOURCE_ID); Integer driftDefId = record.getAttributeAsInt(DriftDataSource.ATTR_CHANGESET_DEF_ID); String driftId = getId(record); - String url = LinkManager.getDriftHistoryLink(resourceId, driftDefId, driftId); + String url = LinkManager.getDriftCarouselDriftLink(resourceId, driftDefId, driftId); CoreGUI.goToView(url); } } @@ -149,7 +149,7 @@ public class DriftCarouselMemberView extends DriftHistoryView implements Carouse public void updateTitleCanvas(String titleString) { int resourceId = getContext().getResourceId(); String imageHtml = Canvas.imgHTML(ImageManager.getViewIcon()); - String link = LinkManager.getDriftSnapshotLink(resourceId, changeSet.getDriftDefinitionId(), changeSet + String link = LinkManager.getDriftCarouselSnapshotLink(resourceId, changeSet.getDriftDefinitionId(), changeSet .getVersion()); StringBuilder sb = new StringBuilder(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java index 7239ef6..4489472 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java @@ -72,7 +72,7 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi private boolean hasWriteAccess; private Integer maxCarouselEndFilter; private ArrayList<Record> selectedRecords = new ArrayList<Record>(); - private boolean useHistoryDetailsView; + private boolean useDriftDetailsView; private DriftGWTServiceAsync driftService = GWTServiceLookup.getDriftService(); @@ -397,16 +397,16 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi return true; } - // this class is somewhat unusual in that it is a detail view for the drift defs list view, but also a pseudo- - // master view for snapshot and drift detail views. It's "pseudo" in that there is no master-detail infrastructure + // this class is somewhat unusual in that it is a detail view for the drift defs list view, but also a pseudo-master + // view for snapshot and drift detail views. It's "pseudo" in that there is no master-detail infrastructure // like that found in TableSection. The following paths must be handled (starting at the ^): - // #Resource/10001/Drift/Definitions/10001/History/driftId + // #Resource/10001/Drift/Definitions/10001/Drift/driftId // #Resource/10001/Drift/Definitions/10001/Snapshot/version // ^ @Override public void renderView(ViewPath viewPath) { if (!viewPath.isEnd() && !viewPath.isNextEnd()) { - this.useHistoryDetailsView = !viewPath.isNextEnd() && "History".equals(viewPath.getNext().getPath()); + this.useDriftDetailsView = !viewPath.isNextEnd() && "Drift".equals(viewPath.getNext().getPath()); } super.renderView(viewPath); @@ -414,8 +414,8 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi @Override public Canvas getDetailsView(String id) { - if (this.useHistoryDetailsView) { - return new DriftDetailsView(extendLocatorId("History"), id); + if (this.useDriftDetailsView) { + return new DriftDetailsView(extendLocatorId("Drift"), id); } return new DriftSnapshotView(extendLocatorId("Snapshot"), null, context.getResourceId(), driftDefId, Integer diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java index 69335e3..71ffeca 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java @@ -108,8 +108,8 @@ public class DriftDefinitionDataSource extends RPCDataSource<DriftDefinitionComp public void onRecordClick(RecordClickEvent event) { switch (entityContext.getType()) { case Resource: - CoreGUI.goToView(LinkManager.getDriftSnapshotLink(entityContext.getResourceId(), event.getRecord() - .getAttributeAsInt(ATTR_ID), 0)); + CoreGUI.goToView(LinkManager.getDriftCarouselSnapshotLink(entityContext.getResourceId(), event + .getRecord().getAttributeAsInt(ATTR_ID), 0)); break; default: throw new IllegalArgumentException("Entity Type not supported"); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateDataSource.java index 034a039..ffcbf5e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateDataSource.java @@ -115,7 +115,7 @@ public class DriftDefinitionTemplateDataSource extends if (event.getRecord().getAttributeAsBoolean(ATTR_IS_PINNED)) { CoreGUI.goToView(LinkManager.getAdminTemplatesEditLink(DriftDefinitionTemplateTypeView.VIEW_ID - .getName(), String.valueOf(resourceTypeId)) + .getName(), resourceTypeId) + "/" + event.getRecord().getAttribute(ATTR_ID) + "/Snapshot"); } } @@ -157,7 +157,7 @@ public class DriftDefinitionTemplateDataSource extends public void onRecordClick(RecordClickEvent event) { CoreGUI.goToView(LinkManager.getAdminTemplatesEditLink(DriftDefinitionTemplateTypeView.VIEW_ID - .getName(), String.valueOf(resourceTypeId)) + .getName(), resourceTypeId) + "/" + event.getRecord().getAttribute(ATTR_ID) + "/Edit"); } }); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java index 0d61047..8b0e4d5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java @@ -54,6 +54,7 @@ public class DriftDefinitionTemplatesView extends TableSection<DriftDefinitionTe private boolean hasWriteAccess; private DriftDefinitionTemplateDataSource dataSource; private boolean useSnapshotDetailsView; + private String snapshotDriftDetailsId; static { DriftCategory[] categoryValues = DriftCategory.values(); @@ -147,10 +148,7 @@ public class DriftDefinitionTemplatesView extends TableSection<DriftDefinitionTe } private void add() { - - DriftAddDefinitionWizard wizard = new DriftAddDefinitionWizard(EntityContext.forSubsystemView(), this.type, - this); - wizard.startWizard(); + DriftAddDefinitionWizard.showWizard(EntityContext.forTemplate(type.getId()), this); // we can refresh the table buttons immediately since the wizard is a dialog, the // user can't access enabled buttons anyway. @@ -192,6 +190,11 @@ public class DriftDefinitionTemplatesView extends TableSection<DriftDefinitionTe // one we're dealing with. The default is the editor. if (!viewPath.isEnd()) { this.useSnapshotDetailsView = !viewPath.isNextEnd() && "Snapshot".equals(viewPath.getNext().getPath()); + snapshotDriftDetailsId = null; + if (viewPath.viewsLeft() > 1) { + snapshotDriftDetailsId = viewPath.getViewForIndex(viewPath.getCurrentIndex() + 2).getPath().substring( + "0id_".length()); + } } super.renderView(viewPath); @@ -200,7 +203,10 @@ public class DriftDefinitionTemplatesView extends TableSection<DriftDefinitionTe @Override public Canvas getDetailsView(Integer driftTemplateId) { if (this.useSnapshotDetailsView) { - return new DriftDefinitionTemplateSnapshotView(extendLocatorId("TemplateSnapshot"), driftTemplateId); + if (null == snapshotDriftDetailsId) { + return new DriftDefinitionTemplateSnapshotView(extendLocatorId("TemplateSnapshot"), driftTemplateId); + } + return new DriftDetailsView(extendLocatorId("TemplateSnapshotDrift"), snapshotDriftDetailsId); } return new DriftDefinitionTemplateEditView(extendLocatorId("TemplateEdit"), driftTemplateId, hasWriteAccess); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java index f95cf77..801b258 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java @@ -158,7 +158,7 @@ public class DriftHistoryView extends StringIDTableSection<DriftDataSource> { Integer resourceId = record.getAttributeAsInt(AncestryUtil.RESOURCE_ID); Integer driftDefId = record.getAttributeAsInt(DriftDataSource.ATTR_CHANGESET_DEF_ID); String driftId = getId(record); - String url = LinkManager.getDriftHistoryLink(resourceId, driftDefId, driftId); + String url = LinkManager.getDriftCarouselDriftLink(resourceId, driftDefId, driftId); String formattedValue = TimestampCellFormatter.format(value); return SeleniumUtility.getLocatableHref(url, formattedValue, null); } @@ -166,77 +166,8 @@ public class DriftHistoryView extends StringIDTableSection<DriftDataSource> { } protected void setupTableInteractions(final boolean hasWriteAccess) { - - /* - * TODO add ack - * - TableActionEnablement singleTargetEnablement = hasWriteAccess ? TableActionEnablement.ANY - : TableActionEnablement.NEVER; - - addTableAction("AcknowledgeDrift", MSG.common_button_ack(), MSG.view_drift_ack_confirm(), - new AbstractTableAction(singleTargetEnablement) { - public void executeAction(ListGridRecord[] selection, Object actionValue) { - acknowledge(selection); - } - }); - - addTableAction("AcknowledgeAll", MSG.common_button_ack_all(), MSG.view_drift_ack_confirm_all(), - new TableAction() { - public boolean isEnabled(ListGridRecord[] selection) { - ListGrid grid = getListGrid(); - ResultSet resultSet = (null != grid) ? grid.getResultSet() : null; - return (hasWriteAccess && grid != null && resultSet != null && !resultSet.isEmpty()); - } - - public void executeAction(ListGridRecord[] selection, Object actionValue) { - acknowledgeAll(); - } - }); - * - * - */ - } - - /* - * TODO add ack - * - private void acknowledge(ListGridRecord[] records) { - final int[] alertIds = new int[records.length]; - for (int i = 0, selectionLength = records.length; i < selectionLength; i++) { - ListGridRecord record = records[i]; - Integer alertId = record.getAttributeAsInt(DriftDataSource.ATTR_ID); - alertIds[i] = alertId; - } - - GWTServiceLookup.getDriftService().acknowledgeDrifts(alertIds, new AsyncCallback<Integer>() { - public void onSuccess(Integer resultCount) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_drift_ack_success(String.valueOf(resultCount)), Message.Severity.Info)); - refresh(); - } - - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_drift_ack_failure(Arrays.toString(alertIds)), caught); - } - }); - } - - private void acknowledgeAll() { - GWTServiceLookup.getDriftService().acknowledgeDriftsByContext(context, new AsyncCallback<Integer>() { - public void onSuccess(Integer resultCount) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_drift_ack_success(String.valueOf(resultCount)), Message.Severity.Info)); - refresh(); - } - - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_drift_ack_failure_all(), caught); - } - }); + // currently no buttons, etc } - * - * - */ @Override public Canvas getDetailsView(String driftId) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java index 570f6f0..e0996eb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java @@ -32,6 +32,8 @@ import com.smartgwt.client.types.Alignment; import com.smartgwt.client.types.ExpansionMode; import com.smartgwt.client.types.ListGridFieldType; import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.events.DoubleClickEvent; +import com.smartgwt.client.widgets.events.DoubleClickHandler; import com.smartgwt.client.widgets.grid.CellFormatter; import com.smartgwt.client.widgets.grid.HoverCustomizer; import com.smartgwt.client.widgets.grid.ListGrid; @@ -70,8 +72,9 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; * * @author Jay Shaughnessy */ +// TODO: Make this extend an abstract table so we can set up true master-detail +//public class DriftSnapshotView extends StringIDTableSection<DriftSnapshotDataSource> { public class DriftSnapshotView extends Table<DriftSnapshotDataSource> { - private static final String DEFAULT_TITLE = MSG.view_drift_table_snapshot(); private Integer templateId; @@ -81,6 +84,7 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> { private boolean hasWriteAccess; private String templateChangeSetId; + private int templateResourceTypeId; protected DriftSnapshotDataSource dataSource; protected DriftSnapshotListGrid listGrid; @@ -159,6 +163,7 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> { } else { DriftDefinitionTemplateCriteria templateCriteria = new DriftDefinitionTemplateCriteria(); templateCriteria.addFilterId(templateId); + templateCriteria.fetchResourceType(true); DriftGWTServiceAsync driftService = GWTServiceLookup.getDriftService(); driftService.findDriftDefinitionTemplatesByCriteria(templateCriteria, @@ -172,6 +177,7 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> { String templateName = template.getName(); String title = MSG.view_drift_table_title_templateSnapshot(templateName); setTitleString(title); + templateResourceTypeId = template.getResourceType().getId(); DriftSnapshotView.super.onDraw(); } }); @@ -288,6 +294,23 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> { getListGrid().setFields(dataSourceFields.toArray(new ListGridField[dataSourceFields.size()])); super.configureTable(); + + // TODO: when we have true detail support then we'll want to remove this. + setListGridDoubleClickHandler(new DoubleClickHandler() { + @Override + public void onDoubleClick(DoubleClickEvent event) { + ListGrid listGrid = (ListGrid) event.getSource(); + ListGridRecord[] selectedRows = listGrid.getSelection(); + if (selectedRows != null && selectedRows.length == 1) { + String driftId = getId(selectedRows[0]); + String link = (null == templateId) ? LinkManager.getDriftCarouselSnapshotDriftLink(resourceId, + driftDefId, version, driftId) : LinkManager.getDriftTemplateSnapshotDriftLink( + templateResourceTypeId, templateId, driftId); + CoreGUI.goToView(link); + + } + } + }); } @Override @@ -302,9 +325,12 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> { return new CellFormatter() { public String format(Object value, ListGridRecord record, int i, int i1) { String driftId = getId(record); - String url = LinkManager.getDriftHistoryLink(resourceId, driftDefId, driftId); + String link = (null == templateId) ? LinkManager.getDriftCarouselSnapshotDriftLink(resourceId, + driftDefId, version, driftId) : LinkManager.getDriftTemplateSnapshotDriftLink( + templateResourceTypeId, templateId, driftId); + String formattedValue = TimestampCellFormatter.format(value); - return SeleniumUtility.getLocatableHref(url, formattedValue, null); + return SeleniumUtility.getLocatableHref(link, formattedValue, null); } }; } else { @@ -488,4 +514,20 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> { return (i < 0) ? path.trim() : path.substring(++i).trim(); } + // TODO: Make this extend an abstract table so we can set up true master-detail + + /* + @Override + public void renderView(ViewPath viewPath) { + viewPath.next(); + super.renderView(viewPath); + } + + + @Override + public Canvas getDetailsView(String driftId) { + return new DriftDetailsView(extendLocatorId("Details"), driftId); + } + */ + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java index c9c3a2f..5521ef5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java @@ -175,7 +175,7 @@ public class AlertDefinitionReportView extends Table<AlertDefinitionReportView.D } else { int typeId = result.get(0).getResourceType().getId(); CoreGUI.goToView(LinkManager.getAdminTemplatesEditLink( - AlertDefinitionTemplateTypeView.VIEW_ID.getName(), String.valueOf(typeId)) + AlertDefinitionTemplateTypeView.VIEW_ID.getName(), typeId) + "/" + templateId); } } commit 0ff9441b2962ccb0fc0aca0d718ffe2e4983d13e Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Oct 27 11:41:13 2011 -0400 Coregui: add ability to get the current viewpath index. Without this viewsLeft() and getViewForIndex() are not very useful. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewPath.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewPath.java index 47b1f91..e448610 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewPath.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewPath.java @@ -53,7 +53,7 @@ public class ViewPath { public String getParentViewPath() { return getPathToIndex(this.index - 1); } - + public ViewPath next() { index++; return this; @@ -75,6 +75,10 @@ public class ViewPath { } } + public int getCurrentIndex() { + return index; + } + public String getPathToCurrent() { return getPathToIndex(this.index); } @@ -102,13 +106,12 @@ public class ViewPath { return !(isEnd() || providedViewId == null || !getCurrent().equals(providedViewId)); } - public boolean isNext(ViewId providedViewId) { return ((index + 1) < viewPath.size() && providedViewId != null && getNext().equals(providedViewId)); } public boolean isNextEnd() { - return viewPath.size() <= index+1; + return viewPath.size() <= index + 1; } public int viewsLeft() { @@ -135,4 +138,3 @@ public class ViewPath { return path; } } - commit c5574b13b03dfa82f38b0aa1a579149416507e3e Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Oct 27 11:39:54 2011 -0400 Fix subtle caching issues suffered by the drift template wizards because of the way we were gathering a type's drift def templates. Now always gather this through the typerepository mechanism, which has been updated to handle things correctly. - also, fix the message supplied for a successful template pinning diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizard.java index ee9016a..cb59f03 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizard.java @@ -19,12 +19,12 @@ package org.rhq.enterprise.gui.coregui.client.drift.wizard; import java.util.ArrayList; +import java.util.EnumSet; import com.google.gwt.user.client.rpc.AsyncCallback; import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.criteria.ResourceCriteria; -import org.rhq.core.domain.criteria.ResourceTypeCriteria; import org.rhq.core.domain.drift.DriftDefinitionTemplate; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; @@ -33,6 +33,7 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.message.Message; /** @@ -42,7 +43,7 @@ public class DriftAddDefinitionWizard extends AbstractDriftAddDefinitionWizard { private Table<?> table; - public DriftAddDefinitionWizard(EntityContext context, ResourceType type, Table<?> table) { + protected DriftAddDefinitionWizard(EntityContext context, ResourceType type, Table<?> table) { super(context, type); this.table = table; @@ -110,7 +111,7 @@ public class DriftAddDefinitionWizard extends AbstractDriftAddDefinitionWizard { break; - case SubsystemView: + case ResourceTemplate: GWTServiceLookup.getDriftService().createTemplate(getType().getId(), getNewDriftDefinition(), new AsyncCallback<DriftDefinitionTemplate>() { public void onSuccess(DriftDefinitionTemplate result) { @@ -150,30 +151,8 @@ public class DriftAddDefinitionWizard extends AbstractDriftAddDefinitionWizard { throw new IllegalArgumentException("Entity not found [" + context + "]"); } - final Resource resource = result.get(0); - - // bypass type cache because this is infrequent and we don't need to cache the - // drift def templates - ResourceTypeCriteria rtc = new ResourceTypeCriteria(); - rtc.addFilterId(resource.getResourceType().getId()); - rtc.fetchDriftDefinitionTemplates(true); - GWTServiceLookup.getResourceTypeGWTService().findResourceTypesByCriteria(rtc, - new AsyncCallback<PageList<ResourceType>>() { - public void onSuccess(PageList<ResourceType> result) { - if (result.isEmpty()) { - throw new IllegalArgumentException("Resource Type not found [" - + resource.getResourceType().getId() + "]"); - } - - DriftAddDefinitionWizard wizard = new DriftAddDefinitionWizard(context, result.get(0), - table); - wizard.startWizard(); - } - - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.widget_typeTree_loadFail(), caught); - } - }); + Resource resource = result.get(0); + showWizard(context, resource.getResourceType().getId(), table); } public void onFailure(Throwable caught) { @@ -183,11 +162,29 @@ public class DriftAddDefinitionWizard extends AbstractDriftAddDefinitionWizard { break; + case ResourceTemplate: + showWizard(context, context.getResourceTypeId(), table); + + break; + default: throw new IllegalArgumentException("Entity Context Type not supported [" + context + "]"); } } + private static void showWizard(final EntityContext context, int resourceTypeId, final Table<?> table) { + + ResourceTypeRepository.Cache.getInstance().getResourceTypes(resourceTypeId, + EnumSet.of(ResourceTypeRepository.MetadataType.driftDefinitionTemplates), + new ResourceTypeRepository.TypeLoadedCallback() { + + public void onTypesLoaded(ResourceType type) { + DriftAddDefinitionWizard wizard = new DriftAddDefinitionWizard(context, type, table); + wizard.startWizard(); + } + }); + } + @Override public void cancel() { super.cancel(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizard.java index 77fd037..2a24e9b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizard.java @@ -19,11 +19,11 @@ package org.rhq.enterprise.gui.coregui.client.drift.wizard; import java.util.ArrayList; +import java.util.EnumSet; import com.google.gwt.user.client.rpc.AsyncCallback; import org.rhq.core.domain.criteria.DriftDefinitionCriteria; -import org.rhq.core.domain.criteria.ResourceTypeCriteria; import org.rhq.core.domain.drift.DriftDefinition; import org.rhq.core.domain.drift.DriftDefinitionTemplate; import org.rhq.core.domain.resource.Resource; @@ -33,6 +33,7 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.components.wizard.WizardStep; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.message.Message; /** @@ -104,15 +105,15 @@ public class DriftPinTemplateWizard extends AbstractDriftPinTemplateWizard { public void onSuccess(Void result) { CoreGUI.getMessageCenter().notify( - new Message(MSG.view_drift_wizard_addTemplate_success(template.getName()), + new Message(MSG.view_drift_wizard_pinTemplate_success(template.getName()), Message.Severity.Info)); getView().closeDialog(); DriftPinTemplateWizard.this.table.refresh(); } public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError( - MSG.view_drift_wizard_addDef_failure(template.getName()), caught); + CoreGUI.getErrorHandler().handleError(MSG.view_drift_wizard_addDef_failure(template.getName()), + caught); getView().closeDialog(); } }); @@ -146,25 +147,12 @@ public class DriftPinTemplateWizard extends AbstractDriftPinTemplateWizard { final DriftDefinition driftDef = result.get(0); final Resource resource = driftDef.getResource(); - // bypass type cache because this is infrequent and we don't need to cache the - // drift def templates - ResourceTypeCriteria rtc = new ResourceTypeCriteria(); - rtc.addFilterId(resource.getResourceType().getId()); - rtc.fetchDriftDefinitionTemplates(true); - GWTServiceLookup.getResourceTypeGWTService().findResourceTypesByCriteria(rtc, - new AsyncCallback<PageList<ResourceType>>() { - - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.widget_typeTree_loadFail(), caught); - } - - public void onSuccess(PageList<ResourceType> result) { - if (result.isEmpty()) { - throw new IllegalArgumentException("Resource Type not found [" - + resource.getResourceType().getId() + "]"); - } + ResourceTypeRepository.Cache.getInstance().getResourceTypes(resource.getResourceType().getId(), + EnumSet.of(ResourceTypeRepository.MetadataType.driftDefinitionTemplates), + new ResourceTypeRepository.TypeLoadedCallback() { - DriftPinTemplateWizard wizard = new DriftPinTemplateWizard(result.get(0), driftDef, + public void onTypesLoaded(ResourceType type) { + DriftPinTemplateWizard wizard = new DriftPinTemplateWizard(type, driftDef, snapshotVersion, table); wizard.startWizard(); } commit 1cc7902d28a21522f6f6be97351b57576374db51 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Oct 27 11:31:21 2011 -0400 Coregui: Add the ability for the ResourceType cache to provide non-cached data. This means for non-cached metadata types we'll always call to the db. This is basically a convenience such that we can make a single call through this mechanism to gather all the needed data for a type. Whether it merges cached and uncached data remains a black box to the caller. - set driftDefinitionTemplates as non-cached metadata because the drift templates available on a type can change as user-defined templates come and go. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java index 6a38d89..2b3dbb1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java @@ -57,8 +57,29 @@ public class ResourceTypeRepository { private static ResourceTypeGWTServiceAsync resourceTypeService = GWTServiceLookup.getResourceTypeGWTService(); + /** + * The following MetadadaTypes are not cached and will always be queried from the database:<br/> + * driftDefinitionTemplates + * + * @author Jay Shaughnessy + */ public enum MetadataType { - children, operations, measurements, content, events, pluginConfigurationDefinition, resourceConfigurationDefinition, subCategory, parentTypes, processScans, productVersions, driftDefinitionTemplates + children, operations, measurements, content, events, pluginConfigurationDefinition, resourceConfigurationDefinition, subCategory, parentTypes, processScans, productVersions, driftDefinitionTemplates( + false); + + private boolean isCachedMetadata; + + private MetadataType() { + this.isCachedMetadata = true; + } + + private MetadataType(boolean isCachedMetadata) { + this.isCachedMetadata = isCachedMetadata; + } + + public boolean isCachedMetadata() { + return isCachedMetadata; + } } public static class Cache { @@ -248,8 +269,7 @@ public class ResourceTypeRepository { criteria.fetchDriftDefinitionTemplates(true); break; default: - Log.error("Metadata type [" + metadataType.name() - + "] not incorporated into ResourceType criteria."); + Log.error("Metadata type [" + metadataType.name() + "] not incorporated into ResourceType criteria."); } } @@ -375,7 +395,11 @@ public class ResourceTypeRepository { if (typeCacheLevel.containsKey(type.getId())) { typeCacheLevel.get(type.getId()).addAll(metadataTypes); } else { - typeCacheLevel.put(type.getId(), EnumSet.copyOf(metadataTypes)); + for (MetadataType metadataType : metadataTypes) { + if (metadataType.isCachedMetadata) { + typeCacheLevel.put(type.getId(), EnumSet.copyOf(metadataTypes)); + } + } } } } commit 8024dda4197413cbec3e2041fce49873a8e303f3 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Oct 27 11:26:54 2011 -0400 Add optional fetch for DriftDefinitionTemplate.resourceType diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionTemplateCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionTemplateCriteria.java index ce1c017..d4ff131 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionTemplateCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionTemplateCriteria.java @@ -29,6 +29,7 @@ public class DriftDefinitionTemplateCriteria extends Criteria { private String filterName; private Integer filterResourceTypeId; + private boolean fetchResourceType; private boolean fetchDriftDefinitions; public DriftDefinitionTemplateCriteria() { @@ -40,19 +41,23 @@ public class DriftDefinitionTemplateCriteria extends Criteria { return DriftDefinitionTemplate.class; } - public void addFilterId(Integer id) { - filterId = id; + public void addFilterId(Integer filterId) { + this.filterId = filterId; } - public void addFilterName(String name) { - filterName = name; + public void addFilterName(String filterName) { + this.filterName = filterName; } - public void addFilterResourceTypeId(Integer resourceTypeId) { - filterResourceTypeId = resourceTypeId; + public void addFilterResourceTypeId(Integer filterResourceTypeId) { + this.filterResourceTypeId = filterResourceTypeId; } - public void fetchDriftDefinitions(boolean fetchDefinitions) { - fetchDriftDefinitions = fetchDefinitions; + public void fetchResourceType(boolean fetchResourceType) { + this.fetchResourceType = fetchResourceType; + } + + public void fetchDriftDefinitions(boolean fetchDriftDefinitions) { + this.fetchDriftDefinitions = fetchDriftDefinitions; } } commit 01811717506e1d7b61c74f1dd5c64f7b9df44dc7 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Oct 27 11:25:27 2011 -0400 Drift - Make JPADrift.changeSet not null. This field should never be null so define it that way. For a while nulls were allowed but that is no longer the case as every drift should refer to either a pinned template's change set or a drift definition's change set. 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 76613d2..d6975d5 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml @@ -728,7 +728,7 @@ <column name="CTIME" type="LONG" required="true"/> <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/> <column name="DRIFT_SET_ID" type="INTEGER" required="false" references="RHQ_DRIFT_SET"/> - <column name="DRIFT_CHANGE_SET_ID" type="INTEGER" required="false" references="RHQ_DRIFT_CHANGE_SET"/> + <column name="DRIFT_CHANGE_SET_ID" type="INTEGER" required="true" references="RHQ_DRIFT_CHANGE_SET"/>  <column name="PATH" type="VARCHAR2" size="1024" required="true"/> <!-- the same as PATH less [/]filename.ext. Redundant storage for the purpose of strict directory search. diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index bd040c6..9221532 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -3617,6 +3617,7 @@ <schema-addColumn table="RHQ_DRIFT" column="PATH_DIRECTORY" columnType="VARCHAR2" precision="1024" /> <schema-alterColumn table="RHQ_DRIFT" column="PATH_DIRECTORY" nullable="FALSE" /> <schema-addColumn table="RHQ_DRIFT" column="DRIFT_CHANGE_SET_ID" columnType="INTEGER" /> + <schema-alterColumn table="RHQ_DRIFT" column="DRIFT_CHANGE_SET_ID" nullable="FALSE" /> <schema-addColumn table="RHQ_DRIFT" column="DRIFT_SET_ID" columnType="INTEGER"/> <schema-directSQL> <statement desc="Creating RHQ_DRIFT foreign key relation to RHQ_DRIFT_CHANGE_SET"> diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADrift.java b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADrift.java index acfc55d..049dc6f 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADrift.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADrift.java @@ -84,8 +84,8 @@ public class JPADrift implements Serializable, Drift<JPADriftChangeSet, JPADrift @Enumerated(EnumType.STRING) private String directory; - @JoinColumn(name = "DRIFT_CHANGE_SET_ID", referencedColumnName = "ID", nullable = true) - @ManyToOne(fetch = FetchType.LAZY, optional = true) + @JoinColumn(name = "DRIFT_CHANGE_SET_ID", referencedColumnName = "ID", nullable = false) + @ManyToOne(fetch = FetchType.LAZY, optional = false) private JPADriftChangeSet changeSet; @JoinColumn(name = "OLD_DRIFT_FILE", referencedColumnName = "HASH_ID", nullable = true) 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 8c7b506..882d22e 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 @@ -233,11 +233,14 @@ public class JPADriftServerBean implements JPADriftServerLocal { for (Drift<?, ?> drift : changeSet.getDrifts()) { JPADrift jpaDrift = new JPADrift(jpaChangeSet, drift.getPath(), drift.getCategory(), toJPADriftFile(drift .getOldDriftFile()), toJPADriftFile(drift.getNewDriftFile())); + driftSet.addDrift(jpaDrift); } + entityManager.persist(jpaChangeSet); + entityManager.persist(driftSet); + jpaChangeSet.setInitialDriftSet(driftSet); - entityManager.persist(jpaChangeSet); return jpaChangeSet.getId(); } @@ -322,9 +325,9 @@ public class JPADriftServerBean implements JPADriftServerLocal { + "]. Change set cannot be saved."); return false; } - // Commenting out the following line for now. We want to set the - // version to the value specified in the headers, but we also - // want to get the latest version we have in the database so that + // TODO: Commenting out the following line for now. We want to set the + // version to the value specified in the headers, but we may want to also + // validate it against the latest version we have in the database so that // we can make sure that the agent is in sync with the server. // //int version = getChangeSetVersion(resource, config); @@ -370,7 +373,11 @@ public class JPADriftServerBean implements JPADriftServerLocal { for (FileEntry entry : reader) { JPADriftFile newDriftFile = getDriftFile(entry.getNewSHA(), emptyDriftFiles); String path = FileUtil.useForwardSlash(entry.getFile()); - driftSet.addDrift(new JPADrift(null, path, entry.getType(), null, newDriftFile)); + // A Drift always has a changeSet. Note that in this code section the changeset is + // always going to be set to a DriftDefinition's changeSet. But that is not always the + // case, it could also be set to a DriftDefinitionTemplate's changeSet. + driftSet.addDrift(new JPADrift(driftChangeSet, path, entry.getType(), null, + newDriftFile)); } entityManager.persist(driftSet); driftChangeSet.setInitialDriftSet(driftSet);

12 years, 6 months

1
0
0 / 0

[rhq] Changes to 'bug/748483'

by Robert Buck

New branch 'bug/748483' available with the following commits: commit 077a1b19bfdb4a4b814adf403488b2442d932e9a Author: Robert Buck <rbuck(a)redhat.com> Date: Thu Oct 27 09:36:04 2011 -0400 [BZ 748483] Make dbsetup sequence id cache size configurable.

12 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits October 2011