Branch: refs/heads/release/jon3.3.x Home: https://github.com/rhq-project/rhq Commit: 708737e525c67b58774a6a1bf79556b6f3133ffc https://github.com/rhq-project/rhq/commit/708737e525c67b58774a6a1bf79556b6f3... Author: Thomas Segismont tsegismo@redhat.com Date: 2014-10-14 (Tue, 14 Oct 2014)

Changed paths: M modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java A modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/ServerVersionColumnUpgrader.java A modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/StorageNodeVersionColumnUpgrader.java M modules/core/domain/pom.xml M modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java A modules/core/domain/src/test/java/org/rhq/core/domain/test/SetupBean.java M modules/core/domain/src/test/resources/arquillian.xml M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBeanPreparation.java

Log Message: ----------- Fix core domain tests and server itests when database does not have Server and StorageNode version columns Version columns are not created as part of the db-upgrade process, but only when running the installer. So we need something when running itests or core domain tests against an upgraded database.

(cherry picked from commit 5054f8fe4e1e81b6167f2538f8f0ad74b3ddf56f) Signed-off-by: Jay Shaughnessy jshaughn@redhat.com