code-coverage/pom.xml | 2 dev/null |binary 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-dmr-client/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/arquillian-integration/suite-extension/pom.xml | 2 modules/core/client-api/pom.xml | 2 modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/ConnectAgentResults.java | 23 ++ modules/core/comm-api/pom.xml | 2 modules/core/dbutils/pom.xml | 4 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 23 ++ 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/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java | 12 + modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 3 modules/enterprise/agentupdate/pom.xml | 2 modules/enterprise/binding/pom.xml | 22 ++ modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardBindings.java | 10 - modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java | 11 + modules/enterprise/comm/pom.xml | 2 modules/enterprise/gui/content_http-war/pom.xml | 2 modules/enterprise/gui/coregui/pom.xml | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginTableView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginTableView.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/SimpleCollapsiblePanel.java | 78 ---------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/Carousel.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableIButton.java | 3 modules/enterprise/gui/pom.xml | 2 modules/enterprise/gui/portal-war/pom.xml | 2 modules/enterprise/gui/rest-examples-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/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/appserver/pom.xml | 2 modules/enterprise/server/client-api/pom.xml | 4 modules/enterprise/server/ear/pom.xml | 2 modules/enterprise/server/installer/pom.xml | 2 modules/enterprise/server/itests-2/pom.xml | 2 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java | 33 ---- modules/enterprise/server/jar/pom.xml | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java | 3 modules/enterprise/server/plugins/alert-cli/pom.xml | 4 modules/enterprise/server/plugins/alert-email/pom.xml | 4 modules/enterprise/server/plugins/alert-irc/pom.xml | 4 modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 modules/enterprise/server/plugins/alert-operations/pom.xml | 4 modules/enterprise/server/plugins/alert-roles/pom.xml | 4 modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 modules/enterprise/server/plugins/alert-subject/pom.xml | 4 modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 modules/enterprise/server/plugins/cobbler/pom.xml | 4 modules/enterprise/server/plugins/disk/pom.xml | 2 modules/enterprise/server/plugins/drift-rhq/pom.xml | 2 modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 modules/enterprise/server/plugins/jboss-software/pom.xml | 2 modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 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/pom.xml | 2 modules/enterprise/server/sars/services-sar/pom.xml | 2 modules/enterprise/server/startup-subsystem/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/integration-tests/rest-api/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/cassandra/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-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java | 20 +- modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 5 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AS7CommandLineTest.java | 20 +- 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 161 files changed, 290 insertions(+), 310 deletions(-)
New commits: commit 9957e3f699a021b08093e3fd6a96421577be9725 Merge: a9352d7 c367f45 Author: Simeon Pinder spinder@fulliautomatix.conchfritter.com Date: Tue Feb 26 10:04:15 2013 -0500
Merge branch 'track_master' into spinder/criteriaUsage
commit c367f45a05cd488d4822d51f4c6368f5924c8223 Author: Thomas Segismont tsegismo@redhat.com Date: Thu Feb 21 11:34:05 2013 +0100
BZ911327 - [EAP 6.1] Restarting servers in server-group fails
While the bug was detected because of the underlying EAP operation failing, it appears that the RHQ timeout for this operation is pretty low. The operation timeout is now configurable and should be adjusted by users for their particular environment. It defaults to 2 minutes.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java index 71967e5..eb97042 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java @@ -55,29 +55,30 @@ import org.rhq.modules.plugins.jbossas7.json.Result; * Component dealing with server group specific things * @author Heiko W. Rupp */ -@SuppressWarnings("unused") public class ServerGroupComponent extends BaseComponent implements ContentFacet, CreateChildResourceFacet, OperationFacet {
- private static final String SUCCESS = "success"; private static final String OUTCOME = "outcome"; + private static final String RESTART_SERVERS = "restart-servers";
@Override public OperationResult invokeOperation(String name, Configuration parameters) throws InterruptedException, Exception { - Operation op = new Operation(name, getAddress()); - Result res = getASConnection().execute(op); - + Result res = null; + if (RESTART_SERVERS.equals(name)) { + // This operation as a timeout parameter as it can run for quite a long time + res = getASConnection().execute(op, parameters.getSimple("responseTimeout").getIntegerValue()); + } else { + res = getASConnection().execute(op); + } OperationResult result = new OperationResult(); - if (res.isSuccess()) { - result.setSimpleResult(SUCCESS); + result.setSimpleResult(Result.SUCCESS); } else { result.setErrorMessage(res.getFailureDescription()); } return result; - }
@Override @@ -119,7 +120,7 @@ public class ServerGroupComponent extends BaseComponent implements ContentFacet,
if (uploadResult.has(OUTCOME)) { String outcome = uploadResult.get(OUTCOME).getTextValue(); - if (outcome.equals(SUCCESS)) { // Upload was successful, so now add the file to the server group + if (outcome.equals(Result.SUCCESS)) { // Upload was successful, so now add the file to the server group JsonNode resultNode = uploadResult.get("result"); String hash = resultNode.get("BYTES_VALUE").getTextValue(); ASConnection connection = getASConnection(); @@ -202,6 +203,7 @@ public class ServerGroupComponent extends BaseComponent implements ContentFacet, return null; // TODO: Customise this generated block }
+ @SuppressWarnings("unused") private String serverGroupFromKey() { String key1 = context.getResourceKey(); return key1.substring(key1.lastIndexOf("/") + 1); diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 2509073..cf01d5f 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -1016,7 +1016,10 @@ <c:simple-property name="operationResult"/> </results> </operation> - <operation name="restart-servers" description="Restarts all servers belonging to the server group currently running in the domain."> + <operation name="restart-servers" description="Restarts all servers belonging to the server group currently running in the domain." timeout="180"> + <parameters> + <c:simple-property name="responseTimeout" default="120" type="long" description="Amount of time the agent will be waiting for domain host response. Defaults to 120 seconds." /> + </parameters> <results> <c:simple-property name="operationResult"/> </results>
commit 068f664483a2013fa84123cb6b6ba85b54ee7c5c Author: Jay Shaughnessy jshaughn@redhat.com Date: Mon Feb 25 16:36:41 2013 -0500
[Bug 881848 - Resource availability type remains in state unknown after application of workaround from bug 865166] Ensure after upgrade that all resources, including those in the ADQ, have at least an intial UNKNOWN Availability.
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index d4bc14c..109eb3a 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.128</db.schema.version> + <db.schema.version>2.129</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 19ac9dd..936c7bf 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -1944,6 +1944,7 @@ </schemaSpec>
<schemaSpec version="2.125"> + <!-- Note, JON 3.1.2 includes this already but it is safe to re-execute --> <!-- We were using a buggy version of password obfuscation from JBoss AS. This task sets the affected passwords to NULL. Fortunately, this currently affects only CSP content sources, so the damage is not huge from the user perspective. --> @@ -1952,6 +1953,7 @@
<!-- BZ 865167 --> <schemaSpec version="2.126"> + <!-- Note, JON 3.1.2 includes this already but it is safe to re-execute --> <schema-directSQL> <statement targetDBVendor="postgresql"> INSERT INTO RHQ_RESOURCE_AVAIL ( ID, RESOURCE_ID, AVAILABILITY_TYPE ) @@ -1988,6 +1990,27 @@ </schema-directSQL> </schemaSpec>
+<!-- RHQ 4.6.0 uses DB Schema 2.128 --> + + <!-- BZ 881848 --> + <schemaSpec version="2.129"> + <schema-directSQL> + <statement targetDBVendor="postgresql"> + INSERT INTO RHQ_AVAILABILITY ( ID, RESOURCE_ID, START_TIME, END_TIME, AVAILABILITY_TYPE ) + SELECT nextval('RHQ_AVAILABILITY_ID_SEQ'::text), res.ID, 0, NULL, 2 + FROM RHQ_RESOURCE res + WHERE NOT EXISTS ( SELECT * FROM RHQ_AVAILABILITY WHERE RESOURCE_ID = res.ID ) + </statement> + <statement targetDBVendor="oracle"> + INSERT INTO RHQ_AVAILABILITY ( ID, RESOURCE_ID, START_TIME, END_TIME, AVAILABILITY_TYPE ) + SELECT RHQ_AVAILABILITY_ID_SEQ.nextval, res.ID, 0, NULL, 2 + FROM RHQ_RESOURCE res + WHERE NOT EXISTS ( SELECT * FROM RHQ_AVAILABILITY WHERE RESOURCE_ID = res.ID ) + </statement> + </schema-directSQL> + </schemaSpec> + + </dbupgrade> </target> </project>
commit c6ddc8538eb130703a276752b05e85b9da5faabc Author: Stefan Negrea snegrea@redhat.com Date: Mon Feb 25 17:31:02 2013 -0600
Update development version to 4.7.0-SNAPSHOT.
diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml index 7bce055..cacf523 100644 --- a/code-coverage/pom.xml +++ b/code-coverage/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<artifactId>rhq-code-coverage</artifactId> diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index ecd5c00..394dc13 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index f69c49e..111b6f0 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index 2b0a46a..190bc89 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 7dc4571..32692b5 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as-dmr-client/pom.xml b/modules/common/jboss-as-dmr-client/pom.xml index 260bd92..4f43692 100644 --- a/modules/common/jboss-as-dmr-client/pom.xml +++ b/modules/common/jboss-as-dmr-client/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<artifactId>rhq-jboss-as-dmr-client</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index c8f844c..17e5433 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 960909d..4ed6d92 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</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 2e9dc48..7c7e949 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<!-- Model Version --> diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml index 65043aa..50e0fed 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<!-- Model Version --> diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml index cbdc2a9..fb6f3ee 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/arquillian-integration/suite-extension/pom.xml b/modules/core/arquillian-integration/suite-extension/pom.xml index 3ccb886..5d80c3f 100644 --- a/modules/core/arquillian-integration/suite-extension/pom.xml +++ b/modules/core/arquillian-integration/suite-extension/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<!-- Model Version --> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index ee8f1dc..a4f4b9e 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index bf4b745..9fd9f98 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index aa9a2ce..d4bc14c 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 21af6e4..9775aa6 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index d17353c..9f1b724 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 08e5675..21f1c48 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index fd717f7..4b828f7 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</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 f439dab..900eb72 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</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 f7451c5..8bff199 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</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 5d80afc..f7abec9 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</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 40d29ec..dbb97fe 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index aff829f..fc8ff80 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index e8a53b5..4528810 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index d0eff4c..c51fb51 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index ef4b285..ff2a247 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index f8c7720..99f9b40 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index b26d8e3..ba0d852 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 709a213..1ddf893 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <name>RHQ Script Bindings</name> <description>Abstraction of different facilities and default configurations for script bindings</description>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 48fad0c..cf5b95f 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 104b50d..61abd3a 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 0f58d9b..f60ae8b 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index f864813..b71b130 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index d032b6d..9795f49 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/gui/rest-examples-war/pom.xml b/modules/enterprise/gui/rest-examples-war/pom.xml index 1eb1ad2..87354d1 100644 --- a/modules/enterprise/gui/rest-examples-war/pom.xml +++ b/modules/enterprise/gui/rest-examples-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml index 9e1ac5a..1b5349c 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 7fe3331..489d603 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index e6daa0f..ee672e2 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index c2addd5..8f0978c 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml index 0c81641..006a9a6 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 3e76a1c..3ab9e66 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/scripting/api/pom.xml b/modules/enterprise/scripting/api/pom.xml index 2a705b3..5fdffe3 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent> <artifactId>rhq-scripting-api</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</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 c2363a5..208076a 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent> <artifactId>rhq-scripting-javascript</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</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 d6faff8..5c82958 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent> <artifactId>rhq-scripting-parent</artifactId> <packaging>pom</packaging>
- <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</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 34e5231..ab12edf 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent> <artifactId>rhq-scripting-python</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <name>RHQ Python support</name> <description>Provides RHQ scripting in Python using Jython</description>
diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml index d8c7d6f..2ffdc7c 100644 --- a/modules/enterprise/server/appserver/pom.xml +++ b/modules/enterprise/server/appserver/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index 87a99b7..ac92aec 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent>
<groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <name>RHQ Enterprise Server Client API</name> <description>The implementation of the client API when accessing the server locally</description>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 09b0def..d6a38d8 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml index a1b2dab..83b8977 100644 --- a/modules/enterprise/server/installer/pom.xml +++ b/modules/enterprise/server/installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml index 49d79f5..cf6aa8d 100644 --- a/modules/enterprise/server/itests-2/pom.xml +++ b/modules/enterprise/server/itests-2/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 2eb3668..d59460f 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index 6a9c1fd..68ea87a 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <name>RHQ Enterprise Server CLI Script Alert Plugin</name> <description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index cfd0d9b..ec91baf 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version>
<name>RHQ Enterprise Server Email Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 67fa7a2..ea7bd90 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version>
<name>RHQ Enterprise Server IRC Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml index 358861c..c50b5cb 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version>
<name>RHQ Enterprise Server Log4J Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index eecd72a..c576b41 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version>
<name>RHQ Enterprise Server Microblog Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 975858f..5d9fb43 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version>
<name>RHQ Enterprise Server Mobicents Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index 90df568..3b08f01 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version>
<name>RHQ Enterprise Server Opertions Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 7ba6e6f..4f8c6a5 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version>
<name>RHQ Enterprise Server Roles Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index dfb59aa..909053a 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version>
<name>RHQ Enterprise Server SNMP Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index de85cf5..cd0263b 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version>
<name>RHQ Enterprise Server Subject Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 6a1b367..6f636d5 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index 5b41896..2c81751 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version>
<name>RHQ Enterprise Server Cobbler Plugin</name>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 570caa3..5ecb7a9 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml index 0afed7e..52b3a7c 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index 7d0ba17..b43da47 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 55b2aea..3d31342 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml index 38bb3f4..80799ab 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version>
<name>RHQ Enterprise Server CLI Package Type Plugin</name>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 77f4d79..827bc41 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</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 e4f17ed..f677d6a 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index bd8c3b1..0d80df3 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index 75c478c..75b3cdc 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index d64e981..494e98e 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index d216e87..8c509f4 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 2fad1d7..2b00e67 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/server/sars/services-sar/pom.xml b/modules/enterprise/server/sars/services-sar/pom.xml index 40044b2..413c681 100644 --- a/modules/enterprise/server/sars/services-sar/pom.xml +++ b/modules/enterprise/server/sars/services-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/startup-subsystem/pom.xml b/modules/enterprise/server/startup-subsystem/pom.xml index a7ed12f..3359f33 100644 --- a/modules/enterprise/server/startup-subsystem/pom.xml +++ b/modules/enterprise/server/startup-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index a060587..9c1bfdd 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent>
diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index c83a433..1c570fc 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version>
<build> <plugins> diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml index 14530ff..348b780 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index 3350726..ceb5377 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <name>Performance Testing Support</name> <description>To support performance testing, this is a basic tool to support extracting and later reimporting of data from/to a database. diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 20f1f76..bd47d23 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</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 f97d2de..0996c3b 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml index d08c7c6..f3cbb2e 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index dcb0402..98b8667 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</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 e161160..ce66fd5 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</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 b20dfa0..e574631 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<artifactId>jndi-access-test</artifactId> diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml index 8dfe58e..caef075 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</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 2bc2fdd..fd7e312 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<artifactId>jndi-access-remote-server</artifactId> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index 4c31380..f110387 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/integration-tests/rest-api/pom.xml b/modules/integration-tests/rest-api/pom.xml index 3ba07c4..cea2a5c 100644 --- a/modules/integration-tests/rest-api/pom.xml +++ b/modules/integration-tests/rest-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-integration-tests</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 2244a12..a7a4469 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 172cce8..5390fcc 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index e887a4e..2ca9086 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 3617648..9a8acb4 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 8366602..6a85842 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml index d8cfd68..ac3d8ff 100644 --- a/modules/plugins/cassandra/pom.xml +++ b/modules/plugins/cassandra/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index b333ad2..8321f4e 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index b0e4004..6ed701b 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index eaf49b8..7959a32 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 70f6d22..c67fc10 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 0b00df8..d77acf5 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index 9d488f5..1a6c591 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index a0eac76..0303046 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 06315b2..467397e 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 9c7f6d2..1a8d193 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <packaging>jar</packaging>
<name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index b8f1f5a..69f1dbb 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index 9787a1d..fc69a41 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index 9c71f33..f2a81a1 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index 75d5b51..1f63c91 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 53e8149..d1f4c74 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index aa4f232..34bdffe 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 35d919b..421f24d 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 16d4245..48e3f93 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index 5d85bc4..9255d09 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index 64620e1..804b04a 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 9e5a24e..14e39a3 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 4afa8a5..184f1db 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/noop/pom.xml b/modules/plugins/noop/pom.xml index 1ab336f..1f43ea4 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 5ce8144..dc4f4aa 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index b8fdab2..7fe46e5 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index e8b68fe..7ccffa7 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 143872e..ef210b6 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 73947ae..9af3938 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 29ea010..69a3b7d 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index c565c89..1e323fb 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 1dcf822..e187c17 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 9d1557b..5327977 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index dd8150c..a392c58 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 77d117e..3772829 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 672ac51..3bec031 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 35121e0..4805c8f 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 6d880e3..92e76ef 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 91bfbee..053fac0 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 52c9b13..9ded2f5 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 6b0ad95..6f00f3f 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index fbc5f94..1e8c6fc 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index a2a48da..1c2bbca 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index d1745b2..82d911d 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index a04cf92..ee5bbfd 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.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> </parent>
<artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index 711cad0..afd1a61 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@
<groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.6.0-SNAPSHOT</version> + <version>4.7.0-SNAPSHOT</version> <packaging>pom</packaging>
<name>RHQ</name>
commit 503f985d13d376f388b3cf1842f3e2904f5ed549 Author: Jay Shaughnessy jshaughn@redhat.com Date: Fri Feb 22 15:28:28 2013 -0500
Don't access the resource to delete transactionally and hold it while trying to then uninventory it via slsb calls. This could cause a deadlock.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java index 1fcda30..213d75d 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java @@ -105,26 +105,21 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { @Override protected void afterMethod() throws Exception { try { + prepareForTestAgents(); + if (theResource != null) { // perform in-band and out-of-band work in quick succession // this also deletes our attached agent - prepareForTestAgents(); resourceManager.uninventoryResource(overlord, theResource.getId()); resourceManager.uninventoryResourceAsyncWork(overlord, theResource.getId()); - unprepareForTestAgents(); theResource = null; }
if (additionalResources != null) { - getTransactionManager().begin(); - for (Resource res : additionalResources) { - Resource res2 = em.find(Resource.class, res.getId()); - resourceManager.uninventoryResource(overlord, res2.getId()); - resourceManager.uninventoryResourceAsyncWork(overlord, res2.getId()); - + resourceManager.uninventoryResource(overlord, res.getId()); + resourceManager.uninventoryResourceAsyncWork(overlord, res.getId()); } - getTransactionManager().commit(); }
if (theResourceType != null) { @@ -141,6 +136,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { }
finally { + unprepareForTestAgents(); unprepareScheduler(); unprepareServerPluginService(); testServerPluginService.stopMasterPluginContainer(); @@ -280,7 +276,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { // platform: UNKNOWN(0) --> commitAndClose();
- AvailabilityReport report = new AvailabilityReport(false, theAgent.getName());
availPoints = availabilityManager.findAvailabilitiesForResource(overlord, theResource.getId(), 1, @@ -431,7 +426,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { setupResource(); commitAndClose();
- // setAllAgentResourceAvails will only operate on those that have at least 1 avail row Availability avail = new Availability(theResource, UNKNOWN); persistAvailability(avail); @@ -461,7 +455,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { setupResource(); commitAndClose();
- // have never heard from the new agent yet - we do not backfill anything in this case LookupUtil.getAgentManager().checkForSuspectAgents(); assert availabilityManager.getCurrentAvailabilityTypeForResource(overlord, theResource.getId()) == UNKNOWN; @@ -491,7 +484,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { setupResource(); commitAndClose();
- // add a report that says the resource was up 20 minutes ago Availability avail = new Availability(theResource, (System.currentTimeMillis() - 12000000), UP); AvailabilityReport report = new AvailabilityReport(false, theAgent.getName()); @@ -507,7 +499,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { agent.setLastAvailabilityPing(System.currentTimeMillis() - (1000 * 60 * 18)); // 18 mins commitAndClose();
- // the agent should be suspect and will be considered down, the platform resource should be down // (although children should be UNKNOWN) LookupUtil.getAgentManager().checkForSuspectAgents(); // checks for 5 mins !! @@ -523,7 +514,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { assert allAvails.size() == 3; commitAndClose();
- Availability a1 = allAvails.get(0); Availability a2 = allAvails.get(1); Availability a3 = allAvails.get(2); @@ -571,7 +561,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
commitAndClose();
- for (Resource res : allResources) { int resId = res.getId(); Availability currentAvailability = availabilityManager.getCurrentAvailabilityForResource(overlord, @@ -600,7 +589,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { agent.setLastAvailabilityPing(System.currentTimeMillis() - (1000 * 60 * 18)); // 18 mins commitAndClose();
- // the agent should be suspect and will be considered down. the resources have their initial // UNKNOWN avails. The platform should get a new DOWN Availability row. The rest should remain // as is since they are already UNKNOWN. @@ -641,7 +629,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { agent.setLastAvailabilityPing(System.currentTimeMillis() - (1000 * 60 * 18)); commitAndClose();
- // the agent should be suspect and will be considered down // all of the resources have availabilities now, so another row will be added to them if they are not disabled start = System.currentTimeMillis(); @@ -670,7 +657,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { assert allAvails.size() == ((expected == DOWN) ? 4 : ((expected == DISABLED) ? 2 : 3)) : allAvails; commitAndClose();
- Availability a0 = allAvails.get(0); Availability a1 = allAvails.get(1); Availability a2 = null; @@ -716,7 +702,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { System.out.println("testAgentBackfillPerformance: checking validity of data took " + (System.currentTimeMillis() - start) + "ms");
- } catch (Exception e) { e.printStackTrace(); throw e; @@ -737,7 +722,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { setupResource(); // inserts initial UNKNOWN Availability at epoch commitAndClose();
- Availability avail; long now = System.currentTimeMillis();
@@ -824,7 +808,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { setupResource(); commitAndClose();
- long now = System.currentTimeMillis();
// add a report that says the resource is down - reports can't have the same resource in it twice, @@ -885,7 +868,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { setupResource(); commitAndClose();
- Calendar cal = Calendar.getInstance(); cal.set(Calendar.YEAR, 2000); cal.set(Calendar.MONTH, 0); @@ -973,7 +955,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { setupResource(); commitAndClose();
- long allAvailCount = setUpAvailabilities();
// we now have 1:00 UP, 1:20 DOWN, 1:40 UP @@ -1170,7 +1151,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { avail = avails.get(0); // 0..1:00 assertTrue(avail.toString(), Math.abs(avail.getStartTime() - 0L) < 1000L); assertEquals(avail.toString(), AvailabilityType.UNKNOWN, avail.getAvailabilityType()); - assertTrue(avail.toString(), Math.abs(avail.getEndTime() - avails.get(1).getStartTime()) < 1000L); + assertTrue(avail.toString(), Math.abs(avail.getEndTime() - avails.get(1).getStartTime()) < 1000L); avail = avails.get(1); // 1:00..1:20 assertTrue(avail.toString(), Math.abs(currentStartTime - (avail.getStartTime() + (40 * 60 * 1000))) < 1000L); assertEquals(avail.toString(), AvailabilityType.UP, avail.getAvailabilityType()); @@ -1297,7 +1278,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
commitAndClose();
- // add a report that says the resources are now up - the report will add one avail for each resource // at this point, the resources do not yet have a row in availability - after the merge they will have 1 AvailabilityReport report = new AvailabilityReport(false, theAgent.getName()); @@ -1371,7 +1351,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test { System.out.println("testMergeReportPerformance: checking validity of data 3 took " + (System.currentTimeMillis() - start) + "ms");
- } catch (Exception e) { e.printStackTrace(); throw e;
commit 17aa29bfb17f8e4ab25f7f26c852a386985c6781 Author: Jay Shaughnessy jshaughn@redhat.com Date: Fri Feb 22 10:42:48 2013 -0500
Fix tests so they run on windows as well.
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AS7CommandLineTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AS7CommandLineTest.java index bb8adcd..534e9f4 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AS7CommandLineTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AS7CommandLineTest.java @@ -48,6 +48,8 @@ import org.rhq.core.util.stream.StreamUtil; public class AS7CommandLineTest { private static final File FAKE_JBOSS_HOME = new File(".");
+ private static final String FILE_URL_PREFIX = (File.separatorChar == '/') ? "file://" : "file:///"; + private interface CommandLineProducer { AS7CommandLine get(); } @@ -73,8 +75,8 @@ public class AS7CommandLineTest { File propsFile1 = File.createTempFile("jboss1-", ".properties"); File propsFile2 = File.createTempFile("jboss2-", ".properties");
- String propsFile1Path = "file://" + propsFile1; - String propsFile2Path = "file://" + propsFile2; + String propsFile1Path = FILE_URL_PREFIX + propsFile1; + String propsFile2Path = FILE_URL_PREFIX + propsFile2;
try { testSysProps(propsFile1, propsFile2, FAKE_JBOSS_HOME, @@ -197,8 +199,8 @@ public class AS7CommandLineTest { File propsFile1 = File.createTempFile("jboss1-", ".properties"); File propsFile2 = File.createTempFile("jboss2-", ".properties");
- String propsFile1Path = "file://" + propsFile1; - String propsFile2Path = "file://" + propsFile2; + String propsFile1Path = FILE_URL_PREFIX + propsFile1; + String propsFile2Path = FILE_URL_PREFIX + propsFile2;
FakeServerProcess fakeServer = startFakeServer(FAKE_JBOSS_HOME, FAKE_JBOSS_HOME, propsFile1Path, propsFile2Path);
@@ -218,8 +220,8 @@ public class AS7CommandLineTest { File propsFile1 = File.createTempFile("jboss1-", ".properties"); File propsFile2 = File.createTempFile("jboss2-", ".properties");
- String propsFile1Path = "file://" + propsFile1; - String propsFile2Path = "file://" + propsFile2; + String propsFile1Path = FILE_URL_PREFIX + propsFile1; + String propsFile2Path = FILE_URL_PREFIX + propsFile2;
FakeServerProcess fakeServer = startFakeServer(new File(".."), FAKE_JBOSS_HOME, propsFile1Path, propsFile2Path);
@@ -385,11 +387,7 @@ public class AS7CommandLineTest {
Assert .fail("The fake jboss as server process has finished even though it should keep running. The exit value was " - + exitValue - + ". Stdout was:\n" - + stdout - + "\n\nStderr was:\n" - + stderr); + + exitValue + ". Stdout was:\n" + stdout + "\n\nStderr was:\n" + stderr); } catch (IllegalThreadStateException e) { //expected }
commit ad131fe3d7a38287857fcf5d34e6b3d3983acc96 Author: Jirka Kremser jkremser@redhat.com Date: Fri Feb 22 11:40:25 2013 +0100
Unifying the width of buttons in the toolstrip (removing autoFit by default, autoFit property is set if the title length is greater than 15 characters) and removing unused class SimpleCollapsiblePanel.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginTableView.java index b9b16ed..d7b8c81 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginTableView.java @@ -223,7 +223,6 @@ public class AgentPluginTableView extends TableSection<AgentPluginDataSource> {
IButton scanForUpdatesButton = new LocatableIButton(extendLocatorId("scanButton"), MSG.view_admin_plugins_scan()); - scanForUpdatesButton.setAutoFit(true); scanForUpdatesButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent event) { GWTServiceLookup.getPluginService().scanAndRegister(new AsyncCallback<Void>() { @@ -246,7 +245,6 @@ public class AgentPluginTableView extends TableSection<AgentPluginDataSource> {
final IButton showDeletedButton = new LocatableIButton(extendLocatorId("showDeletedButton"), MSG.view_admin_plugins_showDeleted()); - showDeletedButton.setAutoFit(true); showDeletedButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent event) { showDeleted = !showDeleted; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginTableView.java index c83d93f..f3f72f4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginTableView.java @@ -223,7 +223,6 @@ public class ServerPluginTableView extends TableSection<ServerPluginDataSource>
IButton scanForUpdatesButton = new LocatableIButton(extendLocatorId("scanButton"), MSG.view_admin_plugins_scan()); - scanForUpdatesButton.setAutoFit(true); scanForUpdatesButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent event) { GWTServiceLookup.getPluginService().scanAndRegister(new AsyncCallback<Void>() { @@ -246,7 +245,6 @@ public class ServerPluginTableView extends TableSection<ServerPluginDataSource>
IButton restartMasterPCButton = new LocatableIButton(extendLocatorId("restartMasterPCButton"), MSG.view_admin_plugins_restartMasterPC()); - restartMasterPCButton.setAutoFit(true); restartMasterPCButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent event) { Message msg = new Message(MSG.view_admin_plugins_restartMasterPCStarted(), Severity.Info); @@ -272,7 +270,6 @@ public class ServerPluginTableView extends TableSection<ServerPluginDataSource>
final IButton showUndeployedButton = new LocatableIButton(extendLocatorId("showUndeployedButton"), MSG.view_admin_plugins_showUndeployed()); - showUndeployedButton.setAutoFit(true); showUndeployedButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent event) { showUndeployed = !showUndeployed; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/SimpleCollapsiblePanel.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/SimpleCollapsiblePanel.java deleted file mode 100644 index ed9163d..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/SimpleCollapsiblePanel.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.components; - -import com.smartgwt.client.types.SelectionType; -import com.smartgwt.client.widgets.Button; -import com.smartgwt.client.widgets.Canvas; -import com.smartgwt.client.widgets.events.ClickEvent; -import com.smartgwt.client.widgets.events.ClickHandler; -import com.smartgwt.client.widgets.layout.VLayout; - -/** - * TODO: Not Quite Working. For some reason the icon is not clickable. - * - * @author Greg Hinkle - */ -public class SimpleCollapsiblePanel extends VLayout { - - private Canvas content; - private String title; - - private boolean expanded = true; - - public SimpleCollapsiblePanel(String title, Canvas content) { - this.content = content; - this.title = title; - setWidth100(); - } - - @Override - protected void onInit() { - super.onInit(); - - final Button button = new Button(title); - button.setShowRollOver(false); - button.setActionType(SelectionType.RADIO); - //button.setBorder(null); - button.setAutoFit(true); - - button.setIcon("[skin]/images/SectionHeader/opener_opened.png"); - //button.setBaseStyle("SimpleButton"); - - button.addClickHandler(new ClickHandler() { - public void onClick(ClickEvent clickEvent) { - expanded = !expanded; - if (expanded) { - button.setIcon("[skin]/images/SectionHeader/opener_opened.png"); - content.show(); - } else { - button.setIcon("[skin]/images/SectionHeader/opener_closed.png"); - content.hide(); - setHeight(30); - } - getParentElement().markForRedraw(); - markForRedraw(); - } - }); - - addMember(button); - addMember(content); - } -} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/Carousel.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/Carousel.java index d82d2ee..cd1a396 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/Carousel.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/Carousel.java @@ -362,7 +362,6 @@ public abstract class Carousel extends LocatableHLayout implements RefreshableVi .getTitle()); menuButton.setMenu(menu); menuButton.setDisabled(true); - menuButton.setAutoFit(true); // this makes it pretty tight, but maybe better than the default, which is pretty wide menuButton.setOverflow(Overflow.VISIBLE); menuButton.setShowMenuBelow(false);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java index 991098e..8cdb741 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java @@ -153,7 +153,6 @@ public class ActivityView extends LocatableVLayout implements DashboardContainer
editButton = new LocatableIButton(footer.extendLocatorId("Mode"), editMode ? MSG.common_title_view_mode() : MSG .common_title_edit_mode()); - editButton.setAutoFit(true); editButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { editMode = !editMode; @@ -163,7 +162,6 @@ public class ActivityView extends LocatableVLayout implements DashboardContainer });
resetButton = new LocatableIButton(footer.extendLocatorId("Reset"), MSG.common_button_reset()); - resetButton.setAutoFit(true); resetButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { String message = MSG.view_summaryDashboard_resetConfirm(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java index 77a729d..ceca886 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java @@ -122,7 +122,6 @@ public class ActivityView extends LocatableVLayout implements DashboardContainer
editButton = new LocatableIButton(footer.extendLocatorId("Mode"), editMode ? MSG.common_title_view_mode() : MSG .common_title_edit_mode()); - editButton.setAutoFit(true); editButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { editMode = !editMode; @@ -132,7 +131,6 @@ public class ActivityView extends LocatableVLayout implements DashboardContainer });
resetButton = new LocatableIButton(footer.extendLocatorId("Reset"), MSG.common_button_reset()); - resetButton.setAutoFit(true); resetButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { String message = MSG.view_summaryDashboard_resetConfirm();
commit 29b87752782a07869894b5c3eccb8d47dd11f46a Author: Lukas Krejci lkrejci@redhat.com Date: Thu Feb 21 23:56:16 2013 +0100
Adding the API checks to the script bindings.
Also corrected a minor incompatible change that was introduced since 4.5.1.
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 08cfdd4..709a213 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -12,6 +12,7 @@
<properties> <filtered.location>src/main/java</filtered.location> + <rhq.internal>false</rhq.internal> </properties>
<dependencies> @@ -240,6 +241,23 @@ </configuration> </plugin>
+ <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>clirr-maven-plugin</artifactId> + <configuration> + <includes> + <!-- Hand picked stuff that corresponds to what is the script context initialized to + in the org/rhq/bindings/StandardBindings. --> + <include>org/rhq/bindings/client/*</include> + <include>org/rhq/bindings/export/*</include> + <include>org/rhq/bindings/output/*</include> + <include>org/rhq/bindings/util/ScriptAssert</include> + <include>org/rhq/bindings/util/ScriptAssertException</include> + <include>org/rhq/bindings/util/ScriptUtil</include> + </includes> + </configuration> + </plugin> + </plugins> </build>
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardBindings.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardBindings.java index 3e1e137..e0e794c 100644 --- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardBindings.java +++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardBindings.java @@ -46,6 +46,10 @@ import org.rhq.core.domain.util.PageControl; * is available for all the users of this class. The user is however able to later modify these defaults to provide * use-case specific overrides (for example the CLI might want to supply impls that hook into the console to provide * interactivity with user in some workflows, which, generically, is not possible in a common case). + * <p> + * *NOTE*: any change in what is exposed to the scripting clients needs to be reflected in the API check configuration + * in the pom.xml of the corresponding modules, because any class that gets exposed in the script context essentially + * becomes a public API. * * @author Lukas Krejci */ @@ -118,10 +122,10 @@ public class StandardBindings extends HashMap<String, Object> {
/** * If you want to preserve non-client-dependent bindings when the facade changes, call this as opposed to - * constructing new StandardBindings. + * constructing new StandardBindings. */ public void setFacade(PrintWriter output, RhqFacade rhqFacade) { - // remove any existing managers + // remove any existing managers if (null != managers) { for (RhqManager manager : managers.keySet()) { remove(manager.name()); @@ -204,7 +208,7 @@ public class StandardBindings extends HashMap<String, Object> { }
public Map<RhqManager, Object> getManagers() { - //XXX ideally this should be a projection into our map + //XXX ideally this should be a projection into our map return (null == managers) ? managers = Collections.emptyMap() : managers; }
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 32832b2..2c781a1 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 @@ -101,7 +101,7 @@ public enum RhqManager { this.beanName = this.name() + "Bean"; localInterfaceClassName = getLocalInterfaceClassName(remote);
- //defaults and evaluates to TRUE unless the string contains "false". Done to defend against + //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; if ((enable != null) && (enable.trim().length() > 0)) { @@ -123,6 +123,15 @@ public enum RhqManager { return this.remote; }
+ /** + * @deprecated since 4.6.0, use the {@link #remote()} method instead + * @return the class name of the remote interface + */ + @Deprecated + public String remoteName() { + return this.remote.getName(); + } + public String localInterfaceClassName() { return localInterfaceClassName; }
commit 6f71c2d100c564e2f52894eca3238a6f5c7b73d7 Author: John Mazzitelli mazz@redhat.com Date: Thu Feb 21 21:22:24 2013 -0500
[BZ 913778] fix NPE
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableIButton.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableIButton.java index 6fdaf95..0aecd4d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableIButton.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableIButton.java @@ -37,7 +37,8 @@ public class LocatableIButton extends IButton implements Locatable { private void init(String locatorId) { this.locatorId = locatorId; SeleniumUtility.setID(this, locatorId); - if (getTitle().length() > 15) { + String title = getTitle(); + if (title != null && title.length() > 15) { setAutoFit(true); } }
commit 277c8b1fc4379e6a652931b7db1bbdd4ce3ce5ac Author: John Mazzitelli mazz@redhat.com Date: Thu Feb 21 16:25:40 2013 -0500
[BZ 913606] agent will send a full avail report if the server tells it at connect time that it has been backfilled. the server will also update the last ping time of the agent when the connect comes in.
diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/ConnectAgentResults.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/ConnectAgentResults.java index 47be78b..3bcf47b 100644 --- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/ConnectAgentResults.java +++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/ConnectAgentResults.java @@ -32,10 +32,12 @@ import java.io.Serializable; public class ConnectAgentResults implements Serializable { private static final long serialVersionUID = 1L;
- private long serverTime; + private final long serverTime; + private final boolean isDown;
- public ConnectAgentResults(long serverTime) { + public ConnectAgentResults(long serverTime, boolean isDown) { this.serverTime = serverTime; + this.isDown = isDown; }
/** @@ -49,10 +51,23 @@ public class ConnectAgentResults implements Serializable { }
/** - * @see java.lang.Object#toString() + * If true, this indicates if the server thinks the agent is down. This happens if the agent + * hasn't connected in a long time and the server had "backfilled" the agent's resources + * as DOWN/UNKNOWN. + * + * When an agent connects to a server, and the server thinks that agent was down, the agent needs + * to prepare to notify the server of its state - for example, the agent should soon send up + * a full availability report so the server can get the up-to-date availability statuses of all + * resources. + * + * @return true if the server had this agent's resources marked as DOWN/UNKNOWN. */ + public boolean isDown() { + return isDown; + } + @Override public String toString() { - return "ConnectAgentResults: [server-time=" + this.serverTime + "]"; + return "ConnectAgentResults: [server-time=" + this.serverTime + ", is-down=" + this.isDown + "]"; } } \ No newline at end of file diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index 6c01d67..0c95199 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -2146,6 +2146,18 @@ public class AgentMain { ConnectAgentResults results = (ConnectAgentResults) connectResponse.getResults(); long serverTime = results.getServerTime(); serverClockNotification(serverTime); + + // If the server thinks we are down, we need to do some things to get this agent in sync with the server. + // Anything we do in here should be very fast. + boolean serverThinksWeAreDown = results.isDown(); + if (serverThinksWeAreDown) { + LOG.warn(AgentI18NResourceKeys.SERVER_THINKS_AGENT_IS_DOWN); + PluginContainer plugin_container = PluginContainer.getInstance(); + if (plugin_container.isStarted()) { + // tell the plugin container to send a full avail report up so the server knows we are UP + plugin_container.getInventoryManager().requestFullAvailabilityReport(); + } + } } catch (Throwable t) { // should never happen, should always cast to non-null ConnectAgentResults LOG.error(AgentI18NResourceKeys.TIME_UNKNOWN, ThrowableUtil.getAllMessages(t)); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java index 57f427c..10761ff 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java @@ -170,6 +170,9 @@ public interface AgentI18NResourceKeys { @I18NMessage("Failed to determine the server time. Cause: {0}") String TIME_UNKNOWN = "AgentMain.time-unknown";
+ @I18NMessage("The server thinks this agent is down. Will notify the server of up-to-date information when possible.") + String SERVER_THINKS_AGENT_IS_DOWN = "AgentMain.server-thinks-agent-is-down"; + @I18NMessage("Timed out waiting for the connectAgent R/W lock to avoid a possible deadlock") String TIMEOUT_WAITING_FOR_CONNECT_LOCK = "AgentMain.connect-lock-timeout";
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java index 23bcbcf..9818ac3 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java @@ -320,6 +320,7 @@ public class CoreServerServiceImpl implements CoreServerService {
Server server = getServerManager().getServer(); agent.setServer(server); + agent.setLastAvailabilityPing(Long.valueOf(System.currentTimeMillis())); getAgentManager().updateAgent(agent);
getAlertConditionCacheManager().reloadCachesForAgent(agent.getId()); @@ -328,7 +329,7 @@ public class CoreServerServiceImpl implements CoreServerService { PartitionEventType.AGENT_CONNECT, agentName + " - " + server.getName());
log.info("Agent [" + agentName + "] has connected to this server at " + new Date()); - return new ConnectAgentResults(System.currentTimeMillis()); + return new ConnectAgentResults(System.currentTimeMillis(), agent.isBackFilled()); }
/**
commit 369633cd9ab6a42d24c98a8c599f8a134fb5cc95 Author: John Mazzitelli mazz@redhat.com Date: Thu Feb 21 15:12:05 2013 -0500
this should not be here
diff --git a/modules/enterprise/server/jar/lib/log4jdbc4-1.2beta2.jar b/modules/enterprise/server/jar/lib/log4jdbc4-1.2beta2.jar deleted file mode 100644 index 3d6f466..0000000 Binary files a/modules/enterprise/server/jar/lib/log4jdbc4-1.2beta2.jar and /dev/null differ
rhq-commits@lists.fedorahosted.org