From ee7de9c80e10edd9a28c9f4ed0d0c41fe12e3b4a Mon Sep 17 00:00:00 2001
From: Michael Hashimoto <michael.hashimoto@liferay.com>
Date: Thu, 2 Feb 2012 18:51:40 -0800
Subject: [PATCH] Test Fixes

---
 build-test-db-upgrade.xml                     | 160 ++++-----
 build-test-tomcat.xml                         |  10 -
 build-test.xml                                | 162 ++++++---
 .../ant-script-db-upgrade-5.2.3.xml           | 189 +++++++++-
 .../ant-script-db-upgrade-5.2.5.xml           | 324 ------------------
 .../ant-script-db-upgrade-5.2.7.xml           | 324 ------------------
 .../ant-script-db-upgrade-5.2.8.xml           | 324 ------------------
 .../ant-script-db-upgrade-5.2.9.xml           | 127 ++++++-
 .../ant-script-db-upgrade-6.0.12.xml          | 144 +++++++-
 .../ant-script-db-upgrade-6.0.6.xml           | 144 +++++++-
 .../ant-script-db-upgrade-smoke-5.2.7.xml     | 119 -------
 .../ant-script-db-upgrade-smoke-5.2.8.xml     | 119 -------
 .../ant-script-db-upgrade-smoke.xml           |  78 ++++-
 portal-web/test-ant-templates/ant-script.xml  | 195 ++++++++++-
 test.properties                               |  66 ++--
 15 files changed, 1054 insertions(+), 1431 deletions(-)
 delete mode 100644 portal-web/test-ant-templates/ant-script-db-upgrade-5.2.5.xml
 delete mode 100644 portal-web/test-ant-templates/ant-script-db-upgrade-5.2.7.xml
 delete mode 100644 portal-web/test-ant-templates/ant-script-db-upgrade-5.2.8.xml
 delete mode 100644 portal-web/test-ant-templates/ant-script-db-upgrade-smoke-5.2.7.xml
 delete mode 100644 portal-web/test-ant-templates/ant-script-db-upgrade-smoke-5.2.8.xml

diff --git a/build-test-db-upgrade.xml b/build-test-db-upgrade.xml
index 5758199e147948..5e45194ae321f3 100644
--- a/build-test-db-upgrade.xml
+++ b/build-test-db-upgrade.xml
@@ -3,9 +3,7 @@
 <project name="portal-test-db-upgrade" basedir="." default="test" xmlns:antelope="antlib:ise.antelope.tasks">
 	<import file="build-test.xml" />
 
-	<target name="prepare-db-db2-common">
-		<echo file="test.${user.name}.properties">db.type=db2</echo>
-
+	<target name="prepare-db-common">
 		<antcall target="prepare-portal-ext-properties" inheritAll="false" />
 
 		<ant dir="portal-impl" target="deploy-properties" inheritAll="false" />
@@ -14,7 +12,52 @@
 			<isset property="sql.version" />
 			<then>
 				<property name="sql.dir" value="sql\legacy\${sql.version}\create\" />
-				<property name="sql.file" value="create-db2.sql" />
+
+				<if>
+					<equals arg1="${db.type}" arg2="db2" />
+					<then>
+						<property name="sql.file" value="create-db2.sql" />
+					</then>
+					<elseif>
+						<equals arg1="${db.type}" arg2="mysql" />
+						<then>
+							<property name="sql.file" value="create-mysql.sql" />
+						</then>
+					</elseif>
+					<elseif>
+						<or>
+							<equals arg1="${db.type}" arg2="oracle-10" />
+							<equals arg1="${db.type}" arg2="oracle-11" />
+						</or>
+						<then>
+							<property name="sql.file" value="create-oracle.sql" />
+						</then>
+					</elseif>
+					<elseif>
+						<or>
+							<equals arg1="${db.type}" arg2="postgresql-8.4" />
+							<equals arg1="${db.type}" arg2="postgresql-9.0" />
+						</or>
+						<then>
+							<property name="sql.file" value="create-postgresql.sql" />
+						</then>
+					</elseif>
+					<elseif>
+						<or>
+							<equals arg1="${db.type}" arg2="sql-server-2005" />
+							<equals arg1="${db.type}" arg2="sql-server-2008" />
+						</or>
+						<then>
+							<property name="sql.file" value="create-sql-server.sql" />
+						</then>
+					</elseif>
+					<elseif>
+						<equals arg1="${db.type}" arg2="sybase" />
+						<then>
+							<property name="sql.file" value="create-sybase.sql" />
+						</then>
+					</elseif>
+				</if>
 			</then>
 		</if>
 
@@ -24,109 +67,58 @@
 		</antcall>
 	</target>
 
-	<target name="prepare-db-mysql-common">
-		<echo file="test.${user.name}.properties">db.type=mysql</echo>
-
-		<antcall target="prepare-portal-ext-properties" inheritAll="false" />
+	<target name="prepare-db-db2-common">
+		<echo file="test.${user.name}.properties">db.type=db2</echo>
 
-		<ant dir="portal-impl" target="deploy-properties" inheritAll="false" />
+		<antcall target="prepare-db-common" />
+	</target>
 
-		<if>
-			<isset property="sql.version" />
-			<then>
-				<property name="sql.dir" value="sql\legacy\${sql.version}\create\" />
-				<property name="sql.file" value="create-mysql.sql" />
-			</then>
-		</if>
+	<target name="prepare-db-mysql-common">
+		<echo file="test.${user.name}.properties">db.type=mysql</echo>
 
-		<antcall target="rebuild-database" inheritAll="false">
-			<param name="sql.dir" value="${sql.dir}" />
-			<param name="sql.file" value="${sql.file}" />
-		</antcall>
+		<antcall target="prepare-db-common" />
 	</target>
 
-	<target name="prepare-db-oracle-common">
-		<echo file="test.${user.name}.properties">db.type=oracle</echo>
-
-		<antcall target="prepare-portal-ext-properties" inheritAll="false" />
+	<target name="prepare-db-oracle-10-common">
+		<echo file="test.${user.name}.properties">db.type=oracle-10</echo>
 
-		<ant dir="portal-impl" target="deploy-properties" inheritAll="false" />
+		<antcall target="prepare-db-common" />
+	</target>
 
-		<if>
-			<isset property="sql.version" />
-			<then>
-				<property name="sql.dir" value="sql\legacy\${sql.version}\create\" />
-				<property name="sql.file" value="create-oracle.sql" />
-			</then>
-		</if>
+	<target name="prepare-db-oracle-11-common">
+		<echo file="test.${user.name}.properties">db.type=oracle-11</echo>
 
-		<antcall target="rebuild-database" inheritAll="false">
-			<param name="sql.dir" value="${sql.dir}" />
-			<param name="sql.file" value="${sql.file}" />
-		</antcall>
+		<antcall target="prepare-db-common" />
 	</target>
 
-	<target name="prepare-db-postgresql-common">
-		<echo file="test.${user.name}.properties">db.type=postgresql</echo>
+	<target name="prepare-db-postgresql-8.4-common">
+		<echo file="test.${user.name}.properties">db.type=postgresql-8.4</echo>
 
-		<antcall target="prepare-portal-ext-properties" inheritAll="false" />
-
-		<ant dir="portal-impl" target="deploy-properties" inheritAll="false" />
+		<antcall target="prepare-db-common" />
+	</target>
 
-		<if>
-			<isset property="sql.version" />
-			<then>
-				<property name="sql.dir" value="sql\legacy\${sql.version}\create\" />
-				<property name="sql.file" value="create-postgresql.sql" />
-			</then>
-		</if>
+	<target name="prepare-db-postgresql-9.0-common">
+		<echo file="test.${user.name}.properties">db.type=postgresql-9.0</echo>
 
-		<antcall target="rebuild-database" inheritAll="false">
-			<param name="sql.dir" value="${sql.dir}" />
-			<param name="sql.file" value="${sql.file}" />
-		</antcall>
+		<antcall target="prepare-db-common" />
 	</target>
 
-	<target name="prepare-db-sql-server-common">
-		<echo file="test.${user.name}.properties">db.type=sql-server</echo>
-
-		<antcall target="prepare-portal-ext-properties" inheritAll="false" />
+	<target name="prepare-db-sql-server-2005-common">
+		<echo file="test.${user.name}.properties">db.type=sql-server-2005</echo>
 
-		<ant dir="portal-impl" target="deploy-properties" inheritAll="false" />
+		<antcall target="prepare-db-common" />
+	</target>
 
-		<if>
-			<isset property="sql.version" />
-			<then>
-				<property name="sql.dir" value="sql\legacy\${sql.version}\create\" />
-				<property name="sql.file" value="create-sql-server.sql" />
-			</then>
-		</if>
+	<target name="prepare-db-sql-server-2008-common">
+		<echo file="test.${user.name}.properties">db.type=sql-server-2008</echo>
 
-		<antcall target="rebuild-database" inheritAll="false">
-			<param name="sql.dir" value="${sql.dir}" />
-			<param name="sql.file" value="${sql.file}" />
-		</antcall>
+		<antcall target="prepare-db-common" />
 	</target>
 
 	<target name="prepare-db-sybase-common">
 		<echo file="test.${user.name}.properties">db.type=sybase</echo>
 
-		<antcall target="prepare-portal-ext-properties" inheritAll="false" />
-
-		<ant dir="portal-impl" target="deploy-properties" inheritAll="false" />
-
-		<if>
-			<isset property="sql.version" />
-			<then>
-				<property name="sql.dir" value="sql\legacy\${sql.version}\create\" />
-				<property name="sql.file" value="create-sybase.sql" />
-			</then>
-		</if>
-
-		<antcall target="rebuild-database" inheritAll="false">
-			<param name="sql.dir" value="${sql.dir}" />
-			<param name="sql.file" value="${sql.file}" />
-		</antcall>
+		<antcall target="prepare-db-common" />
 	</target>
 
 	<target name="run-latest-upgrade-test">
diff --git a/build-test-tomcat.xml b/build-test-tomcat.xml
index 1fb6554c18bc82..9a43ccb3f3536c 100644
--- a/build-test-tomcat.xml
+++ b/build-test-tomcat.xml
@@ -15,16 +15,6 @@
 		/>
 	</target>
 
-	<target name="copy-optional-jars">
-		<copy
-			todir="${app.server.lib.global.dir}">
-				<fileset
-					dir="${jdbc.drivers.optional.dir}"
-					includes="*.jar"
-			/>
-		</copy>
-	</target>
-
 	<target name="prepare-cluster-tomcat-node">
 		<exec executable="${pscp.executable}">
 			<arg line="-pw ${vm.password} dist/liferay-portal-tomcat-${lp.version}.zip ${vm.username}@${cluster-node.host}:/" />
diff --git a/build-test.xml b/build-test.xml
index 07420f53b49195..2c8f1886ccf89b 100644
--- a/build-test.xml
+++ b/build-test.xml
@@ -1960,6 +1960,22 @@
 		</if>
 	</target>
 
