02 Oct '12
modules/cli-tests/pom.xml | 2 +-
modules/common/ant-bundle/pom.xml | 2 +-
modules/common/drift/pom.xml | 2 +-
modules/common/filetemplate-bundle/pom.xml | 2 +-
modules/common/jboss-as/pom.xml | 2 +-
modules/common/pom.xml | 2 +-
modules/core/arquillian-integration/archive/pom.xml | 2 +-
modules/core/arquillian-integration/container/pom.xml | 2 +-
modules/core/arquillian-integration/pom.xml | 2 +-
modules/core/client-api/pom.xml | 2 +-
modules/core/comm-api/pom.xml | 2 +-
modules/core/dbutils/pom.xml | 2 +-
modules/core/domain/pom.xml | 2 +-
modules/core/gui/pom.xml | 2 +-
modules/core/native-system/pom.xml | 2 +-
modules/core/plugin-api/pom.xml | 2 +-
modules/core/plugin-container-itest/pom.xml | 2 +-
modules/core/plugin-container/pom.xml | 2 +-
modules/core/plugin-test-api/pom.xml | 2 +-
modules/core/plugin-test-util/pom.xml | 2 +-
modules/core/plugin-validator/pom.xml | 2 +-
modules/core/plugindoc/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/core/util/pom.xml | 2 +-
modules/enterprise/agent/pom.xml | 2 +-
modules/enterprise/agentupdate/pom.xml | 2 +-
modules/enterprise/binding/pom.xml | 4 ++--
modules/enterprise/comm/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-war/pom.xml | 2 +-
modules/enterprise/gui/content_http-war/pom.xml | 2 +-
modules/enterprise/gui/coregui/pom.xml | 2 +-
modules/enterprise/gui/installer-war/pom.xml | 2 +-
modules/enterprise/gui/pom.xml | 2 +-
modules/enterprise/gui/portal-war/pom.xml | 2 +-
modules/enterprise/gui/rest-war/pom.xml | 2 +-
modules/enterprise/pom.xml | 2 +-
modules/enterprise/remoting/cli/pom.xml | 2 +-
modules/enterprise/remoting/client-api/pom.xml | 2 +-
modules/enterprise/remoting/client-deps/pom.xml | 2 +-
modules/enterprise/remoting/pom.xml | 2 +-
modules/enterprise/remoting/webservices/pom.xml | 2 +-
modules/enterprise/scripting/api/pom.xml | 4 ++--
modules/enterprise/scripting/javascript/pom.xml | 4 ++--
modules/enterprise/scripting/pom.xml | 4 ++--
modules/enterprise/scripting/python/pom.xml | 4 ++--
modules/enterprise/server/client-api/pom.xml | 4 ++--
modules/enterprise/server/container-lib/pom.xml | 2 +-
modules/enterprise/server/container/pom.xml | 2 +-
modules/enterprise/server/ear/pom.xml | 2 +-
modules/enterprise/server/itests/pom.xml | 2 +-
modules/enterprise/server/jar/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-cli/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-email/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-irc/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-operations/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-roles/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 ++--
modules/enterprise/server/plugins/alert-subject/pom.xml | 4 ++--
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/cobbler/pom.xml | 4 ++--
modules/enterprise/server/plugins/disk/pom.xml | 2 +-
modules/enterprise/server/plugins/drift-mongodb/pom.xml | 2 +-
modules/enterprise/server/plugins/drift-rhq/pom.xml | 2 +-
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +-
modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 ++--
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 +-
modules/enterprise/server/plugins/pom.xml | 2 +-
modules/enterprise/server/plugins/url/pom.xml | 2 +-
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +-
modules/enterprise/server/plugins/yum/pom.xml | 2 +-
modules/enterprise/server/pom.xml | 2 +-
modules/enterprise/server/safe-invoker/pom.xml | 2 +-
modules/enterprise/server/sars/agent-sar/pom.xml | 2 +-
modules/enterprise/server/sars/pom.xml | 2 +-
modules/enterprise/server/xml-schemas/pom.xml | 2 +-
modules/helpers/bundleGen/pom.xml | 4 ++--
modules/helpers/jeeGen/pom.xml | 2 +-
modules/helpers/perftest-support/pom.xml | 4 ++--
modules/helpers/pom.xml | 2 +-
modules/helpers/rest-docs-generator/pom.xml | 2 +-
modules/helpers/rtfilter-subsystem/pom.xml | 2 +-
modules/helpers/rtfilter/pom.xml | 2 +-
modules/integration-tests/apache-plugin-test/pom.xml | 2 +-
modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 2 +-
modules/integration-tests/jndi-access/pom.xml | 2 +-
modules/integration-tests/jndi-access/remote-server/pom.xml | 2 +-
modules/integration-tests/pom.xml | 2 +-
modules/plugins/aliases/pom.xml | 2 +-
modules/plugins/ant-bundle/pom.xml | 2 +-
modules/plugins/apache/pom.xml | 2 +-
modules/plugins/augeas/pom.xml | 2 +-
modules/plugins/byteman/pom.xml | 2 +-
modules/plugins/cobbler/pom.xml | 2 +-
modules/plugins/cron/pom.xml | 2 +-
modules/plugins/database/pom.xml | 2 +-
modules/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/plugins/grub/pom.xml | 2 +-
modules/plugins/hadoop/pom.xml | 2 +-
modules/plugins/hibernate/pom.xml | 2 +-
modules/plugins/hosts/pom.xml | 2 +-
modules/plugins/hudson/pom.xml | 4 ++--
modules/plugins/iis/pom.xml | 2 +-
modules/plugins/irc/pom.xml | 2 +-
modules/plugins/jboss-as-5/pom.xml | 2 +-
modules/plugins/jboss-as-7/pom.xml | 2 +-
modules/plugins/jboss-as/pom.xml | 2 +-
modules/plugins/jboss-cache-v3/pom.xml | 2 +-
modules/plugins/jboss-cache/pom.xml | 2 +-
modules/plugins/jmx/pom.xml | 2 +-
modules/plugins/kickstart/pom.xml | 2 +-
modules/plugins/mod-cluster/pom.xml | 2 +-
modules/plugins/mysql/pom.xml | 2 +-
modules/plugins/netservices/pom.xml | 2 +-
modules/plugins/noop/pom.xml | 2 +-
modules/plugins/oracle/pom.xml | 2 +-
modules/plugins/pattern-generator/pom.xml | 2 +-
modules/plugins/perftest/pom.xml | 2 +-
modules/plugins/platform/pom.xml | 2 +-
modules/plugins/pom.xml | 2 +-
modules/plugins/postfix/pom.xml | 2 +-
modules/plugins/postgres/pom.xml | 2 +-
modules/plugins/rhq-agent/pom.xml | 2 +-
modules/plugins/rhq-server/pom.xml | 2 +-
modules/plugins/samba/pom.xml | 2 +-
modules/plugins/script/pom.xml | 2 +-
modules/plugins/script2/pom.xml | 2 +-
modules/plugins/snmptrapd/pom.xml | 2 +-
modules/plugins/sshd/pom.xml | 2 +-
modules/plugins/sudoers/pom.xml | 2 +-
modules/plugins/tomcat/pom.xml | 2 +-
modules/plugins/twitter/pom.xml | 2 +-
modules/plugins/validate-all-plugins/pom.xml | 2 +-
modules/plugins/virt/pom.xml | 2 +-
modules/pom.xml | 2 +-
modules/test-utils/pom.xml | 2 +-
pom.xml | 2 +-
142 files changed, 163 insertions(+), 163 deletions(-)
New commits:
commit c880f5a5c3554c911065177d74668ff1495884e6
Author: Hudson <jboss-qa-internal(a)redhat.com>
Date: Tue Oct 2 16:36:51 2012 -0400
tag RHQ_4_5_1
diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml
index 0512e09..1fc919f 100644
--- a/modules/cli-tests/pom.xml
+++ b/modules/cli-tests/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 8220278..49323dc 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml
index 957a3aa..0c28614 100644
--- a/modules/common/drift/pom.xml
+++ b/modules/common/drift/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<artifactId>rhq-common-drift</artifactId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index 5d78026..633c700 100644
--- a/modules/common/filetemplate-bundle/pom.xml
+++ b/modules/common/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<artifactId>rhq-filetemplate-bundle-common</artifactId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index 8fd3438..3fb7db0 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<artifactId>rhq-jboss-as-common</artifactId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index c110eb7..5c94565 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/arquillian-integration/archive/pom.xml b/modules/core/arquillian-integration/archive/pom.xml
index 3f1d2a2..06046ca 100644
--- a/modules/core/arquillian-integration/archive/pom.xml
+++ b/modules/core/arquillian-integration/archive/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-arquillian-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<!-- Model Version -->
diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml
index 062d4cb..36f233b 100644
--- a/modules/core/arquillian-integration/container/pom.xml
+++ b/modules/core/arquillian-integration/container/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-arquillian-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<!-- Model Version -->
diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml
index 69f44a4..32607d8 100644
--- a/modules/core/arquillian-integration/pom.xml
+++ b/modules/core/arquillian-integration/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index c06ce0c..7d92a5f 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index e1201c7..9ff72e4 100644
--- a/modules/core/comm-api/pom.xml
+++ b/modules/core/comm-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 107d490..3fc76de 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index a89c6c1..a1b8427 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<artifactId>rhq-core-domain</artifactId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index 39e05d1..9016014 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index d56a026..1d661c1 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index a0627dc..d550b11 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container-itest/pom.xml b/modules/core/plugin-container-itest/pom.xml
index 24025f5..3715af3 100644
--- a/modules/core/plugin-container-itest/pom.xml
+++ b/modules/core/plugin-container-itest/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<artifactId>rhq-core-plugin-container-itest</artifactId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index 64c3478..8e8a33d 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<artifactId>rhq-core-plugin-container</artifactId>
diff --git a/modules/core/plugin-test-api/pom.xml b/modules/core/plugin-test-api/pom.xml
index a480f22..92d75c0 100644
--- a/modules/core/plugin-test-api/pom.xml
+++ b/modules/core/plugin-test-api/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<artifactId>rhq-core-plugin-test-api</artifactId>
diff --git a/modules/core/plugin-test-util/pom.xml b/modules/core/plugin-test-util/pom.xml
index 6847b77..fa8efd7 100644
--- a/modules/core/plugin-test-util/pom.xml
+++ b/modules/core/plugin-test-util/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index 535915a..a568111 100644
--- a/modules/core/plugin-validator/pom.xml
+++ b/modules/core/plugin-validator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml
index 33549a8..a234f5a 100644
--- a/modules/core/plugindoc/pom.xml
+++ b/modules/core/plugindoc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 57a761f..79d9364 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index 9514f2b..ec94099 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<artifactId>rhq-core-util</artifactId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index 52ed8d1..f08536c 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 44c643c..9bb5056 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
index 7820e97..abc2e7f 100644
--- a/modules/enterprise/binding/pom.xml
+++ b/modules/enterprise/binding/pom.xml
@@ -3,10 +3,10 @@
<parent>
<artifactId>rhq-enterprise-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<artifactId>rhq-script-bindings</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>RHQ Script Bindings</name>
<description>Abstraction of different facilities and default configurations for script bindings</description>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index 31fcaa7..f946447 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index c2611d3..cb84548 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml
index 922dc43..d09bd00 100644
--- a/modules/enterprise/gui/base-perspective-war/pom.xml
+++ b/modules/enterprise/gui/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index 0ab5396..72a415f 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-gui-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index 2f996e4..fa6f33f 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index cea14e6..1551bbb 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index 6b69a24..b3803ef 100644
--- a/modules/enterprise/gui/pom.xml
+++ b/modules/enterprise/gui/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index 4b836a3..1ec7e5d 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml
index c856868..cb6780c 100644
--- a/modules/enterprise/gui/rest-war/pom.xml
+++ b/modules/enterprise/gui/rest-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 8cc587f..9c133ee 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index 64502d3..e34f2e8 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index 590957e..7c72e57 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml
index e820c88..88f502a 100644
--- a/modules/enterprise/remoting/client-deps/pom.xml
+++ b/modules/enterprise/remoting/client-deps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index f3bbc95..3477ad2 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index 2f90a0b..0499f8d 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/scripting/api/pom.xml b/modules/enterprise/scripting/api/pom.xml
index c51cd9f..c3a9dde 100644
--- a/modules/enterprise/scripting/api/pom.xml
+++ b/modules/enterprise/scripting/api/pom.xml
@@ -3,10 +3,10 @@
<parent>
<artifactId>rhq-scripting-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<artifactId>rhq-scripting-api</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>RHQ Scripting API</name>
<description>Provides API for adding scripting support to RHQ using different javax.scripting - based interpreters</description>
diff --git a/modules/enterprise/scripting/javascript/pom.xml b/modules/enterprise/scripting/javascript/pom.xml
index 54d2275..4d5e4db 100644
--- a/modules/enterprise/scripting/javascript/pom.xml
+++ b/modules/enterprise/scripting/javascript/pom.xml
@@ -4,10 +4,10 @@
<parent>
<artifactId>rhq-scripting-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<artifactId>rhq-scripting-javascript</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>RHQ Javascript support</name>
<description>Provides RHQ scripting in Javascript using Rhino</description>
diff --git a/modules/enterprise/scripting/pom.xml b/modules/enterprise/scripting/pom.xml
index 21a6ba1..0e8040f 100644
--- a/modules/enterprise/scripting/pom.xml
+++ b/modules/enterprise/scripting/pom.xml
@@ -3,12 +3,12 @@
<parent>
<artifactId>rhq-enterprise-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<artifactId>rhq-scripting-parent</artifactId>
<packaging>pom</packaging>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>RHQ Scripting Parent Module</name>
<modules>
diff --git a/modules/enterprise/scripting/python/pom.xml b/modules/enterprise/scripting/python/pom.xml
index 5b77bcb..aa80af5 100644
--- a/modules/enterprise/scripting/python/pom.xml
+++ b/modules/enterprise/scripting/python/pom.xml
@@ -3,10 +3,10 @@
<parent>
<artifactId>rhq-scripting-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<artifactId>rhq-scripting-python</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>RHQ Python support</name>
<description>Provides RHQ scripting in Python using Jython</description>
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index 81b5657..a9627f7 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -5,13 +5,13 @@
<parent>
<artifactId>rhq-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-server-client-api</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>RHQ Enterprise Server Client API</name>
<description>The implementation of the client API when accessing the server locally</description>
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index 6b75d0c..4a82090 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index 80a3d21..2a3ceb6 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 3d8e4c1..1e7d98f 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index e306223..9e581ee 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 3349a1a..92a7458 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml
index 431996e..d9c75e4 100644
--- a/modules/enterprise/server/plugins/alert-cli/pom.xml
+++ b/modules/enterprise/server/plugins/alert-cli/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>alert-cli</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>RHQ Enterprise Server CLI Script Alert Plugin</name>
<description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml
index 93197b6..5ce247d 100644
--- a/modules/enterprise/server/plugins/alert-email/pom.xml
+++ b/modules/enterprise/server/plugins/alert-email/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.server</groupId>
<artifactId>alert-email</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>RHQ Enterprise Server Email Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml
index 95f1902..d514ebc 100644
--- a/modules/enterprise/server/plugins/alert-irc/pom.xml
+++ b/modules/enterprise/server/plugins/alert-irc/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-irc</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>RHQ Enterprise Server IRC Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml
index 12d50e0..63d26bc 100644
--- a/modules/enterprise/server/plugins/alert-log4j/pom.xml
+++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-log4j</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>RHQ Enterprise Server Log4J Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml
index d5acefb..2672571 100644
--- a/modules/enterprise/server/plugins/alert-microblog/pom.xml
+++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-microblog</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>RHQ Enterprise Server Microblog Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
index 9c6e8b0..73bbec4 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
+++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-mobicents</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>RHQ Enterprise Server Mobicents Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index dc0421d..f7884c2 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -2,14 +2,14 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-operations</artifactId>
<packaging>jar</packaging>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>RHQ Enterprise Server Opertions Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index c0d93f9..216c40c 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-roles</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>RHQ Enterprise Server Roles Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml
index debb617..45ec86e 100644
--- a/modules/enterprise/server/plugins/alert-snmp/pom.xml
+++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-snmp</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>RHQ Enterprise Server SNMP Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml
index 7b4696f..06be7b9 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-subject</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>RHQ Enterprise Server Subject Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index 32b07ea..a9b51d8 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</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 468d8b8..0543d7a 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>rhq-serverplugin-cobbler</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>RHQ Enterprise Server Cobbler Plugin</name>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
index 3e637a1..f121796 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/drift-mongodb/pom.xml b/modules/enterprise/server/plugins/drift-mongodb/pom.xml
index 42c34bb..8f4a9b9 100644
--- a/modules/enterprise/server/plugins/drift-mongodb/pom.xml
+++ b/modules/enterprise/server/plugins/drift-mongodb/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml
index 4e05d27..8479a09 100644
--- a/modules/enterprise/server/plugins/drift-rhq/pom.xml
+++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</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 77cbd3e..05b805d 100644
--- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</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 d5f8ed4..822edad 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
index 64d63be..721ebdd 100644
--- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml
+++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>packagetype-cli</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>RHQ Enterprise Server CLI Package Type Plugin</name>
diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
index dda0e8e..253ecdd 100644
--- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml
index 8582ed1..593ec49 100644
--- a/modules/enterprise/server/plugins/perspectives/core/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 022d242..9eecb4a 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index f90c8b1..36ea8dc 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</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 cd549bd..8cb5262 100644
--- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
+++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</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 1b44c0b..4c6e595 100644
--- a/modules/enterprise/server/plugins/yum/pom.xml
+++ b/modules/enterprise/server/plugins/yum/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml
index 1d20532..51cdd13 100644
--- a/modules/enterprise/server/pom.xml
+++ b/modules/enterprise/server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml
index fc95919..33f858d 100644
--- a/modules/enterprise/server/safe-invoker/pom.xml
+++ b/modules/enterprise/server/safe-invoker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index 94741fc..972f9e9 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index 40b66cd..7b3fcfe 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index 1707a63..c1e1192 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml
index cfe496e..c93d28d 100644
--- a/modules/helpers/bundleGen/pom.xml
+++ b/modules/helpers/bundleGen/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.helpers</groupId>
<artifactId>bundleGen</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<build>
<plugins>
diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml
index 3e35e2e..e6e24ff 100644
--- a/modules/helpers/jeeGen/pom.xml
+++ b/modules/helpers/jeeGen/pom.xml
@@ -9,7 +9,7 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml
index 6e38e1e..9ffcc55 100644
--- a/modules/helpers/perftest-support/pom.xml
+++ b/modules/helpers/perftest-support/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>perftest-support</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<name>Performance Testing Support</name>
<description>To support performance testing, this is a basic tool to support extracting and later reimporting of
data from/to a database.
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index 484d8e8..e7ecda6 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/rest-docs-generator/pom.xml b/modules/helpers/rest-docs-generator/pom.xml
index cde6c05..d6a131c 100644
--- a/modules/helpers/rest-docs-generator/pom.xml
+++ b/modules/helpers/rest-docs-generator/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml
index 3f9f776..9bd4145 100644
--- a/modules/helpers/rtfilter-subsystem/pom.xml
+++ b/modules/helpers/rtfilter-subsystem/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index a52adf4..267d687 100644
--- a/modules/helpers/rtfilter/pom.xml
+++ b/modules/helpers/rtfilter/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml
index 8cabf7c..667738d 100644
--- a/modules/integration-tests/apache-plugin-test/pom.xml
+++ b/modules/integration-tests/apache-plugin-test/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-integration-tests</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
index 6a0328d..f3e2028 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
+++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>jndi-access-test-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml
index fbb48e5..3f312b6 100644
--- a/modules/integration-tests/jndi-access/pom.xml
+++ b/modules/integration-tests/jndi-access/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-integration-tests</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml
index a29e292..7d2a9cb 100644
--- a/modules/integration-tests/jndi-access/remote-server/pom.xml
+++ b/modules/integration-tests/jndi-access/remote-server/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>jndi-access-test-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index eb16e50..16c87ea 100644
--- a/modules/integration-tests/pom.xml
+++ b/modules/integration-tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index 6438439..643ba73 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 1569309..6adc582 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index a6bae68..906d485 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 44ae867..d5ff15f 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index d6da811..edb9ce5 100644
--- a/modules/plugins/byteman/pom.xml
+++ b/modules/plugins/byteman/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index 2231a29..4f0351b 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index e64a384..71f50fd 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 749b386..1f072e0 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index c8aeaad..f3f92cf 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index 9a109d7..6c6d6b2 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index a652161..048a7dc 100644
--- a/modules/plugins/hadoop/pom.xml
+++ b/modules/plugins/hadoop/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index 4b25432..85dbffb 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>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index 85615e0..0da4d70 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index 46a0936..7b15fee 100644
--- a/modules/plugins/hudson/pom.xml
+++ b/modules/plugins/hudson/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-hudson-plugin</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<packaging>jar</packaging>
<name>RHQ Hudson Plugin</name>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index f743e54..2c7915f 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index 75ba738..ed1685e 100644
--- a/modules/plugins/irc/pom.xml
+++ b/modules/plugins/irc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</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 9b8f10c..9afcc9e 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index 54c232e..73a963c 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 2437975..3ab437d 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</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 b7a7630..243b987 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index 0d7a467..f068ffb 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index a9d51ca..8657ddc 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index 67c6d43..0df9f85 100644
--- a/modules/plugins/kickstart/pom.xml
+++ b/modules/plugins/kickstart/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml
index 07348bc..e00c1f8 100644
--- a/modules/plugins/mod-cluster/pom.xml
+++ b/modules/plugins/mod-cluster/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index b041e3f..8fcec78 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 7062c0b..c3293e8 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/noop/pom.xml b/modules/plugins/noop/pom.xml
index c515a4a..831f651 100644
--- a/modules/plugins/noop/pom.xml
+++ b/modules/plugins/noop/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 8d1fdc5..9b616f1 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml
index 01703ba..b9f6e72 100644
--- a/modules/plugins/pattern-generator/pom.xml
+++ b/modules/plugins/pattern-generator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 5f1938a..e90c29d 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index 9d6d238..610b862 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index bc8bffb..e7aa078 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 1a12253..0493ed8 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index 4581271..46ae64d 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index ce75832..2667361 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index 99be4dd..e0c624c 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index c6fe3bf..0a04eb6 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index 532745a..11ed852 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index af2fa4e..086d2d8 100644
--- a/modules/plugins/script2/pom.xml
+++ b/modules/plugins/script2/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index 88b6259..9e854e0 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index 87e5b2c..0030580 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index 6c4e8d1..11b5dca 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index ba5d3d2..e4b6760 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index 5a7cc21..c637e6e 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</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 9b04914..7d5f319 100644
--- a/modules/plugins/validate-all-plugins/pom.xml
+++ b/modules/plugins/validate-all-plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index ad73300..3c8ec80 100644
--- a/modules/plugins/virt/pom.xml
+++ b/modules/plugins/virt/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index 5ba9cac..6a8d3cf 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 7ab753e..4ae7ebb 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>rhq-modules-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
</parent>
<artifactId>test-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index 1649aa6..4fcea17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0</version>
+ <version>4.5.1</version>
<packaging>pom</packaging>
<name>RHQ</name>
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java | 102 +++++++++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java | 4
2 files changed, 97 insertions(+), 9 deletions(-)
New commits:
commit 88e982cc45e152fc2025bd73f7e8f7a6ed9d52bb
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Tue Oct 2 22:18:32 2012 +0200
[Bug 860818 - operation schedule doesn't show proper "repeat every" value] The "seconds" unit type was used no matter what actual units were selected. Now when the operation is scheduled, the "repeat every" value is persisted to DB in millis and when displaying the details about the op., the millis are converted to human readable form.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java
index 486b20b..acd80bf 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java
@@ -55,6 +55,14 @@ public class DurationItem extends CanvasItem {
private static final String FIELD_VALUE = "value";
private static final String FIELD_UNITS = "units";
+
+ private static final long SECOND_IN_MILLIS = 1000L;
+ private static final long MINUTE_IN_MILLIS = 60 * SECOND_IN_MILLIS;
+ private static final long HOUR_IN_MILLIS = 60 * MINUTE_IN_MILLIS;
+ private static final long DAY_IN_MILLIS = 24 * HOUR_IN_MILLIS;
+ private static final long WEEK_IN_MILLIS = 7 * DAY_IN_MILLIS;
+ private static final long MONTH_IN_MILLIS = 30 * DAY_IN_MILLIS;
+ private static final long YEAR_IN_MILLIS = 365 * DAY_IN_MILLIS;
private final DynamicForm form;
private TimeUnit defaultTimeUnit;
@@ -214,6 +222,86 @@ public class DurationItem extends CanvasItem {
setValue(value);
}
+ /**
+ * Sets human readable time representation to the form's field "value"
+ *
+ * @param longValue the time period representation in milliseconds
+ */
+ public void setAndFormatValue(long longValue) {
+ if (longValue < 0) {
+ throw new IllegalArgumentException("negative time period " + longValue);
+ }
+ String formattedOutput = formatMilliseconds(longValue);
+ this.unitType = UnitType.TIME;
+ this.form.setValue(FIELD_VALUE, formattedOutput);
+ setValue(formattedOutput);
+ }
+
+ /**
+ * formatMilliseconds(10 * WEEK_IN_MILLIS + 2 * SECOND_IN_MILLIS) = 2 months 2 weeks 2 seconds
+ *
+ * @param longValue
+ * @return formatted string with time period representation
+ */
+ private String formatMilliseconds(long longValue) {
+ if (longValue < 0) {
+ throw new IllegalArgumentException("negative time period " + longValue);
+ }
+ String formattedOutput = null;
+ long wholeUnits = 0;
+ if (longValue < SECOND_IN_MILLIS) { //ms
+ return getTimeValue(longValue, TimeUnit.MILLISECONDS);
+ } else if (longValue < MINUTE_IN_MILLIS) { //s
+ wholeUnits = longValue / SECOND_IN_MILLIS;
+ formattedOutput = getTimeValue(wholeUnits, TimeUnit.SECONDS);
+ return formattedOutput
+ + ((wholeUnits * SECOND_IN_MILLIS < longValue) ? " "
+ + formatMilliseconds(longValue - wholeUnits * SECOND_IN_MILLIS) : "");
+ } else if (longValue < HOUR_IN_MILLIS) { //m
+ wholeUnits = longValue / MINUTE_IN_MILLIS;
+ formattedOutput = getTimeValue(wholeUnits, TimeUnit.MINUTES);
+ return formattedOutput
+ + ((wholeUnits * MINUTE_IN_MILLIS < longValue) ? " "
+ + formatMilliseconds(longValue - wholeUnits * MINUTE_IN_MILLIS) : "");
+ } else if (longValue < DAY_IN_MILLIS) { //h
+ wholeUnits = longValue / HOUR_IN_MILLIS;
+ formattedOutput = getTimeValue(wholeUnits, TimeUnit.HOURS);
+ return formattedOutput
+ + ((wholeUnits * HOUR_IN_MILLIS < longValue) ? " "
+ + formatMilliseconds(longValue - wholeUnits * HOUR_IN_MILLIS) : "");
+ } else if (longValue < WEEK_IN_MILLIS) { //d
+ wholeUnits = longValue / DAY_IN_MILLIS;
+ formattedOutput = getTimeValue(wholeUnits, TimeUnit.DAYS);
+ return formattedOutput
+ + ((wholeUnits * DAY_IN_MILLIS < longValue) ? " "
+ + formatMilliseconds(longValue - wholeUnits * DAY_IN_MILLIS) : "");
+ } else if (longValue < MONTH_IN_MILLIS) { //w
+ wholeUnits = longValue / WEEK_IN_MILLIS;
+ formattedOutput = getTimeValue(wholeUnits, TimeUnit.WEEKS);
+ return formattedOutput
+ + ((wholeUnits * WEEK_IN_MILLIS < longValue) ? " "
+ + formatMilliseconds(longValue - wholeUnits * WEEK_IN_MILLIS) : "");
+ } else if (longValue < YEAR_IN_MILLIS) { //M
+ wholeUnits = longValue / MONTH_IN_MILLIS;
+ formattedOutput = getTimeValue(wholeUnits, TimeUnit.MONTHS);
+ return formattedOutput
+ + ((wholeUnits * MONTH_IN_MILLIS < longValue) ? " "
+ + formatMilliseconds(longValue - wholeUnits * MONTH_IN_MILLIS) : "");
+ } else if (longValue >= YEAR_IN_MILLIS) { //y
+ wholeUnits = longValue / YEAR_IN_MILLIS;
+ formattedOutput = getTimeValue(wholeUnits, TimeUnit.YEARS);
+ return formattedOutput
+ + ((wholeUnits * YEAR_IN_MILLIS < longValue) ? " "
+ + formatMilliseconds(longValue - wholeUnits * YEAR_IN_MILLIS) : "");
+ } else {
+ return "";
+ }
+ }
+
+ private String getTimeValue(long value, TimeUnit valueUnit) {
+ return value + " " + valueUnit.getDisplayName();
+ }
+
private void updateValue() {
Long value = calculateValue();
setValue(value);
@@ -253,7 +341,7 @@ public class DurationItem extends CanvasItem {
convertedValue = integerValue;
break;
case MILLISECONDS:
- convertedValue = integerValue * 1000;
+ convertedValue = integerValue * SECOND_IN_MILLIS;
break;
}
break;
@@ -266,7 +354,7 @@ public class DurationItem extends CanvasItem {
convertedValue = integerValue * 60;
break;
case MILLISECONDS:
- convertedValue = integerValue * 60 * 1000;
+ convertedValue = integerValue * MINUTE_IN_MILLIS;
break;
}
break;
@@ -282,7 +370,7 @@ public class DurationItem extends CanvasItem {
convertedValue = integerValue * 60 * 60;
break;
case MILLISECONDS:
- convertedValue = integerValue * 60 * 60 * 1000;
+ convertedValue = integerValue * HOUR_IN_MILLIS;
break;
}
break;
@@ -301,7 +389,7 @@ public class DurationItem extends CanvasItem {
convertedValue = integerValue * 24 * 60 * 60;
break;
case MILLISECONDS:
- convertedValue = integerValue * 24 * 60 * 60 * 1000;
+ convertedValue = integerValue * DAY_IN_MILLIS;
break;
}
break;
@@ -323,7 +411,7 @@ public class DurationItem extends CanvasItem {
convertedValue = integerValue * 7 * 24 * 60 * 60;
break;
case MILLISECONDS:
- convertedValue = integerValue * 7 * 24 * 60 * 60 * 1000;
+ convertedValue = integerValue * WEEK_IN_MILLIS;
break;
}
break;
@@ -348,7 +436,7 @@ public class DurationItem extends CanvasItem {
convertedValue = integerValue * 30 * 24 * 60 * 60;
break;
case MILLISECONDS:
- convertedValue = integerValue * 30 * 24 * 60 * 60 * 1000;
+ convertedValue = integerValue * MONTH_IN_MILLIS;
break;
}
break;
@@ -376,7 +464,7 @@ public class DurationItem extends CanvasItem {
convertedValue = integerValue * 365 * 24 * 60 * 60;
break;
case MILLISECONDS:
- convertedValue = integerValue * 365 * 24 * 60 * 60 * 1000;
+ convertedValue = integerValue * YEAR_IN_MILLIS;
break;
}
break;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java
index 3cde889..c9c1c35 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java
@@ -149,8 +149,8 @@ public class JobTriggerEditor extends LocatableVLayout {
changeCalendarType("laterAndRepeat");
DurationItem repeatIntervalItem = (DurationItem) this.repeatForm.getItem(FIELD_REPEAT_INTERVAL);
- repeatIntervalItem.setValue(this.jobTrigger.getRepeatInterval().intValue(), UnitType.TIME);
-
+ repeatIntervalItem.setAndFormatValue(this.jobTrigger.getRepeatInterval());
+
FormItem endTimeItem = this.repeatForm.getField(FIELD_END_TIME);
DurationItem repeatDurationItem = (DurationItem) this.repeatForm.getItem(FIELD_REPEAT_DURATION);
FormItem recurrenceTypeItem = this.repeatForm.getField(FIELD_RECURRENCE_TYPE);
1
0
modules/enterprise/server/sars/pom.xml | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit f337aa290f38630c9b279f8de2ccf6856cb21310
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Oct 2 15:00:41 2012 -0400
take agent-sar out of the build
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index f21578d..2fad1d7 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -30,7 +30,9 @@
</build>
<modules>
+ <!--
<module>agent-sar</module>
+ -->
<module>services-sar</module>
</modules>
1
0
modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerProperties.java | 8 --------
1 file changed, 8 deletions(-)
New commits:
commit bd617006c8b602ce528368b30d19d91cab88512b
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Oct 2 13:53:38 2012 -0400
take out embedded agent properties definitions from installer constants
diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerProperties.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerProperties.java
index 9dcd5d5..7a04a6a 100644
--- a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerProperties.java
+++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerProperties.java
@@ -43,11 +43,6 @@ public class ServerProperties {
public static final String PROP_WEB_HTTP_PORT = "rhq.server.socket.binding.port.http";
public static final String PROP_WEB_HTTPS_PORT = "rhq.server.socket.binding.port.https";
- public static final String PROP_EMBEDDED_AGENT_ENABLED = "rhq.server.embedded-agent.enabled";
- public static final String PROP_EMBEDDED_AGENT_NAME = "rhq.server.embedded-agent.name";
- public static final String PROP_EMBEDDED_AGENT_DISABLE_NATIVE = "rhq.server.embedded-agent.disable-native-system";
- public static final String PROP_EMBEDDED_AGENT_RESET_CONFIGURATION = "rhq.server.embedded-agent.reset-configuration";
-
public static final String PROP_EMAIL_SMTP_HOST = "rhq.server.email.smtp-host";
public static final String PROP_EMAIL_SMTP_PORT = "rhq.server.email.smtp-port";
public static final String PROP_EMAIL_FROM_ADDRESS = "rhq.server.email.from-address";
@@ -123,9 +118,6 @@ public class ServerProperties {
static {
BOOLEAN_PROPERTIES = new HashSet<String>();
BOOLEAN_PROPERTIES.add(PROP_SECURITY_CLIENT_SERVER_AUTH_MODE_ENABLED);
- BOOLEAN_PROPERTIES.add(PROP_EMBEDDED_AGENT_ENABLED);
- BOOLEAN_PROPERTIES.add(PROP_EMBEDDED_AGENT_DISABLE_NATIVE);
- BOOLEAN_PROPERTIES.add(PROP_EMBEDDED_AGENT_RESET_CONFIGURATION);
BOOLEAN_PROPERTIES.add(PROP_MM_AT_START);
BOOLEAN_PROPERTIES.add(PROP_AUTOINSTALL_ENABLE);
BOOLEAN_PROPERTIES.add(PROP_AGENT_MULTICAST_DETECTOR_ENABLED);
1
0
modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java | 25 ++-
modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/commands/ScriptCommandTest.java | 4
modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java | 66 ----------
modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java | 26 +++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java | 32 ++++
5 files changed, 77 insertions(+), 76 deletions(-)
New commits:
commit 76a91bd24c1acb40e190c66271964ecea3bfe881
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Oct 2 16:45:55 2012 +0200
Make the RhqManager class the sole place to define everything is necessary
for defining and making available a new *Manager to the scripting clients.
Also removed a property on RhqManager that was only used in a single test
method and replaced its usage.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java
index cfa52e2..1dd79f1 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java
@@ -89,14 +89,17 @@ public enum RhqManager {
SynchronizationManager(SynchronizationManagerRemote.class, "${SynchronizationManager}");
private Class<?> remote;
- private String remoteName;
+ private String localInterfaceClassName;
private String beanName;
private boolean enabled;
+ private static final int REMOTE_IFACE_SUFFIX_LENGTH = "Remote".length();
+
private RhqManager(Class<?> remote, String enable) {
this.remote = remote;
this.beanName = this.name() + "Bean";
- this.remoteName = this.name() + "Remote";
+ localInterfaceClassName = getLocalInterfaceClassName(remote);
+
//defaults and evaluates to TRUE unless the string contains "false". Done to defend against
//possible errors in string replacement during rhq build.
this.enabled = true;
@@ -119,15 +122,25 @@ public enum RhqManager {
return this.remote;
}
- public String beanName() {
- return this.beanName;
+ public String localInterfaceClassName() {
+ return localInterfaceClassName;
}
- public String remoteName() {
- return this.remoteName;
+ public String beanName() {
+ return this.beanName;
}
public boolean enabled() {
return this.enabled;
}
+
+ private static String getLocalInterfaceClassName(Class<?> remoteIface) {
+ String ifaceName = remoteIface.getName();
+ if (!ifaceName.endsWith("Remote")) {
+ throw new AssertionError("Inconsistent SLSB naming in RHQ! Remote interface '" + remoteIface.getName()
+ + "' does not follow the established naming convention. This is a bug, please report it.");
+ }
+
+ return ifaceName.substring(0, ifaceName.length() - REMOTE_IFACE_SUFFIX_LENGTH) + "Local";
+ }
}
\ No newline at end of file
diff --git a/modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/commands/ScriptCommandTest.java b/modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/commands/ScriptCommandTest.java
index 8cf3ceb..d5f1c00 100644
--- a/modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/commands/ScriptCommandTest.java
+++ b/modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/commands/ScriptCommandTest.java
@@ -61,11 +61,11 @@ public class ScriptCommandTest {
void assertManagersBoundToScript() {
ScriptEngine scriptEngine = client.getScriptEngine();
- List<String> mgrsNotBound = new ArrayList<String>();
+ List<Class<?>> mgrsNotBound = new ArrayList<Class<?>>();
for (RhqManager mgr : RhqManager.values()) {
if (!scriptEngine.getBindings(ScriptContext.ENGINE_SCOPE).containsKey(mgr.name())) {
- mgrsNotBound.add(mgr.remoteName());
+ mgrsNotBound.add(mgr.remote());
}
}
diff --git a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java
index 5cbed7e..a918389 100644
--- a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java
+++ b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java
@@ -137,70 +137,6 @@ public class LocalClient implements RhqFacade {
}
private Object getLocalSLSB(RhqManager manager) {
- switch (manager) {
- case AlertDefinitionManager:
- return LookupUtil.getAlertDefinitionManager();
- case AlertManager:
- return LookupUtil.getAlertManager();
- case AvailabilityManager:
- return LookupUtil.getAvailabilityManager();
- case BundleManager:
- return LookupUtil.getBundleManager();
- case CallTimeDataManager:
- return LookupUtil.getCallTimeDataManager();
- case ConfigurationManager:
- return LookupUtil.getConfigurationManager();
- case ContentManager:
- return LookupUtil.getContentManager();
- case DataAccessManager:
- return LookupUtil.getDataAccessManager();
- case DiscoveryBoss:
- return LookupUtil.getDiscoveryBoss();
- case DriftManager:
- return LookupUtil.getDriftManager();
- case DriftTemplateManager:
- return LookupUtil.getDriftTemplateManager();
- case EventManager:
- return LookupUtil.getEventManager();
- case MeasurementBaselineManager:
- return LookupUtil.getMeasurementBaselineManager();
- case MeasurementDataManager:
- return LookupUtil.getMeasurementDataManager();
- case MeasurementDefinitionManager:
- return LookupUtil.getMeasurementDefinitionManager();
- case MeasurementScheduleManager:
- return LookupUtil.getMeasurementScheduleManager();
- case OperationManager:
- return LookupUtil.getOperationManager();
- case RemoteInstallManager:
- return LookupUtil.getRemoteInstallManager();
- case RepoManager:
- return LookupUtil.getRepoManagerLocal();
- case ResourceFactoryManager:
- return LookupUtil.getResourceFactoryManager();
- case ResourceGroupManager:
- return LookupUtil.getResourceGroupManager();
- case ResourceManager:
- return LookupUtil.getResourceManager();
- case ResourceTypeManager:
- return LookupUtil.getResourceTypeManager();
- case RoleManager:
- return LookupUtil.getRoleManager();
- case SavedSearchManager:
- return LookupUtil.getSavedSearchManager();
- case SubjectManager:
- return LookupUtil.getSubjectManager();
- case SupportManager:
- return LookupUtil.getSupportManager();
- case SynchronizationManager:
- return LookupUtil.getSynchronizationManager();
- case SystemManager:
- return LookupUtil.getSystemManager();
- case TagManager:
- return LookupUtil.getTagManager();
- }
-
- throw new IllegalStateException("LocalClient does not handle the manager: " + manager
- + ". This is a bug, please report it.");
+ return LookupUtil.getEjb(manager.beanName(), manager.localInterfaceClassName());
}
}
diff --git a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java
index 61f9ea0..c7165cc 100644
--- a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java
+++ b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java
@@ -19,11 +19,15 @@
package org.rhq.enterprise.client.test;
+import static org.testng.Assert.assertEquals;
+
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.net.URL;
import java.net.URLClassLoader;
+import java.util.Arrays;
+import java.util.HashSet;
import java.util.Hashtable;
import javax.naming.Context;
@@ -63,8 +67,12 @@ public class LocalClientTest extends JMockTest {
System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FakeContextFactory.class.getName());
}
- @Test
- public void testResilienceAgainstContextClassloaders() throws Exception {
+ /**
+ * Needs to be called from within a test method so that the "context" variable is available.
+ *
+ * @throws NamingException
+ */
+ private void setupFakeJndiLookup() throws NamingException {
CONTEXT_MOCK_FOR_TEST = context.mock(Context.class);
context.checking(new Expectations() {{
@@ -102,6 +110,20 @@ public class LocalClientTest extends JMockTest {
allowing(CONTEXT_MOCK_FOR_TEST).close();
}});
+ }
+
+ @Test
+ public void testAllManagersInstantiable() throws Exception {
+ setupFakeJndiLookup();
+
+ LocalClient lc = new LocalClient(null);
+ assertEquals(lc.getScriptingAPI().keySet(), new HashSet<RhqManager>(Arrays.asList(RhqManager.values())),
+ "Scripting API contains different managers than expected.");
+ }
+
+ @Test
+ public void testResilienceAgainstContextClassloaders() throws Exception {
+ setupFakeJndiLookup();
ClassLoader origCl = Thread.currentThread().getContextClassLoader();
try {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java
index e49498c..8ef6a9f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java
@@ -632,6 +632,18 @@ public final class LookupUtil {
return service;
}
+ /**
+ * Generic method to lookup an Ejb bean by name and the interface name
+ *
+ * @param beanName the name of the EJB bean
+ * @param interfaceName the full class name of either the remote or local interface
+ *
+ * @return the bean accessed through specified inerface
+ */
+ public static Object getEjb(String beanName, String interfaceName) {
+ return lookupByName(beanName, interfaceName);
+ }
+
//--------------------------------------------
// The TEST services
//--------------------------------------------
@@ -658,8 +670,15 @@ public final class LookupUtil {
// Private Methods
+ //in this method, we don't actually need the interfaceName yet, but
+ //this will become necessary as soon as we start using AS7 as our container.
+ //So let's be proactive here ;)
+ private static String getLocalJNDIName(String beanName, String interfaceName) {
+ return (embeddedDeployment ? "" : (RHQConstants.EAR_NAME + "/")) + beanName + "/local";
+ }
+
private static <T> String getLocalJNDIName(@NotNull Class<? super T> beanClass) {
- return (embeddedDeployment ? "" : (RHQConstants.EAR_NAME + "/")) + beanClass.getSimpleName() + "/local";
+ return getLocalJNDIName(beanClass.getSimpleName(), beanClass.getName().replace("Bean", "Local"));
}
/**
@@ -685,6 +704,17 @@ public final class LookupUtil {
}
}
+ private static Object lookupByName(String beanName, String localInterfaceName) {
+ String localJNDIName = "-not initialized-";
+ try {
+ localJNDIName = getLocalJNDIName(beanName, localInterfaceName);
+ return lookup(localJNDIName);
+ } catch (NamingException e) {
+ throw new RuntimeException("Failed to lookup local interface to EJB " + beanName + ", localJNDI=["
+ + localJNDIName + "]", e);
+ }
+ }
+
@SuppressWarnings("unchecked")
private static <T> T lookupRemote(Class<? super T> type) {
try {
1
0
modules/core/dbutils/pom.xml | 2 +-
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 84e7e552a2ee7d05aff8eb489c66cdfe6adf2bd0
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Oct 2 11:43:10 2012 -0500
[BZ 861127] Revert back to sequential db upgrade ids.
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index becb85e..107d490 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -17,7 +17,7 @@
<description>Database schema setup, upgrade and other utilities</description>
<properties>
- <db.schema.version>2.125</db.schema.version>
+ <db.schema.version>2.124</db.schema.version>
<rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping>
<rhq.ds.server-name>${rhq.test.ds.server-name}</rhq.ds.server-name>
<rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name>
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 00722db..84fbf5e 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -4037,20 +4037,25 @@
</schemaSpec>
-<!-- RHQ 4.5.0 uses DB Schema 2.125 -->
- <schemaSpec version="2.125">
+<!-- RHQ 4.5.0 uses DB Schema 2.123 -->
+
+ <schemaSpec version="2.124">
+
<schema-directSQL>
<statement desc="Update the NULL to 0 for MIN_ENTRIES">
UPDATE RHQ_CONFIG_PROP_DEF
SET MIN_ENTRIES = 0
WHERE MIN_ENTRIES IS NULL
+ AND DTYPE = 'list'
</statement>
<statement desc="Update the NULL to 32767 for MAX_ENTRIES">
UPDATE RHQ_CONFIG_PROP_DEF
SET MAX_ENTRIES = 32767
WHERE MAX_ENTRIES IS NULL
+ AND DTYPE = 'list'
</statement>
</schema-directSQL>
+
</schemaSpec>
</dbupgrade>
1
0
modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 21 ++++++----
1 file changed, 14 insertions(+), 7 deletions(-)
New commits:
commit 4939d0d0617401d420ca499236b7f68eb733cdc7
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Oct 2 11:35:22 2012 -0400
do not deploy embedded agent. it is not working yet
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
index 2a5da0d..54dcbc4 100644
--- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
@@ -244,11 +244,24 @@
dest="${jboss.deploy.dir}/rhq-installer.war" />
<touch file="${jboss.deploy.dir}/rhq-installer.war.dodeploy" />
+ <!--TODO - this isn't working now - we need to:
+ 1) add AS7's jars jboss-as-[jmx,server]-7.x.x.Final.jar to META-INF/embedded-agent/lib
+ 2) get the agent to successfully see that the server is started (AgentMain.waitForServer was hanging for me)
+ So until we fix this we need to not deploy this at all.
+ Note that I also took out the sysprops for embedded agent from rhq-server.properties.
+ If we resurrect embedded agent, add this to the rhq-server.properties created down below:
+ # Embedded RHQ Agent
+ rhq.server.embedded-agent.enabled=false
+ rhq.server.embedded-agent.name=
+ rhq.server.embedded-agent.reset-configuration=true
+ rhq.server.embedded-agent.disable-native-system=false
+
<echo>Deploying embedded agent sar ...</echo>
<mkdir dir="${jboss.deploy.dir}/rhq-agent.sar" />
<unjar src="${settings.localRepository}/org/rhq/rhq-enterprise-server-agent-sar/${rhq.version}/rhq-enterprise-server-agent-sar-${rhq.version}.sar"
dest="${jboss.deploy.dir}/rhq-agent.sar" />
- <touch file="${jboss.deploy.dir}/rhq-agent.sar.skipdeploy" /> <!-- TODO: make this dodeploy -->
+ <touch file="${jboss.deploy.dir}/rhq-agent.sar.dodeploy" />
+ -->
<echo>Delete docs, README, et. al. files</echo>
<delete dir="${jboss.home}/docs/examples" />
@@ -443,12 +456,6 @@ rhq.server.client.security.truststore.type=JKS
rhq.server.client.security.truststore.password=RHQManagement
rhq.server.client.security.server-auth-mode-enabled=false
-# Embedded RHQ Agent
-rhq.server.embedded-agent.enabled=false
-rhq.server.embedded-agent.name=
-rhq.server.embedded-agent.reset-configuration=true
-rhq.server.embedded-agent.disable-native-system=false
-
# Email
rhq.server.email.smtp-host=localhost
rhq.server.email.smtp-port=25
1
0
modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 20
modules/enterprise/server/sars/agent-sar/pom.xml | 21
modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapService.java | 326 ++-
modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapServiceMBean.java | 24
modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/embedded-agent-configuration.xml | 1062 ----------
modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/jboss-deployment-structure.xml | 12
modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/jboss-service.xml | 129 -
modules/enterprise/server/sars/agent-sar/src/main/resources/embedded-agent-configuration-overrides.properties | 29
modules/enterprise/server/sars/agent-sar/src/main/resources/embedded-agent-configuration.xml | 1062 ++++++++++
modules/enterprise/server/sars/services-sar/src/main/resources/META-INF/jboss-service.xml | 4
modules/enterprise/server/sars/services-sar/src/main/resources/server-comm-configuration-overrides.properties | 2
11 files changed, 1388 insertions(+), 1303 deletions(-)
New commits:
commit 595abdb8a046e31c3528a6482b438ef6e731fef3
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Oct 2 01:57:15 2012 -0400
try to resurrect embedded agent. this still doesn't work in AS7 due to JMX deps. I think its best to move the sar's embedded agent into an AS7 module
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
index f060121..2a5da0d 100644
--- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
@@ -244,13 +244,11 @@
dest="${jboss.deploy.dir}/rhq-installer.war" />
<touch file="${jboss.deploy.dir}/rhq-installer.war.dodeploy" />
- <!-- TODO: deploy embedded agent sar -->
- <!--
<echo>Deploying embedded agent sar ...</echo>
<mkdir dir="${jboss.deploy.dir}/rhq-agent.sar" />
<unjar src="${settings.localRepository}/org/rhq/rhq-enterprise-server-agent-sar/${rhq.version}/rhq-enterprise-server-agent-sar-${rhq.version}.sar"
dest="${jboss.deploy.dir}/rhq-agent.sar" />
- -->
+ <touch file="${jboss.deploy.dir}/rhq-agent.sar.skipdeploy" /> <!-- TODO: make this dodeploy -->
<echo>Delete docs, README, et. al. files</echo>
<delete dir="${jboss.home}/docs/examples" />
@@ -419,13 +417,13 @@ rhq.server.tomcat.security.truststore.type=JKS
# Server-side SSL Security Configuration (for incoming messages from agents)
# These are used when secure transports other than sslservlet are used
rhq.communications.connector.security.secure-socket-protocol=TLS
-rhq.communications.connector.security.keystore.file=${jboss.server.home.dir}/conf/rhq.keystore
+rhq.communications.connector.security.keystore.file=${jboss.server.config.dir}/rhq.keystore
rhq.communications.connector.security.keystore.algorithm=SunX509
rhq.communications.connector.security.keystore.type=JKS
rhq.communications.connector.security.keystore.password=RHQManagement
rhq.communications.connector.security.keystore.key-password=RHQManagement
rhq.communications.connector.security.keystore.alias=RHQ
-rhq.communications.connector.security.truststore.file=${jboss.server.home.dir}/conf/rhq.truststore
+rhq.communications.connector.security.truststore.file=${jboss.server.config.dir}/rhq.truststore
rhq.communications.connector.security.truststore.algorithm=SunX509
rhq.communications.connector.security.truststore.type=JKS
rhq.communications.connector.security.truststore.password=RHQManagement
@@ -433,13 +431,13 @@ rhq.communications.connector.security.client-auth-mode=none
# Client-side SSL Security Configuration (for outgoing messages to agents)
rhq.server.client.security.secure-socket-protocol=TLS
-rhq.server.client.security.keystore.file=${jboss.server.home.dir}/conf/rhq.keystore
+rhq.server.client.security.keystore.file=${jboss.server.config.dir}/rhq.keystore
rhq.server.client.security.keystore.algorithm=SunX509
rhq.server.client.security.keystore.type=JKS
rhq.server.client.security.keystore.password=RHQManagement
rhq.server.client.security.keystore.key-password=RHQManagement
rhq.server.client.security.keystore.alias=RHQ
-rhq.server.client.security.truststore.file=${jboss.server.home.dir}/conf/rhq.truststore
+rhq.server.client.security.truststore.file=${jboss.server.config.dir}/rhq.truststore
rhq.server.client.security.truststore.algorithm=SunX509
rhq.server.client.security.truststore.type=JKS
rhq.server.client.security.truststore.password=RHQManagement
@@ -583,14 +581,6 @@ rhq.autoinstall.public-endpoint-address=
<echo>!!THIS IS A DEVELOPER CONTAINER BUILD - PRE-DEPLOYING RHQ SERVER!!</echo>
</target>
- <!-- TODO: when we ship with an embedded agent -->
- <!--
- <target name="undeploy-embedded-agent" unless="predeploy">
- <echo>Preparing for release - undeploying Embedded Agent...</echo>
- <move file="${jboss.deploy.dir}/rhq-agent.sar" tofile="${jboss.deploy.dir}/rhq-agent.sar.skipdeploy" />
- </target>
- -->
-
<target name="undeploy-ear" unless="predeploy">
<echo>Preparing for release - telling AS to skip ear deployment</echo>
<touch file="${jboss.deploy.dir}/${rhq.earName}.skipdeploy" />
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index 2763936..914cde2 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -26,12 +26,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-domain</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<!-- we want to explicitly include these (do not use scope=provided) -->
<dependency>
<groupId>commons-logging</groupId>
@@ -73,15 +67,20 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
- <!-- we are packaging the agent in isolation - but the sar needs the agent jar itself, put a copy in the lib directory -->
+ <!-- we are packaging the agent in isolation - but the sar needs the agent jar/core-util jars, put a copy in the lib directory -->
<execution>
<phase>package</phase>
<configuration>
<target>
<echo>sarDirectory="${sarDirectory}"</echo>
- <echo>Putting the agent jar in the sar's classpath</echo>
+ <echo>Putting some jars required by the embedded agent bootstrap service in the sar's classpath</echo>
+ <!-- if you add jars in here, make sure you add them in jboss-deployment-structure.xml also -->
<mkdir dir="${sarDirectory}/lib" />
<copy file="${sarDirectory}/META-INF/embedded-agent/lib/rhq-enterprise-agent-${project.version}.jar" todir="${sarDirectory}/lib" />
+ <copy file="${sarDirectory}/META-INF/embedded-agent/lib/rhq-enterprise-comm-${project.version}.jar" todir="${sarDirectory}/lib" />
+ <copy file="${sarDirectory}/META-INF/embedded-agent/lib/rhq-core-comm-api-${project.version}.jar" todir="${sarDirectory}/lib" />
+ <copy file="${sarDirectory}/META-INF/embedded-agent/lib/rhq-core-util-${project.version}.jar" todir="${sarDirectory}/lib" />
+ <copy file="${sarDirectory}/META-INF/embedded-agent/lib/i18nlog-${i18nlog.version}.jar" todir="${sarDirectory}/lib" />
<echo>Populating the sar with the native libraries found at ${settings.localRepository}/org/hyperic/sigar-dist/${sigar.version}/sigar-dist-${sigar.version}.zip</echo>
<unzip dest="${sarDirectory}/META-INF/embedded-agent/lib">
@@ -100,13 +99,15 @@
<include name="**/lib/*" />
</fileset>
</move>
- <delete dir="${sarDirectory}/META-INF/embedded-agent/lib/hyperic-sigar-${sigar.version}" />
+
+ <delete includeemptydirs="true">
+ <fileset dir="${sarDirectory}/META-INF/embedded-agent/lib/" includes="hyperic-sigar*/**"/>
+ </delete>
<echo>Removing libraries that are either unused or in the RHQ Server's JBossAS endorsed dir</echo>
<delete>
<fileset dir="${sarDirectory}/META-INF/embedded-agent/lib">
<include name="jdom*.jar" /> <!-- never needed; only for deprecated XML code for the license stuff -->
- <include name="jaxb*.jar" /> <!-- JAXB is in JBossAS's endorsed directory -->
</fileset>
</delete>
diff --git a/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapService.java b/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapService.java
index 2c866a2..d39e05e 100644
--- a/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapService.java
+++ b/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapService.java
@@ -30,6 +30,7 @@ import java.net.InetAddress;
import java.net.URL;
import java.net.UnknownHostException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Map;
import java.util.Properties;
import java.util.prefs.BackingStoreException;
@@ -67,7 +68,12 @@ public class EmbeddedAgentBootstrapService implements EmbeddedAgentBootstrapServ
/**
* The location of the configuration file - can be a file path or path within classloader.
*/
- private String configFile = "META-INF/embedded-agent-configuration.xml";
+ private String configFile = "embedded-agent-configuration.xml";
+
+ /**
+ * The location of the configuration overrides properties file - can be a URL, file path or path within classloader.
+ */
+ private String overridesFile = null; // the jboss-service.xml service descriptor must set this
/**
* The preferences node name that identifies the configuration set used to configure the services.
@@ -78,7 +84,7 @@ public class EmbeddedAgentBootstrapService implements EmbeddedAgentBootstrapServ
* Properties that will be used to override preferences found in the preferences node and the configuration
* preferences file.
*/
- private Properties configurationOverrides = null;
+ private Properties configurationOverrides = new Properties();
/**
* Arguments passed to the agent's main method.
@@ -107,8 +113,9 @@ public class EmbeddedAgentBootstrapService implements EmbeddedAgentBootstrapServ
*
* @see EmbeddedAgentBootstrapServiceMBean#startAgent()
*/
+ @Override
public void startAgent() throws Exception {
- //-- if this method signature changes, you must also change StartupServlet.startEmbeddedAgent
+ //-- if this method signature changes, you must also change StartupBean.startEmbeddedAgent
if (!enabled.booleanValue()) {
log.info("Will not start the embedded RHQ agent - it is disabled");
@@ -143,7 +150,8 @@ public class EmbeddedAgentBootstrapService implements EmbeddedAgentBootstrapServ
try {
Class<?> agentClass = agentClassLoader.loadClass("org.rhq.enterprise.agent.AgentMain");
Constructor<?> agentConstructor = agentClass.getConstructor(new Class[] { String[].class });
- Object agentInstance = agentConstructor.newInstance(new Object[] { getAgentArguments() });
+ Object agentInstance = agentConstructor
+ .newInstance(new Object[] { getAgentArgumentsAsArray() });
agentClass.getMethod("start", new Class[0]).invoke(agentInstance, new Object[0]);
@@ -177,6 +185,7 @@ public class EmbeddedAgentBootstrapService implements EmbeddedAgentBootstrapServ
return;
}
+ @Override
public void stopAgent() throws Exception {
if (agent != null) {
log.info("Stopping the embedded RHQ Agent...");
@@ -217,60 +226,86 @@ public class EmbeddedAgentBootstrapService implements EmbeddedAgentBootstrapServ
}
}
+ public void start() throws Exception {
+ return; // no-op
+ }
+
// this method is needed so the JBossAS server will call it when shutting down the service
+ @Override
public void stop() throws Exception {
stopAgent();
}
+ @Override
public boolean isAgentStarted() {
return agent != null;
}
+ @Override
public String getAgentEnabled() {
- //-- if this method signature changes, you must also change StartupServlet.startEmbeddedAgent
+ //-- if this method signature changes, you must also change StartupBean.startEmbeddedAgent
return enabled.toString();
}
+ @Override
public void setAgentEnabled(String flag) {
- enabled = Boolean.valueOf(flag.trim());
+ enabled = Boolean.valueOf(replaceProperties(flag));
}
+ @Override
public String getResetConfiguration() {
return resetConfigurationAtStartup.toString();
}
+ @Override
public void setResetConfiguration(String flag) {
- resetConfigurationAtStartup = Boolean.valueOf(flag.trim());
+ resetConfigurationAtStartup = Boolean.valueOf(replaceProperties(flag));
}
- public File getEmbeddedAgentDirectory() {
- return embeddedAgentDirectory;
+ @Override
+ public String getEmbeddedAgentDirectory() {
+ return embeddedAgentDirectory.getAbsolutePath();
}
- public void setEmbeddedAgentDirectory(File directory) {
- if (!directory.exists() || !directory.isDirectory()) {
+ @Override
+ public void setEmbeddedAgentDirectory(String directoryStr) {
+ File directory = null;
+
+ if (directoryStr != null) {
+ directoryStr = replaceProperties(directoryStr);
+ directory = new File(directoryStr);
+ }
+
+ if (directory == null || !directory.exists() || !directory.isDirectory()) {
enabled = Boolean.FALSE;
- embeddedAgentDirectory = null;
- throw new IllegalArgumentException(
- "Invalid embedded agent directory specified - embedded agent has been disabled: " + directory);
+ directory = null;
+ log.warn("Invalid embedded agent directory specified - embedded agent has been disabled: " + directory);
}
embeddedAgentDirectory = directory;
}
+ @Override
public String getConfigurationFile() {
return configFile;
}
+ @Override
public void setConfigurationFile(String location) {
- configFile = StringPropertyReplacer.replaceProperties(location);
+ configFile = replaceProperties(replaceProperties(location));
}
+ @Override
public String getPreferencesNodeName() {
return preferencesNodeName;
}
+ @Override
public void setPreferencesNodeName(String node) {
+ if (node != null) {
+ node = replaceProperties(node);
+ }
+
if (node == null || node.trim().length() == 0) {
try {
node = InetAddress.getLocalHost().getCanonicalHostName();
@@ -279,18 +314,32 @@ public class EmbeddedAgentBootstrapService implements EmbeddedAgentBootstrapServ
}
node = node + "-embedded";
}
- preferencesNodeName = StringPropertyReplacer.replaceProperties(node);
+ preferencesNodeName = replaceProperties(node);
System.setProperty("rhq.server.embedded-agent.preferences-node", preferencesNodeName);
}
+ @Override
public Properties getConfigurationOverrides() {
- //-- if this method signature changes, you must also change StartupServlet.startEmbeddedAgent
+ //-- if this method signature changes, you must also change StartupBean.startEmbeddedAgent
return configurationOverrides;
}
+ @Override
public void setConfigurationOverrides(Properties overrides) {
- //-- if this method signature changes, you must also change StartupServlet.startEmbeddedAgent
- configurationOverrides = overrides;
+ //-- if this method signature changes, you must also change StartupBean.startEmbeddedAgent
+
+ if (overrides == null) {
+ return; // do nothing
+ }
+
+ for (String propName : overrides.stringPropertyNames()) {
+ String origValue = overrides.getProperty(propName);
+ String newValue = replaceProperties(origValue);
+ overrides.setProperty(propName, newValue);
+ }
+
+ configurationOverrides.clear();
+ configurationOverrides.putAll(overrides);
// perform some checking to setup defaults if need be
@@ -304,17 +353,28 @@ public class EmbeddedAgentBootstrapService implements EmbeddedAgentBootstrapServ
agent_name = "${jboss.bind.address}";
}
agent_name = agent_name + "-embedded";
- agent_name = StringPropertyReplacer.replaceProperties(agent_name);
+ agent_name = replaceProperties(agent_name);
configurationOverrides.put("rhq.agent.name", agent_name);
}
+
+ return;
+ }
+
+ @Override
+ public String getAgentArguments() {
+ // this only returns a human readable string - to use the args, use getAgentArgumentsAsArray instead
+ String[] allArgs = getAgentArgumentsAsArray();
+ return Arrays.toString(allArgs);
}
- public String[] getAgentArguments() {
+ // we want to use this because it adds some required args
+ private String[] getAgentArgumentsAsArray() {
ArrayList<String> args = new ArrayList<String>();
if (arguments != null) {
for (String argument : arguments) {
- args.add(argument);
+ String realArg = replaceProperties(argument);
+ args.add(realArg);
}
}
@@ -323,16 +383,23 @@ public class EmbeddedAgentBootstrapService implements EmbeddedAgentBootstrapServ
return args.toArray(new String[args.size()]);
}
- public void setAgentArguments(String[] args) {
- arguments = args;
+ @Override
+ public void setAgentArguments(String args) {
+ if (args != null) {
+ arguments = args.split(",");
+ } else {
+ arguments = new String[0];
+ }
}
+ @Override
public void reloadAgentConfiguration() throws Exception {
getPreferencesNode().clear();
prepareConfigurationPreferences();
}
+ @Override
public void cleanDataDirectory() {
AgentConfiguration config = new AgentConfiguration(getPreferencesNode());
File data_dir = config.getDataDirectory();
@@ -349,6 +416,7 @@ public class EmbeddedAgentBootstrapService implements EmbeddedAgentBootstrapServ
return;
}
+ @Override
public Properties getAgentConfiguration() {
try {
Properties properties = new Properties();
@@ -364,6 +432,7 @@ public class EmbeddedAgentBootstrapService implements EmbeddedAgentBootstrapServ
}
}
+ @Override
public void executeAgentPromptCommand(final String command) {
// all this funky threading/reflection is so we execute the command
// in the isoloated context of the embedded agent
@@ -402,6 +471,85 @@ public class EmbeddedAgentBootstrapService implements EmbeddedAgentBootstrapServ
return;
}
+ @Override
+ public String getConfigurationOverridesFile() {
+ return overridesFile;
+ }
+
+ @Override
+ public void setConfigurationOverridesFile(String location) {
+ if (location == null) {
+ overridesFile = null;
+ } else {
+ // substitute ${} replacement variables found in the location string
+ overridesFile = replaceProperties(location);
+ try {
+ loadConfigurationOverridesFromFile();
+ } catch (Exception e) {
+ log.warn("Cannot load embedded agent config overrides file [" + overridesFile + "]", e);
+ }
+ }
+ }
+
+ private void loadConfigurationOverridesFromFile() throws Exception {
+ if (overridesFile == null) {
+ return; // nothing to do
+ }
+
+ InputStream is = getFileInputStream(overridesFile);
+ try {
+ Properties props = new Properties();
+ props.load(is);
+ setConfigurationOverrides(props);
+ } finally {
+ is.close(); // if we got here, "is" will never be null
+ }
+
+ return;
+ }
+
+ /**
+ * Loads a file either from file system, from URL or from classloader. If file
+ * can't be found, exception is thrown.
+ * @param file_name the file whose input stream is to be returned
+ * @return input stream of the file - will never be null
+ * @throws IOException if the file input stream cannot be obtained
+ */
+ private InputStream getFileInputStream(String file_name) throws IOException {
+ // first see if the file was specified as a path on the local file system
+ InputStream config_file_input_stream = null;
+ try {
+ File config_file = new File(file_name);
+
+ if (config_file.exists()) {
+ config_file_input_stream = new FileInputStream(config_file);
+ }
+ } catch (Exception e) {
+ // isn't really an error - this just isn't a file on the local file system
+ }
+
+ // see if the file was specified as a URL
+ if (config_file_input_stream == null) {
+ try {
+ URL config_file = new URL(file_name);
+
+ config_file_input_stream = config_file.openStream();
+ } catch (Exception e) {
+ // isn't really an error - this just isn't a URL
+ }
+ }
+
+ // if neither a file path or URL, assume the config file can be found in the classloader
+ if (config_file_input_stream == null) {
+ config_file_input_stream = this.getClass().getClassLoader().getResourceAsStream(file_name);
+ }
+
+ if (config_file_input_stream == null) {
+ throw new IOException("Cannot find config file for embedded agent: " + file_name);
+ }
+ return config_file_input_stream;
+ }
+
/**
* This will return URLs to all of the jars and resources that the embedded agent will have access to in its
* isolated classloader. Only those classes within these jars will be accessible to the embedded agent. Even classes
@@ -428,6 +576,29 @@ public class EmbeddedAgentBootstrapService implements EmbeddedAgentBootstrapServ
classpathUrls.add(jarFile.toURI().toURL());
}
+ // we need jboss-modules.jar because in AS7 it is used to override JAXP impl classes and we can't not use it
+ URL jbossModules = null;
+ String cp = System.getProperty("java.class.path");
+ if (cp != null && cp.contains("jboss-modules.jar")) {
+ for (String cpPath : cp.split(File.pathSeparator)) {
+ if (cpPath.contains("jboss-modules.jar")) {
+ jbossModules = new File(cpPath).toURI().toURL();
+ classpathUrls.add(jbossModules);
+ break;
+ }
+ }
+ }
+
+ if (jbossModules == null) {
+ File rootLocation = new File(System.getProperty("jboss.home.dir"), "jboss-modules.jar");
+ if (rootLocation.exists()) {
+ jbossModules = rootLocation.toURI().toURL();
+ classpathUrls.add(jbossModules);
+ } else {
+ throw new IllegalStateException(
+ "Cannot find jboss-modules.jar - it is necessary for embedded agent to run.");
+ }
+ }
return classpathUrls.toArray(new URL[classpathUrls.size()]);
}
@@ -493,7 +664,7 @@ public class EmbeddedAgentBootstrapService implements EmbeddedAgentBootstrapServ
String value = entry.getValue().toString();
// allow ${var} notation in the values so we can provide variable replacements in the values
- value = StringPropertyReplacer.replaceProperties(value);
+ value = replaceProperties(value);
preferences_node.put(key, value);
}
@@ -521,38 +692,8 @@ public class EmbeddedAgentBootstrapService implements EmbeddedAgentBootstrapServ
private AgentConfiguration loadConfigurationFile() throws Exception {
String file_name = getConfigurationFile();
String preferences_node_name = getPreferencesNodeName();
- InputStream config_file_input_stream = null;
- // first see if the file was specified as a path on the local file system
- try {
- File config_file = new File(file_name);
-
- if (config_file.exists()) {
- config_file_input_stream = new FileInputStream(config_file);
- }
- } catch (Exception e) {
- // isn't really an error - this just isn't a file on the local file system
- }
-
- // see if the file was specified as a URL
- if (config_file_input_stream == null) {
- try {
- URL config_file = new URL(file_name);
-
- config_file_input_stream = config_file.openStream();
- } catch (Exception e) {
- // isn't really an error - this just isn't a URL
- }
- }
-
- // if neither a file path or URL, assume the config file can be found in the classloader
- if (config_file_input_stream == null) {
- config_file_input_stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(file_name);
- }
-
- if (config_file_input_stream == null) {
- throw new IOException("Bad config file: " + file_name);
- }
+ InputStream config_file_input_stream = getFileInputStream(file_name);
// We need to clear out any previous configuration in case the current config file doesn't specify a preference
// that already exists in the preferences node. In this case, the configuration file wants to fall back on the
@@ -561,37 +702,42 @@ public class EmbeddedAgentBootstrapService implements EmbeddedAgentBootstrapServ
// But first we need to backup these original preferences in case the config file fails to load -
// we'll restore the original values in that case.
- Preferences preferences_node = getPreferencesNode();
- ByteArrayOutputStream backup = new ByteArrayOutputStream();
- preferences_node.exportSubtree(backup);
- preferences_node.clear();
-
- // now load in the preferences
try {
- ByteArrayOutputStream raw_config_file = new ByteArrayOutputStream();
- StreamUtil.copy(config_file_input_stream, raw_config_file, true);
- String new_config = StringPropertyReplacer.replaceProperties(raw_config_file.toString());
- ByteArrayInputStream new_config_input_stream = new ByteArrayInputStream(new_config.getBytes());
- Preferences.importPreferences(new_config_input_stream);
-
- if (new AgentConfiguration(preferences_node).getAgentConfigurationVersion() == 0) {
- throw new IllegalArgumentException("Bad node name: " + preferences_node_name);
- }
- } catch (Exception e) {
- // a problem occurred importing the config file; let's restore our original values
+ Preferences preferences_node = getPreferencesNode();
+ ByteArrayOutputStream backup = new ByteArrayOutputStream();
+ preferences_node.exportSubtree(backup);
+ preferences_node.clear();
+
+ // now load in the preferences
try {
- Preferences.importPreferences(new ByteArrayInputStream(backup.toByteArray()));
- } catch (Exception e1) {
- // its conceivable the same problem occurred here as with the original exception (backing store problem?)
- // let's throw the original exception, not this one
- }
+ ByteArrayOutputStream raw_config_file = new ByteArrayOutputStream();
+ StreamUtil.copy(config_file_input_stream, raw_config_file, true);
+ String new_config = replaceProperties(raw_config_file.toString());
+ ByteArrayInputStream new_config_input_stream = new ByteArrayInputStream(new_config.getBytes());
+ Preferences.importPreferences(new_config_input_stream);
+
+ if (new AgentConfiguration(preferences_node).getAgentConfigurationVersion() == 0) {
+ throw new IllegalArgumentException("Bad node name: " + preferences_node_name);
+ }
+ } catch (Exception e) {
+ // a problem occurred importing the config file; let's restore our original values
+ try {
+ Preferences.importPreferences(new ByteArrayInputStream(backup.toByteArray()));
+ } catch (Exception e1) {
+ // its conceivable the same problem occurred here as with the original exception (backing store problem?)
+ // let's throw the original exception, not this one
+ }
- throw e;
- }
+ throw e;
+ }
- AgentConfiguration agent_configuration = new AgentConfiguration(preferences_node);
+ AgentConfiguration agent_configuration = new AgentConfiguration(preferences_node);
- return agent_configuration;
+ return agent_configuration;
+ } finally {
+ // we know this is not null; if it was, we would have thrown the IOException earlier.
+ config_file_input_stream.close();
+ }
}
/**
@@ -630,4 +776,20 @@ public class EmbeddedAgentBootstrapService implements EmbeddedAgentBootstrapServ
return;
}
+
+ private String replaceProperties(String str) {
+ if (str == null) {
+ return null;
+ }
+
+ // keep replacing properties until no more ${} tokens are left that are replaceable
+ String newValue = "";
+ String oldValue = str;
+ while (!newValue.equals(oldValue)) {
+ oldValue = str;
+ newValue = StringPropertyReplacer.replaceProperties(str);
+ str = newValue;
+ }
+ return newValue;
+ }
}
\ No newline at end of file
diff --git a/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapServiceMBean.java b/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapServiceMBean.java
index f71b4f2..0adeb17 100644
--- a/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapServiceMBean.java
+++ b/modules/enterprise/server/sars/agent-sar/src/main/java/org/rhq/enterprise/server/agent/EmbeddedAgentBootstrapServiceMBean.java
@@ -18,10 +18,7 @@
*/
package org.rhq.enterprise.server.agent;
-import java.io.File;
import java.util.Properties;
-import javax.management.ObjectName;
-import org.jboss.mx.util.ObjectNameFactory;
/**
* The interface to the MBean that embeds a JON Agent in the JON Server.
@@ -32,7 +29,7 @@ public interface EmbeddedAgentBootstrapServiceMBean {
/**
* The object name that the MBean service will be registered under.
*/
- ObjectName OBJECT_NAME = ObjectNameFactory.create("rhq:service=EmbeddedAgentBootstrap");
+ String OBJECT_NAME = "rhq:service=EmbeddedAgentBootstrap";
/**
* If <code>true</code>, this indicates that the agent should be started when the JON Server is started. This
@@ -81,7 +78,7 @@ public interface EmbeddedAgentBootstrapServiceMBean {
*
* @return location of the embedded agent and its resources
*/
- File getEmbeddedAgentDirectory();
+ String getEmbeddedAgentDirectory();
/**
* Indicates the location where the embedded agent and all its resources will be found. There must be a <code>
@@ -90,7 +87,7 @@ public interface EmbeddedAgentBootstrapServiceMBean {
*
* @param directory location of the embedded agent and its resources
*/
- void setEmbeddedAgentDirectory(File directory);
+ void setEmbeddedAgentDirectory(String directory);
/**
* Returns the location of the configuration file where all agent preferences are defined. The file location can be
@@ -144,18 +141,29 @@ public interface EmbeddedAgentBootstrapServiceMBean {
void setConfigurationOverrides(Properties overrides);
/**
+ * This allows you to explicitly override configuration preferences found in the configuration file. If this isn't
+ * set, then the settings specified by the configuration preferences file take effect as-is. If this is set,
+ * this file is a properties file whose values will override the config file prefs.
+ *
+ * @param overrides configuration settings file that override the configuration preferences (may be<code>null</code>)
+ */
+ void setConfigurationOverridesFile(String overridesFile);
+
+ String getConfigurationOverridesFile();
+
+ /**
* Returns the arguments that are passed to the agent's main startup method.
*
* @return agent arguments
*/
- String[] getAgentArguments();
+ String getAgentArguments();
/**
* Sets the arguments that will be passed to the agent's main startup method.
*
* @param args
*/
- void setAgentArguments(String[] args);
+ void setAgentArguments(String args);
/**
* This will clear any and all current configuration preferences and then reload the
diff --git a/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/embedded-agent-configuration.xml b/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/embedded-agent-configuration.xml
deleted file mode 100644
index a9a8b77..0000000
--- a/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/embedded-agent-configuration.xml
+++ /dev/null
@@ -1,1062 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE preferences SYSTEM 'http://java.sun.com/dtd/preferences.dtd'>
-
-<!--
-==============================================================================
-Embedded RHQ Agent Configuration
-==============================================================================
--->
-
-<preferences EXTERNAL_XML_VERSION="1.0">
- <root type="user">
- <map />
- <node name="rhq-agent">
- <map />
- <node name="${rhq.server.embedded-agent.preferences-node}">
- <map>
- <!--
- _______________________________________________________________
- rhq.agent.configuration-schema-version
-
- Defines what version of the agent configuration schema this
- file conforms to. This is the schema for the rhq.agent
- preferences.
- -->
- <entry key="rhq.agent.configuration-schema-version" value="6" />
-
- <!--
- _______________________________________________________________
- rhq.agent.configuration-setup-flag
-
- If true, the agent will assume it is fully configured and
- will not ask setup questions when it starts up. If false,
- the agent assumes the configuration is not complete and
- will ask a series of setup questions to the user in order
- to be fully configured.
-
- If you write your own custom agent configuration file, you
- will probably want to set this flag to true since you
- probably will set all of your configuration right in the
- configuration file itself. However, you may wish to
- distribute agent configuration files with only a subset
- of configuration preferences set and rely on each agent's
- startup setup mechanism to finish its configuration - in this
- case, you'll want to leave this as false.
-
- EMBEDDED: this is true - we ensure the agent is fully
- configured; we have to since the agent has no console
- interface and must start in daemon mode
- -->
- <entry key="rhq.agent.configuration-setup-flag" value="true" />
-
- <!--
- _______________________________________________________________
- rhq.agent.name
-
- Explicitly defines what the agent's name is. This will
- default to the agent's fully qualified domain name (that is,
- the FQDN of the platform where the agent is running). However,
- you can set this to any value you want, so long as it is
- unique among all other agents. You will need to explicitly set
- this if the agent platform's FQDN cannot be reliably determined
- at runtime.
-
- EMBEDDED: this will usually be overridden so the deployer can
- provide a unique embedded agent name
- -->
- <entry key="rhq.agent.name" value="127.0.0.1"/>
-
- <!--
- _______________________________________________________________
- rhq.agent.server.transport
- rhq.agent.server.bind-address
- rhq.agent.server.bind-port
- rhq.agent.server.transport-params
-
- The RHQ Server endpoint configuration.
-
- Note that because this is an XML file, you must specify
- "&" in the transport-params value when needing an ampersand
- to separate the transport parameters.
-
- EMBEDDED: these will usually be overridden in the
- jboss-service.xml of the embedded agent service
- -->
- <entry key="rhq.agent.server.transport" value="servlet" />
- <entry key="rhq.agent.server.bind-port" value="7080" />
- <entry key="rhq.agent.server.bind-address" value="127.0.0.1" />
- <entry key="rhq.agent.server.transport-params" value="/jboss-remoting-servlet-invoker/ServerInvokerServlet" />
-
- <!--
- _______________________________________________________________
- rhq.agent.server-auto-detection
-
- If true, the agent will attempt to auto-detect the RHQ Server
- coming online and going offline. This is more efficient
- than server polling but it requires multicast traffic to be
- enabled on your network and also requires the multicast
- detector be enabled.
-
- EMBEDDED: we disable this since we know if the agent is started
- the server must be started (since the agent lives inside the
- server!)
- -->
- <entry key="rhq.agent.server-auto-detection" value="false" />
-
- <!--
- _______________________________________________________________
- rhq.agent.register-with-server-at-startup
-
- If true, the agent will attempt to register itself with the
- RHQ Server when the agent starts up. If false, the agent will
- not automatically register itself at startup; the agent must
- be manually registered via some other mechanism (e.g. the
- 'register' prompt command). The agent must be registered
- at least once in order to notify the RHQ Server about its
- existence and to assign the agent a valid security token.
- Note that even if this is true, the registration may not happen
- immediately if the RHQ Server itself is not up - once the RHQ
- Server comes up, the registration attempt will occur.
- -->
- <entry key="rhq.agent.register-with-server-at-startup" value="true" />
-
- <!--
- _______________________________________________________________
- rhq.agent.wait-for-server-at-startup-msecs
-
- This defines how many milliseconds the agent should wait at
- startup for the RHQ Server to be detected. If the RHQ Server
- has not started up in the given amount of time, the agent will
- continue initializing and expect the server to come up later.
- If this is 0, the agent will not wait at all.
-
- EMBEDDED: we still give an initial pause to let the server
- finish starting up before its embedded agent starts talking
- to it.
- -->
- <entry key="rhq.agent.wait-for-server-at-startup-msecs" value="10000" />
-
- <!--
- _______________________________________________________________
- rhq.agent.update-plugins-at-startup
-
- If true, the agent will attempt to update its current set
- of plugins to their latest versions at startup. If false, the
- agent will not automatically update the plugins; the agent
- will use its current plugins. To update the plugins, you must
- manually do so via some other mechanism (e.g. the
- 'plugins' prompt command).
- Note that even if this is true, the update may not happen
- immediately if the RHQ Server itself is not up - once the RHQ
- Server comes up, the update attempt will occur.
-
- EMBEDDED: we do not need to update the plugins because the
- embedded agent will just share the plugins that the server
- serves to other agents.
- -->
- <entry key="rhq.agent.update-plugins-at-startup" value="false" />
-
- <!--
- _______________________________________________________________
- rhq.agent.test-failover-list-at-startup
-
- If true, the agent will test connectivity to all server
- endpoints found in the agent's failover list. This helps
- provide a mechanism to quickly detect problems with the
- public endpoints configured for all RHQ Servers.
- -->
- <!--
- <entry key="rhq.agent.test-failover-list-at-startup" value="false" />
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.agent-update.enabled
-
- 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.
-
- EMBEDDED: we never have to worry about being up-to-date,
- the embedded agent will always be the latest
- when embedded in its server.
- -->
- <entry key="rhq.agent.agent-update.enabled" value="false" />
-
- <!--
- _______________________________________________________________
- rhq.agent.agent-update.version-url
-
- If this is defined, it 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.
- -->
- <!--
- <entry key="rhq.agent.agent-update.version-url" value="http://127.0.0.1:7080/agentupdate/version" />
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.agent-update.download-url
-
- If this is defined, it 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.
- -->
- <!--
- <entry key="rhq.agent.agent-update.download-url" value="http://127.0.0.1:7080/agentupdate/download" />
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.primary-server-switchover-check-interval-msecs
-
- The agent will periodically check to ensure that the server
- it is connected to is its primary server (as opposed to one
- of its failover servers). This preference defines how many
- milliseconds the agent should wait in between these checks.
- A side-effect of this check is that the agent will also
- download an updated version of its failover list. So if
- new servers have been added to the cloud, the agent will
- now know about it.
-
- If this is 0, this check is never performed. You should never
- set this to 0 unless your agent will never participate in
- an RHQ HA environment.
- -->
- <entry key="rhq.agent.primary-server-switchover-check-interval-msecs" value="3600000" />
-
- <!--
- _______________________________________________________________
- rhq.agent.vm-health-check.interval-msecs
-
- The agent will periodically check the health of its JVM if
- this preference is larger than 0. This check will allow the
- agent to attempt to correct possibly fatal problems that are
- detected (such as the JVM getting critically low on memory).
- The value of this preference, if larger than 0, is the number
- of milliseconds the agent should wait in between checks.
-
- EMBEDDED: disabled - will not check the VM health
- -->
- <entry key="rhq.agent.vm-health-check.interval-msecs" value="0" />
-
- <!--
- _______________________________________________________________
- rhq.agent.vm-health-check.low-heap-mem-threshold
- rhq.agent.vm-health-check.low-nonheap-mem-threshold
-
- The threshold percentage (as a floating decimal) that must be
- crossed if the agent's VM health check thread is to consider
- the JVM with critically low memory. For example, if
- the agent's maximum heap size is 100MB and the heap
- threshold is set to 0.90, the agent's VM health check thread
- will consider the agent critically low on memory if the agent
- is using over 90MB of heap space.
- Note that he heap and non-heap memory thresholds are specified
- as separate preferences.
- -->
- <entry key="rhq.agent.vm-health-check.low-heap-mem-threshold" value="0.90" />
- <entry key="rhq.agent.vm-health-check.low-nonheap-mem-threshold" value="0.90" />
-
- <!--
- _______________________________________________________________
- rhq.agent.data-directory
-
- Location of a directory where the agent can write its internal
- cache of data.
-
- EMBEDDED: will be overridden to the server's data directory
- -->
- <!--
- <entry key="rhq.agent.data-directory" value="data" />
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.client.queue-size
-
- The maximum size of the client command queue - this is the
- maximum number of commands that can be queued for sending to
- the server. If this is 0, then the queue is unbounded.
- WARNING! Setting this to 0 could lead to resources being used
- up if for some reason commands keep getting queued but are
- not getting sent.
- -->
- <entry key="rhq.agent.client.queue-size" value="50000" />
-
- <!--
- _______________________________________________________________
- rhq.agent.client.max-concurrent
-
- The maximum number of concurrent commands that can be in the
- process of being sent to the server at any one time.
- -->
- <entry key="rhq.agent.client.max-concurrent" value="5" />
-
- <!--
- _______________________________________________________________
- rhq.agent.client.command-timeout-msecs
-
- The time in milliseconds that the client sender will wait
- before aborting a command. This is the amount of time in
- milliseconds that the server has in order to process commands.
- This value is only the default if a command has not specified
- its own timeout. A command can override this by setting its
- own timeout in the command's configuration, so this value may
- not be used for all commands that are sent. If this value is
- less than or equal to 0, there will be no default timeout
- and commands will therefore be allowed to take as long as they
- need (again, this is the default, individual commands may
- override this and set their own timeout). While this infinite
- timeout default could conceivably cause a thread to hang
- waiting for a rogue command that never finishes, it also reduces
- the amount of short-lived threads created by the system
- and will increase throughput, dramatically in some cases.
- -->
- <entry key="rhq.agent.client.command-timeout-msecs" value="600000" />
-
- <!--
- _______________________________________________________________
- rhq.agent.client.retry-interval-msecs
-
- This is the minimum amount of time, in milliseconds, the client
- sender will wait before trying to resend a guaranteed command
- that previously failed. This is not a guarantee of when
- a command is retried - all that can be inferred is that a
- command that fails to be sent will not be retried until at
- least this amount of time passes.
- Note: if the sender is currently waiting in this retry pause
- period, the agent will not be able to be shutdown until that
- retry period is over. In other words, if the agent is asked
- to shutdown, it will wait for those commands waiting in this
- retry interval to wake up. This is to help ensure those
- commands are not lost. Keep this time period short enough
- to make agent shutdowns fairly responsive but long enough
- to avoid spinning the process with continuous resending of
- commands during periods of RHQ Server downtime. It is
- recommended to use auto-detection or server polling in order
- to automatically stop the client sender from continuously
- trying to retry commands during long periods of RHQ
- Server downtime.
- -->
- <entry key="rhq.agent.client.retry-interval-msecs" value="15000" />
-
- <!--
- _______________________________________________________________
- rhq.agent.client.max-retries
-
- If a guaranteed delivery message is sent, but the agent fails
- to connect to the server and deliver the message, it will
- always be retried. However, if the error was something other
- than a "cannot connect" error, the command will only be retried
- this amount of times before the command is dropped. When this
- happens, the guaranteed command will never be delivered. This
- will normally happen under very odd and rare circumstances.
- Also, this setting only effects asynchronous messages that
- are sent with guaranteed delivery. This setting has no effect
- on other messages.
- -->
- <entry key="rhq.agent.client.max-retries" value="10" />
-
- <!--
- _______________________________________________________________
- rhq.agent.client.server-polling-interval-msecs
-
- If this value is larger than 0, it indicates the client sender
- 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. If the
- value is 0 or less, server polling is disabled. Server polling
- is less efficient that the agent's auto-detection mechanism,
- but server polling does not use multicasting, and thus might
- be the only way for the agent to detect the server.
-
- EMBEDDED: we do not need to poll since we know the server is
- always up
- -->
- <entry key="rhq.agent.client.server-polling-interval-msecs" value="0" />
-
- <!--
- _______________________________________________________________
- rhq.agent.client.command-spool-file.name
-
- This 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). Note that if you do not define
- this setting, the default is to not spool commands to disk
- and thus implicitly disable guaranteed delivery.
- -->
- <entry key="rhq.agent.client.command-spool-file.name" value="embedded-agent-command-spool.dat" />
-
- <!--
- _______________________________________________________________
- rhq.agent.client.command-spool-file.params
-
- This defines the parameters for the command spool file.
- The spool file is where the agent persists commands that
- are flagged for guaranteed delivery and need to be sent.
- The format is defined as "max-file-size:purge-percentage".
- The first number is the size, in bytes, of the maximum file
- size threshold. If the spool file grows larger than this, a
- "purge" will be triggered in order to shrink the file.
- The second number is the purge percentage which indicates how
- large the file is allowed to be after a purge. This is
- specified as a percentage of the first parameter - the max
- file size threshold. For example, if the max file size is
- 100000 (i.e. 100KB) and the purge percentage is 90, then when
- the spool file grows larger than 100KB, a purge will be
- triggered and the file will be shrunk to no more than
- 90% of 100KB - which is 90KB. In effect, 10KB will be freed
- to allow room for new commands to be spooled. When this
- occurs, unused space is freed first and if that does not
- free up enough space, the oldest commands in the spool file
- will be sacrificed in order to make room for the newer
- commands.
- -->
- <entry key="rhq.agent.client.command-spool-file.params" value="10000000:75" />
-
- <!--
- _______________________________________________________________
- rhq.agent.client.command-spool-file.compressed
-
- If this flag is true, the commands stored in the spool file
- will be compressed. This can potentially save about 30%-40% in
- disk space (give or take), however, it slows down the
- persistence mechanism considerably. Recommended setting for
- this should be true unless something on the agent deployment
- box warrants persistence performance over disk-saving . The
- performance hit will only appear when unusual conditions occur,
- such as shutting down while some guaranteed commands have not
- been sent yet or if the RHQ Server is down. It will not affect
- the agent under normal conditions (while running with the RHQ
- Server up and successfully communicating with the agent).
- In those unusual/rare conditions, having performance degradation
- may not be as important.
- -->
- <entry key="rhq.agent.client.command-spool-file.compressed" value="true" />
-
- <!--
- _______________________________________________________________
- rhq.agent.client.send-throttling
-
- If this setting is defined, it will enable send throttling to
- occur while sending commands to the server. The format is
- defined as "max-commands:quiet-period-milliseconds"
- where the maximum commands defines the maximum number
- of commands that will be sent before the start of a quiet
- period. The quiet period defines the number of milliseconds
- in which no commands should be sent. After this duration
- expires, commands can again be sent, up to the maximum defined.
- Note that send throttling only affects those commands that
- are "throttle-able". Some commands are sent as soon as
- possible, regardless of the throttling settings.
-
- This affects sending commands synchronously and asynchronously.
- -->
- <entry key="rhq.agent.client.send-throttling" value="100:1000" />
-
- <!--
- _______________________________________________________________
- rhq.agent.client.queue-throttling
-
- If this setting is defined, it will enable queue throttling to
- occur while sending commands to the server. The format is
- defined as "max-commands-per-burst:burst-period-milliseconds"
- where the maximum commands per burst defines the maximum number
- of commands that can be dequeued within a burst period. The
- burst period defines the number of milliseconds in which the
- defined maximum number of commands can be dequeued. If more
- than the maximum number of commands are queued within this
- time period, they will wait until the next burst period starts
- before being able to be dequeued.
-
- This does not affect sending commands synchronously. It only
- effects commands queued to be sent asynchronously.
- -->
- <entry key="rhq.agent.client.queue-throttling" value="200:2000" />
-
- <!--
- _______________________________________________________________
- rhq.agent.client.command-preprocessors
-
- Defines what class or classes will handle preprocessing of all
- commands that are sent by the agent. To define multiple
- classes, separate them with colon characters (:).
- You should never have to change this unless you know what
- you are doing.
- -->
- <entry key="rhq.agent.client.command-preprocessors" value="org.rhq.enterprise.agent.SecurityTokenCommandPreprocessor:org.rhq.enterprise.agent.ExternalizableStrategyCommandPreprocessor" />
-
- <!--
- _______________________________________________________________
- rhq.agent.disable-native-system
-
- The agent has a native system (JNI native libraries) on certain
- supported platforms to help the plugin container perform
- discovery of native components on those platforms. If the
- native libraries are causing errors within the agent or if you
- simply do not want to load native components in the agent,
- you can disable this native system by setting this preference
- setting to true.
- -->
- <entry key="rhq.agent.disable-native-system" value="false"/>
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.directory
-
- Defines where the plugins can be located.
-
- EMBEDDED: this will be overridden to point to the
- server's location where it stores the plugins that it uses
- to send to other agents
- -->
- <!--
- <entry key="rhq.agent.plugins.directory" value="plugins"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.operation-invocation-timeout-secs
-
- When an operation is invoked, it will be aborted if it takes
- longer than the given amount of seconds. This is just the
- default operation invocation timeout - a plugin can override
- this default by defining its own timeout in the operation
- metadata within its plugin descriptor.
- -->
- <!--
- <entry key="rhq.agent.plugins.operation-invocation-timeout-secs" value="600"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.operation-invoker.threadpool-size
-
- When an operation is to be invoked, the execution of the
- operation will be performed by threads from a thread pool.
- This defines the number of threads within that thread pool,
- effectively defining the number of operations that can be
- invoked concurrently.
- -->
- <!--
- <entry key="rhq.agent.plugins.operation-invoker.threadpool-size" value="5"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.server-discovery.initial-delay-secs
-
- Defines the delay before the first server discovery scan is
- run. The value is specified in seconds.
- -->
- <!--
- <entry key="rhq.agent.plugins.server-discovery.initial-delay-secs" value="10"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.server-discovery.period-secs
-
- Defines how often a server discovery scan is run. This type
- of scan is used to determine changes in the platform
- as well as to find new servers that have been added or
- old server that have been removed. The value is specified
- in seconds.
- -->
- <!--
- <entry key="rhq.agent.plugins.server-discovery.period-secs" value="900"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.service-discovery.initial-delay-secs
-
- Defines the delay before the first service discovery scan is
- run. The value is specified in seconds.
- -->
- <!--
- <entry key="rhq.agent.plugins.service-discovery.initial-delay-secs" value="20"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.service-discovery.period-secs
-
- Defines how often a service discovery scan is run. This type
- of scan is used to find new services that have been added or
- removed from existing platforms and servers. Technically,
- this kind of discovery is used to find any child resource
- to an existing parent resource (like a platform or server).
- The value is specified in seconds.
- -->
- <!--
- <entry key="rhq.agent.plugins.service-discovery.period-secs" value="86400"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.availability-scan.initial-delay-secs
-
- Defines the delay before the first availability scan is
- run. The value is specified in seconds.
- -->
- <!--
- <entry key="rhq.agent.plugins.availability-scan.initial-delay-secs" value="5"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.availability-scan.period-secs
-
- Defines how often an availability scan is run. This type
- of scan is used to determine what resources are up and running
- and what resources have gone down. The value is specified in
- seconds.
- -->
- <!--
- <entry key="rhq.agent.plugins.availability-scan.period-secs" value="300"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.measurement-collection.threadpool-size
-
- When measurement's are scheduled for collection, the collection
- will be performed by threads from a thread pool. This defines
- the number of threads within that thread pool, effectively
- defining the number of measurements that can be collected
- concurrently.
- -->
- <!--
- <entry key="rhq.agent.plugins.measurement-collection.threadpool-size" value="5"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.measurement-collection.initial-delay-secs
-
- Defines the delay before the first measurement collection is
- run. The value is specified in seconds.
- -->
- <!--
- <entry key="rhq.agent.plugins.measurement-collection.initial-delay-secs" value="30"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.drift-detection.initial-delay-secs
-
- Defines the delay before the first drift detection scan is
- run. The value is specified in seconds.
- -->
- <!--
- <entry key="rhq.agent.plugins.drift-detection.initial-delay-secs" value="30"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.drift-detection.period-secs
-
- Defines how often a drift detection scan is run. This type
- of scan is used to determine what, if any, file changes (such
- as additions, deletions, modifications) occurred within
- specific file system locations that are being monitored.
- -->
- <!--
- <entry key="rhq.agent.plugins.drift-detection.period-secs" value="60"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.content-discovery.threadpool-size
-
- When plugins are scheduled to discover content, the discovery
- will be performed by threads from a thread pool. This defines
- the number of threads within that thread pool.
- -->
- <!--
- <entry key="rhq.agent.plugins.content-discovery.threadpool-size" value="10"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.content-discovery.initial-delay-secs
-
- Defines the delay before the first content discovery is
- run. The value is specified in seconds.
- -->
- <!--
- <entry key="rhq.agent.plugins.content-discovery.initial-delay-secs" value="60"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.content-discovery.period-secs
-
- Defines how often content discoveries are run. The value is
- specified in seconds. If this value is 0 or less, content
- discovery will be disabled. Content discovery is used to
- detect new or changed content that are associated with
- resources in inventory.
- -->
- <!--
- <entry key="rhq.agent.plugins.content-discovery.period-secs" value="30"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.configuration-discovery.initial-delay-secs
-
- Defines the delay before the first configuration discovery is
- run. The value is specified in seconds.
- -->
- <!--
- <entry key="rhq.agent.plugins.configuration-discovery.initial-delay-secs" value="300"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.configuration-discovery.period-secs
-
- Defines how often configuration discoveries are run. The value is
- specified in seconds. If this value is 0 or less, configuration
- discovery will be disabled. Configuration discovery is
- performed to detect changes in a managed resource's
- configuration settings.
- -->
- <!--
- <entry key="rhq.agent.plugins.configuration-discovery.period-secs" value="3600"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.event-sender.initial-delay-secs
-
- Defines the delay before the first event report gets sent
- to the server. The value is specified in seconds.
- -->
- <!--
- <entry key="rhq.agent.plugins.event-sender.initial-delay-secs" value="30"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.event-sender.period-secs
-
- Defines how often event reports get sent to the server. The
- value is specified in seconds.
- -->
- <!--
- <entry key="rhq.agent.plugins.event-sender.period-secs" value="30"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.event-report.max-per-source
-
- 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.
- -->
- <!--
- <entry key="rhq.agent.plugins.event-report.max-per-source" value="200"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.event-report.max-total
-
- Defines the total maximum number of events that can be placed
- in a single event report that is sent up to the server.
- -->
- <!--
- <entry key="rhq.agent.plugins.event-report.max-total" value="400"/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.agent.plugins.disabled
-
- Defines the names of the plugins that are to be disabled.
- This is a comma-separated list of plugin names, where a
- plugin name is found in the name attribute in the root XML
- element in the plugin descriptor. A disabled plugin will
- simply not be loaded in the plugin container.
-
- By default, all plugins are enabled. If a plugin was marked
- as disabled by the server, the agent will not download it and
- will not load it, regardless of the value of this preference.
- If a plugin is enabled on the server, this
- preference will override that enable setting (in other words,
- an agent is able to disable a plugin, effectively overriding
- the server setting, by placing the plugin name in this
- preference). If the agent already has a plugin jar in
- its local plugins directory, but that plugin is disabled
- via this preference, that local plugin jar file will be
- deleted and the plugin will not be loaded.
- -->
- <!--
- <entry key="rhq.agent.plugins.disabled" value=""/>
- -->
-
- <!--
- _______________________________________________________________
- rhq.communications.configuration-schema-version
-
- Defines what version of the agent configuration schema this
- file conforms to. This is the schema for the
- rhq.communications preferences.
- -->
- <entry key="rhq.communications.configuration-schema-version" value="1" />
-
- <!--
- _______________________________________________________________
- rhq.communications.service-container.mbean-server-name
-
- Name of the MBean Server that houses the communications MBean
- services. This is actually the default domain name of the
- MBean Server and if an MBean Server has already been registered
- with this name, it will be used to house the communications
- services. If an MBean Server has not yet been registered with
- this name as its default domain, one will be created. Typically
- this can be left undefined which means the fallback MBeanServer
- to be used is the built-in JVM platform MBeanServer.
- -->
- <entry key="rhq.communications.service-container.mbean-server-name" value="embedded-agent" />
-
- <!--
- _______________________________________________________________
- rhq.communications.data-directory
-
- The location where the communication services write internal
- data files. If not defined, the data directory will be the
- same as the agent's.
- -->
- <!--
- <entry key="rhq.communications.data-directory" value="data" />
- -->
-
- <!--
- _______________________________________________________________
- rhq.communications.global-concurrency-limit
-
- The maximum number of incoming commands that are allowed to be
- received concurrently. Zero or less indicates there is to
- be no limit and the agent can accept as many incoming
- commands as possible. By default, there is no limit
- and you typically did not have to change this from its
- default.
- -->
- <entry key="rhq.communications.global-concurrency-limit" value="-1" />
-
- <!--
- _______________________________________________________________
- rhq.communications.multicast-detector.enabled
- rhq.communications.multicast-detector.multicast-address
- rhq.communications.multicast-detector.bind-address
- rhq.communications.multicast-detector.port
- rhq.communications.multicast-detector.default-time-delay
- rhq.communications.multicast-detector.heartbeat-time-delay
-
- The multicast detector configuration. This is the service that
- listens for new remote servers coming on and going offline and
- is required if you want server auto-detection. If you do not
- have server auto-detection enabled or your network will not
- support multicast traffic, you should disable the multicast
- detector.
-
- The multicast-address is used to broadcast detection messages.
- To be more specific, it is the IP address of the
- multicast group the detector will join. The bind-address
- is the IP that is bound by the network interface.
-
- The detector will send heartbeat messages every X milliseconds
- (this is the heartbeat-time-delay). If external servers'
- detectors do not send their heartbeat messages within the
- default-time-delay, our detector will assume that external
- server has gone down. These settings affect the timeliness
- of our auto-detection mechanism.
-
- EMBEDDED: since the agent is running inside the server, no need
- to try to auto-discover it since, if the agent is up, it knows
- the server is, too.
- -->
- <entry key="rhq.communications.multicast-detector.enabled" value="false" />
- <entry key="rhq.communications.multicast-detector.multicast-address" value="224.16.16.16" />
- <entry key="rhq.communications.multicast-detector.bind-address" value="0.0.0.0" />
- <entry key="rhq.communications.multicast-detector.port" value="16162" />
- <entry key="rhq.communications.multicast-detector.default-time-delay" value="5000" />
- <entry key="rhq.communications.multicast-detector.heartbeat-time-delay" value="1000" />
-
- <!--
- _______________________________________________________________
- rhq.communications.connector.rhqtype
- rhq.communications.connector.transport
- rhq.communications.connector.bind-port
- rhq.communications.connector.bind-address
- rhq.communications.connector.transport-params
- rhq.communications.connector.lease-period
-
- The agent's connector configuration. This is the service that
- listens for incoming client requests and passes them to the
- appropriate server-side components for processing. See the
- JBoss/Remoting documentation for a full list of options
- that can be specified. Note that because this is an XML file,
- you must specify "&" in the transport-params value
- when needing an ampersand to separate the parameters.
-
- EMBEDDED: the bind address will be overridden to be the
- one used by the server. The bind port is normally overridden
- in the jboss-service.xml also.
- -->
- <entry key="rhq.communications.connector.rhqtype" value="agent" />
- <entry key="rhq.communications.connector.transport" value="socket" />
- <!--
- <entry key="rhq.communications.connector.bind-address" value="127.0.0.1" />
- <entry key="rhq.communications.connector.bind-port" value="26163" />
- -->
- <!--
- <entry key="rhq.communications.connector.transport-params" value="clientConnectAddress=127.0.0.1&clientConnectPort=16163&numAcceptThreads=3&maxPoolSize=303&clientMaxPoolSize=304&socketTimeout=60000&enableTcpNoDelay=true&backlog=200" />
- <entry key="rhq.communications.connector.lease-period" value="5000" />
- -->
-
- <!--
- _______________________________________________________________
- rhq.communications.connector.security.secure-socket-protocol
- rhq.communications.connector.security.keystore.file
- rhq.communications.connector.security.keystore.algorithm
- rhq.communications.connector.security.keystore.type
- rhq.communications.connector.security.keystore.password
- rhq.communications.connector.security.keystore.key-password
- rhq.communications.connector.security.keystore.alias
- rhq.communications.connector.security.truststore.file
- rhq.communications.connector.security.truststore.algorithm
- rhq.communications.connector.security.truststore.type
- rhq.communications.connector.security.truststore.password
- rhq.communications.connector.security.client-auth-mode
-
- rhq.agent.client.security.secure-socket-protocol
- rhq.agent.client.security.keystore.file
- rhq.agent.client.security.keystore.algorithm
- rhq.agent.client.security.keystore.type
- rhq.agent.client.security.keystore.password
- rhq.agent.client.security.keystore.key-password
- rhq.agent.client.security.keystore.alias
- rhq.agent.client.security.truststore.file
- rhq.agent.client.security.truststore.algorithm
- rhq.agent.client.security.truststore.type
- rhq.agent.client.security.truststore.password
- rhq.agent.client.security.server-auth-mode-enabled
-
- These are the settings that are used if SSL is to be used for
- either the server or client communications. These can be left
- unset since the defaults will normally suffice. These
- properties are here just in case some use case occurs that
- require one or more of these settings to be customized.
-
- Note that if client-auth-mode is specified, it must be one of:
- "none", "want", "need".
-
- EMBEDDED: the agent is in the same VM as the server so there
- is no need for transport security since traffic is never
- actually routed outside of the VM.
- -->
- <!--
- <entry key="rhq.communications.connector.security.secure-socket-protocol" value="TLS" />
- <entry key="rhq.communications.connector.security.keystore.file" value="data/keystore.dat" />
- <entry key="rhq.communications.connector.security.keystore.algorithm" value="SunX509" />
- <entry key="rhq.communications.connector.security.keystore.type" value="JKS" />
- <entry key="rhq.communications.connector.security.keystore.password" value="rhqpwd" />
- <entry key="rhq.communications.connector.security.keystore.key-password" value="rhqpwd" />
- <entry key="rhq.communications.connector.security.keystore.alias" value="rhq" />
- <entry key="rhq.communications.connector.security.truststore.file" value="data/truststore.dat" />
- <entry key="rhq.communications.connector.security.truststore.algorithm" value="SunX509" />
- <entry key="rhq.communications.connector.security.truststore.type" value="JKS" />
- <entry key="rhq.communications.connector.security.truststore.password" value="" />
- <entry key="rhq.communications.connector.security.client-auth-mode" value="none" />
-
- <entry key="rhq.agent.client.security.secure-socket-protocol" value="TLS" />
- <entry key="rhq.agent.client.security.keystore.file" value="data/keystore.dat" />
- <entry key="rhq.agent.client.security.keystore.algorithm" value="SunX509" />
- <entry key="rhq.agent.client.security.keystore.type" value="JKS" />
- <entry key="rhq.agent.client.security.keystore.password" value="rhqpwd" />
- <entry key="rhq.agent.client.security.keystore.key-password" value="rhqpwd" />
- <entry key="rhq.agent.client.security.keystore.alias" value="rhq" />
- <entry key="rhq.agent.client.security.truststore.file" value="data/truststore.dat" />
- <entry key="rhq.agent.client.security.truststore.algorithm" value="SunX509" />
- <entry key="rhq.agent.client.security.truststore.type" value="JKS" />
- <entry key="rhq.agent.client.security.truststore.password" value="" />
- <entry key="rhq.agent.client.security.server-auth-mode-enabled" value="false" />
- -->
-
- <!--
- _______________________________________________________________
- rhq.communications.remote-stream-max-idle-time-msecs
-
- The maximum amount of milliseconds a remoted stream
- is allowed to be idle before it is automatically closed and
- removed from the server. This means that a client must
- attempt to access the remoted stream every X milliseconds
- (where X is the value of this setting) or that stream will no
- longer be available. Note that this does not mean a client
- must read or write the entire stream in this amount of time,
- it only means a client must make a request on the stream every
- X milliseconds (be it to read or write one byte, see how many
- bytes are available to be read, etc).
- -->
- <entry key="rhq.communications.remote-stream-max-idle-time-msecs" value="300000" />
-
- <!--
- _______________________________________________________________
- rhq.communications.command-service-directory.allow-dynamic-discovery
-
- Flag to allow new command services to be added to the command
- services directory during runtime. If this is false, only
- those services defined in the
- rhq.communications.command-services preference will be available
- during the lifetime of the command service directory.
- -->
- <entry key="rhq.communications.command-service-directory.allow-dynamic-discovery" value="true" />
-
- <!--
- _______________________________________________________________
- rhq.communications.command-services
-
- Command Services that are to be added immediately at startup.
- -->
- <entry key="rhq.communications.command-services" value="org.rhq.enterprise.communications.command.impl.echo.server.EchoCommandService, org.rhq.enterprise.communications.command.impl.identify.server.IdentifyCommandService" />
-
- <!--
- _______________________________________________________________
- rhq.communications.remote-pojos
-
- Objects that are to be created and their remote interfaces
- deployed immediately at startup. The format of the value is
- a comma separated list of implementation/interface names:
- class.to.instantiate.via.noarg.constructor:interface.to.expose
- -->
- <entry key="rhq.communications.remote-pojos" value="org.rhq.enterprise.communications.PingImpl:org.rhq.enterprise.communications.Ping" />
-
- <!--
- _______________________________________________________________
- rhq.agent.do-not-override-prefs-with-sysprops
-
- EMBEDDED: To avoid having the embedded agent pick up
- configuration settings that belong to the server in which it is
- embedded, we want to disable the system property overlay
- feature of the agent configuration.
- -->
- <entry key="rhq.agent.do-not-override-prefs-with-sysprops" value="true" />
-
- </map>
- </node>
- </node>
- </root>
-</preferences>
\ No newline at end of file
diff --git a/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/jboss-deployment-structure.xml b/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/jboss-deployment-structure.xml
new file mode 100644
index 0000000..afbe075
--- /dev/null
+++ b/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/jboss-deployment-structure.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.1">
+ <deployment>
+ <resources>
+ <resource-root path="lib/rhq-enterprise-agent-${project.version}.jar" />
+ <resource-root path="lib/rhq-enterprise-comm-${project.version}.jar" />
+ <resource-root path="lib/rhq-core-comm-api-${project.version}.jar" />
+ <resource-root path="lib/rhq-core-util-${project.version}.jar" />
+ <resource-root path="lib/i18nlog-${i18nlog.version}.jar" />
+ </resources>
+ </deployment>
+</jboss-deployment-structure>
\ No newline at end of file
diff --git a/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/jboss-service.xml b/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/jboss-service.xml
index d014713..b8f3359 100644
--- a/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/jboss-service.xml
+++ b/modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/jboss-service.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: jboss-service.xml,v 1.3.2.12 2006/03/10 19:26:40 asaldhana Exp $ -->
-<server>
+<server xmlns="urn:jboss:service:7.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd">
<mbean code="org.rhq.enterprise.server.agent.EmbeddedAgentBootstrapService"
name="rhq:service=EmbeddedAgentBootstrap">
@@ -9,129 +10,11 @@
<attribute name="AgentEnabled">${rhq.server.embedded-agent.enabled:false}</attribute>
<attribute name="ResetConfiguration">${rhq.server.embedded-agent.reset-configuration:false}</attribute>
<attribute name="PreferencesNodeName">${rhq.server.embedded-agent.name:}</attribute>
-
- <attribute name="ConfigurationOverrides" serialDataType="jbxb">
- <java:properties xmlns:java="urn:jboss:java-properties"
- xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:schemaLocation="urn:jboss:java-properties resource:java-properties_1_0.xsd">
+ <attribute name="EmbeddedAgentDirectory">${jboss.server.base.dir}/deployments/rhq-agent.sar/META-INF/embedded-agent</attribute>
+ <attribute name="ConfigurationOverridesFile">embedded-agent-configuration-overrides.properties</attribute>
- <!-- name of the embedded agent -->
-
- <java:property>
- <java:key>rhq.agent.name</java:key>
- <java:value>${rhq.server.embedded-agent.name:}</java:value>
- </java:property>
-
- <!-- the agent's server will point to the location of the server where it is embedded -->
-
- <java:property>
- <java:key>rhq.agent.server.transport</java:key>
- <java:value>${rhq.communications.connector.transport:servlet}</java:value>
- </java:property>
- <java:property>
- <java:key>rhq.agent.server.bind-address</java:key>
- <java:value>${rhq.communications.connector.bind-address}</java:value>
- </java:property>
- <java:property>
- <java:key>rhq.agent.server.bind-port</java:key>
- <java:value>${rhq.communications.connector.bind-port}</java:value>
- </java:property>
- <java:property>
- <java:key>rhq.agent.server.transport-params</java:key>
- <java:value>${rhq.communications.connector.transport-params:/jboss-remoting-servlet-invoker/ServerInvokerServlet}</java:value>
- </java:property>
-
- <!-- the binding address/port for the agent's server socket -->
-
- <java:property>
- <java:key>rhq.communications.connector.bind-address</java:key>
- <java:value>${rhq.communications.connector.bind-address}</java:value>
- </java:property>
- <java:property>
- <java:key>rhq.communications.connector.bind-port</java:key>
- <java:value>${rhq.server.embedded-agent.bind-port:26163}</java:value>
- </java:property>
-
- <!-- location where data files can be stored -->
-
- <java:property>
- <java:key>rhq.agent.data-directory</java:key>
- <java:value>${jboss.server.data.dir}/embedded-agent</java:value>
- </java:property>
-
- <!-- location of the plugins -->
-
- <java:property>
- <java:key>rhq.agent.plugins.directory</java:key>
- <java:value>${jboss.server.home.dir}/deploy/rhq.ear/rhq-downloads/rhq-plugins</java:value>
- </java:property>
-
- <!-- Client-side SSL Security Configuration (for sending messages to the server) -->
-
- <java:property>
- <java:key>rhq.agent.client.security.secure-socket-protocol</java:key>
- <java:value>${rhq.communications.connector.security.secure-socket-protocol:TLS}</java:value>
- </java:property>
- <java:property>
- <java:key>rhq.agent.client.security.keystore.file</java:key>
- <java:value>${rhq.communications.connector.security.keystore.file}</java:value>
- </java:property>
- <java:property>
- <java:key>rhq.agent.client.security.keystore.algorithm</java:key>
- <java:value>${rhq.communications.connector.security.keystore.algorithm:SunX509}</java:value>
- </java:property>
- <java:property>
- <java:key>rhq.agent.client.security.keystore.type</java:key>
- <java:value>${rhq.communications.connector.security.keystore.type:JKS}</java:value>
- </java:property>
- <java:property>
- <java:key>rhq.agent.client.security.keystore.password</java:key>
- <java:value>${rhq.communications.connector.security.keystore.password:rhqpwd}</java:value>
- </java:property>
- <java:property>
- <java:key>rhq.agent.client.security.keystore.key-password</java:key>
- <java:value>${rhq.communications.connector.security.keystore.key-password:rhqpwd}</java:value>
- </java:property>
- <java:property>
- <java:key>rhq.agent.client.security.keystore.alias</java:key>
- <java:value>${rhq.communications.connector.security.keystore.alias:rhq}</java:value>
- </java:property>
- <java:property>
- <java:key>rhq.agent.client.security.truststore.file</java:key>
- <java:value>${rhq.communications.connector.security.truststore.file}</java:value>
- </java:property>
- <java:property>
- <java:key>rhq.agent.client.security.truststore.algorithm</java:key>
- <java:value>${rhq.communications.connector.security.truststore.algorithm:SunX509}</java:value>
- </java:property>
- <java:property>
- <java:key>rhq.agent.client.security.truststore.type</java:key>
- <java:value>${rhq.communications.connector.security.truststore.type:JKS}</java:value>
- </java:property>
- <java:property>
- <java:key>rhq.agent.client.security.truststore.password</java:key>
- <java:value>${rhq.communications.connector.security.truststore.password}</java:value>
- </java:property>
- <java:property>
- <java:key>rhq.agent.client.security.server-auth-mode-enabled</java:key>
- <java:value>${rhq.server.client.security.server-auth-mode-enabled:false}</java:value>
- </java:property>
-
- <!-- indicate if you do not want the native system to be used by the embedded agent -->
-
- <java:property>
- <java:key>rhq.agent.disable-native-system</java:key>
- <java:value>${rhq.server.embedded-agent.disable-native-system:false}</java:value>
- </java:property>
-
- </java:properties>
- </attribute>
-
- <attribute name="EmbeddedAgentDirectory">${jboss.server.home.dir}/deploy/rhq-agent.sar/META-INF/embedded-agent</attribute>
-
<!-- comma-separated arguments passed to agent main method; do not pass the -c or -p arguments -->
- <attribute name="AgentArguments">--daemon,--output=${jboss.home.dir}/../logs/embedded-agent.out</attribute>
-
+ <attribute name="AgentArguments">--daemon,--output=${jboss.server.log.dir}/embedded-agent.out</attribute>
</mbean>
</server>
diff --git a/modules/enterprise/server/sars/agent-sar/src/main/resources/embedded-agent-configuration-overrides.properties b/modules/enterprise/server/sars/agent-sar/src/main/resources/embedded-agent-configuration-overrides.properties
new file mode 100644
index 0000000..3bcc7d7
--- /dev/null
+++ b/modules/enterprise/server/sars/agent-sar/src/main/resources/embedded-agent-configuration-overrides.properties
@@ -0,0 +1,29 @@
+# name of the embedded agent
+rhq.agent.name=${rhq.server.embedded-agent.name:}
+# the agent's server will point to the location of the server where it is embedded
+rhq.agent.server.transport=${rhq.communications.connector.transport:servlet}
+rhq.agent.server.bind-address=${rhq.communications.connector.bind-address}
+rhq.agent.server.bind-port=${rhq.communications.connector.bind-port}
+rhq.agent.server.transport-params=${rhq.communications.connector.transport-params:/jboss-remoting-servlet-invoker/ServerInvokerServlet}
+# the binding address/port for the agent's server socket
+rhq.communications.connector.bind-address=${rhq.communications.connector.bind-address}
+rhq.communications.connector.bind-port=${rhq.server.embedded-agent.bind-port:26163}
+# location where data files can be stored
+rhq.agent.data-directory=${jboss.server.data.dir}/embedded-agent
+# location of the plugins
+rhq.agent.plugins.directory=${jboss.server.base.dir}/deployments/rhq.ear/rhq-downloads/rhq-plugins
+# Client-side SSL Security Configuration (for sending messages to the server)
+rhq.agent.client.security.secure-socket-protocol=${rhq.communications.connector.security.secure-socket-protocol:TLS}
+rhq.agent.client.security.keystore.file=${rhq.communications.connector.security.keystore.file}
+rhq.agent.client.security.keystore.algorithm=${rhq.communications.connector.security.keystore.algorithm:SunX509}
+rhq.agent.client.security.keystore.type=${rhq.communications.connector.security.keystore.type:JKS}
+rhq.agent.client.security.keystore.password=${rhq.communications.connector.security.keystore.password:rhqpwd}
+rhq.agent.client.security.keystore.key-password=${rhq.communications.connector.security.keystore.key-password:rhqpwd}
+rhq.agent.client.security.keystore.alias=${rhq.communications.connector.security.keystore.alias:rhq}
+rhq.agent.client.security.truststore.file=${rhq.communications.connector.security.truststore.file}
+rhq.agent.client.security.truststore.algorithm=${rhq.communications.connector.security.truststore.algorithm:SunX509}
+rhq.agent.client.security.truststore.type=${rhq.communications.connector.security.truststore.type:JKS}
+rhq.agent.client.security.truststore.password=${rhq.communications.connector.security.truststore.password}
+rhq.agent.client.security.server-auth-mode-enabled=${rhq.server.client.security.server-auth-mode-enabled:false}
+# indicate if you do not want the native system to be used by the embedded agent
+rhq.agent.disable-native-system=${rhq.server.embedded-agent.disable-native-system:false}
diff --git a/modules/enterprise/server/sars/agent-sar/src/main/resources/embedded-agent-configuration.xml b/modules/enterprise/server/sars/agent-sar/src/main/resources/embedded-agent-configuration.xml
new file mode 100644
index 0000000..a9a8b77
--- /dev/null
+++ b/modules/enterprise/server/sars/agent-sar/src/main/resources/embedded-agent-configuration.xml
@@ -0,0 +1,1062 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE preferences SYSTEM 'http://java.sun.com/dtd/preferences.dtd'>
+
+<!--
+==============================================================================
+Embedded RHQ Agent Configuration
+==============================================================================
+-->
+
+<preferences EXTERNAL_XML_VERSION="1.0">
+ <root type="user">
+ <map />
+ <node name="rhq-agent">
+ <map />
+ <node name="${rhq.server.embedded-agent.preferences-node}">
+ <map>
+ <!--
+ _______________________________________________________________
+ rhq.agent.configuration-schema-version
+
+ Defines what version of the agent configuration schema this
+ file conforms to. This is the schema for the rhq.agent
+ preferences.
+ -->
+ <entry key="rhq.agent.configuration-schema-version" value="6" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.configuration-setup-flag
+
+ If true, the agent will assume it is fully configured and
+ will not ask setup questions when it starts up. If false,
+ the agent assumes the configuration is not complete and
+ will ask a series of setup questions to the user in order
+ to be fully configured.
+
+ If you write your own custom agent configuration file, you
+ will probably want to set this flag to true since you
+ probably will set all of your configuration right in the
+ configuration file itself. However, you may wish to
+ distribute agent configuration files with only a subset
+ of configuration preferences set and rely on each agent's
+ startup setup mechanism to finish its configuration - in this
+ case, you'll want to leave this as false.
+
+ EMBEDDED: this is true - we ensure the agent is fully
+ configured; we have to since the agent has no console
+ interface and must start in daemon mode
+ -->
+ <entry key="rhq.agent.configuration-setup-flag" value="true" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.name
+
+ Explicitly defines what the agent's name is. This will
+ default to the agent's fully qualified domain name (that is,
+ the FQDN of the platform where the agent is running). However,
+ you can set this to any value you want, so long as it is
+ unique among all other agents. You will need to explicitly set
+ this if the agent platform's FQDN cannot be reliably determined
+ at runtime.
+
+ EMBEDDED: this will usually be overridden so the deployer can
+ provide a unique embedded agent name
+ -->
+ <entry key="rhq.agent.name" value="127.0.0.1"/>
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.server.transport
+ rhq.agent.server.bind-address
+ rhq.agent.server.bind-port
+ rhq.agent.server.transport-params
+
+ The RHQ Server endpoint configuration.
+
+ Note that because this is an XML file, you must specify
+ "&" in the transport-params value when needing an ampersand
+ to separate the transport parameters.
+
+ EMBEDDED: these will usually be overridden in the
+ jboss-service.xml of the embedded agent service
+ -->
+ <entry key="rhq.agent.server.transport" value="servlet" />
+ <entry key="rhq.agent.server.bind-port" value="7080" />
+ <entry key="rhq.agent.server.bind-address" value="127.0.0.1" />
+ <entry key="rhq.agent.server.transport-params" value="/jboss-remoting-servlet-invoker/ServerInvokerServlet" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.server-auto-detection
+
+ If true, the agent will attempt to auto-detect the RHQ Server
+ coming online and going offline. This is more efficient
+ than server polling but it requires multicast traffic to be
+ enabled on your network and also requires the multicast
+ detector be enabled.
+
+ EMBEDDED: we disable this since we know if the agent is started
+ the server must be started (since the agent lives inside the
+ server!)
+ -->
+ <entry key="rhq.agent.server-auto-detection" value="false" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.register-with-server-at-startup
+
+ If true, the agent will attempt to register itself with the
+ RHQ Server when the agent starts up. If false, the agent will
+ not automatically register itself at startup; the agent must
+ be manually registered via some other mechanism (e.g. the
+ 'register' prompt command). The agent must be registered
+ at least once in order to notify the RHQ Server about its
+ existence and to assign the agent a valid security token.
+ Note that even if this is true, the registration may not happen
+ immediately if the RHQ Server itself is not up - once the RHQ
+ Server comes up, the registration attempt will occur.
+ -->
+ <entry key="rhq.agent.register-with-server-at-startup" value="true" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.wait-for-server-at-startup-msecs
+
+ This defines how many milliseconds the agent should wait at
+ startup for the RHQ Server to be detected. If the RHQ Server
+ has not started up in the given amount of time, the agent will
+ continue initializing and expect the server to come up later.
+ If this is 0, the agent will not wait at all.
+
+ EMBEDDED: we still give an initial pause to let the server
+ finish starting up before its embedded agent starts talking
+ to it.
+ -->
+ <entry key="rhq.agent.wait-for-server-at-startup-msecs" value="10000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.update-plugins-at-startup
+
+ If true, the agent will attempt to update its current set
+ of plugins to their latest versions at startup. If false, the
+ agent will not automatically update the plugins; the agent
+ will use its current plugins. To update the plugins, you must
+ manually do so via some other mechanism (e.g. the
+ 'plugins' prompt command).
+ Note that even if this is true, the update may not happen
+ immediately if the RHQ Server itself is not up - once the RHQ
+ Server comes up, the update attempt will occur.
+
+ EMBEDDED: we do not need to update the plugins because the
+ embedded agent will just share the plugins that the server
+ serves to other agents.
+ -->
+ <entry key="rhq.agent.update-plugins-at-startup" value="false" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.test-failover-list-at-startup
+
+ If true, the agent will test connectivity to all server
+ endpoints found in the agent's failover list. This helps
+ provide a mechanism to quickly detect problems with the
+ public endpoints configured for all RHQ Servers.
+ -->
+ <!--
+ <entry key="rhq.agent.test-failover-list-at-startup" value="false" />
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.agent-update.enabled
+
+ 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.
+
+ EMBEDDED: we never have to worry about being up-to-date,
+ the embedded agent will always be the latest
+ when embedded in its server.
+ -->
+ <entry key="rhq.agent.agent-update.enabled" value="false" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.agent-update.version-url
+
+ If this is defined, it 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.
+ -->
+ <!--
+ <entry key="rhq.agent.agent-update.version-url" value="http://127.0.0.1:7080/agentupdate/version" />
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.agent-update.download-url
+
+ If this is defined, it 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.
+ -->
+ <!--
+ <entry key="rhq.agent.agent-update.download-url" value="http://127.0.0.1:7080/agentupdate/download" />
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.primary-server-switchover-check-interval-msecs
+
+ The agent will periodically check to ensure that the server
+ it is connected to is its primary server (as opposed to one
+ of its failover servers). This preference defines how many
+ milliseconds the agent should wait in between these checks.
+ A side-effect of this check is that the agent will also
+ download an updated version of its failover list. So if
+ new servers have been added to the cloud, the agent will
+ now know about it.
+
+ If this is 0, this check is never performed. You should never
+ set this to 0 unless your agent will never participate in
+ an RHQ HA environment.
+ -->
+ <entry key="rhq.agent.primary-server-switchover-check-interval-msecs" value="3600000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.vm-health-check.interval-msecs
+
+ The agent will periodically check the health of its JVM if
+ this preference is larger than 0. This check will allow the
+ agent to attempt to correct possibly fatal problems that are
+ detected (such as the JVM getting critically low on memory).
+ The value of this preference, if larger than 0, is the number
+ of milliseconds the agent should wait in between checks.
+
+ EMBEDDED: disabled - will not check the VM health
+ -->
+ <entry key="rhq.agent.vm-health-check.interval-msecs" value="0" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.vm-health-check.low-heap-mem-threshold
+ rhq.agent.vm-health-check.low-nonheap-mem-threshold
+
+ The threshold percentage (as a floating decimal) that must be
+ crossed if the agent's VM health check thread is to consider
+ the JVM with critically low memory. For example, if
+ the agent's maximum heap size is 100MB and the heap
+ threshold is set to 0.90, the agent's VM health check thread
+ will consider the agent critically low on memory if the agent
+ is using over 90MB of heap space.
+ Note that he heap and non-heap memory thresholds are specified
+ as separate preferences.
+ -->
+ <entry key="rhq.agent.vm-health-check.low-heap-mem-threshold" value="0.90" />
+ <entry key="rhq.agent.vm-health-check.low-nonheap-mem-threshold" value="0.90" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.data-directory
+
+ Location of a directory where the agent can write its internal
+ cache of data.
+
+ EMBEDDED: will be overridden to the server's data directory
+ -->
+ <!--
+ <entry key="rhq.agent.data-directory" value="data" />
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.queue-size
+
+ The maximum size of the client command queue - this is the
+ maximum number of commands that can be queued for sending to
+ the server. If this is 0, then the queue is unbounded.
+ WARNING! Setting this to 0 could lead to resources being used
+ up if for some reason commands keep getting queued but are
+ not getting sent.
+ -->
+ <entry key="rhq.agent.client.queue-size" value="50000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.max-concurrent
+
+ The maximum number of concurrent commands that can be in the
+ process of being sent to the server at any one time.
+ -->
+ <entry key="rhq.agent.client.max-concurrent" value="5" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.command-timeout-msecs
+
+ The time in milliseconds that the client sender will wait
+ before aborting a command. This is the amount of time in
+ milliseconds that the server has in order to process commands.
+ This value is only the default if a command has not specified
+ its own timeout. A command can override this by setting its
+ own timeout in the command's configuration, so this value may
+ not be used for all commands that are sent. If this value is
+ less than or equal to 0, there will be no default timeout
+ and commands will therefore be allowed to take as long as they
+ need (again, this is the default, individual commands may
+ override this and set their own timeout). While this infinite
+ timeout default could conceivably cause a thread to hang
+ waiting for a rogue command that never finishes, it also reduces
+ the amount of short-lived threads created by the system
+ and will increase throughput, dramatically in some cases.
+ -->
+ <entry key="rhq.agent.client.command-timeout-msecs" value="600000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.retry-interval-msecs
+
+ This is the minimum amount of time, in milliseconds, the client
+ sender will wait before trying to resend a guaranteed command
+ that previously failed. This is not a guarantee of when
+ a command is retried - all that can be inferred is that a
+ command that fails to be sent will not be retried until at
+ least this amount of time passes.
+ Note: if the sender is currently waiting in this retry pause
+ period, the agent will not be able to be shutdown until that
+ retry period is over. In other words, if the agent is asked
+ to shutdown, it will wait for those commands waiting in this
+ retry interval to wake up. This is to help ensure those
+ commands are not lost. Keep this time period short enough
+ to make agent shutdowns fairly responsive but long enough
+ to avoid spinning the process with continuous resending of
+ commands during periods of RHQ Server downtime. It is
+ recommended to use auto-detection or server polling in order
+ to automatically stop the client sender from continuously
+ trying to retry commands during long periods of RHQ
+ Server downtime.
+ -->
+ <entry key="rhq.agent.client.retry-interval-msecs" value="15000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.max-retries
+
+ If a guaranteed delivery message is sent, but the agent fails
+ to connect to the server and deliver the message, it will
+ always be retried. However, if the error was something other
+ than a "cannot connect" error, the command will only be retried
+ this amount of times before the command is dropped. When this
+ happens, the guaranteed command will never be delivered. This
+ will normally happen under very odd and rare circumstances.
+ Also, this setting only effects asynchronous messages that
+ are sent with guaranteed delivery. This setting has no effect
+ on other messages.
+ -->
+ <entry key="rhq.agent.client.max-retries" value="10" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.server-polling-interval-msecs
+
+ If this value is larger than 0, it indicates the client sender
+ 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. If the
+ value is 0 or less, server polling is disabled. Server polling
+ is less efficient that the agent's auto-detection mechanism,
+ but server polling does not use multicasting, and thus might
+ be the only way for the agent to detect the server.
+
+ EMBEDDED: we do not need to poll since we know the server is
+ always up
+ -->
+ <entry key="rhq.agent.client.server-polling-interval-msecs" value="0" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.command-spool-file.name
+
+ This 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). Note that if you do not define
+ this setting, the default is to not spool commands to disk
+ and thus implicitly disable guaranteed delivery.
+ -->
+ <entry key="rhq.agent.client.command-spool-file.name" value="embedded-agent-command-spool.dat" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.command-spool-file.params
+
+ This defines the parameters for the command spool file.
+ The spool file is where the agent persists commands that
+ are flagged for guaranteed delivery and need to be sent.
+ The format is defined as "max-file-size:purge-percentage".
+ The first number is the size, in bytes, of the maximum file
+ size threshold. If the spool file grows larger than this, a
+ "purge" will be triggered in order to shrink the file.
+ The second number is the purge percentage which indicates how
+ large the file is allowed to be after a purge. This is
+ specified as a percentage of the first parameter - the max
+ file size threshold. For example, if the max file size is
+ 100000 (i.e. 100KB) and the purge percentage is 90, then when
+ the spool file grows larger than 100KB, a purge will be
+ triggered and the file will be shrunk to no more than
+ 90% of 100KB - which is 90KB. In effect, 10KB will be freed
+ to allow room for new commands to be spooled. When this
+ occurs, unused space is freed first and if that does not
+ free up enough space, the oldest commands in the spool file
+ will be sacrificed in order to make room for the newer
+ commands.
+ -->
+ <entry key="rhq.agent.client.command-spool-file.params" value="10000000:75" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.command-spool-file.compressed
+
+ If this flag is true, the commands stored in the spool file
+ will be compressed. This can potentially save about 30%-40% in
+ disk space (give or take), however, it slows down the
+ persistence mechanism considerably. Recommended setting for
+ this should be true unless something on the agent deployment
+ box warrants persistence performance over disk-saving . The
+ performance hit will only appear when unusual conditions occur,
+ such as shutting down while some guaranteed commands have not
+ been sent yet or if the RHQ Server is down. It will not affect
+ the agent under normal conditions (while running with the RHQ
+ Server up and successfully communicating with the agent).
+ In those unusual/rare conditions, having performance degradation
+ may not be as important.
+ -->
+ <entry key="rhq.agent.client.command-spool-file.compressed" value="true" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.send-throttling
+
+ If this setting is defined, it will enable send throttling to
+ occur while sending commands to the server. The format is
+ defined as "max-commands:quiet-period-milliseconds"
+ where the maximum commands defines the maximum number
+ of commands that will be sent before the start of a quiet
+ period. The quiet period defines the number of milliseconds
+ in which no commands should be sent. After this duration
+ expires, commands can again be sent, up to the maximum defined.
+ Note that send throttling only affects those commands that
+ are "throttle-able". Some commands are sent as soon as
+ possible, regardless of the throttling settings.
+
+ This affects sending commands synchronously and asynchronously.
+ -->
+ <entry key="rhq.agent.client.send-throttling" value="100:1000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.queue-throttling
+
+ If this setting is defined, it will enable queue throttling to
+ occur while sending commands to the server. The format is
+ defined as "max-commands-per-burst:burst-period-milliseconds"
+ where the maximum commands per burst defines the maximum number
+ of commands that can be dequeued within a burst period. The
+ burst period defines the number of milliseconds in which the
+ defined maximum number of commands can be dequeued. If more
+ than the maximum number of commands are queued within this
+ time period, they will wait until the next burst period starts
+ before being able to be dequeued.
+
+ This does not affect sending commands synchronously. It only
+ effects commands queued to be sent asynchronously.
+ -->
+ <entry key="rhq.agent.client.queue-throttling" value="200:2000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.client.command-preprocessors
+
+ Defines what class or classes will handle preprocessing of all
+ commands that are sent by the agent. To define multiple
+ classes, separate them with colon characters (:).
+ You should never have to change this unless you know what
+ you are doing.
+ -->
+ <entry key="rhq.agent.client.command-preprocessors" value="org.rhq.enterprise.agent.SecurityTokenCommandPreprocessor:org.rhq.enterprise.agent.ExternalizableStrategyCommandPreprocessor" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.disable-native-system
+
+ The agent has a native system (JNI native libraries) on certain
+ supported platforms to help the plugin container perform
+ discovery of native components on those platforms. If the
+ native libraries are causing errors within the agent or if you
+ simply do not want to load native components in the agent,
+ you can disable this native system by setting this preference
+ setting to true.
+ -->
+ <entry key="rhq.agent.disable-native-system" value="false"/>
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.directory
+
+ Defines where the plugins can be located.
+
+ EMBEDDED: this will be overridden to point to the
+ server's location where it stores the plugins that it uses
+ to send to other agents
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.directory" value="plugins"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.operation-invocation-timeout-secs
+
+ When an operation is invoked, it will be aborted if it takes
+ longer than the given amount of seconds. This is just the
+ default operation invocation timeout - a plugin can override
+ this default by defining its own timeout in the operation
+ metadata within its plugin descriptor.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.operation-invocation-timeout-secs" value="600"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.operation-invoker.threadpool-size
+
+ When an operation is to be invoked, the execution of the
+ operation will be performed by threads from a thread pool.
+ This defines the number of threads within that thread pool,
+ effectively defining the number of operations that can be
+ invoked concurrently.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.operation-invoker.threadpool-size" value="5"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.server-discovery.initial-delay-secs
+
+ Defines the delay before the first server discovery scan is
+ run. The value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.server-discovery.initial-delay-secs" value="10"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.server-discovery.period-secs
+
+ Defines how often a server discovery scan is run. This type
+ of scan is used to determine changes in the platform
+ as well as to find new servers that have been added or
+ old server that have been removed. The value is specified
+ in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.server-discovery.period-secs" value="900"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.service-discovery.initial-delay-secs
+
+ Defines the delay before the first service discovery scan is
+ run. The value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.service-discovery.initial-delay-secs" value="20"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.service-discovery.period-secs
+
+ Defines how often a service discovery scan is run. This type
+ of scan is used to find new services that have been added or
+ removed from existing platforms and servers. Technically,
+ this kind of discovery is used to find any child resource
+ to an existing parent resource (like a platform or server).
+ The value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.service-discovery.period-secs" value="86400"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.availability-scan.initial-delay-secs
+
+ Defines the delay before the first availability scan is
+ run. The value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.availability-scan.initial-delay-secs" value="5"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.availability-scan.period-secs
+
+ Defines how often an availability scan is run. This type
+ of scan is used to determine what resources are up and running
+ and what resources have gone down. The value is specified in
+ seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.availability-scan.period-secs" value="300"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.measurement-collection.threadpool-size
+
+ When measurement's are scheduled for collection, the collection
+ will be performed by threads from a thread pool. This defines
+ the number of threads within that thread pool, effectively
+ defining the number of measurements that can be collected
+ concurrently.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.measurement-collection.threadpool-size" value="5"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.measurement-collection.initial-delay-secs
+
+ Defines the delay before the first measurement collection is
+ run. The value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.measurement-collection.initial-delay-secs" value="30"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.drift-detection.initial-delay-secs
+
+ Defines the delay before the first drift detection scan is
+ run. The value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.drift-detection.initial-delay-secs" value="30"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.drift-detection.period-secs
+
+ Defines how often a drift detection scan is run. This type
+ of scan is used to determine what, if any, file changes (such
+ as additions, deletions, modifications) occurred within
+ specific file system locations that are being monitored.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.drift-detection.period-secs" value="60"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.content-discovery.threadpool-size
+
+ When plugins are scheduled to discover content, the discovery
+ will be performed by threads from a thread pool. This defines
+ the number of threads within that thread pool.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.content-discovery.threadpool-size" value="10"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.content-discovery.initial-delay-secs
+
+ Defines the delay before the first content discovery is
+ run. The value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.content-discovery.initial-delay-secs" value="60"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.content-discovery.period-secs
+
+ Defines how often content discoveries are run. The value is
+ specified in seconds. If this value is 0 or less, content
+ discovery will be disabled. Content discovery is used to
+ detect new or changed content that are associated with
+ resources in inventory.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.content-discovery.period-secs" value="30"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.configuration-discovery.initial-delay-secs
+
+ Defines the delay before the first configuration discovery is
+ run. The value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.configuration-discovery.initial-delay-secs" value="300"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.configuration-discovery.period-secs
+
+ Defines how often configuration discoveries are run. The value is
+ specified in seconds. If this value is 0 or less, configuration
+ discovery will be disabled. Configuration discovery is
+ performed to detect changes in a managed resource's
+ configuration settings.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.configuration-discovery.period-secs" value="3600"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.event-sender.initial-delay-secs
+
+ Defines the delay before the first event report gets sent
+ to the server. The value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.event-sender.initial-delay-secs" value="30"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.event-sender.period-secs
+
+ Defines how often event reports get sent to the server. The
+ value is specified in seconds.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.event-sender.period-secs" value="30"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.event-report.max-per-source
+
+ 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.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.event-report.max-per-source" value="200"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.event-report.max-total
+
+ Defines the total maximum number of events that can be placed
+ in a single event report that is sent up to the server.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.event-report.max-total" value="400"/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.plugins.disabled
+
+ Defines the names of the plugins that are to be disabled.
+ This is a comma-separated list of plugin names, where a
+ plugin name is found in the name attribute in the root XML
+ element in the plugin descriptor. A disabled plugin will
+ simply not be loaded in the plugin container.
+
+ By default, all plugins are enabled. If a plugin was marked
+ as disabled by the server, the agent will not download it and
+ will not load it, regardless of the value of this preference.
+ If a plugin is enabled on the server, this
+ preference will override that enable setting (in other words,
+ an agent is able to disable a plugin, effectively overriding
+ the server setting, by placing the plugin name in this
+ preference). If the agent already has a plugin jar in
+ its local plugins directory, but that plugin is disabled
+ via this preference, that local plugin jar file will be
+ deleted and the plugin will not be loaded.
+ -->
+ <!--
+ <entry key="rhq.agent.plugins.disabled" value=""/>
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.configuration-schema-version
+
+ Defines what version of the agent configuration schema this
+ file conforms to. This is the schema for the
+ rhq.communications preferences.
+ -->
+ <entry key="rhq.communications.configuration-schema-version" value="1" />
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.service-container.mbean-server-name
+
+ Name of the MBean Server that houses the communications MBean
+ services. This is actually the default domain name of the
+ MBean Server and if an MBean Server has already been registered
+ with this name, it will be used to house the communications
+ services. If an MBean Server has not yet been registered with
+ this name as its default domain, one will be created. Typically
+ this can be left undefined which means the fallback MBeanServer
+ to be used is the built-in JVM platform MBeanServer.
+ -->
+ <entry key="rhq.communications.service-container.mbean-server-name" value="embedded-agent" />
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.data-directory
+
+ The location where the communication services write internal
+ data files. If not defined, the data directory will be the
+ same as the agent's.
+ -->
+ <!--
+ <entry key="rhq.communications.data-directory" value="data" />
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.global-concurrency-limit
+
+ The maximum number of incoming commands that are allowed to be
+ received concurrently. Zero or less indicates there is to
+ be no limit and the agent can accept as many incoming
+ commands as possible. By default, there is no limit
+ and you typically did not have to change this from its
+ default.
+ -->
+ <entry key="rhq.communications.global-concurrency-limit" value="-1" />
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.multicast-detector.enabled
+ rhq.communications.multicast-detector.multicast-address
+ rhq.communications.multicast-detector.bind-address
+ rhq.communications.multicast-detector.port
+ rhq.communications.multicast-detector.default-time-delay
+ rhq.communications.multicast-detector.heartbeat-time-delay
+
+ The multicast detector configuration. This is the service that
+ listens for new remote servers coming on and going offline and
+ is required if you want server auto-detection. If you do not
+ have server auto-detection enabled or your network will not
+ support multicast traffic, you should disable the multicast
+ detector.
+
+ The multicast-address is used to broadcast detection messages.
+ To be more specific, it is the IP address of the
+ multicast group the detector will join. The bind-address
+ is the IP that is bound by the network interface.
+
+ The detector will send heartbeat messages every X milliseconds
+ (this is the heartbeat-time-delay). If external servers'
+ detectors do not send their heartbeat messages within the
+ default-time-delay, our detector will assume that external
+ server has gone down. These settings affect the timeliness
+ of our auto-detection mechanism.
+
+ EMBEDDED: since the agent is running inside the server, no need
+ to try to auto-discover it since, if the agent is up, it knows
+ the server is, too.
+ -->
+ <entry key="rhq.communications.multicast-detector.enabled" value="false" />
+ <entry key="rhq.communications.multicast-detector.multicast-address" value="224.16.16.16" />
+ <entry key="rhq.communications.multicast-detector.bind-address" value="0.0.0.0" />
+ <entry key="rhq.communications.multicast-detector.port" value="16162" />
+ <entry key="rhq.communications.multicast-detector.default-time-delay" value="5000" />
+ <entry key="rhq.communications.multicast-detector.heartbeat-time-delay" value="1000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.connector.rhqtype
+ rhq.communications.connector.transport
+ rhq.communications.connector.bind-port
+ rhq.communications.connector.bind-address
+ rhq.communications.connector.transport-params
+ rhq.communications.connector.lease-period
+
+ The agent's connector configuration. This is the service that
+ listens for incoming client requests and passes them to the
+ appropriate server-side components for processing. See the
+ JBoss/Remoting documentation for a full list of options
+ that can be specified. Note that because this is an XML file,
+ you must specify "&" in the transport-params value
+ when needing an ampersand to separate the parameters.
+
+ EMBEDDED: the bind address will be overridden to be the
+ one used by the server. The bind port is normally overridden
+ in the jboss-service.xml also.
+ -->
+ <entry key="rhq.communications.connector.rhqtype" value="agent" />
+ <entry key="rhq.communications.connector.transport" value="socket" />
+ <!--
+ <entry key="rhq.communications.connector.bind-address" value="127.0.0.1" />
+ <entry key="rhq.communications.connector.bind-port" value="26163" />
+ -->
+ <!--
+ <entry key="rhq.communications.connector.transport-params" value="clientConnectAddress=127.0.0.1&clientConnectPort=16163&numAcceptThreads=3&maxPoolSize=303&clientMaxPoolSize=304&socketTimeout=60000&enableTcpNoDelay=true&backlog=200" />
+ <entry key="rhq.communications.connector.lease-period" value="5000" />
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.connector.security.secure-socket-protocol
+ rhq.communications.connector.security.keystore.file
+ rhq.communications.connector.security.keystore.algorithm
+ rhq.communications.connector.security.keystore.type
+ rhq.communications.connector.security.keystore.password
+ rhq.communications.connector.security.keystore.key-password
+ rhq.communications.connector.security.keystore.alias
+ rhq.communications.connector.security.truststore.file
+ rhq.communications.connector.security.truststore.algorithm
+ rhq.communications.connector.security.truststore.type
+ rhq.communications.connector.security.truststore.password
+ rhq.communications.connector.security.client-auth-mode
+
+ rhq.agent.client.security.secure-socket-protocol
+ rhq.agent.client.security.keystore.file
+ rhq.agent.client.security.keystore.algorithm
+ rhq.agent.client.security.keystore.type
+ rhq.agent.client.security.keystore.password
+ rhq.agent.client.security.keystore.key-password
+ rhq.agent.client.security.keystore.alias
+ rhq.agent.client.security.truststore.file
+ rhq.agent.client.security.truststore.algorithm
+ rhq.agent.client.security.truststore.type
+ rhq.agent.client.security.truststore.password
+ rhq.agent.client.security.server-auth-mode-enabled
+
+ These are the settings that are used if SSL is to be used for
+ either the server or client communications. These can be left
+ unset since the defaults will normally suffice. These
+ properties are here just in case some use case occurs that
+ require one or more of these settings to be customized.
+
+ Note that if client-auth-mode is specified, it must be one of:
+ "none", "want", "need".
+
+ EMBEDDED: the agent is in the same VM as the server so there
+ is no need for transport security since traffic is never
+ actually routed outside of the VM.
+ -->
+ <!--
+ <entry key="rhq.communications.connector.security.secure-socket-protocol" value="TLS" />
+ <entry key="rhq.communications.connector.security.keystore.file" value="data/keystore.dat" />
+ <entry key="rhq.communications.connector.security.keystore.algorithm" value="SunX509" />
+ <entry key="rhq.communications.connector.security.keystore.type" value="JKS" />
+ <entry key="rhq.communications.connector.security.keystore.password" value="rhqpwd" />
+ <entry key="rhq.communications.connector.security.keystore.key-password" value="rhqpwd" />
+ <entry key="rhq.communications.connector.security.keystore.alias" value="rhq" />
+ <entry key="rhq.communications.connector.security.truststore.file" value="data/truststore.dat" />
+ <entry key="rhq.communications.connector.security.truststore.algorithm" value="SunX509" />
+ <entry key="rhq.communications.connector.security.truststore.type" value="JKS" />
+ <entry key="rhq.communications.connector.security.truststore.password" value="" />
+ <entry key="rhq.communications.connector.security.client-auth-mode" value="none" />
+
+ <entry key="rhq.agent.client.security.secure-socket-protocol" value="TLS" />
+ <entry key="rhq.agent.client.security.keystore.file" value="data/keystore.dat" />
+ <entry key="rhq.agent.client.security.keystore.algorithm" value="SunX509" />
+ <entry key="rhq.agent.client.security.keystore.type" value="JKS" />
+ <entry key="rhq.agent.client.security.keystore.password" value="rhqpwd" />
+ <entry key="rhq.agent.client.security.keystore.key-password" value="rhqpwd" />
+ <entry key="rhq.agent.client.security.keystore.alias" value="rhq" />
+ <entry key="rhq.agent.client.security.truststore.file" value="data/truststore.dat" />
+ <entry key="rhq.agent.client.security.truststore.algorithm" value="SunX509" />
+ <entry key="rhq.agent.client.security.truststore.type" value="JKS" />
+ <entry key="rhq.agent.client.security.truststore.password" value="" />
+ <entry key="rhq.agent.client.security.server-auth-mode-enabled" value="false" />
+ -->
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.remote-stream-max-idle-time-msecs
+
+ The maximum amount of milliseconds a remoted stream
+ is allowed to be idle before it is automatically closed and
+ removed from the server. This means that a client must
+ attempt to access the remoted stream every X milliseconds
+ (where X is the value of this setting) or that stream will no
+ longer be available. Note that this does not mean a client
+ must read or write the entire stream in this amount of time,
+ it only means a client must make a request on the stream every
+ X milliseconds (be it to read or write one byte, see how many
+ bytes are available to be read, etc).
+ -->
+ <entry key="rhq.communications.remote-stream-max-idle-time-msecs" value="300000" />
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.command-service-directory.allow-dynamic-discovery
+
+ Flag to allow new command services to be added to the command
+ services directory during runtime. If this is false, only
+ those services defined in the
+ rhq.communications.command-services preference will be available
+ during the lifetime of the command service directory.
+ -->
+ <entry key="rhq.communications.command-service-directory.allow-dynamic-discovery" value="true" />
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.command-services
+
+ Command Services that are to be added immediately at startup.
+ -->
+ <entry key="rhq.communications.command-services" value="org.rhq.enterprise.communications.command.impl.echo.server.EchoCommandService, org.rhq.enterprise.communications.command.impl.identify.server.IdentifyCommandService" />
+
+ <!--
+ _______________________________________________________________
+ rhq.communications.remote-pojos
+
+ Objects that are to be created and their remote interfaces
+ deployed immediately at startup. The format of the value is
+ a comma separated list of implementation/interface names:
+ class.to.instantiate.via.noarg.constructor:interface.to.expose
+ -->
+ <entry key="rhq.communications.remote-pojos" value="org.rhq.enterprise.communications.PingImpl:org.rhq.enterprise.communications.Ping" />
+
+ <!--
+ _______________________________________________________________
+ rhq.agent.do-not-override-prefs-with-sysprops
+
+ EMBEDDED: To avoid having the embedded agent pick up
+ configuration settings that belong to the server in which it is
+ embedded, we want to disable the system property overlay
+ feature of the agent configuration.
+ -->
+ <entry key="rhq.agent.do-not-override-prefs-with-sysprops" value="true" />
+
+ </map>
+ </node>
+ </node>
+ </root>
+</preferences>
\ No newline at end of file
diff --git a/modules/enterprise/server/sars/services-sar/src/main/resources/META-INF/jboss-service.xml b/modules/enterprise/server/sars/services-sar/src/main/resources/META-INF/jboss-service.xml
index 3feb3ea..2f1ad89 100644
--- a/modules/enterprise/server/sars/services-sar/src/main/resources/META-INF/jboss-service.xml
+++ b/modules/enterprise/server/sars/services-sar/src/main/resources/META-INF/jboss-service.xml
@@ -21,8 +21,8 @@
<mbean code="org.rhq.enterprise.server.core.plugin.PluginDeploymentScanner"
name="rhq:service=PluginDeploymentScanner">
<attribute name="ScanPeriod">${rhq.server.plugin-scan-period-ms:300000}</attribute>
- <attribute name="AgentPluginDir">${jboss.home.dir}/standalone/deployments/rhq.ear/rhq-downloads/rhq-plugins</attribute>
- <attribute name="ServerPluginDir">${jboss.home.dir}/standalone/deployments/rhq.ear/rhq-serverplugins</attribute>
+ <attribute name="AgentPluginDir">${jboss.server.base.dir}/deployments/rhq.ear/rhq-downloads/rhq-plugins</attribute>
+ <attribute name="ServerPluginDir">${jboss.server.base.dir}/deployments/rhq.ear/rhq-serverplugins</attribute>
<attribute name="UserPluginDir">${jboss.home.dir}/../plugins</attribute>
</mbean>
diff --git a/modules/enterprise/server/sars/services-sar/src/main/resources/server-comm-configuration-overrides.properties b/modules/enterprise/server/sars/services-sar/src/main/resources/server-comm-configuration-overrides.properties
index 7b9e7a0..da5427b 100644
--- a/modules/enterprise/server/sars/services-sar/src/main/resources/server-comm-configuration-overrides.properties
+++ b/modules/enterprise/server/sars/services-sar/src/main/resources/server-comm-configuration-overrides.properties
@@ -1,5 +1,5 @@
# location of the plugin jars and other files agents can download directly from sever
-rhq.server.agent-files-directory=${jboss.home.dir}/standalone/deployments/rhq.ear/rhq-downloads
+rhq.server.agent-files-directory=${jboss.server.base.dir}/deployments/rhq.ear/rhq-downloads
# location where data files can be stored
rhq.communications.data-directory=${jboss.server.data.dir}
# global limit on number of concurrent incoming messages allowed
1
0
New branch 'feature/cassandra-backend' available with the following commits:
commit 08da6469c862c0383b64c92a0c721b43cc1bc73c
Author: John Sanda <jsanda(a)redhat.com>
Date: Sun Sep 30 20:10:42 2012 -0400
Changing deployment property cluster.type property to is-embedded
After having thought more about the differnet deployment scenarios, I think we
will have either embedded or non-embeeded clusters. A boolean makes more sense
in this case.
commit c11fa5436e6a2d1578e5c39bb355699d112f52fd
Author: John Sanda <jsanda(a)redhat.com>
Date: Sat Sep 29 12:56:54 2012 -0400
Need to parameterize the listen_address and rpc_address properties in bundle recipe
When I first set up this module I forgot to parameterize the listen_address and
rpc_address properties in cassandra.yaml. In the server plugin prototype
project, I set both of them to the hostname bundle recipe property. This commit
introduces separate listen.address and rpc.address bundle recipe properties
making it possible to bind to different interfaces.
commit 7f5950a58bed2cf970dd49689919f052696835d4
Author: John Sanda <jsanda(a)redhat.com>
Date: Sat Sep 29 11:20:54 2012 -0400
Periodically check that we can connect to at least one cassadra node
This is the initial commit for CassandraClusterHeartBeatJob. It checks that the
RHQ server can connect to at least one cassandra node. If the server cannot
establish a connection to any nodes, the rhq server goes into maintenance mode.
When in maintenance mode the server will be brought back into normal operating
mode when a connection is established.
CassandraClusterManagerBean submits the jobs in its installBundle method which
is called at server start up. EmbeddedDeployer has been updated to return a
list of cluster ndoes. That list is passed into CassandraClusterHeartBeatJob.
Conflicts:
modules/enterprise/server/jar/pom.xml
commit 96a01682a90f4bbafb14abca84d91be973a26c13
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Sep 27 16:33:59 2012 -0400
Refactoring logic for embedded cluster deployment
This is the initial commit for EmbeddedDeployer. It performs deployment of an
embedded cluster which is the default cluster type for development. An embedded
cluster is one in which all nodes run on localhost and are bound aliases of the
loopback address, e.g., 127.0.0.2, 127.0.0.3, etc.
EmbeddedDeployer does not server APIs to deploy the cluster. More specifically,
it does not use the bundles subsystem. It does however use the Ant-based
bundles APIs to deploy the cassandra bundle. Since it does not use server APIs
which require a running agent to carry out requests, EmbeddedDeployer is
suitable for bootstrapping scenarios.
EmbeddedDeployer looks for the presence of a marker file named .installed in
the cluster directory for installing nodes. If that file exists, it assumes
that the cluster is already is installed and does not do any installation.
If the marker file is not present, anything in the cluster directory is purged
and nodes will be provisioned.
Conflicts:
modules/enterprise/server/jar/pom.xml
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java
commit 7a430a3ea66dcdaf32c1086ed8cb387e154e9620
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Sep 25 16:01:59 2012 -0400
Install rhq cassandra bundle on server start up.
This commit introduces a number of changes in order to support installing the
rhq cassandra bundle on start up. The contents of the build artifact for the
cassandra-bundle module has changed. The JAR file itself is no longer the
bundle. The artifact now consists of two files - the bundle zip file and
a new file cassandra.properties. cassandra.properties will provide deployment
options like the number of nodes in the cluster.
The bundle recipe file, deploy.xml, is now filtered at build time with
cassandra.properties. Attribute values in deploy.xml for things like
the bundle name and bundle version have to be the same as the ones used in
the installBundle method. Filtering with cassandra.properties makes this
possible.
StartupServlet has been updated to invoke CassandraClusterManagerBean.installBundle.
The installBundle method is idempotent. It will install the necessary bundle
components only if they do not already exist in the database. It can be invoked
multiple times without having any additional effect.
Conflicts:
modules/enterprise/server/jar/pom.xml
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java
commit f1f5f8881ea01b74b80a8656c07b47cbfcab9f27
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Sep 24 11:45:24 2012 -0400
Initial commit for cassandra-bundle module
The cassandra-bundle module packages a bundle recipe for provisioning machines
with instances of Cassandra.
Conflicts:
modules/common/pom.xml
1
0
modules/core/dbutils/pom.xml | 13 +++++++++++++
1 file changed, 13 insertions(+)
New commits:
commit 199a3c56e9f11068bf16fda06544e73197b61184
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Oct 1 13:37:48 2012 -0400
fix the use-case when you specific -Pdev -Ddbsetup while building the dbutils module
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 9c8a9b2..33c0072 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -170,6 +170,7 @@
</property>
</activation>
+ <!-- these are defined in the dev profile also - see below in that profile for why -->
<properties>
<rhq.ds.type-mapping>${rhq.dev.ds.type-mapping}</rhq.ds.type-mapping>
<rhq.ds.server-name>${rhq.dev.ds.server-name}</rhq.ds.server-name>
@@ -368,6 +369,18 @@
<rhq.rootDir>../../..</rhq.rootDir>
<rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
<rhq.deploymentDir>${rhq.containerDir}/jbossas/standalone/deployments/${rhq.earName}/lib</rhq.deploymentDir>
+
+ <!-- these are defined in the db.dev profile also - but if you just use -Pdev without -Ddb=dev or -Pdb.dev
+ then you won't be using the dev DB. These properties allow -Pdev -Ddbsetup to do what you'd expect
+ (that is, setup the dev DB)
+ -->
+ <rhq.ds.type-mapping>${rhq.dev.ds.type-mapping}</rhq.ds.type-mapping>
+ <rhq.ds.server-name>${rhq.dev.ds.server-name}</rhq.ds.server-name>
+ <rhq.ds.db-name>${rhq.dev.ds.db-name}</rhq.ds.db-name>
+ <rhq.ds.connection-url>${rhq.dev.ds.connection-url}</rhq.ds.connection-url>
+ <rhq.ds.user-name>${rhq.dev.ds.user-name}</rhq.ds.user-name>
+ <rhq.ds.password>${rhq.dev.ds.password}</rhq.ds.password>
+ <rhq.ds.driver-class>${rhq.dev.ds.driver-class}</rhq.ds.driver-class>
</properties>
<build>
<plugins>
1
0