rhq-commits May 2012

rhq-commits@lists.fedorahosted.org

12 participants
326 discussions

[rhq] Branch 'rc/jon3.1.0.ER5' - 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 24 May '12

24 May '12

modules/cli-tests/pom.xml | 2 +- modules/common/ant-bundle/pom.xml | 2 +- modules/common/drift/pom.xml | 2 +- modules/common/filetemplate-bundle/pom.xml | 2 +- modules/common/jboss-as/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/core/arquillian-integration/archive/pom.xml | 2 +- modules/core/arquillian-integration/container/pom.xml | 2 +- modules/core/arquillian-integration/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-itest/pom.xml | 2 +- modules/core/plugin-container/pom.xml | 2 +- modules/core/plugin-test-api/pom.xml | 2 +- modules/core/plugin-test-util/pom.xml | 2 +- modules/core/plugin-validator/pom.xml | 2 +- modules/core/plugindoc/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/util/pom.xml | 2 +- modules/enterprise/agent/pom.xml | 2 +- modules/enterprise/agentupdate/pom.xml | 2 +- modules/enterprise/binding/pom.xml | 4 ++-- modules/enterprise/comm/pom.xml | 2 +- modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +- modules/enterprise/gui/base-perspective-war/pom.xml | 2 +- modules/enterprise/gui/content_http-war/pom.xml | 2 +- modules/enterprise/gui/coregui/pom.xml | 2 +- modules/enterprise/gui/installer-war/pom.xml | 2 +- modules/enterprise/gui/pom.xml | 2 +- modules/enterprise/gui/portal-war/pom.xml | 2 +- modules/enterprise/gui/rest-war/pom.xml | 2 +- modules/enterprise/pom.xml | 2 +- modules/enterprise/remoting/cli/pom.xml | 2 +- modules/enterprise/remoting/client-api/pom.xml | 2 +- modules/enterprise/remoting/client-deps/pom.xml | 2 +- modules/enterprise/remoting/pom.xml | 2 +- modules/enterprise/remoting/webservices/pom.xml | 2 +- modules/enterprise/server/client-api/pom.xml | 4 ++-- modules/enterprise/server/container-lib/pom.xml | 2 +- modules/enterprise/server/container/pom.xml | 2 +- modules/enterprise/server/ear/pom.xml | 2 +- modules/enterprise/server/itests/pom.xml | 2 +- modules/enterprise/server/jar/pom.xml | 2 +- modules/enterprise/server/plugins/alert-cli/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-email/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-irc/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-operations/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-roles/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-subject/pom.xml | 4 ++-- modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/cobbler/pom.xml | 4 ++-- modules/enterprise/server/plugins/disk/pom.xml | 2 +- modules/enterprise/server/plugins/drift-mongodb/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/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/jeeGen/pom.xml | 2 +- modules/helpers/perftest-support/pom.xml | 4 ++-- modules/helpers/pom.xml | 2 +- modules/helpers/rtfilter-subsystem/pom.xml | 2 +- modules/helpers/rtfilter/pom.xml | 2 +- modules/integration-tests/apache-plugin-test/pom.xml | 2 +- modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 2 +- modules/integration-tests/jndi-access/pom.xml | 2 +- modules/integration-tests/jndi-access/remote-server/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 +- 137 files changed, 155 insertions(+), 155 deletions(-) New commits: commit 5de0b8e4fb6b27d5c3e753faff54a936b20e037c Author: Hudson <jboss-qa-internal(a)redhat.com> Date: Thu May 24 00:27:04 2012 -0400 tag RHQ_4_4_0_JON310ER5 diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index 3141330..dab0f01 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 09bf308..668fd5d 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index 761268e..e34a410 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index fceb7bf..911cb44 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 dc5a309..7a2bc08 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 4bd55d2..e6c58c8 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/arquillian-integration/archive/pom.xml b/modules/core/arquillian-integration/archive/pom.xml index c971d99..79f10d0 100644 --- a/modules/core/arquillian-integration/archive/pom.xml +++ b/modules/core/arquillian-integration/archive/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent>  diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml index fe27670..fd614be 100644 --- a/modules/core/arquillian-integration/container/pom.xml +++ b/modules/core/arquillian-integration/container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent>  diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml index f7fb600..6d8d873 100644 --- a/modules/core/arquillian-integration/pom.xml +++ b/modules/core/arquillian-integration/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 53c721f..986d7fa 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 8ab2167..be509a6 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 2996c54..598f7fb 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 7006397..7a5fe07 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 9ff6c78..aa63126 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 505f77a..a0a96a4 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index cb2ba9e..67c1e82 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container-itest/pom.xml b/modules/core/plugin-container-itest/pom.xml index 5239595..b61e206 100644 --- a/modules/core/plugin-container-itest/pom.xml +++ b/modules/core/plugin-container-itest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <artifactId>rhq-core-plugin-container-itest</artifactId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index b989e5f..f39abaa 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-test-api/pom.xml b/modules/core/plugin-test-api/pom.xml index ccfc1d8..a73d0d9 100644 --- a/modules/core/plugin-test-api/pom.xml +++ b/modules/core/plugin-test-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <artifactId>rhq-core-plugin-test-api</artifactId> diff --git a/modules/core/plugin-test-util/pom.xml b/modules/core/plugin-test-util/pom.xml index 85955f3..70ecd49 100644 --- a/modules/core/plugin-test-util/pom.xml +++ b/modules/core/plugin-test-util/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index d077ff8..359b037 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index d0e9cf1..b2d76c9 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index f350e7c..2471244 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 9ede572..76ddaf4 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index e25668f..b7ce269 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 2d9cf1d..541c34c 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 359baa1..3c5ff82 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 9af1787..b0ed436 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 c5f6365..2bc82b1 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 2cb10e4..64016a4 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 c25bf1b..319605b 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 9c18ed6..baecde8 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 514dae4..ee8cd12 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 1f9c53b..223381a 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 680be5c..1a6328a 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 c40bef5..b51d0ae 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index a71a20a..396cdb5 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 76fd3e3..dd7b1bb 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 39a316b..3603101 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 4bf4133..a8c0351 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 5de24ec..f542b53 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index 5d84c7f..d2da0c7 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 075bab3..e49a571 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 5184b49..f8e25e8 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 7005e95..8a09142 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 0119cc5..dca100e 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml index f96bf06..33f17ea 100644 --- a/modules/enterprise/server/itests/pom.xml +++ b/modules/enterprise/server/itests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index daee116..bf7b942 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 c7f5d47..d072088 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 cac9abe..4dc430b 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 b8603ad..94e4843 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 891800d..468750c 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 a5b937d..cee7c74 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 dee6820..6d2d7a9 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 5d16801..f2dd7e0 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 b86357e..2f3b3ec 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 554c9b0..aae5c6f 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 0a2eae5..f80e2c8 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 3e8714d..7393d62 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 4dc8e19..0c285ce 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 f6ea33c..c083cd2 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/drift-mongodb/pom.xml b/modules/enterprise/server/plugins/drift-mongodb/pom.xml index 275d207..961628e 100644 --- a/modules/enterprise/server/plugins/drift-mongodb/pom.xml +++ b/modules/enterprise/server/plugins/drift-mongodb/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 233448f..a29fbf1 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 4f33fc6..fb810bc 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 159d7ed..0ba109a 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>groovy-script-server-plugin</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 fa5fbf9..39d2830 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 cb44676..351f863 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 fa17b74..7f993f2 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 94ca6e4..d029c94 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 7042f19..4ca02f3 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 03c1f88..6c7bbc7 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 b0c6e8b..3cffddc 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 8bf5764..0dcfbbd 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index 17ff04b..458c2bf 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 789d412..b37683a 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 9837d84..b5ade6c 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 2075405..e136691 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 dc49f7d..3e962ea 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index a496d8c..b9e1c0b 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <build> <plugins> diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml index 6d0f4de..25a9fc9 100644 --- a/modules/helpers/jeeGen/pom.xml +++ b/modules/helpers/jeeGen/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index 090b9ef..ef8142f 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 561a73b..994acde 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml index 98a50e9..8e71fbb 100644 --- a/modules/helpers/rtfilter-subsystem/pom.xml +++ b/modules/helpers/rtfilter-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index b926687..e87c66e 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index e9082b6..1082454 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml index 87a8b84..6c43b37 100644 --- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml +++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml index 641efc8..325ceeb 100644 --- a/modules/integration-tests/jndi-access/pom.xml +++ b/modules/integration-tests/jndi-access/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml index 9507dfc..268d974 100644 --- a/modules/integration-tests/jndi-access/remote-server/pom.xml +++ b/modules/integration-tests/jndi-access/remote-server/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index f7eca34..82ca3ba 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 4879880..a385e09 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 269fd3a..bb102fa 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 12c16fe..ddde709 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index f50e547..76cec09 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index fdbf5da..ee991b0 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index a7fe25e..0bdc831 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 8bb7858..2cf1a5c 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 0ed2904..5988f6d 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 9311066..9c96cc0 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 5cf8176..9e5a2e3 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index 4d0a221..4b3ab46 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 954f8df..f0c49be 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 1f45df3..78e08de 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 34a7d7d..4c8bb2e 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index ac15ed2..6b66353 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index fe43901..e1114e8 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 b6b730a..18b702d 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 865042b..7eb3083 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index b879d7d..ef24426 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 93ba8a6..e0573a5 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 5a6dfa5..1523dfa 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index a20ec35..47822db 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index b69a6db..a48fdd5 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index a17f13e..0bfd58d 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 467874d..a854fea 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 6ce11c5..dfd881d 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 317157e..43138e3 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 23936a0..399681e 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 1d22fab..258ff75 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 13ed138..d731553 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 4184401..91543c3 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 13eb05d..a1292bb 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index d06c792..e71b8b6 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index cb171f4..11f55ea 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index db5a0d6..5f11789 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index e654a70..e5010f1 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 4a8c713..77e1ea3 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 4c94705..8bd330e 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 80a215f..6ee0772 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 86ccdf0..4df7fb0 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index e2283a0..f5f11c0 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index abbc476..0bffa6f 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index bb21eab..5f3e5dc 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</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 716c544..ddfac5e 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index fa32294..10b9f8b 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 9f2f231..df12968 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 18c2a46..61d5755 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.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index caff8bf..042cca5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON310-SNAPSHOT</version> + <version>4.4.0.JON310ER5</version> <packaging>pom</packaging> <name>RHQ</name>

1 0

[rhq] modules/plugins
by ips 24 May '12

24 May '12

modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java | 74 ++++++++++ modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java | 4 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java | 53 +++++-- modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java | 13 + modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 4 5 files changed, 139 insertions(+), 9 deletions(-) New commits: commit 6eb0643d9d1e27376628048f564759cb87868487 Author: Ian Springer <ian.springer(a)redhat.com> Date: Wed May 23 21:31:11 2012 -0400 [BZ 813066] expose new 'multicastAddress' trait on Standalone Server and Managed Server Resources that are running in HA/cluster mode (https://bugzilla.redhat.com/show_bug.cgi?id=813066) diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java index 49dfc1d..ace2a35 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java @@ -62,6 +62,7 @@ import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.core.pluginapi.util.StartScriptConfiguration; import org.rhq.modules.plugins.jbossas7.helper.ServerPluginConfiguration; import org.rhq.modules.plugins.jbossas7.json.Address; import org.rhq.modules.plugins.jbossas7.json.CompositeOperation; @@ -744,6 +745,79 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone return (T) res.getResult(); } + protected Address getServerAddress() { + throw new UnsupportedOperationException(); + } + + protected String getSocketBindingGroup() { + throw new UnsupportedOperationException(); + } + + protected void collectMulticastAddressTrait(MeasurementReport report, MeasurementScheduleRequest request) { + Address jgroupsUdpStackAddress = new Address(getServerAddress()); + jgroupsUdpStackAddress.add("subsystem", "jgroups"); + jgroupsUdpStackAddress.add("stack", "udp"); + jgroupsUdpStackAddress.add("transport", "TRANSPORT"); + + String socketBinding; + try { + socketBinding = readAttribute(jgroupsUdpStackAddress, "socket-binding"); + } catch (Exception e) { + socketBinding = null; + } + + if (socketBinding != null) { + Address jgroupsSocketBindingAddress = new Address(getServerAddress()); + String socketBindingGroup = getSocketBindingGroup(); + jgroupsSocketBindingAddress.add("socket-binding-group", socketBindingGroup); + jgroupsSocketBindingAddress.add("socket-binding", socketBinding); + String multicastHost = null; + Integer multicastPort; + try { + try { + Map<String, String> map = readAttribute(jgroupsSocketBindingAddress, "multicast-address", Map.class); + String expressionValue = map.get("EXPRESSION_VALUE"); + int beginIndex = expressionValue.indexOf("${jboss.default.multicast.address"); + if (beginIndex >= 0) { + int endIndex = expressionValue.indexOf('}', beginIndex); + if (endIndex >= 0) { + String expression = expressionValue.substring(beginIndex + 2, endIndex); + StartScriptConfiguration startScriptConfig = getServerComponent().getStartScriptConfiguration(); + List<String> startScriptArgs = startScriptConfig.getStartScriptArgs(); + for (String startScriptArg : startScriptArgs) { + if (startScriptArg.startsWith("-Djboss.default.multicast.address=")) { + multicastHost = startScriptArg.substring("-Djboss.default.multicast.address=".length()); + break; + } + } + if (multicastHost == null) { + int colonIndex = expression.indexOf(':'); + String defaultValue = (colonIndex >= 0) ? expression.substring(colonIndex + 1) : null; + if (defaultValue != null) { + multicastHost = defaultValue; + } else { + log.error("Failed to resolve expression value [" + expressionValue + + "] of 'multicast-address' attribute."); + } + } + } + } + } catch (ClassCastException cce) { + multicastHost = readAttribute(jgroupsSocketBindingAddress, "multicast-address"); + } + multicastPort = readAttribute(jgroupsSocketBindingAddress, "multicast-port", Integer.class); + } catch (Exception e) { + throw new RuntimeException("Failed to lookup multicast address for socket binding [" + socketBinding + "]."); + } + + if (multicastHost != null && multicastPort != null) { + String multicastAddress = multicastHost + ":" + multicastPort; + MeasurementDataTrait data = new MeasurementDataTrait(request, multicastAddress); + report.addData(data); + } + } + } + private static class ComplexRequest { private String prop; private String sub; diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java index 836393e..8b85deb 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java @@ -189,6 +189,10 @@ public abstract class BaseServerComponent<T extends ResourceComponent<?>> extend return serverPluginConfig; } + public StartScriptConfiguration getStartScriptConfiguration() { + return startScriptConfig; + } + @Override public ASConnection getASConnection() { return connection; diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java index 945682c..d26f54e 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java @@ -102,18 +102,14 @@ public class ManagedASComponent extends BaseComponent<HostControllerComponent<?> return super.getAvailability(); } - public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) throws Exception { - - Set<MeasurementScheduleRequest> leftovers = new HashSet<MeasurementScheduleRequest>(requests.size()); Set<MeasurementScheduleRequest> skmRequests = new HashSet<MeasurementScheduleRequest>(requests.size()); - for (MeasurementScheduleRequest req : requests) { - if (req.getName().startsWith("_skm:")) - skmRequests.add(req); - } + Set<MeasurementScheduleRequest> leftovers = new HashSet<MeasurementScheduleRequest>(requests.size()); for (MeasurementScheduleRequest request : requests) { - if (request.getName().equals("startTime")) { + if (request.getName().startsWith("_skm:")) { + skmRequests.add(request); + } else if (request.getName().equals("startTime")) { String path = getPath(); path = path.replace("server-config", "server"); Address address = new Address(path); @@ -127,10 +123,13 @@ public class ManagedASComponent extends BaseComponent<HostControllerComponent<?> MeasurementDataTrait data = new MeasurementDataTrait(request, new Date(startTime).toString()); report.addData(data); } - } else if (!request.getName().startsWith("_skm:")) { + } else if (request.getName().equals("multicastAddress")) { + collectMulticastAddressTrait(report, request); + } else { leftovers.add(request); } } + // Now handle the skm (this could go into a common method with BaseServerComponent's impl. if (skmRequests.size() > 0) { Address address = new Address(); @@ -169,6 +168,42 @@ public class ManagedASComponent extends BaseComponent<HostControllerComponent<?> } @Override + protected Address getServerAddress() { + String serverConfigElement = getAddress().get(1); + String serverName = serverConfigElement.substring(serverConfigElement.indexOf('=') + 1); + Address serverAddress = getAddress().getParent(); + serverAddress.add("server", serverName); + return serverAddress; + } + + @Override + protected String getSocketBindingGroup() { + String socketBindingGroup; + try { + socketBindingGroup = readAttribute("socket-binding-group"); + } catch (Exception e) { + socketBindingGroup = null; + } + if (socketBindingGroup == null) { + String group; + try { + group = readAttribute("group"); + } catch (Exception e) { + group = null; + } + if (group != null) { + Address groupAddress = new Address("server-group", group); + try { + socketBindingGroup = readAttribute(groupAddress, "socket-binding-group"); + } catch (Exception e) { + // ignore + } + } + } + return socketBindingGroup; + } + + @Override public Configuration loadResourceConfiguration() throws Exception { Configuration configuration = super.loadResourceConfiguration(); diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java index f024530..6eb19f6 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java @@ -63,6 +63,8 @@ public class StandaloneASComponent<T extends ResourceComponent<?>> extends BaseS String requestName = request.getName(); if (requestName.equals(SERVER_CONFIG_TRAIT)) { collectConfigTrait(report, request); + } else if (requestName.equals("multicastAddress")) { + collectMulticastAddressTrait(report, request); } else { leftovers.add(request); // handled below } @@ -72,6 +74,17 @@ public class StandaloneASComponent<T extends ResourceComponent<?>> extends BaseS } @Override + protected Address getServerAddress() { + return getAddress(); + } + + @Override + protected String getSocketBindingGroup() { + // TODO (ips): Can this ever be something other than "standard-sockets"? + return "standard-sockets"; + } + + @Override public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { if (name.equals("start")) { diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 4331fcc..d4d0141 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -921,6 +921,8 @@ <metric property="status" dataType="trait" displayName="Server state" description="Detailed server state" displayType="summary"/> <metric property="startTime" dataType="trait" displayName="Start time of the server" defaultOn="true"/> + <metric property="multicastAddress" displayName="JGroups Multicast Address" dataType="trait" displayType="summary" + description="the host and port used by JGroups for multicast"/> <event name="logEntry" description="an entry in a log file"/> @@ -1336,6 +1338,8 @@ displayType="summary"/> &serverKindMetrics; <metric property="startTime" dataType="trait" displayName="Server Start Time" defaultOn="true"/> + <metric property="multicastAddress" displayName="JGroups Multicast Address" dataType="trait" displayType="summary" + description="the host and port used by JGroups for multicast"/> <metric property="config-file" dataType="trait" displayName="Server Config File" displayType="summary" defaultInterval="3600000" description="The name of the server configuration file this server is using"/>

1 0

[rhq] Changes to 'rc/jon3.1.0.ER5'
by John Sanda 24 May '12

24 May '12

New branch 'rc/jon3.1.0.ER5' available with the following commits:

1 0

[rhq] modules/enterprise pom.xml
by mazz 23 May '12

23 May '12

modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_de.properties | 34 - modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_ja.properties | 34 - modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_pt.properties | 31 - modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_zh.properties | 35 - modules/enterprise/gui/installer-war/pom.xml | 8 modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java | 182 +++++----- modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_pt.properties | 1 pom.xml | 8 8 files changed, 122 insertions(+), 211 deletions(-) New commits: commit 5dce85d192bbd2f060dff6e32d5231ff5f045569 Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed May 23 17:27:37 2012 -0400 [BZ 823860] get the installer startup props links to work. Get them to not require the prefix "-" so we can have JON be able to use these without requiring JON docs to have "-" in the URL. this also cleans up some of the other non-en i18n properties files - they don't need some of the non-translatable properties (this way we don't have N places to change the strings, we just have 1 now) diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_de.properties index cd12595..6b17551 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_de.properties @@ -7,48 +7,18 @@ ################################### #=================== Help URLs ===================== -# The Help sections and entries are table driven via property lookups. The following property -# names are expected: +# See the default MessageConstants.properties for what these properties mean and +# what needs to be internationalized. # -# The number of help sections: -# -# view_help_section_count = numSectionsInteger -# -# For each section: -# N = 1..numSections -# -# view_help_section_N_title = localized title for section in the sectionStack -# view_help_section_N_item_count = numSectionItemsInteger -# -# For each url entry in the section N: -# M = 1..numSectionItems -# -# view_help_section_N_propTitle_M = localized title for the help (required) -# view_help_section_N_propIcon_M = icon path (optional, defaults to document icon) -# view_help_section_N_propUrl_M = url for the help (required) -# -view_help_section_count = 2 - view_help_section_1_title = Dokumentation -view_help_section_1_item_count = 3 view_help_section_1_propTitle_1 = Frequently Asked Questions (FAQ) -view_help_section_1_propUrl_1 = http://www.rhq-project.org/display/JOPR2/FAQ view_help_section_1_propTitle_2 = Dokumentation -view_help_section_1_propUrl_2 = http://www.rhq-project.org/display/JOPR2/Home view_help_section_1_propTitle_3 = API Javadoc -view_help_section_1_propUrl_3 = http://www.rhq-project.org/display/JOPR2/API+Documentation view_help_section_2_title = Tutorium -view_help_section_2_item_count = 4 view_help_section_2_propTitle_1 = Demo: Alles -view_help_section_2_propUrl_1 = http://www.rhq-project.org/display/JOPR2/Demos view_help_section_2_propTitle_2 = Demo: Bundles installieren -view_help_section_2_propUrl_2 = http://management-platform.blogspot.com/2011/01/bundle-provisioning-via-rhq… view_help_section_2_propTitle_3 = Wie man Gruppen-Definitionen erstellt -view_help_section_2_propIcon_3 = [SKIN]/../actions/help.png -view_help_section_2_propUrl_3 = http://docs.redhat.com/docs/en-US/JBoss_Operations_Network/2.4/html/Basic_A… view_help_section_2_propTitle_4 = Wie man die Suchleiste benutzt -view_help_section_2_propIcon_4 = [SKIN]/../actions/help.png -view_help_section_2_propUrl_4 = http://www.rhq-project.org/display/JOPR2/Search diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_ja.properties index 0f3caa7..c3b1487 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_ja.properties @@ -7,48 +7,18 @@ ################################### #=================== Help URLs ===================== -# The Help sections and entries are table driven via property lookups. The following property -# names are expected: +# See the default MessageConstants.properties for what these properties mean and +# what needs to be internationalized. # -# The number of help sections: -# -# view_help_section_count = numSectionsInteger -# -# For each section: -# N = 1..numSections -# -# view_help_section_N_title = localized title for section in the sectionStack -# view_help_section_N_item_count = numSectionItemsInteger -# -# For each url entry in the section N: -# M = 1..numSectionItems -# -# view_help_section_N_propTitle_M = localized title for the help (required) -# view_help_section_N_propIcon_M = icon path (optional, defaults to document icon) -# view_help_section_N_propUrl_M = url for the help (required) -# -view_help_section_count = 2 - view_help_section_1_title = ドキュメンテーション -view_help_section_1_item_count = 3 view_help_section_1_propTitle_1 = よくある質問 (FAQ) -view_help_section_1_propUrl_1 = http://www.rhq-project.org/display/JOPR2/FAQ view_help_section_1_propTitle_2 = ドキュメンテーションセット -view_help_section_1_propUrl_2 = http://www.rhq-project.org/display/JOPR2/Home view_help_section_1_propTitle_3 = API Javadoc -view_help_section_1_propUrl_3 = http://www.rhq-project.org/display/JOPR2/API+Documentation view_help_section_2_title = チュートリアル -view_help_section_2_item_count = 4 view_help_section_2_propTitle_1 = デモ: すべてのデモ -view_help_section_2_propUrl_1 = http://www.rhq-project.org/display/JOPR2/Demos view_help_section_2_propTitle_2 = デモ: バンドルプロビジョニング -view_help_section_2_propUrl_2 = http://management-platform.blogspot.com/2011/01/bundle-provisioning-via-rhq… view_help_section_2_propTitle_3 = グループ定義の構築方法 -view_help_section_2_propIcon_3 = [SKIN]/../actions/help.png -view_help_section_2_propUrl_3 = http://docs.redhat.com/docs/en-US/JBoss_Operations_Network/2.4/html/Basic_A… view_help_section_2_propTitle_4 = 検索バーの使用方法 -view_help_section_2_propIcon_4 = [SKIN]/../actions/help.png -view_help_section_2_propUrl_4 = http://www.rhq-project.org/display/JOPR2/Search diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_pt.properties index 76d3fa8..434c06b 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_pt.properties @@ -1,21 +1,24 @@ -view_help_section_count = 2 -view_help_section_1_title = Documentação -view_help_section_1_item_count = 3 +# +# RHQ GUI i18n Message Constants - Locale: PT (Portuguese) +# This file should be UTF-8 encoded. +# +# This is used specifically for properties needing lookup by name, at runtime. These +# constant properties can be localized but can not have arguments. +################################### + +#=================== Help URLs ===================== +# See the default MessageConstants.properties for what these properties mean and +# what needs to be internationalized. +# +view_help_section_1_title = Documentação + view_help_section_1_propTitle_1 = Perguntas & Respostas (FAQ) -view_help_section_1_propUrl_1 = http://www.rhq-project.org/display/JOPR2/FAQ view_help_section_1_propTitle_2 = Conjunto de Documentos -view_help_section_1_propUrl_2 = http://www.rhq-project.org/display/JOPR2/Home view_help_section_1_propTitle_3 = API Javadoc -view_help_section_1_propUrl_3 = http://www.rhq-project.org/display/JOPR2/API+Documentation -view_help_section_2_title = Tutorial -view_help_section_2_item_count = 4 + +view_help_section_2_title = Tutorial + view_help_section_2_propTitle_1 = Demo: Todas as Demos -view_help_section_2_propUrl_1 = http://www.rhq-project.org/display/JOPR2/Demos view_help_section_2_propTitle_2 = Demo: Provisionamento de Pacotes -view_help_section_2_propUrl_2 = http://management-platform.blogspot.com/2011/01/bundle-provisioning-via-rhq… view_help_section_2_propTitle_3 = Como construir Definições de Grupo -view_help_section_2_propIcon_3 = [SKIN]/../actions/help.png -view_help_section_2_propUrl_3 = http://docs.redhat.com/docs/en-US/JBoss_Operations_Network/2.4/html/Basic_A… view_help_section_2_propTitle_4 = Como utilizar a Barra de Pesquisa -view_help_section_2_propIcon_4 = [SKIN]/../actions/help.png\n -view_help_section_2_propUrl_4 = http://www.rhq-project.org/display/JOPR2/Search diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_zh.properties index 86a6efb..545263e 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_zh.properties @@ -7,49 +7,18 @@ ################################### #=================== Help URLs ===================== -# The Help sections and entries are table driven via property lookups. The following property -# names are expected: +# See the default MessageConstants.properties for what these properties mean and +# what needs to be internationalized. # -# The number of help sections: -# -# view_help_section_count = numSectionsInteger -# -# For each section: -# N = 1..numSections -# -# view_help_section_N_title = localized title for section in the sectionStack -# view_help_section_N_item_count = numSectionItemsInteger -# -# For each url entry in the section N: -# M = 1..numSectionItems -# -# view_help_section_N_propTitle_M = localized title for the help (required) -# view_help_section_N_propIcon_M = icon path (optional, defaults to document icon) -# view_help_section_N_propUrl_M = url for the help (required) -# -view_help_section_count = 2 - view_help_section_1_title = \u6587\u6863 -view_help_section_1_item_count = 3 view_help_section_1_propTitle_1 = \u7591\u96be\u89e3\u7b54 (FAQ) -view_help_section_1_propUrl_1 = http://www.rhq-project.org/display/JOPR2/FAQ view_help_section_1_propTitle_2 = \u6587\u6863\u96c6 -view_help_section_1_propUrl_2 = http://www.rhq-project.org/display/JOPR2/Home view_help_section_1_propTitle_3 = API Javadoc -view_help_section_1_propUrl_3 = http://www.rhq-project.org/display/JOPR2/API+Documentation view_help_section_2_title = \u6559\u7a0b -view_help_section_2_item_count = 4 view_help_section_2_propTitle_1 = \u6f14\u793a: \u6240\u6709\u6f14\u793a -view_help_section_2_propUrl_1 = http://www.rhq-project.org/display/JOPR2/Demos view_help_section_2_propTitle_2 = \u6f14\u793a: Bundle Provisioning -view_help_section_2_propUrl_2 = http://management-platform.blogspot.com/2011/01/bundle-provisioning-via-rhq… view_help_section_2_propTitle_3 = How to build Group Definitions -view_help_section_2_propIcon_3 = [SKIN]/../actions/help.png -view_help_section_2_propUrl_3 = http://docs.redhat.com/docs/en-US/JBoss_Operations_Network/2.4/html/Basic_A… view_help_section_2_propTitle_4 = \u5982\u4f55\u4f7f\u7528\u68c0\u7d22\u6846 -view_help_section_2_propIcon_4 = [SKIN]/../actions/help.png -view_help_section_2_propUrl_4 = http://www.rhq-project.org/display/JOPR2/Search - diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index b4fd36c..ba0518f 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -26,15 +26,15 @@ <product.name>RHQ</product.name> <product.fullName>RHQ</product.fullName> <product.url.domain>rhq-project.org</product.url.domain> - <product.sales.email>sales(a)rhq-project.org</product.sales.email> - <product.support.email>info(a)rhq-project.org</product.support.email> + <product.sales.email>rhq-users(a)lists.fedorahosted.org</product.sales.email> + <product.support.email>rhq-users(a)lists.fedorahosted.org</product.support.email> <product.version>${project.version}</product.version> - <product.help.doc.root>http://support.rhq-project.org/display/JOPR2/</product.help.doc.root> + <product.help.doc.root>http://www.rhq-project.org/display/JOPR2/</product.help.doc.root> <product.help.installation>Installation</product.help.installation> <product.help.guide.server>Running+the+RHQ+Server</product.help.guide.server> <product.help.guide.agent>Running+the+RHQ+Agent</product.help.guide.agent> <product.help.FAQ>FAQ</product.help.FAQ> - <product.help.config.props>http://support.rhq-project.org/display/JOPR2/Startup+Properties#Configuring…</product.help.config.props> + <product.help.config.props>http://www.rhq-project.org/display/JOPR2/Startup+Properties#StartupProperti…</product.help.config.props> </properties> <dependencies> diff --git a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java index e9f1511..b316c13 100644 --- a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java +++ b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java @@ -201,447 +201,447 @@ public interface InstallerI18NResourceKeys { @I18NMessage(locale = "en", value = "Database Type") String PROP_DATABASE_TYPE = "propertyDatabaseType"; - @I18NMessage("-DatabaseType") + @I18NMessage(/* help url */"DatabaseType") String PROP_DATABASE_TYPE_HELP = "propertyDatabaseTypeHelp"; @I18NMessage(locale = "en", value = "Database Connection URL") String PROP_DATABASE_CONNECTION_URL = "propertyDatabaseConnectionUrl"; - @I18NMessage("-DatabaseConnectionURL") + @I18NMessage(/* help url */"DatabaseConnectionURL") String PROP_DATABASE_CONNECTION_URL_HELP = "propertyDatabaseConnectionUrlHelp"; @I18NMessage(locale = "en", value = "Database JDBC Driver Class") String PROP_DATABASE_DRIVER_CLASS = "propertyDatabaseDriverClass"; - @I18NMessage("-DatabaseJDBCDriverClass") + @I18NMessage(/* help url */"DatabaseJDBCDriverClass") String PROP_DATABASE_DRIVER_CLASS_HELP = "propertyDatabaseDriverClassHelp"; @I18NMessage(locale = "en", value = "Database XA DataSource Class") String PROP_DATABASE_XA_DS_CLASS = "propertyDatabaseXADataSourceClass"; - @I18NMessage("-DatabaseXADataSourceClass") + @I18NMessage(/* help url */"DatabaseXADataSourceClass") String PROP_DATABASE_XA_DS_CLASS_HELP = "propertyDatabaseXADataSourceClassHelp"; @I18NMessage(locale = "en", value = "Database User Name") String PROP_DATABASE_USERNAME = "propertyDatabaseUserName"; - @I18NMessage("-DatabaseUserName") + @I18NMessage(/* help url */"DatabaseUserName") String PROP_DATABASE_USERNAME_HELP = "propertyDatabaseUserNameHelp"; @I18NMessage(locale = "en", value = "Database Password") String PROP_DATABASE_PASSWORD = "propertyDatabasePassword"; - @I18NMessage("-DatabasePassword") + @I18NMessage(/* help url */"DatabasePassword") String PROP_DATABASE_PASSWORD_HELP = "propertyDatabasePasswordHelp"; @I18NMessage(locale = "en", value = "Server Bind Address") String PROP_SERVER_BIND_ADDRESS = "propertyBindAddress"; - @I18NMessage("-ServerBindAddress") + @I18NMessage(/* help url */"ServerBindAddress") String PROP_SERVER_BIND_ADDRESS_HELP = "propertyBindAddressHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "HTTP Port") }) String PROP_HTTP_PORT = "propertyHttpPort"; - @I18NMessage("-HTTPPort") + @I18NMessage(/* help url */"HTTPPort") String PROP_HTTP_PORT_HELP = "propertyHttpPortHelp"; @I18NMessage(locale = "en", value = "Secure HTTPS Port") String PROP_HTTPS_PORT = "propertyHttpsPort"; - @I18NMessage("-SecureHTTPSPort") + @I18NMessage(/* help url */"SecureHTTPSPort") String PROP_HTTPS_PORT_HELP = "propertyHttpsPortHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Web Service Port") }) String PROP_WEB_SERVICE_PORT = "propertyWebServicePort"; - @I18NMessage("-WebServicePort") + @I18NMessage(/* help url */"WebServicePort") String PROP_WEB_SERVICE_PORT_HELP = "propertyWebServicePortHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Naming Service Port") }) String PROP_NAMING_SERVICE_PORT = "propertyNamingServicePort"; - @I18NMessage("-NamingServicePort") + @I18NMessage(/* help url */"NamingServicePort") String PROP_NAMING_SERVICE_PORT_HELP = "propertyNamingServicePortHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Naming Service RMI Port") }) String PROP_NAMING_SERVICE_RMI_PORT = "propertyNamingServiceRmiPort"; - @I18NMessage("-NamingServiceRMIPort") + @I18NMessage(/* help url */"NamingServiceRMIPort") String PROP_NAMING_SERVICE_RMI_PORT_HELP = "propertyNamingServiceRmiPortHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "JRMP Invoker RMI Port") }) String PROP_JRMP_INVOKER_RMI_PORT = "propertyJrmpInvokerRmiPort"; - @I18NMessage("-JRMPInvokerRMIPort") + @I18NMessage(/* help url */"JRMPInvokerRMIPort") String PROP_JRMP_INVOKER_RMI_PORT_HELP = "propertyJrmpInvokerRmiPortHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Pooled Invoker RMI Port") }) String PROP_POOLED_INVOKER_RMI_PORT = "propertyPooledInvokerRmiPort"; - @I18NMessage("-PooledInvokerRMIPort") + @I18NMessage(/* help url */"PooledInvokerRMIPort") String PROP_POOLED_INVOKER_RMI_PORT_HELP = "propertyPooledInvokerRmiPortHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "AJP Port") }) String PROP_AJP_PORT = "propertyAjpPort"; - @I18NMessage("-AJPPort") + @I18NMessage(/* help url */"AJPPort") String PROP_AJP_PORT_HELP = "propertyAjpPortHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Unified Invoker Port") }) String PROP_UNIFIED_INVOKER_PORT = "propertyUnifiedInvokerPort"; - @I18NMessage("-UnifiedInvokerPort") + @I18NMessage(/* help url */"UnifiedInvokerPort") String PROP_UNIFIED_INVOKER_PORT_HELP = "propertyUnifiedInvokerPortHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Aspect Deployer Port") }) String PROP_ASPECT_DEPLOYER_PORT = "propertyAspectDeployerPort"; - @I18NMessage("-AspectDeployerPort") + @I18NMessage(/* help url */"AspectDeployerPort") String PROP_ASPECT_DEPLOYER_PORT_HELP = "propertyAspectDeployerPortHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Client Auth Mode") }) String PROP_TOMCAT_SECURITY_CLIENT_AUTH_MOD = "propertyTomcatClientAuthMode"; - @I18NMessage("-TomcatClientAuthMode") + @I18NMessage(/* help url */"TomcatClientAuthMode") String PROP_TOMCAT_SECURITY_CLIENT_AUTH_MOD_HELP = "propertyTomcatClientAuthModeHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Keystore/Truststore Algorithm") }) String PROP_TOMCAT_SECURITY_ALGORITHM = "propertyTomcatAlgorithm"; - @I18NMessage("-TomcatAlgorithm") + @I18NMessage(/* help url */"TomcatAlgorithm") String PROP_TOMCAT_SECURITY_ALGORITHM_HELP = "propertyTomcatAlgorithmHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Keystore") }) String PROP_TOMCAT_SECURITY_KEYSTORE_FILENAME = "propertyTomcatKeystoreFilename"; - @I18NMessage("-TomcatKeystore") + @I18NMessage(/* help url */"TomcatKeystore") String PROP_TOMCAT_SECURITY_KEYSTORE_FILENAME_HELP = "propertyTomcatKeystoreFilenameHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Keystore Password") }) String PROP_TOMCAT_SECURITY_KEYSTORE_PASSWORD = "propertyTomcatKeystorePassword"; - @I18NMessage("-TomcatKeystorePassword") + @I18NMessage(/* help url */"TomcatKeystorePassword") String PROP_TOMCAT_SECURITY_KEYSTORE_PASSWORD_HELP = "propertyTomcatKeystorePasswordHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Keystore Type") }) String PROP_TOMCAT_SECURITY_KEYSTORE_TYPE = "propertyTomcatKeystoreType"; - @I18NMessage("-TomcatKeystoreType") + @I18NMessage(/* help url */"TomcatKeystoreType") String PROP_TOMCAT_SECURITY_KEYSTORE_TYPE_HELP = "propertyTomcatKeystoreTypeHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Keystore Alias") }) String PROP_TOMCAT_SECURITY_KEYSTORE_ALIAS = "propertyTomcatKeystoreAlias"; - @I18NMessage("-TomcatKeystoreAlias") + @I18NMessage(/* help url */"TomcatKeystoreAlias") String PROP_TOMCAT_SECURITY_KEYSTORE_ALIAS_HELP = "propertyTomcatKeystoreAliasHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Truststore") }) String PROP_TOMCAT_SECURITY_TRUSTSTORE_FILENAME = "propertyTomcatTruststoreFilename"; - @I18NMessage("-TomcatTruststore") + @I18NMessage(/* help url */"TomcatTruststore") String PROP_TOMCAT_SECURITY_TRUSTSTORE_FILENAME_HELP = "propertyTomcatTruststoreFilenameHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Truststore Password") }) String PROP_TOMCAT_SECURITY_TRUSTSTORE_PASSWORD = "propertyTomcatTruststorePassword"; - @I18NMessage("-TomcatTruststorePassword") + @I18NMessage(/* help url */"TomcatTruststorePassword") String PROP_TOMCAT_SECURITY_TRUSTSTORE_PASSWORD_HELP = "propertyTomcatTruststorePasswordHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat Truststore Type") }) String PROP_TOMCAT_SECURITY_TRUSTSTORE_TYPE = "propertyTomcatTruststoreType"; - @I18NMessage("-TomcatTruststoreType") + @I18NMessage(/* help url */"TomcatTruststoreType") String PROP_TOMCAT_SECURITY_TRUSTSTORE_TYPE_HELP = "propertyTomcatTruststoreTypeHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Tomcat SSL Protocol") }) String PROP_TOMCAT_SECURITY_SSL_PROTOCOL = "propertyTomcatSslProtocol"; - @I18NMessage("-TomcatSSLProtocol") + @I18NMessage(/* help url */"TomcatSSLProtocol") String PROP_TOMCAT_SECURITY_SSL_PROTOCOL_HELP = "propertyTomcatSslProtocolHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Agent Communications Transport") }) String PROP_CONNECTOR_TRANSPORT = "propertyConnectorTransport"; - @I18NMessage("-IncomingAgentCommunicationsTransport") + @I18NMessage(/* help url */"IncomingAgentCommunicationsTransport") String PROP_CONNECTOR_TRANSPORT_HELP = "propertyConnectorTransportHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Agent Communications Bind Address") }) String PROP_CONNECTOR_BIND_ADDRESS = "propertyConnectorBindAddress"; - @I18NMessage("-IncomingAgentCommunicationsBindAddress") + @I18NMessage(/* help url */"IncomingAgentCommunicationsBindAddress") String PROP_CONNECTOR_BIND_ADDRESS_HELP = "propertyConnectorBindAddressHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Agent Communications Port") }) String PROP_CONNECTOR_BIND_PORT = "propertyConnectorBindPort"; - @I18NMessage("-IncomingAgentCommunicationsPort") + @I18NMessage(/* help url */"IncomingAgentCommunicationsPort") String PROP_CONNECTOR_BIND_PORT_HELP = "propertyConnectorBindPortHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Agent Communications Transport Parameters") }) String PROP_CONNECTOR_TRANSPORT_PARAMS = "propertyConnectorTransportParams"; - @I18NMessage("-IncomingAgentCommunicationsTransportParameters") + @I18NMessage(/* help url */"IncomingAgentCommunicationsTransportParameters") String PROP_CONNECTOR_TRANSPORT_PARAMS_HELP = "propertyConnectorTransportParamsHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Agent Multicast Detector Enabled") }) String PROP_AGENT_MULTICAST_DETECTOR_ENABLED = "propertyAgentMulticastDetectorEnabled"; - @I18NMessage("-AgentMulticastDetectorEnabled") + @I18NMessage(/* help url */"AgentMulticastDetectorEnabled") String PROP_AGENT_MULTICAST_DETECTOR_ENABLED_HELP = "propertyAgentMulticastDetectorEnabledHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Agent Multicast Detector Bind Address") }) String PROP_AGENT_MULTICAST_DETECTOR_BIND_ADDRESS = "propertyAgentMulticastDetectorBindAddress"; - @I18NMessage("-AgentMulticastDetectorBindAddress") + @I18NMessage(/* help url */"AgentMulticastDetectorBindAddress") String PROP_AGENT_MULTICAST_DETECTOR_BIND_ADDRESS_HELP = "propertyAgentMulticastDetectorBindAddressHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Agent Multicast Detector Multicast Address") }) String PROP_AGENT_MULTICAST_DETECTOR_MULTICAST_ADDRESS = "propertyAgentMulticastDetectorMulticastAddress"; - @I18NMessage("-AgentMulticastDetectorMulticastAddress") + @I18NMessage(/* help url */"AgentMulticastDetectorMulticastAddress") String PROP_AGENT_MULTICAST_DETECTOR_MULTICAST_ADDRESS_HELP = "propertyAgentMulticastDetectorMulticastAddressHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Agent Multicast Detector Port") }) String PROP_AGENT_MULTICAST_DETECTOR_PORT = "propertyAgentMulticastDetectorPort"; - @I18NMessage("-AgentMulticastDetectorPort") + @I18NMessage(/* help url */"AgentMulticastDetectorPort") String PROP_AGENT_MULTICAST_DETECTOR_PORT_HELP = "propertyAgentMulticastDetectorPortHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Secure Socket Protocol") }) String PROP_SECURITY_SERVER_SECURE_SOCKET_PROTOCOL = "propertySecurityServerSecureSocketProtocol"; - @I18NMessage("-IncomingSecureSocketProtocol") + @I18NMessage(/* help url */"IncomingSecureSocketProtocol") String PROP_SECURITY_SERVER_SECURE_SOCKET_PROTOCOL_HELP = "propertySecurityServerSecureSocketProtocolHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Keystore File") }) String PROP_SECURITY_SERVER_KEYSTORE_FILE = "propertySecurityServerKeystoreFile"; - @I18NMessage("-IncomingKeystoreFile") + @I18NMessage(/* help url */"IncomingKeystoreFile") String PROP_SECURITY_SERVER_KEYSTORE_FILE_HELP = "propertySecurityServerKeystoreFileHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Keystore Algorithm") }) String PROP_SECURITY_SERVER_KEYSTORE_ALGORITHM = "propertySecurityServerKeystoreAlgorithm"; - @I18NMessage("-IncomingKeystoreAlgorithm") + @I18NMessage(/* help url */"IncomingKeystoreAlgorithm") String PROP_SECURITY_SERVER_KEYSTORE_ALGORITHM_HELP = "propertySecurityServerKeystoreAlgorithmHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Keystore Type") }) String PROP_SECURITY_SERVER_KEYSTORE_TYPE = "propertySecurityServerKeystoreType"; - @I18NMessage("-IncomingKeystoreType") + @I18NMessage(/* help url */"IncomingKeystoreType") String PROP_SECURITY_SERVER_KEYSTORE_TYPE_HELP = "propertySecurityServerKeystoreTypeHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Keystore Password") }) String PROP_SECURITY_SERVER_KEYSTORE_PASSWORD = "propertySecurityServerKeystorePassword"; - @I18NMessage("-IncomingKeystorePassword") + @I18NMessage(/* help url */"IncomingKeystorePassword") String PROP_SECURITY_SERVER_KEYSTORE_PASSWORD_HELP = "propertySecurityServerKeystorePasswordHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Keystore Key Password") }) String PROP_SECURITY_SERVER_KEYSTORE_KEY_PASSWORD = "propertySecurityServerKeystoreKeyPassword"; - @I18NMessage("-IncomingKeystoreKeyPassword") + @I18NMessage(/* help url */"IncomingKeystoreKeyPassword") String PROP_SECURITY_SERVER_KEYSTORE_KEY_PASSWORD_HELP = "propertySecurityServerKeystoreKeyPasswordHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Keystore Alias") }) String PROP_SECURITY_SERVER_KEYSTORE_ALIAS = "propertySecurityServerKeystoreAlias"; - @I18NMessage("-IncomingKeystoreAlias") + @I18NMessage(/* help url */"IncomingKeystoreAlias") String PROP_SECURITY_SERVER_KEYSTORE_ALIAS_HELP = "propertySecurityServerKeystoreAliasHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Truststore File") }) String PROP_SECURITY_SERVER_TRUSTSTORE_FILE = "propertySecurityServerTruststoreFile"; - @I18NMessage("-IncomingTruststoreFile") + @I18NMessage(/* help url */"IncomingTruststoreFile") String PROP_SECURITY_SERVER_TRUSTSTORE_FILE_HELP = "propertySecurityServerTruststoreFileHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Truststore Algorithm") }) String PROP_SECURITY_SERVER_TRUSTSTORE_ALGORITHM = "propertySecurityServerTruststoreAlgorithm"; - @I18NMessage("-IncomingTruststoreAlgorithm") + @I18NMessage(/* help url */"IncomingTruststoreAlgorithm") String PROP_SECURITY_SERVER_TRUSTSTORE_ALGORITHM_HELP = "propertySecurityServerTruststoreAlgorithmHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Truststore Type") }) String PROP_SECURITY_SERVER_TRUSTSTORE_TYPE = "propertySecurityServerTruststoreType"; - @I18NMessage("-IncomingTruststoreType") + @I18NMessage(/* help url */"IncomingTruststoreType") String PROP_SECURITY_SERVER_TRUSTSTORE_TYPE_HELP = "propertySecurityServerTruststoreTypeHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Truststore Password") }) String PROP_SECURITY_SERVER_TRUSTSTORE_PASSWORD = "propertySecurityServerTruststorePassword"; - @I18NMessage("-IncomingTruststorePassword") + @I18NMessage(/* help url */"IncomingTruststorePassword") String PROP_SECURITY_SERVER_TRUSTSTORE_PASSWORD_HELP = "propertySecurityServerTruststorePasswordHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Incoming Security - Client Authentication Mode") }) String PROP_SECURITY_SERVER_CLIENT_AUTH_MODE = "propertySecurityServerClientAuthMode"; - @I18NMessage("-IncomingClientAuthenticationMode") + @I18NMessage(/* help url */"IncomingClientAuthenticationMode") String PROP_SECURITY_SERVER_CLIENT_AUTH_MODE_HELP = "propertySecurityServerClientAuthModeHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Secure Socket Protocol") }) String PROP_SECURITY_CLIENT_SECURE_SOCKET_PROTOCOL = "propertySecurityClientSecureSocketProtocol"; - @I18NMessage("-OutgoingSecureSocketProtocol") + @I18NMessage(/* help url */"OutgoingSecureSocketProtocol") String PROP_SECURITY_CLIENT_SECURE_SOCKET_PROTOCOL_HELP = "propertySecurityClientSecureSocketProtocolHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Keystore File") }) String PROP_SECURITY_CLIENT_KEYSTORE_FILE = "propertySecurityClientKeystoreFile"; - @I18NMessage("-OutgoingKeystoreFile") + @I18NMessage(/* help url */"OutgoingKeystoreFile") String PROP_SECURITY_CLIENT_KEYSTORE_FILE_HELP = "propertySecurityClientKeystoreFileHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Algorithm") }) String PROP_SECURITY_CLIENT_KEYSTORE_ALGORITHM = "propertySecurityClientKeystoreAlgorithm"; - @I18NMessage("-OutgoingKeystoreAlgorithm") + @I18NMessage(/* help url */"OutgoingKeystoreAlgorithm") String PROP_SECURITY_CLIENT_KEYSTORE_ALGORITHM_HELP = "propertySecurityClientKeystoreAlgorithmHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Type") }) String PROP_SECURITY_CLIENT_KEYSTORE_TYPE = "propertySecurityClientKeystoreType"; - @I18NMessage("-OutgoingKeystoreType") + @I18NMessage(/* help url */"OutgoingKeystoreType") String PROP_SECURITY_CLIENT_KEYSTORE_TYPE_HELP = "propertySecurityClientKeystoreTypeHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Password") }) String PROP_SECURITY_CLIENT_KEYSTORE_PASSWORD = "propertySecurityClientKeystorePassword"; - @I18NMessage("-OutgoingKeystorePassword") + @I18NMessage(/* help url */"OutgoingKeystorePassword") String PROP_SECURITY_CLIENT_KEYSTORE_PASSWORD_HELP = "propertySecurityClientKeystorePasswordHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Key Password") }) String PROP_SECURITY_CLIENT_KEYSTORE_KEY_PASSWORD = "propertySecurityClientKeystoreKeyPassword"; - @I18NMessage("-OutgoingKeystoreKeyPassword") + @I18NMessage(/* help url */"OutgoingKeystoreKeyPassword") String PROP_SECURITY_CLIENT_KEYSTORE_KEY_PASSWORD_HELP = "propertySecurityClientKeystoreKeyPasswordHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Keystore Alias") }) String PROP_SECURITY_CLIENT_KEYSTORE_ALIAS = "propertySecurityClientKeystoreAlias"; - @I18NMessage("-OutgoingKeystoreAlias") + @I18NMessage(/* help url */"OutgoingKeystoreAlias") String PROP_SECURITY_CLIENT_KEYSTORE_ALIAS_HELP = "propertySecurityClientKeystoreAliasHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Truststore File") }) String PROP_SECURITY_CLIENT_TRUSTSTORE_FILE = "propertySecurityClientTruststoreFile"; - @I18NMessage("-OutgoingTruststoreFile") + @I18NMessage(/* help url */"OutgoingTruststoreFile") String PROP_SECURITY_CLIENT_TRUSTSTORE_FILE_HELP = "propertySecurityClientTruststoreFileHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Truststore Algorithm") }) String PROP_SECURITY_CLIENT_TRUSTSTORE_ALGORITHM = "propertySecurityClientTruststoreAlgorithm"; - @I18NMessage("-OutgoingTruststoreAlgorithm") + @I18NMessage(/* help url */"OutgoingTruststoreAlgorithm") String PROP_SECURITY_CLIENT_TRUSTSTORE_ALGORITHM_HELP = "propertySecurityClientTruststoreAlgorithmHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Truststore Type") }) String PROP_SECURITY_CLIENT_TRUSTSTORE_TYPE = "propertySecurityClientTruststoreType"; - @I18NMessage("-OutgoingTruststoreType") + @I18NMessage(/* help url */"OutgoingTruststoreType") String PROP_SECURITY_CLIENT_TRUSTSTORE_TYPE_HELP = "propertySecurityClientTruststoreTypeHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Truststore Password") }) String PROP_SECURITY_CLIENT_TRUSTSTORE_PASSWORD = "propertySecurityClientTruststorePassword"; - @I18NMessage("-OutgoingTruststorePassword") + @I18NMessage(/* help url */"OutgoingTruststorePassword") String PROP_SECURITY_CLIENT_TRUSTSTORE_PASSWORD_HELP = "propertySecurityClientTruststorePasswordHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Outgoing Security - Server Authentication Mode Enabled") }) String PROP_SECURITY_CLIENT_SERVER_AUTH_MODE_ENABLED = "propertySecurityClientServerAuthModeEnabled"; - @I18NMessage("-OutgoingServerAuthenticationModeEnabled") + @I18NMessage(/* help url */"OutgoingServerAuthenticationModeEnabled") String PROP_SECURITY_CLIENT_SERVER_AUTH_MODE_ENABLED_HELP = "propertySecurityClientServerAuthModeEnabledHelp"; @I18NMessage(locale = "en", value = "Embedded Agent Enabled") String PROP_EMBEDDED_RHQ_AGENT_ENABLED = "propertyEmbeddedRHQAgentEnabled"; - @I18NMessage("-EmbeddedRHQAgentEnabled") + @I18NMessage(/* help url */"EmbeddedRHQAgentEnabled") String PROP_EMBEDDED_RHQ_AGENT_ENABLED_HELP = "propertyEmbeddedRHQAgentEnabledHelp"; @I18NMessage(locale = "en", value = "Embedded Agent Name") String PROP_EMBEDDED_RHQ_AGENT_NAME = "propertyEmbeddedRHQAgentName"; - @I18NMessage("-EmbeddedRHQAgentName") + @I18NMessage(/* help url */"EmbeddedRHQAgentName") String PROP_EMBEDDED_RHQ_AGENT_NAME_HELP = "propertyEmbeddedRHQAgentNameHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Embedded Agent Disable Native System") }) String PROP_EMBEDDED_RHQ_AGENT_DISABLE_NATIVE_SYSTEM = "propertyEmbeddedRHQAgentDisableNativeSystem"; - @I18NMessage("-EmbeddedRHQAgentDisableNativeSystem") + @I18NMessage(/* help url */"EmbeddedRHQAgentDisableNativeSystem") String PROP_EMBEDDED_RHQ_AGENT_DISABLE_NATIVE_SYSTEM_HELP = "propertyEmbeddedRHQAgentDisableNativeSystemHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Embedded Agent Reset Configuration") }) String PROP_EMBEDDED_RHQ_AGENT_RESET_CONFIGURATION = "propertyEmbeddedRHQAgentResetConfiguration"; - @I18NMessage("-EmbeddedRHQAgentResetConfiguration") + @I18NMessage(/* help url */"EmbeddedRHQAgentResetConfiguration") String PROP_EMBEDDED_RHQ_AGENT_RESET_CONFIGURATION_HELP = "propertyEmbeddedRHQAgentResetConfigurationHelp"; @I18NMessage(locale = "en", value = "Email SMTP Hostname") String PROP_EMAIL_SMTP_HOST = "propertyEmailSmtpHost"; - @I18NMessage("-EmailSMTPHostname") + @I18NMessage(/* help url */"EmailSMTPHostname") String PROP_EMAIL_SMTP_HOST_HELP = "propertyEmailSmtpHostHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Email SMTP Port") }) String PROP_EMAIL_SMTP_PORT = "propertyEmailSmtpPort"; - @I18NMessage("-EmailSMTPPort") + @I18NMessage(/* help url */"EmailSMTPPort") String PROP_EMAIL_SMTP_PORT_HELP = "propertyEmailSmtpPortHelp"; @I18NMessage(locale = "en", value = "Email From Address") String PROP_EMAIL_FROM_ADDRESS = "propertyEmailFromAddress"; - @I18NMessage("-EmailFromAddress") + @I18NMessage(/* help url */"EmailFromAddress") String PROP_EMAIL_FROM_ADDRESS_HELP = "propertyEmailFromAddressHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Operation Invocation Default Timeout") }) String PROP_OPERATION_TIMEOUT = "propertyOperationTimeout"; - @I18NMessage("-OperationInvocationDefaultTimeout") + @I18NMessage(/* help url */"OperationInvocationDefaultTimeout") String PROP_OPERATION_TIMEOUT_HELP = "propertyOperationTimeoutHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition Name") }) String PROP_CLUSTER_PARTITION_NAME = "propertyClusterPartitionName"; - @I18NMessage("-PartitionName") + @I18NMessage(/* help url */"PartitionName") String PROP_CLUSTER_PARTITION_NAME_HELP = "propertyClusterPartitionNameHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition Bind Address") }) String PROP_CLUSTER_PARTITION_BIND_ADDRESS = "propertyClusterPartitionBindAddress"; - @I18NMessage("-PartitionBindAddress") + @I18NMessage(/* help url */"PartitionBindAddress") String PROP_CLUSTER_PARTITION_BIND_ADDRESS_HELP = "propertyClusterPartitionBindAddressHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition UDP Multicast Group IP Address") }) String PROP_CLUSTER_UDP_GROUP = "propertyClusterUdpGroup"; - @I18NMessage("-PartitionUDPMulticastGroupIPAddress") + @I18NMessage(/* help url */"PartitionUDPMulticastGroupIPAddress") String PROP_CLUSTER_UDP_GROUP_HELP = "propertyClusterUdpGroupHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition UDP Multicast Port") }) String PROP_CLUSTER_HAPARTITION_PORT = "propertyClusterHaPartitionPort"; - @I18NMessage("-PartitionUDPMulticastPort") + @I18NMessage(/* help url */"PartitionUDPMulticastPort") String PROP_CLUSTER_HAPARTITION_PORT_HELP = "propertyClusterHaPartitionPortHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition UDP EJB3 Entity Cache Multicast Port") }) String PROP_CLUSTER_EJB3CACHE_PORT = "propertyClusterEjb3CachePort"; - @I18NMessage("-PartitionUDPEJB3EntityCacheMulticastPort") + @I18NMessage(/* help url */"PartitionUDPEJB3EntityCacheMulticastPort") String PROP_CLUSTER_EJB3CACHE_PORT_HELP = "propertyClusterEjb3CachePortHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition UDP Alert Cache Multicast Port") }) String PROP_CLUSTER_ALERTCACHE_PORT = "propertyClusterAlertCachePort"; - @I18NMessage("-PartitionUDPAlertCacheMulticastPort") + @I18NMessage(/* help url */"PartitionUDPAlertCacheMulticastPort") String PROP_CLUSTER_ALERTCACHE_PORT_HELP = "propertyClusterAlertCachePortHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - Partition UDP Loopback") }) String PROP_CLUSTER_UDP_LOOPBACK = "propertyClusterUdpLoopback"; - @I18NMessage("-PartitionUDPLoopback") + @I18NMessage(/* help url */"PartitionUDPLoopback") String PROP_CLUSTER_UDP_LOOPBACK_HELP = "propertyClusterUdpLoopbackHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - HA JNDI Port") }) String PROP_CLUSTER_HAJNDI_PORT = "propertyClusterHaJndiPort"; - @I18NMessage("-HAJNDIPort") + @I18NMessage(/* help url */"HAJNDIPort") String PROP_CLUSTER_HAJNDI_PORT_HELP = "propertyClusterHaJndiPortHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - HA JNDI RMI Port") }) String PROP_CLUSTER_HAJNDI_RMIPORT = "propertyClusterHaJndiRmiPort"; - @I18NMessage("-HAJNDIRMIPort") + @I18NMessage(/* help url */"HAJNDIRMIPort") String PROP_CLUSTER_HAJNDI_RMIPORT_HELP = "propertyClusterHaJndiRmiPortHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - HA JNDI Auto Discovery Group Port") }) String PROP_CLUSTER_HAJNDI_AUTODISCOVERPORT = "propertyClusterHaJndiAutoDiscoveryPort"; - @I18NMessage("-HAJNDIAutoDiscoveryGroupPort") + @I18NMessage(/* help url */"HAJNDIAutoDiscoveryGroupPort") String PROP_CLUSTER_HAJNDI_AUTODISCOVERPORT_HELP = "propertyClusterHaJndiAutoDiscoveryPortHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - HA JRMP Invoker RMI Port") }) String PROP_CLUSTER_HAJRMPINVOKER_RMIPORT = "propertyClusterHaJrmpInvokerRmiPort"; - @I18NMessage("-HAJRMPInvokerRMIPort") + @I18NMessage(/* help url */"HAJRMPInvokerRMIPort") String PROP_CLUSTER_HAJRMPINVOKER_RMIPORT_HELP = "propertyClusterHaJrmpInvokerRmiPortHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - HA Pooled Invoker Port") }) String PROP_CLUSTER_HAPOOLEDINVOKER_PORT = "propertyClusterHaPooledInvokerPort"; - @I18NMessage("-HAPooledInvokerPort") + @I18NMessage(/* help url */"HAPooledInvokerPort") String PROP_CLUSTER_HAPOOLEDINVOKER_PORT_HELP = "propertyClusterHaPooledInvokerPortHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Cluster - JGroups UDP IP Time To Live") }) String PROP_CLUSTER_JGROUPS_UDP_IP_TTL = "propertyClusterJGroupsUdpIpTtl"; - @I18NMessage("-JGroupsUDPIPTimeToLive") + @I18NMessage(/* help url */"JGroupsUDPIPTimeToLive") String PROP_CLUSTER_JGROUPS_UDP_IP_TTL_HELP = "propertyClusterJGroupsUdpIpTtlHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Maximum Web Connections") }) String PROP_CONCURRENCY_LIMIT_WEBCONNS = "propertyConcurrencyLimitWebConns"; - @I18NMessage("-WebConnections") + @I18NMessage(/* help url */"WebConnections") String PROP_CONCURRENCY_LIMIT_WEBCONNS_HELP = "propertyConcurrencyLimitWebConnsHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Global") }) String PROP_CONCURRENCY_LIMIT_GLOBAL = "propertyConcurrencyLimitGlobal"; - @I18NMessage("-GlobalConcurrencyLimit") + @I18NMessage(/* help url */"GlobalConcurrencyLimit") String PROP_CONCURRENCY_LIMIT_GLOBAL_HELP = "propertyConcurrencyLimitGlobalHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Inventory Reports") }) String PROP_CONCURRENCY_LIMIT_INV_REPORT = "propertyConcurrencyLimitInventoryReport"; - @I18NMessage("-InventoryReport") + @I18NMessage(/* help url */"InventoryReport") String PROP_CONCURRENCY_LIMIT_INV_REPORT_HELP = "propertyConcurrencyLimitInventoryReportHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Availability Reports") }) String PROP_CONCURRENCY_LIMIT_AVAIL_REPORT = "propertyConcurrencyLimitAvailabilityReport"; - @I18NMessage("-AvailabilityReport") + @I18NMessage(/* help url */"AvailabilityReport") String PROP_CONCURRENCY_LIMIT_AVAIL_REPORT_HELP = "propertyConcurrencyLimitAvailabilityReportHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Inventory Synchronizations") }) String PROP_CONCURRENCY_LIMIT_INV_SYNC = "propertyConcurrencyLimitInventorySync"; - @I18NMessage("-InventorySynchronization") + @I18NMessage(/* help url */"InventorySynchronization") String PROP_CONCURRENCY_LIMIT_INV_SYNC_HELP = "propertyConcurrencyLimitInventorySyncHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Content Reports") }) String PROP_CONCURRENCY_LIMIT_CONTENT_REPORT = "propertyConcurrencyLimitContentReport"; - @I18NMessage("-ContentReport") + @I18NMessage(/* help url */"ContentReport") String PROP_CONCURRENCY_LIMIT_CONTENT_REPORT_HELP = "propertyConcurrencyLimitContentReportHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Content Downloads") }) String PROP_CONCURRENCY_LIMIT_CONTENT_DOWNLOAD = "propertyConcurrencyLimitContentDownload"; - @I18NMessage("-ContentDownload") + @I18NMessage(/* help url */"ContentDownload") String PROP_CONCURRENCY_LIMIT_CONTENT_DOWNLOAD_HELP = "propertyConcurrencyLimitContentDownloadHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Measurement Reports") }) String PROP_CONCURRENCY_LIMIT_MEAS_REPORT = "propertyConcurrencyLimitMeasurementReport"; - @I18NMessage("-MeasurementReport") + @I18NMessage(/* help url */"MeasurementReport") String PROP_CONCURRENCY_LIMIT_MEAS_REPORT_HELP = "propertyConcurrencyLimitMeasurementReportHelp"; @I18NMessages({ @I18NMessage(locale = "en", value = "Concurrency Limit - Measurement Schedule Requests") }) String PROP_CONCURRENCY_LIMIT_MEASSCHED_REQ = "propertyConcurrencyLimitMeasurementScheduleRequest"; - @I18NMessage("-MeasurementScheduleRequest") + @I18NMessage(/* help url */"MeasurementScheduleRequest") String PROP_CONCURRENCY_LIMIT_MEASSCHED_REQ_HELP = "propertyConcurrencyLimitMeasurementScheduleRequestHelp"; // Help Documentation - links to the wiki @@ -687,12 +687,12 @@ public interface InstallerI18NResourceKeys { @I18NMessage(locale = "en", value = "Server Name") String PROP_HIGH_AVAILABILITY_NAME = "propertyHighAvailabilityName"; - @I18NMessage("-ServerName") + @I18NMessage(/* help url */"ServerName") String PROP_HIGH_AVAILABILITY_NAME_HELP = "propertyHighAvailabilityNameHelp"; @I18NMessage(locale = "en", value = "Maintenance Mode At Start") String PROP_MM_AT_START = "propertyMaintenanceModeAtStart"; - @I18NMessage("-MaintenanceModeAtStart") + @I18NMessage(/* help url */"MaintenanceModeAtStart") String PROP_MM_AT_START_HELP = "propertyMaintenanceModeAtStartHelp"; @I18NMessage(locale = "en", value = "Server Public Address") diff --git a/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_pt.properties b/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_pt.properties index f98e373..c3af5ba 100644 --- a/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_pt.properties +++ b/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_pt.properties @@ -45,7 +45,6 @@ startInstallingLink=Clique aqui para continuar a instala\u00E7\u00E3o. backToSettingsLink=Retornar \u00E0 p\u00E1gina de configura\u00E7\u00E3o showAdvancedSettings=Mostrar configura\u00E7\u00F5es avan\u00E7adas propertyDatabaseType=Tipo de Banco de Dados -propertyDatabaseTypeHelp=-TipoBancoDeDados propertyDatabaseConnectionUrl=URL de conex\u00E3o do Banco de Dados propertyDatabaseUserName=Usu\u00E1rio do Banco de Dados propertyDatabasePassword=Senha do Banco de Dados diff --git a/pom.xml b/pom.xml index 3ae18ec..de04570 100644 --- a/pom.xml +++ b/pom.xml @@ -47,12 +47,12 @@ <product.shortName>RHQ</product.shortName> <product.name>RHQ</product.name> <product.fullName>RHQ</product.fullName> - <product.url>http://rhq-project.org/</product.url> + <product.url>http://www.rhq-project.org/</product.url> <product.urlDomain>rhq-project.org</product.urlDomain> - <product.salesEmail>sales(a)rhq-project.org</product.salesEmail> - <product.supportEmail>info(a)rhq-project.org</product.supportEmail> + <product.salesEmail>rhq-users(a)lists.fedorahosted.org</product.salesEmail> + <product.supportEmail>rhq-users(a)lists.fedorahosted.org</product.supportEmail> <product.version>${project.version}</product.version> - <product.helpDocRoot>http://support.rhq-project.org/display/RHQ/</product.helpDocRoot> + <product.helpDocRoot>http://www.rhq-project.org/display/JOPR2/</product.helpDocRoot> <product.buildPropertiesFile>target/build.properties</product.buildPropertiesFile> <doUpdate>false</doUpdate>