+	<target name="copy-optional-jars">
+		<delete includeemptydirs="true" failonerror="false">
+			<fileset
+				dir="${simple.server.lib.global.dir}"
+				includes="db2*.jar,jtds.jar,ojdbc*.jar"
+			/>
+		</delete>
+
+		<copy todir="${app.server.lib.global.dir}">
+				<fileset
+					dir="${jdbc.drivers.optional.dir}/${db.type}"
+					includes="*.jar"
+			/>
+		</copy>
+	</target>
+
 	<target name="create-ant-script">
 		<loadfile property="template.content" srcfile="portal-web/test-ant-templates/${ant.script.template}">
 			<filterchain>
@@ -2125,8 +2141,14 @@
 		<antcall target="prepare-common" />
 	</target>
 
-	<target name="prepare-oracle">
-		<echo file="test.${user.name}.properties">db.type=oracle</echo>
+	<target name="prepare-oracle-10">
+		<echo file="test.${user.name}.properties">db.type=oracle-10</echo>
+
+		<antcall target="prepare-common" />
+	</target>
+
+	<target name="prepare-oracle-11">
+		<echo file="test.${user.name}.properties">db.type=oracle-11</echo>
 
 		<antcall target="prepare-common" />
 	</target>
@@ -2167,7 +2189,10 @@ custom.sql.function.isnull=CAST(? AS VARCHAR(32672)) IS NULL
 custom.sql.function.isnotnull=CAST(? AS VARCHAR(32672)) IS NOT NULL</echo>
 			</then>
 			<elseif>
-				<equals arg1="${db.type}" arg2="oracle" />
+				<or>
+					<equals arg1="${db.type}" arg2="oracle-10" />
+					<equals arg1="${db.type}" arg2="oracle-11" />
+				</or>
 				<then>
 					<echo file="portal-impl/src/portal-ext.properties" append="true">
 
@@ -2362,7 +2387,8 @@ message.boards.subscribe.by.default=false</echo>
 				<echo file="portal-impl/src/portal-ext.properties" append="true">
 
 upgrade.processes=\
-	com.liferay.portal.upgrade.UpgradeProcess_6_0_12_to_6_1_0</echo>
+	com.liferay.portal.upgrade.UpgradeProcess_6_0_12_to_6_1_0,\
+	com.liferay.portal.upgrade.UpgradeProcess_6_1_1</echo>
 			</then>
 		</if>
 
@@ -2461,8 +2487,14 @@ svn --username ${svn.username} --password ${svn.password} update -r ${svn.info.r
 		</if>
 	</target>
 
-	<target name="prepare-postgresql">
-		<echo file="test.${user.name}.properties">db.type=postgresql</echo>
+	<target name="prepare-postgresql-8.4">
+		<echo file="test.${user.name}.properties">db.type=postgresql-8.4</echo>
+
+		<antcall target="prepare-common" />
+	</target>
+
+	<target name="prepare-postgresql-9.0">
+		<echo file="test.${user.name}.properties">db.type=postgresql-9.0</echo>
 
 		<antcall target="prepare-common" />
 	</target>
@@ -2618,8 +2650,14 @@ executable ZIP file.
 		</if>
 	</target>
 
-	<target name="prepare-sql-server">
-		<echo file="test.${user.name}.properties">db.type=sql-server</echo>
+	<target name="prepare-sql-server-2005">
+		<echo file="test.${user.name}.properties">db.type=sql-server-2005</echo>
+
+		<antcall target="prepare-common" />
+	</target>
+
+	<target name="prepare-sql-server-2008">
+		<echo file="test.${user.name}.properties">db.type=sql-server-2008</echo>
 
 		<antcall target="prepare-common" />
 	</target>
@@ -2781,19 +2819,28 @@ file.
 								</then>
 							</elseif>
 							<elseif>
-								<equals arg1="${db.type}" arg2="oracle" />
+								<or>
+									<equals arg1="${db.type}" arg2="oracle-10" />
+									<equals arg1="${db.type}" arg2="oracle-11" />
+								</or>
 								<then>
 									<antcall target="rebuild-database-oracle" />
 								</then>
 							</elseif>
 							<elseif>
-								<equals arg1="${db.type}" arg2="postgresql" />
+								<or>
+									<equals arg1="${db.type}" arg2="postgresql-8.4" />
+									<equals arg1="${db.type}" arg2="postgresql-9.0" />
+								</or>
 								<then>
 									<antcall target="rebuild-database-postgresql" />
 								</then>
 							</elseif>
 							<elseif>
-								<equals arg1="${db.type}" arg2="sql-server" />
+								<or>
+									<equals arg1="${db.type}" arg2="sql-server-2005" />
+									<equals arg1="${db.type}" arg2="sql-server-2008" />
+								</or>
 								<then>
 									<antcall target="rebuild-database-sql-server" />
 								</then>
@@ -2843,26 +2890,26 @@ file.
 		<copy file="${sql.dir}${sql.file}" tofile="${sql.file}" />
 
 		<replace file="${sql.file}">
-			<replacefilter token="drop database lportal;" value="drop database ${db.db2.schema};"/>
-			<replacefilter token="create database lportal;" value="create database ${db.db2.schema} pagesize 8192;"/>
-			<replacefilter token="create database lportal pagesize 8192;" value="create database ${db.db2.schema} pagesize 8192;"/>
-			<replacefilter token="connect to lportal;" value="connect to ${db.db2.schema} USER ${db.db2.username} USING ${db.db2.password};"/>
+			<replacefilter token="drop database lportal;" value="drop database ${db.schema};"/>
+			<replacefilter token="create database lportal;" value="create database ${db.schema} pagesize 8192;"/>
+			<replacefilter token="create database lportal pagesize 8192;" value="create database ${db.schema} pagesize 8192;"/>
+			<replacefilter token="connect to lportal;" value="connect to ${db.schema} USER ${db.username} USING ${db.password};"/>
 		</replace>
 
 		<exec executable="${plink.executable}">
-			<arg line="-pw ${vm.password} ${vm.username}@${db.db2.host} cmd.exe /c mkdir C:\${tstamp.value}" />
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c mkdir C:\${tstamp.value}" />
 		</exec>
 
 		<exec executable="${pscp.executable}">
-			<arg line="-pw ${vm.password} ${sql.file} ${vm.username}@${db.db2.host}:\${tstamp.value}" />
+			<arg line="-pw ${vm.password} ${sql.file} ${vm.username}@${db.host}:\${tstamp.value}" />
 		</exec>
 
 		<exec executable="${plink.executable}">
-			<arg line="-pw ${vm.password} ${vm.username}@${db.db2.host} cmd.exe /c db2cmd /c /w /i /t db2 -f C:\${tstamp.value}\${sql.file} -td;" />
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c db2cmd /c /w /i /t db2 -f C:\${tstamp.value}\${sql.file} -td;" />
 		</exec>
 
 		<exec executable="${plink.executable}">
-			<arg line="-pw ${vm.password} ${vm.username}@${db.db2.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
 		</exec>
 
 		<delete file="${sql.file}" />
@@ -2909,9 +2956,9 @@ file.
 				<copy file="${sql.dir}${sql.file}" tofile="${sql.file}" />
 
 				<replace file="${sql.file}">
-					<replacefilter token="drop database if exists lportal;" value="drop database if exists ${db.mysql.schema};"/>
-					<replacefilter token="create database lportal character set utf8;" value="create database ${db.mysql.schema} character set utf8;"/>
-					<replacefilter token="use lportal;" value="use ${db.mysql.schema};"/>
+					<replacefilter token="drop database if exists lportal;" value="drop database if exists ${db.schema};"/>
+					<replacefilter token="create database lportal character set utf8;" value="create database ${db.schema} character set utf8;"/>
+					<replacefilter token="use lportal;" value="use ${db.schema};"/>
 				</replace>
 
 				<exec executable="cmd">
@@ -2953,19 +3000,19 @@ file.
 		</tstamp>
 
 		<exec executable="${plink.executable}">
-			<arg line="-pw ${vm.password} ${vm.username}@${db.oracle.host} cmd.exe /c mkdir C:\${tstamp.value}" />
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c mkdir C:\${tstamp.value}" />
 		</exec>
 
 		<exec executable="${pscp.executable}">
-			<arg line="-pw ${vm.password} ${sql.dir}${sql.file} ${vm.username}@${db.oracle.host}:\${tstamp.value}" />
+			<arg line="-pw ${vm.password} ${sql.dir}${sql.file} ${vm.username}@${db.host}:\${tstamp.value}" />
 		</exec>
 
 		<exec executable="${plink.executable}">
-			<arg line="-pw ${vm.password} ${vm.username}@${db.oracle.host} sqlplus system/password @C:\${tstamp.value}\${sql.file} ${db.oracle.username} ${db.oracle.password}" />
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} sqlplus system/password @C:\${tstamp.value}\${sql.file} ${db.username} ${db.password}" />
 		</exec>
 
 		<exec executable="${plink.executable}">
-			<arg line="-pw ${vm.password} ${vm.username}@${db.oracle.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
 		</exec>
 	</target>
 
@@ -3001,25 +3048,38 @@ file.
 		<copy file="${sql.dir}${sql.file}" tofile="${sql.file}" />
 
 		<replace file="${sql.file}">
-			<replacefilter token="drop database lportal;" value="drop database ${db.postgresql.schema};"/>
-			<replacefilter token="create database lportal encoding = 'UNICODE';" value="create database ${db.postgresql.schema} encoding = 'UNICODE';"/>
-			<replacefilter token="\c lportal;" value="\c ${db.postgresql.schema};"/>
+			<replacefilter token="drop database lportal;" value="drop database ${db.schema};"/>
+			<replacefilter token="create database lportal encoding = 'UNICODE';" value="create database ${db.schema} encoding = 'UNICODE';"/>
+			<replacefilter token="\c lportal;" value="\c ${db.schema};"/>
 		</replace>
 
 		<exec executable="${plink.executable}">
-			<arg line="-pw ${vm.password} ${vm.username}@${db.postgresql.host} cmd.exe /c mkdir C:\${tstamp.value}" />
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c mkdir C:\${tstamp.value}" />
 		</exec>
 
 		<exec executable="${pscp.executable}">
-			<arg line="-pw ${vm.password} ${sql.file} ${vm.username}@${db.postgresql.host}:\${tstamp.value}" />
+			<arg line="-pw ${vm.password} ${sql.file} ${vm.username}@${db.host}:\${tstamp.value}" />
 		</exec>
 
-		<exec executable="${plink.executable}">
-			<arg line="-pw ${vm.password} ${vm.username}@${db.postgresql.host} C:\Progra~1\PostgreSQL\8.4\bin\psql.exe -U ${db.postgresql.username} -f C:\${tstamp.value}\${sql.file}" />
-		</exec>
+		<if>
+			<equals arg1="${db.type}" arg2="postgresql-8.4" />
+			<then>
+				<exec executable="${plink.executable}">
+					<arg line="-pw ${vm.password} ${vm.username}@${db.host} C:\Progra~1\PostgreSQL\8.4\bin\psql.exe -U ${db.username} -f C:\${tstamp.value}\${sql.file}" />
+				</exec>
+			</then>
+			<elseif>
+				<equals arg1="${db.type}" arg2="postgresql-9.0" />
+				<then>
+					<exec executable="${plink.executable}">
+						<arg line="-pw ${vm.password} ${vm.username}@${db.host} C:\Progra~1\PostgreSQL\9.0\bin\psql.exe -U ${db.username} -f C:\${tstamp.value}\${sql.file}" />
+					</exec>
+				</then>
+			</elseif>
+		</if>
 
 		<exec executable="${plink.executable}">
