Branch: refs/heads/release/jon3.3.x Home: https://github.com/rhq-project/rhq Commit: d88b854bc2e0746c7befe4be4792a7afbbeeadf2 https://github.com/rhq-project/rhq/commit/d88b854bc2e0746c7befe4be4792a7afbb... Author: Michael Burman miburman@redhat.com Date: 2014-08-11 (Mon, 11 Aug 2014)

Changed paths: M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml

Log Message: ----------- [BZ 1120411] Only allow selecting a proper jdbc driver in the datasource configuration

(cherry picked from commit 28df962ff235511387aff36d79133ed503dc7769)

Commit: 4c237989185b81d7ffe46110a54cba4a4fa2a0f1 https://github.com/rhq-project/rhq/commit/4c237989185b81d7ffe46110a54cba4a4f... Author: burmanm miburman@redhat.com Date: 2014-08-11 (Mon, 11 Aug 2014)

Changed paths: M modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/ResourcesStandaloneServerTest.java

Log Message: ----------- [BZ 1120411] Datasources (*) should not be tested like a datasource

(cherry picked from commit a106392596b6f8e717ee57c7a7b33d8ea891b9e4)

Commit: 218c6bebde400f5d16eca0adf70599c97185bfd2 https://github.com/rhq-project/rhq/commit/218c6bebde400f5d16eca0adf70599c971... Author: burmanm miburman@redhat.com Date: 2014-08-11 (Mon, 11 Aug 2014)

Changed paths: M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/ResourcesDomainServerTest.java M modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/ResourcesStandaloneServerTest.java

Log Message: ----------- [BZ 1120411] Fix the integration tests and move selection from profile to managed

(cherry picked from commit c83e8c4536b07b7ea9b6571ef68af11c41018234)

Compare: https://github.com/rhq-project/rhq/compare/970b3a479db0...218c6bebde40