1 0

[rhq] Branch 'release/jon3.1.x' - modules/plugins
by Simeon Pinder 23 May '12

23 May '12

modules/plugins/jboss-as-7/pom.xml | 13 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextComponent.java | 2 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextDiscoveryComponent.java | 2 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/modcluster/ProxyInfo.java | 349 ++++++++++ 4 files changed, 351 insertions(+), 15 deletions(-) New commits: commit 3ad5f3a16684cbdc02bce1d75a1606a85f99ef5c Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed May 23 16:52:33 2012 -0400 [BZ 823624] refactor to no longer depend upon presence or components from mod_cluster for various reasons. diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index 865042b..f0a7f3d 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -65,14 +65,6 @@ <version>${jboss.sasl.version}</version> </dependency> -  - <dependency> - <groupId>${rhq.groupId}</groupId> - <artifactId>modcluster-plugin</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> -  <dependency> @@ -128,11 +120,6 @@ <artifactId>jboss-sasl</artifactId> </artifactItem> - <artifactItem> - <groupId>${rhq.groupId}</groupId> - <artifactId>modcluster-plugin</artifactId> - <version>${project.version}</version> - </artifactItem> </artifactItems> <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory> </configuration> diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextComponent.java index 5239e1a..836b6a7 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextComponent.java @@ -6,7 +6,7 @@ import org.rhq.core.pluginapi.availability.AvailabilityFacet; import org.rhq.modules.plugins.jbossas7.json.Address; import org.rhq.modules.plugins.jbossas7.json.Operation; import org.rhq.modules.plugins.jbossas7.json.Result; -import org.rhq.plugins.modcluster.model.ProxyInfo; +import org.rhq.modules.plugins.jbossas7.modcluster.ProxyInfo; /** * Component class for ModCluster Webapp Context diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextDiscoveryComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextDiscoveryComponent.java index 02a7e68..eed0c3b 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextDiscoveryComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextDiscoveryComponent.java @@ -30,7 +30,7 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.modules.plugins.jbossas7.json.Address; import org.rhq.modules.plugins.jbossas7.json.Operation; import org.rhq.modules.plugins.jbossas7.json.Result; -import org.rhq.plugins.modcluster.model.ProxyInfo; +import org.rhq.modules.plugins.jbossas7.modcluster.ProxyInfo; /** * Discovers mod_cluster contexts using the proxyInfo details from as7. diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/modcluster/ProxyInfo.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/modcluster/ProxyInfo.java new file mode 100644 index 0000000..3a57a1b --- /dev/null +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/modcluster/ProxyInfo.java @@ -0,0 +1,349 @@ +package org.rhq.modules.plugins.jbossas7.modcluster; + +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/**This is a clone of org.rhq.plugins.modcluster.model.ProxyInfo from modules/plugins/mod-cluster/... pulled + * into this plugin to avoid complicated build/install/deploy/runtime dependency issues + * between the two plugins. + * + * Simple parser for the raw proxy information provided by mod_cluster. + * + * @author Simeon Pinder + */ +public class ProxyInfo { + + private Map<String, Node> availableNodes = new HashMap<String, Node>(); + private Map<String, Vhost> availableVhosts = new HashMap<String, Vhost>(); + private List<Context> availableContexts = new ArrayList<ProxyInfo.Context>(); + + public ProxyInfo(String rawProxyInfo) { + parseNodes(rawProxyInfo); + parseVhosts(rawProxyInfo); + parseContexts(rawProxyInfo); + } + + private void parseNodes(String rawProxyInfo) { + Pattern nodePattern = Pattern.compile("Node:.*\n"); + Matcher nodeMatcher = nodePattern.matcher(rawProxyInfo); + while (nodeMatcher.find()) { + String rawNode = nodeMatcher.group(); + String[] nodePieces = rawNode.split(","); + + String identifier = nodePieces[0]; + identifier = identifier.substring(identifier.indexOf("[") + 1, identifier.indexOf("]")); + + String jvmRoute = nodePieces[1]; + jvmRoute = jvmRoute.substring(jvmRoute.indexOf(':') + 1).trim(); + + availableNodes.put(identifier, new Node(jvmRoute, identifier)); + } + } + + private void parseVhosts(String rawProxyInfo) { + Pattern vhostPattern = Pattern.compile("Vhost:.*\n"); + Matcher vhostMatcher = vhostPattern.matcher(rawProxyInfo); + while (vhostMatcher.find()) { + String rawVhost = vhostMatcher.group(); + String[] vhostPieces = rawVhost.split(","); + + String identifier = vhostPieces[0].trim(); + identifier = identifier.substring(identifier.indexOf("[") + 1, identifier.indexOf("]")); + identifier = identifier.substring(0, identifier.lastIndexOf(":")); + + String host = vhostPieces[1].trim(); + host = host.substring(host.indexOf(":") + 1).trim(); + + availableVhosts.put(identifier, new Vhost(identifier, host)); + } + } + + private void parseContexts(String rawProxyInfo) { + Pattern contextPattern = Pattern.compile("Context:.*[\n|}]"); + Matcher contextMatcher = contextPattern.matcher(rawProxyInfo); + while (contextMatcher.find()) { + String rawContext = contextMatcher.group(); + String[] contextPieces = rawContext.split(","); + String actualContext = contextPieces[1].substring(contextPieces[1].indexOf("/")).trim(); + + String identifier = contextPieces[0]; + identifier = identifier.substring(identifier.indexOf("[") + 1, identifier.indexOf("]")); + identifier = identifier.substring(0, identifier.lastIndexOf(":")); + + String nodeIdentifier = contextPieces[0]; + nodeIdentifier = nodeIdentifier.substring(nodeIdentifier.indexOf("[") + 1, nodeIdentifier.indexOf("]")); + nodeIdentifier = nodeIdentifier.substring(0, nodeIdentifier.indexOf(":")); + String jvmRoute = availableNodes.get(nodeIdentifier).getJvmRoute(); + + String rawIsEnabled = contextPieces[2]; + rawIsEnabled = rawIsEnabled.substring(rawIsEnabled.indexOf(':') + 1).trim(); + boolean isEnabled = rawIsEnabled.equals("ENABLED") ? true : false; + + Vhost relatedVhost = availableVhosts.get(identifier); + + availableContexts.add(new Context(jvmRoute, relatedVhost.getHost(), actualContext, isEnabled)); + } + } + + public List<Context> getAvailableContexts() { + return Collections.unmodifiableList(availableContexts); + } + + public List<Vhost> getAvailableVhosts() { + return Collections.unmodifiableList(new ArrayList<Vhost>(availableVhosts.values())); + } + + public List<Node> getAvailableNodes() { + return Collections.unmodifiableList(new ArrayList<Node>(availableNodes.values())); + } + + public static class Node { + private String jvmRoute; + private String nodeId; + + public Node(String jvmRoute, String nodeId) { + this.jvmRoute = jvmRoute; + this.nodeId = nodeId; + } + + public String getNodeId() { + return nodeId; + } + + public String getJvmRoute() { + return jvmRoute; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((jvmRoute == null) ? 0 : jvmRoute.hashCode()); + result = prime * result + ((nodeId == null) ? 0 : nodeId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Node other = (Node) obj; + if (jvmRoute == null) { + if (other.jvmRoute != null) + return false; + } else if (!jvmRoute.equals(other.jvmRoute)) + return false; + if (nodeId == null) { + if (other.nodeId != null) + return false; + } else if (!nodeId.equals(other.nodeId)) + return false; + return true; + } + } + + public static class Vhost { + private String identifier; + private String host; + + public Vhost(String identifier, String host) { + this.identifier = identifier; + this.host = host; + } + + public String getIdentifier() { + return identifier; + } + + public String getHost() { + return host; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((host == null) ? 0 : host.hashCode()); + result = prime * result + ((identifier == null) ? 0 : identifier.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Vhost other = (Vhost) obj; + if (host == null) { + if (other.host != null) + return false; + } else if (!host.equals(other.host)) + return false; + if (identifier == null) { + if (other.identifier != null) + return false; + } else if (!identifier.equals(other.identifier)) + return false; + return true; + } + } + + public static class Context { + private String path; + private String host; + private String jvmRoute; + private boolean isEnabled; + + public Context(String jvmRoute, String host, String path) { + this(jvmRoute, host, path, false); + } + + public Context(String jvmRoute, String host, String path, boolean isEnabled) { + this.jvmRoute = jvmRoute; + this.host = host; + this.path = path; + this.isEnabled = isEnabled; + } + + public String getPath() { + return path; + } + + public String getHost() { + return host; + } + + public String getJvmRoute() { + return jvmRoute; + } + + public boolean isEnabled() { + return isEnabled; + } + + public String createKey() { + return jvmRoute + ":" + host + ":" + path; + } + + public String createName() { + return host + ":" + path; + } + + @Override + public String toString() { + return createKey(); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((host == null) ? 0 : host.hashCode()); + result = prime * result + ((jvmRoute == null) ? 0 : jvmRoute.hashCode()); + result = prime * result + ((path == null) ? 0 : path.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Context other = (Context) obj; + if (host == null) { + if (other.host != null) + return false; + } else if (!host.equals(other.host)) + return false; + if (jvmRoute == null) { + if (other.jvmRoute != null) + return false; + } else if (!jvmRoute.equals(other.jvmRoute)) + return false; + if (path == null) { + if (other.path != null) + return false; + } else if (!path.equals(other.path)) + return false; + return true; + } + + public static Context fromString(String stringRepresentation) throws Exception { + String parts[] = stringRepresentation.trim().split(":"); + if (parts.length < 3) { + throw new Exception("Parsing error. Not enough information to create a context."); + } + + return new Context(parts[0], parts[1], parts[2]); + } + } + + public static void main(String[] args) { + String as7ProxyInfo = ""; + as7ProxyInfo += "Node: [1],Name: asterixA-0502-3305-8ff3-fad7fee8b516,Balancer: mycluster,LBGroup: ,Host: 192.168.1.9,Port: 8009,Type: ajp,Flushpackets: Off,Flushwait: 10,Ping: 10,Smax: 26,Ttl: 60,Elected: 0,Read: 0,Transfered: 0,Connected: 0,Load: 100\n"; + as7ProxyInfo += "Node: [2],Name: 00fa6bff-83a2-3bde-9e76-998b1a4a8c2c,Balancer: mycluster,LBGroup: ,Host: 192.168.1.3,Port: 8009,Type: ajp,Flushpackets: Off,Flushwait: 10,Ping: 10,Smax: 26,Ttl: 60,Elected: 0,Read: 0,Transfered: 0,Connected: 0,Load: 98\n"; + as7ProxyInfo += "Vhost: [1:1:1], Alias: example.com\n"; + as7ProxyInfo += "Vhost: [1:1:2], Alias: localhost\n"; + as7ProxyInfo += "Vhost: [1:1:3], Alias: default-host\n"; + as7ProxyInfo += "Vhost: [2:1:4], Alias: default-host\n"; + as7ProxyInfo += "Vhost: [2:1:5], Alias: 192.168.1.3\n"; + as7ProxyInfo += "Vhost: [2:1:6], Alias: example1.com\n"; + as7ProxyInfo += "Context: [1:1:1], Context: /helloworld, Status: ENABLED\n"; + as7ProxyInfo += "Context: [2:1:2], Context: /helloworld, Status: ENABLED\n"; + + //test out proxyInfo + ProxyInfo pi = new ProxyInfo(as7ProxyInfo); + //list nodes + for (Node n : pi.getAvailableNodes()) { + System.out.println("Node jvmRoute:" + n.getJvmRoute() + " nodeId:" + n.getNodeId()); + } + System.out.println(""); + //list VHosts + for (Vhost v : pi.getAvailableVhosts()) { + System.out.println("VHost host:" + v.getHost() + " identifier:" + v.getIdentifier()); + } + System.out.println(""); + + //list Contexts + for (Context c : pi.getAvailableContexts()) { + System.out.println("VHost host:" + c.getHost() + " jvmRoute:" + c.getJvmRoute() + " path:" + c.getPath()); + System.out.println("\t createKey:" + c.createKey() + " createName:" + c.createName()); + } + System.out.println(""); + + } +}

1 0

[rhq] modules/plugins
by Simeon Pinder 23 May '12

23 May '12

modules/plugins/jboss-as-7/pom.xml | 13 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextComponent.java | 2 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextDiscoveryComponent.java | 2 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/modcluster/ProxyInfo.java | 349 ++++++++++ 4 files changed, 351 insertions(+), 15 deletions(-) New commits: commit 89bf8dfc9ead2f6cff8382617bfad018e58f7790 Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed May 23 16:52:33 2012 -0400 [BZ 823624] refactor to no longer depend upon presence or components from mod_cluster for various reasons. diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index f630059..d586724 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -65,14 +65,6 @@ <version>${jboss.sasl.version}</version> </dependency> -  - <dependency> - <groupId>${rhq.groupId}</groupId> - <artifactId>modcluster-plugin</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> -  <dependency> @@ -128,11 +120,6 @@ <artifactId>jboss-sasl</artifactId> </artifactItem> - <artifactItem> - <groupId>${rhq.groupId}</groupId> - <artifactId>modcluster-plugin</artifactId> - <version>${project.version}</version> - </artifactItem> </artifactItems> <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory> </configuration> diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextComponent.java index 5239e1a..836b6a7 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextComponent.java @@ -6,7 +6,7 @@ import org.rhq.core.pluginapi.availability.AvailabilityFacet; import org.rhq.modules.plugins.jbossas7.json.Address; import org.rhq.modules.plugins.jbossas7.json.Operation; import org.rhq.modules.plugins.jbossas7.json.Result; -import org.rhq.plugins.modcluster.model.ProxyInfo; +import org.rhq.modules.plugins.jbossas7.modcluster.ProxyInfo; /** * Component class for ModCluster Webapp Context diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextDiscoveryComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextDiscoveryComponent.java index 02a7e68..eed0c3b 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextDiscoveryComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextDiscoveryComponent.java @@ -30,7 +30,7 @@ import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.modules.plugins.jbossas7.json.Address; import org.rhq.modules.plugins.jbossas7.json.Operation; import org.rhq.modules.plugins.jbossas7.json.Result; -import org.rhq.plugins.modcluster.model.ProxyInfo; +import org.rhq.modules.plugins.jbossas7.modcluster.ProxyInfo; /** * Discovers mod_cluster contexts using the proxyInfo details from as7. diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/modcluster/ProxyInfo.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/modcluster/ProxyInfo.java new file mode 100644 index 0000000..3a57a1b --- /dev/null +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/modcluster/ProxyInfo.java @@ -0,0 +1,349 @@ +package org.rhq.modules.plugins.jbossas7.modcluster; + +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/**This is a clone of org.rhq.plugins.modcluster.model.ProxyInfo from modules/plugins/mod-cluster/... pulled + * into this plugin to avoid complicated build/install/deploy/runtime dependency issues + * between the two plugins. + * + * Simple parser for the raw proxy information provided by mod_cluster. + * + * @author Simeon Pinder + */ +public class ProxyInfo { + + private Map<String, Node> availableNodes = new HashMap<String, Node>(); + private Map<String, Vhost> availableVhosts = new HashMap<String, Vhost>(); + private List<Context> availableContexts = new ArrayList<ProxyInfo.Context>(); + + public ProxyInfo(String rawProxyInfo) { + parseNodes(rawProxyInfo); + parseVhosts(rawProxyInfo); + parseContexts(rawProxyInfo); + } + + private void parseNodes(String rawProxyInfo) { + Pattern nodePattern = Pattern.compile("Node:.*\n"); + Matcher nodeMatcher = nodePattern.matcher(rawProxyInfo); + while (nodeMatcher.find()) { + String rawNode = nodeMatcher.group(); + String[] nodePieces = rawNode.split(","); + + String identifier = nodePieces[0]; + identifier = identifier.substring(identifier.indexOf("[") + 1, identifier.indexOf("]")); + + String jvmRoute = nodePieces[1]; + jvmRoute = jvmRoute.substring(jvmRoute.indexOf(':') + 1).trim(); + + availableNodes.put(identifier, new Node(jvmRoute, identifier)); + } + } + + private void parseVhosts(String rawProxyInfo) { + Pattern vhostPattern = Pattern.compile("Vhost:.*\n"); + Matcher vhostMatcher = vhostPattern.matcher(rawProxyInfo); + while (vhostMatcher.find()) { + String rawVhost = vhostMatcher.group(); + String[] vhostPieces = rawVhost.split(","); + + String identifier = vhostPieces[0].trim(); + identifier = identifier.substring(identifier.indexOf("[") + 1, identifier.indexOf("]")); + identifier = identifier.substring(0, identifier.lastIndexOf(":")); + + String host = vhostPieces[1].trim(); + host = host.substring(host.indexOf(":") + 1).trim(); + + availableVhosts.put(identifier, new Vhost(identifier, host)); + } + } + + private void parseContexts(String rawProxyInfo) { + Pattern contextPattern = Pattern.compile("Context:.*[\n|}]"); + Matcher contextMatcher = contextPattern.matcher(rawProxyInfo); + while (contextMatcher.find()) { + String rawContext = contextMatcher.group(); + String[] contextPieces = rawContext.split(","); + String actualContext = contextPieces[1].substring(contextPieces[1].indexOf("/")).trim(); + + String identifier = contextPieces[0]; + identifier = identifier.substring(identifier.indexOf("[") + 1, identifier.indexOf("]")); + identifier = identifier.substring(0, identifier.lastIndexOf(":")); + + String nodeIdentifier = contextPieces[0]; + nodeIdentifier = nodeIdentifier.substring(nodeIdentifier.indexOf("[") + 1, nodeIdentifier.indexOf("]")); + nodeIdentifier = nodeIdentifier.substring(0, nodeIdentifier.indexOf(":")); + String jvmRoute = availableNodes.get(nodeIdentifier).getJvmRoute(); + + String rawIsEnabled = contextPieces[2]; + rawIsEnabled = rawIsEnabled.substring(rawIsEnabled.indexOf(':') + 1).trim(); + boolean isEnabled = rawIsEnabled.equals("ENABLED") ? true : false; + + Vhost relatedVhost = availableVhosts.get(identifier); + + availableContexts.add(new Context(jvmRoute, relatedVhost.getHost(), actualContext, isEnabled)); + } + } + + public List<Context> getAvailableContexts() { + return Collections.unmodifiableList(availableContexts); + } + + public List<Vhost> getAvailableVhosts() { + return Collections.unmodifiableList(new ArrayList<Vhost>(availableVhosts.values())); + } + + public List<Node> getAvailableNodes() { + return Collections.unmodifiableList(new ArrayList<Node>(availableNodes.values())); + } + + public static class Node { + private String jvmRoute; + private String nodeId; + + public Node(String jvmRoute, String nodeId) { + this.jvmRoute = jvmRoute; + this.nodeId = nodeId; + } + + public String getNodeId() { + return nodeId; + } + + public String getJvmRoute() { + return jvmRoute; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((jvmRoute == null) ? 0 : jvmRoute.hashCode()); + result = prime * result + ((nodeId == null) ? 0 : nodeId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Node other = (Node) obj; + if (jvmRoute == null) { + if (other.jvmRoute != null) + return false; + } else if (!jvmRoute.equals(other.jvmRoute)) + return false; + if (nodeId == null) { + if (other.nodeId != null) + return false; + } else if (!nodeId.equals(other.nodeId)) + return false; + return true; + } + } + + public static class Vhost { + private String identifier; + private String host; + + public Vhost(String identifier, String host) { + this.identifier = identifier; + this.host = host; + } + + public String getIdentifier() { + return identifier; + } + + public String getHost() { + return host; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((host == null) ? 0 : host.hashCode()); + result = prime * result + ((identifier == null) ? 0 : identifier.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Vhost other = (Vhost) obj; + if (host == null) { + if (other.host != null) + return false; + } else if (!host.equals(other.host)) + return false; + if (identifier == null) { + if (other.identifier != null) + return false; + } else if (!identifier.equals(other.identifier)) + return false; + return true; + } + } + + public static class Context { + private String path; + private String host; + private String jvmRoute; + private boolean isEnabled; + + public Context(String jvmRoute, String host, String path) { + this(jvmRoute, host, path, false); + } + + public Context(String jvmRoute, String host, String path, boolean isEnabled) { + this.jvmRoute = jvmRoute; + this.host = host; + this.path = path; + this.isEnabled = isEnabled; + } + + public String getPath() { + return path; + } + + public String getHost() { + return host; + } + + public String getJvmRoute() { + return jvmRoute; + } + + public boolean isEnabled() { + return isEnabled; + } + + public String createKey() { + return jvmRoute + ":" + host + ":" + path; + } + + public String createName() { + return host + ":" + path; + } + + @Override + public String toString() { + return createKey(); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((host == null) ? 0 : host.hashCode()); + result = prime * result + ((jvmRoute == null) ? 0 : jvmRoute.hashCode()); + result = prime * result + ((path == null) ? 0 : path.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Context other = (Context) obj; + if (host == null) { + if (other.host != null) + return false; + } else if (!host.equals(other.host)) + return false; + if (jvmRoute == null) { + if (other.jvmRoute != null) + return false; + } else if (!jvmRoute.equals(other.jvmRoute)) + return false; + if (path == null) { + if (other.path != null) + return false; + } else if (!path.equals(other.path)) + return false; + return true; + } + + public static Context fromString(String stringRepresentation) throws Exception { + String parts[] = stringRepresentation.trim().split(":"); + if (parts.length < 3) { + throw new Exception("Parsing error. Not enough information to create a context."); + } + + return new Context(parts[0], parts[1], parts[2]); + } + } + + public static void main(String[] args) { + String as7ProxyInfo = ""; + as7ProxyInfo += "Node: [1],Name: asterixA-0502-3305-8ff3-fad7fee8b516,Balancer: mycluster,LBGroup: ,Host: 192.168.1.9,Port: 8009,Type: ajp,Flushpackets: Off,Flushwait: 10,Ping: 10,Smax: 26,Ttl: 60,Elected: 0,Read: 0,Transfered: 0,Connected: 0,Load: 100\n"; + as7ProxyInfo += "Node: [2],Name: 00fa6bff-83a2-3bde-9e76-998b1a4a8c2c,Balancer: mycluster,LBGroup: ,Host: 192.168.1.3,Port: 8009,Type: ajp,Flushpackets: Off,Flushwait: 10,Ping: 10,Smax: 26,Ttl: 60,Elected: 0,Read: 0,Transfered: 0,Connected: 0,Load: 98\n"; + as7ProxyInfo += "Vhost: [1:1:1], Alias: example.com\n"; + as7ProxyInfo += "Vhost: [1:1:2], Alias: localhost\n"; + as7ProxyInfo += "Vhost: [1:1:3], Alias: default-host\n"; + as7ProxyInfo += "Vhost: [2:1:4], Alias: default-host\n"; + as7ProxyInfo += "Vhost: [2:1:5], Alias: 192.168.1.3\n"; + as7ProxyInfo += "Vhost: [2:1:6], Alias: example1.com\n"; + as7ProxyInfo += "Context: [1:1:1], Context: /helloworld, Status: ENABLED\n"; + as7ProxyInfo += "Context: [2:1:2], Context: /helloworld, Status: ENABLED\n"; + + //test out proxyInfo + ProxyInfo pi = new ProxyInfo(as7ProxyInfo); + //list nodes + for (Node n : pi.getAvailableNodes()) { + System.out.println("Node jvmRoute:" + n.getJvmRoute() + " nodeId:" + n.getNodeId()); + } + System.out.println(""); + //list VHosts + for (Vhost v : pi.getAvailableVhosts()) { + System.out.println("VHost host:" + v.getHost() + " identifier:" + v.getIdentifier()); + } + System.out.println(""); + + //list Contexts + for (Context c : pi.getAvailableContexts()) { + System.out.println("VHost host:" + c.getHost() + " jvmRoute:" + c.getJvmRoute() + " path:" + c.getPath()); + System.out.println("\t createKey:" + c.createKey() + " createName:" + c.createName()); + } + System.out.println(""); + + } +}

1 0

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

23 May '12

modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_ko.properties | 93 ---------- modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_zh.properties | 91 --------- 2 files changed, 1 insertion(+), 183 deletions(-) New commits: commit f05397758cd437e80ea81303a7004406709a6e47 Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed May 23 13:15:44 2012 -0400 [BZ 823860] the korean and chinese i18n props file had the help url props in them. No need to do this since these aren't really strings that need translation and if we ever change these url fragments (which we need to in this bz), we need to not only change the java code that produces the default message .props but we would then have to remember to change these files. Taking these out won't break anything since those languages will not have these props in their own .props file thus will fallback to the default messages props file which WILL have them (they are autogenerated by the java code) diff --git a/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_ko.properties b/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_ko.properties index ecf95e8..f206aef 100644 --- a/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_ko.properties +++ b/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_ko.properties @@ -57,183 +57,94 @@ startInstallingLink=\uc124\uce58\ub97c \uacc4\uc18d\ud558\ub824\uba74 \uc5ec\uae backToSettingsLink=\uad6c\uc131 \ud398\uc774\uc9c0\ub85c \ub3cc\uc544\uac00\uae30 showAdvancedSettings=\uace0\uae09 \uc124\uc815 \ubcf4\uae30 propertyDatabaseType=\ub370\uc774\ud130\ubca0\uc774\uc2a4 \ud0c0\uc785 -propertyDatabaseTypeHelp=-DatabaseType propertyDatabaseConnectionUrl=\ub370\uc774\ud130\ubca0\uc774\uc2a4 \uc5f0\uacb0 URL -propertyDatabaseConnectionUrlHelp=-DatabaseConnectionURL propertyDatabaseDriverClass=\ub370\uc774\ud130\ubca0\uc774\uc2a4 JDBC \ub4dc\ub77c\uc774\ubc84 \ud074\ub798\uc2a4 -propertyDatabaseDriverClassHelp=-DatabaseJDBCDriverClass propertyDatabaseXADataSourceClass=\ub370\uc774\ud130\ubca0\uc774\uc2a4 XA \ub370\uc774\ud130\uc18c\uc2a4 \ud074\ub798\uc2a4 -propertyDatabaseXADataSourceClassHelp=-DatabaseXADataSourceClass propertyDatabaseUserName=\ub370\uc774\ud130\ubca0\uc774\uc2a4 \uc0ac\uc6a9\uc790 \uc774\ub984 -propertyDatabaseUserNameHelp=-DatabaseUserName propertyDatabasePassword=\ub370\uc774\ud130\ubca0\uc774\uc2a4 \ube44\ubc00\ubc88\ud638 -propertyDatabasePasswordHelp=-DatabasePassword propertyBindAddress=\uc11c\ubc84 \ubc14\uc778\ub4dc \uc8fc\uc18c -propertyBindAddressHelp=-ServerBindAddress propertyHttpPort=HTTP \ud3ec\ud2b8 -propertyHttpPortHelp=-HTTPPort propertyHttpsPort=\ubcf4\uc548 HTTPS \ud3ec\ud2b8 -propertyHttpsPortHelp=-SecureHTTPSPort propertyWebServicePort=\uc6f9 \uc11c\ube44\uc2a4 \ud3ec\ud2b8 -propertyWebServicePortHelp=-WebServicePort propertyNamingServicePort=\ub124\uc774\ubc0d \uc11c\ube44\uc2a4 \ud3ec\ud2b8 -propertyNamingServicePortHelp=-NamingServicePort propertyNamingServiceRmiPort=\ub124\uc774\ubc0d \uc11c\ube44\uc2a4 RMI \ud3ec\ud2b8 -propertyNamingServiceRmiPortHelp=-NamingServiceRMIPort propertyJrmpInvokerRmiPort=JRMP \ud638\ucd9c\uc790 RMI \ud3ec\ud2b8 -propertyJrmpInvokerRmiPortHelp=-JRMPInvokerRMIPort propertyPooledInvokerRmiPort=\ud480\ub9c1 \ud638\ucd9c\uc790 RMI \ud3ec\ud2b8 -propertyPooledInvokerRmiPortHelp=-PooledInvokerRMIPort propertyAjpPort=AJP \ud3ec\ud2b8 -propertyAjpPortHelp=-AJPPort propertyUnifiedInvokerPort=\ud1b5\ud569 \ud638\ucd9c\uc790 \ud3ec\ud2b8 -propertyUnifiedInvokerPortHelp=-UnifiedInvokerPort propertyAspectDeployerPort=Aspect \ubc30\ud3ec\uc790 \ud3ec\ud2b8 -propertyAspectDeployerPortHelp=-AspectDeployerPort propertyTomcatClientAuthMode=\ud1b0\ucf13 \ud074\ub77c\uc774\uc5b8\ud2b8 \uc778\uc99d \ubaa8\ub4dc -propertyTomcatClientAuthModeHelp=-TomcatClientAuthMode propertyTomcatAlgorithm=\ud1b0\ucf13 Keystore/Truststore \uc54c\uace0\ub9ac\uc998 -propertyTomcatAlgorithmHelp=-TomcatAlgorithm propertyTomcatKeystoreFilename=\ud1b0\ucf13 Keystore -propertyTomcatKeystoreFilenameHelp=-TomcatKeystore propertyTomcatKeystorePassword=\ud1b0\ucf13 Keystore \ube44\ubc00\ubc88\ud638 -propertyTomcatKeystorePasswordHelp=-TomcatKeystorePassword propertyTomcatKeystoreType=\ud1b0\ucf13 Keystore \ud0c0\uc785 -propertyTomcatKeystoreTypeHelp=-TomcatKeystoreType propertyTomcatKeystoreAlias=\ud1b0\ucf13 Keystore \ubcc4\uce6d -propertyTomcatKeystoreAliasHelp=-TomcatKeystoreAlias propertyTomcatTruststoreFilename=\ud1b0\ucf13 Truststore -propertyTomcatTruststoreFilenameHelp=-TomcatTruststore propertyTomcatTruststorePassword=\ud1b0\ucf13 Truststore \ube44\ubc00\ubc88\ud638 -propertyTomcatTruststorePasswordHelp=-TomcatTruststorePassword propertyTomcatTruststoreType=\ud1b0\ucf13 Truststore \ud0c0\uc785 -propertyTomcatTruststoreTypeHelp=-TomcatTruststoreType propertyTomcatSslProtocol=\ud1b0\ucf13 SSL \ud504\ub85c\ud1a0\ucf5c -propertyTomcatSslProtocolHelp=-TomcatSSLProtocol propertyConnectorTransport=\uc218\uc2e0 \uc5d0\uc774\uc804\ud2b8 \ud1b5\uc2e0 \uc804\uc1a1 -propertyConnectorTransportHelp=-IncomingAgentCommunicationsTransport propertyConnectorBindAddress=\uc218\uc2e0 \uc5d0\uc774\uc804\ud2b8 \ud1b5\uc2e0 \ubc14\uc778\ub4dc \uc8fc\uc18c -propertyConnectorBindAddressHelp=-IncomingAgentCommunicationsBindAddress propertyConnectorBindPort=\uc218\uc2e0 \uc5d0\uc774\uc804\ud2b8 \ud1b5\uc2e0 \ud3ec\ud2b8 -propertyConnectorBindPortHelp=-IncomingAgentCommunicationsPort propertyConnectorTransportParams=\uc218\uc2e0 \uc5d0\uc774\uc804\ud2b8 \ud1b5\uc2e0 \uc804\uc1a1 \ud30c\ub77c\ubbf8\ud130 -propertyConnectorTransportParamsHelp=-IncomingAgentCommunicationsTransportParameters propertyAgentMulticastDetectorEnabled=\uc5d0\uc774\uc804\ud2b8 \uba40\ud2f0\uce90\uc2a4\ud2b8 \ud0d0\uc9c0 \ud65c\uc131\ud654 -propertyAgentMulticastDetectorEnabledHelp=-AgentMulticastDetectorEnabled propertyAgentMulticastDetectorBindAddress=\uc5d0\uc774\uc804\ud2b8 \uba40\ud2f0\uce90\uc2a4\ud2b8 \ud0d0\uc9c0 \ubc14\uc778\ub4dc \uc8fc\uc18c -propertyAgentMulticastDetectorBindAddressHelp=-AgentMulticastDetectorBindAddress propertyAgentMulticastDetectorMulticastAddress=\uc5d0\uc774\uc804\ud2b8 \uba40\ud2f0\uce90\uc2a4\ud2b8 \ud0d0\uc9c0 \uba40\ud2f0\uce90\uc2a4\ud2b8 \uc8fc\uc18c -propertyAgentMulticastDetectorMulticastAddressHelp=-AgentMulticastDetectorMulticastAddress propertyAgentMulticastDetectorPort=\uc5d0\uc774\uc804\ud2b8 \uba40\ud2f0\uce90\uc2a4\ud2b8 \ud0d0\uc9c0 \ud3ec\ud2b8 -propertyAgentMulticastDetectorPortHelp=-AgentMulticastDetectorPort propertySecurityServerSecureSocketProtocol=\uc218\uc2e0 \ubcf4\uc548 - \ubcf4\uc548 \uc18c\ucf13 \ud504\ub85c\ud1a0\ucf5c -propertySecurityServerSecureSocketProtocolHelp=-IncomingSecureSocketProtocol propertySecurityServerKeystoreFile=\uc218\uc2e0 \ubcf4\uc548 - Keystore \ud30c\uc77c -propertySecurityServerKeystoreFileHelp=-IncomingKeystoreFile propertySecurityServerKeystoreAlgorithm=\uc218\uc2e0 \ubcf4\uc548 - Keystore \uc54c\uace0\ub9ac\uc998 -propertySecurityServerKeystoreAlgorithmHelp=-IncomingKeystoreAlgorithm propertySecurityServerKeystoreType=\uc218\uc2e0 \ubcf4\uc548 - Keystore \ud0c0\uc785 -propertySecurityServerKeystoreTypeHelp=-IncomingKeystoreType propertySecurityServerKeystorePassword=\uc218\uc2e0 \ubcf4\uc548 - Keystore \ube44\ubc00\ubc88\ud638 -propertySecurityServerKeystorePasswordHelp=-IncomingKeystorePassword propertySecurityServerKeystoreKeyPassword=\uc218\uc2e0 \ubcf4\uc548 - Keystore \ud0a4 \ud328\uc2a4\uc6cc\ub4dc -propertySecurityServerKeystoreKeyPasswordHelp=-IncomingKeystoreKeyPassword propertySecurityServerKeystoreAlias=\uc218\uc2e0 \ubcf4\uc548 - Keystore \ubcc4\uce6d -propertySecurityServerKeystoreAliasHelp=-IncomingKeystoreAlias propertySecurityServerTruststoreFile=\uc218\uc2e0 \ubcf4\uc548 - Truststore \ud30c\uc77c -propertySecurityServerTruststoreFileHelp=-IncomingTruststoreFile propertySecurityServerTruststoreAlgorithm=\uc218\uc2e0 \ubcf4\uc548 - Truststore \uc54c\uace0\ub9ac\uc998 -propertySecurityServerTruststoreAlgorithmHelp=-IncomingTruststoreAlgorithm propertySecurityServerTruststoreType=\uc218\uc2e0 \ubcf4\uc548 - Truststore \ud0c0\uc785 -propertySecurityServerTruststoreTypeHelp=-IncomingTruststoreType propertySecurityServerTruststorePassword=\uc218\uc2e0 \ubcf4\uc548 - Truststore \ud328\uc2a4\uc6cc\ub4dc -propertySecurityServerTruststorePasswordHelp=-IncomingTruststorePassword propertySecurityServerClientAuthMode=\uc218\uc2e0 \ubcf4\uc548 - \ud074\ub77c\uc774\uc5b8\ud2b8 \uc778\uc99d \ubaa8\ub4dc -propertySecurityServerClientAuthModeHelp=-IncomingClientAuthenticationMode propertySecurityClientSecureSocketProtocol=\ubc1c\uc2e0 \ubcf4\uc548 - \ubcf4\uc548 \uc18c\ucf13 \ud504\ub85c\ud1a0\ucf5c -propertySecurityClientSecureSocketProtocolHelp=-OutgoingSecureSocketProtocol propertySecurityClientKeystoreFile=\ubc1c\uc2e0 \ubcf4\uc548 - Keystore \ud30c\uc77c -propertySecurityClientKeystoreFileHelp=-OutgoingKeystoreFile propertySecurityClientKeystoreAlgorithm=\ubc1c\uc2e0 \ubcf4\uc548 - Keystore \uc54c\uace0\ub9ac\uc998 -propertySecurityClientKeystoreAlgorithmHelp=-OutgoingKeystoreAlgorithm propertySecurityClientKeystoreType=\ubc1c\uc2e0 \ubcf4\uc548 - Keystore \ud0c0\uc785 -propertySecurityClientKeystoreTypeHelp=-OutgoingKeystoreType propertySecurityClientKeystorePassword=\ubc1c\uc2e0 \ubcf4\uc548 - Keystore \ube44\ubc00\ubc88\ud638 -propertySecurityClientKeystorePasswordHelp=-OutgoingKeystorePassword propertySecurityClientKeystoreKeyPassword=\ubc1c\uc2e0 \ubcf4\uc548 - Keystore \ud0a4 \ube44\ubc00\ubc88\ud638 -propertySecurityClientKeystoreKeyPasswordHelp=-OutgoingKeystoreKeyPassword propertySecurityClientKeystoreAlias=\ubc1c\uc2e0 \ubcf4\uc548 - Keystore \ubcc4\uce6d -propertySecurityClientKeystoreAliasHelp=-OutgoingKeystoreAlias propertySecurityClientTruststoreFile=\ubc1c\uc2e0 \ubcf4\uc548 - Truststore \ud30c\uc77c -propertySecurityClientTruststoreFileHelp=-OutgoingTruststoreFile propertySecurityClientTruststoreAlgorithm=\ubc1c\uc2e0 \ubcf4\uc548 - Truststore \uc54c\uace0\ub9ac\uc998 -propertySecurityClientTruststoreAlgorithmHelp=-OutgoingTruststoreAlgorithm propertySecurityClientTruststoreType=\ubc1c\uc2e0 \ubcf4\uc548 - Truststore \ud0c0\uc785 -propertySecurityClientTruststoreTypeHelp=-OutgoingTruststoreType propertySecurityClientTruststorePassword=\ubc1c\uc2e0 \ubcf4\uc548 - Truststore \ube44\ubc00\ubc88\ud638 -propertySecurityClientTruststorePasswordHelp=-OutgoingTruststorePassword propertySecurityClientServerAuthModeEnabled=\ubc1c\uc2e0 \ubcf4\uc548 - \uc11c\ubc84 \uc778\uc99d \ubaa8\ub4dc \ud65c\uc131\ud654 -propertySecurityClientServerAuthModeEnabledHelp=-OutgoingServerAuthenticationModeEnabled propertyEmbeddedRHQAgentEnabled=\uc784\ubca0\ub514\ub4dc \uc5d0\uc774\uc804\ud2b8 \ud65c\uc131\ud654 -propertyEmbeddedRHQAgentEnabledHelp=-EmbeddedRHQAgentEnabled propertyEmbeddedRHQAgentName=\uc784\ubca0\ub514\ub4dc \uc5d0\uc774\uc804\ud2b8 \uc774\ub984 -propertyEmbeddedRHQAgentNameHelp=-EmbeddedRHQAgentName propertyEmbeddedRHQAgentDisableNativeSystem=\uc784\ubca0\ub514\ub4dc \uc5d0\uc774\uc804\ud2b8 \ubd88\uac00 \ub124\uc774\ud2f0\ube0c \uc2dc\uc2a4\ud15c -propertyEmbeddedRHQAgentDisableNativeSystemHelp=-EmbeddedRHQAgentDisableNativeSystem propertyEmbeddedRHQAgentResetConfiguration=\uc784\ubca0\ub514\ub4dc \uc5d0\uc774\uc804\ud2b8 \ucd08\uae30\ud654 \uad6c\uc131 -propertyEmbeddedRHQAgentResetConfigurationHelp=-EmbeddedRHQAgentResetConfiguration propertyEmailSmtpHost=\uc774\uba54\uc77c SMTP \ud638\uc2a4\ud2b8\uba85 -propertyEmailSmtpHostHelp=-EmailSMTPHostname propertyEmailSmtpPort=\uc774\uba54\uc77c SMTP \ud3ec\ud2b8 -propertyEmailSmtpPortHelp=-EmailSMTPPort propertyEmailFromAddress=\uc774\uba54\uc77c \ubcf4\ub0b4\ub294 \uc8fc\uc18c -propertyEmailFromAddressHelp=-EmailFromAddress propertyOperationTimeout=\uc791\uc5c5\uc218\ud589 \ud638\ucd9c \uae30\ubcf8 \ud0c0\uc784\uc544\uc6c3 -propertyOperationTimeoutHelp=-OperationInvocationDefaultTimeout propertyClusterPartitionName=\ud074\ub7ec\uc2a4\ud130 - \ud30c\ud2f0\uc158 \uc774\ub984 -propertyClusterPartitionNameHelp=-PartitionName propertyClusterPartitionBindAddress=\ud074\ub7ec\uc2a4\ud130 - \ud30c\ud2f0\uc158 \ubc14\uc778\ub4dc \uc8fc\uc18c -propertyClusterPartitionBindAddressHelp=-PartitionBindAddress propertyClusterUdpGroup=\ud074\ub7ec\uc2a4\ud130 - \ud30c\ud2f0\uc158 UDP \uba40\ud2f0\uce90\uc2a4\ud2b8 \uadf8\ub8f9 \uc544\uc774\ud53c \uc8fc\uc18c -propertyClusterUdpGroupHelp=-PartitionUDPMulticastGroupIPAddress propertyClusterHaPartitionPort=\ud074\ub7ec\uc2a4\ud130 - \ud30c\ud2f0\uc158 UDP \uba40\ud2f0\uce90\uc2a4\ud2b8 \ud3ec\ud2b8 -propertyClusterHaPartitionPortHelp=-PartitionUDPMulticastPort propertyClusterEjb3CachePort=Cluster - \ud30c\ud2f0\uc158 UDP EJB3 \uc5d4\ud2f0\ud2f0 \uce90\uc2dc \uba40\ud2f0\uce90\uc2a4\ud2b8 \ud3ec\ud2b8 -propertyClusterEjb3CachePortHelp=-PartitionUDPEJB3EntityCacheMulticastPort propertyClusterAlertCachePort=Cluster - \ud30c\ud2f0\uc158 UDP \uc54c\ub9bc \uce90\uc2dc \uba40\ud2f0\uce90\uc2a4\ud2b8 \ud3ec\ud2b8 -propertyClusterAlertCachePortHelp=-PartitionUDPAlertCacheMulticastPort propertyClusterUdpLoopback=Cluster - \ud30c\ud2f0\uc158 UDP \ub8e8\ud504\ubc31 -propertyClusterUdpLoopbackHelp=-PartitionUDPLoopback propertyClusterHaJndiPort=Cluster - HA JNDI \ud3ec\ud2b8 -propertyClusterHaJndiPortHelp=-HAJNDIPort propertyClusterHaJndiRmiPort=Cluster - HA JNDI RMI \ud3ec\ud2b8 -propertyClusterHaJndiRmiPortHelp=-HAJNDIRMIPort propertyClusterHaJndiAutoDiscoveryPort=Cluster - HA JNDI \uc790\ub3d9 \ud0d0\uc0c9 \uadf8\ub8f9 \ud3ec\ud2b8 -propertyClusterHaJndiAutoDiscoveryPortHelp=-HAJNDIAutoDiscoveryGroupPort propertyClusterHaJrmpInvokerRmiPort=Cluster - HA JRMP \ud638\ucd9c\uc790 RMI \ud3ec\ud2b8 -propertyClusterHaJrmpInvokerRmiPortHelp=-HAJRMPInvokerRMIPort propertyClusterHaPooledInvokerPort=Cluster - HA \ud480\ub9c1 \ud638\ucd9c\uc790 \ud3ec\ud2b8 -propertyClusterHaPooledInvokerPortHelp=-HAPooledInvokerPort propertyClusterJGroupsUdpIpTtl=Cluster - JGroups UDP \uc544\uc774\ud53c Time To Live -propertyClusterJGroupsUdpIpTtlHelp=-JGroupsUDPIPTimeToLive propertyConcurrencyLimitWebConns=\ub3d9\uc2dc\uc131 \uc81c\ud55c - \ucd5c\ub300 \uc6f9 \uc5f0\uacb0 -propertyConcurrencyLimitWebConnsHelp=-WebConnections propertyConcurrencyLimitGlobal=\ub3d9\uc2dc\uc131 \uc81c\ud55c - \uae00\ub85c\ubc8c -propertyConcurrencyLimitGlobalHelp=-GlobalConcurrencyLimit propertyConcurrencyLimitInventoryReport=\ub3d9\uc2dc\uc131 \uc81c\ud55c - \ubaa9\ub85d \ubcf4\uace0\uc11c -propertyConcurrencyLimitInventoryReportHelp=-InventoryReport propertyConcurrencyLimitAvailabilityReport=\ub3d9\uc2dc\uc131 \uc81c\ud55c - \uac00\uc6a9\uc131 \ubcf4\uace0\uc11c -propertyConcurrencyLimitAvailabilityReportHelp=-AvailabilityReport propertyConcurrencyLimitInventorySync=\ub3d9\uc2dc\uc131 \uc81c\ud55c - \ubaa9\ub85d \ub3d9\uae30\ud654 -propertyConcurrencyLimitInventorySyncHelp=-InventorySynchronization propertyConcurrencyLimitContentReport=\ub3d9\uc2dc\uc131 \uc81c\ud55c - \ucf58\ud150\uce20 \ubcf4\uace0\uc11c -propertyConcurrencyLimitContentReportHelp=-ContentReport propertyConcurrencyLimitContentDownload=\ub3d9\uc2dc\uc131 \uc81c\ud55c - \ucf58\ud150\uce20 \ub2e4\uc6b4\ub85c\ub4dc -propertyConcurrencyLimitContentDownloadHelp=-ContentDownload propertyConcurrencyLimitMeasurementReport=\ub3d9\uc2dc\uc131 \uc81c\ud55c - \uce21\uc815 \ubcf4\uace0\uc11c -propertyConcurrencyLimitMeasurementReportHelp=-MeasurementReport propertyConcurrencyLimitMeasurementScheduleRequest=\ub3d9\uc2dc\uc131 \uc81c\ud55c - \uce21\uc815 \uc2a4\ucf00\uc974 \uc694\uccad -propertyConcurrencyLimitMeasurementScheduleRequestHelp=-MeasurementScheduleRequest introduceHelpDocs=RHQ\uc5d0 \ub300\ud55c \uc790\uc138\ud55c \ub0b4\uc6a9\uc740 \uc544\ub798 \ub9c1\ud06c\ub41c \ubb38\uc11c\ub97c \ucc38\uace0\ud558\uc2ed\uc2dc\uc624: helpDocRHQServerInstallGuide=\uc124\uce58 helpDocRHQServerInstallGuideLabel=RHQ \uc11c\ubc84 \uc124\uce58 \uac00\uc774\ub4dc @@ -249,8 +160,6 @@ helpDocRHQServerPropParentPage=http://support.rhq-project.org/display/JOPR2… newServerSelectItem=\uc2e0\uaddc \uc11c\ubc84 registeredServersLabel=\ub4f1\ub85d\ub41c \uc11c\ubc84: propertyHighAvailabilityName=\uc11c\ubc84 \uc774\ub984 -propertyHighAvailabilityNameHelp=-ServerName propertyMaintenanceModeAtStart=\uad6c\ub3d9\uc2dc \uc720\uc9c0 \uad00\ub9ac \ubaa8\ub4dc -propertyMaintenanceModeAtStartHelp=-MaintenanceModeAtStart propertyHighAvailabilityEndpointAddress=\uc11c\ubc84 \uacf5\uac1c \uc8fc\uc18c -propertyHighAvailabilityAffinityGroup=\uc11c\ubc84 \ub3d9\uc9c8 \uadf8\ub8f9 \uc774\ub984 \ No newline at end of file +propertyHighAvailabilityAffinityGroup=\uc11c\ubc84 \ub3d9\uc9c8 \uadf8\ub8f9 \uc774\ub984 diff --git a/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_zh.properties b/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_zh.properties index 06c2191..e392202 100644 --- a/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_zh.properties +++ b/modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_zh.properties @@ -51,183 +51,94 @@ startInstallingLink=\u7ee7\u7eed\u5b89\u88c5\u8bf7\u70b9\u51fb\u8fd9\u91cc backToSettingsLink=\u8fd4\u56de\u914d\u7f6e\u9875\u9762 showAdvancedSettings=\u663e\u793a\u9ad8\u7ea7\u9009\u9879 propertyDatabaseType=\u6570\u636e\u5e93\u7c7b\u578b -propertyDatabaseTypeHelp=-DatabaseType propertyDatabaseConnectionUrl=\u6570\u636e\u5e93\u8fde\u63a5URL -propertyDatabaseConnectionUrlHelp=-DatabaseConnectionURL propertyDatabaseDriverClass=\u6570\u636e\u5e93JDBC\u9a71\u52a8 -propertyDatabaseDriverClassHelp=-DatabaseJDBCDriverClass propertyDatabaseXADataSourceClass=\u6570\u636e\u5e93XA\u6570\u636e\u6e90\u7c7b -propertyDatabaseXADataSourceClassHelp=-DatabaseXADataSourceClass propertyDatabaseUserName=\u6570\u636e\u5e93\u7528\u6237\u540d -propertyDatabaseUserNameHelp=-DatabaseUserName propertyDatabasePassword=\u6570\u636e\u5e93\u5bc6\u7801 -propertyDatabasePasswordHelp=-DatabasePassword propertyBindAddress=\u670d\u52a1\u5668\u76d1\u542c\u5730\u5740 -propertyBindAddressHelp=-ServerBindAddress propertyHttpPort=HTTP\u7aef\u53e3 -propertyHttpPortHelp=-HTTPPort propertyHttpsPort=\u5b89\u5168HTTPS\u7aef\u53e3 -propertyHttpsPortHelp=-SecureHTTPSPort propertyWebServicePort=Web Service\u7aef\u53e3 -propertyWebServicePortHelp=-WebServicePort propertyNamingServicePort=Naming Service\u7aef\u53e3 -propertyNamingServicePortHelp=-NamingServicePort propertyNamingServiceRmiPort=Naming Service RMI\u7aef\u53e3 -propertyNamingServiceRmiPortHelp=-NamingServiceRMIPort propertyJrmpInvokerRmiPort=JRMP Invoker RMI\u7aef\u53e3 -propertyJrmpInvokerRmiPortHelp=-JRMPInvokerRMIPort propertyPooledInvokerRmiPort=Pooled Invoker RMI\u7aef\u53e3 -propertyPooledInvokerRmiPortHelp=-PooledInvokerRMIPort propertyAjpPort=AJP\u7aef\u53e3 -propertyAjpPortHelp=-AJPPort propertyUnifiedInvokerPort=\u7edf\u4e00Invoker\u7aef\u53e3 -propertyUnifiedInvokerPortHelp=-UnifiedInvokerPort propertyAspectDeployerPort=Aspect Deployer\u7aef\u53e3 -propertyAspectDeployerPortHelp=-AspectDeployerPort propertyTomcatClientAuthMode=Tomcat\u5ba2\u6237\u7aef\u6388\u6743\u6a21\u5f0f -propertyTomcatClientAuthModeHelp=-TomcatClientAuthMode propertyTomcatAlgorithm=Tomcat Keystore/Truststore\u7b97\u6cd5 -propertyTomcatAlgorithmHelp=-TomcatAlgorithm propertyTomcatKeystoreFilename=Tomcat Keystore -propertyTomcatKeystoreFilenameHelp=-TomcatKeystore propertyTomcatKeystorePassword=Tomcat Keystore\u5bc6\u7801 -propertyTomcatKeystorePasswordHelp=-TomcatKeystorePassword propertyTomcatKeystoreType=Tomcat Keystore\u7c7b\u578b -propertyTomcatKeystoreTypeHelp=-TomcatKeystoreType propertyTomcatKeystoreAlias=Tomcat Keystore Alias -propertyTomcatKeystoreAliasHelp=-TomcatKeystoreAlias propertyTomcatTruststoreFilename=Tomcat Truststore -propertyTomcatTruststoreFilenameHelp=-TomcatTruststore propertyTomcatTruststorePassword=Tomcat Truststore\u5bc6\u7801 -propertyTomcatTruststorePasswordHelp=-TomcatTruststorePassword propertyTomcatTruststoreType=Tomcat Truststore\u7c7b\u578b -propertyTomcatTruststoreTypeHelp=-TomcatTruststoreType propertyTomcatSslProtocol=Tomcat SSL\u534f\u8bae -propertyTomcatSslProtocolHelp=-TomcatSSLProtocol propertyConnectorTransport=\u63a5\u6536Agent\u901a\u4fe1\u4f20\u8f93 -propertyConnectorTransportHelp=-IncomingAgentCommunicationsTransport propertyConnectorBindAddress=\u63a5\u6536Agent\u901a\u4fe1\u76d1\u542c\u5730\u5740 -propertyConnectorBindAddressHelp=-IncomingAgentCommunicationsBindAddress propertyConnectorBindPort=\u63a5\u6536Agent\u901a\u4fe1\u7aef\u53e3 -propertyConnectorBindPortHelp=-IncomingAgentCommunicationsPort propertyConnectorTransportParams=\u63a5\u6536Agent\u901a\u4fe1\u4f20\u8f93\u53c2\u6570 -propertyConnectorTransportParamsHelp=-IncomingAgentCommunicationsTransportParameters propertyAgentMulticastDetectorEnabled=\u542f\u7528Agent\u591a\u64ad\u63a2\u6d4b\u5668 -propertyAgentMulticastDetectorEnabledHelp=-AgentMulticastDetectorEnabled propertyAgentMulticastDetectorBindAddress=Agent\u591a\u64ad\u63a2\u6d4b\u5668\u76d1\u542c\u5730\u5740 -propertyAgentMulticastDetectorBindAddressHelp=-AgentMulticastDetectorBindAddress propertyAgentMulticastDetectorMulticastAddress=Agent \u7ec4\u64ad\u5730\u5740\u591a\u64ad\u63a2\u6d4b\u5668 -propertyAgentMulticastDetectorMulticastAddressHelp=-AgentMulticastDetectorMulticastAddress propertyAgentMulticastDetectorPort=Agent\u591a\u64ad\u63a2\u6d4b\u5668\u7aef\u53e3 -propertyAgentMulticastDetectorPortHelp=-AgentMulticastDetectorPort propertySecurityServerSecureSocketProtocol=\u63a5\u6536\u5b89\u5168 - \u5b89\u5168Socket\u534f\u8bae -propertySecurityServerSecureSocketProtocolHelp=-IncomingSecureSocketProtocol propertySecurityServerKeystoreFile=\u63a5\u6536\u5b89\u5168 - Keystore\u6587\u4ef6 -propertySecurityServerKeystoreFileHelp=-IncomingKeystoreFile propertySecurityServerKeystoreAlgorithm=\u63a5\u6536\u5b89\u5168 - Keystore\u7b97\u6cd5 -propertySecurityServerKeystoreAlgorithmHelp=-IncomingKeystoreAlgorithm propertySecurityServerKeystoreType=\u63a5\u6536\u5b89\u5168 - Keystore\u7c7b\u578b -propertySecurityServerKeystoreTypeHelp=-IncomingKeystoreType propertySecurityServerKeystorePassword=\u63a5\u6536\u5b89\u5168 - Keystore\u5bc6\u7801 -propertySecurityServerKeystorePasswordHelp=-IncomingKeystorePassword propertySecurityServerKeystoreKeyPassword=\u63a5\u6536\u5b89\u5168 - Keystore Key\u5bc6\u7801 -propertySecurityServerKeystoreKeyPasswordHelp=-IncomingKeystoreKeyPassword propertySecurityServerKeystoreAlias=\u63a5\u6536\u5b89\u5168 - Keystore Alias -propertySecurityServerKeystoreAliasHelp=-IncomingKeystoreAlias propertySecurityServerTruststoreFile=\u63a5\u6536\u5b89\u5168 - Truststore\u6587\u4ef6 -propertySecurityServerTruststoreFileHelp=-IncomingTruststoreFile propertySecurityServerTruststoreAlgorithm=\u63a5\u6536\u5b89\u5168 - Truststore\u7b97\u6cd5 -propertySecurityServerTruststoreAlgorithmHelp=-IncomingTruststoreAlgorithm propertySecurityServerTruststoreType=\u63a5\u6536\u5b89\u5168 - Truststore\u7c7b\u578b -propertySecurityServerTruststoreTypeHelp=-IncomingTruststoreType propertySecurityServerTruststorePassword=\u63a5\u6536\u5b89\u5168 - Truststore\u5bc6\u7801 -propertySecurityServerTruststorePasswordHelp=-IncomingTruststorePassword propertySecurityServerClientAuthMode=\u63a5\u6536\u5b89\u5168 - \u5ba2\u6237\u7aef\u6388\u6743\u6a21\u5f0f -propertySecurityServerClientAuthModeHelp=-IncomingClientAuthenticationMode propertySecurityClientSecureSocketProtocol=\u5916\u53d1\u5b89\u5168 - \u5b89\u5168Socket\u534f\u8bae -propertySecurityClientSecureSocketProtocolHelp=-OutgoingSecureSocketProtocol propertySecurityClientKeystoreFile=\u5916\u53d1\u5b89\u5168 - Keystore\u6587\u4ef6 -propertySecurityClientKeystoreFileHelp=-OutgoingKeystoreFile propertySecurityClientKeystoreAlgorithm=\u5916\u53d1\u5b89\u5168 - Keystore\u7b97\u6cd5 -propertySecurityClientKeystoreAlgorithmHelp=-OutgoingKeystoreAlgorithm propertySecurityClientKeystoreType=\u5916\u53d1\u5b89\u5168 - Keystore\u7c7b\u578b -propertySecurityClientKeystoreTypeHelp=-OutgoingKeystoreType propertySecurityClientKeystorePassword=\u5916\u53d1\u5b89\u5168 - Keystore\u5bc6\u7801 -propertySecurityClientKeystorePasswordHelp=-OutgoingKeystorePassword propertySecurityClientKeystoreKeyPassword=\u5916\u53d1\u5b89\u5168 - Keystore Key\u5bc6\u7801 -propertySecurityClientKeystoreKeyPasswordHelp=-OutgoingKeystoreKeyPassword propertySecurityClientKeystoreAlias=\u5916\u53d1\u5b89\u5168 - Keystore Alias -propertySecurityClientKeystoreAliasHelp=-OutgoingKeystoreAlias propertySecurityClientTruststoreFile=\u5916\u53d1\u5b89\u5168 - Truststore\u6587\u4ef6 -propertySecurityClientTruststoreFileHelp=-OutgoingTruststoreFile propertySecurityClientTruststoreAlgorithm=\u5916\u53d1\u5b89\u5168 - Truststore\u7b97\u6cd5 -propertySecurityClientTruststoreAlgorithmHelp=-OutgoingTruststoreAlgorithm propertySecurityClientTruststoreType=\u5916\u53d1\u5b89\u5168 - Truststore\u7c7b\u578b -propertySecurityClientTruststoreTypeHelp=-OutgoingTruststoreType propertySecurityClientTruststorePassword=\u5916\u53d1\u5b89\u5168 - Truststore\u5bc6\u7801 -propertySecurityClientTruststorePasswordHelp=-OutgoingTruststorePassword propertySecurityClientServerAuthModeEnabled=\u5916\u53d1\u5b89\u5168 - \u542f\u7528\u670d\u52a1\u5668\u6388\u6743\u6a21\u5f0f -propertySecurityClientServerAuthModeEnabledHelp=-OutgoingServerAuthenticationModeEnabled propertyEmbeddedRHQAgentEnabled=\u542f\u7528\u5d4c\u5165Agent -propertyEmbeddedRHQAgentEnabledHelp=-EmbeddedRHQAgentEnabled propertyEmbeddedRHQAgentName=\u5d4c\u5165Agent\u540d\u79f0 -propertyEmbeddedRHQAgentNameHelp=-EmbeddedRHQAgentName propertyEmbeddedRHQAgentDisableNativeSystem=\u5d4c\u5165Agent\u7981\u7528\u672c\u5730\u7cfb\u7edf -propertyEmbeddedRHQAgentDisableNativeSystemHelp=-EmbeddedRHQAgentDisableNativeSystem propertyEmbeddedRHQAgentResetConfiguration=\u5d4c\u5165Agent\u91cd\u7f6e\u914d\u7f6e -propertyEmbeddedRHQAgentResetConfigurationHelp=-EmbeddedRHQAgentResetConfiguration propertyEmailSmtpHost=\u90ae\u4ef6SMTP\u4e3b\u673a\u540d -propertyEmailSmtpHostHelp=-EmailSMTPHostname propertyEmailSmtpPort=\u90ae\u4ef6SMTP\u7aef\u53e3 -propertyEmailSmtpPortHelp=-EmailSMTPPort propertyEmailFromAddress=\u53d1\u9001\u90ae\u4ef6\u5730\u5740 -propertyEmailFromAddressHelp=-EmailFromAddress propertyOperationTimeout=\u9ed8\u8ba4Operation Invocation\u8d85\u65f6\u65f6\u95f4 -propertyOperationTimeoutHelp=-OperationInvocationDefaultTimeout propertyClusterPartitionName=\u96c6\u7fa4 - Partition Name -propertyClusterPartitionNameHelp=-PartitionName propertyClusterPartitionBindAddress=\u96c6\u7fa4 - Partition\u76d1\u542c\u5730\u5740 -propertyClusterPartitionBindAddressHelp=-PartitionBindAddress propertyClusterUdpGroup=\u96c6\u7fa4 - Partition UDP Multicast Group IP\u5730\u5740 -propertyClusterUdpGroupHelp=-PartitionUDPMulticastGroupIPAddress propertyClusterHaPartitionPort=\u96c6\u7fa4 - Partition UDP\u591a\u64ad\u7aef\u53e3 -propertyClusterHaPartitionPortHelp=-PartitionUDPMulticastPort propertyClusterEjb3CachePort=\u96c6\u7fa4 - Partition UDP EJB3\u5b9e\u4f53\u7f13\u5b58\u591a\u64ad\u7aef\u53e3 -propertyClusterEjb3CachePortHelp=-PartitionUDPEJB3EntityCacheMulticastPort propertyClusterAlertCachePort=\u96c6\u7fa4 - Partition UDP\u544a\u8b66\u7f13\u5b58\u591a\u64ad\u7aef\u53e3 -propertyClusterAlertCachePortHelp=-PartitionUDPAlertCacheMulticastPort propertyClusterUdpLoopback=\u96c6\u7fa4 - Partition UDP\u56de\u73af -propertyClusterUdpLoopbackHelp=-PartitionUDPLoopback propertyClusterHaJndiPort=\u96c6\u7fa4 - HA JNDI\u7aef\u53e3 -propertyClusterHaJndiPortHelp=-HAJNDIPort propertyClusterHaJndiRmiPort=\u96c6\u7fa4 - HA JNDI RMI\u7aef\u53e3 -propertyClusterHaJndiRmiPortHelp=-HAJNDIRMIPort propertyClusterHaJndiAutoDiscoveryPort=\u96c6\u7fa4 - HA JNDI\u81ea\u52a8\u53d1\u73b0\u7ec4\u7aef\u53e3 -propertyClusterHaJndiAutoDiscoveryPortHelp=-HAJNDIAutoDiscoveryGroupPort propertyClusterHaJrmpInvokerRmiPort=\u96c6\u7fa4 - HA JRMP Invoker RMI\u7aef\u53e3 -propertyClusterHaJrmpInvokerRmiPortHelp=-HAJRMPInvokerRMIPort propertyClusterHaPooledInvokerPort=\u96c6\u7fa4 - HA Pooled Invoker\u7aef\u53e3 -propertyClusterHaPooledInvokerPortHelp=-HAPooledInvokerPort propertyClusterJGroupsUdpIpTtl=\u96c6\u7fa4 - JGroups UDP IP\u5b58\u6d3b\u65f6\u95f4 -propertyClusterJGroupsUdpIpTtlHelp=-JGroupsUDPIPTimeToLive propertyConcurrencyLimitWebConns=\u5e76\u53d1\u6570\u9650\u5236 - \u6700\u5927Web\u8fde\u63a5\u6570 -propertyConcurrencyLimitWebConnsHelp=-WebConnections propertyConcurrencyLimitGlobal=\u5e76\u53d1\u6570\u9650\u5236 - \u5168\u5c40 -propertyConcurrencyLimitGlobalHelp=-GlobalConcurrencyLimit propertyConcurrencyLimitInventoryReport=\u5e76\u53d1\u6570\u9650\u5236 - \u6e05\u5355\u62a5\u8868 -propertyConcurrencyLimitInventoryReportHelp=-InventoryReport propertyConcurrencyLimitAvailabilityReport=\u5e76\u53d1\u6570\u9650\u5236 - \u53ef\u7528\u6027\u62a5\u8868 -propertyConcurrencyLimitAvailabilityReportHelp=-AvailabilityReport propertyConcurrencyLimitInventorySync=\u5e76\u53d1\u6570\u9650\u5236 - \u6e05\u5355\u540c\u6b65 -propertyConcurrencyLimitInventorySyncHelp=-InventorySynchronization propertyConcurrencyLimitContentReport=\u5e76\u53d1\u6570\u9650\u5236 - Content\u62a5\u8868 -propertyConcurrencyLimitContentReportHelp=-ContentReport propertyConcurrencyLimitContentDownload=\u5e76\u53d1\u6570\u9650\u5236 - Content\u4e0b\u8f7d -propertyConcurrencyLimitContentDownloadHelp=-ContentDownload propertyConcurrencyLimitMeasurementReport=\u5e76\u53d1\u6570\u9650\u5236 - \u6027\u80fd\u62a5\u8868 -propertyConcurrencyLimitMeasurementReportHelp=-MeasurementReport propertyConcurrencyLimitMeasurementScheduleRequest=\u5e76\u53d1\u6570\u9650\u5236 - Measurement Schedule\u8bf7\u6c42 -propertyConcurrencyLimitMeasurementScheduleRequestHelp=-MeasurementScheduleRequest introduceHelpDocs=\u60f3\u66f4\u591a\u4e86\u89e3RHQ,\u8bf7\u67e5\u770b\u4e0b\u9762\u7684\u6587\u6863\u94fe\u63a5: helpDocRHQServerInstallGuide=\u5b89\u88c5 helpDocRHQServerInstallGuideLabel=RHQ\u670d\u52a1\u5668\u5b89\u88c5\u6307\u5357 @@ -243,8 +154,6 @@ helpDocRHQServerPropParentPage=http://support.rhq-project.org/display/JOPR2… newServerSelectItem=\u65b0\u670d\u52a1\u5668 registeredServersLabel=\u6ce8\u518c\u7684\u670d\u52a1\u5668: propertyHighAvailabilityName=\u670d\u52a1\u5668\u540d\u79f0 -propertyHighAvailabilityNameHelp=-ServerName propertyMaintenanceModeAtStart=\u542f\u52a8\u7ef4\u62a4\u6a21\u5f0f -propertyMaintenanceModeAtStartHelp=-MaintenanceModeAtStart propertyHighAvailabilityEndpointAddress=\u670d\u52a1\u5668\u516c\u5171\u5730\u5740 propertyHighAvailabilityAffinityGroup=\u76f8\u4f3c\u7684\u670d\u52a1\u5668\u7ec4\u540d

1 0

[rhq] etc/apt etc/classloaders-test etc/samples modules/cli-tests modules/common modules/core modules/enterprise modules/helpers modules/integration-tests modules/jopr modules/plugins modules/test-utils pom.xml
by ips 23 May '12

23 May '12

etc/apt/pom.xml | 12 +-- etc/classloaders-test/plugin1/pom.xml | 12 +-- etc/classloaders-test/plugin2/pom.xml | 12 +-- etc/samples/perspectives/sample-perspective/perspective/pom.xml | 12 +-- etc/samples/provisioning/sample-bundle/pom.xml | 4 - etc/samples/skeleton-plugin/pom.xml | 12 +-- modules/cli-tests/pom.xml | 12 +-- modules/common/ant-bundle/pom.xml | 8 +- modules/common/drift/pom.xml | 16 ++--- modules/common/filetemplate-bundle/pom.xml | 8 +- modules/common/jboss-as/pom.xml | 8 +- modules/core/client-api/pom.xml | 16 ++--- modules/core/comm-api/pom.xml | 8 +- modules/core/domain/pom.xml | 16 ++--- modules/core/gui/pom.xml | 8 +- modules/core/native-system/pom.xml | 12 +-- modules/core/plugin-api/pom.xml | 8 +- modules/core/plugin-container/pom.xml | 16 ++--- modules/core/plugindoc/pom.xml | 4 - modules/core/util/pom.xml | 20 +++--- modules/enterprise/agent/pom.xml | 20 +++--- modules/enterprise/agentupdate/pom.xml | 16 ++--- modules/enterprise/binding/pom.xml | 24 +++---- modules/enterprise/comm/pom.xml | 20 +++--- modules/enterprise/gui/content_http-war/pom.xml | 12 +-- modules/enterprise/gui/coregui/pom.xml | 20 +++--- modules/enterprise/gui/installer-war/pom.xml | 16 ++--- modules/enterprise/gui/portal-war/pom.xml | 28 ++++---- modules/enterprise/gui/rest-war/pom.xml | 20 +++--- modules/enterprise/gui/webdav-war/pom.xml | 12 +-- modules/enterprise/remoting/webservices/pom.xml | 4 - modules/enterprise/server/client-api/pom.xml | 16 ++--- modules/enterprise/server/container-lib/pom.xml | 8 +- modules/enterprise/server/ear/pom.xml | 12 +-- modules/enterprise/server/itests/pom.xml | 4 - modules/enterprise/server/jar/pom.xml | 32 +++++----- modules/enterprise/server/plugins/alert-cli/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-email/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-irc/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-log4j/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-microblog/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-mobicents/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-operations/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-roles/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-scriptlang/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-sms/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-snmp/pom.xml | 20 +++--- modules/enterprise/server/plugins/alert-subject/pom.xml | 16 ++--- modules/enterprise/server/plugins/ant-bundle/pom.xml | 20 +++--- modules/enterprise/server/plugins/cloud/pom.xml | 12 +-- modules/enterprise/server/plugins/cobbler/pom.xml | 20 +++--- modules/enterprise/server/plugins/disk/pom.xml | 20 +++--- modules/enterprise/server/plugins/drift-mongodb/pom.xml | 20 +++--- modules/enterprise/server/plugins/drift-rhq/pom.xml | 20 +++--- modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 20 +++--- modules/enterprise/server/plugins/groovy-script/pom.xml | 20 +++--- modules/enterprise/server/plugins/jboss-software/pom.xml | 20 +++--- modules/enterprise/server/plugins/packagetype-cli/pom.xml | 20 +++--- modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 12 +-- modules/enterprise/server/plugins/perspectives/policy/perspective/pom.xml | 12 +-- modules/enterprise/server/plugins/url/pom.xml | 20 +++--- modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 4 - modules/enterprise/server/plugins/yum/pom.xml | 20 +++--- modules/enterprise/server/safe-invoker/pom.xml | 16 ++--- modules/enterprise/server/xml-schemas/pom.xml | 24 +++---- modules/helpers/bundleGen/pom.xml | 8 +- modules/helpers/perftest-support/pom.xml | 8 +- modules/helpers/pluginGen/pom.xml | 8 +- modules/helpers/rtfilter/pom.xml | 16 ++--- modules/integration-tests/apache-plugin-test/pom.xml | 4 - modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 4 - modules/integration-tests/mod_cluster-plugin-test/pom.xml | 4 - modules/jopr/dist/agent/pom.xml | 4 - modules/jopr/dist/server/pom.xml | 4 - modules/plugins/JBossOSGi/pom.xml | 20 +++--- modules/plugins/aliases/pom.xml | 24 +++---- modules/plugins/ant-bundle/pom.xml | 24 +++---- modules/plugins/apache/pom.xml | 24 +++---- modules/plugins/augeas/pom.xml | 20 +++--- modules/plugins/byteman/pom.xml | 24 +++---- modules/plugins/cobbler/pom.xml | 24 +++---- modules/plugins/cron/pom.xml | 24 +++---- modules/plugins/database/pom.xml | 20 +++--- modules/plugins/filetemplate-bundle/pom.xml | 24 +++---- modules/plugins/grub/pom.xml | 24 +++---- modules/plugins/hadoop/pom.xml | 20 +++--- modules/plugins/hardware/pom.xml | 8 +- modules/plugins/hibernate/pom.xml | 24 +++---- modules/plugins/hosts/pom.xml | 24 +++---- modules/plugins/hudson/pom.xml | 8 +- modules/plugins/iis/pom.xml | 24 +++---- modules/plugins/iptables/pom.xml | 16 ++--- modules/plugins/irc/pom.xml | 20 +++--- modules/plugins/jboss-as-5/pom.xml | 24 +++---- modules/plugins/jboss-as-7/pom.xml | 12 +-- modules/plugins/jboss-as/pom.xml | 24 +++---- modules/plugins/jboss-cache-v3/pom.xml | 24 +++---- modules/plugins/jboss-cache/pom.xml | 24 +++---- modules/plugins/jdbctrace/pom.xml | 28 ++++---- modules/plugins/jira/pom.xml | 24 +++---- modules/plugins/jmx/pom.xml | 24 +++---- modules/plugins/kickstart/pom.xml | 20 +++--- modules/plugins/lsof/pom.xml | 24 +++---- modules/plugins/mod-cluster/pom.xml | 24 +++---- modules/plugins/mysql/pom.xml | 24 +++---- modules/plugins/netservices/pom.xml | 24 +++---- modules/plugins/nss/pom.xml | 20 +++--- modules/plugins/onewire/pom.xml | 20 +++--- modules/plugins/oracle/pom.xml | 20 +++--- modules/plugins/pattern-generator/pom.xml | 12 +-- modules/plugins/platform/pom.xml | 24 +++---- modules/plugins/postfix/pom.xml | 24 +++---- modules/plugins/postgres/pom.xml | 24 +++---- modules/plugins/raw-config-test/pom.xml | 4 - modules/plugins/rhq-agent/pom.xml | 24 +++---- modules/plugins/rhq-server/pom.xml | 24 +++---- modules/plugins/samba/pom.xml | 24 +++---- modules/plugins/script/pom.xml | 24 +++---- modules/plugins/script2/pom.xml | 20 +++--- modules/plugins/services/pom.xml | 20 +++--- modules/plugins/snmptrapd/pom.xml | 20 +++--- modules/plugins/sshd/pom.xml | 24 +++---- modules/plugins/sudoers/pom.xml | 24 +++---- modules/plugins/tomcat/pom.xml | 24 +++---- modules/plugins/twitter/pom.xml | 20 +++--- modules/plugins/validate-all-plugins/pom.xml | 4 - modules/plugins/virt/pom.xml | 24 +++---- modules/test-utils/pom.xml | 8 +- pom.xml | 16 ++--- 129 files changed, 1114 insertions(+), 1114 deletions(-) New commits: commit 3ba7c30f1a23c243448cc427c763dcd83b5d76da Author: Ian Springer <ian.springer(a)redhat.com> Date: Wed May 23 13:07:41 2012 -0400 use <target>...</target>, rather than the deprecated <tasks>...</tasks>, in all antrun plugin executions diff --git a/etc/apt/pom.xml b/etc/apt/pom.xml index cbb8ae3..882bdee 100644 --- a/etc/apt/pom.xml +++ b/etc/apt/pom.xml @@ -49,7 +49,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar... </echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> @@ -81,7 +81,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -150,12 +150,12 @@ <id>deploy</id>  <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -166,11 +166,11 @@ <id>undeploy</id>  <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/etc/classloaders-test/plugin1/pom.xml b/etc/classloaders-test/plugin1/pom.xml index b23d084..465db1c 100644 --- a/etc/classloaders-test/plugin1/pom.xml +++ b/etc/classloaders-test/plugin1/pom.xml @@ -169,12 +169,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -184,7 +184,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -196,7 +196,7 @@ manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -206,11 +206,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/etc/classloaders-test/plugin2/pom.xml b/etc/classloaders-test/plugin2/pom.xml index 593d2ce..265b305 100644 --- a/etc/classloaders-test/plugin2/pom.xml +++ b/etc/classloaders-test/plugin2/pom.xml @@ -169,12 +169,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -184,7 +184,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -196,7 +196,7 @@ manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -206,11 +206,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/etc/samples/perspectives/sample-perspective/perspective/pom.xml b/etc/samples/perspectives/sample-perspective/perspective/pom.xml index c72c419..d50b4e4 100644 --- a/etc/samples/perspectives/sample-perspective/perspective/pom.xml +++ b/etc/samples/perspectives/sample-perspective/perspective/pom.xml @@ -81,7 +81,7 @@ <id>add-war</id> <phase>verify</phase> <configuration> - <tasks> + <target> <property name="classes.dir" location="${rhq.deploymentDir}/WEB-INF/classes" /> @@ -90,7 +90,7 @@ destfile="${basedir}/target/${project.artifactId}-${project.version}.jar" basedir="${basedir}/../app/target" includes="*.war" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -122,11 +122,11 @@ <id>deploy</id> <phase>install</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <copy file="${basedir}/target/${project.build.finalName}.jar" toDir="${rhq.deploymentDir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -137,11 +137,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/etc/samples/provisioning/sample-bundle/pom.xml b/etc/samples/provisioning/sample-bundle/pom.xml index 26f227b..a939baf 100644 --- a/etc/samples/provisioning/sample-bundle/pom.xml +++ b/etc/samples/provisioning/sample-bundle/pom.xml @@ -43,7 +43,7 @@ <id>prepare-bundle</id> <phase>process-resources</phase> <configuration> - <tasks> + <target> <echo>settings.localRepository=${settings.localRepository}</echo> <echo>project.build.outputDirectory=${project.build.outputDirectory}</echo> <ant antfile="src/main/scripts/build.xml"> @@ -52,7 +52,7 @@ <property name="project.build.outputDirectory" value="${project.build.outputDirectory}"/> <property name="derbyclient.version" value="${derbyclient.version}"/> </ant> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/etc/samples/skeleton-plugin/pom.xml b/etc/samples/skeleton-plugin/pom.xml index f45b37e..39fc241 100644 --- a/etc/samples/skeleton-plugin/pom.xml +++ b/etc/samples/skeleton-plugin/pom.xml @@ -170,12 +170,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -185,7 +185,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -197,7 +197,7 @@ manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -207,11 +207,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index de9a671..e1b5521 100644 --- a/modules/cli-tests/pom.xml +++ b/modules/cli-tests/pom.xml @@ -86,7 +86,7 @@ <id>test-scripts</id> <phase>test</phase> <configuration> - <tasks> + <target> <java classname="org.rhq.enterprise.remoting.cli.ScriptTestRunner" classpathref="maven.test.classpath" resultproperty="script.tests.failed" @@ -103,7 +103,7 @@ <isfailure code="${script.tests.failed}"/> </condition> </fail> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -161,7 +161,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -181,7 +181,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -191,7 +191,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -212,7 +212,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 9fe88e9..4da4ece 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -135,7 +135,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -155,7 +155,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -165,7 +165,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -186,7 +186,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index 8268ccf..cd0c979 100644 --- a/modules/common/drift/pom.xml +++ b/modules/common/drift/pom.xml @@ -49,12 +49,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -65,11 +65,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -104,7 +104,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -124,7 +124,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -134,7 +134,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -155,7 +155,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 580ecef..74480d7 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -62,7 +62,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -82,7 +82,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -92,7 +92,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -113,7 +113,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 60894f0..6600791 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -106,7 +106,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -132,7 +132,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -142,7 +142,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -163,7 +163,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index bd022fb..b5f049f 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -145,12 +145,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -161,11 +161,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -199,7 +199,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -219,7 +219,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -229,7 +229,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -250,7 +250,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index b71665b..bf501fc 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -40,12 +40,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -56,11 +56,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index ebe159a..fa4eee4 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -330,7 +330,7 @@ <execution> <phase>process-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -463,7 +463,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -473,7 +473,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -494,7 +494,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 0ed21ed..51781ce 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -162,12 +162,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -178,11 +178,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index de8e2e3..82cd33a 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -50,7 +50,7 @@ <execution> <phase>process-test-resources</phase> <configuration> - <tasks> + <target> <echo>SIGAR Java library version used is ${sigar.version}.</echo> <echo>Copying/unzipping SIGAR native libraries (version ${sigar.version}) to local build directory...</echo> <mkdir dir="${project.build.directory}/jboss-sigar" /> @@ -74,7 +74,7 @@ </fileset> </move> <delete dir="${project.build.directory}/jboss-sigar/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -177,7 +177,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -198,7 +198,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -208,7 +208,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -229,7 +229,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index b79a075..5ba5465 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -143,7 +143,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -163,7 +163,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -174,7 +174,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -195,7 +195,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 8887e4c..b9c19a4 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -128,7 +128,7 @@ <id>process-test-resources</id> <phase>process-test-resources</phase> <configuration> - <tasks> + <target> <echo>SIGAR java library version used is ${sigar.version}</echo> <echo>Copying/unzipping SIGAR native libraries (version ${sigar.version}) to local build directory</echo> <mkdir dir="${project.build.directory}/jboss-sigar" /> @@ -152,7 +152,7 @@ </fileset> </move> <delete dir="${project.build.directory}/jboss-sigar/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -163,7 +163,7 @@ <id>process-test-classes</id> <phase>process-test-classes</phase> <configuration> - <tasks unless="maven.test.skip"> + <target unless="maven.test.skip"> <echo>Assembling the resource upgrade test plugins</echo> <copy toDir="${project.build.testOutputDirectory}/tmp/v1/META-INF"> <fileset file="${project.build.testSourceDirectory}/org/rhq/core/pc/upgrade/plugins/v1/rhq-plugin.xml" /> @@ -336,7 +336,7 @@ </jar> <delete dir="${project.build.testOutputDirectory}/tmp" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -411,7 +411,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -431,7 +431,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -441,7 +441,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -462,7 +462,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 7192c4d..c35c001 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -102,12 +102,12 @@ <id>plugindoc-distro-package</id> <phase>install</phase> <configuration> - <tasks> + <target> <ant antfile="${basedir}/ant-run.xml" dir="${basedir}" target="package-dist" inheritAll="false" inheritRefs="false"> <property name="settings.localRepository" value="${settings.localRepository}" /> <property name="project.version" value="${project.version}" /> </ant> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 2dd2ef6..2737ce3 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -53,7 +53,7 @@ <execution> <phase>process-classes</phase> <configuration> - <tasks> + <target>  <taskdef name="i18n" classpathref="maven.compile.classpath" classname="mazz.i18n.ant.I18NAntTask" /> @@ -63,7 +63,7 @@ <include name="**/*.class" /> </classfileset> </i18n> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -97,12 +97,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -113,11 +113,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -151,7 +151,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -171,7 +171,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -181,7 +181,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -202,7 +202,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 6abfed3..6fa0902 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -122,7 +122,7 @@ <execution> <phase>process-classes</phase> <configuration> - <tasks> + <target>  <taskdef name="i18n" classpathref="maven.runtime.classpath" classname="mazz.i18n.ant.I18NAntTask" /> @@ -152,7 +152,7 @@ Build-OS-Version=${os.version} Build-Number=${buildNumber} </echo> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -164,7 +164,7 @@ Build-Number=${buildNumber} <id>agent-distro-package</id> <phase>install</phase> <configuration> - <tasks> + <target> <ant antfile="${basedir}/ant-run.xml" dir="${basedir}" target="package-dist" inheritAll="false" inheritRefs="false"> <property name="settings.localRepository" value="${settings.localRepository}" /> <property name="project.version" value="${project.version}" /> @@ -185,7 +185,7 @@ Build-Number=${buildNumber} <property name="augeas.zip.version" value="${augeas.zip.version}" /> <property name="log4j.version" value="${log4j.version}" /> </ant> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -196,10 +196,10 @@ Build-Number=${buildNumber} <id>clean-test-dirs</id> <phase>test</phase> <configuration> - <tasks> + <target> <delete dir="${basedir}/data" /> <delete dir="${basedir}/plugins" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -257,7 +257,7 @@ Build-Number=${buildNumber} <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -277,7 +277,7 @@ Build-Number=${buildNumber} <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -287,7 +287,7 @@ Build-Number=${buildNumber} <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -308,7 +308,7 @@ Build-Number=${buildNumber} </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index de2ef8d..6069aaf 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -162,7 +162,7 @@ rhq-agent.latest.build-number=${buildNumber} <id>deploy</id> <phase>package</phase> <configuration> - <tasks> + <target> <echo>*** Cleaning old ${rhq.deploymentDir}...</echo> <mkdir dir="${rhq.deploymentDir}" /> <delete failonerror="false"> @@ -171,7 +171,7 @@ rhq-agent.latest.build-number=${buildNumber} <property name="deployment.file" location="${rhq.deploymentDir}/${rhq.deploymentJar}" /> <echo>*** Updating ${deployment.file}...</echo> <copy file="${basedir}/target/${rhq.projectJar}" toFile="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -181,12 +181,12 @@ rhq-agent.latest.build-number=${buildNumber} <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <echo>*** Deleting ${rhq.deploymentDir}...</echo> <delete failonerror="false"> <fileset dir="${rhq.deploymentDir}" includes="*" /> </delete> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -218,7 +218,7 @@ rhq-agent.latest.build-number=${buildNumber} <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -238,7 +238,7 @@ rhq-agent.latest.build-number=${buildNumber} <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -248,7 +248,7 @@ rhq-agent.latest.build-number=${buildNumber} <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -269,7 +269,7 @@ rhq-agent.latest.build-number=${buildNumber} </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 7383d3a..23eab14 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -238,13 +238,13 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -255,12 +255,12 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -292,7 +292,7 @@ <id>bindings-api</id> <phase>compile</phase> <configuration> - <tasks> + <target> <property name="javadoc.outputDirectory" value="${javadoc.outputDirectory}" /> <property name="project.dir" value="./src/main/java/org/rhq/bindings" /> <property name="maven.compile.classpath" refid="maven.compile.classpath" /> @@ -309,7 +309,7 @@ <link href="http://download.oracle.com/javase/6/docs/api/" /> <bottom><![CDATA[Copyright © 2005-2011 <a href="http://redhat.com/">Red Hat, Inc.</a>. All Rights Reserved.]]></bottom> </javadoc> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -344,7 +344,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> @@ -368,7 +368,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -378,7 +378,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  @@ -402,7 +402,7 @@  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -448,10 +448,10 @@ </goals> <phase>generate-sources</phase> <configuration> - <tasks> + <target>  <echo>Updating remote api to exclude RemoteManagers passed in.</echo> - </tasks> + </target> </configuration> </execution> </executions> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 2c6133e..f784d42 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -105,7 +105,7 @@ <execution> <phase>process-classes</phase> <configuration> - <tasks> + <target>  <taskdef name="i18n" classpathref="maven.runtime.classpath" classname="mazz.i18n.ant.I18NAntTask" /> @@ -115,7 +115,7 @@ <include name="**/CommI18NResourceKeys.class" /> </classfileset> </i18n> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -186,12 +186,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -202,11 +202,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -240,7 +240,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -260,7 +260,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -270,7 +270,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -291,7 +291,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 5f86321..78f8982 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -220,7 +220,7 @@ <id>deploy-classes</id> <phase>compile</phase> <configuration> - <tasks> + <target> <property name="classes.dir" location="${rhq.deploymentDir}/WEB-INF/classes" /> <echo>*** Copying updated files from target/classes to ${classes.dir}...</echo> <copy todir="${classes.dir}" verbose="${rhq.verbose}"> @@ -232,7 +232,7 @@ <fileset dir="${basedir}/src/main/webapp" /> </copy>  - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -243,13 +243,13 @@ <id>deploy</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> <fileset dir="${basedir}/target/${project.build.finalName}" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -260,11 +260,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> <delete dir="${deployment.dir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 1260cee..45308cc 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -351,7 +351,7 @@ <id>Generate I18N Resource Bundles</id> <phase>process-classes</phase> <configuration> - <tasks> + <target> <taskdef name="i18n" classpathref="maven.runtime.classpath" classname="mazz.i18n.ant.I18NAntTask" /> <i18n outputdir="${project.buildNodes.outputDirectory}" defaultlocale="en" verbose="false" append="false" verify="true"> <classpath refid="maven.runtime.classpath" /> @@ -359,7 +359,7 @@ <include name="**/*I18NResourceKeys.class" /> </classfileset> </i18n> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -369,14 +369,14 @@ <id>Maintain an unfiltered copy of i18n properties files</id> <phase>process-classes</phase> <configuration> - <tasks> + <target> <copy todir="${project.buildNodes.outputDirectory}"> <fileset dir="src/main/webapp-filtered/WEB-INF/classes"> <include name="ApplicationResources.properties" /> </fileset> <mapper type="glob" from="*" to="*.unfiltered" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -414,7 +414,7 @@ <id>deploy-classes</id> <phase>compile</phase> <configuration> - <tasks> + <target>  <taskdef name="i18n" classpathref="maven.runtime.classpath" classname="mazz.i18n.ant.I18NAntTask" />  @@ -198,7 +198,7 @@ </fileset> <mapper type="glob" from="*" to="*.unfiltered" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -256,13 +256,13 @@ <id>deploy-classes</id> <phase>compile</phase> <configuration> - <tasks> + <target> <property name="classes.dir" location="${rhq.deploymentDir}/WEB-INF/classes" /> <echo>*** Copying updated files from target/classes to ${classes.dir}...</echo> <copy todir="${classes.dir}" verbose="${rhq.verbose}"> <fileset dir="target/classes" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -273,14 +273,14 @@ <id>deploy</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> <fileset dir="${basedir}/target/${project.build.finalName}" /> </copy> <delete dir="${deployment.dir}.rej" />  - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -291,11 +291,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> <delete dir="${deployment.dir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 6a5e230..5e034ef 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -444,7 +444,7 @@ <id>Generate I18N Resource Bundles</id> <phase>process-classes</phase> <configuration> - <tasks> + <target>  <taskdef name="i18n" classpathref="maven.runtime.classpath" classname="mazz.i18n.ant.I18NAntTask" /> <i18n outputdir="${project.build.outputDirectory}" defaultlocale="en" verbose="false" append="false" verify="true"> @@ -453,7 +453,7 @@ <include name="**/*I18NResourceKeys.class" /> </classfileset> </i18n> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -463,14 +463,14 @@ <id>Maintain an unfiltered copy of i18n properties files</id> <phase>process-classes</phase> <configuration> - <tasks> + <target> <copy todir="${project.build.outputDirectory}"> <fileset dir="src/main/webapp-filtered/WEB-INF/classes"> <include name="ApplicationResources.properties" /> </fileset> <mapper type="glob" from="*" to="*.unfiltered" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -507,7 +507,7 @@ <id>deploy-classes</id> <phase>compile</phase> <configuration> - <tasks> + <target> <property name="classes.dir" location="${rhq.deploymentDir}/WEB-INF/classes" /> <echo>*** Copying updated files from target/classes to ${classes.dir}...</echo> <copy todir="${classes.dir}" verbose="${rhq.verbose}"> @@ -519,7 +519,7 @@ <fileset dir="${basedir}/src/main/webapp" /> </copy>  - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -530,13 +530,13 @@ <id>deploy</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> <fileset dir="${basedir}/target/${project.build.finalName}" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -547,11 +547,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> <delete dir="${deployment.dir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -610,7 +610,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -632,7 +632,7 @@ <include name="org/rhq/enterprise/gui/common/time/converter/RelativeDurationConverter.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -642,7 +642,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -665,7 +665,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml index 4eb9c60..4c18901 100644 --- a/modules/enterprise/gui/rest-war/pom.xml +++ b/modules/enterprise/gui/rest-war/pom.xml @@ -139,7 +139,7 @@ <id>deploy-classes</id> <phase>compile</phase> <configuration> - <tasks> + <target> <property name="classes.dir" location="${rhq.deploymentDir}/WEB-INF/classes" /> <echo>*** Copying updated files from target/classes to ${classes.dir}...</echo> <copy todir="${classes.dir}" verbose="${rhq.verbose}"> @@ -151,7 +151,7 @@ <fileset dir="${basedir}/src/main/webapp" /> </copy>  - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -162,13 +162,13 @@ <id>deploy</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> <fileset dir="${basedir}/target/${project.build.finalName}" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -179,11 +179,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> <delete dir="${deployment.dir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -218,7 +218,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -240,7 +240,7 @@ <include name="org/rhq/enterprise/gui/common/time/converter/RelativeDurationConverter.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -250,7 +250,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -273,7 +273,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index b85eeef..3ab00df 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -213,7 +213,7 @@ <id>deploy-classes</id> <phase>compile</phase> <configuration> - <tasks> + <target> <property name="classes.dir" location="${rhq.deploymentDir}/WEB-INF/classes" /> <echo>*** Copying updated files from target/classes to ${classes.dir}...</echo> <copy todir="${classes.dir}" verbose="${rhq.verbose}"> @@ -225,7 +225,7 @@ <fileset dir="${basedir}/src/main/webapp" /> </copy>  - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -236,13 +236,13 @@ <id>deploy</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> <fileset dir="${basedir}/target/${project.build.finalName}" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -253,11 +253,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> <delete dir="${deployment.dir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index f3e0c81..fe1c3e7 100644 --- a/modules/enterprise/remoting/webservices/pom.xml +++ b/modules/enterprise/remoting/webservices/pom.xml @@ -104,7 +104,7 @@ <id>client-distribution</id> <phase>compile</phase> <configuration> - <tasks> + <target> <echo>ant.version=${ant.version}</echo> <ant antfile="${basedir}/src/main/scripts/rhq-client.build.xml" dir="${basedir}" target="prepare-dist" inheritAll="false" inheritRefs="false"> @@ -126,7 +126,7 @@ <property name="ant.contrib.version" value="${ant.contrib.version}" /> <property name="webservice.version" value="${project.version}" /> </ant> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index 9a2f24f..81b559c 100644 --- a/modules/enterprise/server/client-api/pom.xml +++ b/modules/enterprise/server/client-api/pom.xml @@ -71,13 +71,13 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -88,12 +88,12 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -128,7 +128,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> @@ -152,7 +152,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -162,7 +162,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  @@ -186,7 +186,7 @@  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index 197341b..8a5f9dd 100644 --- a/modules/enterprise/server/container-lib/pom.xml +++ b/modules/enterprise/server/container-lib/pom.xml @@ -69,12 +69,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -85,11 +85,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index ecbf664..46ec595 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -854,7 +854,7 @@ <id>deploy</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to @@ -866,7 +866,7 @@ <echo>*** Touching ${deployment.descriptor.file} to force redeployment of ${rhq.deploymentName}...</echo> <touch file="${deployment.descriptor.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -877,13 +877,13 @@ <id>deploy-ear-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <unjar src="${project.build.directory}/${project.build.finalName}.ear" dest="${rhq.deploymentDir}"> <patternset> <include name="META-INF/**" /> </patternset> </unjar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -894,11 +894,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> <delete dir="${deployment.dir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml index 3725e1d..3f3f03f 100644 --- a/modules/enterprise/server/itests/pom.xml +++ b/modules/enterprise/server/itests/pom.xml @@ -286,7 +286,7 @@ <id>Extract JMS classes from RAR needed for JMS tests</id> <phase>process-classes</phase> <configuration> - <tasks> + <target> <unzip src="src/test/resources/jms-ra.rar" dest="target"> <patternset> <include name="jms-ra.jar"/> @@ -297,7 +297,7 @@ <include name="org/**"/> </patternset> </unzip> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index ef539f6..86bc22d 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -606,7 +606,7 @@ <execution> <phase>process-classes</phase> <configuration> - <tasks> + <target>  <taskdef name="i18n" classpathref="maven.runtime.classpath" classname="mazz.i18n.ant.I18NAntTask" /> @@ -634,7 +634,7 @@ Build-Jdk=${java.version} Build-OS-Name=${os.name} Build-OS-Version=${os.version} </echo> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -646,7 +646,7 @@ Build-OS-Version=${os.version} <id>Extract JMS classes from RAR needed for JMS tests</id> <phase>process-classes</phase> <configuration> - <tasks> + <target> <unzip src="src/test/resources/jms-ra.rar" dest="target"> <patternset> <include name="jms-ra.jar"/> @@ -657,7 +657,7 @@ Build-OS-Version=${os.version} <include name="org/**"/> </patternset> </unzip> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -845,13 +845,13 @@ Build-OS-Version=${os.version} <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Copying updated files from target/classes to ${deployment.dir}...</echo> <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> <fileset dir="target/classes" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -867,13 +867,13 @@ Build-OS-Version=${os.version} <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${rhq.deploymentDir}" overwrite="false"> <patternset> <include name="META-INF/**" /> </patternset> </unjar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -884,11 +884,11 @@ Build-OS-Version=${os.version} <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.dir" location="${rhq.deploymentDir}" /> <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> <delete dir="${deployment.dir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -941,7 +941,7 @@ Build-OS-Version=${os.version} <id>remote-api</id> <phase>compile</phase> <configuration> - <tasks> + <target> <property name="javadoc.outputDirectory" value="${javadoc.outputDirectory}" /> <property name="project.dir" value="./src/main/java/org/rhq/enterprise/server" /> <property name="maven.compile.classpath" refid="maven.compile.classpath" /> @@ -958,7 +958,7 @@ Build-OS-Version=${os.version} <link href="http://download.oracle.com/javase/6/docs/api/" /> <bottom><![CDATA[Copyright © 2005-2011 <a href="http://redhat.com/">Red Hat, Inc.</a>. All Rights Reserved.]]></bottom> </javadoc> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -990,7 +990,7 @@ Build-OS-Version=${os.version} <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -1012,7 +1012,7 @@ Build-OS-Version=${os.version} <exclude name="**/DynamicConfigurationPropertyBean.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -1022,7 +1022,7 @@ Build-OS-Version=${os.version} <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -1043,7 +1043,7 @@ Build-OS-Version=${os.version} </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index ad59517..0977465 100644 --- a/modules/enterprise/server/plugins/alert-cli/pom.xml +++ b/modules/enterprise/server/plugins/alert-cli/pom.xml @@ -58,13 +58,13 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -75,12 +75,12 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -91,7 +91,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> @@ -102,7 +102,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -137,7 +137,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> @@ -161,7 +161,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -171,7 +171,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  @@ -195,7 +195,7 @@  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index 419c20a..a7db8c7 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -64,12 +64,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -80,11 +80,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -95,7 +95,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -105,7 +105,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -140,7 +140,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -160,7 +160,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -170,7 +170,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -191,7 +191,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 0d7194a..53b67dd 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -61,12 +61,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -77,11 +77,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -92,7 +92,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -102,7 +102,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -194,7 +194,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -214,7 +214,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -224,7 +224,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -245,7 +245,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml index 9884b3d..5f01f19 100644 --- a/modules/enterprise/server/plugins/alert-log4j/pom.xml +++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml @@ -51,12 +51,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -67,11 +67,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -82,7 +82,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -92,7 +92,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -130,7 +130,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -150,7 +150,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -160,7 +160,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -181,7 +181,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index c3b4437..ceb88ad 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -59,12 +59,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -75,11 +75,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -90,7 +90,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -100,7 +100,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -191,7 +191,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -211,7 +211,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -221,7 +221,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -242,7 +242,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 9a5ea88..01e8ed2 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -51,12 +51,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -67,11 +67,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -82,7 +82,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -92,7 +92,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -127,7 +127,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -147,7 +147,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -157,7 +157,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -178,7 +178,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index c28cee4..032030c 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -126,12 +126,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -142,11 +142,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -157,7 +157,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -167,7 +167,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -201,7 +201,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -221,7 +221,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -231,7 +231,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -252,7 +252,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 63375ca..e1b2b68 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -78,12 +78,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -94,11 +94,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -109,7 +109,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -119,7 +119,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -154,7 +154,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -174,7 +174,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -184,7 +184,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -205,7 +205,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-scriptlang/pom.xml b/modules/enterprise/server/plugins/alert-scriptlang/pom.xml index 5aace00..843b2af 100644 --- a/modules/enterprise/server/plugins/alert-scriptlang/pom.xml +++ b/modules/enterprise/server/plugins/alert-scriptlang/pom.xml @@ -81,12 +81,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -97,11 +97,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -112,7 +112,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -123,7 +123,7 @@ <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -156,7 +156,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -176,7 +176,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -186,7 +186,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -207,7 +207,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-sms/pom.xml b/modules/enterprise/server/plugins/alert-sms/pom.xml index eaddb5a..31fdfd7 100644 --- a/modules/enterprise/server/plugins/alert-sms/pom.xml +++ b/modules/enterprise/server/plugins/alert-sms/pom.xml @@ -94,12 +94,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -110,11 +110,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -125,7 +125,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -135,7 +135,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -209,7 +209,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -229,7 +229,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -239,7 +239,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -260,7 +260,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index 249f916..5e272f6 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -59,12 +59,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -75,11 +75,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -90,7 +90,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -100,7 +100,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -160,7 +160,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -180,7 +180,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -190,7 +190,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -211,7 +211,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index f1d7420..1e168a0 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -52,12 +52,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -68,11 +68,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -106,7 +106,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -126,7 +126,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -136,7 +136,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -157,7 +157,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 64d9579..5cb7d9d 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -152,12 +152,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -168,11 +168,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -183,7 +183,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -193,7 +193,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -227,7 +227,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -247,7 +247,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -257,7 +257,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -278,7 +278,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/cloud/pom.xml b/modules/enterprise/server/plugins/cloud/pom.xml index 2a5b73c..6ed8c41 100644 --- a/modules/enterprise/server/plugins/cloud/pom.xml +++ b/modules/enterprise/server/plugins/cloud/pom.xml @@ -79,12 +79,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -95,11 +95,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -110,7 +110,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -120,7 +120,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index df451de..db45a30 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -103,12 +103,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -119,11 +119,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -134,7 +134,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -144,7 +144,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -178,7 +178,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -198,7 +198,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -208,7 +208,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -229,7 +229,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 9252abd..f695434 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -78,12 +78,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -94,11 +94,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -109,7 +109,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -119,7 +119,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -153,7 +153,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -173,7 +173,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -183,7 +183,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -204,7 +204,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/drift-mongodb/pom.xml b/modules/enterprise/server/plugins/drift-mongodb/pom.xml index 869286d..985cd67 100644 --- a/modules/enterprise/server/plugins/drift-mongodb/pom.xml +++ b/modules/enterprise/server/plugins/drift-mongodb/pom.xml @@ -154,12 +154,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -170,11 +170,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -185,7 +185,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -195,7 +195,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -230,7 +230,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -250,7 +250,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -260,7 +260,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -281,7 +281,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml index e06625c..141b792 100644 --- a/modules/enterprise/server/plugins/drift-rhq/pom.xml +++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml @@ -92,12 +92,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -108,11 +108,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -123,7 +123,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -133,7 +133,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -167,7 +167,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -187,7 +187,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -197,7 +197,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -218,7 +218,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index 4fed8f3..1d3afe9 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -129,12 +129,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -145,11 +145,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -160,7 +160,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -170,7 +170,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -205,7 +205,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -225,7 +225,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -235,7 +235,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -256,7 +256,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml index 0e26344..f708881 100644 --- a/modules/enterprise/server/plugins/groovy-script/pom.xml +++ b/modules/enterprise/server/plugins/groovy-script/pom.xml @@ -155,12 +155,12 @@ <id>deploy</id> <phase>package</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -171,11 +171,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -186,7 +186,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -196,7 +196,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -230,7 +230,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -250,7 +250,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -260,7 +260,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -281,7 +281,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 91920bf..ba40c46 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -82,12 +82,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -98,11 +98,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -113,7 +113,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -123,7 +123,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -157,7 +157,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -177,7 +177,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -187,7 +187,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -208,7 +208,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml index d78df65..523a7b8 100644 --- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml +++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml @@ -52,12 +52,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -68,11 +68,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -83,7 +83,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> @@ -94,7 +94,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -127,7 +127,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -147,7 +147,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -157,7 +157,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -178,7 +178,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index 39da337..601d777 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -40,12 +40,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -56,11 +56,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -71,7 +71,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -81,7 +81,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/perspectives/policy/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/policy/perspective/pom.xml index 6ce8667..141eaef 100644 --- a/modules/enterprise/server/plugins/perspectives/policy/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/policy/perspective/pom.xml @@ -53,7 +53,7 @@ <id>add-war</id> <phase>verify</phase> <configuration> - <tasks> + <target> <property name="classes.dir" location="${rhq.deploymentDir}/WEB-INF/classes" /> @@ -62,7 +62,7 @@ destfile="${basedir}/target/${project.artifactId}-${project.version}.jar" basedir="${basedir}/../app/target" includes="*.war" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -94,11 +94,11 @@ <id>deploy</id> <phase>install</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <copy file="${basedir}/target/${project.build.finalName}.jar" toDir="${rhq.deploymentDir}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -109,11 +109,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 26e21c6..56877dd 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -87,12 +87,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -103,11 +103,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -118,7 +118,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -128,7 +128,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -163,7 +163,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -183,7 +183,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -193,7 +193,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -214,7 +214,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 4890974..4d68e6e 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -23,7 +23,7 @@ <execution> <phase>integration-test</phase> <configuration> - <tasks> + <target> <property name="test.classpath" refid="maven.test.classpath" /> <echo>Validating plugins...</echo> <java classname="org.rhq.enterprise.server.plugin.pc.ServerPluginValidatorUtil" failonerror="true" fork="true"> @@ -59,7 +59,7 @@ <jvmarg line="-Xdebug -Xrunjdwp:transport=dt_socket,address=8797,server=y,suspend=y" /> --> </java> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index f9cd80a..4d91ffd 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -72,12 +72,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -88,11 +88,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -103,7 +103,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -113,7 +113,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -148,7 +148,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -168,7 +168,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -178,7 +178,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -199,7 +199,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 2607be4..1a515f3 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -62,12 +62,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${rhq.deploymentName}" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -78,11 +78,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${rhq.deploymentName}" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -117,7 +117,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -137,7 +137,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -147,7 +147,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -168,7 +168,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index e9cb460..d14f05d 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -97,7 +97,7 @@ <id>Copy the schemas in one place, including rhq-configuration.xsd schema so we can reuse it</id> <phase>initialize</phase> <configuration> - <tasks> + <target> <mkdir dir="${basedir}/target/classes" /> <copy todir="${basedir}/target/classes"> <fileset dir="${basedir}/src/main/resources"> @@ -107,7 +107,7 @@ <include name="rhq-configuration.xsd" /> </fileset> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -117,9 +117,9 @@ <id>purge duplicated JAXB-generated configuration schema classes</id> <phase>process-sources</phase> <configuration> - <tasks> + <target> <delete dir="${basedir}/target/generated-sources/xjc/org/rhq/core" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -160,12 +160,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -176,11 +176,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -214,7 +214,7 @@ <id>cobertura-instrument</id> <phase>process-test-classes</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -234,7 +234,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -244,7 +244,7 @@ <id>cobertura-report</id> <phase>prepare-package</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -265,7 +265,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index a1c2d5b..6476dc0 100644 --- a/modules/helpers/bundleGen/pom.xml +++ b/modules/helpers/bundleGen/pom.xml @@ -95,7 +95,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -115,7 +115,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -125,7 +125,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -146,7 +146,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index f34103c..55e7c37 100644 --- a/modules/helpers/perftest-support/pom.xml +++ b/modules/helpers/perftest-support/pom.xml @@ -137,7 +137,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -157,7 +157,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -167,7 +167,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -188,7 +188,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 6394863..299550d 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -116,7 +116,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -136,7 +136,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -146,7 +146,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -167,7 +167,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index e94372a..821df29 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -104,12 +104,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -120,11 +120,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -159,7 +159,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -179,7 +179,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -189,7 +189,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -210,7 +210,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index 10f3766..7219146 100644 --- a/modules/integration-tests/apache-plugin-test/pom.xml +++ b/modules/integration-tests/apache-plugin-test/pom.xml @@ -130,7 +130,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> @@ -241,7 +241,7 @@ <chmod perm="ugo+rx"> <fileset dir="target/itest/httpd/bin" /> </chmod> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml index efa765d..4351b11 100644 --- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml +++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml @@ -275,7 +275,7 @@ <id>Extract JMS classes from RAR needed for JMS tests</id> <phase>process-classes</phase> <configuration> - <tasks> + <target> <unzip src="src/test/resources/jms-ra.rar" dest="target"> <patternset> @@ -288,7 +288,7 @@ <include name="org/**" /> </patternset> </unzip> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/integration-tests/mod_cluster-plugin-test/pom.xml b/modules/integration-tests/mod_cluster-plugin-test/pom.xml index a51f3b1..63fb98d 100644 --- a/modules/integration-tests/mod_cluster-plugin-test/pom.xml +++ b/modules/integration-tests/mod_cluster-plugin-test/pom.xml @@ -282,7 +282,7 @@ <execution> <phase>process-test-resources</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/testsetup" /> @@ -320,7 +320,7 @@ </fileset> </move> <delete dir="target/testsetup/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/jopr/dist/agent/pom.xml b/modules/jopr/dist/agent/pom.xml index fa46fc7..9fab897 100644 --- a/modules/jopr/dist/agent/pom.xml +++ b/modules/jopr/dist/agent/pom.xml @@ -53,7 +53,7 @@ <id>build-dist</id> <phase>generate-resources</phase> <configuration> - <tasks> + <target> <property name="jopr.trunk.dir" location="../../.." /> <property name="rhq.agent.dist.zipfile" location="${settings.localRepository}/org/rhq/rhq-enterprise-agent/${rhq.version}/rhq-enterprise-agent-${rhq.version}.zip" /> <property name="rhq.connectors.dist.zipfile" location="${settings.localRepository}/org/rhq/rhq-enterprise-agent/${rhq.version}/rhq-product_connectors-${rhq.version}.zip" /> @@ -75,7 +75,7 @@ <copy todir="${jopr.agent.dist.dir}"> <fileset dir="${jopr.trunk.dir}" includes="LICENSE*" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/jopr/dist/server/pom.xml b/modules/jopr/dist/server/pom.xml index 9ec8f35..0e95346 100644 --- a/modules/jopr/dist/server/pom.xml +++ b/modules/jopr/dist/server/pom.xml @@ -158,7 +158,7 @@ <id>build-dist</id> <phase>generate-resources</phase> <configuration> - <tasks> + <target> <echo>settings.localRepository=${settings.localRepository}</echo> <echo>project.build.outputDirectory=${project.build.outputDirectory}</echo> <ant antfile="src/main/scripts/dist.build.xml" target="run"> @@ -177,7 +177,7 @@ <property name="rhq.ds.password" value="${rhq.ds.password}" /> <property name="rhq.ds.type-mapping" value="${rhq.ds.type-mapping}" /> </ant> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/JBossOSGi/pom.xml b/modules/plugins/JBossOSGi/pom.xml index 1033830..0abd4b2 100644 --- a/modules/plugins/JBossOSGi/pom.xml +++ b/modules/plugins/JBossOSGi/pom.xml @@ -90,13 +90,13 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}"/> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -107,7 +107,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> @@ -121,7 +121,7 @@ manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -132,12 +132,12 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -171,7 +171,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -191,7 +191,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -201,7 +201,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -222,7 +222,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 24cbe04..17cd506 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -66,7 +66,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -137,7 +137,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -203,12 +203,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -219,7 +219,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -227,7 +227,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -238,11 +238,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -277,7 +277,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -297,7 +297,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -307,7 +307,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -328,7 +328,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index a7bb554..35bad6b 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -104,7 +104,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -135,7 +135,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -205,12 +205,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" update="true" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -221,7 +221,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -231,7 +231,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -242,11 +242,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -281,7 +281,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -301,7 +301,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -311,7 +311,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -332,7 +332,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index ca40f59..92b0521 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -125,7 +125,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -200,7 +200,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -264,12 +264,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" update="true" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -280,7 +280,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -288,7 +288,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -299,11 +299,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -338,7 +338,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -358,7 +358,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -368,7 +368,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -389,7 +389,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 92aa5c2..b770b07 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -133,12 +133,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -149,7 +149,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -157,7 +157,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -168,11 +168,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -230,7 +230,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -250,7 +250,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -260,7 +260,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -281,7 +281,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 13140d1..c6fbfed 100644 --- a/modules/plugins/byteman/pom.xml +++ b/modules/plugins/byteman/pom.xml @@ -76,7 +76,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -107,7 +107,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -174,12 +174,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" update="true" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -190,7 +190,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -198,7 +198,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -209,11 +209,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -247,7 +247,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -267,7 +267,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -277,7 +277,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -298,7 +298,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index 2d7604e..840b4b6 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -71,7 +71,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -142,7 +142,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -208,12 +208,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -224,7 +224,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -232,7 +232,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -243,11 +243,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -302,7 +302,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -322,7 +322,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -332,7 +332,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -353,7 +353,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index f1022b4..fa4f7d3 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -60,7 +60,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -131,7 +131,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -197,12 +197,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -213,7 +213,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -221,7 +221,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -232,11 +232,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -270,7 +270,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -290,7 +290,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -300,7 +300,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -321,7 +321,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 27c86f7..d4da519 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -41,12 +41,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -57,7 +57,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -65,7 +65,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -76,11 +76,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -114,7 +114,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -134,7 +134,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -144,7 +144,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -165,7 +165,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index d7c92c7..8c0a155 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -85,7 +85,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -116,7 +116,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -183,12 +183,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" update="true" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -199,7 +199,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -207,7 +207,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -218,11 +218,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -256,7 +256,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -276,7 +276,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -286,7 +286,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -307,7 +307,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 94dc1d4..5c56712 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -60,7 +60,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -128,7 +128,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -194,12 +194,12 @@ <id>deploy</id>  <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -210,7 +210,7 @@ <id>deploy-jar-meta-inf</id>  <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -218,7 +218,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -229,11 +229,11 @@ <id>undeploy</id>  <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -267,7 +267,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -287,7 +287,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -297,7 +297,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -318,7 +318,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index e393e1a..7aae62d 100644 --- a/modules/plugins/hadoop/pom.xml +++ b/modules/plugins/hadoop/pom.xml @@ -50,12 +50,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -66,7 +66,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -76,7 +76,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -87,11 +87,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -126,7 +126,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -146,7 +146,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -156,7 +156,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -177,7 +177,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/hardware/pom.xml b/modules/plugins/hardware/pom.xml index a922967..5b17f47 100644 --- a/modules/plugins/hardware/pom.xml +++ b/modules/plugins/hardware/pom.xml @@ -92,7 +92,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -112,7 +112,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -122,7 +122,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -143,7 +143,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 5e62e6b..e7a1349 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -75,7 +75,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -109,7 +109,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -176,12 +176,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -192,7 +192,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -200,7 +200,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -211,11 +211,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -249,7 +249,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -269,7 +269,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -279,7 +279,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -300,7 +300,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 46417ee..4794d78 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -67,7 +67,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -138,7 +138,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -204,12 +204,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -220,7 +220,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -228,7 +228,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -239,11 +239,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -277,7 +277,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -297,7 +297,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -307,7 +307,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -328,7 +328,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 47747e5..e50de4e 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -97,7 +97,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -117,7 +117,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -127,7 +127,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -148,7 +148,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 62fa324..60c3f2c 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -34,7 +34,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -65,7 +65,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -132,12 +132,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -148,7 +148,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -156,7 +156,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -167,11 +167,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -205,7 +205,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -225,7 +225,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -235,7 +235,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -256,7 +256,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/iptables/pom.xml b/modules/plugins/iptables/pom.xml index afcd92f..d6eeff3 100644 --- a/modules/plugins/iptables/pom.xml +++ b/modules/plugins/iptables/pom.xml @@ -48,7 +48,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar... </echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> @@ -80,7 +80,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -149,12 +149,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -165,7 +165,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -173,7 +173,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -184,11 +184,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index 65a7d8f..0750d4b 100644 --- a/modules/plugins/irc/pom.xml +++ b/modules/plugins/irc/pom.xml @@ -73,12 +73,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -89,7 +89,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -99,7 +99,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -110,11 +110,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -149,7 +149,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -169,7 +169,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -179,7 +179,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -200,7 +200,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index f23bc01..8ca5f8a 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -279,7 +279,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository"/> @@ -316,7 +316,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -599,13 +599,13 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}"/> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -616,7 +616,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> @@ -630,7 +630,7 @@ manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -641,12 +641,12 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -681,7 +681,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura"/> <mkdir dir="target/cobertura/backup"/> @@ -705,7 +705,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -715,7 +715,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties"/>  <mkdir dir="target/cobertura"/> @@ -738,7 +738,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index 425d85b..f630059 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -624,12 +624,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}"/> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -640,7 +640,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" @@ -652,7 +652,7 @@ <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -663,11 +663,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar"/> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index aaeca54..866838e 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -203,7 +203,7 @@ <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -236,7 +236,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -302,12 +302,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -318,7 +318,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -326,7 +326,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -337,11 +337,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -375,7 +375,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -395,7 +395,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -405,7 +405,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -426,7 +426,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 7f88567..1519908 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -322,7 +322,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -355,7 +355,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -441,12 +441,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -457,7 +457,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -465,7 +465,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -476,11 +476,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -514,7 +514,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -534,7 +534,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -544,7 +544,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -565,7 +565,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index f266552..1079417 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -65,7 +65,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -99,7 +99,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -166,12 +166,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -182,7 +182,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -190,7 +190,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -201,11 +201,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -239,7 +239,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -259,7 +259,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -269,7 +269,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -290,7 +290,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/jdbctrace/pom.xml b/modules/plugins/jdbctrace/pom.xml index 9f1e210..4d6b14a 100644 --- a/modules/plugins/jdbctrace/pom.xml +++ b/modules/plugins/jdbctrace/pom.xml @@ -41,14 +41,14 @@ <id>Package helper jar</id> <phase>process-classes</phase> <configuration> - <tasks> + <target> <echo>Preparing the internal byteman helper jar to be installed in byteman classpath</echo> <mkdir dir="${project.build.outputDirectory}/helper" /> <jar destfile="${project.build.outputDirectory}/helper/rhq-jdbctrace-plugin-helper.jar"> <fileset dir="${project.build.outputDirectory}" includes="**/org/rhq/plugins/jdbctrace/helper/*.class"/> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -106,7 +106,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -137,7 +137,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -204,12 +204,12 @@ <id>deploy</id> <phase>package</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" update="true" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -220,7 +220,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -228,7 +228,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -239,11 +239,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -277,7 +277,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -297,7 +297,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -307,7 +307,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -328,7 +328,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/jira/pom.xml b/modules/plugins/jira/pom.xml index b97bc8a..4839ea0 100644 --- a/modules/plugins/jira/pom.xml +++ b/modules/plugins/jira/pom.xml @@ -165,7 +165,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -196,7 +196,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -250,12 +250,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -266,7 +266,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" @@ -276,7 +276,7 @@ <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -287,11 +287,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -325,7 +325,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -345,7 +345,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -355,7 +355,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -376,7 +376,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index bba3095..c38a4d0 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -141,7 +141,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -172,7 +172,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -205,12 +205,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -221,7 +221,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -229,7 +229,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -240,11 +240,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -279,7 +279,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -299,7 +299,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -309,7 +309,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -330,7 +330,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index d92b2ba..8ee8062 100644 --- a/modules/plugins/kickstart/pom.xml +++ b/modules/plugins/kickstart/pom.xml @@ -53,12 +53,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -68,7 +68,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -78,7 +78,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -88,11 +88,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -124,7 +124,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -144,7 +144,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -154,7 +154,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -175,7 +175,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/lsof/pom.xml b/modules/plugins/lsof/pom.xml index 3c03009..d3d6b24 100644 --- a/modules/plugins/lsof/pom.xml +++ b/modules/plugins/lsof/pom.xml @@ -76,7 +76,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -107,7 +107,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -174,12 +174,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" update="true" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -190,7 +190,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -198,7 +198,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -209,11 +209,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -247,7 +247,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -267,7 +267,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -277,7 +277,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -298,7 +298,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index dbb1e1c..11ef595 100644 --- a/modules/plugins/mod-cluster/pom.xml +++ b/modules/plugins/mod-cluster/pom.xml @@ -87,12 +87,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -103,7 +103,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -111,7 +111,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -122,11 +122,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -191,12 +191,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -207,7 +207,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -215,7 +215,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -226,11 +226,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 9c4572f..fb018ca 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -79,7 +79,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -111,7 +111,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -178,12 +178,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -194,7 +194,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -202,7 +202,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -213,11 +213,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -251,7 +251,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -271,7 +271,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -281,7 +281,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -302,7 +302,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index dc68504..748cc07 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -89,7 +89,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -117,7 +117,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -183,12 +183,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -199,7 +199,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -207,7 +207,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -218,11 +218,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -256,7 +256,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -276,7 +276,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -286,7 +286,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -307,7 +307,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/nss/pom.xml b/modules/plugins/nss/pom.xml index ce34157..e5e9534 100644 --- a/modules/plugins/nss/pom.xml +++ b/modules/plugins/nss/pom.xml @@ -38,12 +38,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -53,7 +53,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -65,7 +65,7 @@ manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -75,11 +75,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -111,7 +111,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -131,7 +131,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -141,7 +141,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -162,7 +162,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/onewire/pom.xml b/modules/plugins/onewire/pom.xml index b991c55..3595d8d 100644 --- a/modules/plugins/onewire/pom.xml +++ b/modules/plugins/onewire/pom.xml @@ -92,12 +92,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -108,7 +108,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -116,7 +116,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -127,11 +127,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -165,7 +165,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -185,7 +185,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -195,7 +195,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -216,7 +216,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 4245f28..60fdb03 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -92,12 +92,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -108,7 +108,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -118,7 +118,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -129,11 +129,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -219,7 +219,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -239,7 +239,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -249,7 +249,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -270,7 +270,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 9549c47..28d63d4 100644 --- a/modules/plugins/pattern-generator/pom.xml +++ b/modules/plugins/pattern-generator/pom.xml @@ -50,12 +50,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -66,7 +66,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -76,7 +76,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -87,11 +87,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 57ce747..b098b14 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -37,7 +37,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -65,7 +65,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -131,12 +131,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -147,7 +147,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -155,7 +155,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -166,11 +166,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -204,7 +204,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -224,7 +224,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -234,7 +234,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -255,7 +255,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index f58ad01..a40b63d 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -65,7 +65,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -136,7 +136,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -202,12 +202,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -218,7 +218,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -226,7 +226,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -237,11 +237,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -275,7 +275,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -295,7 +295,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -305,7 +305,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -326,7 +326,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index 605e377..46c873e 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -78,7 +78,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -110,7 +110,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -177,12 +177,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -193,7 +193,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -201,7 +201,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -212,11 +212,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -250,7 +250,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -270,7 +270,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -280,7 +280,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -301,7 +301,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/raw-config-test/pom.xml b/modules/plugins/raw-config-test/pom.xml index 5a4abc6..5b023ba 100644 --- a/modules/plugins/raw-config-test/pom.xml +++ b/modules/plugins/raw-config-test/pom.xml @@ -148,12 +148,12 @@ <id>deploy</id> <phase>install</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 863acf0..46b0171 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -52,7 +52,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -85,7 +85,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -144,12 +144,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -160,7 +160,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -168,7 +168,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -179,11 +179,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -217,7 +217,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -237,7 +237,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -247,7 +247,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -268,7 +268,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 076e534..c3af4c6 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -77,7 +77,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -110,7 +110,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -175,12 +175,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -191,7 +191,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -199,7 +199,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -210,11 +210,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -248,7 +248,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -268,7 +268,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -278,7 +278,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -299,7 +299,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index eae465a..0f7bd3d 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -65,7 +65,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -136,7 +136,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -202,12 +202,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -218,7 +218,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -226,7 +226,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -237,11 +237,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -275,7 +275,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -295,7 +295,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -305,7 +305,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -326,7 +326,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index a9044b2..9a1370b 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -37,7 +37,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -65,7 +65,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -131,12 +131,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -147,7 +147,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -155,7 +155,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -166,11 +166,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -203,7 +203,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -223,7 +223,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -233,7 +233,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -254,7 +254,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 1202bd6..0c0bee5 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -104,12 +104,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -120,7 +120,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -130,7 +130,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -141,11 +141,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -180,7 +180,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -200,7 +200,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -210,7 +210,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -231,7 +231,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/services/pom.xml b/modules/plugins/services/pom.xml index 256c63b..a484f18 100644 --- a/modules/plugins/services/pom.xml +++ b/modules/plugins/services/pom.xml @@ -46,7 +46,7 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${project.build.outputDirectory}/lib"/> <copy todir="${project.build.outputDirectory}/lib"> <fileset dir="/usr/share/java/dbus-java"> @@ -61,7 +61,7 @@ <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -72,7 +72,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -82,7 +82,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -93,11 +93,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -131,7 +131,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup"/> @@ -151,7 +151,7 @@ <include name="**/*.class"/> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -161,7 +161,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -182,7 +182,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 830338a..4f60a52 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -88,12 +88,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -104,7 +104,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -112,7 +112,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -123,11 +123,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -161,7 +161,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -181,7 +181,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -191,7 +191,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -212,7 +212,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index c04bf17..c3db44f 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -61,7 +61,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -128,7 +128,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -194,12 +194,12 @@ <id>deploy</id>  <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -210,7 +210,7 @@ <id>deploy-jar-meta-inf</id>  <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -218,7 +218,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -229,11 +229,11 @@ <id>undeploy</id>  <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -267,7 +267,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -287,7 +287,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -297,7 +297,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -318,7 +318,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 549b70a..4aed11b 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -54,7 +54,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties"> <classpath> <pathelement location="${settings.localRepository}/ant-contrib/ant-contrib/${ant.contrib.version}/ant-contrib-${ant.contrib.version}.jar" /> @@ -126,7 +126,7 @@ </then> </if> <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -192,12 +192,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -208,7 +208,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -216,7 +216,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -227,11 +227,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -265,7 +265,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -285,7 +285,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -295,7 +295,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -316,7 +316,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 891869b..ca0576f 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -60,7 +60,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -92,7 +92,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -158,12 +158,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -174,7 +174,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -182,7 +182,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -193,11 +193,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -231,7 +231,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -251,7 +251,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -261,7 +261,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -282,7 +282,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index f94068b..daf4755 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -48,12 +48,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -64,7 +64,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -74,7 +74,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -85,11 +85,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -147,7 +147,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -167,7 +167,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -177,7 +177,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -198,7 +198,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index 2cad837..cff4b8b 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -23,7 +23,7 @@ <execution> <phase>integration-test</phase> <configuration> - <tasks> + <target> <property name="test.classpath" refid="maven.test.classpath" /> <echo>Validating plugins...</echo> <java classname="org.rhq.core.pc.plugin.PluginValidator" failonerror="true" fork="true"> @@ -65,7 +65,7 @@ <jvmarg line="-Xdebug -Xrunjdwp:transport=dt_socket,address=8797,server=y,suspend=y" /> --> </java> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 9baf60d..e9fbb43 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -134,7 +134,7 @@ <execution> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target> <echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo> <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <mkdir dir="target/itest" /> @@ -165,7 +165,7 @@ </fileset> </move> <delete dir="target/itest/lib/hyperic-sigar-${sigar.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -219,12 +219,12 @@ <id>deploy</id> <phase>compile</phase> <configuration> - <tasks> + <target> <mkdir dir="${rhq.deploymentDir}" /> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -235,7 +235,7 @@ <id>deploy-jar-meta-inf</id> <phase>package</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> @@ -243,7 +243,7 @@ </unjar> <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -254,11 +254,11 @@ <id>undeploy</id> <phase>clean</phase> <configuration> - <tasks> + <target> <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -293,7 +293,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -313,7 +313,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -323,7 +323,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -344,7 +344,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 9c3f1d7..ba3e023 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -127,7 +127,7 @@ <id>cobertura-instrument</id> <phase>pre-integration-test</phase> <configuration> - <tasks> + <target>  <mkdir dir="target/cobertura" /> <mkdir dir="target/cobertura/backup" /> @@ -147,7 +147,7 @@ <include name="**/*.class" /> </fileset> </cobertura-instrument> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -157,7 +157,7 @@ <id>cobertura-report</id> <phase>post-integration-test</phase> <configuration> - <tasks> + <target> <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> @@ -178,7 +178,7 @@ </cobertura-report>  <delete file="target/classes/cobertura.properties" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/pom.xml b/pom.xml index 6dd1430..3ae18ec 100644 --- a/pom.xml +++ b/pom.xml @@ -975,7 +975,7 @@ </goals> <phase>generate-sources</phase> <configuration> - <tasks> + <target> <mkdir dir="target" /> <tstamp> @@ -989,7 +989,7 @@ <arg value="-n1"/> </exec> <echo file="target/build.properties" append="true">buildNumber = ${buildNumber}${line.separator}</echo> - </tasks> + </target> </configuration> </execution> @@ -1000,10 +1000,10 @@ <goal>run</goal> </goals> <configuration> - <tasks> + <target> <echo level="debug">buildTime = ${buildTime}</echo> <echo level="debug">buildNumber = ${buildNumber}</echo> - </tasks> + </target> </configuration> </execution> @@ -1012,11 +1012,11 @@ <phase>site</phase> <inherited>false</inherited> <configuration> - <tasks> + <target> <property name="apidocs.dir" value="target/apidocs" /> <copy dir="modules/core/domain/target/site/apidocs" todir="${apidocs.dir}/domain"/> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -1193,9 +1193,9 @@ <phase>validate</phase> <inherited>false</inherited> <configuration> - <tasks> + <target> <echo>. !!!!!!! dev profile is active !!!!!!!</echo> - </tasks> + </target> </configuration> <goals> <goal>run</goal>

1 0

[rhq] etc/apt etc/classloaders-test etc/samples modules/common modules/core modules/enterprise modules/helpers modules/jopr modules/plugins
by ips 23 May '12

23 May '12

etc/apt/pom.xml | 1 - etc/classloaders-test/plugin1/pom.xml | 1 - etc/classloaders-test/plugin2/pom.xml | 1 - etc/samples/perspectives/sample-perspective/perspective/pom.xml | 2 -- etc/samples/skeleton-plugin/pom.xml | 1 - modules/common/drift/pom.xml | 1 - modules/core/client-api/pom.xml | 1 - modules/core/comm-api/pom.xml | 1 - modules/core/domain/pom.xml | 1 - modules/core/gui/pom.xml | 1 - modules/core/util/pom.xml | 1 - modules/enterprise/agentupdate/pom.xml | 1 - modules/enterprise/binding/pom.xml | 1 - modules/enterprise/comm/pom.xml | 1 - modules/enterprise/gui/content_http-war/pom.xml | 1 - modules/enterprise/gui/webdav-war/pom.xml | 1 - modules/enterprise/server/client-api/pom.xml | 1 - modules/enterprise/server/container-lib/pom.xml | 1 - modules/enterprise/server/container/pom.xml | 1 - modules/enterprise/server/jar/pom.xml | 1 - modules/enterprise/server/plugins/alert-cli/pom.xml | 1 - modules/enterprise/server/plugins/alert-email/pom.xml | 1 - modules/enterprise/server/plugins/alert-log4j/pom.xml | 1 - modules/enterprise/server/plugins/alert-mobicents/pom.xml | 1 - modules/enterprise/server/plugins/alert-operations/pom.xml | 1 - modules/enterprise/server/plugins/alert-roles/pom.xml | 1 - modules/enterprise/server/plugins/alert-subject/pom.xml | 1 - modules/enterprise/server/plugins/disk/pom.xml | 1 - modules/enterprise/server/plugins/drift-rhq/pom.xml | 1 - modules/enterprise/server/plugins/groovy-script/pom.xml | 1 - modules/enterprise/server/plugins/jboss-software/pom.xml | 1 - modules/enterprise/server/plugins/packagetype-cli/pom.xml | 1 - modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 1 - modules/enterprise/server/plugins/perspectives/policy/perspective/pom.xml | 2 -- modules/enterprise/server/plugins/url/pom.xml | 1 - modules/enterprise/server/plugins/yum/pom.xml | 1 - modules/enterprise/server/safe-invoker/pom.xml | 1 - modules/enterprise/server/sars/agent-sar/pom.xml | 1 - modules/enterprise/server/xml-schemas/pom.xml | 1 - modules/helpers/rtfilter/pom.xml | 1 - modules/jopr/dist/agent/pom.xml | 1 - modules/plugins/aliases/pom.xml | 1 - modules/plugins/cron/pom.xml | 1 - modules/plugins/database/pom.xml | 1 - modules/plugins/grub/pom.xml | 1 - modules/plugins/hadoop/pom.xml | 1 - modules/plugins/hosts/pom.xml | 1 - modules/plugins/iis/pom.xml | 1 - modules/plugins/iptables/pom.xml | 1 - modules/plugins/jboss-as/pom.xml | 1 - modules/plugins/jboss-cache/pom.xml | 1 - modules/plugins/kickstart/pom.xml | 1 - modules/plugins/mod-cluster/pom.xml | 1 - modules/plugins/nss/pom.xml | 1 - modules/plugins/onewire/pom.xml | 1 - modules/plugins/pattern-generator/pom.xml | 1 - modules/plugins/platform/pom.xml | 1 - modules/plugins/postfix/pom.xml | 1 - modules/plugins/rhq-agent/pom.xml | 1 - modules/plugins/samba/pom.xml | 1 - modules/plugins/script/pom.xml | 1 - modules/plugins/services/pom.xml | 1 - modules/plugins/sshd/pom.xml | 1 - modules/plugins/sudoers/pom.xml | 1 - modules/plugins/tomcat/pom.xml | 1 - 65 files changed, 67 deletions(-) New commits: commit ea70331b162b55210268a7ffe79653d7c2d100c9 Author: Ian Springer <ian.springer(a)redhat.com> Date: Wed May 23 12:49:30 2012 -0400 eradicate all remaining usages of v1.1 of the antrun plugin diff --git a/etc/apt/pom.xml b/etc/apt/pom.xml index c36dc64..cbb8ae3 100644 --- a/etc/apt/pom.xml +++ b/etc/apt/pom.xml @@ -144,7 +144,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/etc/classloaders-test/plugin1/pom.xml b/etc/classloaders-test/plugin1/pom.xml index 405b9e7..b23d084 100644 --- a/etc/classloaders-test/plugin1/pom.xml +++ b/etc/classloaders-test/plugin1/pom.xml @@ -164,7 +164,6 @@ <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> <id>deploy</id> diff --git a/etc/classloaders-test/plugin2/pom.xml b/etc/classloaders-test/plugin2/pom.xml index 8a79746..593d2ce 100644 --- a/etc/classloaders-test/plugin2/pom.xml +++ b/etc/classloaders-test/plugin2/pom.xml @@ -164,7 +164,6 @@ <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> <id>deploy</id> diff --git a/etc/samples/perspectives/sample-perspective/perspective/pom.xml b/etc/samples/perspectives/sample-perspective/perspective/pom.xml index d29d240..c72c419 100644 --- a/etc/samples/perspectives/sample-perspective/perspective/pom.xml +++ b/etc/samples/perspectives/sample-perspective/perspective/pom.xml @@ -75,7 +75,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> @@ -117,7 +116,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/etc/samples/skeleton-plugin/pom.xml b/etc/samples/skeleton-plugin/pom.xml index 668497a..f45b37e 100644 --- a/etc/samples/skeleton-plugin/pom.xml +++ b/etc/samples/skeleton-plugin/pom.xml @@ -165,7 +165,6 @@ <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> <id>deploy</id> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index 8f79012..8268ccf 100644 --- a/modules/common/drift/pom.xml +++ b/modules/common/drift/pom.xml @@ -43,7 +43,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 3452c98..bd022fb 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -139,7 +139,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 7449f9d..b71665b 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -34,7 +34,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 127b0e6..ebe159a 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -325,7 +325,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 2af1cdb..0ed21ed 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -156,7 +156,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index e0c51af..2dd2ef6 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -91,7 +91,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 12c9449..de2ef8d 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -157,7 +157,6 @@ rhq-agent.latest.build-number=${buildNumber} <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> <id>deploy</id> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 7ca5ea1..7383d3a 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -232,7 +232,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 833e7d2..2c6133e 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -180,7 +180,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index a299477..5f86321 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -214,7 +214,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index ac519a9..b85eeef 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -207,7 +207,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index 257e016..9a2f24f 100644 --- a/modules/enterprise/server/client-api/pom.xml +++ b/modules/enterprise/server/client-api/pom.xml @@ -65,7 +65,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index 99a3073..197341b 100644 --- a/modules/enterprise/server/container-lib/pom.xml +++ b/modules/enterprise/server/container-lib/pom.xml @@ -63,7 +63,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 0ce9d26..2f0dcbd 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -302,7 +302,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index c32c8d1..ef539f6 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -839,7 +839,6 @@ Build-OS-Version=${os.version} <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index 9d2b9e2..ad59517 100644 --- a/modules/enterprise/server/plugins/alert-cli/pom.xml +++ b/modules/enterprise/server/plugins/alert-cli/pom.xml @@ -52,7 +52,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index e299e5b..419c20a 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -58,7 +58,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml index 906ab2b..9884b3d 100644 --- a/modules/enterprise/server/plugins/alert-log4j/pom.xml +++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml @@ -45,7 +45,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index cd07626..9a5ea88 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -45,7 +45,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index 6c4e434..c28cee4 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -120,7 +120,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 195710e..63375ca 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -72,7 +72,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index 2aa0c0a..f1d7420 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -46,7 +46,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index dcc23df..9252abd 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -72,7 +72,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml index f59df6d..e06625c 100644 --- a/modules/enterprise/server/plugins/drift-rhq/pom.xml +++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml @@ -86,7 +86,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml index 082efa0..0e26344 100644 --- a/modules/enterprise/server/plugins/groovy-script/pom.xml +++ b/modules/enterprise/server/plugins/groovy-script/pom.xml @@ -149,7 +149,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index aad2fac..91920bf 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -76,7 +76,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml index 230dd56..d78df65 100644 --- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml +++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml @@ -46,7 +46,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index d4536b6..39da337 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -34,7 +34,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/plugins/perspectives/policy/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/policy/perspective/pom.xml index 51d3e6c..6ce8667 100644 --- a/modules/enterprise/server/plugins/perspectives/policy/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/policy/perspective/pom.xml @@ -47,7 +47,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> @@ -89,7 +88,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 39b0945..26e21c6 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -81,7 +81,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index 52b7390..f9cd80a 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -66,7 +66,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 2e9d5b9..2607be4 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -56,7 +56,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 2c7d4e4..e2ae626 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -155,7 +155,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index a0ac998..e9cb460 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -154,7 +154,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 62442ea..e94372a 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -98,7 +98,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/jopr/dist/agent/pom.xml b/modules/jopr/dist/agent/pom.xml index 5a3cd70..fa46fc7 100644 --- a/modules/jopr/dist/agent/pom.xml +++ b/modules/jopr/dist/agent/pom.xml @@ -47,7 +47,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 8407065..24cbe04 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -197,7 +197,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index ba16523..f1022b4 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -191,7 +191,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 87a8a37..27c86f7 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -35,7 +35,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 8d94bd2..94dc1d4 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -188,7 +188,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index 99fd26f..e393e1a 100644 --- a/modules/plugins/hadoop/pom.xml +++ b/modules/plugins/hadoop/pom.xml @@ -44,7 +44,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 17d766f..46417ee 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -198,7 +198,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 03ab909..62fa324 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -126,7 +126,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/iptables/pom.xml b/modules/plugins/iptables/pom.xml index 9a9c1c4..afcd92f 100644 --- a/modules/plugins/iptables/pom.xml +++ b/modules/plugins/iptables/pom.xml @@ -143,7 +143,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index b095b92..aaeca54 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -296,7 +296,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 4c8588c..f266552 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -160,7 +160,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index b724cb1..d92b2ba 100644 --- a/modules/plugins/kickstart/pom.xml +++ b/modules/plugins/kickstart/pom.xml @@ -48,7 +48,6 @@ <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> <id>deploy</id> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index 6fb87ee..dbb1e1c 100644 --- a/modules/plugins/mod-cluster/pom.xml +++ b/modules/plugins/mod-cluster/pom.xml @@ -186,7 +186,6 @@ <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> <id>deploy</id> diff --git a/modules/plugins/nss/pom.xml b/modules/plugins/nss/pom.xml index 583c9cb..ce34157 100644 --- a/modules/plugins/nss/pom.xml +++ b/modules/plugins/nss/pom.xml @@ -33,7 +33,6 @@ <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> <id>deploy</id> diff --git a/modules/plugins/onewire/pom.xml b/modules/plugins/onewire/pom.xml index 8c2628b..b991c55 100644 --- a/modules/plugins/onewire/pom.xml +++ b/modules/plugins/onewire/pom.xml @@ -86,7 +86,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index e8576bb..9549c47 100644 --- a/modules/plugins/pattern-generator/pom.xml +++ b/modules/plugins/pattern-generator/pom.xml @@ -44,7 +44,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index c631b00..57ce747 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -125,7 +125,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 741ead3..f58ad01 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -196,7 +196,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index c152355..863acf0 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -138,7 +138,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 1234a55..eae465a 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -196,7 +196,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 75b856b..a9044b2 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -125,7 +125,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/services/pom.xml b/modules/plugins/services/pom.xml index 9c62d09..256c63b 100644 --- a/modules/plugins/services/pom.xml +++ b/modules/plugins/services/pom.xml @@ -41,7 +41,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> <id>deploy</id> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 6d64760..c04bf17 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -188,7 +188,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index bdd8f11..549b70a 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -186,7 +186,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 9b30ee3..891869b 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -152,7 +152,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution>

1 0

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

23 May '12

modules/enterprise/remoting/cli/pom.xml | 1 - 1 file changed, 1 deletion(-) New commits: commit f708e6d36d0b586cc80baee72debb3773be931a0 Author: Ian Springer <ian.springer(a)redhat.com> Date: Wed May 23 12:23:18 2012 -0400 fix "Failed to create assembly: Error creating assembly archive rhq-client: You must set at least one file." build error diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index b5a7461..ae77f1e 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -272,7 +272,6 @@ <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> <id>deploy</id>

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits May 2012