-			<arg line="-pw ${vm.password} ${vm.username}@${db.postgresql.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
 		</exec>
 
 		<delete file="${sql.file}" />
@@ -3057,25 +3117,25 @@ file.
 		<copy file="${sql.dir}${sql.file}" tofile="${sql.file}" />
 
 		<replace file="${sql.file}">
-			<replacefilter token="drop database lportal;" value="drop database ${db.sql-server.schema};"/>
-			<replacefilter token="create database lportal;" value="create database ${db.sql-server.schema};"/>
-			<replacefilter token="use lportal;" value="use ${db.sql-server.schema};"/>
+			<replacefilter token="drop database lportal;" value="drop database ${db.schema};"/>
+			<replacefilter token="create database lportal;" value="create database ${db.schema};"/>
+			<replacefilter token="use lportal;" value="use ${db.schema};"/>
 		</replace>
 
 		<exec executable="${plink.executable}">
-			<arg line="-pw ${vm.password} ${vm.username}@${db.sql-server.host} cmd.exe /c mkdir C:\${tstamp.value}" />
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c mkdir C:\${tstamp.value}" />
 		</exec>
 
 		<exec executable="${pscp.executable}">
-			<arg line="-pw ${vm.password} ${sql.file} ${vm.username}@${db.sql-server.host}:\${tstamp.value}" />
+			<arg line="-pw ${vm.password} ${sql.file} ${vm.username}@${db.host}:\${tstamp.value}" />
 		</exec>
 
 		<exec executable="${plink.executable}">
-			<arg line="-pw ${vm.password} ${vm.username}@${db.sql-server.host} osql -n -U ${db.sql-server.username} -P ${db.sql-server.password} -i C:\${tstamp.value}\${sql.file}" />
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} osql -n -U ${db.username} -P ${db.password} -i C:\${tstamp.value}\${sql.file}" />
 		</exec>
 
 		<exec executable="${plink.executable}">
-			<arg line="-pw ${vm.password} ${vm.username}@${db.sql-server.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
 		</exec>
 
 		<delete file="${sql.file}" />
@@ -3113,26 +3173,26 @@ file.
 		<copy file="${sql.dir}${sql.file}" tofile="${sql.file}" />
 
 		<replace file="${sql.file}">
-			<replacefilter token="use master" value="use master${line.separator}dump transaction master with no_log${line.separator}go${line.separator}if exists (select * from master.dbo.sysdatabases where name = &quot;${db.sybase.schema}&quot;)${line.separator}begin${line.separator}drop database ${db.sybase.schema}${line.separator}end${line.separator}go${line.separator}create database ${db.sybase.schema} on ${db.sybase.device.name} = &quot;250m&quot;${line.separator}go" />
-			<replacefilter token="exec sp_dboption 'lportal', 'allow nulls by default' , true" value="exec sp_dboption '${db.sybase.schema}', 'allow nulls by default' , true"/>
-			<replacefilter token="exec sp_dboption 'lportal', 'select into/bulkcopy/pllsort' , true" value="exec sp_dboption '${db.sybase.schema}', 'select into/bulkcopy/pllsort' , true"/>
-			<replacefilter token="use lportal" value="use ${db.sybase.schema}${line.separator}go"/>
+			<replacefilter token="use master" value="use master${line.separator}dump transaction master with no_log${line.separator}go${line.separator}if exists (select * from master.dbo.sysdatabases where name = &quot;${db.schema}&quot;)${line.separator}begin${line.separator}drop database ${db.schema}${line.separator}end${line.separator}go${line.separator}create database ${db.schema} on ${db.device.name} = &quot;250m&quot;${line.separator}go" />
+			<replacefilter token="exec sp_dboption 'lportal', 'allow nulls by default' , true" value="exec sp_dboption '${db.schema}', 'allow nulls by default' , true"/>
+			<replacefilter token="exec sp_dboption 'lportal', 'select into/bulkcopy/pllsort' , true" value="exec sp_dboption '${db.schema}', 'select into/bulkcopy/pllsort' , true"/>
+			<replacefilter token="use lportal" value="use ${db.schema}${line.separator}go"/>
 		</replace>
 
 		<exec executable="${plink.executable}">
-			<arg line="-pw ${vm.password} ${vm.username}@${db.sybase.host} cmd.exe /c mkdir C:\${tstamp.value}" />
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c mkdir C:\${tstamp.value}" />
 		</exec>
 
 		<exec executable="${pscp.executable}">
-			<arg line="-pw ${vm.password} ${sql.file} ${vm.username}@${db.sybase.host}:\${tstamp.value}" />
+			<arg line="-pw ${vm.password} ${sql.file} ${vm.username}@${db.host}:\${tstamp.value}" />
 		</exec>
 
 		<exec executable="${plink.executable}">
-			<arg line="-pw ${vm.password} ${vm.username}@${db.sybase.host} isql -U ${db.sybase.username} -P ${db.sybase.password} -i C:\${tstamp.value}\${sql.file}" />
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} isql -U ${db.username} -P ${db.password} -i C:\${tstamp.value}\${sql.file}" />
 		</exec>
 
 		<exec executable="${plink.executable}">
-			<arg line="-pw ${vm.password} ${vm.username}@${db.sybase.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
+			<arg line="-pw ${vm.password} ${vm.username}@${db.host} cmd.exe /c rmdir /q /s C:\${tstamp.value}" />
 		</exec>
 
 		<delete file="${sql.file}" />
@@ -3223,6 +3283,8 @@ file.
 	<target name="run-simple-server">
 		<antcall target="rebuild-database" inheritAll="false" />
 
+		<antcall target="copy-optional-jars" inheritAll="false" />
+
 		<if>
 			<not>
 				<equals arg1="${skip.clean-server-deploy-dir}" arg2="true" />
diff --git a/portal-web/test-ant-templates/ant-script-db-upgrade-5.2.3.xml b/portal-web/test-ant-templates/ant-script-db-upgrade-5.2.3.xml
index d7854cd3a3a5a3..b2c699d5598c6f 100644
--- a/portal-web/test-ant-templates/ant-script-db-upgrade-5.2.3.xml
+++ b/portal-web/test-ant-templates/ant-script-db-upgrade-5.2.3.xml
@@ -102,7 +102,7 @@
 		</antcall>
 	</target>
 
-	<target name="test-${test.ant.script.command}-5.2.3-tomcat-oracle-firefox">
+	<target name="test-${test.ant.script.command}-5.2.3-tomcat-oracle-10-firefox">
 		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
 
 		<antcall target="prepare-vm-server">
@@ -112,7 +112,7 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-db-oracle-common">
+		<antcall target="prepare-db-oracle-10-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="sql.version" value="5.2.3" />
 		</antcall>
@@ -127,7 +127,7 @@
 			<param name="tomcat.folder.dir" value="liferay-portal-5.2.3/tomcat-6.0.18" />
 		</antcall>
 
-		<antcall target="prepare-db-oracle-common">
+		<antcall target="prepare-db-oracle-10-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="skip.rebuild-database" value="true" />
 			<param name="sql.version" value="5.2.3" />
@@ -139,7 +139,7 @@
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523LatestConvertTestSuite" />
 		</antcall>
 
-		<antcall target="prepare-db-oracle-common">
+		<antcall target="prepare-db-oracle-10-common">
 			<param name="set.permission.algorithm.6" value="true" />
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="skip.rebuild-database" value="true" />
@@ -157,7 +157,62 @@
 		</antcall>
 	</target>
 
-	<target name="test-${test.ant.script.command}-5.2.3-tomcat-postgresql-firefox">
+	<target name="test-${test.ant.script.command}-5.2.3-tomcat-oracle-11-firefox">
+		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
+
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="oracle-11.2.0.1.0" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-db-oracle-11-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="sql.version" value="5.2.3" />
+		</antcall>
+
+		<antcall target="run-versioned-upgrade-test">
+			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2.3.zip" />
+			<param name="legacy.theme.ids" value="classic,controlpanel" />
+			<param name="lp.version" value="5.2.3" />
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets.ee}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523TestSuite" />
+			<param name="tomcat.folder.dir" value="liferay-portal-5.2.3/tomcat-6.0.18" />
+		</antcall>
+
+		<antcall target="prepare-db-oracle-11-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="skip.rebuild-database" value="true" />
+			<param name="sql.version" value="5.2.3" />
+		</antcall>
+
+		<antcall target="run-latest-upgrade-test">
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523LatestConvertTestSuite" />
+		</antcall>
+
+		<antcall target="prepare-db-oracle-11-common">
+			<param name="set.permission.algorithm.6" value="true" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="skip.rebuild-database" value="true" />
+			<param name="sql.version" value="5.2.3" />
+		</antcall>
+
+		<antcall target="run-latest-upgrade-test">
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523LatestTestSuite" />
+		</antcall>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+	<target name="test-${test.ant.script.command}-5.2.3-tomcat-postgresql-8.4-firefox">
 		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
 
 		<antcall target="prepare-vm-server">
@@ -167,7 +222,62 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-db-postgresql-common">
+		<antcall target="prepare-db-postgresql-8.4-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="sql.version" value="5.2.3" />
+		</antcall>
+
+		<antcall target="run-versioned-upgrade-test">
+			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2.3.zip" />
+			<param name="legacy.theme.ids" value="classic,controlpanel" />
+			<param name="lp.version" value="5.2.3" />
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets.ee}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523TestSuite" />
+			<param name="tomcat.folder.dir" value="liferay-portal-5.2.3/tomcat-6.0.18" />
+		</antcall>
+
+		<antcall target="prepare-db-postgresql-8.4-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="skip.rebuild-database" value="true" />
+			<param name="sql.version" value="5.2.3" />
+		</antcall>
+
+		<antcall target="run-latest-upgrade-test">
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523LatestConvertTestSuite" />
+		</antcall>
+
+		<antcall target="prepare-db-postgresql-8.4-common">
+			<param name="set.permission.algorithm.6" value="true" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="skip.rebuild-database" value="true" />
+			<param name="sql.version" value="5.2.3" />
+		</antcall>
+
+		<antcall target="run-latest-upgrade-test">
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523LatestTestSuite" />
+		</antcall>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+	<target name="test-${test.ant.script.command}-5.2.3-tomcat-postgresql-9.0-firefox">
+		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
+
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="postgresql-9.0.4-1" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-db-postgresql-9.0-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="sql.version" value="5.2.3" />
 		</antcall>
@@ -182,7 +292,7 @@
 			<param name="tomcat.folder.dir" value="liferay-portal-5.2.3/tomcat-6.0.18" />
 		</antcall>
 
-		<antcall target="prepare-db-postgresql-common">
+		<antcall target="prepare-db-postgresql-9.0-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="skip.rebuild-database" value="true" />
 			<param name="sql.version" value="5.2.3" />
@@ -194,7 +304,7 @@
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523LatestConvertTestSuite" />
 		</antcall>
 
-		<antcall target="prepare-db-postgresql-common">
+		<antcall target="prepare-db-postgresql-9.0-common">
 			<param name="set.permission.algorithm.6" value="true" />
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="skip.rebuild-database" value="true" />
@@ -212,7 +322,7 @@
 		</antcall>
 	</target>
 
