modules/enterprise/agent/src/etc/rhq-agent-wrapper-ec2 | 122 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentManagement.java | 4 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentManagementMBean.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java | 8 modules/enterprise/server/container/pom.xml | 2 modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java | 15 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerLocal.java | 9 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/SyncEndpointAddressException.java | 20 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractJobWrapper.java | 10 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractTypeServerPluginContainer.java | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ConcurrentJobWrapper.java | 9 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ScheduledJobInvocationContext.java | 70 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/StatefulJobWrapper.java | 9 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/StatefulScheduledJobInvocationContext.java | 65 modules/enterprise/server/plugins/cloud/pom.xml | 146 modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java | 193 modules/enterprise/server/plugins/cloud/src/main/resources/META-INF/rhq-serverplugin.xml | 57 modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentServerComponent.java | 3 modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml | 1952 +++++----- pom.xml | 12 21 files changed, 1870 insertions(+), 842 deletions(-)
New commits: commit cef77c500dbdf9435677be2baa984556edeaee4d Merge: a6d145b... 782f2d7... Author: John Sanda jsanda@redhat.com Date: Tue Nov 30 14:37:34 2010 -0500
Merge branch 'ec2' into release-3.0.0
commit 782f2d70fb0e54708eb3fe3ab52eb25468ca5033 Author: John Sanda jsanda@redhat.com Date: Tue Nov 30 14:04:48 2010 -0500
Revert "[maven-release-plugin] prepare release 3_0_1_EC2_B01"
This reverts commit f3e226034f54e1ed8cf523341482610c2d99f205.
Conflicts:
modules/common/ant-bundle/pom.xml modules/common/filetemplate-bundle/pom.xml modules/common/jboss-as/pom.xml modules/common/pom.xml modules/core/client-api/pom.xml modules/core/comm-api/pom.xml modules/core/dbutils/pom.xml modules/core/domain/pom.xml modules/core/gui/pom.xml modules/core/native-system/pom.xml modules/core/plugin-api/pom.xml modules/core/plugin-container/pom.xml modules/core/plugin-validator/pom.xml modules/core/plugindoc/pom.xml modules/core/pom.xml modules/core/util/pom.xml modules/enterprise/agent/pom.xml modules/enterprise/agentupdate/pom.xml modules/enterprise/comm/pom.xml modules/enterprise/gui/base-perspective-jar/pom.xml modules/enterprise/gui/base-perspective-war/pom.xml modules/enterprise/gui/content_http-war/pom.xml modules/enterprise/gui/coregui/pom.xml modules/enterprise/gui/installer-war/pom.xml modules/enterprise/gui/pom.xml modules/enterprise/gui/portal-war/pom.xml modules/enterprise/gui/webdav-war/pom.xml modules/enterprise/pom.xml modules/enterprise/remoting/cli/pom.xml modules/enterprise/remoting/client-api/pom.xml modules/enterprise/remoting/pom.xml modules/enterprise/server/ear/pom.xml modules/enterprise/server/jar/pom.xml modules/enterprise/server/plugins/alert-email/pom.xml modules/enterprise/server/plugins/alert-irc/pom.xml modules/enterprise/server/plugins/alert-microblog/pom.xml modules/enterprise/server/plugins/alert-mobicents/pom.xml modules/enterprise/server/plugins/alert-operations/pom.xml modules/enterprise/server/plugins/alert-roles/pom.xml modules/enterprise/server/plugins/alert-snmp/pom.xml modules/enterprise/server/plugins/alert-subject/pom.xml modules/enterprise/server/plugins/ant-bundle/pom.xml modules/enterprise/server/plugins/cobbler/pom.xml modules/enterprise/server/plugins/disk/pom.xml modules/enterprise/server/plugins/filetemplate-bundle/pom.xml modules/enterprise/server/plugins/jboss-software/pom.xml modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml modules/enterprise/server/plugins/perspectives/core/pom.xml modules/enterprise/server/plugins/pom.xml modules/enterprise/server/plugins/rhnhosted/pom.xml modules/enterprise/server/plugins/url/pom.xml modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml modules/enterprise/server/plugins/yum/pom.xml modules/enterprise/server/safe-invoker/pom.xml modules/enterprise/server/sars/agent-sar/pom.xml modules/enterprise/server/sars/pom.xml modules/enterprise/server/xml-schemas/pom.xml modules/helpers/pluginAnnotations/pom.xml modules/helpers/pluginGen/pom.xml modules/helpers/pom.xml modules/helpers/rtfilter/pom.xml modules/plugins/aliases/pom.xml modules/plugins/ant-bundle/pom.xml modules/plugins/apache/pom.xml modules/plugins/augeas/pom.xml modules/plugins/cobbler/pom.xml modules/plugins/cron/pom.xml modules/plugins/database/pom.xml modules/plugins/filetemplate-bundle/pom.xml modules/plugins/grub/pom.xml modules/plugins/hibernate/pom.xml modules/plugins/hosts/pom.xml modules/plugins/hudson/pom.xml modules/plugins/iis/pom.xml modules/plugins/jboss-as-5/pom.xml modules/plugins/jboss-as/pom.xml modules/plugins/jboss-cache-v3/pom.xml modules/plugins/jboss-cache/pom.xml modules/plugins/jmx/pom.xml modules/plugins/mysql/pom.xml modules/plugins/netservices/pom.xml modules/plugins/oracle/pom.xml modules/plugins/perftest/pom.xml modules/plugins/platform/pom.xml modules/plugins/pom.xml modules/plugins/postfix/pom.xml modules/plugins/postgres/pom.xml modules/plugins/rhq-agent/pom.xml modules/plugins/rhq-server/pom.xml modules/plugins/samba/pom.xml modules/plugins/script/pom.xml modules/plugins/snmptrapd/pom.xml modules/plugins/sshd/pom.xml modules/plugins/sudoers/pom.xml modules/plugins/tomcat/pom.xml modules/plugins/twitter/pom.xml modules/plugins/validate-all-plugins/pom.xml modules/pom.xml modules/test-utils/pom.xml pom.xml
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index a2402b9..18b3148 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index e3d26f6..7328519 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index b70174d..ce47a67 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 4812f9a..01eea5c 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 0a0aa72..9f3881a 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 7de49ee..74b5928 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 3a5dfed..c5852ba 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index b980fb0..a28eb3a 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index e28e56a..561aa33 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 520e651..bdf222d 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index c45f880..9010509 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 0285f13..2f23428 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 21daa15..df4f531 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 82bbdd3..152a178 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 76763a6..fa507c8 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index ed825e4..39d1f3a 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index abd701c..9aa5095 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index d036e52..565bc6b 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index fb4361c..4690f9c 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index 89bae7e..452af60 100644 --- a/modules/enterprise/gui/base-perspective-jar/pom.xml +++ b/modules/enterprise/gui/base-perspective-jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml index 1c68fbf..128359c 100644 --- a/modules/enterprise/gui/base-perspective-war/pom.xml +++ b/modules/enterprise/gui/base-perspective-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 0f2c033..0d3bca5 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 29444e8..ee22fea 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index fffbe86..61363d3 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index bdf5ae6..8cb4c27 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 58d2f2c..c9eeee8 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index e38ce30..d723c43 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 8fec96b..c95bb90 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 4d82fd4..1dd7aad 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<artifactId>rhq-remoting-cli</artifactId> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index 51c30ea..e13b3cb 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<artifactId>rhq-remoting-client-api</artifactId> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index e3d42cf..d40ba9f 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<artifactId>rhq-remoting-parent</artifactId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index bba59f1..4c354bb 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 28fd2d0..ff09450 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index 0a45b14..f7f4685 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 9674296..54c7628 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index 1d5e7d7..e6425e6 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index a83a7cc..cc3e87e 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index 5a54029..65d296b 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 89a2b92..649554b 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index 8327bd8..d40372d 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index cdad570..ab235e2 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index c2eb54f..49fb793 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index 5a59949..414089a 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index ba42f98..1cf8dc4 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index 9e7c144..19d8f63 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 80a208e..d523815 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index b68dd0b..5465cb7 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index cb4687c..ef113ea 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index ef6ff00..9fae1c6 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index 583df89..e897939 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index ba2a4e3..e94bc97 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 1cd9158..972ffae 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index 8c4fd8c..b0d0889 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index de21b16..bac02fe 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 10542a3..d4eb1d3 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index aa40133..9c89fb0 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 0044069..adcee30 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index be3e8ea..34f96b7 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index a9f77c2..760aa47 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index b2b6168..a9a1ed6 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 7e13c31..66817bb 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index d4ec32f..d45740a 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 3faceb0..e85b019 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 4d36fff..f8868f6 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index e71e71d..8ce4c7d 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index a8ccdd7..f389aed 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 8909c47..134b32f 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index c0b4c9e..b835e7b 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 31b37a8..63f3c7e 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 0186ea0..b7a6da7 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index c7a0284..43a0d03 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. --> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index a611edd..bf9b384 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 9641b4e..094349a 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 7a00562..7a22b82 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index 3dcad67..2e26619 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 9cd647c..1556ac8 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 6ac1e1b..4b3b21d 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 9b774c7..8c78ea7 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index cd82f58..5f92e76 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 8e7e876..c99ae4b 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 8db305f..67919cf 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 9e3aca7..ad6478a 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index b8b5bfc..cb424ef 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index d211f07..6f8b8c3 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 960ef9e..4d12efb 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 798abb5..663c562 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index bdccc70..4551c56 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index ff99ab7..2918cd1 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 7fa07e0..71c3e26 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 67384d8..99ef74e 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index f598cbb..c7403c4 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 8d7bd2e..baa076b 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 5698156..efc4a8c 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 788e20c..8bd1665 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 52c9287..37b1d4f 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index fa2a883..44a9746 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index 001f19d..4982e56 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index acf099d..fee12c3 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 01e47eb..432b517 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index df37529..2b8888b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@
<groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.2.EC2_B01-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> <packaging>pom</packaging>
<name>RHQ</name>
commit 20137c388c734347ee7c4d484d795fdf92323db0 Author: John Sanda jsanda@redhat.com Date: Mon Sep 27 13:23:24 2010 -0400
[maven-release-plugin] prepare for next development iteration
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index baa80e1..a2402b9 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 4a1e0d4..e3d26f6 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 2aca854..b70174d 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index bd3d04d..4812f9a 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index c9858a4..0a0aa72 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 6d88431..7de49ee 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 577da80..3a5dfed 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 6345561..b980fb0 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index dd72c59..e28e56a 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index adc926e..520e651 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index dfd3626..c45f880 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 8eef4c6..0285f13 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index b3e86ff..21daa15 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 64ee173..82bbdd3 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 6929b12..76763a6 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 3854288..ed825e4 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index f3cf6a9..abd701c 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 35e6e5a..d036e52 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 381b9ef..fb4361c 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index 3e9dffc..89bae7e 100644 --- a/modules/enterprise/gui/base-perspective-jar/pom.xml +++ b/modules/enterprise/gui/base-perspective-jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml index 3a736a0..1c68fbf 100644 --- a/modules/enterprise/gui/base-perspective-war/pom.xml +++ b/modules/enterprise/gui/base-perspective-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index aa4800c..0f2c033 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 41390c0..29444e8 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 79ba566..fffbe86 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index ee9357e..bdf5ae6 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 2ac8206..58d2f2c 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index 8faa06a..e38ce30 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 48b8029..8fec96b 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 458f226..4d82fd4 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<artifactId>rhq-remoting-cli</artifactId> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index 990017a..51c30ea 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<artifactId>rhq-remoting-client-api</artifactId> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 5ad9c18..e3d42cf 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<artifactId>rhq-remoting-parent</artifactId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 90be92e..bba59f1 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 78aa525..28fd2d0 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index ec21b84..0a45b14 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 1affd58..9674296 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index 366b562..1d5e7d7 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 44c4f53..a83a7cc 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index 8f30369..5a54029 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index d104900..89a2b92 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index aa5346c..8327bd8 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index bd45ed8..cdad570 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 36f46c6..c2eb54f 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index c7500f5..5a59949 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 7deb628..ba42f98 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index 1d7c4ca..9e7c144 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index c884a95..80a208e 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index e823790..b68dd0b 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index 9628e05..cb4687c 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 8993c2c..ef6ff00 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index 1069630..583df89 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 4a7eda4..ba2a4e3 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index b4c41ab..1cd9158 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index 675451c..8c4fd8c 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 998f0c7..de21b16 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 2fa63c6..10542a3 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index e1b89b6..aa40133 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index c133413..0044069 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index 0067efa..be3e8ea 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 8151e92..a9f77c2 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 9dbe976..b2b6168 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 093c2ec..7e13c31 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index ef8a8f3..d4ec32f 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 17b5a63..3faceb0 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 640f337..4d36fff 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 370c065..e71e71d 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index 77434b9..a8ccdd7 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 861bdab..8909c47 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 9e81ecd..c0b4c9e 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 2506f95..31b37a8 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 9f29705..0186ea0 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 62d91c3..c7a0284 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. --> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 4fd1775..a611edd 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index dd801e7..9641b4e 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index f6ac558..7a00562 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index 12d7c84..3dcad67 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index f4c6d60..9cd647c 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index d4bf78b..6ac1e1b 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 4ff7b0d..9b774c7 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 9b877b0..cd82f58 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 17067fa..8e7e876 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 21f5718..8db305f 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 9b7aa18..9e3aca7 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 50620ac..b8b5bfc 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 6a987ae..d211f07 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 7ab1848..960ef9e 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index acfdec5..798abb5 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index 5ff1a7b..bdccc70 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index b5af578..ff99ab7 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index cd85ec8..7fa07e0 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index bca417e..67384d8 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 68dfb4b..f598cbb 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index ce8649b..8d7bd2e 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index a9265ad..5698156 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 4008fbe..788e20c 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 82b8eb6..52c9287 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 12cc8dc..fa2a883 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index 572e87a..001f19d 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 87bba39..acf099d 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 5ddba8c..01e47eb 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index 5128c68..df37529 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@
<groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1.EC2_B01</version> + <version>3.0.2.EC2_B01-SNAPSHOT</version> <packaging>pom</packaging>
<name>RHQ</name>
commit f3e226034f54e1ed8cf523341482610c2d99f205 Author: John Sanda jsanda@redhat.com Date: Mon Sep 27 13:23:03 2010 -0400
[maven-release-plugin] prepare release 3_0_1_EC2_B01
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 18b3148..baa80e1 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 7328519..4a1e0d4 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index ce47a67..2aca854 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 01eea5c..bd3d04d 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 9f3881a..c9858a4 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 74b5928..6d88431 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index c5852ba..577da80 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index a28eb3a..6345561 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 561aa33..dd72c59 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index bdf222d..adc926e 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index 9010509..dfd3626 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 2f23428..8eef4c6 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index df4f531..b3e86ff 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 152a178..64ee173 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index fa507c8..6929b12 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 39d1f3a..3854288 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 9aa5095..f3cf6a9 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 565bc6b..35e6e5a 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 4690f9c..381b9ef 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index 452af60..3e9dffc 100644 --- a/modules/enterprise/gui/base-perspective-jar/pom.xml +++ b/modules/enterprise/gui/base-perspective-jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml index 128359c..3a736a0 100644 --- a/modules/enterprise/gui/base-perspective-war/pom.xml +++ b/modules/enterprise/gui/base-perspective-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 0d3bca5..aa4800c 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index ee22fea..41390c0 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 61363d3..79ba566 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 8cb4c27..ee9357e 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index c9eeee8..2ac8206 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index d723c43..8faa06a 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index c95bb90..48b8029 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 1dd7aad..458f226 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<artifactId>rhq-remoting-cli</artifactId> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index e13b3cb..990017a 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<artifactId>rhq-remoting-client-api</artifactId> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index d40ba9f..5ad9c18 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<artifactId>rhq-remoting-parent</artifactId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 4c354bb..90be92e 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index ff09450..78aa525 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index f7f4685..ec21b84 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 54c7628..1affd58 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index e6425e6..366b562 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index cc3e87e..44c4f53 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index 65d296b..8f30369 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 649554b..d104900 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index d40372d..aa5346c 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index ab235e2..bd45ed8 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 49fb793..36f46c6 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</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 414089a..c7500f5 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 1cf8dc4..7deb628 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</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 19d8f63..1d7c4ca 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index d523815..c884a95 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index 5465cb7..e823790 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index ef113ea..9628e05 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 9fae1c6..8993c2c 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index e897939..1069630 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index e94bc97..4a7eda4 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</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 972ffae..b4c41ab 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</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 b0d0889..675451c 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index bac02fe..998f0c7 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index d4eb1d3..2fa63c6 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 9c89fb0..e1b89b6 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index adcee30..c133413 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index 34f96b7..0067efa 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 760aa47..8151e92 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index a9a1ed6..9dbe976 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 66817bb..093c2ec 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index d45740a..ef8a8f3 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index e85b019..17b5a63 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index f8868f6..640f337 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 8ce4c7d..370c065 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index f389aed..77434b9 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 134b32f..861bdab 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index b835e7b..9e81ecd 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 63f3c7e..2506f95 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index b7a6da7..9f29705 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 43a0d03..62d91c3 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. --> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index bf9b384..4fd1775 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 094349a..dd801e7 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 7a22b82..f6ac558 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</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 2e26619..12d7c84 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 1556ac8..f4c6d60 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</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 4b3b21d..d4bf78b 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 8c78ea7..4ff7b0d 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 5f92e76..9b877b0 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index c99ae4b..17067fa 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 67919cf..21f5718 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index ad6478a..9b7aa18 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index cb424ef..50620ac 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 6f8b8c3..6a987ae 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 4d12efb..7ab1848 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 663c562..acfdec5 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index 4551c56..5ff1a7b 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 2918cd1..b5af578 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 71c3e26..cd85ec8 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 99ef74e..bca417e 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index c7403c4..68dfb4b 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index baa076b..ce8649b 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index efc4a8c..a9265ad 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 8bd1665..4008fbe 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 37b1d4f..82b8eb6 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 44a9746..12cc8dc 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</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 4982e56..572e87a 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index fee12c3..87bba39 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 432b517..5ddba8c 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index 2b8888b..5128c68 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@
<groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.1.EC2_B01</version> <packaging>pom</packaging>
<name>RHQ</name>
commit 0f4f8c7dd916f688c5018c9deea961bbb85638f8 Author: John Sanda jsanda@redhat.com Date: Sun Sep 26 13:46:39 2010 -0400
Adding logic to purge stale servers from the sync list
If a server has been taken down and removed from the system, then we need to remove it from the list of servers we look at to see if their addresses need to be synced.
Adding a bunch of debug logging.
diff --git a/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java b/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java index 796f035..88eb3ba 100644 --- a/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java +++ b/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java @@ -1,12 +1,18 @@ package org.rhq.enterprise.server.plugins.cloud;
import java.io.Serializable; +import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set;
import javax.persistence.EntityManager;
+import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import org.rhq.core.domain.cloud.Server; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; @@ -16,6 +22,7 @@ import org.rhq.core.domain.resource.Resource; import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.cloud.CloudManagerLocal; import org.rhq.enterprise.server.operation.OperationManagerLocal; +import org.rhq.enterprise.server.operation.ResourceOperationSchedule; import org.rhq.enterprise.server.plugin.pc.ControlFacet; import org.rhq.enterprise.server.plugin.pc.ControlResults; import org.rhq.enterprise.server.plugin.pc.ScheduledJobInvocationContext; @@ -25,6 +32,8 @@ import org.rhq.enterprise.server.util.LookupUtil;
public class CloudServerPluginComponent implements ServerPluginComponent, ControlFacet {
+ private static Log log = LogFactory.getLog(CloudServerPluginComponent.class); + public void initialize(ServerPluginContext context) throws Exception { }
@@ -42,9 +51,21 @@ public class CloudServerPluginComponent implements ServerPluginComponent, Contro String serverName = parameters.getSimpleValue("name", null); String serverAddr = parameters.getSimpleValue("address", null);
+ if (log.isDebugEnabled()) { + log.debug("Invoked syncServerEndpoint with [name: " + serverName + ", address: " + serverAddr + "]"); + } + + ControlResults results = new ControlResults(); + CloudManagerLocal cloudMgr = LookupUtil.getCloudManager(); Server server = cloudMgr.getServerByName(serverName);
+ if (server == null) { + log.warn("Failed to locate server. No address sync will be performed."); + results.setError("No update performed. Failed to find server " + server.getName()); + return results; + } + if (serverAddr != null) { SubjectManagerLocal subjectMgr = LookupUtil.getSubjectManager();
@@ -54,10 +75,13 @@ public class CloudServerPluginComponent implements ServerPluginComponent, Contro
int updateCount = notifyAgents(server);
- ControlResults results = new ControlResults(); Configuration complexResults = results.getComplexResults(); complexResults.put(new PropertySimple("results", updateCount + " agents have been updated."));
+ if (log.isDebugEnabled()) { + log.debug("Notified " + updateCount + " agents of the address change."); + } + return results; }
@@ -65,19 +89,57 @@ public class CloudServerPluginComponent implements ServerPluginComponent, Contro }
public void syncServerEndpoints(ScheduledJobInvocationContext context) { + log.debug("Preparing to sync server endpoints."); + CloudManagerLocal cloudMgr = LookupUtil.getCloudManager(); List<Server> servers = cloudMgr.getAllServers();
+ purgeStaleServers(context, servers); + for (Server server : servers) { if (!context.containsKey("server:" + server.getName())) { + log.debug("Adding server [" + server.getName() + "] to sync list."); context.put("server:" + server.getName(), server.getAddress()); } else if (addressChanged(context, server)) { + if (log.isDebugEnabled()) { + log.debug("Detected address change for " + server); + log.debug("Old address was " + context.get("server:" + server.getName() + ", new address is " + + server.getAddress())); + } context.put("server:" + server.getName(), server.getAddress()); notifyAgents(server); } } }
+ private void purgeStaleServers(ScheduledJobInvocationContext context, List<Server> servers) { + List<String> purgeList = new ArrayList<String>(); + + Set<String> serverNames = new HashSet<String>(); + for (Server server : servers) { + serverNames.add(server.getName()); + } + + for (String key : context.getJobData().keySet()) { + if (key.startsWith("server:")) { + String serverName = parseServerName(key); + if (!serverNames.contains(serverName)) { + log.debug("Detected a stale server: " + serverName); + log.debug(serverName + " will be removed from the sync list."); + purgeList.add(key); + } + } + } + + for (String staleServer : purgeList) { + context.remove(staleServer); + } + } + + private String parseServerName(String key) { + return key.substring("server:".length()); + } + private boolean addressChanged(ScheduledJobInvocationContext context, Server server) { String lastKnownAddr = context.get("server:" + server.getName()); return !server.getAddress().endsWith(lastKnownAddr); @@ -100,6 +162,10 @@ public class CloudServerPluginComponent implements ServerPluginComponent, Contro .setParameter("server", server) .getResultList();
+ if (log.isDebugEnabled()) { + log.debug("Found " + agents.size() + " to be updated with new server endpoint for " + server); + } + int numUpdated = 0; for (Resource agent : agents) { updateAgent(agent, server); @@ -116,7 +182,12 @@ public class CloudServerPluginComponent implements ServerPluginComponent, Contro Configuration params = new Configuration(); params.put(new PropertySimple("server", server.getAddress()));
- operationMgr.scheduleResourceOperation(subjectMgr.getOverlord(), agent.getId(), "switchToServer", 0, 0, 0, 0, - params, "Server endpoint has changed. Sending new address to agent."); + ResourceOperationSchedule schedule = operationMgr.scheduleResourceOperation(subjectMgr.getOverlord(), + agent.getId(), "switchToServer", 0, 0, 0, 0, params, "Cloud Plugin: syncing server endpoint address"); + + if (log.isDebugEnabled()) { + log.debug("Schedule address sync for agent [name: " + agent.getName() + "]."); + log.debug("Operation schedule is " + schedule); + } } }
commit 45633060e9a2c1cfb7c4d30845b7cac97f6a7c8b Author: John Sanda jsanda@redhat.com Date: Thu Sep 23 17:52:57 2010 -0400
Exposing address sync job as an operation that can be manually invoked.
This is a first code at this plugin operation. Some error handling needs to be added along with some logging.
diff --git a/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java b/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java index 233436d..796f035 100644 --- a/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java +++ b/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java @@ -16,12 +16,14 @@ import org.rhq.core.domain.resource.Resource; import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.cloud.CloudManagerLocal; import org.rhq.enterprise.server.operation.OperationManagerLocal; +import org.rhq.enterprise.server.plugin.pc.ControlFacet; +import org.rhq.enterprise.server.plugin.pc.ControlResults; import org.rhq.enterprise.server.plugin.pc.ScheduledJobInvocationContext; import org.rhq.enterprise.server.plugin.pc.ServerPluginComponent; import org.rhq.enterprise.server.plugin.pc.ServerPluginContext; import org.rhq.enterprise.server.util.LookupUtil;
-public class CloudServerPluginComponent implements ServerPluginComponent { +public class CloudServerPluginComponent implements ServerPluginComponent, ControlFacet {
public void initialize(ServerPluginContext context) throws Exception { } @@ -35,6 +37,33 @@ public class CloudServerPluginComponent implements ServerPluginComponent { public void shutdown() { }
+ public ControlResults invoke(String name, Configuration parameters) { + if ("syncServerEndpoint".equals(name)) { + String serverName = parameters.getSimpleValue("name", null); + String serverAddr = parameters.getSimpleValue("address", null); + + CloudManagerLocal cloudMgr = LookupUtil.getCloudManager(); + Server server = cloudMgr.getServerByName(serverName); + + if (serverAddr != null) { + SubjectManagerLocal subjectMgr = LookupUtil.getSubjectManager(); + + server.setAddress(serverAddr); + cloudMgr.updateServer(subjectMgr.getOverlord(), server); + } + + int updateCount = notifyAgents(server); + + ControlResults results = new ControlResults(); + Configuration complexResults = results.getComplexResults(); + complexResults.put(new PropertySimple("results", updateCount + " agents have been updated.")); + + return results; + } + + return null; + } + public void syncServerEndpoints(ScheduledJobInvocationContext context) { CloudManagerLocal cloudMgr = LookupUtil.getCloudManager(); List<Server> servers = cloudMgr.getAllServers(); @@ -55,7 +84,7 @@ public class CloudServerPluginComponent implements ServerPluginComponent { }
@SuppressWarnings("unchecked") - private void notifyAgents(Server server) { + private int notifyAgents(Server server) { EntityManager entityMgr = LookupUtil.getEntityManager(); String queryString = "select r " + "from Resource r " + @@ -71,9 +100,13 @@ public class CloudServerPluginComponent implements ServerPluginComponent { .setParameter("server", server) .getResultList();
+ int numUpdated = 0; for (Resource agent : agents) { updateAgent(agent, server); + numUpdated++; } + + return numUpdated; }
private void updateAgent(Resource agent, Server server) { diff --git a/modules/enterprise/server/plugins/cloud/src/main/resources/META-INF/rhq-serverplugin.xml b/modules/enterprise/server/plugins/cloud/src/main/resources/META-INF/rhq-serverplugin.xml index de9f94a..e6944c0 100644 --- a/modules/enterprise/server/plugins/cloud/src/main/resources/META-INF/rhq-serverplugin.xml +++ b/modules/enterprise/server/plugins/cloud/src/main/resources/META-INF/rhq-serverplugin.xml @@ -7,6 +7,21 @@ xmlns:serverplugin="urn:xmlns:rhq-serverplugin" xmlns:c="urn:xmlns:rhq-configuration"> <serverplugin:plugin-component class="CloudServerPluginComponent"> + <serverplugin:control name="syncServerEndpoint" description=""> + serverplugin:parameters + <c:simple-property name="name" + required="true" + description="The server name"/> + <c:simple-property name="address" + required="false" + description="If an address is specified, it will overwrite the server's current value + in the database. If an address is not specified then the server's + current address will be sent down to its agents."/> + </serverplugin:parameters> + serverplugin:results + <c:simple-property name="results" description="Contains a status or error message"/> + </serverplugin:results> + </serverplugin:control> </serverplugin:plugin-component>
commit 36a9ba826d569a5cd43fc80553cbd665bed344e1 Author: John Sanda jsanda@redhat.com Date: Thu Sep 23 15:22:44 2010 -0400
Schedule the 'switchToServer' agent resource operation
diff --git a/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java b/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java index 154a0c2..233436d 100644 --- a/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java +++ b/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java @@ -8,10 +8,14 @@ import java.util.Map; import javax.persistence.EntityManager;
import org.rhq.core.domain.cloud.Server; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.resource.Agent; import org.rhq.core.domain.resource.Resource; +import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.cloud.CloudManagerLocal; +import org.rhq.enterprise.server.operation.OperationManagerLocal; import org.rhq.enterprise.server.plugin.pc.ScheduledJobInvocationContext; import org.rhq.enterprise.server.plugin.pc.ServerPluginComponent; import org.rhq.enterprise.server.plugin.pc.ServerPluginContext; @@ -38,7 +42,7 @@ public class CloudServerPluginComponent implements ServerPluginComponent { for (Server server : servers) { if (!context.containsKey("server:" + server.getName())) { context.put("server:" + server.getName(), server.getAddress()); - } else if (addressChanged(context, server) || true) { + } else if (addressChanged(context, server)) { context.put("server:" + server.getName(), server.getAddress()); notifyAgents(server); } @@ -61,14 +65,25 @@ public class CloudServerPluginComponent implements ServerPluginComponent { "from Agent a " + "where a.server = :server)";
- List<Resource> resources = entityMgr.createQuery(queryString) + List<Resource> agents = entityMgr.createQuery(queryString) .setParameter("pluginName", "RHQAgent") .setParameter("resourceTypeName", "RHQ Agent") .setParameter("server", server) .getResultList();
- for (Resource resource : resources) { - // update agents... + for (Resource agent : agents) { + updateAgent(agent, server); } } + + private void updateAgent(Resource agent, Server server) { + OperationManagerLocal operationMgr = LookupUtil.getOperationManager(); + SubjectManagerLocal subjectMgr = LookupUtil.getSubjectManager(); + + Configuration params = new Configuration(); + params.put(new PropertySimple("server", server.getAddress())); + + operationMgr.scheduleResourceOperation(subjectMgr.getOverlord(), agent.getId(), "switchToServer", 0, 0, 0, 0, + params, "Server endpoint has changed. Sending new address to agent."); + } }
commit 47f44ce60b96e53756a36d8801047f24fcae19ff Author: John Sanda jsanda@redhat.com Date: Thu Sep 23 12:58:52 2010 -0400
Adding logic to detect changed addresses
diff --git a/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java b/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java index 2577b48..154a0c2 100644 --- a/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java +++ b/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java @@ -10,6 +10,7 @@ import javax.persistence.EntityManager; import org.rhq.core.domain.cloud.Server; import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.resource.Agent; +import org.rhq.core.domain.resource.Resource; import org.rhq.enterprise.server.cloud.CloudManagerLocal; import org.rhq.enterprise.server.plugin.pc.ScheduledJobInvocationContext; import org.rhq.enterprise.server.plugin.pc.ServerPluginComponent; @@ -31,44 +32,43 @@ public class CloudServerPluginComponent implements ServerPluginComponent { }
public void syncServerEndpoints(ScheduledJobInvocationContext context) { -// CloudManagerLocal cloudMgr = LookupUtil.getCloudManager(); -// List<Server> servers = cloudMgr.getAllServers(); -// Map<String, String> addresses = getAddresses(context); + CloudManagerLocal cloudMgr = LookupUtil.getCloudManager(); + List<Server> servers = cloudMgr.getAllServers();
-// for (Server server : servers) { -// if (!addresses.containsKey(server.getName())) { -// addresses.put(server.getName(), server.getAddress()); -// } else if (addressChanged(addresses, server)) { -// addresses.put(server.getName(), server.getAddress()); -// notifyAgents(server); -// } -// } - - if (!context.containsKey("counter")) { - context.put("counter", "1"); - return; + for (Server server : servers) { + if (!context.containsKey("server:" + server.getName())) { + context.put("server:" + server.getName(), server.getAddress()); + } else if (addressChanged(context, server) || true) { + context.put("server:" + server.getName(), server.getAddress()); + notifyAgents(server); + } } + }
- Integer counter = Integer.parseInt(context.get("counter")); - System.out.println("CURRENT COUNT: " + counter); - context.put("counter", Integer.toString(counter + 1)); + private boolean addressChanged(ScheduledJobInvocationContext context, Server server) { + String lastKnownAddr = context.get("server:" + server.getName()); + return !server.getAddress().endsWith(lastKnownAddr); }
-// @SuppressWarnings("unchecked") -// private Map<String, String> getAddresses(ScheduledJobInvocationContext context) { -// Map<String, Serializable> jobData = context.getProperties(); -// if (!jobData.containsKey("serverAddresses")) { -// jobData.put("serverAddresses", new HashMap<String, String>()); -// } -// return (Map<String, String>) jobData.get("serverAddresses"); -// } -// -// private boolean addressChanged(Map<String, String> addresses, Server server) { -// String lastKnownAddr = addresses.get(server.getName()); -// return !server.getAddress().endsWith(lastKnownAddr); -// } -// -// private void notifyAgents(Server server) { -// EntityManager entityMgr = LookupUtil.getEntityManager(); -// } + @SuppressWarnings("unchecked") + private void notifyAgents(Server server) { + EntityManager entityMgr = LookupUtil.getEntityManager(); + String queryString = "select r " + + "from Resource r " + + "where r.resourceType.plugin = :pluginName and " + + "r.resourceType.name = :resourceTypeName and " + + "r.agent in (select a " + + "from Agent a " + + "where a.server = :server)"; + + List<Resource> resources = entityMgr.createQuery(queryString) + .setParameter("pluginName", "RHQAgent") + .setParameter("resourceTypeName", "RHQ Agent") + .setParameter("server", server) + .getResultList(); + + for (Resource resource : resources) { + // update agents... + } + } }
commit 7e4d28dd2f8f906008d1da86e50c34ae41095311 Author: John Sanda jsanda@redhat.com Date: Thu Sep 23 12:20:10 2010 -0400
Fixing methods to throw the correct exception type
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ScheduledJobInvocationContext.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ScheduledJobInvocationContext.java index 0defea3..b69fc9c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ScheduledJobInvocationContext.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ScheduledJobInvocationContext.java @@ -93,7 +93,7 @@ public class ScheduledJobInvocationContext { * @throws UnsupportedOperationException if the job is marked for concurrent execution */ public void put(String key, String value) { - throw new IllegalArgumentException("This operation is only supported for stateful jobs."); + throw new UnsupportedOperationException("This operation is only supported for stateful jobs."); }
/** @@ -104,7 +104,7 @@ public class ScheduledJobInvocationContext { * @throws UnsupportedOperationException if the job is marked for concurrent execution */ public String get(String key) { - throw new IllegalArgumentException("This operation is only supported for stateful jobs."); + throw new UnsupportedOperationException("This operation is only supported for stateful jobs."); }
/** @@ -115,7 +115,7 @@ public class ScheduledJobInvocationContext { * @throws UnsupportedOperationException if the job is marked for concurrent execution */ public String remove(String key) { - throw new IllegalArgumentException("This operation is only supported for stateful jobs."); + throw new UnsupportedOperationException("This operation is only supported for stateful jobs."); }
/** @@ -125,7 +125,7 @@ public class ScheduledJobInvocationContext { * @throws UnsupportedOperationException if the job is marked for concurrent execution */ public boolean containsKey(String key) { - throw new IllegalArgumentException("This operation is only supported for stateful jobs."); + throw new UnsupportedOperationException("This operation is only supported for stateful jobs."); }
/** @@ -135,7 +135,7 @@ public class ScheduledJobInvocationContext { * @throws UnsupportedOperationException if the job is marked for concurrent execution */ public Map<String, String> getJobData() { - throw new IllegalArgumentException("This operation is only supported for stateful jobs."); + throw new UnsupportedOperationException("This operation is only supported for stateful jobs."); }
}
commit 7b611aba945d61070809b1d36c187a7c27b42a4c Author: John Sanda jsanda@redhat.com Date: Thu Sep 23 11:52:25 2010 -0400
Only allow job data to be persisted when the job is not marked concurrent
Adding logic such that persisting job data in the ScheduledJobInvocationContext is only supported when the job is not marked as concurrent. If the job is marked as concurrent, and the plugin calls a method to access or update properties, an exception will be thrown.
Also adding some javadocs to explain how/when persisting job data is supported
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractJobWrapper.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractJobWrapper.java index 78058b3..5c61f8b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractJobWrapper.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractJobWrapper.java @@ -113,6 +113,9 @@ abstract class AbstractJobWrapper implements Job { */ public static final String DATAMAP_IS_CLUSTERED = DATAMAP_LEADER + "isClustered";
+ protected abstract ScheduledJobInvocationContext createContext(ScheduledJobDefinition jobDefinition, + ServerPluginContext pluginContext, ServerPluginComponent serverPluginComponent, Map<String, String> jobData); + /** * This is the method that quartz calls when the schedule has triggered. This method will * delegate to the plugin component that is responsible to do work for the plugin. @@ -234,8 +237,7 @@ abstract class AbstractJobWrapper implements Job { ScheduledJobDefinition jobDefinition = new ScheduledJobDefinition(jobId, true, jobClass, jobMethodName, scheduleType, callbackData); ServerPluginContext pluginContext = pluginManager.getServerPluginContext(pluginEnv); - Map<String, String> properties = new HashMap<String, String>(); - params[0] = new ScheduledJobInvocationContext(jobDefinition, pluginContext, pluginComponent, dataMap); + params[0] = createContext(jobDefinition, pluginContext, pluginComponent,dataMap); } catch (NoSuchMethodException e) { try { // see if there is a no-arg method of the given name diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ConcurrentJobWrapper.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ConcurrentJobWrapper.java index 13cbfc4..dfbb941 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ConcurrentJobWrapper.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ConcurrentJobWrapper.java @@ -19,6 +19,10 @@
package org.rhq.enterprise.server.plugin.pc;
+import java.util.Map; + +import org.rhq.enterprise.server.xmlschema.ScheduledJobDefinition; + /** * The actual quartz job that the plugin container will submit when it needs to invoke * a concurrent scheduled job on behalf of a plugin. This is a normal non-stateful "job" @@ -31,4 +35,9 @@ package org.rhq.enterprise.server.plugin.pc; * @author John Mazzitelli */ public class ConcurrentJobWrapper extends AbstractJobWrapper { + @Override + protected ScheduledJobInvocationContext createContext(ScheduledJobDefinition jobDefinition, + ServerPluginContext pluginContext, ServerPluginComponent serverPluginComponent, Map<String, String> jobData) { + return new ScheduledJobInvocationContext(jobDefinition, pluginContext, serverPluginComponent); + } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ScheduledJobInvocationContext.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ScheduledJobInvocationContext.java index 1cf48a5..0defea3 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ScheduledJobInvocationContext.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ScheduledJobInvocationContext.java @@ -28,9 +28,17 @@ import java.util.Map; import org.rhq.enterprise.server.xmlschema.ScheduledJobDefinition;
/** + * <p> * A scheduled job's invocation method can take a single argument of this type. * If this is the case, the scheduled job's method will be passed an object of this type enabling * the job being invoked to be given information about the invocation. + * </p> + * <p> + * When a job is <strong>not</strong> marked for concurrent execution, it can store data in the context in the form of + * key/value properties. These properties will be persisted across invocations of the job. If the job is marked to as + * clustered, the job data will persist across server restarts as well. Lastly, if the job is marked to run + * concurrently, the methods for accessing/updating properties will throw an exception. + * </p> * * @author John Mazzitelli */ @@ -38,14 +46,12 @@ public class ScheduledJobInvocationContext { private final ScheduledJobDefinition jobDefinition; private final ServerPluginContext serverPluginContext; private final ServerPluginComponent serverPluginComponent; - private Map<String, String> properties;
public ScheduledJobInvocationContext(ScheduledJobDefinition jobDefinition, ServerPluginContext pluginContext, - ServerPluginComponent serverPluginComponent, Map<String, String> properties) { + ServerPluginComponent serverPluginComponent) { this.jobDefinition = jobDefinition; this.serverPluginContext = pluginContext; this.serverPluginComponent = serverPluginComponent; - this.properties = properties; }
/** @@ -78,13 +84,16 @@ public class ScheduledJobInvocationContext { }
/** - * Adds a property to the context that is persisted across invocations of the job. + * Adds a property to the context that is persisted across invocations of the job. The property is persisted across + * server restarts <strong>only if</strong> the scheduled job is declared to run as clustered. Note that method + * will throw an exception if the job is declared for concurrent execution. * * @param key The property name * @param value The property value + * @throws UnsupportedOperationException if the job is marked for concurrent execution */ public void put(String key, String value) { - properties.put(key, value); + throw new IllegalArgumentException("This operation is only supported for stateful jobs."); }
/** @@ -92,9 +101,10 @@ public class ScheduledJobInvocationContext { * * @param key The property key * @return The property value or <code>null<code> if the key is not found + * @throws UnsupportedOperationException if the job is marked for concurrent execution */ public String get(String key) { - return properties.get(key); + throw new IllegalArgumentException("This operation is only supported for stateful jobs."); }
/** @@ -102,26 +112,30 @@ public class ScheduledJobInvocationContext { * * @param key The property key * @return The value previously associated with the key or <code>null</code> if the key is present in the context + * @throws UnsupportedOperationException if the job is marked for concurrent execution */ public String remove(String key) { - return properties.remove(key); + throw new IllegalArgumentException("This operation is only supported for stateful jobs."); }
/** * Checks to see whether or not the property key is stored in the context. * @param key The property key * @return <code>true</code> if the key is found, <code>false</code> otherwise. + * @throws UnsupportedOperationException if the job is marked for concurrent execution */ public boolean containsKey(String key) { - return properties.containsKey(key); + throw new IllegalArgumentException("This operation is only supported for stateful jobs."); }
/** * Returns a <strong>read-only</strong> view of the properties stored in the context. * * @return A <strong>read-only</strong> view of the properties stored in the context. + * @throws UnsupportedOperationException if the job is marked for concurrent execution */ - public Map<String, String> getProperties() { - return Collections.unmodifiableMap(properties); + public Map<String, String> getJobData() { + throw new IllegalArgumentException("This operation is only supported for stateful jobs."); } + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/StatefulJobWrapper.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/StatefulJobWrapper.java index d04558b..61a151a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/StatefulJobWrapper.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/StatefulJobWrapper.java @@ -19,8 +19,12 @@
package org.rhq.enterprise.server.plugin.pc;
+import java.util.Map; + import org.quartz.StatefulJob;
+import org.rhq.enterprise.server.xmlschema.ScheduledJobDefinition; + /** * The actual quartz job that the plugin container will submit when it needs to invoke * a scheduled job on behalf of a plugin. This is a "stateful job" which tells quartz @@ -33,4 +37,9 @@ import org.quartz.StatefulJob; * @author John Mazzitelli */ public class StatefulJobWrapper extends AbstractJobWrapper implements StatefulJob { + @Override + protected ScheduledJobInvocationContext createContext(ScheduledJobDefinition jobDefinition, + ServerPluginContext pluginContext, ServerPluginComponent serverPluginComponent, Map<String, String> jobData) { + return new StatefulScheduledJobInvocationContext(jobDefinition, pluginContext, serverPluginComponent, jobData); + } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/StatefulScheduledJobInvocationContext.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/StatefulScheduledJobInvocationContext.java new file mode 100644 index 0000000..c526400 --- /dev/null +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/StatefulScheduledJobInvocationContext.java @@ -0,0 +1,65 @@ +package org.rhq.enterprise.server.plugin.pc; + +import java.util.Collections; +import java.util.Map; + +import org.rhq.enterprise.server.xmlschema.ScheduledJobDefinition; + +public class StatefulScheduledJobInvocationContext extends ScheduledJobInvocationContext { + private Map<String, String> jobData; + + public StatefulScheduledJobInvocationContext(ScheduledJobDefinition jobDefinition, + ServerPluginContext pluginContext, ServerPluginComponent serverPluginComponent, Map<String, String> jobData) { + super(jobDefinition, pluginContext, serverPluginComponent); + this.jobData = jobData; + } + + /** + * Adds a property to the context that is persisted across invocations of the job. + * + * @param key The property name + * @param value The property value + */ + public void put(String key, String value) { + jobData.put(key, value); + } + + /** + * Retrieves a property value from the context. + * + * @param key The property key + * @return The property value or <code>null<code> if the key is not found + */ + public String get(String key) { + return jobData.get(key); + } + + /** + * Removes the property value associated with the specified key + * + * @param key The property key + * @return The value previously associated with the key or <code>null</code> if the key is present in the context + */ + public String remove(String key) { + return jobData.remove(key); + } + + /** + * Checks to see whether or not the property key is stored in the context. + * @param key The property key + * @return <code>true</code> if the key is found, <code>false</code> otherwise. + */ + public boolean containsKey(String key) { + return jobData.containsKey(key); + } + + /** + * Returns a <strong>read-only</strong> view of the properties stored in the context. + * + * @return A <strong>read-only</strong> view of the properties stored in the context. + */ + public Map<String, String> getJobData() { + return Collections.unmodifiableMap(jobData); + } + +}
commit 050a2b0c70167cf3e029e92220f3aa2098fff4a7 Author: John Sanda jsanda@redhat.com Date: Wed Sep 22 20:50:38 2010 -0400
Updating plugin descriptor to make cloud plugin clustered
Also refactoring plugin to work with new methods in ScheduledJobInvocationContext
diff --git a/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java b/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java index e2aac5a..2577b48 100644 --- a/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java +++ b/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java @@ -1,11 +1,20 @@ package org.rhq.enterprise.server.plugins.cloud;
import java.io.Serializable; +import java.util.HashMap; +import java.util.List; import java.util.Map;
+import javax.persistence.EntityManager; + +import org.rhq.core.domain.cloud.Server; +import org.rhq.core.domain.criteria.ResourceCriteria; +import org.rhq.core.domain.resource.Agent; +import org.rhq.enterprise.server.cloud.CloudManagerLocal; import org.rhq.enterprise.server.plugin.pc.ScheduledJobInvocationContext; import org.rhq.enterprise.server.plugin.pc.ServerPluginComponent; import org.rhq.enterprise.server.plugin.pc.ServerPluginContext; +import org.rhq.enterprise.server.util.LookupUtil;
public class CloudServerPluginComponent implements ServerPluginComponent {
@@ -22,15 +31,44 @@ public class CloudServerPluginComponent implements ServerPluginComponent { }
public void syncServerEndpoints(ScheduledJobInvocationContext context) { - Map<String, Serializable> jobProperties = context.getProperties(); - - if (!jobProperties.containsKey("counter")) { - jobProperties.put("counter", 1); +// CloudManagerLocal cloudMgr = LookupUtil.getCloudManager(); +// List<Server> servers = cloudMgr.getAllServers(); +// Map<String, String> addresses = getAddresses(context); + +// for (Server server : servers) { +// if (!addresses.containsKey(server.getName())) { +// addresses.put(server.getName(), server.getAddress()); +// } else if (addressChanged(addresses, server)) { +// addresses.put(server.getName(), server.getAddress()); +// notifyAgents(server); +// } +// } + + if (!context.containsKey("counter")) { + context.put("counter", "1"); return; }
- Integer counter = (Integer)jobProperties.get("counter"); + Integer counter = Integer.parseInt(context.get("counter")); System.out.println("CURRENT COUNT: " + counter); - jobProperties.put("counter", counter + 1); + context.put("counter", Integer.toString(counter + 1)); } + +// @SuppressWarnings("unchecked") +// private Map<String, String> getAddresses(ScheduledJobInvocationContext context) { +// Map<String, Serializable> jobData = context.getProperties(); +// if (!jobData.containsKey("serverAddresses")) { +// jobData.put("serverAddresses", new HashMap<String, String>()); +// } +// return (Map<String, String>) jobData.get("serverAddresses"); +// } +// +// private boolean addressChanged(Map<String, String> addresses, Server server) { +// String lastKnownAddr = addresses.get(server.getName()); +// return !server.getAddress().endsWith(lastKnownAddr); +// } +// +// private void notifyAgents(Server server) { +// EntityManager entityMgr = LookupUtil.getEntityManager(); +// } } diff --git a/modules/enterprise/server/plugins/cloud/src/main/resources/META-INF/rhq-serverplugin.xml b/modules/enterprise/server/plugins/cloud/src/main/resources/META-INF/rhq-serverplugin.xml index fd3b2f9..de9f94a 100644 --- a/modules/enterprise/server/plugins/cloud/src/main/resources/META-INF/rhq-serverplugin.xml +++ b/modules/enterprise/server/plugins/cloud/src/main/resources/META-INF/rhq-serverplugin.xml @@ -14,7 +14,7 @@ <c:simple-property name="scheduleType" type="string" required="true" - default="cron" + default="periodic" summary="true" description="Indicates the type of trigger this synchronize job will use"> <c:property-options> @@ -33,10 +33,10 @@ <c:simple-property name="clustered" type="boolean" required="true" - default="false" + default="true" summary="false" readOnly="true" - description="This must always be false"/> + description="This must always be true"/> </c:map-property> </serverplugin:scheduled-jobs> </generic-plugin> \ No newline at end of file
commit 41a7ba13b51f4a29474f308f662151b22fa24292 Author: John Sanda jsanda@redhat.com Date: Wed Sep 22 17:26:23 2010 -0400
Restricting plugins to storing only string in the job data
Quartz is already configured to only allow strings to be stored in the job data map when a job is scheduled for concurrent execution. Restricting entries in the map to strings is recommended to avoid class versioning errors that are common during deserialization. ScheduledInvocationContext has been refactored a bit so that the underlying map is no longer directly exposed. To edit values in the map it now exposes get/put methods that help enforce and ensure only strings are stored in the map. There is still a getProperties() method; however, it returns a read-only view of the data map.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractJobWrapper.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractJobWrapper.java index 974cc4d..78058b3 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractJobWrapper.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractJobWrapper.java @@ -22,6 +22,7 @@ package org.rhq.enterprise.server.plugin.pc; import java.io.Serializable; import java.lang.reflect.Method; import java.util.Date; +import java.util.HashMap; import java.util.Map; import java.util.Properties;
@@ -113,12 +114,6 @@ abstract class AbstractJobWrapper implements Job { public static final String DATAMAP_IS_CLUSTERED = DATAMAP_LEADER + "isClustered";
/** - * Key to the data map to a map where the plugin job can store data that it wants - * to persist across invocations of the job. - */ - public static final String DATAMAP_PLUGIN_JOB_DATA = DATAMAP_LEADER + "pluginJobData"; - - /** * This is the method that quartz calls when the schedule has triggered. This method will * delegate to the plugin component that is responsible to do work for the plugin. * @@ -239,8 +234,8 @@ abstract class AbstractJobWrapper implements Job { ScheduledJobDefinition jobDefinition = new ScheduledJobDefinition(jobId, true, jobClass, jobMethodName, scheduleType, callbackData); ServerPluginContext pluginContext = pluginManager.getServerPluginContext(pluginEnv); - params[0] = new ScheduledJobInvocationContext(jobDefinition, pluginContext, pluginComponent, - (Map<String, Serializable>)dataMap.get(DATAMAP_PLUGIN_JOB_DATA)); + Map<String, String> properties = new HashMap<String, String>(); + params[0] = new ScheduledJobInvocationContext(jobDefinition, pluginContext, pluginComponent, dataMap); } catch (NoSuchMethodException e) { try { // see if there is a no-arg method of the given name diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractTypeServerPluginContainer.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractTypeServerPluginContainer.java index bfaae58..c7fc556 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractTypeServerPluginContainer.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractTypeServerPluginContainer.java @@ -458,7 +458,6 @@ public abstract class AbstractTypeServerPluginContainer { jobData.putAsString(AbstractJobWrapper.DATAMAP_IS_CONCURRENT, schedule.getScheduleType().isConcurrent()); jobData.putAsString(AbstractJobWrapper.DATAMAP_IS_CLUSTERED, schedule.getScheduleType().isClustered()); jobData.put(AbstractJobWrapper.DATAMAP_JOB_METHOD_NAME, schedule.getMethodName()); - jobData.put(AbstractJobWrapper.DATAMAP_PLUGIN_JOB_DATA, new HashMap<String, Serializable>()); if (schedule.getClassName() != null) { jobData.put(AbstractJobWrapper.DATAMAP_JOB_CLASS, schedule.getClassName()); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ScheduledJobInvocationContext.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ScheduledJobInvocationContext.java index 81cd7c5..1cf48a5 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ScheduledJobInvocationContext.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ScheduledJobInvocationContext.java @@ -20,7 +20,9 @@ package org.rhq.enterprise.server.plugin.pc;
import java.io.Serializable; +import java.util.Collections; import java.util.HashMap; +import java.util.Iterator; import java.util.Map;
import org.rhq.enterprise.server.xmlschema.ScheduledJobDefinition; @@ -36,10 +38,10 @@ public class ScheduledJobInvocationContext { private final ScheduledJobDefinition jobDefinition; private final ServerPluginContext serverPluginContext; private final ServerPluginComponent serverPluginComponent; - private Map<String, Serializable> properties; + private Map<String, String> properties;
public ScheduledJobInvocationContext(ScheduledJobDefinition jobDefinition, ServerPluginContext pluginContext, - ServerPluginComponent serverPluginComponent, Map<String, Serializable> properties) { + ServerPluginComponent serverPluginComponent, Map<String, String> properties) { this.jobDefinition = jobDefinition; this.serverPluginContext = pluginContext; this.serverPluginComponent = serverPluginComponent; @@ -75,7 +77,51 @@ public class ScheduledJobInvocationContext { return serverPluginComponent; }
- public Map<String, Serializable> getProperties() { - return properties; + /** + * Adds a property to the context that is persisted across invocations of the job. + * + * @param key The property name + * @param value The property value + */ + public void put(String key, String value) { + properties.put(key, value); + } + + /** + * Retrieves a property value from the context. + * + * @param key The property key + * @return The property value or <code>null<code> if the key is not found + */ + public String get(String key) { + return properties.get(key); + } + + /** + * Removes the property value associated with the specified key + * + * @param key The property key + * @return The value previously associated with the key or <code>null</code> if the key is present in the context + */ + public String remove(String key) { + return properties.remove(key); + } + + /** + * Checks to see whether or not the property key is stored in the context. + * @param key The property key + * @return <code>true</code> if the key is found, <code>false</code> otherwise. + */ + public boolean containsKey(String key) { + return properties.containsKey(key); + } + + /** + * Returns a <strong>read-only</strong> view of the properties stored in the context. + * + * @return A <strong>read-only</strong> view of the properties stored in the context. + */ + public Map<String, String> getProperties() { + return Collections.unmodifiableMap(properties); } }
commit e850432834bb07537ef4f3d61da7ee5b946566e1 Author: John Sanda jsanda@redhat.com Date: Wed Sep 22 11:21:50 2010 -0400
Adding support for syncing the server endpoint url at start up.
The behavior is turned off by default. It can be enabled by setting
rhq.sync.endpoint-address=true
in rhq-server.properties. When this is enabled, the server at start up will compare its endpoint address to the host name/address found on the host machine. If they differ, the server endpoint address will be updated to the value found on the host machine. This addresses the (first part of the problem of) address/host name changes that will occur in EC2 when a server machine is restarted.
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java index e69e1ff..90a534a 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java @@ -51,6 +51,7 @@ import org.rhq.enterprise.server.alert.engine.internal.AlertConditionCacheCoordi import org.rhq.enterprise.server.auth.SessionManager; import org.rhq.enterprise.server.auth.prefs.SubjectPreferencesCache; import org.rhq.enterprise.server.cloud.instance.ServerManagerLocal; +import org.rhq.enterprise.server.cloud.instance.SyncEndpointAddressException; import org.rhq.enterprise.server.core.AgentManagerLocal; import org.rhq.enterprise.server.core.CustomJaasDeploymentServiceMBean; import org.rhq.enterprise.server.core.comm.ServerCommunicationsServiceUtil; @@ -164,6 +165,13 @@ public class StartupServlet extends HttpServlet { // Establish the current server mode for the server. This will move the server to NORMAL // mode from DOWN if necessary. This can also affect comm layer behavior. serverManager.establishCurrentServerMode(); + if ("true".equals(System.getProperty("rhq.sync.endpoint-address", "false"))) { + try { + serverManager.syncEndpointAddress(); + } catch (SyncEndpointAddressException e) { + log("Failed to sync server endpoint address.", e); + } + } }
/** diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 0f02b39..e14135c 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -199,6 +199,8 @@
<property name="rhq.server.enable.ws" value="${rhq.server.enable.ws}" /> <property name="jbossws-native-dist.version" value="${jbossws-native-dist.version}" /> + + <property name="rhq.sync.endpoint-address" value="${rhq.sync.endpoint-address}"/> </ant> </tasks> </configuration> diff --git a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml index 477f62f..50ecea0 100644 --- a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml @@ -20,6 +20,8 @@ <property name="default.rhq.server.quartz.selectWithLockSQL" value="SELECT * FROM {0}LOCKS WHERE LOCK_NAME = ? FOR UPDATE" /> <property name="default.rhq.server.quartz.lockHandlerClass" value="org.quartz.impl.jdbcjobstore.StdRowLockSemaphore" />
+ <property name="rhq.sync.endpoint-address" value="false"/> + <target name="set-predeploy-prop"> <condition property="predeploy" value="true"> <or> @@ -604,6 +606,7 @@ rhq.server.plugin-scan-period-ms=${rhq.server.plugin-scan-period-ms} rhq.autoinstall.enabled=false rhq.autoinstall.database=auto rhq.autoinstall.public-endpoint-address= +rhq.sync.endpoint-address=${rhq.sync.endpoint-address}
</echo>
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java index cc2c565..be91c65 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java @@ -18,6 +18,8 @@ */ package org.rhq.enterprise.server.cloud.instance;
+import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.Collection; import java.util.List;
@@ -284,6 +286,19 @@ public class ServerManagerBean implements ServerManagerLocal { Server.OperationMode.MAINTENANCE.name()); }
+ public void syncEndpointAddress() throws SyncEndpointAddressException { + Server server = getServer(); + try { + String hostName = InetAddress.getLocalHost().getHostName(); + + if (!hostName.equals(server.getAddress())) { + server.setAddress(hostName); + } + } catch (UnknownHostException e) { + throw new SyncEndpointAddressException("Failed to sync endpoint address for " + server, e); + } + } + @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) public void beat() { Server server = getServer(); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerLocal.java index 135db97..04e244c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerLocal.java @@ -102,6 +102,15 @@ public interface ServerManagerLocal { void establishCurrentServerMode();
/** + * Synchronizes the endpoint address of this server with the host name or address found on the host machine. If the + * host name or address of this machine differs from {@link Server#getAddress()} then this server will be updated + * with the value of this machine's host name/address. + * + * @throws SyncEndpointAddressException + */ + void syncEndpointAddress() throws SyncEndpointAddressException; + + /** * Updates server mtime to register active heart beat */ void beat(); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/SyncEndpointAddressException.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/SyncEndpointAddressException.java new file mode 100644 index 0000000..a3924d7 --- /dev/null +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/SyncEndpointAddressException.java @@ -0,0 +1,20 @@ +package org.rhq.enterprise.server.cloud.instance; + +public class SyncEndpointAddressException extends Exception { + + public SyncEndpointAddressException() { + super(); + } + + public SyncEndpointAddressException(String message) { + super(message); + } + + public SyncEndpointAddressException(String message, Throwable cause) { + super(message, cause); + } + + public SyncEndpointAddressException(Throwable cause) { + super(cause); + } +} diff --git a/pom.xml b/pom.xml index 6c332d3..2b8888b 100644 --- a/pom.xml +++ b/pom.xml @@ -142,6 +142,18 @@
<rhq.server.enable.ws>false</rhq.server.enable.ws>
+ <!-- + When this property is set to true will compare its endpoint address + that is stored in the database against the actual host name/IP address + returned by the host system. If they differ, the address stored in the + datbase will be updated to the value found on the host machine. While + host name changes are/should be uncommon in a typical deployment, they + are more common in a cloud deployment such as EC2. And in a cloud + deployment like EC2, we want to turn this behavior on to ensure that + the server endpoint accurately reflects the current machine address. + --> + <rhq.sync.endpoint-address>false</rhq.sync.endpoint-address> + <!-- NOTE: The below line is a workaround for a Maven bug, where it does not expand settings.* properties used in the distributionManagement section of the POM. --> <localRepository>${user.home}/.m2/repository</localRepository>
commit c83a6cf9bd4043fd737be5b2d14ff4ec27507839 Author: John Sanda jsanda@redhat.com Date: Tue Sep 21 21:46:32 2010 -0400
Adding ability for plugin jobs to persist data across invocations of jobs
Server plugin scheduled jobs previously had no mechanism provided by the plugin framework for persisting data across invocations of the job. Quartz however provides this capability when using a StatefulJob. Server plugin jobs run as StatefulJob objects when they do not run concurrently. The only change needed then was to expose a hook to the JobDataMap. A map has been added to ScheduledJobInvocationContext which comes from the JobDataMap. Anything added to this map by the server plugin job will be persisted from invocation of the job to the next.
Initial commit for cloud plugin which at this point is just testing that persisting job data works as expected.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractJobWrapper.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractJobWrapper.java index 19c8eb8..974cc4d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractJobWrapper.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractJobWrapper.java @@ -19,13 +19,17 @@
package org.rhq.enterprise.server.plugin.pc;
+import java.io.Serializable; import java.lang.reflect.Method; +import java.util.Date; +import java.util.Map; import java.util.Properties;
import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.quartz.Job; import org.quartz.JobDataMap; +import org.quartz.JobDetail; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException;
@@ -109,6 +113,12 @@ abstract class AbstractJobWrapper implements Job { public static final String DATAMAP_IS_CLUSTERED = DATAMAP_LEADER + "isClustered";
/** + * Key to the data map to a map where the plugin job can store data that it wants + * to persist across invocations of the job. + */ + public static final String DATAMAP_PLUGIN_JOB_DATA = DATAMAP_LEADER + "pluginJobData"; + + /** * This is the method that quartz calls when the schedule has triggered. This method will * delegate to the plugin component that is responsible to do work for the plugin. * @@ -229,7 +239,8 @@ abstract class AbstractJobWrapper implements Job { ScheduledJobDefinition jobDefinition = new ScheduledJobDefinition(jobId, true, jobClass, jobMethodName, scheduleType, callbackData); ServerPluginContext pluginContext = pluginManager.getServerPluginContext(pluginEnv); - params[0] = new ScheduledJobInvocationContext(jobDefinition, pluginContext, pluginComponent); + params[0] = new ScheduledJobInvocationContext(jobDefinition, pluginContext, pluginComponent, + (Map<String, Serializable>)dataMap.get(DATAMAP_PLUGIN_JOB_DATA)); } catch (NoSuchMethodException e) { try { // see if there is a no-arg method of the given name diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractTypeServerPluginContainer.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractTypeServerPluginContainer.java index b8e760c..bfaae58 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractTypeServerPluginContainer.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractTypeServerPluginContainer.java @@ -19,6 +19,7 @@
package org.rhq.enterprise.server.plugin.pc;
+import java.io.Serializable; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -457,6 +458,7 @@ public abstract class AbstractTypeServerPluginContainer { jobData.putAsString(AbstractJobWrapper.DATAMAP_IS_CONCURRENT, schedule.getScheduleType().isConcurrent()); jobData.putAsString(AbstractJobWrapper.DATAMAP_IS_CLUSTERED, schedule.getScheduleType().isClustered()); jobData.put(AbstractJobWrapper.DATAMAP_JOB_METHOD_NAME, schedule.getMethodName()); + jobData.put(AbstractJobWrapper.DATAMAP_PLUGIN_JOB_DATA, new HashMap<String, Serializable>()); if (schedule.getClassName() != null) { jobData.put(AbstractJobWrapper.DATAMAP_JOB_CLASS, schedule.getClassName()); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ScheduledJobInvocationContext.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ScheduledJobInvocationContext.java index cdb0ebf..81cd7c5 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ScheduledJobInvocationContext.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ScheduledJobInvocationContext.java @@ -19,6 +19,10 @@
package org.rhq.enterprise.server.plugin.pc;
+import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + import org.rhq.enterprise.server.xmlschema.ScheduledJobDefinition;
/** @@ -32,12 +36,14 @@ public class ScheduledJobInvocationContext { private final ScheduledJobDefinition jobDefinition; private final ServerPluginContext serverPluginContext; private final ServerPluginComponent serverPluginComponent; + private Map<String, Serializable> properties;
public ScheduledJobInvocationContext(ScheduledJobDefinition jobDefinition, ServerPluginContext pluginContext, - ServerPluginComponent serverPluginComponent) { + ServerPluginComponent serverPluginComponent, Map<String, Serializable> properties) { this.jobDefinition = jobDefinition; this.serverPluginContext = pluginContext; this.serverPluginComponent = serverPluginComponent; + this.properties = properties; }
/** @@ -68,4 +74,8 @@ public class ScheduledJobInvocationContext { public ServerPluginComponent getServerPluginComponent() { return serverPluginComponent; } + + public Map<String, Serializable> getProperties() { + return properties; + } } diff --git a/modules/enterprise/server/plugins/cloud/pom.xml b/modules/enterprise/server/plugins/cloud/pom.xml new file mode 100644 index 0000000..8d10fcd --- /dev/null +++ b/modules/enterprise/server/plugins/cloud/pom.xml @@ -0,0 +1,146 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <parent> + <groupId>org.rhq</groupId> + <artifactId>rhq-enterprise-server-plugins-parent</artifactId> + <version>3.0.1-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.rhq</groupId> + <artifactId>rhq-serverplugin-cloud</artifactId> + + <name>RHQ Enterprise Server Cloud Plugin</name> + + <scm> + <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/enterprise/server/plugins/cloud/</connection> + <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/enterprise/server/plugins/cloud/</developerConnection> + </scm> + + <properties> + <scm.module.path>modules/enterprise/server/plugins/cloud/</scm.module.path> + <cobber4j.version>0.1</cobber4j.version> + </properties> + + <dependencies> + </dependencies> + + <build> + <plugins> + + <!-- + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.0</version> + <executions> + <execution> + <id>copy-libs</id> + <phase>process-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + </artifactItems> + <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + --> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> + <!-- + <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine> + --> + </configuration> + </plugin> + + </plugins> + </build> + + <profiles> + + <profile> + <id>dev</id> + + <properties> + <rhq.rootDir>../../../../..</rhq.rootDir> + <rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir> + <rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/rhq-serverplugins</rhq.deploymentDir> + </properties> + + <build> + <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.1</version> + <executions> + + <execution> + <id>deploy</id> + <phase>compile</phase> + <configuration> + <tasks> + <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> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <execution> + <id>undeploy</id> + <phase>clean</phase> + <configuration> + <tasks> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <echo>*** Deleting ${deployment.file}...</echo> + <delete file="${deployment.file}" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <execution> + <id>deploy-jar-meta-inf</id> + <phase>package</phase> + <configuration> + <tasks> + <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}"> + <patternset> + <include name="META-INF/**" /> + </patternset> + </unjar> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> + </jar> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + </executions> + </plugin> + + </plugins> + </build> + </profile> + + </profiles> +</project> diff --git a/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java b/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java new file mode 100644 index 0000000..e2aac5a --- /dev/null +++ b/modules/enterprise/server/plugins/cloud/src/main/java/org/rhq/enterprise/server/plugins/cloud/CloudServerPluginComponent.java @@ -0,0 +1,36 @@ +package org.rhq.enterprise.server.plugins.cloud; + +import java.io.Serializable; +import java.util.Map; + +import org.rhq.enterprise.server.plugin.pc.ScheduledJobInvocationContext; +import org.rhq.enterprise.server.plugin.pc.ServerPluginComponent; +import org.rhq.enterprise.server.plugin.pc.ServerPluginContext; + +public class CloudServerPluginComponent implements ServerPluginComponent { + + public void initialize(ServerPluginContext context) throws Exception { + } + + public void start() { + } + + public void stop() { + } + + public void shutdown() { + } + + public void syncServerEndpoints(ScheduledJobInvocationContext context) { + Map<String, Serializable> jobProperties = context.getProperties(); + + if (!jobProperties.containsKey("counter")) { + jobProperties.put("counter", 1); + return; + } + + Integer counter = (Integer)jobProperties.get("counter"); + System.out.println("CURRENT COUNT: " + counter); + jobProperties.put("counter", counter + 1); + } +} diff --git a/modules/enterprise/server/plugins/cloud/src/main/resources/META-INF/rhq-serverplugin.xml b/modules/enterprise/server/plugins/cloud/src/main/resources/META-INF/rhq-serverplugin.xml new file mode 100644 index 0000000..fd3b2f9 --- /dev/null +++ b/modules/enterprise/server/plugins/cloud/src/main/resources/META-INF/rhq-serverplugin.xml @@ -0,0 +1,42 @@ +<generic-plugin name="CloudServerPlugin" + displayName="Cloud" + description="" + package="org.rhq.enterprise.server.plugins.cloud" + disabledOnDiscovery="false" + xmlns="urn:xmlns:rhq-serverplugin.generic" + xmlns:serverplugin="urn:xmlns:rhq-serverplugin" + xmlns:c="urn:xmlns:rhq-configuration"> + <serverplugin:plugin-component class="CloudServerPluginComponent"> + </serverplugin:plugin-component> + + serverplugin:scheduled-jobs + <c:map-property name="syncServerEndpoints"> + <c:simple-property name="scheduleType" + type="string" + required="true" + default="cron" + summary="true" + description="Indicates the type of trigger this synchronize job will use"> + <c:property-options> + <c:option value="periodic" default="true"/> + <c:option value="cron"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="scheduleTrigger" default="300000"/> + <c:simple-property name="concurrent" + type="boolean" + required="true" + default="false" + summary="false" + readOnly="true" + description="This must always be false - only want one sync job running at a time"/> + <c:simple-property name="clustered" + type="boolean" + required="true" + default="false" + summary="false" + readOnly="true" + description="This must always be false"/> + </c:map-property> + </serverplugin:scheduled-jobs> +</generic-plugin> \ No newline at end of file
commit 6372cc4d683d74f06c481e78ebc6b547a7ba2990 Author: John Sanda jsanda@redhat.com Date: Tue Sep 14 16:09:47 2010 -0400
Adding logic to check for and skip initialization if it has already run
The initialization function only needs to run the first time an agent runs so that the server endpoint url can be specified. That url will be supplied in the AMI's user-defined data. Also adding logic to force initialization to run when specifying the <init> cmd line arg.
diff --git a/modules/enterprise/agent/src/etc/rhq-agent-wrapper-ec2 b/modules/enterprise/agent/src/etc/rhq-agent-wrapper-ec2 index 990be6e..3808ba0 100755 --- a/modules/enterprise/agent/src/etc/rhq-agent-wrapper-ec2 +++ b/modules/enterprise/agent/src/etc/rhq-agent-wrapper-ec2 @@ -1,5 +1,29 @@ #!/bin/bash
+# ============================================================================= +# RHQ AGENT LINUX/EC2 Boot Script +# +# This script is a wrapper script for rhq-agent-wrapper.sh which is used to +# start/stop the agent on LINUX/UNIX platforms. This script provides some +# additional functionality for automatically configuring the agent in an EC2 +# environment. +# +# When the agent is started with this script, it will check to see if server +# endpoint URL has been configured. If it finds that the agent has not already +# been configured the script fetches paramerters specified as part of the AMIs +# user-defined data, parses the parameters, looking for the jon.server.url +# parameter. The rhq.agent.server.bind-address setting is then configured with +# the parameter's value. If the jon.server.url parameter is not found, an error +# message is logged and the agent will not be started. +# +# To force initialization or to re-initialize the agent run, +# +# $ rhq-agent-wrapper-ec2 init +# ============================================================================= + +RHQ_AGENT_HOME=/usr/share/rhq-agent-<VERSION> +SCRIPT_NAME=rhq-wrapper-agent-ec2 + function load_user_data { user_data_url="http://169.254.169.254/1.0/user-data/" @@ -33,7 +57,14 @@ function parse_jon_server_url
function init { - echo "init.." + force_init=$1 + default_prefs=~/.java/.userPrefs/rhq-agent/default/prefs.xml + + if [ -s $default_prefs ] && [ "force" != $force_init ]; then + echo "Default configuration found at $default_prefs. Skipping " \ + "configuration. Run $SCRIPT_NAME <init> to force configuration " \ + "of server endpoint URL." + fi
load_user_data parse_jon_server_url @@ -51,9 +82,12 @@ function init return 0 }
+ +cd $RHQ_AGENT_HOME/bin + case "$1" in 'init') - init + init "force" ;; 'start') if init @@ -78,6 +112,9 @@ case "$1" in 'quiet-restart') ./rhq-agent-wrapper.sh quiet-restart ;; +'echo') + echo "script: $0" + ;; *) echo "Usage: $0 { init | start | stop | kill | restart | status }" exit 1
commit a528859af5227b9e97c95bf51cc49d2e23b61d6d Author: John Sanda jsanda@redhat.com Date: Tue Sep 14 15:03:27 2010 -0400
Initial commit for rhq-agent-wrapper-ec2 script
This is a wrapper script for rhq-agent-wrapper.sh that additionally configures the server endpoint url and will also set up the agent to run as a service.
diff --git a/modules/enterprise/agent/src/etc/rhq-agent-wrapper-ec2 b/modules/enterprise/agent/src/etc/rhq-agent-wrapper-ec2 new file mode 100755 index 0000000..990be6e --- /dev/null +++ b/modules/enterprise/agent/src/etc/rhq-agent-wrapper-ec2 @@ -0,0 +1,85 @@ +#!/bin/bash + +function load_user_data +{ + user_data_url="http://169.254.169.254/1.0/user-data/" + user_data_file="/tmp/user_data" + + #curl $user_data_url > $user_data_file + + user_data=`cat $user_data_file` +} + +function parse_jon_server_url +{ + ORIG_IFS=$IFS + IFS=$',' + + read -rda params <<< $user_data + + IFS=$ORIG_IFS + + for param in $params + do + idx=`expr index $param =` + key=${param:0:idx - 1} + + if [ $key = jon.server.url ]; then + jon_server_url=${param:idx} + return 0 + fi + done +} + +function init +{ + echo "init.." + + load_user_data + parse_jon_server_url + + if [ -z $jon_server_url ]; then + echo "Warning: Failed find jon.server.url parameter. You need to " \ + "manually set the rhq.agent.server.bind-address property in " \ + "<RHQ_AGENT>/conf/agent-configuration.xml. Cannot start agent." + return 1 + fi + + export RHQ_AGENT_CMDLINE_OPTS="--daemon $RHQ_AGENT_CMDLINE_OPTS" + export RHQ_AGENT_CMDLINE_OPTS="-Drhq.agent.server.bind-address=$jon_server_url $RHQ_AGENT_CMDLINE_OPTS" + + return 0 +} + +case "$1" in +'init') + init + ;; +'start') + if init + then + ./rhq-agent-wrapper.sh start + else + echo "Failed: Cannot start the agent do to previous initialization errors" + fi + ;; +'stop') + ./rhq-agent-wrapper.sh stop + ;; +'kill') + ./rhq-agent-wrapper.sh kill + ;; +'status') + ./rhq-agent-wrapper.sh status + ;; +'restart') + ./rhq-agent-wrapper.sh restart + ;; +'quiet-restart') + ./rhq-agent-wrapper.sh quiet-restart + ;; +*) + echo "Usage: $0 { init | start | stop | kill | restart | status }" + exit 1 + ;; +esac
commit 33e7a898859c456a723c8fd08f11dbdf0b273c13 Author: John Sanda jsanda@redhat.com Date: Mon Sep 13 11:07:21 2010 -0400
Adding new operation to rhq-agent plugin to update the server endpoint url
Invoking the switchToServer operation will result in the operation switching over to the specified server. In an EC2 deployment, the server can invoke this operation whenever its IP address has changed. Then the agent will have a valid server endpoint url from which it can download its failover list.
diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentManagement.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentManagement.java index bde4400..a1cd70e 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentManagement.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentManagement.java @@ -87,6 +87,10 @@ public class AgentManagement implements AgentManagementMBean, MBeanRegistration m_agent = agent; }
+ public void switchToServer(String server) { + m_agent.switchToServer(server); + } + public void restart() { // restarting the agent is a suicidal act - this MBean instance will // be unregistered after we shutdown. Therefore, we must do this in a diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentManagementMBean.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentManagementMBean.java index 62108a1..1be62dc 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentManagementMBean.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentManagementMBean.java @@ -82,6 +82,8 @@ public interface AgentManagementMBean { */ String PLUGIN_INFO_MD5 = "md5";
+ void switchToServer(String server); + /** * This will perform an agent <i>hot-restart</i>. The agent will be {@link #shutdown()} and then immediately started * again. This is usually called after a client has diff --git a/modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentServerComponent.java b/modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentServerComponent.java index 2c83140..d352ae9 100644 --- a/modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentServerComponent.java +++ b/modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentServerComponent.java @@ -194,6 +194,9 @@ public class AgentServerComponent extends JMXServerComponent implements JMXCompo throw eie; } } + } else if (name.equals("switchToServer")) { + String server = params.getSimpleValue("server", null); + getAgentBean().getOperation(name).invoke(server); } else { // this should really never happen throw new IllegalArgumentException("Operation [" + name + "] does not support params"); diff --git a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml index dbfdfe2..aeff784 100644 --- a/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml @@ -6,868 +6,1138 @@ description="Management and monitoring of the RHQ Agent" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:xmlns:rhq-plugin" - xmlns:c="urn:xmlns:rhq-configuration"> - - <depends plugin="JMX" /> - - <server name="RHQ Agent" - discovery="AgentDiscoveryComponent" - class="AgentServerComponent" - description="Management Agent" - singleton="true"> - - <plugin-configuration> - <c:group name="event" displayName="Log Tracking"> - <c:list-property name="logEventSources" description="The list of log files that can be tracked"> - <c:map-property name="logEventSource"> - <c:simple-property name="logFilePath" type="file" summary="true" - description="The absolute path to the source log file."/> - <c:simple-property name="enabled" type="boolean" summary="true" - description="A flag indicating whether or not this log source is currently + xmlns:c="urn:xmlns:rhq-configuration" xsi:schemaLocation="urn:xmlns:rhq-plugin "> + + <depends plugin="JMX"/> + + <server name="RHQ Agent" + discovery="AgentDiscoveryComponent" + class="AgentServerComponent" + description="Management Agent" + singleton="true"> + + <plugin-configuration> + <c:group name="event" displayName="Log Tracking"> + <c:list-property name="logEventSources" description="The list of log files that can be tracked"> + <c:map-property name="logEventSource"> + <c:simple-property name="logFilePath" type="file" summary="true" + description="The absolute path to the source log file."/> + <c:simple-property name="enabled" type="boolean" summary="true" + description="A flag indicating whether or not this log source is currently enabled (i.e. whether the associated log file should be tailed for new entries)."/> - <c:simple-property name="dateFormat" required="false" - description="The date format to use when parsing the dates in log entries. The + <c:simple-property name="dateFormat" required="false" + description="The date format to use when parsing the dates in log entries. The format must be in the syntax defined by the Java SimpleDateFormat class. If not specified, the three date formats that are predefined by Log4J (ISO8601, DATE, and ABSOLUTE) will be tried."/> - <c:simple-property name="includesPattern" required="false" - description="A regular expression against which a log entry's detail is matched + <c:simple-property name="includesPattern" required="false" + description="A regular expression against which a log entry's detail is matched to determine if an event should be fired for that entry. If not specified, no filtering of log entries will be done based on their detail."/> - <c:simple-property name="minimumSeverity" required="false" default="error" - description="The minimum severity of log messages that should be collected for this + <c:simple-property name="minimumSeverity" required="false" default="error" + description="The minimum severity of log messages that should be collected for this source. If not specified, there is no minimum severity (i.e. all log messages will be collected)."> - <c:property-options> - <c:option name="debug" value="DEBUG"/> - <c:option name="info" value="INFO"/> - <c:option name="warn" value="WARN"/> - <c:option name="error" value="ERROR" default="true"/> - <c:option name="fatal" value="FATAL"/> - </c:property-options> - </c:simple-property> - </c:map-property> - </c:list-property> - </c:group> - <c:group name="snapshotReport" displayName="Snapshot Report" hiddenByDefault="true"> - <c:simple-property name="snapshotConfigEnabled" type="boolean" default="true" description="If true, take a snapshot of the configuration"/> - <c:simple-property name="snapshotLogEnabled" type="boolean" default="true" description="If true, take a snapshot of the log files"/> - <c:simple-property name="snapshotDataEnabled" type="boolean" default="true" description="If true, take a snapshot of the data files"/> - </c:group> - <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> - <c:simple-property name="childJmxServerName" displayName="JVM Name" default="JVM" - readOnly="true" required="false" - description="The name of the child JVM resource."/> - </c:group> - </plugin-configuration> - - <operation name="restart" - displayName="Restart Agent" - description="Shuts down the agent's comm layer and plugin container and starts them up again. This does *not* restart the agent's VM - use the launcher services to do that."> - </operation> - - <operation name="shutdown" - displayName="Shutdown Agent" - description="Shuts down the agent's comm layer and plugin container. If the agent is in daemon mode, the entire agent VM will exit"> - </operation> - - <operation name="restartPluginContainer" - displayName="Restart Plugin Container" - description="Recycles the plugin container."> - </operation> - - <operation name="downloadLatestFailoverList" - displayName="Download Latest Failover List" - description="Tells the agent to download an updated server failover list. This will also check to make sure the agent is pointing to its primary server as found in the new failover list and, if not, will attempt to switch to the primary server now."> - </operation> - - <operation name="updatePlugins" - displayName="Update All Plugins" - description="Tells the agent to update its plugins. This pulls new/updated plugins down from the RHQ Server"> - </operation> - - <operation name="retrieveAllPluginInfo" - displayName="Get Info On All Plugins" - description="Retrieves information on all deployed plugins."> - <results> - <c:list-property name="plugins"> - <c:map-property name="plugin"> - <c:simple-property name="name" description="Name of the plugin" /> - <c:simple-property name="path" description="Full path to the plugin as seen by the agent" /> - <c:simple-property name="timestamp" description="Last time the plugin was updated" /> - <c:simple-property name="size" description="Size of the plugin file" /> - <c:simple-property name="md5" description="MD5 of the plugin file" /> - </c:map-property> - </c:list-property> - </results> - </operation> - - <operation name="retrievePluginInfo" - displayName="Get Plugin Info" - description="Retrieves information on a specific plugin."> - <parameters> - <c:simple-property name="pluginName" description="The name of the plugin whose info is to be retrieved"/> - </parameters> - <results> - <c:simple-property name="name" description="Name of the plugin" /> - <c:simple-property name="path" description="Full path to the plugin as seen by the agent" /> - <c:simple-property name="timestamp" description="Last time the plugin was updated" /> - <c:simple-property name="size" description="Size of the plugin file" /> - <c:simple-property name="md5" description="MD5 of the plugin file" /> - </results> - </operation> - - <operation name="executeAvailabilityScan" - displayName="Execute Availability Scan" - description="Runs an availability scan and returns a report of its findings. An availability report tells you what resources are up or down. This operation will send the report to the server for processing, as well as return the results."> - <parameters> - <c:simple-property name="changesOnly" type="boolean" default="true" description="If true, this reports only those availabililities that have changed"/> - </parameters> - <results> - <c:simple-property name="agentName" type="string" description="The name of the agent that produced the report" /> - <c:simple-property name="isChangesOnly" type="boolean" description="If true, only resources that have changed availability will be in the report" /> - <c:list-property name="resourceAvailabilities"> - <c:map-property name="resourceAvailability"> - <c:simple-property name="resourceId" type="integer" description="The unique ID of the resource whose availability is being reported" /> - <c:simple-property name="resourceName" type="string" description="The name of the resource whose availability is being reported" /> - <c:simple-property name="isAvailable" type="boolean" description="If true, the resource is UP, otherwise it is considered DOWN"/> - </c:map-property> - </c:list-property> - </results> - </operation> - - <operation name="retrieveCurrentDateTime" - displayName="Get Current Date/Time" - description="Obtains the agent's current date/time."> - <parameters> - <c:simple-property name="timeZone" type="string" default="" required="false" description="A timezone identifier that will be used to format the date/time string. This can be either an abbreviation such as 'PST', a full name such as 'America/Los_Angeles', or a custom ID such as 'GMT-8:00'. If this is not specified, the agent's local time zone will be used. If the given time zone identifier is unknown, 'GMT' will be the default."/> - </parameters> - <results> - <c:simple-property name="dateTime" type="string" description="The agent's current date/time, formatted in the given time zone" /> - </results> - </operation> - - <operation name="setDebugMode" - displayName="Set Debug Mode" - description="Turns on or off debug mode, which causes the agent to emit verbose log messages."> - <parameters> - <c:simple-property name="enabled" type="boolean" required="true" description="Indicates if debug mode should be enabled or disabled"/> - <c:simple-property name="traceMessaging" type="boolean" default="false" required="true" description="Indicates if incoming and outgoing messages should be traced. This tracks the messaging between the agent and its server. This will be ignored and default to false if 'enabled' is false."/> - </parameters> - </operation> - - <operation name="executePromptCommand" - displayName="Execute Prompt Command" - description="Executes an agent prompt command, just as if you invoked the command at the agent prompt in a console. Note that you must ensure the prompt command does not require additional input, since the agent will look for that input from another source (e.g. console keyboard)."> - <parameters> - <c:simple-property name="command" type="string" default="" required="true" description="The prompt command to execute"/> - </parameters> - <results> - <c:simple-property name="output" type="longString" required="true" description="The results of the prompt command. This will typically be the output that you would have seen in the console, had this prompt command been executed directly on the agent console." /> - <c:simple-property name="error" type="longString" required="false" description="If the prompt command execution had an error, this will be information on the error." /> - </results> - </operation> - - <metric property="Trait.SigarVersion" - displayName="SIGAR Version" - dataType="trait" - displayType="summary" - description="The version of the SIGAR (System Information Gatherer and Reporter) native library used by the Agent" /> - - <metric property="Trait.ReasonForLastRestart" - displayName="Reason For Last Restart" - dataType="trait" - displayType="summary" - description="Indicates what caused the last agent restart" /> - - <metric property="Trait.AgentHomeDirectory" - displayName="Agent Home Directory" - dataType="trait" - displayType="detail" - defaultInterval="86400000" - defaultOn="true" - description="The directory where the agent is installed" /> - - <metric property="NumberAgentRestarts" - displayName="Number of Agent Restarts" - description="Number of times the agent was restarted during the lifetime of its Java Virtual Machine" - defaultOn="true" - displayType="detail" - units="none" - category="availability" - measurementType="dynamic" /> - - <metric property="AgentServerClockDifference" - displayName="Agent-Server Clock Difference" - description="Number of milliseconds the agent's clock differs from its server's clock" - defaultInterval="1800000" - defaultOn="true" - displayType="summary" - units="milliseconds" - category="performance" - measurementType="dynamic" /> - - <metric property="Uptime" - displayName="Up Time" - description="Total number of seconds since the agent was started" - defaultOn="false" - units="seconds" - category="availability" - measurementType="dynamic" /> <!-- changed to dynamic to prevent generation of per Minute metric. --> - - <metric property="NumberTotalCommandsReceived" - displayName="Total Number Of Commands Received" - description="Total number of messages this agent has received from the RHQ Server" - defaultOn="true" - displayType="summary" - category="throughput" - measurementType="trendsup" /> - - <metric property="NumberSuccessfulCommandsReceived" - displayName="Number of Commands Received Successfully" - description="Number of messages this agent has received from the RHQ Server and succesfully processed" - defaultOn="true" - category="throughput" - measurementType="trendsup" /> - - <metric property="NumberFailedCommandsReceived" - displayName="Number of Commands Received but Failed " - description="Number of messages this agent has received from the RHQ Server but failed to process" - defaultOn="true" - category="throughput" - measurementType="trendsup" /> - - <metric property="AverageExecutionTimeReceived" - displayName="Avg Execution Time Commands Received Successfully" - description="Average time it took to process incoming commands that are ultimately successful" - defaultOn="true" - displayType="summary" - category="performance" - measurementType="dynamic" - units="milliseconds" /> - - <metric property="AverageExecutionTimeSent" - displayName="Avg Execution Time Commands Sent Successfully" - description="Average time it took to send commands that are ultimately successful" - defaultOn="true" - displayType="summary" - category="performance" - measurementType="dynamic" - units="milliseconds" /> - - <metric property="NumberTotalCommandsSent" - displayName="Total Number of Commands Sent" - description="Total number of messages this agent has sent to the RHQ Server" - defaultOn="true" - displayType="summary" - category="throughput" - measurementType="trendsup" /> - - <metric property="NumberSuccessfulCommandsSent" - displayName="Number of Commands Successfully Sent" - description="Number of messages this agent has sent to the RHQ Server successfully" - defaultOn="true" - category="throughput" - measurementType="trendsup" /> - - <metric property="NumberFailedCommandsSent" - displayName="Number of Commands Sent but Failed" - description="Number of messages this agent has either tried, but failed, to send or were not processed succesfully by the RHQ Server" - defaultOn="true" - category="throughput" - measurementType="trendsup" /> - - <metric property="NumberCommandsActiveSent" - displayName="Number Of Active Commands Being Sent" - description="The number of messages this agent is currently sending" - defaultOn="true" - displayType="summary" - category="throughput" - measurementType="dynamic" /> - - <metric property="NumberCommandsInQueue" - displayName="Number of Commands In Queue" - description="Number of messages currently queued waiting to be sent to the RHQ Server" - defaultOn="true" - displayType="summary" - category="throughput" - measurementType="dynamic" /> - - <metric property="NumberCommandsSpooled" - displayName="Number of Commands Spooled To Disk" - description="Number of messages spooled to disk waiting to be sent to the RHQ Server" - defaultOn="true" - category="throughput" - measurementType="dynamic" /> - - <metric property="JVMFreeMemory" - displayName="JVM Free Memory" - description="The amount of free memory the agent JVM has in its heap" - defaultOn="true" - units="bytes" - category="performance" - measurementType="dynamic" /> - - <metric property="JVMTotalMemory" - displayName="JVM Total Memory" - description="The amount of total memory the agent JVM has in its heap" - defaultOn="true" - units="bytes" - category="performance" - measurementType="dynamic" /> - - <metric property="JVMActiveThreads" - displayName="JVM Active Threads" - description="The number of active threads currently running in the agent JVM" - defaultOn="true" - category="performance" - measurementType="dynamic" /> - - <event name="logEntry" description="a log message"/> - - <resource-configuration> - <c:group name="general" displayName="General" hiddenByDefault="false"> - <c:description>General configuration properties</c:description> - <c:simple-property name="rhq.agent.name" type="string" readOnly="true" required="true" displayName="Agent Name" description="The name that this agent is known as. This is read-only - once assigned, it cannot change."> - <c:constraint> - <c:regex-constraint expression=".{1,64}"/> - </c:constraint> - </c:simple-property> - </c:group> - <c:group name="plugincontainer" displayName="Plugin Container" hiddenByDefault="false"> - <c:description>Plugin Container configuration properties</c:description> - <c:simple-property name="rhq.agent.plugins.directory" type="string" activationPolicy="restart" required="true" default="plugins" displayName="Plugins Directory" description="Location on the file system where the plugin jar files are stored"/> - <c:simple-property name="rhq.agent.plugins.server-discovery.initial-delay-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="10" displayName="Server Discovery Initial Delay" description="Startup delay before the first server discovery is run" /> - <c:simple-property name="rhq.agent.plugins.server-discovery.period-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="900" displayName="Server Discovery Period" description="Time between server discoveries" /> - <c:simple-property name="rhq.agent.plugins.service-discovery.initial-delay-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="20" displayName="Service Discovery Initial Delay" description="Startup delay before the first service discovery is run" /> - <c:simple-property name="rhq.agent.plugins.service-discovery.period-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="86400" displayName="Service Discovery Period" description="Time between service discoveries" /> - <c:simple-property name="rhq.agent.plugins.availability-scan.initial-delay-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="30" displayName="Availability Scan Initial Delay" description="Startup delay before the first availability scan is run" /> - <c:simple-property name="rhq.agent.plugins.availability-scan.period-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="300" displayName="Availability Scan Period" description="Time between availability scans" /> - <c:simple-property name="rhq.agent.plugins.measurement-collection.initial-delay-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="30" displayName="Measurement Collection Initial Delay" description="Startup delay before the first measurement collection is run" /> - <c:simple-property name="rhq.agent.plugins.measurement-collection.threadpool-size" type="integer" activationPolicy="restart" required="false" default="5" displayName="Measurement Collection Threadpool Size" description="Number of concurrent measurement collections that can be run" /> - <c:simple-property name="rhq.agent.plugins.operation-invocation-timeout-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="600" displayName="Operation Invocation Timeout" description="Time before an operation invocation is aborted" /> - <c:simple-property name="rhq.agent.plugins.operation-invoker.threadpool-size" type="integer" activationPolicy="restart" required="false" default="5" displayName="Operation Invoker Threadpool Size" description="Number of concurrent operation invocations that can be run" /> - <c:simple-property name="rhq.agent.plugins.content-discovery.initial-delay-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="30" displayName="Content Discovery Initial Delay" description="Startup delay before the first content discovery is run" /> - <c:simple-property name="rhq.agent.plugins.content-discovery.period-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="10" displayName="Content Discovery Period" description="Time between content discoveries" /> - <c:simple-property name="rhq.agent.plugins.content-discovery.threadpool-size" type="integer" activationPolicy="restart" required="false" default="10" displayName="Content Discovery Threadpool Size" description="Number of concurrent content discoveries that can be run" /> - <c:simple-property name="rhq.agent.plugins.configuration-discovery.initial-delay-secs" type="integer" activationPolicy="restart" required="false" default="300" displayName="Configuration Change Detection Startup Delay" description="Time before configuration change detection starts in seconds" /> - <c:simple-property name="rhq.agent.plugins.configuration-discovery.period-secs" type="integer" activationPolicy="restart" required="false" default="3600" displayName="Configuration Change Detection Interval" description="Time period for checking for configuration changes in seconds" /> - <c:simple-property name="rhq.agent.plugins.event-sender.initial-delay-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="30" displayName="Event Sender Initial Delay" description="Defines the delay before the first event report gets sent to the server" /> - <c:simple-property name="rhq.agent.plugins.event-sender.period-secs" type="integer" units="seconds" activationPolicy="restart" required="false" default="30" displayName="Event Sender Period" description="Defines how often event reports get sent to the server" /> - <c:simple-property name="rhq.agent.plugins.event-report.max-per-source" type="integer" activationPolicy="restart" required="false" default="200" displayName="Event Report Max Per Source" description="Defines the maximum number of events for any given event source that can be placed in a single event report that is sent up to the server. If this number is larger than the max-total setting, then this setting is ignored" /> - <c:simple-property name="rhq.agent.plugins.event-report.max-total" type="integer" activationPolicy="restart" required="false" default="400" displayName="Event Report Max Total" description="Defines the total maximum number of events that can be placed in a single event report that is sent up to the server" /> - <c:simple-property name="rhq.agent.plugins.disabled" type="string" activationPolicy="restart" required="false" default="" displayName="Disabled Plugins" description="Defines the plugins that should be disabled and not loaded by the plugin container. This is a comma-separated list of plugin names." /> - </c:group> - <c:group name="comm-endpoints" displayName="Communication Endpoints" hiddenByDefault="false"> - <c:description>Communication settings that define the endpoints of this RHQ Agent and its RHQ Server</c:description> - <c:simple-property name="rhq.agent.server.transport" type="string" activationPolicy="restart" required="true" default="servlet" displayName="RHQ Server Transport Protocol" description="The transport protocol used to send commands to the RHQ Server. If you want secure communications, the RHQ Server must use an SSL-enabled transport"> - <c:property-options> - <c:option name="servlet" value="servlet" default="true" /> - <c:option name="sslservlet" value="sslservlet" /> - <c:option name="socket" value="socket" /> - <c:option name="sslsocket" value="sslsocket" /> - <c:option name="http" value="http" /> - <c:option name="https" value="https" /> - </c:property-options> - </c:simple-property> - <c:simple-property name="rhq.agent.server.bind-address" type="string" activationPolicy="restart" required="true" default="127.0.0.1" displayName="RHQ Server IP Address" description="The RHQ Server address that it is bound to" /> - <c:simple-property name="rhq.agent.server.bind-port" type="integer" activationPolicy="restart" required="true" default="7080" displayName="RHQ Server Port" description="The port that the RHQ Server is listening to"> - <c:constraint> - <c:integer-constraint minimum="1" maximum="65535"/> - </c:constraint> - </c:simple-property> - <c:simple-property name="rhq.agent.server.transport-params" type="string" activationPolicy="restart" required="false" default="/jboss-remoting-servlet-invoker/ServerInvokerServlet" displayName="RHQ Server Transport Parameters" description="Custom set of transport parameters used when sending commands to the RHQ Server. Please see the documentation for more information on transport params." /> - <c:simple-property name="rhq.communications.connector.transport" type="string" activationPolicy="restart" required="true" default="socket" displayName="Agent Transport Protocol" description="The transport protocol used to receive commands from the RHQ Server. e.g. socket, sslsocket. If you want secure communications, you must use an SSL-enabled transport"> - <c:property-options> - <c:option name="socket" value="socket" default="true" /> - <c:option name="sslsocket" value="sslsocket" /> - </c:property-options> - </c:simple-property> - <c:simple-property name="rhq.communications.connector.bind-address" type="string" activationPolicy="restart" required="false" default="" displayName="Agent IP Address" description="The address the agent binds to when listening for incoming commands from the RHQ Server" /> - <c:simple-property name="rhq.communications.connector.bind-port" type="integer" activationPolicy="restart" required="true" default="16163" displayName="Agent Port" description="The port the agent listens to for incoming commands from the RHQ Server"> - <c:constraint> - <c:integer-constraint minimum="1" maximum="65535"/> - </c:constraint> - </c:simple-property> - <c:simple-property name="rhq.communications.connector.transport-params" type="string" activationPolicy="restart" required="false" default="numAcceptThreads=3&maxPoolSize=303&clientMaxPoolSize=304&socketTimeout=60000&enableTcpNoDelay=true&backlog=200" displayName="Agent Transport Parameters" description="Custom set of transport parameters. Please see the documentation for more information on transport params." /> - </c:group> - <c:group name="comm-security" displayName="Communication Security" hiddenByDefault="true"> - <c:description>Settings that secure the communications between the RHQ Agent and RHQ Server</c:description> - <c:simple-property name="rhq.communications.connector.security.secure-socket-protocol" - type="string" activationPolicy="restart" required="false" default="TLS" displayName="Incoming: Secure Socket Protocol"> - <c:property-options allowCustomValue="true"> - <c:option name="TLS" value="TLS" default="true" /> - <c:option name="SSL_TLS" value="SSL_TLS" /> - <c:option name="SSL" value="SSL" /> - <c:option name="SSLv3" value="SSLv3" /> - </c:property-options> - </c:simple-property> - <c:simple-property name="rhq.communications.connector.security.keystore.file" - type="string" activationPolicy="restart" required="false" default="data/keystore.dat" displayName="Incoming: Keystore File" /> - <c:simple-property name="rhq.communications.connector.security.keystore.algorithm" - type="string" activationPolicy="restart" required="false" default="SunX509" displayName="Incoming: Keystore Algorithm" > - <c:property-options allowCustomValue="true"> - <c:option name="SunX509" value="SunX509" default="true" /> - <c:option name="IbmX509" value="IbmX509" /> - </c:property-options> - </c:simple-property> - <c:simple-property name="rhq.communications.connector.security.keystore.type" - type="string" activationPolicy="restart" required="false" default="JKS" displayName="Incoming: Keystore Type"> - <c:property-options allowCustomValue="true"> - <c:option name="JKS" value="JKS" default="true" /> - <c:option name="PKCS12" value="PKCS12" /> - </c:property-options> - </c:simple-property> - <c:simple-property name="rhq.communications.connector.security.keystore.password" - type="password" activationPolicy="restart" required="false" default="rhqpwd" displayName="Incoming: Keystore Password"/> - <c:simple-property name="rhq.communications.connector.security.keystore.key-password" - type="password" activationPolicy="restart" required="false" default="rhqpwd" displayName="Incoming: Keystore Key Password" /> - <c:simple-property name="rhq.communications.connector.security.keystore.alias" - type="string" activationPolicy="restart" required="false" default="rhq" displayName="Incoming: Keystore Alias " /> - <c:simple-property name="rhq.communications.connector.security.truststore.file" - type="string" activationPolicy="restart" required="false" default="data/truststore.dat" displayName="Incoming: Truststore File"/> - <c:simple-property name="rhq.communications.connector.security.truststore.algorithm" - type="string" activationPolicy="restart" required="false" default="SunX509" displayName="Incoming: Truststore Algorithm"> - <c:property-options allowCustomValue="true"> - <c:option name="SunX509" value="SunX509" default="true" /> - <c:option name="IbmX509" value="IbmX509" /> - </c:property-options> - </c:simple-property> - <c:simple-property name="rhq.communications.connector.security.truststore.type" - type="string" activationPolicy="restart" required="false" default="JKS" displayName="Incoming: Truststore Type"> - <c:property-options allowCustomValue="true"> - <c:option name="JKS" value="JKS" default="true" /> - <c:option name="PKCS12" value="PKCS12" /> - </c:property-options> - </c:simple-property> - <c:simple-property name="rhq.communications.connector.security.truststore.password" - type="password" activationPolicy="restart" required="false" default="" displayName="Incoming: Truststore Password"/> - <c:simple-property name="rhq.communications.connector.security.client-auth-mode" - type="string" activationPolicy="restart" required="false" default="none" displayName="Incoming: Client Authentication Mode" - description="Determines if the agent should authenticate a RHQ Server before accepting incoming commands from it"> - <c:property-options> - <c:option name="none" value="none" default="true" /> - <c:option name="want" value="want" /> - <c:option name="need" value="need" /> - </c:property-options> - </c:simple-property> - - <c:simple-property name="rhq.agent.client.security.secure-socket-protocol" - type="string" activationPolicy="restart" required="false" default="TLS" displayName="Outgoing: Secure Socket Protocol"> - <c:property-options allowCustomValue="true"> - <c:option name="TLS" value="TLS" default="true" /> - <c:option name="SSL_TLS" value="SSL_TLS" /> - <c:option name="SSL" value="SSL" /> - <c:option name="SSLv3" value="SSLv3" /> - </c:property-options> - </c:simple-property> - <c:simple-property name="rhq.agent.client.security.keystore.file" - type="string" activationPolicy="restart" required="false" default="data/keystore.dat" displayName="Outgoing: Keystore File" /> - <c:simple-property name="rhq.agent.client.security.keystore.algorithm" - type="string" activationPolicy="restart" required="false" default="SunX509" displayName="Outgoing: Keystore Algorithm"> - <c:property-options allowCustomValue="true"> - <c:option name="SunX509" value="SunX509" default="true" /> - <c:option name="IbmX509" value="IbmX509" /> - </c:property-options> - </c:simple-property> - <c:simple-property name="rhq.agent.client.security.keystore.type" - type="string" activationPolicy="restart" required="false" default="JKS" displayName="Outgoing: Keystore Type"> - <c:property-options allowCustomValue="true"> - <c:option name="JKS" value="JKS" default="true" /> - <c:option name="PKCS12" value="PKCS12" /> - </c:property-options> - </c:simple-property> - <c:simple-property name="rhq.agent.client.security.keystore.password" - type="password" activationPolicy="restart" required="false" default="rhqpwd" displayName="Outgoing: Keystore Password"/> - <c:simple-property name="rhq.agent.client.security.keystore.key-password" - type="password" activationPolicy="restart" required="false" default="rhqpwd" displayName="Outgoing: Keystore Key Password"/> - <c:simple-property name="rhq.agent.client.security.keystore.alias" - type="string" activationPolicy="restart" required="false" default="rhq" displayName="Outgoing: Keystore Alias"/> - <c:simple-property name="rhq.agent.client.security.truststore.file" - type="string" activationPolicy="restart" required="false" default="data/truststore.dat" displayName="Outgoing: Truststore File"/> - <c:simple-property name="rhq.agent.client.security.truststore.algorithm" - type="string" activationPolicy="restart" required="false" default="SunX509" displayName="Outgoing: Truststore Algorithm"> - <c:property-options allowCustomValue="true"> - <c:option name="SunX509" value="SunX509" default="true" /> - <c:option name="IbmX509" value="IbmX509" /> - </c:property-options> - </c:simple-property> - <c:simple-property name="rhq.agent.client.security.truststore.type" - type="string" activationPolicy="restart" required="false" default="JKS" displayName="Outgoing: Truststore Type"> - <c:property-options allowCustomValue="true"> - <c:option name="JKS" value="JKS" default="true" /> - <c:option name="PKCS12" value="PKCS12" /> - </c:property-options> - </c:simple-property> - <c:simple-property name="rhq.agent.client.security.truststore.password" - type="password" activationPolicy="restart" required="false" default="" displayName="Outgoing: Truststore Password"/> - <c:simple-property name="rhq.agent.client.security.server-auth-mode-enabled" - type="boolean" activationPolicy="restart" required="false" default="false" - displayName="Outgoing: Authenticate Server?" - description="If true, then the agent must authenticate the RHQ Server before it can send it messages" /> - </c:group> - <c:group name="auto-detection" displayName="Auto Detection" hiddenByDefault="true"> - <c:description>Configures auto-detection mechanisms that allow the RHQ Agent to find the RHQ Server and vice versa</c:description> - <c:simple-property name="rhq.agent.client.server-polling-interval-msecs" type="integer" activationPolicy="restart" required="false" units="milliseconds" default="60000" displayName="RHQ Server Polling Interval" description="If this value is larger than 0, it indicates the agent should periodically poll the RHQ Server to make sure it's still up or (if it was down) see when it comes back up. The value is the number of milliseconds to wait in between polls"> - <c:constraint> - <c:integer-constraint minimum="0" /> - </c:constraint> - </c:simple-property> - <c:simple-property name="rhq.agent.server-auto-detection" required="false" type="boolean" activationPolicy="restart" default="false" displayName="Auto-Detect RHQ Server?" description="If true, the agent will use multicast detection to auto-detect the RHQ Server. If this is enabled, make sure you enable and configure the multicast detector" /> - <c:simple-property name="rhq.communications.multicast-detector.enabled" required="false" type="boolean" activationPolicy="restart" default="false" displayName="Multicast Detector Enabled?" description="The multicast detector must be enabled if you want the RHQ Agent to auto-detect the RHQ Server and vice versa. Disable this if your network does not support multicast traffic." /> - <c:simple-property name="rhq.communications.multicast-detector.multicast-address" required="false" type="string" activationPolicy="restart" default="224.16.16.16" displayName="Multicast Detector Multicast Address" description="The address used by JBoss ON to broadcast detection messages. All RHQ Servers and RHQ Agents must be using the same address." /> - <c:simple-property name="rhq.communications.multicast-detector.bind-address" required="false" type="string" activationPolicy="restart" default="0.0.0.0" displayName="Multicast Detector Bind Address" description="The address bound by the network interface" /> - <c:simple-property name="rhq.communications.multicast-detector.port" required="false" type="integer" activationPolicy="restart" default="16162" displayName="Multicast Detector Port" description="The port that the detector is multicasting to"> - <c:constraint> - <c:integer-constraint minimum="1" maximum="65535" /> - </c:constraint> - </c:simple-property> - <c:simple-property name="rhq.communications.multicast-detector.heartbeat-time-delay" required="false" type="integer" activationPolicy="restart" units="milliseconds" default="1000" displayName="Multicast Detector Heartbeat" description="The number of milliseconds between heartbeat messages emitted by the multicast detector. This value must be less than the default time delay."> - <c:constraint> - <c:integer-constraint minimum="500" /> - </c:constraint> - </c:simple-property> - <c:simple-property name="rhq.communications.multicast-detector.default-time-delay" required="false" type="integer" activationPolicy="restart" units="milliseconds" default="5000" displayName="Multicast Detector Time Delay" description="Amount of milliseconds that must pass without hearing a RHQ Server's heartbeat before assuming its down. This value must be greater than the heartbeat time delay."> - <c:constraint> - <c:integer-constraint minimum="500" /> - </c:constraint> - </c:simple-property> - </c:group> - <c:group name="sender" displayName="Client Sender" hiddenByDefault="true"> - <c:description>Configures the client sender which is responsible for sending messages to the RHQ Server</c:description> - <c:simple-property name="rhq.agent.client.queue-size" required="false" type="integer" activationPolicy="restart" units="milliseconds" default="50000" displayName="Queue Size" description="Maximum number of commands that the agent can queue up for sending to the RHQ Server. Setting this to 0 makes the queue unbounded."> - <c:constraint> - <c:integer-constraint minimum="0" /> - </c:constraint> - </c:simple-property> - <c:simple-property name="rhq.agent.client.max-concurrent" required="false" type="integer" activationPolicy="restart" default="5" displayName="Maximum Concurrency" description="Maximum number of commands that the agent can send to the RHQ Server at the same time."> - <c:constraint> - <c:integer-constraint minimum="1" /> - </c:constraint> - </c:simple-property> - <c:simple-property name="rhq.agent.client.command-timeout-msecs" required="false" type="integer" activationPolicy="restart" units="milliseconds" default="600000" displayName="Timeout" description="The default time in milliseconds the agent will wait before aborting a command being sent"> - <c:constraint> - <c:integer-constraint minimum="0" /> - </c:constraint> - </c:simple-property> - <c:simple-property name="rhq.agent.client.retry-interval-msecs" required="false" type="integer" activationPolicy="restart" units="milliseconds" default="15000" displayName="Retry Interval" description="This is the minimum amount of time, in milliseconds, the agent will wait before trying to resend a guaranteed command that previously failed"> - <c:constraint> - <c:integer-constraint minimum="500" /> - </c:constraint> - </c:simple-property> - <c:simple-property name="rhq.agent.client.max-retries" required="false" type="integer" activationPolicy="restart" default="10" displayName="Max Retries" description="This is the maximum amount of times the agent will resend a guaranteed command that previously failed due to something other than a cannot-connect error"> - <c:constraint> - <c:integer-constraint minimum="0" /> - </c:constraint> - </c:simple-property> - <c:simple-property name="rhq.agent.client.send-throttling" required="false" type="string" activationPolicy="restart" default="100:1000" displayName="Send Throttling" description="Configures the send throttle. See the documentation for more information on send throttling"> - <c:constraint> - <c:regex-constraint expression="[0-9]+:[0-9]+" /> - </c:constraint> - </c:simple-property> - <c:simple-property name="rhq.agent.client.queue-throttling" required="false" type="string" activationPolicy="restart" default="200:2000" displayName="Queue Throttling" description="Configures the queue throttle. See the documentation for more information on queue throttling"> - <c:constraint> - <c:regex-constraint expression="[0-9]+:[0-9]+" /> - </c:constraint> - </c:simple-property> - </c:group> - <c:group name="startup" displayName="Startup" hiddenByDefault="true"> - <c:description>Configures what the agent does while it is starting up</c:description> - <c:simple-property name="rhq.agent.register-with-server-at-startup" required="false" type="boolean" activationPolicy="restart" default="false" displayName="Register with RHQ Server At Startup?" description="This will force the agent to register with the RHQ Server, even if it is already registered" /> - <c:simple-property name="rhq.agent.wait-for-server-at-startup-msecs" required="false" type="integer" activationPolicy="restart" default="5000" displayName="Time To Wait For RHQ Server At Startup" description="This is the number of milliseconds the agent will wait for the RHQ Server to come up" /> - <c:simple-property name="rhq.agent.update-plugins-at-startup" required="false" type="boolean" activationPolicy="restart" default="true" displayName="Update Plugins At Startup" description="This will force the agent to download plugin updates from the RHQ Server" /> - </c:group> - <c:group name="agentupdate" displayName="Agent Auto-Update" hiddenByDefault="true"> - <c:simple-property name="rhq.agent.agent-update.enabled" required="false" type="boolean" activationPolicy="immediate" default="true" displayName="Enable Agent Update" description="If true, the agent will be allowed to update itself if it finds there is a new agent update binary available. If this feature is not enabled, the agent will never be allowed to update itself." /> - <c:simple-property name="rhq.agent.agent-update.version-url" required="false" type="string" activationPolicy="immediate" displayName="Agent Update Binary Version URL" description="If defined, this will be the URL the agent uses when it needs to retrieve information about the latest available agent update binary. If this is not defined, the agent will ask its server for the agent update binary version information." /> - <c:simple-property name="rhq.agent.agent-update.download-url" required="false" type="string" activationPolicy="immediate" displayName="Agent Update Binary Download URL" description="If defined, this will be the URL the agent uses when it needs to download the latest available agent update binary. If this is not defined, the agent will download the agent update binary from its server." /> - </c:group> - <c:group name="misc" displayName="Miscellaneous Settings" hiddenByDefault="true"> - <c:description>Settings that usually do not need to change under normal circumstances</c:description> - <c:simple-property name="rhq.agent.data-directory" required="false" type="string" activationPolicy="restart" default="data" displayName="Data Directory" description="Location where the agent can persist data to the file system" /> - <c:simple-property name="rhq.agent.disable-native-system" required="false" type="boolean" activationPolicy="restart" default="false" displayName="Disable Native System" description="Disables the native system; agent will not use the native JNI libraries" /> - <c:simple-property name="rhq.agent.primary-server-switchover-check-interval-msecs" required="false" type="integer" activationPolicy="restart" default="3600000" displayName="Primary Server Switchover Check Interval" description="The amount of milliseconds in between checking that the agent is connected to the primary server, as opposed to a failover server. The check is disabled if this is 0."> - <c:constraint> - <c:integer-constraint minimum="0" /> - </c:constraint> - </c:simple-property> - <c:simple-property name="rhq.communications.remote-stream-max-idle-time-msecs" required="false" type="integer" activationPolicy="restart" default="300000" displayName="Remote Stream Idle Timeout" description="The maximum amount of milliseconds an agent-hosted remote stream is allowed to remain idle before it will be closed." /> - <c:simple-property name="rhq.agent.client.command-spool-file.name" required="false" type="string" activationPolicy="restart" default="command-spool.dat" displayName="Command Spool Filename" description="Defines the name of the command spool file. This file must be located in the data directory (if one does not exist, it will be created)" /> - <c:simple-property name="rhq.agent.client.command-spool-file.params" required="false" type="string" activationPolicy="restart" default="10000000:75" displayName="Command Spool File Parameters" description="Defines the maximum size the spool file is allowed to be and how it is to be purged. See the documentation on the format of this value."> - <c:constraint> - <c:regex-constraint expression="[1-9][0-9]{4,}:[0-9]{1,2}" /> - </c:constraint> - </c:simple-property> - <c:simple-property name="rhq.agent.client.command-spool-file.compressed" required="false" type="boolean" activationPolicy="restart" default="false" displayName="Compress Spool File?" description="If true, data in the spool file will be compressed. Note that this saves disk space at the expense of performance" /> - <c:simple-property name="rhq.agent.vm-health-check.interval-msecs" required="false" type="integer" activationPolicy="restart" default="5000" displayName="VM Health Check Interval" description="The amount of milliseconds in between checking the health of the agent's Java Virtual Machine. The check is disabled if this is set to 0."> - <c:constraint> - <c:integer-constraint minimum="0" /> - </c:constraint> - </c:simple-property> - <c:simple-property name="rhq.agent.vm-health-check.low-heap-mem-threshold" required="false" type="float" activationPolicy="restart" default="0.90" displayName="VM Health Check Low Heap Memory Threshold" description="The threshold percentage that must be crossed if the agent's VM health check is to consider the JVM with critically low memory. This value is a percentage of used heap memory out of the maximum heap size."> - <c:constraint> - <c:float-constraint minimum="0.00" maximum="1.00" /> - </c:constraint> - </c:simple-property> - <c:simple-property name="rhq.agent.vm-health-check.low-nonheap-mem-threshold" required="false" type="float" activationPolicy="restart" default="0.90" displayName="VM Health Check Low NonHeap Memory Threshold" description="The threshold percentage that must be crossed if the agent's VM health check is to consider the JVM with critically low memory. This value is a percentage of used non-heap memory out of the maximum non-heap size."> - <c:constraint> - <c:float-constraint minimum="0.00" maximum="1.00" /> - </c:constraint> - </c:simple-property> - </c:group> - </resource-configuration> - - <server name="RHQ Agent JVM" - description="JVM of the Management Agent" - sourcePlugin="JMX" - sourceType="JMX Server" - discovery="org.rhq.plugins.jmx.InternalJMXServerDiscoveryComponent" - class="org.rhq.plugins.jmx.JMXServerComponent" - singleton="true"> - </server> - - <service name="Measurement Subsystem" - discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent" - class="org.rhq.plugins.jmx.MBeanResourceComponent" - description="The measurement subsystem within an agent's plugin container" - singleton="true"> - - <plugin-configuration> - <c:simple-property name="objectName" default="rhq.pc:type=MeasurementManager"/> - <c:simple-property name="nameTemplate" default="Agent Measurement Subsystem"/> - <c:simple-property name="descriptionTemplate" default="information about this agent's measurement subsystem"/> - </plugin-configuration> - - <metric property="CurrentlyScheduleMeasurements" displayType="summary" - description="The total number of active measurement schedules currently being collected by this RHQ Agent"/> - <metric property="MeasurementsCollected" measurementType="trendsup" displayType="summary" - description="The total number of measurements collected since this RHQ Agent was started"/> - <metric property="TotalTimeCollectingMeasurements" displayType="summary" units="milliseconds" measurementType="trendsup" - description="The amount of time this RHQ Agent has spent collecting measurements since it was started"/> - <metric property="FailedCollections" displayType="summary" measurementType="trendsup" - description="The number of individual measurement collections that have failed since this RHQ Agent was started"/> - <metric property="LateCollections" displayType="summary" measurementType="trendsup" - description="The number of individual measurement collections that have fallen behind from their desired schedule"/> - - </service> - - <service name="Plugin Container" - discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent" - class="org.rhq.plugins.jmx.MBeanResourceComponent" - description="The plugin container itself, which hosts the plugins and manages their lifecycle" - singleton="true"> - - <plugin-configuration> - <c:simple-property name="objectName" default="rhq.pc:type=PluginContainer"/> - <c:simple-property name="nameTemplate" default="Agent Plugin Container"/> - <c:simple-property name="descriptionTemplate" default="information about this agent's plugin container"/> - </plugin-configuration> - - <operation name="retrievePluginDependencyGraph" - description="Get the list of plugins and show what plugins they depend on. The order of this list is the order in which the plugins are deployed."> - <results> - <c:list-property name="plugins" description="The plugins currently deployed and their dependencies. This list is in the order the plugins are deployed."> - <c:map-property name="plugin"> - <c:simple-property name="name" description="Name of the plugin" /> - <c:simple-property name="dependencies" description="The list of dependent plugins that this plugin depends on" /> - </c:map-property> - </c:list-property> - </results> - </operation> - - <operation name="retrievePluginClassLoaderInformation" - displayName="Retrieve Plugin ClassLoader Information" - description="Get information on all plugin classloaders. There is one plugin classloader for each deployed plugin."> + <c:property-options> + <c:option name="debug" value="DEBUG"/> + <c:option name="info" value="INFO"/> + <c:option name="warn" value="WARN"/> + <c:option name="error" value="ERROR" default="true"/> + <c:option name="fatal" value="FATAL"/> + </c:property-options> + </c:simple-property> + </c:map-property> + </c:list-property> + </c:group> + <c:group name="snapshotReport" displayName="Snapshot Report" hiddenByDefault="true"> + <c:simple-property name="snapshotConfigEnabled" type="boolean" default="true" + description="If true, take a snapshot of the configuration"/> + <c:simple-property name="snapshotLogEnabled" type="boolean" default="true" + description="If true, take a snapshot of the log files"/> + <c:simple-property name="snapshotDataEnabled" type="boolean" default="true" + description="If true, take a snapshot of the data files"/> + </c:group> + <c:group name="advanced" displayName="Advanced" hiddenByDefault="true"> + <c:simple-property name="childJmxServerName" displayName="JVM Name" default="JVM" + readOnly="true" required="false" + description="The name of the child JVM resource."/> + </c:group> + </plugin-configuration> + + <operation name="switchToServer" + description="Tell the agent to immediately switch to another server. The given server can be a simple + hostname in which case, the current transport, port and transport parameters being used to + talk to the current server will stay the same. Otherwise, it will be assumed the server + is a full endpoint URL."> + <parameters> + <c:simple-property name="server" description="A simple hostname or a full endpoint URL" + required="true"/> + </parameters> + </operation> + + <operation name="restart" + displayName="Restart Agent" + description="Shuts down the agent's comm layer and plugin container and starts them up again. This does *not* restart the agent's VM - use the launcher services to do that."> + </operation> + + <operation name="shutdown" + displayName="Shutdown Agent" + description="Shuts down the agent's comm layer and plugin container. If the agent is in daemon mode, the entire agent VM will exit"> + </operation> + + <operation name="restartPluginContainer" + displayName="Restart Plugin Container" + description="Recycles the plugin container."> + </operation> + + <operation name="downloadLatestFailoverList" + displayName="Download Latest Failover List" + description="Tells the agent to download an updated server failover list. This will also check to make sure the agent is pointing to its primary server as found in the new failover list and, if not, will attempt to switch to the primary server now."> + </operation> + + <operation name="updatePlugins" + displayName="Update All Plugins" + description="Tells the agent to update its plugins. This pulls new/updated plugins down from the RHQ Server"> + </operation> + + <operation name="retrieveAllPluginInfo" + displayName="Get Info On All Plugins" + description="Retrieves information on all deployed plugins."> <results> - <c:simple-property name="numberOfClassLoaders" displayName="Number of ClassLoaders" description="The number of plugin classloaders in the list" type="integer"/> - <c:list-property name="classloaders" displayName="ClassLoaders" description="Classloaders that have been created and are assigned to plugins"> - <c:map-property name="classloader"> - <c:simple-property name="pluginName" description="Name of the plugin that is assigned the classloader" /> - <c:simple-property name="classloaderInfo" displayName="ClassLoader Information" description="The information on the plugin classloader" /> - </c:map-property> - </c:list-property> + <c:list-property name="plugins"> + <c:map-property name="plugin"> + <c:simple-property name="name" description="Name of the plugin"/> + <c:simple-property name="path" description="Full path to the plugin as seen by the agent"/> + <c:simple-property name="timestamp" description="Last time the plugin was updated"/> + <c:simple-property name="size" description="Size of the plugin file"/> + <c:simple-property name="md5" description="MD5 of the plugin file"/> + </c:map-property> + </c:list-property> </results> - </operation> - - <operation name="retrieveDiscoveryClassLoaderInformation" - displayName="Retrieve Discovery ClassLoader Information" - description="Get information on all discovery classloaders. These are created for discovery components that need to discover resources under a parent resource where that parent resource is from a different plugin than the discovery component."> + </operation> + + <operation name="retrievePluginInfo" + displayName="Get Plugin Info" + description="Retrieves information on a specific plugin."> + <parameters> + <c:simple-property name="pluginName" + description="The name of the plugin whose info is to be retrieved"/> + </parameters> <results> - <c:simple-property name="numberOfClassLoaders" displayName="Number of ClassLoaders" description="The number of discovery classloaders in the list" type="integer"/> - <c:list-property name="classloaders" displayName="ClassLoaders" description="Classloaders that have been created for discovery components"> - <c:map-property name="classloader"> - <c:simple-property name="id" description="A identifier consisting of the name of the plugin combined with the hashcode of the parent resource classloader" /> - <c:simple-property name="classloaderInfo" displayName="ClassLoader Information" description="The information on the discovery classloader" /> - </c:map-property> - </c:list-property> + <c:simple-property name="name" description="Name of the plugin"/> + <c:simple-property name="path" description="Full path to the plugin as seen by the agent"/> + <c:simple-property name="timestamp" description="Last time the plugin was updated"/> + <c:simple-property name="size" description="Size of the plugin file"/> + <c:simple-property name="md5" description="MD5 of the plugin file"/> </results> - </operation> - - <operation name="retrieveAllResourceClassLoaderInformation" - displayName="Retrieve ClassLoader Information For All Resources" - description="Get information on classloaders for all resources. Depending on the number of resources being managed, this is potentially an expensive operation."> + </operation> + + <operation name="executeAvailabilityScan" + displayName="Execute Availability Scan" + description="Runs an availability scan and returns a report of its findings. An availability report tells you what resources are up or down. This operation will send the report to the server for processing, as well as return the results."> + <parameters> + <c:simple-property name="changesOnly" type="boolean" default="true" + description="If true, this reports only those availabililities that have changed"/> + </parameters> <results> - <c:simple-property name="numberOfResources" description="The number of resource classloaders in the list. This is the number of resources currently being managed, not the total number of classloader instances that exist" type="integer"/> - <c:list-property name="classloaders" description="Classloaders that have been created and are assigned to resources"> - <c:map-property name="classloader"> - <c:simple-property name="resourceName" description="Name of the resource that is assigned the classloader" /> - <c:simple-property name="resourceId" description="The ID of the resource that is assigned the classloader" /> - <c:simple-property name="resourceUuid" description="The UUID of the resource that is assigned the classloader" /> - <c:simple-property name="canonicalId" description="Canonical identification data of the resource that is assigned the classloader" /> - <c:simple-property name="classloaderInfo" description="The information on the resource classloader" /> - </c:map-property> - </c:list-property> + <c:simple-property name="agentName" type="string" + description="The name of the agent that produced the report"/> + <c:simple-property name="isChangesOnly" type="boolean" + description="If true, only resources that have changed availability will be in the report"/> + <c:list-property name="resourceAvailabilities"> + <c:map-property name="resourceAvailability"> + <c:simple-property name="resourceId" type="integer" + description="The unique ID of the resource whose availability is being reported"/> + <c:simple-property name="resourceName" type="string" + description="The name of the resource whose availability is being reported"/> + <c:simple-property name="isAvailable" type="boolean" + description="If true, the resource is UP, otherwise it is considered DOWN"/> + </c:map-property> + </c:list-property> </results> - </operation> - - <operation name="retrieveUniqueResourceClassLoaderInformation" - displayName="Retrieve Unique Resource ClassLoader Information" - description="Get information on all unique resource classloader instances that are created. Depending on the number of resources being managed, this is potentially an expensive operation."> + </operation> + + <operation name="retrieveCurrentDateTime" + displayName="Get Current Date/Time" + description="Obtains the agent's current date/time."> + <parameters> + <c:simple-property name="timeZone" type="string" default="" required="false" + description="A timezone identifier that will be used to format the date/time string. This can be either an abbreviation such as 'PST', a full name such as 'America/Los_Angeles', or a custom ID such as 'GMT-8:00'. If this is not specified, the agent's local time zone will be used. If the given time zone identifier is unknown, 'GMT' will be the default."/> + </parameters> <results> - <c:simple-property name="numberOfClassLoaders" displayName="Number of ClassLoaders" description="The number of resource classloader instances that have been created and are assigned to at least one resource" type="integer"/> - <c:list-property name="classloaders" description="Classloaders that have been created and are assigned to resources"> - <c:map-property name="classloader"> - <c:simple-property name="classloaderInfo" description="The information on the resource classloader instance" /> - <c:simple-property name="resourceCount" description="The number of resources that are currently assigned this resource classloader"/> - </c:map-property> - </c:list-property> + <c:simple-property name="dateTime" type="string" + description="The agent's current date/time, formatted in the given time zone"/> </results> - </operation> - - <metric property="NumberOfPluginClassLoaders" - defaultOn="false" - displayType="detail" - defaultInterval="3600000" - description="The total number of plugin classloaders currently created and actively managed."/> - <metric property="NumberOfDiscoveryClassLoaders" - defaultOn="false" - displayType="detail" - defaultInterval="3600000" - description="The total number of discovery classloaders currently created and actively managed."/> - <metric property="NumberOfResourceClassLoaders" - displayType="summary" - defaultInterval="600000" - description="The total number of individual resource classloaders currently created and assigned to resources."/> - - </service> - - <service name="Environment Setup Script" - description="The agent startup script that sets up the agent environment" - discovery="AgentEnvironmentScriptDiscoveryComponent" - class="AgentEnvironmentScriptComponent" - singleton="true"> - <plugin-configuration> - <c:simple-property name="Pathname" type="file" description="The full path to the script" required="true"/> - </plugin-configuration> - <resource-configuration> - <c:list-property name="environmentVariables" description="Environment variables that are set when starting the RHQ Agent JVM process"> - <c:map-property name="environmentVariable"> - <c:simple-property name="name" type="string" required="true" summary="true" description="Name of the environment variable"/> - <c:simple-property name="value" type="string" required="true" summary="true" description="Value of the environment variable" /> - </c:map-property> - </c:list-property> - </resource-configuration> - </service> - - <service name="Launcher Script" - description="The script that can run the agent as a daemon service. The Environment Setup Script configures the behavior of this service." - discovery="AgentLauncherScriptDiscoveryComponent" - class="AgentLauncherScriptComponent" - singleton="true"> - - <plugin-configuration> - <c:simple-property name="Pathname" type="file" description="The full path to launcher script file" required="true"/> - </plugin-configuration> - - <operation name="Restart" description="Restarts the agent VM. This will completely kill the agent VM process (if it is running as this service) and then attempt to restart it. If the agent executing this operation will quickly die, no confirmation will be available as to the success or failure of this operation."> - </operation> - - <operation name="Stop" description="Stops the agent VM gracefully. This will completely kill the agent VM process (if it is running as this service). If the agent executing this operation will quickly die, no confirmation will be available as to the success or failure of this operation."> - </operation> - - <operation name="Kill" description="Performs a hard kill on the agent VM. This will completely kill the agent VM process (if it is running as this service). If the agent executing this operation will quickly die, no confirmation will be available as to the success or failure of this operation."> - </operation> - - <operation name="Status" description="Gets the status of agent VM, if it was launched by the launcher script."> + </operation> + + <operation name="setDebugMode" + displayName="Set Debug Mode" + description="Turns on or off debug mode, which causes the agent to emit verbose log messages."> + <parameters> + <c:simple-property name="enabled" type="boolean" required="true" + description="Indicates if debug mode should be enabled or disabled"/> + <c:simple-property name="traceMessaging" type="boolean" default="false" required="true" + description="Indicates if incoming and outgoing messages should be traced. This tracks the messaging between the agent and its server. This will be ignored and default to false if 'enabled' is false."/> + </parameters> + </operation> + + <operation name="executePromptCommand" + displayName="Execute Prompt Command" + description="Executes an agent prompt command, just as if you invoked the command at the agent prompt in a console. Note that you must ensure the prompt command does not require additional input, since the agent will look for that input from another source (e.g. console keyboard)."> + <parameters> + <c:simple-property name="command" type="string" default="" required="true" + description="The prompt command to execute"/> + </parameters> <results> - <c:simple-property name="exitCode" type="integer" /> - <c:simple-property name="output" type="longString" /> + <c:simple-property name="output" type="longString" required="true" + description="The results of the prompt command. This will typically be the output that you would have seen in the console, had this prompt command been executed directly on the agent console."/> + <c:simple-property name="error" type="longString" required="false" + description="If the prompt command execution had an error, this will be information on the error."/> </results> - </operation> - - </service> - - <service name="Java Service Wrapper Launcher" - description="The Java Service Wrapper that can run the agent as a daemon service" - discovery="AgentJavaServiceWrapperDiscoveryComponent" - class="AgentJavaServiceWrapperComponent" - singleton="true"> - - <plugin-configuration> - <c:simple-property name="launcherScript" type="file" description="The full path to wrapper launcher script file" required="true"/> - <c:simple-property name="configurationFile" type="file" description="The full path to the configuration file" required="true"/> - <c:simple-property name="environmentFile" type="file" description="The full path to the environment setup file" required="false"/> - <c:simple-property name="includeFile" type="file" description="The full path to the include file" required="false"/> - </plugin-configuration> - - <operation name="Install" description="Installs the Java Service Wrapper so it starts the agent at boot time"> - <results> - <c:simple-property name="exitCode" type="integer"/> - <c:simple-property name="output" type="longString"/> - </results> - </operation> - - <operation name="Restart" description="Restarts the Java Service Wrapper and the agent it contains. This will completely kill the agent VM process (if it is running as this service) and then attempt to restart it. If the agent executing this operation will quickly die, no confirmation will be available as to the success or failure of this operation."> - </operation> - - <operation name="Stop" description="Stops the Java Service Wrapper and the agent it contains. This will completely kill the agent VM process (if it is running as this service). If the agent executing this operation will quickly die, no confirmation will be available as to the success or failure of this operation."> - </operation> - - <operation name="Remove" description="Removes the Java Service Wrapper so it no longer starts the agent at boot time. *NOTE* This will completely kill the agent VM process if it is running as this service. If the agent executing this operation will quickly die, no confirmation will be available as to the success or failure of this operation."> - </operation> - - <operation name="Status" description="Gets the status of the Java Service Wrapper"> - <results> - <c:simple-property name="disabled" type="boolean" required="false" /> - <c:simple-property name="requiresManualStart" type="boolean" required="false" /> - <c:simple-property name="willAutomaticallyStart" type="boolean" required="false" /> - <c:simple-property name="hasInteractiveConsole" type="boolean" required="false" /> - <c:simple-property name="isRunning" type="boolean" required="false" /> - <c:simple-property name="isInstalled" type="boolean" required="false" /> - <c:simple-property name="exitCode" type="integer" /> - <c:simple-property name="output" type="longString" /> - </results> - </operation> - - <resource-configuration> - <c:group name="mainConfiguration" > - <c:list-property name="mainConfigurationSettings" description="The main JSW configuration. This is read-only - to customize the configuration, add settings to the environment and/or includes." readOnly="true"> - <c:map-property name="mainConfigurationSetting" readOnly="true"> - <c:simple-property name="name" type="string" required="true" summary="true" readOnly="true" description="Name of the wrapper configuration setting"/> - <c:simple-property name="value" type="string" required="true" summary="true" readOnly="true" description="Value of the wrapper configuration setting"/> - </c:map-property> - </c:list-property> + </operation> + + <metric property="Trait.SigarVersion" + displayName="SIGAR Version" + dataType="trait" + displayType="summary" + description="The version of the SIGAR (System Information Gatherer and Reporter) native library used by the Agent"/> + + <metric property="Trait.ReasonForLastRestart" + displayName="Reason For Last Restart" + dataType="trait" + displayType="summary" + description="Indicates what caused the last agent restart"/> + + <metric property="Trait.AgentHomeDirectory" + displayName="Agent Home Directory" + dataType="trait" + displayType="detail" + defaultInterval="86400000" + defaultOn="true" + description="The directory where the agent is installed"/> + + <metric property="NumberAgentRestarts" + displayName="Number of Agent Restarts" + description="Number of times the agent was restarted during the lifetime of its Java Virtual Machine" + defaultOn="true" + displayType="detail" + units="none" + category="availability" + measurementType="dynamic"/> + + <metric property="AgentServerClockDifference" + displayName="Agent-Server Clock Difference" + description="Number of milliseconds the agent's clock differs from its server's clock" + defaultInterval="1800000" + defaultOn="true" + displayType="summary" + units="milliseconds" + category="performance" + measurementType="dynamic"/> + + <metric property="Uptime" + displayName="Up Time" + description="Total number of seconds since the agent was started" + defaultOn="false" + units="seconds" + category="availability" + measurementType="dynamic"/> + <!-- changed to dynamic to prevent generation of per Minute metric. --> + + <metric property="NumberTotalCommandsReceived" + displayName="Total Number Of Commands Received" + description="Total number of messages this agent has received from the RHQ Server" + defaultOn="true" + displayType="summary" + category="throughput" + measurementType="trendsup"/> + + <metric property="NumberSuccessfulCommandsReceived" + displayName="Number of Commands Received Successfully" + description="Number of messages this agent has received from the RHQ Server and succesfully processed" + defaultOn="true" + category="throughput" + measurementType="trendsup"/> + + <metric property="NumberFailedCommandsReceived" + displayName="Number of Commands Received but Failed " + description="Number of messages this agent has received from the RHQ Server but failed to process" + defaultOn="true" + category="throughput" + measurementType="trendsup"/> + + <metric property="AverageExecutionTimeReceived" + displayName="Avg Execution Time Commands Received Successfully" + description="Average time it took to process incoming commands that are ultimately successful" + defaultOn="true" + displayType="summary" + category="performance" + measurementType="dynamic" + units="milliseconds"/> + + <metric property="AverageExecutionTimeSent" + displayName="Avg Execution Time Commands Sent Successfully" + description="Average time it took to send commands that are ultimately successful" + defaultOn="true" + displayType="summary" + category="performance" + measurementType="dynamic" + units="milliseconds"/> + + <metric property="NumberTotalCommandsSent" + displayName="Total Number of Commands Sent" + description="Total number of messages this agent has sent to the RHQ Server" + defaultOn="true" + displayType="summary" + category="throughput" + measurementType="trendsup"/> + + <metric property="NumberSuccessfulCommandsSent" + displayName="Number of Commands Successfully Sent" + description="Number of messages this agent has sent to the RHQ Server successfully" + defaultOn="true" + category="throughput" + measurementType="trendsup"/> + + <metric property="NumberFailedCommandsSent" + displayName="Number of Commands Sent but Failed" + description="Number of messages this agent has either tried, but failed, to send or were not processed succesfully by the RHQ Server" + defaultOn="true" + category="throughput" + measurementType="trendsup"/> + + <metric property="NumberCommandsActiveSent" + displayName="Number Of Active Commands Being Sent" + description="The number of messages this agent is currently sending" + defaultOn="true" + displayType="summary" + category="throughput" + measurementType="dynamic"/> + + <metric property="NumberCommandsInQueue" + displayName="Number of Commands In Queue" + description="Number of messages currently queued waiting to be sent to the RHQ Server" + defaultOn="true" + displayType="summary" + category="throughput" + measurementType="dynamic"/> + + <metric property="NumberCommandsSpooled" + displayName="Number of Commands Spooled To Disk" + description="Number of messages spooled to disk waiting to be sent to the RHQ Server" + defaultOn="true" + category="throughput" + measurementType="dynamic"/> + + <metric property="JVMFreeMemory" + displayName="JVM Free Memory" + description="The amount of free memory the agent JVM has in its heap" + defaultOn="true" + units="bytes" + category="performance" + measurementType="dynamic"/> + + <metric property="JVMTotalMemory" + displayName="JVM Total Memory" + description="The amount of total memory the agent JVM has in its heap" + defaultOn="true" + units="bytes" + category="performance" + measurementType="dynamic"/> + + <metric property="JVMActiveThreads" + displayName="JVM Active Threads" + description="The number of active threads currently running in the agent JVM" + defaultOn="true" + category="performance" + measurementType="dynamic"/> + + <event name="logEntry" description="a log message"/> + + <resource-configuration> + <c:group name="general" displayName="General" hiddenByDefault="false"> + <c:description>General configuration properties</c:description> + <c:simple-property name="rhq.agent.name" type="string" readOnly="true" required="true" + displayName="Agent Name" + description="The name that this agent is known as. This is read-only - once assigned, it cannot change."> + <c:constraint> + <c:regex-constraint expression=".{1,64}"/> + </c:constraint> + </c:simple-property> + </c:group> + <c:group name="plugincontainer" displayName="Plugin Container" hiddenByDefault="false"> + <c:description>Plugin Container configuration properties</c:description> + <c:simple-property name="rhq.agent.plugins.directory" type="string" activationPolicy="restart" + required="true" default="plugins" displayName="Plugins Directory" + description="Location on the file system where the plugin jar files are stored"/> + <c:simple-property name="rhq.agent.plugins.server-discovery.initial-delay-secs" type="integer" + units="seconds" activationPolicy="restart" required="false" default="10" + displayName="Server Discovery Initial Delay" + description="Startup delay before the first server discovery is run"/> + <c:simple-property name="rhq.agent.plugins.server-discovery.period-secs" type="integer" units="seconds" + activationPolicy="restart" required="false" default="900" + displayName="Server Discovery Period" description="Time between server discoveries"/> + <c:simple-property name="rhq.agent.plugins.service-discovery.initial-delay-secs" type="integer" + units="seconds" activationPolicy="restart" required="false" default="20" + displayName="Service Discovery Initial Delay" + description="Startup delay before the first service discovery is run"/> + <c:simple-property name="rhq.agent.plugins.service-discovery.period-secs" type="integer" units="seconds" + activationPolicy="restart" required="false" default="86400" + displayName="Service Discovery Period" + description="Time between service discoveries"/> + <c:simple-property name="rhq.agent.plugins.availability-scan.initial-delay-secs" type="integer" + units="seconds" activationPolicy="restart" required="false" default="30" + displayName="Availability Scan Initial Delay" + description="Startup delay before the first availability scan is run"/> + <c:simple-property name="rhq.agent.plugins.availability-scan.period-secs" type="integer" units="seconds" + activationPolicy="restart" required="false" default="300" + displayName="Availability Scan Period" + description="Time between availability scans"/> + <c:simple-property name="rhq.agent.plugins.measurement-collection.initial-delay-secs" type="integer" + units="seconds" activationPolicy="restart" required="false" default="30" + displayName="Measurement Collection Initial Delay" + description="Startup delay before the first measurement collection is run"/> + <c:simple-property name="rhq.agent.plugins.measurement-collection.threadpool-size" type="integer" + activationPolicy="restart" required="false" default="5" + displayName="Measurement Collection Threadpool Size" + description="Number of concurrent measurement collections that can be run"/> + <c:simple-property name="rhq.agent.plugins.operation-invocation-timeout-secs" type="integer" + units="seconds" activationPolicy="restart" required="false" default="600" + displayName="Operation Invocation Timeout" + description="Time before an operation invocation is aborted"/> + <c:simple-property name="rhq.agent.plugins.operation-invoker.threadpool-size" type="integer" + activationPolicy="restart" required="false" default="5" + displayName="Operation Invoker Threadpool Size" + description="Number of concurrent operation invocations that can be run"/> + <c:simple-property name="rhq.agent.plugins.content-discovery.initial-delay-secs" type="integer" + units="seconds" activationPolicy="restart" required="false" default="30" + displayName="Content Discovery Initial Delay" + description="Startup delay before the first content discovery is run"/> + <c:simple-property name="rhq.agent.plugins.content-discovery.period-secs" type="integer" units="seconds" + activationPolicy="restart" required="false" default="10" + displayName="Content Discovery Period" + description="Time between content discoveries"/> + <c:simple-property name="rhq.agent.plugins.content-discovery.threadpool-size" type="integer" + activationPolicy="restart" required="false" default="10" + displayName="Content Discovery Threadpool Size" + description="Number of concurrent content discoveries that can be run"/> + <c:simple-property name="rhq.agent.plugins.configuration-discovery.initial-delay-secs" type="integer" + activationPolicy="restart" required="false" default="300" + displayName="Configuration Change Detection Startup Delay" + description="Time before configuration change detection starts in seconds"/> + <c:simple-property name="rhq.agent.plugins.configuration-discovery.period-secs" type="integer" + activationPolicy="restart" required="false" default="3600" + displayName="Configuration Change Detection Interval" + description="Time period for checking for configuration changes in seconds"/> + <c:simple-property name="rhq.agent.plugins.event-sender.initial-delay-secs" type="integer" + units="seconds" activationPolicy="restart" required="false" default="30" + displayName="Event Sender Initial Delay" + description="Defines the delay before the first event report gets sent to the server"/> + <c:simple-property name="rhq.agent.plugins.event-sender.period-secs" type="integer" units="seconds" + activationPolicy="restart" required="false" default="30" + displayName="Event Sender Period" + description="Defines how often event reports get sent to the server"/> + <c:simple-property name="rhq.agent.plugins.event-report.max-per-source" type="integer" + activationPolicy="restart" required="false" default="200" + displayName="Event Report Max Per Source" + description="Defines the maximum number of events for any given event source that can be placed in a single event report that is sent up to the server. If this number is larger than the max-total setting, then this setting is ignored"/> + <c:simple-property name="rhq.agent.plugins.event-report.max-total" type="integer" + activationPolicy="restart" required="false" default="400" + displayName="Event Report Max Total" + description="Defines the total maximum number of events that can be placed in a single event report that is sent up to the server"/> + <c:simple-property name="rhq.agent.plugins.disabled" type="string" activationPolicy="restart" + required="false" default="" displayName="Disabled Plugins" + description="Defines the plugins that should be disabled and not loaded by the plugin container. This is a comma-separated list of plugin names."/> + </c:group> + <c:group name="comm-endpoints" displayName="Communication Endpoints" hiddenByDefault="false"> + <c:description>Communication settings that define the endpoints of this RHQ Agent and its RHQ Server + </c:description> + <c:simple-property name="rhq.agent.server.transport" type="string" activationPolicy="restart" + required="true" default="servlet" displayName="RHQ Server Transport Protocol" + description="The transport protocol used to send commands to the RHQ Server. If you want secure communications, the RHQ Server must use an SSL-enabled transport"> + <c:property-options> + <c:option name="servlet" value="servlet" default="true"/> + <c:option name="sslservlet" value="sslservlet"/> + <c:option name="socket" value="socket"/> + <c:option name="sslsocket" value="sslsocket"/> + <c:option name="http" value="http"/> + <c:option name="https" value="https"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="rhq.agent.server.bind-address" type="string" activationPolicy="restart" + required="true" default="127.0.0.1" displayName="RHQ Server IP Address" + description="The RHQ Server address that it is bound to"/> + <c:simple-property name="rhq.agent.server.bind-port" type="integer" activationPolicy="restart" + required="true" default="7080" displayName="RHQ Server Port" + description="The port that the RHQ Server is listening to"> + <c:constraint> + <c:integer-constraint minimum="1" maximum="65535"/> + </c:constraint> + </c:simple-property> + <c:simple-property name="rhq.agent.server.transport-params" type="string" activationPolicy="restart" + required="false" default="/jboss-remoting-servlet-invoker/ServerInvokerServlet" + displayName="RHQ Server Transport Parameters" + description="Custom set of transport parameters used when sending commands to the RHQ Server. Please see the documentation for more information on transport params."/> + <c:simple-property name="rhq.communications.connector.transport" type="string" + activationPolicy="restart" required="true" default="socket" + displayName="Agent Transport Protocol" + description="The transport protocol used to receive commands from the RHQ Server. e.g. socket, sslsocket. If you want secure communications, you must use an SSL-enabled transport"> + <c:property-options> + <c:option name="socket" value="socket" default="true"/> + <c:option name="sslsocket" value="sslsocket"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="rhq.communications.connector.bind-address" type="string" + activationPolicy="restart" required="false" default="" displayName="Agent IP Address" + description="The address the agent binds to when listening for incoming commands from the RHQ Server"/> + <c:simple-property name="rhq.communications.connector.bind-port" type="integer" + activationPolicy="restart" required="true" default="16163" displayName="Agent Port" + description="The port the agent listens to for incoming commands from the RHQ Server"> + <c:constraint> + <c:integer-constraint minimum="1" maximum="65535"/> + </c:constraint> + </c:simple-property> + <c:simple-property name="rhq.communications.connector.transport-params" type="string" + activationPolicy="restart" required="false" + default="numAcceptThreads=3&maxPoolSize=303&clientMaxPoolSize=304&socketTimeout=60000&enableTcpNoDelay=true&backlog=200" + displayName="Agent Transport Parameters" + description="Custom set of transport parameters. Please see the documentation for more information on transport params."/> + </c:group> + <c:group name="comm-security" displayName="Communication Security" hiddenByDefault="true"> + <c:description>Settings that secure the communications between the RHQ Agent and RHQ Server + </c:description> + <c:simple-property name="rhq.communications.connector.security.secure-socket-protocol" + type="string" activationPolicy="restart" required="false" default="TLS" + displayName="Incoming: Secure Socket Protocol"> + <c:property-options allowCustomValue="true"> + <c:option name="TLS" value="TLS" default="true"/> + <c:option name="SSL_TLS" value="SSL_TLS"/> + <c:option name="SSL" value="SSL"/> + <c:option name="SSLv3" value="SSLv3"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="rhq.communications.connector.security.keystore.file" + type="string" activationPolicy="restart" required="false" default="data/keystore.dat" + displayName="Incoming: Keystore File"/> + <c:simple-property name="rhq.communications.connector.security.keystore.algorithm" + type="string" activationPolicy="restart" required="false" default="SunX509" + displayName="Incoming: Keystore Algorithm"> + <c:property-options allowCustomValue="true"> + <c:option name="SunX509" value="SunX509" default="true"/> + <c:option name="IbmX509" value="IbmX509"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="rhq.communications.connector.security.keystore.type" + type="string" activationPolicy="restart" required="false" default="JKS" + displayName="Incoming: Keystore Type"> + <c:property-options allowCustomValue="true"> + <c:option name="JKS" value="JKS" default="true"/> + <c:option name="PKCS12" value="PKCS12"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="rhq.communications.connector.security.keystore.password" + type="password" activationPolicy="restart" required="false" default="rhqpwd" + displayName="Incoming: Keystore Password"/> + <c:simple-property name="rhq.communications.connector.security.keystore.key-password" + type="password" activationPolicy="restart" required="false" default="rhqpwd" + displayName="Incoming: Keystore Key Password"/> + <c:simple-property name="rhq.communications.connector.security.keystore.alias" + type="string" activationPolicy="restart" required="false" default="rhq" + displayName="Incoming: Keystore Alias "/> + <c:simple-property name="rhq.communications.connector.security.truststore.file" + type="string" activationPolicy="restart" required="false" + default="data/truststore.dat" displayName="Incoming: Truststore File"/> + <c:simple-property name="rhq.communications.connector.security.truststore.algorithm" + type="string" activationPolicy="restart" required="false" default="SunX509" + displayName="Incoming: Truststore Algorithm"> + <c:property-options allowCustomValue="true"> + <c:option name="SunX509" value="SunX509" default="true"/> + <c:option name="IbmX509" value="IbmX509"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="rhq.communications.connector.security.truststore.type" + type="string" activationPolicy="restart" required="false" default="JKS" + displayName="Incoming: Truststore Type"> + <c:property-options allowCustomValue="true"> + <c:option name="JKS" value="JKS" default="true"/> + <c:option name="PKCS12" value="PKCS12"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="rhq.communications.connector.security.truststore.password" + type="password" activationPolicy="restart" required="false" default="" + displayName="Incoming: Truststore Password"/> + <c:simple-property name="rhq.communications.connector.security.client-auth-mode" + type="string" activationPolicy="restart" required="false" default="none" + displayName="Incoming: Client Authentication Mode" + description="Determines if the agent should authenticate a RHQ Server before accepting incoming commands from it"> + <c:property-options> + <c:option name="none" value="none" default="true"/> + <c:option name="want" value="want"/> + <c:option name="need" value="need"/> + </c:property-options> + </c:simple-property> + + <c:simple-property name="rhq.agent.client.security.secure-socket-protocol" + type="string" activationPolicy="restart" required="false" default="TLS" + displayName="Outgoing: Secure Socket Protocol"> + <c:property-options allowCustomValue="true"> + <c:option name="TLS" value="TLS" default="true"/> + <c:option name="SSL_TLS" value="SSL_TLS"/> + <c:option name="SSL" value="SSL"/> + <c:option name="SSLv3" value="SSLv3"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="rhq.agent.client.security.keystore.file" + type="string" activationPolicy="restart" required="false" default="data/keystore.dat" + displayName="Outgoing: Keystore File"/> + <c:simple-property name="rhq.agent.client.security.keystore.algorithm" + type="string" activationPolicy="restart" required="false" default="SunX509" + displayName="Outgoing: Keystore Algorithm"> + <c:property-options allowCustomValue="true"> + <c:option name="SunX509" value="SunX509" default="true"/> + <c:option name="IbmX509" value="IbmX509"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="rhq.agent.client.security.keystore.type" + type="string" activationPolicy="restart" required="false" default="JKS" + displayName="Outgoing: Keystore Type"> + <c:property-options allowCustomValue="true"> + <c:option name="JKS" value="JKS" default="true"/> + <c:option name="PKCS12" value="PKCS12"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="rhq.agent.client.security.keystore.password" + type="password" activationPolicy="restart" required="false" default="rhqpwd" + displayName="Outgoing: Keystore Password"/> + <c:simple-property name="rhq.agent.client.security.keystore.key-password" + type="password" activationPolicy="restart" required="false" default="rhqpwd" + displayName="Outgoing: Keystore Key Password"/> + <c:simple-property name="rhq.agent.client.security.keystore.alias" + type="string" activationPolicy="restart" required="false" default="rhq" + displayName="Outgoing: Keystore Alias"/> + <c:simple-property name="rhq.agent.client.security.truststore.file" + type="string" activationPolicy="restart" required="false" + default="data/truststore.dat" displayName="Outgoing: Truststore File"/> + <c:simple-property name="rhq.agent.client.security.truststore.algorithm" + type="string" activationPolicy="restart" required="false" default="SunX509" + displayName="Outgoing: Truststore Algorithm"> + <c:property-options allowCustomValue="true"> + <c:option name="SunX509" value="SunX509" default="true"/> + <c:option name="IbmX509" value="IbmX509"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="rhq.agent.client.security.truststore.type" + type="string" activationPolicy="restart" required="false" default="JKS" + displayName="Outgoing: Truststore Type"> + <c:property-options allowCustomValue="true"> + <c:option name="JKS" value="JKS" default="true"/> + <c:option name="PKCS12" value="PKCS12"/> + </c:property-options> + </c:simple-property> + <c:simple-property name="rhq.agent.client.security.truststore.password" + type="password" activationPolicy="restart" required="false" default="" + displayName="Outgoing: Truststore Password"/> + <c:simple-property name="rhq.agent.client.security.server-auth-mode-enabled" + type="boolean" activationPolicy="restart" required="false" default="false" + displayName="Outgoing: Authenticate Server?" + description="If true, then the agent must authenticate the RHQ Server before it can send it messages"/> + </c:group> + <c:group name="auto-detection" displayName="Auto Detection" hiddenByDefault="true"> + <c:description>Configures auto-detection mechanisms that allow the RHQ Agent to find the RHQ Server and + vice versa + </c:description> + <c:simple-property name="rhq.agent.client.server-polling-interval-msecs" type="integer" + activationPolicy="restart" required="false" units="milliseconds" default="60000" + displayName="RHQ Server Polling Interval" + description="If this value is larger than 0, it indicates the agent should periodically poll the RHQ Server to make sure it's still up or (if it was down) see when it comes back up. The value is the number of milliseconds to wait in between polls"> + <c:constraint> + <c:integer-constraint minimum="0"/> + </c:constraint> + </c:simple-property> + <c:simple-property name="rhq.agent.server-auto-detection" required="false" type="boolean" + activationPolicy="restart" default="false" displayName="Auto-Detect RHQ Server?" + description="If true, the agent will use multicast detection to auto-detect the RHQ Server. If this is enabled, make sure you enable and configure the multicast detector"/> + <c:simple-property name="rhq.communications.multicast-detector.enabled" required="false" type="boolean" + activationPolicy="restart" default="false" displayName="Multicast Detector Enabled?" + description="The multicast detector must be enabled if you want the RHQ Agent to auto-detect the RHQ Server and vice versa. Disable this if your network does not support multicast traffic."/> + <c:simple-property name="rhq.communications.multicast-detector.multicast-address" required="false" + type="string" activationPolicy="restart" default="224.16.16.16" + displayName="Multicast Detector Multicast Address" + description="The address used by JBoss ON to broadcast detection messages. All RHQ Servers and RHQ Agents must be using the same address."/> + <c:simple-property name="rhq.communications.multicast-detector.bind-address" required="false" + type="string" activationPolicy="restart" default="0.0.0.0" + displayName="Multicast Detector Bind Address" + description="The address bound by the network interface"/> + <c:simple-property name="rhq.communications.multicast-detector.port" required="false" type="integer" + activationPolicy="restart" default="16162" displayName="Multicast Detector Port" + description="The port that the detector is multicasting to"> + <c:constraint> + <c:integer-constraint minimum="1" maximum="65535"/> + </c:constraint> + </c:simple-property> + <c:simple-property name="rhq.communications.multicast-detector.heartbeat-time-delay" required="false" + type="integer" activationPolicy="restart" units="milliseconds" default="1000" + displayName="Multicast Detector Heartbeat" + description="The number of milliseconds between heartbeat messages emitted by the multicast detector. This value must be less than the default time delay."> + <c:constraint> + <c:integer-constraint minimum="500"/> + </c:constraint> + </c:simple-property> + <c:simple-property name="rhq.communications.multicast-detector.default-time-delay" required="false" + type="integer" activationPolicy="restart" units="milliseconds" default="5000" + displayName="Multicast Detector Time Delay" + description="Amount of milliseconds that must pass without hearing a RHQ Server's heartbeat before assuming its down. This value must be greater than the heartbeat time delay."> + <c:constraint> + <c:integer-constraint minimum="500"/> + </c:constraint> + </c:simple-property> + </c:group> + <c:group name="sender" displayName="Client Sender" hiddenByDefault="true"> + <c:description>Configures the client sender which is responsible for sending messages to the RHQ Server + </c:description> + <c:simple-property name="rhq.agent.client.queue-size" required="false" type="integer" + activationPolicy="restart" units="milliseconds" default="50000" + displayName="Queue Size" + description="Maximum number of commands that the agent can queue up for sending to the RHQ Server. Setting this to 0 makes the queue unbounded."> + <c:constraint> + <c:integer-constraint minimum="0"/> + </c:constraint> + </c:simple-property> + <c:simple-property name="rhq.agent.client.max-concurrent" required="false" type="integer" + activationPolicy="restart" default="5" displayName="Maximum Concurrency" + description="Maximum number of commands that the agent can send to the RHQ Server at the same time."> + <c:constraint> + <c:integer-constraint minimum="1"/> + </c:constraint> + </c:simple-property> + <c:simple-property name="rhq.agent.client.command-timeout-msecs" required="false" type="integer" + activationPolicy="restart" units="milliseconds" default="600000" + displayName="Timeout" + description="The default time in milliseconds the agent will wait before aborting a command being sent"> + <c:constraint> + <c:integer-constraint minimum="0"/> + </c:constraint> + </c:simple-property> + <c:simple-property name="rhq.agent.client.retry-interval-msecs" required="false" type="integer" + activationPolicy="restart" units="milliseconds" default="15000" + displayName="Retry Interval" + description="This is the minimum amount of time, in milliseconds, the agent will wait before trying to resend a guaranteed command that previously failed"> + <c:constraint> + <c:integer-constraint minimum="500"/> + </c:constraint> + </c:simple-property> + <c:simple-property name="rhq.agent.client.max-retries" required="false" type="integer" + activationPolicy="restart" default="10" displayName="Max Retries" + description="This is the maximum amount of times the agent will resend a guaranteed command that previously failed due to something other than a cannot-connect error"> + <c:constraint> + <c:integer-constraint minimum="0"/> + </c:constraint> + </c:simple-property> + <c:simple-property name="rhq.agent.client.send-throttling" required="false" type="string" + activationPolicy="restart" default="100:1000" displayName="Send Throttling" + description="Configures the send throttle. See the documentation for more information on send throttling"> + <c:constraint> + <c:regex-constraint expression="[0-9]+:[0-9]+"/> + </c:constraint> + </c:simple-property> + <c:simple-property name="rhq.agent.client.queue-throttling" required="false" type="string" + activationPolicy="restart" default="200:2000" displayName="Queue Throttling" + description="Configures the queue throttle. See the documentation for more information on queue throttling"> + <c:constraint> + <c:regex-constraint expression="[0-9]+:[0-9]+"/> + </c:constraint> + </c:simple-property> + </c:group> + <c:group name="startup" displayName="Startup" hiddenByDefault="true"> + <c:description>Configures what the agent does while it is starting up</c:description> + <c:simple-property name="rhq.agent.register-with-server-at-startup" required="false" type="boolean" + activationPolicy="restart" default="false" + displayName="Register with RHQ Server At Startup?" + description="This will force the agent to register with the RHQ Server, even if it is already registered"/> + <c:simple-property name="rhq.agent.wait-for-server-at-startup-msecs" required="false" type="integer" + activationPolicy="restart" default="5000" + displayName="Time To Wait For RHQ Server At Startup" + description="This is the number of milliseconds the agent will wait for the RHQ Server to come up"/> + <c:simple-property name="rhq.agent.update-plugins-at-startup" required="false" type="boolean" + activationPolicy="restart" default="true" displayName="Update Plugins At Startup" + description="This will force the agent to download plugin updates from the RHQ Server"/> </c:group> - <c:group name="environment" > - <c:list-property name="environmentSettings" description="Environment settings to further customize the JSW. These are set prior to applying the main configuration and include settings. Variables set here can be placed in the main config or includes using the %VAR% notation."> - <c:map-property name="environmentSetting"> - <c:simple-property name="name" type="string" required="true" summary="true" description="Name of the environment variable" /> - <c:simple-property name="value" type="string" required="true" summary="true" description="Value of the environment variable" /> - </c:map-property> - </c:list-property> + <c:group name="agentupdate" displayName="Agent Auto-Update" hiddenByDefault="true"> + <c:simple-property name="rhq.agent.agent-update.enabled" required="false" type="boolean" + activationPolicy="immediate" default="true" displayName="Enable Agent Update" + description="If true, the agent will be allowed to update itself if it finds there is a new agent update binary available. If this feature is not enabled, the agent will never be allowed to update itself."/> + <c:simple-property name="rhq.agent.agent-update.version-url" required="false" type="string" + activationPolicy="immediate" displayName="Agent Update Binary Version URL" + description="If defined, this will be the URL the agent uses when it needs to retrieve information about the latest available agent update binary. If this is not defined, the agent will ask its server for the agent update binary version information."/> + <c:simple-property name="rhq.agent.agent-update.download-url" required="false" type="string" + activationPolicy="immediate" displayName="Agent Update Binary Download URL" + description="If defined, this will be the URL the agent uses when it needs to download the latest available agent update binary. If this is not defined, the agent will download the agent update binary from its server."/> </c:group> - <c:group name="includes" > - <c:list-property name="includeSettings" description="Override settings that augment the existing JSW configuration. These are applied after the main configuration is set."> - <c:map-property name="includeSetting"> - <c:simple-property name="name" type="string" required="true" summary="true" description="Name of the wrapper override setting"/> - <c:simple-property name="value" type="string" required="true" summary="true" description="Value of the wrapper override setting"/> - </c:map-property> - </c:list-property> + <c:group name="misc" displayName="Miscellaneous Settings" hiddenByDefault="true"> + <c:description>Settings that usually do not need to change under normal circumstances</c:description> + <c:simple-property name="rhq.agent.data-directory" required="false" type="string" + activationPolicy="restart" default="data" displayName="Data Directory" + description="Location where the agent can persist data to the file system"/> + <c:simple-property name="rhq.agent.disable-native-system" required="false" type="boolean" + activationPolicy="restart" default="false" displayName="Disable Native System" + description="Disables the native system; agent will not use the native JNI libraries"/> + <c:simple-property name="rhq.agent.primary-server-switchover-check-interval-msecs" required="false" + type="integer" activationPolicy="restart" default="3600000" + displayName="Primary Server Switchover Check Interval" + description="The amount of milliseconds in between checking that the agent is connected to the primary server, as opposed to a failover server. The check is disabled if this is 0."> + <c:constraint> + <c:integer-constraint minimum="0"/> + </c:constraint> + </c:simple-property> + <c:simple-property name="rhq.communications.remote-stream-max-idle-time-msecs" required="false" + type="integer" activationPolicy="restart" default="300000" + displayName="Remote Stream Idle Timeout" + description="The maximum amount of milliseconds an agent-hosted remote stream is allowed to remain idle before it will be closed."/> + <c:simple-property name="rhq.agent.client.command-spool-file.name" required="false" type="string" + activationPolicy="restart" default="command-spool.dat" + displayName="Command Spool Filename" + description="Defines the name of the command spool file. This file must be located in the data directory (if one does not exist, it will be created)"/> + <c:simple-property name="rhq.agent.client.command-spool-file.params" required="false" type="string" + activationPolicy="restart" default="10000000:75" + displayName="Command Spool File Parameters" + description="Defines the maximum size the spool file is allowed to be and how it is to be purged. See the documentation on the format of this value."> + <c:constraint> + <c:regex-constraint expression="[1-9][0-9]{4,}:[0-9]{1,2}"/> + </c:constraint> + </c:simple-property> + <c:simple-property name="rhq.agent.client.command-spool-file.compressed" required="false" type="boolean" + activationPolicy="restart" default="false" displayName="Compress Spool File?" + description="If true, data in the spool file will be compressed. Note that this saves disk space at the expense of performance"/> + <c:simple-property name="rhq.agent.vm-health-check.interval-msecs" required="false" type="integer" + activationPolicy="restart" default="5000" displayName="VM Health Check Interval" + description="The amount of milliseconds in between checking the health of the agent's Java Virtual Machine. The check is disabled if this is set to 0."> + <c:constraint> + <c:integer-constraint minimum="0"/> + </c:constraint> + </c:simple-property> + <c:simple-property name="rhq.agent.vm-health-check.low-heap-mem-threshold" required="false" type="float" + activationPolicy="restart" default="0.90" + displayName="VM Health Check Low Heap Memory Threshold" + description="The threshold percentage that must be crossed if the agent's VM health check is to consider the JVM with critically low memory. This value is a percentage of used heap memory out of the maximum heap size."> + <c:constraint> + <c:float-constraint minimum="0.00" maximum="1.00"/> + </c:constraint> + </c:simple-property> + <c:simple-property name="rhq.agent.vm-health-check.low-nonheap-mem-threshold" required="false" + type="float" activationPolicy="restart" default="0.90" + displayName="VM Health Check Low NonHeap Memory Threshold" + description="The threshold percentage that must be crossed if the agent's VM health check is to consider the JVM with critically low memory. This value is a percentage of used non-heap memory out of the maximum non-heap size."> + <c:constraint> + <c:float-constraint minimum="0.00" maximum="1.00"/> + </c:constraint> + </c:simple-property> </c:group> - </resource-configuration> - </service> - - </server> + </resource-configuration> + + <server name="RHQ Agent JVM" + description="JVM of the Management Agent" + sourcePlugin="JMX" + sourceType="JMX Server" + discovery="org.rhq.plugins.jmx.InternalJMXServerDiscoveryComponent" + class="org.rhq.plugins.jmx.JMXServerComponent" + singleton="true"> + </server> + + <service name="Measurement Subsystem" + discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent" + class="org.rhq.plugins.jmx.MBeanResourceComponent" + description="The measurement subsystem within an agent's plugin container" + singleton="true"> + + <plugin-configuration> + <c:simple-property name="objectName" default="rhq.pc:type=MeasurementManager"/> + <c:simple-property name="nameTemplate" default="Agent Measurement Subsystem"/> + <c:simple-property name="descriptionTemplate" + default="information about this agent's measurement subsystem"/> + </plugin-configuration> + + <metric property="CurrentlyScheduleMeasurements" displayType="summary" + description="The total number of active measurement schedules currently being collected by this RHQ Agent"/> + <metric property="MeasurementsCollected" measurementType="trendsup" displayType="summary" + description="The total number of measurements collected since this RHQ Agent was started"/> + <metric property="TotalTimeCollectingMeasurements" displayType="summary" units="milliseconds" + measurementType="trendsup" + description="The amount of time this RHQ Agent has spent collecting measurements since it was started"/> + <metric property="FailedCollections" displayType="summary" measurementType="trendsup" + description="The number of individual measurement collections that have failed since this RHQ Agent was started"/> + <metric property="LateCollections" displayType="summary" measurementType="trendsup" + description="The number of individual measurement collections that have fallen behind from their desired schedule"/> + + </service> + + <service name="Plugin Container" + discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent" + class="org.rhq.plugins.jmx.MBeanResourceComponent" + description="The plugin container itself, which hosts the plugins and manages their lifecycle" + singleton="true"> + + <plugin-configuration> + <c:simple-property name="objectName" default="rhq.pc:type=PluginContainer"/> + <c:simple-property name="nameTemplate" default="Agent Plugin Container"/> + <c:simple-property name="descriptionTemplate" + default="information about this agent's plugin container"/> + </plugin-configuration> + + <operation name="retrievePluginDependencyGraph" + description="Get the list of plugins and show what plugins they depend on. The order of this list is the order in which the plugins are deployed."> + <results> + <c:list-property name="plugins" + description="The plugins currently deployed and their dependencies. This list is in the order the plugins are deployed."> + <c:map-property name="plugin"> + <c:simple-property name="name" description="Name of the plugin"/> + <c:simple-property name="dependencies" + description="The list of dependent plugins that this plugin depends on"/> + </c:map-property> + </c:list-property> + </results> + </operation> + + <operation name="retrievePluginClassLoaderInformation" + displayName="Retrieve Plugin ClassLoader Information" + description="Get information on all plugin classloaders. There is one plugin classloader for each deployed plugin."> + <results> + <c:simple-property name="numberOfClassLoaders" displayName="Number of ClassLoaders" + description="The number of plugin classloaders in the list" type="integer"/> + <c:list-property name="classloaders" displayName="ClassLoaders" + description="Classloaders that have been created and are assigned to plugins"> + <c:map-property name="classloader"> + <c:simple-property name="pluginName" + description="Name of the plugin that is assigned the classloader"/> + <c:simple-property name="classloaderInfo" displayName="ClassLoader Information" + description="The information on the plugin classloader"/> + </c:map-property> + </c:list-property> + </results> + </operation> + + <operation name="retrieveDiscoveryClassLoaderInformation" + displayName="Retrieve Discovery ClassLoader Information" + description="Get information on all discovery classloaders. These are created for discovery components that need to discover resources under a parent resource where that parent resource is from a different plugin than the discovery component."> + <results> + <c:simple-property name="numberOfClassLoaders" displayName="Number of ClassLoaders" + description="The number of discovery classloaders in the list" type="integer"/> + <c:list-property name="classloaders" displayName="ClassLoaders" + description="Classloaders that have been created for discovery components"> + <c:map-property name="classloader"> + <c:simple-property name="id" + description="A identifier consisting of the name of the plugin combined with the hashcode of the parent resource classloader"/> + <c:simple-property name="classloaderInfo" displayName="ClassLoader Information" + description="The information on the discovery classloader"/> + </c:map-property> + </c:list-property> + </results> + </operation> + + <operation name="retrieveAllResourceClassLoaderInformation" + displayName="Retrieve ClassLoader Information For All Resources" + description="Get information on classloaders for all resources. Depending on the number of resources being managed, this is potentially an expensive operation."> + <results> + <c:simple-property name="numberOfResources" + description="The number of resource classloaders in the list. This is the number of resources currently being managed, not the total number of classloader instances that exist" + type="integer"/> + <c:list-property name="classloaders" + description="Classloaders that have been created and are assigned to resources"> + <c:map-property name="classloader"> + <c:simple-property name="resourceName" + description="Name of the resource that is assigned the classloader"/> + <c:simple-property name="resourceId" + description="The ID of the resource that is assigned the classloader"/> + <c:simple-property name="resourceUuid" + description="The UUID of the resource that is assigned the classloader"/> + <c:simple-property name="canonicalId" + description="Canonical identification data of the resource that is assigned the classloader"/> + <c:simple-property name="classloaderInfo" + description="The information on the resource classloader"/> + </c:map-property> + </c:list-property> + </results> + </operation> + + <operation name="retrieveUniqueResourceClassLoaderInformation" + displayName="Retrieve Unique Resource ClassLoader Information" + description="Get information on all unique resource classloader instances that are created. Depending on the number of resources being managed, this is potentially an expensive operation."> + <results> + <c:simple-property name="numberOfClassLoaders" displayName="Number of ClassLoaders" + description="The number of resource classloader instances that have been created and are assigned to at least one resource" + type="integer"/> + <c:list-property name="classloaders" + description="Classloaders that have been created and are assigned to resources"> + <c:map-property name="classloader"> + <c:simple-property name="classloaderInfo" + description="The information on the resource classloader instance"/> + <c:simple-property name="resourceCount" + description="The number of resources that are currently assigned this resource classloader"/> + </c:map-property> + </c:list-property> + </results> + </operation> + + <metric property="NumberOfPluginClassLoaders" + defaultOn="false" + displayType="detail" + defaultInterval="3600000" + description="The total number of plugin classloaders currently created and actively managed."/> + <metric property="NumberOfDiscoveryClassLoaders" + defaultOn="false" + displayType="detail" + defaultInterval="3600000" + description="The total number of discovery classloaders currently created and actively managed."/> + <metric property="NumberOfResourceClassLoaders" + displayType="summary" + defaultInterval="600000" + description="The total number of individual resource classloaders currently created and assigned to resources."/> + + </service> + + <service name="Environment Setup Script" + description="The agent startup script that sets up the agent environment" + discovery="AgentEnvironmentScriptDiscoveryComponent" + class="AgentEnvironmentScriptComponent" + singleton="true"> + <plugin-configuration> + <c:simple-property name="Pathname" type="file" description="The full path to the script" + required="true"/> + </plugin-configuration> + <resource-configuration> + <c:list-property name="environmentVariables" + description="Environment variables that are set when starting the RHQ Agent JVM process"> + <c:map-property name="environmentVariable"> + <c:simple-property name="name" type="string" required="true" summary="true" + description="Name of the environment variable"/> + <c:simple-property name="value" type="string" required="true" summary="true" + description="Value of the environment variable"/> + </c:map-property> + </c:list-property> + </resource-configuration> + </service> + + <service name="Launcher Script" + description="The script that can run the agent as a daemon service. The Environment Setup Script configures the behavior of this service." + discovery="AgentLauncherScriptDiscoveryComponent" + class="AgentLauncherScriptComponent" + singleton="true"> + + <plugin-configuration> + <c:simple-property name="Pathname" type="file" description="The full path to launcher script file" + required="true"/> + </plugin-configuration> + + <operation name="Restart" + description="Restarts the agent VM. This will completely kill the agent VM process (if it is running as this service) and then attempt to restart it. If the agent executing this operation will quickly die, no confirmation will be available as to the success or failure of this operation."> + </operation> + + <operation name="Stop" + description="Stops the agent VM gracefully. This will completely kill the agent VM process (if it is running as this service). If the agent executing this operation will quickly die, no confirmation will be available as to the success or failure of this operation."> + </operation> + + <operation name="Kill" + description="Performs a hard kill on the agent VM. This will completely kill the agent VM process (if it is running as this service). If the agent executing this operation will quickly die, no confirmation will be available as to the success or failure of this operation."> + </operation> + + <operation name="Status" + description="Gets the status of agent VM, if it was launched by the launcher script."> + <results> + <c:simple-property name="exitCode" type="integer"/> + <c:simple-property name="output" type="longString"/> + </results> + </operation> + + </service> + + <service name="Java Service Wrapper Launcher" + description="The Java Service Wrapper that can run the agent as a daemon service" + discovery="AgentJavaServiceWrapperDiscoveryComponent" + class="AgentJavaServiceWrapperComponent" + singleton="true"> + + <plugin-configuration> + <c:simple-property name="launcherScript" type="file" + description="The full path to wrapper launcher script file" required="true"/> + <c:simple-property name="configurationFile" type="file" + description="The full path to the configuration file" required="true"/> + <c:simple-property name="environmentFile" type="file" + description="The full path to the environment setup file" required="false"/> + <c:simple-property name="includeFile" type="file" description="The full path to the include file" + required="false"/> + </plugin-configuration> + + <operation name="Install" + description="Installs the Java Service Wrapper so it starts the agent at boot time"> + <results> + <c:simple-property name="exitCode" type="integer"/> + <c:simple-property name="output" type="longString"/> + </results> + </operation> + + <operation name="Restart" + description="Restarts the Java Service Wrapper and the agent it contains. This will completely kill the agent VM process (if it is running as this service) and then attempt to restart it. If the agent executing this operation will quickly die, no confirmation will be available as to the success or failure of this operation."> + </operation> + + <operation name="Stop" + description="Stops the Java Service Wrapper and the agent it contains. This will completely kill the agent VM process (if it is running as this service). If the agent executing this operation will quickly die, no confirmation will be available as to the success or failure of this operation."> + </operation> + + <operation name="Remove" + description="Removes the Java Service Wrapper so it no longer starts the agent at boot time. *NOTE* This will completely kill the agent VM process if it is running as this service. If the agent executing this operation will quickly die, no confirmation will be available as to the success or failure of this operation."> + </operation> + + <operation name="Status" description="Gets the status of the Java Service Wrapper"> + <results> + <c:simple-property name="disabled" type="boolean" required="false"/> + <c:simple-property name="requiresManualStart" type="boolean" required="false"/> + <c:simple-property name="willAutomaticallyStart" type="boolean" required="false"/> + <c:simple-property name="hasInteractiveConsole" type="boolean" required="false"/> + <c:simple-property name="isRunning" type="boolean" required="false"/> + <c:simple-property name="isInstalled" type="boolean" required="false"/> + <c:simple-property name="exitCode" type="integer"/> + <c:simple-property name="output" type="longString"/> + </results> + </operation> + + <resource-configuration> + <c:group name="mainConfiguration"> + <c:list-property name="mainConfigurationSettings" + description="The main JSW configuration. This is read-only - to customize the configuration, add settings to the environment and/or includes." + readOnly="true"> + <c:map-property name="mainConfigurationSetting" readOnly="true"> + <c:simple-property name="name" type="string" required="true" summary="true" readOnly="true" + description="Name of the wrapper configuration setting"/> + <c:simple-property name="value" type="string" required="true" summary="true" readOnly="true" + description="Value of the wrapper configuration setting"/> + </c:map-property> + </c:list-property> + </c:group> + <c:group name="environment"> + <c:list-property name="environmentSettings" + description="Environment settings to further customize the JSW. These are set prior to applying the main configuration and include settings. Variables set here can be placed in the main config or includes using the %VAR% notation."> + <c:map-property name="environmentSetting"> + <c:simple-property name="name" type="string" required="true" summary="true" + description="Name of the environment variable"/> + <c:simple-property name="value" type="string" required="true" summary="true" + description="Value of the environment variable"/> + </c:map-property> + </c:list-property> + </c:group> + <c:group name="includes"> + <c:list-property name="includeSettings" + description="Override settings that augment the existing JSW configuration. These are applied after the main configuration is set."> + <c:map-property name="includeSetting"> + <c:simple-property name="name" type="string" required="true" summary="true" + description="Name of the wrapper override setting"/> + <c:simple-property name="value" type="string" required="true" summary="true" + description="Value of the wrapper override setting"/> + </c:map-property> + </c:list-property> + </c:group> + </resource-configuration> + </service> + + </server> </plugin> \ No newline at end of file
rhq-commits@lists.fedorahosted.org
-
John Sanda