-	<target name="test-${test.ant.script.command}-5.2.3-tomcat-sql-server-firefox">
+	<target name="test-${test.ant.script.command}-5.2.3-tomcat-sql-server-2005-firefox">
 		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
 
 		<antcall target="prepare-vm-server">
@@ -222,7 +332,62 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-db-sql-server-common">
+		<antcall target="prepare-db-sql-server-2005-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="sql.version" value="5.2.3" />
+		</antcall>
+
+		<antcall target="run-versioned-upgrade-test">
+			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2.3.zip" />
+			<param name="legacy.theme.ids" value="classic,controlpanel" />
+			<param name="lp.version" value="5.2.3" />
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets.ee}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523TestSuite" />
+			<param name="tomcat.folder.dir" value="liferay-portal-5.2.3/tomcat-6.0.18" />
+		</antcall>
+
+		<antcall target="prepare-db-sql-server-2005-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="skip.rebuild-database" value="true" />
+			<param name="sql.version" value="5.2.3" />
+		</antcall>
+
+		<antcall target="run-latest-upgrade-test">
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523LatestConvertTestSuite" />
+		</antcall>
+
+		<antcall target="prepare-db-sql-server-2005-common">
+			<param name="set.permission.algorithm.6" value="true" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="skip.rebuild-database" value="true" />
+			<param name="sql.version" value="5.2.3" />
+		</antcall>
+
+		<antcall target="run-latest-upgrade-test">
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523LatestTestSuite" />
+		</antcall>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+	<target name="test-${test.ant.script.command}-5.2.3-tomcat-sql-server-2008-firefox">
+		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
+
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="sql-server-2008-r2" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-db-sql-server-2008-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="sql.version" value="5.2.3" />
 		</antcall>
@@ -237,7 +402,7 @@
 			<param name="tomcat.folder.dir" value="liferay-portal-5.2.3/tomcat-6.0.18" />
 		</antcall>
 
-		<antcall target="prepare-db-sql-server-common">
+		<antcall target="prepare-db-sql-server-2008-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="skip.rebuild-database" value="true" />
 			<param name="sql.version" value="5.2.3" />
@@ -249,7 +414,7 @@
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}523LatestConvertTestSuite" />
 		</antcall>
 
-		<antcall target="prepare-db-sql-server-common">
+		<antcall target="prepare-db-sql-server-2008-common">
 			<param name="set.permission.algorithm.6" value="true" />
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="skip.rebuild-database" value="true" />
diff --git a/portal-web/test-ant-templates/ant-script-db-upgrade-5.2.5.xml b/portal-web/test-ant-templates/ant-script-db-upgrade-5.2.5.xml
deleted file mode 100644
index ec1d4bcf9ceb9a..00000000000000
--- a/portal-web/test-ant-templates/ant-script-db-upgrade-5.2.5.xml
+++ /dev/null
@@ -1,324 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="portal-test-${test.ant.script.command}-5.2.5" basedir="../../." default="test" xmlns:antelope="antlib:ise.antelope.tasks">
-	<import file="../../build-test-db-upgrade.xml" />
-
-	<target name="test-${test.ant.script.command}-5.2.5-tomcat-db2-firefox">
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
-
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="db2-9.7" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-db2-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.5" />
-		</antcall>
-
-		<antcall target="run-versioned-upgrade-test">
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp1.zip" />
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
-			<param name="lp.version" value="5.2.5" />
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets.ee}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525TestSuite" />
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp1/tomcat-6.0.18" />
-		</antcall>
-
-		<antcall target="prepare-db-db2-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.5" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestConvertTestSuite" />
-		</antcall>
-
-		<antcall target="prepare-db-db2-common">
-			<param name="set.permission.algorithm.6" value="true" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.5" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestTestSuite" />
-		</antcall>
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-${test.ant.script.command}-5.2.5-tomcat-mysql-firefox">
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
-
-		<antcall target="prepare-db-mysql-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.5" />
-		</antcall>
-
-		<antcall target="run-versioned-upgrade-test">
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp1.zip" />
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
-			<param name="lp.version" value="5.2.5" />
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets.ee}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525TestSuite" />
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp1/tomcat-6.0.18" />
-		</antcall>
-
-		<antcall target="prepare-db-mysql-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.5" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestConvertTestSuite" />
-		</antcall>
-
-		<antcall target="prepare-db-mysql-common">
-			<param name="set.permission.algorithm.6" value="true" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.5" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestTestSuite" />
-		</antcall>
-	</target>
-
-	<target name="test-${test.ant.script.command}-5.2.5-tomcat-oracle-firefox">
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
-
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="oracle-10.2.0.1.0" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-oracle-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.5" />
-		</antcall>
-
-		<antcall target="run-versioned-upgrade-test">
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp1.zip" />
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
-			<param name="lp.version" value="5.2.5" />
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets.ee}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525TestSuite" />
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp1/tomcat-6.0.18" />
-		</antcall>
-
-		<antcall target="prepare-db-oracle-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.5" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestConvertTestSuite" />
-		</antcall>
-
-		<antcall target="prepare-db-oracle-common">
-			<param name="set.permission.algorithm.6" value="true" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.5" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestTestSuite" />
-		</antcall>
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-${test.ant.script.command}-5.2.5-tomcat-postgresql-firefox">
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
-
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="postgresql-8.4.2-1" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-postgresql-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.5" />
-		</antcall>
-
-		<antcall target="run-versioned-upgrade-test">
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp1.zip" />
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
-			<param name="lp.version" value="5.2.5" />
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets.ee}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525TestSuite" />
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp1/tomcat-6.0.18" />
-		</antcall>
-
-		<antcall target="prepare-db-postgresql-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.5" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestConvertTestSuite" />
-		</antcall>
-
-		<antcall target="prepare-db-postgresql-common">
-			<param name="set.permission.algorithm.6" value="true" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.5" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestTestSuite" />
-		</antcall>
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-${test.ant.script.command}-5.2.5-tomcat-sql-server-firefox">
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
-
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="sql-server-2005-sp2" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-sql-server-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.5" />
-		</antcall>
-
-		<antcall target="run-versioned-upgrade-test">
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp1.zip" />
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
-			<param name="lp.version" value="5.2.5" />
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets.ee}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525TestSuite" />
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp1/tomcat-6.0.18" />
-		</antcall>
-
-		<antcall target="prepare-db-sql-server-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.5" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestConvertTestSuite" />
-		</antcall>
-
-		<antcall target="prepare-db-sql-server-common">
-			<param name="set.permission.algorithm.6" value="true" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.5" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestTestSuite" />
-		</antcall>
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-${test.ant.script.command}-5.2.5-tomcat-sybase-firefox">
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
-
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="sybase-15.0.2" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-sybase-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.5" />
-		</antcall>
-
-		<antcall target="run-versioned-upgrade-test">
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp1.zip" />
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
-			<param name="lp.version" value="5.2.5" />
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets.ee}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525TestSuite" />
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp1/tomcat-6.0.18" />
-		</antcall>
-
-		<antcall target="prepare-db-sybase-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.5" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestConvertTestSuite" />
-		</antcall>
-
-		<antcall target="prepare-db-sybase-common">
-			<param name="set.permission.algorithm.6" value="true" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.5" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}525LatestTestSuite" />
-		</antcall>
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-</project>
\ No newline at end of file
diff --git a/portal-web/test-ant-templates/ant-script-db-upgrade-5.2.7.xml b/portal-web/test-ant-templates/ant-script-db-upgrade-5.2.7.xml
deleted file mode 100644
index 792fbc406e7c2e..00000000000000
--- a/portal-web/test-ant-templates/ant-script-db-upgrade-5.2.7.xml
+++ /dev/null
@@ -1,324 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="portal-test-${test.ant.script.command}-5.2.7" basedir="../../." default="test" xmlns:antelope="antlib:ise.antelope.tasks">
-	<import file="../../build-test-db-upgrade.xml" />
-
-	<target name="test-${test.ant.script.command}-5.2.7-tomcat-db2-firefox">
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
-
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="db2-9.7" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-db2-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-versioned-upgrade-test">
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp3.zip" />
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
-			<param name="lp.version" value="5.2.7" />
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets.ee}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}527TestSuite" />
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp3/tomcat-6.0.18" />
-		</antcall>
-
-		<antcall target="prepare-db-db2-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}527LatestConvertTestSuite" />
-		</antcall>
-
-		<antcall target="prepare-db-db2-common">
-			<param name="set.permission.algorithm.6" value="true" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}527LatestTestSuite" />
-		</antcall>
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-${test.ant.script.command}-5.2.7-tomcat-mysql-firefox">
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
-
-		<antcall target="prepare-db-mysql-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-versioned-upgrade-test">
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp3.zip" />
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
-			<param name="lp.version" value="5.2.7" />
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets.ee}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}527TestSuite" />
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp3/tomcat-6.0.18" />
-		</antcall>
-
-		<antcall target="prepare-db-mysql-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}527LatestConvertTestSuite" />
-		</antcall>
-
-		<antcall target="prepare-db-mysql-common">
-			<param name="set.permission.algorithm.6" value="true" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}527LatestTestSuite" />
-		</antcall>
-	</target>
-
-	<target name="test-${test.ant.script.command}-5.2.7-tomcat-oracle-firefox">
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
-
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="oracle-10.2.0.1.0" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-oracle-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-versioned-upgrade-test">
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp3.zip" />
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
-			<param name="lp.version" value="5.2.7" />
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets.ee}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}527TestSuite" />
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp3/tomcat-6.0.18" />
-		</antcall>
-
-		<antcall target="prepare-db-oracle-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}527LatestConvertTestSuite" />
-		</antcall>
-
-		<antcall target="prepare-db-oracle-common">
-			<param name="set.permission.algorithm.6" value="true" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}527LatestTestSuite" />
-		</antcall>
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-${test.ant.script.command}-5.2.7-tomcat-postgresql-firefox">
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
-
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="postgresql-8.4.2-1" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-postgresql-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-versioned-upgrade-test">
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp3.zip" />
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
-			<param name="lp.version" value="5.2.7" />
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets.ee}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}527TestSuite" />
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp3/tomcat-6.0.18" />
-		</antcall>
-
-		<antcall target="prepare-db-postgresql-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}527LatestConvertTestSuite" />
-		</antcall>
-
-		<antcall target="prepare-db-postgresql-common">
-			<param name="set.permission.algorithm.6" value="true" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}527LatestTestSuite" />
-		</antcall>
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-${test.ant.script.command}-5.2.7-tomcat-sql-server-firefox">
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
-
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="sql-server-2005-sp2" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-sql-server-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-versioned-upgrade-test">
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp3.zip" />
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
-			<param name="lp.version" value="5.2.7" />
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets.ee}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}527TestSuite" />
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp3/tomcat-6.0.18" />
-		</antcall>
-
-		<antcall target="prepare-db-sql-server-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}527LatestConvertTestSuite" />
-		</antcall>
-
-		<antcall target="prepare-db-sql-server-common">
-			<param name="set.permission.algorithm.6" value="true" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}527LatestTestSuite" />
-		</antcall>
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-${test.ant.script.command}-5.2.7-tomcat-sybase-firefox">
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
-
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="sybase-15.0.2" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-sybase-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-versioned-upgrade-test">
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp3.zip" />
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
-			<param name="lp.version" value="5.2.7" />
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets.ee}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}527TestSuite" />
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp3/tomcat-6.0.18" />
-		</antcall>
-
-		<antcall target="prepare-db-sybase-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}527LatestConvertTestSuite" />
-		</antcall>
-
-		<antcall target="prepare-db-sybase-common">
-			<param name="set.permission.algorithm.6" value="true" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}527LatestTestSuite" />
-		</antcall>
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-</project>
\ No newline at end of file
diff --git a/portal-web/test-ant-templates/ant-script-db-upgrade-5.2.8.xml b/portal-web/test-ant-templates/ant-script-db-upgrade-5.2.8.xml
deleted file mode 100644
index 693eac718c9547..00000000000000
--- a/portal-web/test-ant-templates/ant-script-db-upgrade-5.2.8.xml
+++ /dev/null
@@ -1,324 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="portal-test-${test.ant.script.command}-5.2.8" basedir="../../." default="test" xmlns:antelope="antlib:ise.antelope.tasks">
-	<import file="../../build-test-db-upgrade.xml" />
-
-	<target name="test-${test.ant.script.command}-5.2.8-tomcat-db2-firefox">
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
-
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="db2-9.7" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-db2-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-versioned-upgrade-test">
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp4.zip" />
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
-			<param name="lp.version" value="5.2.8" />
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets.ee}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}528TestSuite" />
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp4/tomcat-6.0.18" />
-		</antcall>
-
-		<antcall target="prepare-db-db2-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}528LatestConvertTestSuite" />
-		</antcall>
-
-		<antcall target="prepare-db-db2-common">
-			<param name="set.permission.algorithm.6" value="true" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}528LatestTestSuite" />
-		</antcall>
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-${test.ant.script.command}-5.2.8-tomcat-mysql-firefox">
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
-
-		<antcall target="prepare-db-mysql-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-versioned-upgrade-test">
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp4.zip" />
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
-			<param name="lp.version" value="5.2.8" />
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets.ee}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}528TestSuite" />
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp4/tomcat-6.0.18" />
-		</antcall>
-
-		<antcall target="prepare-db-mysql-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}528LatestConvertTestSuite" />
-		</antcall>
-
-		<antcall target="prepare-db-mysql-common">
-			<param name="set.permission.algorithm.6" value="true" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}528LatestTestSuite" />
-		</antcall>
-	</target>
-
-	<target name="test-${test.ant.script.command}-5.2.8-tomcat-oracle-firefox">
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
-
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="oracle-10.2.0.1.0" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-oracle-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-versioned-upgrade-test">
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp4.zip" />
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
-			<param name="lp.version" value="5.2.8" />
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets.ee}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}528TestSuite" />
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp4/tomcat-6.0.18" />
-		</antcall>
-
-		<antcall target="prepare-db-oracle-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}528LatestConvertTestSuite" />
-		</antcall>
-
-		<antcall target="prepare-db-oracle-common">
-			<param name="set.permission.algorithm.6" value="true" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}528LatestTestSuite" />
-		</antcall>
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-${test.ant.script.command}-5.2.8-tomcat-postgresql-firefox">
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
-
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="postgresql-8.4.2-1" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-postgresql-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-versioned-upgrade-test">
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp4.zip" />
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
-			<param name="lp.version" value="5.2.8" />
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets.ee}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}528TestSuite" />
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp4/tomcat-6.0.18" />
-		</antcall>
-
-		<antcall target="prepare-db-postgresql-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}528LatestConvertTestSuite" />
-		</antcall>
-
-		<antcall target="prepare-db-postgresql-common">
-			<param name="set.permission.algorithm.6" value="true" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}528LatestTestSuite" />
-		</antcall>
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-${test.ant.script.command}-5.2.8-tomcat-sql-server-firefox">
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
-
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="sql-server-2005-sp2" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-sql-server-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-versioned-upgrade-test">
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp4.zip" />
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
-			<param name="lp.version" value="5.2.8" />
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets.ee}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}528TestSuite" />
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp4/tomcat-6.0.18" />
-		</antcall>
-
-		<antcall target="prepare-db-sql-server-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}528LatestConvertTestSuite" />
-		</antcall>
-
-		<antcall target="prepare-db-sql-server-common">
-			<param name="set.permission.algorithm.6" value="true" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}528LatestTestSuite" />
-		</antcall>
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-${test.ant.script.command}-5.2.8-tomcat-sybase-firefox">
-		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
-
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="sybase-15.0.2" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-sybase-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-versioned-upgrade-test">
-			<param name="file.name" value="liferay-portal-tomcat-6.0-5.2-ee-sp4.zip" />
-			<param name="legacy.theme.ids" value="classic,controlpanel" />
-			<param name="lp.version" value="5.2.8" />
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets.ee}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}528TestSuite" />
-			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp4/tomcat-6.0.18" />
-		</antcall>
-
-		<antcall target="prepare-db-sybase-common">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}528LatestConvertTestSuite" />
-		</antcall>
-
-		<antcall target="prepare-db-sybase-common">
-			<param name="set.permission.algorithm.6" value="true" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="skip.rebuild-database" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-latest-upgrade-test">
-			${test.ant.script.file.evaluate.logs}
-			${test.ant.script.file.plugin.portlets}
-			<param name="test.name" value="DBUpgrade${test.ant.script.suite}528LatestTestSuite" />
-		</antcall>
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-</project>
\ No newline at end of file
diff --git a/portal-web/test-ant-templates/ant-script-db-upgrade-5.2.9.xml b/portal-web/test-ant-templates/ant-script-db-upgrade-5.2.9.xml
index d68d4022de3ff2..6fe844cf47f7c2 100644
--- a/portal-web/test-ant-templates/ant-script-db-upgrade-5.2.9.xml
+++ b/portal-web/test-ant-templates/ant-script-db-upgrade-5.2.9.xml
@@ -102,7 +102,7 @@
 		</antcall>
 	</target>
 
-	<target name="test-${test.ant.script.command}-5.2.9-tomcat-oracle-firefox">
+	<target name="test-${test.ant.script.command}-5.2.9-tomcat-oracle-10-firefox">
 		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
 
 		<antcall target="prepare-vm-server">
@@ -112,7 +112,7 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-db-oracle-common">
+		<antcall target="prepare-db-oracle-10-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="sql.version" value="5.2.9" />
 		</antcall>
@@ -127,7 +127,7 @@
 			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp5/tomcat-6.0.29" />
 		</antcall>
 
-		<antcall target="prepare-db-oracle-common">
+		<antcall target="prepare-db-oracle-10-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="skip.rebuild-database" value="true" />
 			<param name="sql.version" value="5.2.9" />
@@ -139,7 +139,7 @@
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}529LatestConvertTestSuite" />
 		</antcall>
 
-		<antcall target="prepare-db-oracle-common">
+		<antcall target="prepare-db-oracle-10-common">
 			<param name="set.permission.algorithm.6" value="true" />
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="skip.rebuild-database" value="true" />
@@ -157,7 +157,62 @@
 		</antcall>
 	</target>
 
-	<target name="test-${test.ant.script.command}-5.2.9-tomcat-postgresql-firefox">
+	<target name="test-${test.ant.script.command}-5.2.9-tomcat-oracle-11-firefox">
+		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
+
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="oracle-11.2.0.1.0" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-db-oracle-11-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="sql.version" value="5.2.9" />
+		</antcall>
+
+		<antcall target="run-versioned-upgrade-test">
+			<param name="file.name" value="liferay-portal-tomcat-6.0.29-5.2-ee-sp5.zip" />
+			<param name="legacy.theme.ids" value="classic,controlpanel" />
+			<param name="lp.version" value="5.2.9" />
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets.ee}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}529TestSuite" />
+			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp5/tomcat-6.0.29" />
+		</antcall>
+
+		<antcall target="prepare-db-oracle-11-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="skip.rebuild-database" value="true" />
+			<param name="sql.version" value="5.2.9" />
+		</antcall>
+
+		<antcall target="run-latest-upgrade-test">
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}529LatestConvertTestSuite" />
+		</antcall>
+
+		<antcall target="prepare-db-oracle-11-common">
+			<param name="set.permission.algorithm.6" value="true" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="skip.rebuild-database" value="true" />
+			<param name="sql.version" value="5.2.9" />
+		</antcall>
+
+		<antcall target="run-latest-upgrade-test">
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}529LatestTestSuite" />
+		</antcall>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+	<target name="test-${test.ant.script.command}-5.2.9-tomcat-postgresql-8.4-firefox">
 		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
 
 		<antcall target="prepare-vm-server">
@@ -167,7 +222,7 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-db-postgresql-common">
+		<antcall target="prepare-db-postgresql-8.4-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="sql.version" value="5.2.9" />
 		</antcall>
@@ -182,7 +237,7 @@
 			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp5/tomcat-6.0.29" />
 		</antcall>
 
-		<antcall target="prepare-db-postgresql-common">
+		<antcall target="prepare-db-postgresql-8.4-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="skip.rebuild-database" value="true" />
 			<param name="sql.version" value="5.2.9" />
@@ -194,7 +249,7 @@
 			<param name="test.name" value="DBUpgrade${test.ant.script.suite}529LatestConvertTestSuite" />
 		</antcall>
 
-		<antcall target="prepare-db-postgresql-common">
+		<antcall target="prepare-db-postgresql-8.4-common">
 			<param name="set.permission.algorithm.6" value="true" />
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="skip.rebuild-database" value="true" />
@@ -212,6 +267,62 @@
 		</antcall>
 	</target>
 
+	<target name="test-${test.ant.script.command}-5.2.9-tomcat-postgresql-9.0-firefox">
+		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
+
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="postgresql-9.0.4-1" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-db-postgresql-9.0-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="sql.version" value="5.2.9" />
+		</antcall>
+
+		<antcall target="run-versioned-upgrade-test">
+			<param name="file.name" value="liferay-portal-tomcat-6.0.29-5.2-ee-sp5.zip" />
+			<param name="legacy.theme.ids" value="classic,controlpanel" />
+			<param name="lp.version" value="5.2.9" />
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets.ee}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}529TestSuite" />
+			<param name="tomcat.folder.dir" value="liferay-portal-5.2-ee-sp5/tomcat-6.0.29" />
+		</antcall>
+
+		<antcall target="prepare-db-postgresql-9.0-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="skip.rebuild-database" value="true" />
+			<param name="sql.version" value="5.2.9" />
+		</antcall>
+
+		<antcall target="run-latest-upgrade-test">
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}529LatestConvertTestSuite" />
+		</antcall>
+
+		<antcall target="prepare-db-postgresql-9.0-common">
+			<param name="set.permission.algorithm.6" value="true" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="skip.rebuild-database" value="true" />
+			<param name="sql.version" value="5.2.9" />
+		</antcall>
+
+		<antcall target="run-latest-upgrade-test">
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}529LatestTestSuite" />
+		</antcall>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+
 	<target name="test-${test.ant.script.command}-5.2.9-tomcat-sql-server-firefox">
 		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
 
diff --git a/portal-web/test-ant-templates/ant-script-db-upgrade-6.0.12.xml b/portal-web/test-ant-templates/ant-script-db-upgrade-6.0.12.xml
index 517161d522d643..3b5c4de2bcefa9 100644
--- a/portal-web/test-ant-templates/ant-script-db-upgrade-6.0.12.xml
+++ b/portal-web/test-ant-templates/ant-script-db-upgrade-6.0.12.xml
@@ -76,7 +76,7 @@
 		</antcall>
 	</target>
 
-	<target name="test-${test.ant.script.command}-6.0.12-tomcat-oracle-firefox">
+	<target name="test-${test.ant.script.command}-6.0.12-tomcat-oracle-10-firefox">
 		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
 
 		<antcall target="prepare-vm-server">
@@ -86,7 +86,7 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-db-oracle-common">
+		<antcall target="prepare-db-oracle-10-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="sql.version" value="6.0.12" />
 		</antcall>
@@ -101,7 +101,7 @@
 			<param name="tomcat.folder.dir" value="liferay-portal-6.0-ee-sp2/tomcat-6.0.32" />
 		</antcall>
 
-		<antcall target="prepare-db-oracle-common">
+		<antcall target="prepare-db-oracle-10-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="skip.rebuild-database" value="true" />
 			<param name="sql.version" value="6.0.12" />
@@ -118,7 +118,49 @@
 		</antcall>
 	</target>
 
-	<target name="test-${test.ant.script.command}-6.0.12-tomcat-postgresql-firefox">
+	<target name="test-${test.ant.script.command}-6.0.12-tomcat-oracle-11-firefox">
+		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
+
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="oracle-11.2.0.1.0" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-db-oracle-11-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="sql.version" value="6.0.12" />
+		</antcall>
+
+		<antcall target="run-versioned-upgrade-test">
+			<param name="file.name" value="liferay-portal-tomcat-6.0-ee-sp2-20110727.zip" />
+			<param name="legacy.theme.ids" value="classic,controlpanel" />
+			<param name="lp.version" value="6.0.12" />
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets.ee}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}6012TestSuite" />
+			<param name="tomcat.folder.dir" value="liferay-portal-6.0-ee-sp2/tomcat-6.0.32" />
+		</antcall>
+
+		<antcall target="prepare-db-oracle-11-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="skip.rebuild-database" value="true" />
+			<param name="sql.version" value="6.0.12" />
+		</antcall>
+
+		<antcall target="run-latest-upgrade-test">
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}6012LatestTestSuite" />
+		</antcall>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+	<target name="test-${test.ant.script.command}-6.0.12-tomcat-postgresql-8.4-firefox">
 		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
 
 		<antcall target="prepare-vm-server">
@@ -128,7 +170,49 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-db-postgresql-common">
+		<antcall target="prepare-db-postgresql-8.4-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="sql.version" value="6.0.12" />
+		</antcall>
+
+		<antcall target="run-versioned-upgrade-test">
+			<param name="file.name" value="liferay-portal-tomcat-6.0-ee-sp2-20110727.zip" />
+			<param name="legacy.theme.ids" value="classic,controlpanel" />
+			<param name="lp.version" value="6.0.12" />
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets.ee}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}6012TestSuite" />
+			<param name="tomcat.folder.dir" value="liferay-portal-6.0-ee-sp2/tomcat-6.0.32" />
+		</antcall>
+
+		<antcall target="prepare-db-postgresql-8.4-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="skip.rebuild-database" value="true" />
+			<param name="sql.version" value="6.0.12" />
+		</antcall>
+
+		<antcall target="run-latest-upgrade-test">
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}6012LatestTestSuite" />
+		</antcall>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+	<target name="test-${test.ant.script.command}-6.0.12-tomcat-postgresql-9.0-firefox">
+		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
+
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="postgresql-9.0.4-1" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-db-postgresql-9.0-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="sql.version" value="6.0.12" />
 		</antcall>
@@ -143,7 +227,7 @@
 			<param name="tomcat.folder.dir" value="liferay-portal-6.0-ee-sp2/tomcat-6.0.32" />
 		</antcall>
 
-		<antcall target="prepare-db-postgresql-common">
+		<antcall target="prepare-db-postgresql-9.0-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="skip.rebuild-database" value="true" />
 			<param name="sql.version" value="6.0.12" />
@@ -160,7 +244,7 @@
 		</antcall>
 	</target>
 
-	<target name="test-${test.ant.script.command}-6.0.12-tomcat-sql-server-firefox">
+	<target name="test-${test.ant.script.command}-6.0.12-tomcat-sql-server-2005-firefox">
 		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
 
 		<antcall target="prepare-vm-server">
@@ -170,7 +254,49 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-db-sql-server-common">
+		<antcall target="prepare-db-sql-server-2005-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="sql.version" value="6.0.12" />
+		</antcall>
+
+		<antcall target="run-versioned-upgrade-test">
+			<param name="file.name" value="liferay-portal-tomcat-6.0-ee-sp2-20110727.zip" />
+			<param name="legacy.theme.ids" value="classic,controlpanel" />
+			<param name="lp.version" value="6.0.12" />
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets.ee}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}6012TestSuite" />
+			<param name="tomcat.folder.dir" value="liferay-portal-6.0-ee-sp2/tomcat-6.0.32" />
+		</antcall>
+
+		<antcall target="prepare-db-sql-server-2005-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="skip.rebuild-database" value="true" />
+			<param name="sql.version" value="6.0.12" />
+		</antcall>
+
+		<antcall target="run-latest-upgrade-test">
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}6012LatestTestSuite" />
+		</antcall>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+	<target name="test-${test.ant.script.command}-6.0.12-tomcat-sql-server-2008-firefox">
+		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
+
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="sql-server-2008-r2" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-db-sql-server-2008-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="sql.version" value="6.0.12" />
 		</antcall>
@@ -185,7 +311,7 @@
 			<param name="tomcat.folder.dir" value="liferay-portal-6.0-ee-sp2/tomcat-6.0.32" />
 		</antcall>
 
-		<antcall target="prepare-db-sql-server-common">
+		<antcall target="prepare-db-sql-server-2008-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="skip.rebuild-database" value="true" />
 			<param name="sql.version" value="6.0.12" />
diff --git a/portal-web/test-ant-templates/ant-script-db-upgrade-6.0.6.xml b/portal-web/test-ant-templates/ant-script-db-upgrade-6.0.6.xml
index 3fc0deaa32d7d4..49fd381d4a9bfe 100644
--- a/portal-web/test-ant-templates/ant-script-db-upgrade-6.0.6.xml
+++ b/portal-web/test-ant-templates/ant-script-db-upgrade-6.0.6.xml
@@ -76,7 +76,7 @@
 		</antcall>
 	</target>
 
-	<target name="test-${test.ant.script.command}-6.0.6-tomcat-oracle-firefox">
+	<target name="test-${test.ant.script.command}-6.0.6-tomcat-oracle-10-firefox">
 		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
 
 		<antcall target="prepare-vm-server">
@@ -86,7 +86,7 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-db-oracle-common">
+		<antcall target="prepare-db-oracle-10-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="sql.version" value="6.0.6" />
 		</antcall>
@@ -101,7 +101,7 @@
 			<param name="tomcat.folder.dir" value="liferay-portal-6.0.6/tomcat-6.0.29" />
 		</antcall>
 
-		<antcall target="prepare-db-oracle-common">
+		<antcall target="prepare-db-oracle-10-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="skip.rebuild-database" value="true" />
 			<param name="sql.version" value="6.0.6" />
@@ -118,7 +118,49 @@
 		</antcall>
 	</target>
 
-	<target name="test-${test.ant.script.command}-6.0.6-tomcat-postgresql-firefox">
+	<target name="test-${test.ant.script.command}-6.0.6-tomcat-oracle-11-firefox">
+		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
+
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="oracle-11.2.0.1.0" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-db-oracle-11-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="sql.version" value="6.0.6" />
+		</antcall>
+
+		<antcall target="run-versioned-upgrade-test">
+			<param name="file.name" value="liferay-portal-tomcat-6.0.6-20110225.zip" />
+			<param name="legacy.theme.ids" value="classic,controlpanel" />
+			<param name="lp.version" value="6.0.6" />
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets.ee}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}606TestSuite" />
+			<param name="tomcat.folder.dir" value="liferay-portal-6.0.6/tomcat-6.0.29" />
+		</antcall>
+
+		<antcall target="prepare-db-oracle-11-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="skip.rebuild-database" value="true" />
+			<param name="sql.version" value="6.0.6" />
+		</antcall>
+
+		<antcall target="run-latest-upgrade-test">
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}606LatestTestSuite" />
+		</antcall>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+	<target name="test-${test.ant.script.command}-6.0.6-tomcat-postgresql-8.4-firefox">
 		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
 
 		<antcall target="prepare-vm-server">
@@ -128,7 +170,49 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-db-postgresql-common">
+		<antcall target="prepare-db-postgresql-8.4-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="sql.version" value="6.0.6" />
+		</antcall>
+
+		<antcall target="run-versioned-upgrade-test">
+			<param name="file.name" value="liferay-portal-tomcat-6.0.6-20110225.zip" />
+			<param name="legacy.theme.ids" value="classic,controlpanel" />
+			<param name="lp.version" value="6.0.6" />
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets.ee}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}606TestSuite" />
+			<param name="tomcat.folder.dir" value="liferay-portal-6.0.6/tomcat-6.0.29" />
+		</antcall>
+
+		<antcall target="prepare-db-postgresql-8.4-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="skip.rebuild-database" value="true" />
+			<param name="sql.version" value="6.0.6" />
+		</antcall>
+
+		<antcall target="run-latest-upgrade-test">
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}606LatestTestSuite" />
+		</antcall>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+	<target name="test-${test.ant.script.command}-6.0.6-tomcat-postgresql-9.0-firefox">
+		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
+
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="postgresql-9.0.4-1" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-db-postgresql-9.0-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="sql.version" value="6.0.6" />
 		</antcall>
@@ -143,7 +227,7 @@
 			<param name="tomcat.folder.dir" value="liferay-portal-6.0.6/tomcat-6.0.29" />
 		</antcall>
 
-		<antcall target="prepare-db-postgresql-common">
+		<antcall target="prepare-db-postgresql-9.0-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="skip.rebuild-database" value="true" />
 			<param name="sql.version" value="6.0.6" />
@@ -160,7 +244,7 @@
 		</antcall>
 	</target>
 
-	<target name="test-${test.ant.script.command}-6.0.6-tomcat-sql-server-firefox">
+	<target name="test-${test.ant.script.command}-6.0.6-tomcat-sql-server-2005-firefox">
 		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
 
 		<antcall target="prepare-vm-server">
@@ -170,7 +254,49 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-db-sql-server-common">
+		<antcall target="prepare-db-sql-server-2005-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="sql.version" value="6.0.6" />
+		</antcall>
+
+		<antcall target="run-versioned-upgrade-test">
+			<param name="file.name" value="liferay-portal-tomcat-6.0.6-20110225.zip" />
+			<param name="legacy.theme.ids" value="classic,controlpanel" />
+			<param name="lp.version" value="6.0.6" />
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets.ee}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}606TestSuite" />
+			<param name="tomcat.folder.dir" value="liferay-portal-6.0.6/tomcat-6.0.29" />
+		</antcall>
+
+		<antcall target="prepare-db-sql-server-2005-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="skip.rebuild-database" value="true" />
+			<param name="sql.version" value="6.0.6" />
+		</antcall>
+
+		<antcall target="run-latest-upgrade-test">
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.portlets}
+			<param name="test.name" value="DBUpgrade${test.ant.script.suite}606LatestTestSuite" />
+		</antcall>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+	<target name="test-${test.ant.script.command}-6.0.6-tomcat-sql-server-2008-firefox">
+		<ant antfile="build-dist.xml" target="build-dist-tomcat" />
+
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="sql-server-2008-r2" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-db-sql-server-2008-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="sql.version" value="6.0.6" />
 		</antcall>
@@ -185,7 +311,7 @@
 			<param name="tomcat.folder.dir" value="liferay-portal-6.0.6/tomcat-6.0.29" />
 		</antcall>
 
-		<antcall target="prepare-db-sql-server-common">
+		<antcall target="prepare-db-sql-server-2008-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="skip.rebuild-database" value="true" />
 			<param name="sql.version" value="6.0.6" />
diff --git a/portal-web/test-ant-templates/ant-script-db-upgrade-smoke-5.2.7.xml b/portal-web/test-ant-templates/ant-script-db-upgrade-smoke-5.2.7.xml
deleted file mode 100644
index 259e7dd36deefb..00000000000000
--- a/portal-web/test-ant-templates/ant-script-db-upgrade-smoke-5.2.7.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="portal-test-db-upgrade-smoke-5.2.7" basedir="../../." default="test" xmlns:antelope="antlib:ise.antelope.tasks">
-	<import file="../../build-test-db-upgrade.xml" />
-
-	<target name="test-db-upgrade-smoke-5.2.7-tomcat-db2-firefox">
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="db2-9.7" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-db2-common">
-			<param name="custom.properties" value="upgrade.processes=\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_5_2_7_to_6_0_0,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_1,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_2,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_3,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_5,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_6,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_1_0" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-smoke-test" />
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-db-upgrade-smoke-5.2.7-tomcat-mysql-firefox">
-		<antcall target="prepare-db-mysql-common">
-			<param name="custom.properties" value="upgrade.processes=\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_5_2_7_to_6_0_0,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_1,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_2,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_3,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_5,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_6,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_1_0" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-smoke-test" />
-	</target>
-
-	<target name="test-db-upgrade-smoke-5.2.7-tomcat-oracle-firefox">
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="oracle-10.2.0.1.0" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-oracle-common">
-			<param name="custom.properties" value="upgrade.processes=\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_5_2_7_to_6_0_0,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_1,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_2,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_3,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_5,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_6,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_1_0" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-smoke-test" />
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-db-upgrade-smoke-5.2.7-tomcat-postgresql-firefox">
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="postgresql-8.4.2-1" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-postgresql-common">
-			<param name="custom.properties" value="upgrade.processes=\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_5_2_7_to_6_0_0,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_1,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_2,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_3,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_5,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_6,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_1_0" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-smoke-test" />
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-db-upgrade-smoke-5.2.7-tomcat-sql-server-firefox">
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="sql-server-2005-sp2" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-sql-server-common">
-			<param name="custom.properties" value="upgrade.processes=\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_5_2_7_to_6_0_0,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_1,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_2,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_3,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_5,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_6,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_1_0" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-smoke-test" />
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-db-upgrade-smoke-5.2.7-tomcat-sybase-firefox">
-		<antcall target="prepare-vm-server">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="sybase-15.0.2" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-sybase-common">
-			<param name="custom.properties" value="upgrade.processes=\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_5_2_7_to_6_0_0,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_1,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_2,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_3,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_5,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_6,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_1_0" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.7" />
-		</antcall>
-
-		<antcall target="run-smoke-test" />
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-</project>
diff --git a/portal-web/test-ant-templates/ant-script-db-upgrade-smoke-5.2.8.xml b/portal-web/test-ant-templates/ant-script-db-upgrade-smoke-5.2.8.xml
deleted file mode 100644
index 272bb3e6f7fbad..00000000000000
--- a/portal-web/test-ant-templates/ant-script-db-upgrade-smoke-5.2.8.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="portal-test-db-upgrade-smoke-5.2.8" basedir="../../." default="test" xmlns:antelope="antlib:ise.antelope.tasks">
-	<import file="../../build-test-db-upgrade.xml" />
-
-	<target name="test-db-upgrade-smoke-5.2.8-tomcat-db2-firefox">
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="db2-9.7" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-db2-common">
-			<param name="custom.properties" value="upgrade.processes=\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_5_2_8_to_6_0_5,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_6,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_1_0" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-smoke-test" />
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-db-upgrade-smoke-5.2.8-tomcat-mysql-firefox">
-		<antcall target="prepare-db-mysql-common">
-			<param name="custom.properties" value="upgrade.processes=\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_5_2_8_to_6_0_5,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_6,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_1_0" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-smoke-test" />
-	</target>
-
-	<target name="test-db-upgrade-smoke-5.2.8-tomcat-oracle-firefox">
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="oracle-10.2.0.1.0" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-oracle-common">
-			<param name="custom.properties" value="upgrade.processes=\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_5_2_8_to_6_0_5,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_6,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_1_0" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-smoke-test" />
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-db-upgrade-smoke-5.2.8-tomcat-postgresql-firefox">
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="postgresql-8.4.2-1" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-postgresql-common">
-			<param name="custom.properties" value="upgrade.processes=\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_5_2_8_to_6_0_5,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_6,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_1_0" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-smoke-test" />
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-db-upgrade-smoke-5.2.8-tomcat-sql-server-firefox">
-		<antcall target="prepare-vm-server">
-			<param name="build.war" value="false" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="sql-server-2005-sp2" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-sql-server-common">
-			<param name="custom.properties" value="upgrade.processes=\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_5_2_8_to_6_0_5,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_6,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_1_0" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-smoke-test" />
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-
-	<target name="test-db-upgrade-smoke-5.2.8-tomcat-sybase-firefox">
-		<antcall target="prepare-vm-server">
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="vm.vmdk.suffix" value="sybase-15.0.2" />
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-
-		<antcall target="prepare-db-sybase-common">
-			<param name="custom.properties" value="upgrade.processes=\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_5_2_8_to_6_0_5,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_0_6,\$${line.separator}com.liferay.portal.upgrade.UpgradeProcess_6_1_0" />
-			<param name="skip.prepare-bundle" value="true" />
-			<param name="sql.version" value="5.2.8" />
-		</antcall>
-
-		<antcall target="run-smoke-test" />
-
-		<antcall target="stop-vm">
-			<param name="vm.host" value="${vm.db.host}" />
-		</antcall>
-	</target>
-</project>
diff --git a/portal-web/test-ant-templates/ant-script-db-upgrade-smoke.xml b/portal-web/test-ant-templates/ant-script-db-upgrade-smoke.xml
index f4634c341a4f1c..6c277d7c3a4321 100644
--- a/portal-web/test-ant-templates/ant-script-db-upgrade-smoke.xml
+++ b/portal-web/test-ant-templates/ant-script-db-upgrade-smoke.xml
@@ -36,7 +36,7 @@
 		</antcall>
 	</target>
 
-	<target name="test-db-upgrade-smoke-${test.ant.script.version}-tomcat-oracle-firefox">
+	<target name="test-db-upgrade-smoke-${test.ant.script.version}-tomcat-oracle-10-firefox">
 		<antcall target="prepare-vm-server">
 			<param name="build.war" value="false" />
 			<param name="skip.prepare-bundle" value="true" />
@@ -44,7 +44,7 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-db-oracle-common">
+		<antcall target="prepare-db-oracle-10-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="sql.version" value="${test.ant.script.version}" />
 		</antcall>
@@ -58,7 +58,29 @@
 		</antcall>
 	</target>
 
-	<target name="test-db-upgrade-smoke-${test.ant.script.version}-tomcat-postgresql-firefox">
+	<target name="test-db-upgrade-smoke-${test.ant.script.version}-tomcat-oracle-11-firefox">
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="oracle-11.2.0.1.0" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-db-oracle-11-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="sql.version" value="${test.ant.script.version}" />
+		</antcall>
+
+		<antcall target="run-smoke-test">
+			${test.ant.script.file.evaluate.logs}
+		</antcall>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+	<target name="test-db-upgrade-smoke-${test.ant.script.version}-tomcat-postgresql-8.4-firefox">
 		<antcall target="prepare-vm-server">
 			<param name="build.war" value="false" />
 			<param name="skip.prepare-bundle" value="true" />
@@ -66,7 +88,7 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-db-postgresql-common">
+		<antcall target="prepare-db-postgresql-8.4-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="sql.version" value="${test.ant.script.version}" />
 		</antcall>
@@ -80,7 +102,29 @@
 		</antcall>
 	</target>
 
-	<target name="test-db-upgrade-smoke-${test.ant.script.version}-tomcat-sql-server-firefox">
+	<target name="test-db-upgrade-smoke-${test.ant.script.version}-tomcat-postgresql-9.0-firefox">
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="postgresql-9.0.4-1" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-db-postgresql-9.0-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="sql.version" value="${test.ant.script.version}" />
+		</antcall>
+
+		<antcall target="run-smoke-test">
+			${test.ant.script.file.evaluate.logs}
+		</antcall>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+	<target name="test-db-upgrade-smoke-${test.ant.script.version}-tomcat-sql-server-2005-firefox">
 		<antcall target="prepare-vm-server">
 			<param name="build.war" value="false" />
 			<param name="skip.prepare-bundle" value="true" />
@@ -88,7 +132,29 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-db-sql-server-common">
+		<antcall target="prepare-db-sql-server-2005-common">
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="sql.version" value="${test.ant.script.version}" />
+		</antcall>
+
+		<antcall target="run-smoke-test">
+			${test.ant.script.file.evaluate.logs}
+		</antcall>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+	<target name="test-db-upgrade-smoke-${test.ant.script.version}-tomcat-sql-server-2008-firefox">
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="sql-server-2008-r2" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-db-sql-server-2008-common">
 			<param name="skip.prepare-bundle" value="true" />
 			<param name="sql.version" value="${test.ant.script.version}" />
 		</antcall>
diff --git a/portal-web/test-ant-templates/ant-script.xml b/portal-web/test-ant-templates/ant-script.xml
index 32530d2ae4ae95..b783b1b6b22be2 100644
--- a/portal-web/test-ant-templates/ant-script.xml
+++ b/portal-web/test-ant-templates/ant-script.xml
@@ -379,7 +379,7 @@
 		</ant>
 	</target>
 
-	<target name="test-${test.ant.script.command}-tomcat-oracle-firefox">
+	<target name="test-${test.ant.script.command}-tomcat-oracle-10-firefox">
 		<antcall target="prepare-vm-server">
 			<param name="build.war" value="false" />
 			<param name="skip.prepare-bundle" value="true" />
@@ -387,7 +387,7 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-oracle">
+		<antcall target="prepare-oracle-10">
 			${test.ant.script.file.properties}
 		</antcall>
 
@@ -407,7 +407,7 @@
 		</antcall>
 	</target>
 
-	<target name="test-${test.ant.script.command}-tomcat-oracle-minimal-firefox">
+	<target name="test-${test.ant.script.command}-tomcat-oracle-10-minimal-firefox">
 		<antcall target="prepare-vm-server">
 			<param name="build.war" value="false" />
 			<param name="skip.prepare-bundle" value="true" />
@@ -415,7 +415,7 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-oracle">
+		<antcall target="prepare-oracle-10">
 			${test.ant.script.file.properties}
 		</antcall>
 
@@ -436,7 +436,64 @@
 		</antcall>
 	</target>
 
-	<target name="test-${test.ant.script.command}-tomcat-postgresql-firefox">
+	<target name="test-${test.ant.script.command}-tomcat-oracle-11-firefox">
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="oracle-11.2.0.1.0" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-oracle-11">
+			${test.ant.script.file.properties}
+		</antcall>
+
+		<ant antfile="build-test-tomcat.xml" target="run-selenium-tomcat">
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.hooks}
+			${test.ant.script.file.plugin.layouttpls}
+			${test.ant.script.file.plugin.portlets}
+			${test.ant.script.file.plugin.portlets.properties}
+			${test.ant.script.file.plugin.themes}
+			${test.ant.script.file.plugin.webs}
+			<property name="test.name" value="${test.ant.script.suite}" />
+		</ant>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+	<target name="test-${test.ant.script.command}-tomcat-oracle-11-minimal-firefox">
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="oracle-11.2.0.1.0" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-oracle-11">
+			${test.ant.script.file.properties}
+		</antcall>
+
+		<ant antfile="build-test-tomcat.xml" target="run-selenium-tomcat">
+			<property name="test.database.minimal" value="true" />
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.hooks}
+			${test.ant.script.file.plugin.layouttpls}
+			${test.ant.script.file.plugin.portlets}
+			${test.ant.script.file.plugin.portlets.properties}
+			${test.ant.script.file.plugin.themes}
+			${test.ant.script.file.plugin.webs}
+			<property name="test.name" value="${test.ant.script.suite}" />
+		</ant>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+	<target name="test-${test.ant.script.command}-tomcat-postgresql-8.4-firefox">
 		<antcall target="prepare-vm-server">
 			<param name="build.war" value="false" />
 			<param name="skip.prepare-bundle" value="true" />
@@ -444,7 +501,7 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-postgresql">
+		<antcall target="prepare-postgresql-8.4">
 			${test.ant.script.file.properties}
 		</antcall>
 
@@ -464,7 +521,7 @@
 		</antcall>
 	</target>
 
-	<target name="test-${test.ant.script.command}-tomcat-postgresql-minimal-firefox">
+	<target name="test-${test.ant.script.command}-tomcat-postgresql-8.4-minimal-firefox">
 		<antcall target="prepare-vm-server">
 			<param name="build.war" value="false" />
 			<param name="skip.prepare-bundle" value="true" />
@@ -472,7 +529,7 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-postgresql">
+		<antcall target="prepare-postgresql-8.4">
 			${test.ant.script.file.properties}
 		</antcall>
 
@@ -493,7 +550,64 @@
 		</antcall>
 	</target>
 
-	<target name="test-${test.ant.script.command}-tomcat-sql-server-firefox">
+	<target name="test-${test.ant.script.command}-tomcat-postgresql-9.0-firefox">
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="postgresql-9.0.4-1" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-postgresql-9.0">
+			${test.ant.script.file.properties}
+		</antcall>
+
+		<ant antfile="build-test-tomcat.xml" target="run-selenium-tomcat">
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.hooks}
+			${test.ant.script.file.plugin.layouttpls}
+			${test.ant.script.file.plugin.portlets}
+			${test.ant.script.file.plugin.portlets.properties}
+			${test.ant.script.file.plugin.themes}
+			${test.ant.script.file.plugin.webs}
+			<property name="test.name" value="${test.ant.script.suite}" />
+		</ant>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+	<target name="test-${test.ant.script.command}-tomcat-postgresql-9.0-minimal-firefox">
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="postgresql-9.0.4-1" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-postgresql-9.0">
+			${test.ant.script.file.properties}
+		</antcall>
+
+		<ant antfile="build-test-tomcat.xml" target="run-selenium-tomcat">
+			<property name="test.database.minimal" value="true" />
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.hooks}
+			${test.ant.script.file.plugin.layouttpls}
+			${test.ant.script.file.plugin.portlets}
+			${test.ant.script.file.plugin.portlets.properties}
+			${test.ant.script.file.plugin.themes}
+			${test.ant.script.file.plugin.webs}
+			<property name="test.name" value="${test.ant.script.suite}" />
+		</ant>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+	<target name="test-${test.ant.script.command}-tomcat-sql-server-2005-firefox">
 		<antcall target="prepare-vm-server">
 			<param name="build.war" value="false" />
 			<param name="skip.prepare-bundle" value="true" />
@@ -501,7 +615,7 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-sql-server">
+		<antcall target="prepare-sql-server-2005">
 			${test.ant.script.file.properties}
 		</antcall>
 
@@ -521,7 +635,7 @@
 		</antcall>
 	</target>
 
-	<target name="test-${test.ant.script.command}-tomcat-sql-server-minimal-firefox">
+	<target name="test-${test.ant.script.command}-tomcat-sql-server-2005-minimal-firefox">
 		<antcall target="prepare-vm-server">
 			<param name="build.war" value="false" />
 			<param name="skip.prepare-bundle" value="true" />
@@ -529,7 +643,64 @@
 			<param name="vm.host" value="${vm.db.host}" />
 		</antcall>
 
-		<antcall target="prepare-sql-server">
+		<antcall target="prepare-sql-server-2005">
+			${test.ant.script.file.properties}
+		</antcall>
+
+		<ant antfile="build-test-tomcat.xml" target="run-selenium-tomcat">
+			<property name="test.database.minimal" value="true" />
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.hooks}
+			${test.ant.script.file.plugin.layouttpls}
+			${test.ant.script.file.plugin.portlets}
+			${test.ant.script.file.plugin.portlets.properties}
+			${test.ant.script.file.plugin.themes}
+			${test.ant.script.file.plugin.webs}
+			<property name="test.name" value="${test.ant.script.suite}" />
+		</ant>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+	<target name="test-${test.ant.script.command}-tomcat-sql-server-2008-firefox">
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="sql-server-2008-r2" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-sql-server-2008">
+			${test.ant.script.file.properties}
+		</antcall>
+
+		<ant antfile="build-test-tomcat.xml" target="run-selenium-tomcat">
+			${test.ant.script.file.evaluate.logs}
+			${test.ant.script.file.plugin.hooks}
+			${test.ant.script.file.plugin.layouttpls}
+			${test.ant.script.file.plugin.portlets}
+			${test.ant.script.file.plugin.portlets.properties}
+			${test.ant.script.file.plugin.themes}
+			${test.ant.script.file.plugin.webs}
+			<property name="test.name" value="${test.ant.script.suite}" />
+		</ant>
+
+		<antcall target="stop-vm">
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+	</target>
+
+	<target name="test-${test.ant.script.command}-tomcat-sql-server-2008-minimal-firefox">
+		<antcall target="prepare-vm-server">
+			<param name="build.war" value="false" />
+			<param name="skip.prepare-bundle" value="true" />
+			<param name="vm.vmdk.suffix" value="sql-server-2008-r2" />
+			<param name="vm.host" value="${vm.db.host}" />
+		</antcall>
+
+		<antcall target="prepare-sql-server-2008">
 			${test.ant.script.file.properties}
 		</antcall>
 
diff --git a/test.properties b/test.properties
index 7cc2349229ab3d..ec0a85be15aa75 100644
--- a/test.properties
+++ b/test.properties
@@ -27,8 +27,12 @@
     #db.type=db2
     #db.type=hsql
     db.type=mysql
-    #db.type=oracle
-    #db.type=sql-server
+    #db.type=postgresql-8.4
+    #db.type=postgresql-9.0
+    #db.type=oracle-10
+    #db.type=oracle-11
+    #db.type=sql-server-2005
+    #db.type=sql-server-2008
     #db.type=sybase
 
     db.db2.host=localhost
@@ -51,25 +55,45 @@
     db.mysql.username=
     db.mysql.password=
 
-    db.oracle.host=localhost
-    db.oracle.driver=oracle.jdbc.driver.OracleDriver
-    db.oracle.url=jdbc:oracle:thin:@${db.oracle.host}:1521:xe
-    db.oracle.username=lportal
-    db.oracle.password=lportal
-
-    db.postgresql.host=localhost
-    db.postgresql.driver=org.postgresql.Driver
-    db.postgresql.schema=lportal
-    db.postgresql.url=jdbc:postgresql://${db.postgresql.host}:5432/${db.postgresql.schema}
-    db.postgresql.username=postgres
-    db.postgresql.password=
-
-    db.sql-server.host=localhost
-    db.sql-server.driver=net.sourceforge.jtds.jdbc.Driver
-    db.sql-server.schema=lportal
-    db.sql-server.url=jdbc:jtds:sqlserver://${db.sql-server.host}/${db.sql-server.schema}
-    db.sql-server.username=sa
-    db.sql-server.password=password
+    db.oracle-10.host=localhost
+    db.oracle-10.driver=oracle.jdbc.driver.OracleDriver
+    db.oracle-10.url=jdbc:oracle:thin:@${db.oracle-10.host}:1521:xe
+    db.oracle-10.username=lportal
+    db.oracle-10.password=lportal
+
+    db.oracle-11.host=localhost
+    db.oracle-11.driver=oracle.jdbc.driver.OracleDriver
+    db.oracle-11.url=jdbc:oracle:thin:@${db.oracle-11.host}:1521:orcl
+    db.oracle-11.username=lportal
+    db.oracle-11.password=lportal
+
+    db.postgresql-8.4.host=localhost
+    db.postgresql-8.4.driver=org.postgresql.Driver
+    db.postgresql-8.4.schema=lportal
+    db.postgresql-8.4.url=jdbc:postgresql://${db.postgresql-8.4.host}:5432/${db.postgresql-8.4.schema}
+    db.postgresql-8.4.username=postgres
+    db.postgresql-8.4.password=
+
+    db.postgresql-9.0.host=localhost
+    db.postgresql-9.0.driver=org.postgresql.Driver
+    db.postgresql-9.0.schema=lportal
+    db.postgresql-9.0.url=jdbc:postgresql://${db.postgresql-9.0.host}:5432/${db.postgresql-9.0.schema}
+    db.postgresql-9.0.username=postgres
+    db.postgresql-9.0.password=
+
+    db.sql-server-2005.host=localhost
+    db.sql-server-2005.driver=net.sourceforge.jtds.jdbc.Driver
+    db.sql-server-2005.schema=lportal
+    db.sql-server-2005.url=jdbc:jtds:sqlserver://${db.sql-server-2005.host}/${db.sql-server-2005.schema}
+    db.sql-server-2005.username=sa
+    db.sql-server-2005.password=password
+
+    db.sql-server-2008.host=localhost
+    db.sql-server-2008.driver=net.sourceforge.jtds.jdbc.Driver
+    db.sql-server-2008.schema=lportal
+    db.sql-server-2008.url=jdbc:jtds:sqlserver://${db.sql-server-2008.host}/${db.sql-server-2008.schema}
+    db.sql-server-2008.username=sa
+    db.sql-server-2008.password=password1
 
     db.sybase.device.name=lportal
     db.sybase.host=localhost